0
1
Fork 0

Compare commits

..

232 Commits

Author SHA1 Message Date
Juan Ferrer a956c268b6 Merge pull request 'refs #8480 Hide inactive items' (!101) from test into dev
gitea/hedera-web/pipeline/head This commit looks good Details
gitea/hedera-web/pipeline/pr-beta There was a failure building this commit Details
Reviewed-on: verdnatura/hedera-web#101
2025-01-27 11:41:26 +00:00
Juan Ferrer 5b968b6e46 refs #8480 Hide inactive items
gitea/hedera-web/pipeline/head This commit looks good Details
gitea/hedera-web/pipeline/pr-dev Build queued... Details
gitea/hedera-web/pipeline/pr-master This commit looks good Details
2025-01-27 12:25:51 +01:00
Juan Ferrer ef65622014 Merge pull request 'test into dev' (!100) from test into dev
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#100
2025-01-27 11:20:42 +00:00
Juan Ferrer 35efe67c63 refs #8471 Order confirm code fix
gitea/hedera-web/pipeline/head This commit looks good Details
gitea/hedera-web/pipeline/pr-dev Build started... Details
2025-01-24 09:13:53 +01:00
Juan Ferrer 6dbcf162ca refs #8471 Version increased
gitea/hedera-web/pipeline/head This commit looks good Details
2025-01-23 16:58:06 +01:00
Juan Ferrer 20f5dc46f7 refs #8471 Fix apt key location
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2025-01-23 16:54:20 +01:00
Juan Ferrer c0ab27bd7a refs #8471 Version increased
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2025-01-23 16:35:57 +01:00
Juan Ferrer 6508a4e4f0 refs #8471 Remove transfer and later payments from frontend
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2025-01-23 16:32:09 +01:00
Guillermo Bonet 6fa75b3abc Version increased
gitea/hedera-web/pipeline/head This commit looks good Details
2024-08-06 09:48:59 +02:00
Guillermo Bonet ce230b1133 Merge pull request 'test → master' (!76) from test into master
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#76
2024-08-06 07:08:53 +00:00
Guillermo Bonet f2ca49b261 Merge pull request 'refactor: refs #7511 Changed dependences' (!75) from dev into test
gitea/hedera-web/pipeline/pr-master Build queued... Details
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#75
2024-08-06 07:08:17 +00:00
Guillermo Bonet a5b8e56506 Merge pull request 'test → master' (!66) from test into master
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#66
2024-07-23 06:23:47 +00:00
Guillermo Bonet 93562bb4dd fix: refs #7704 Bug fix
gitea/hedera-web/pipeline/pr-master This commit looks good Details
gitea/hedera-web/pipeline/head This commit looks good Details
2024-07-19 10:25:23 +02:00
Guillermo Bonet aaa9d34404 Version increased
gitea/hedera-web/pipeline/pr-master This commit looks good Details
gitea/hedera-web/pipeline/head This commit looks good Details
2024-07-19 09:40:10 +02:00
Guillermo Bonet de5740856e refactor: refs #7511 Changed dependences
gitea/hedera-web/pipeline/head This commit looks good Details
gitea/hedera-web/pipeline/pr-test Build queued... Details
2024-07-19 07:50:02 +02:00
Guillermo Bonet 70746995ca Merge pull request 'dev → test' (!69) from dev into test
gitea/hedera-web/pipeline/pr-master This commit looks good Details
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#69
2024-07-18 05:59:33 +00:00
Juan Ferrer 90dea8fde9 ci(Jenkinsfile): refs #7643 Tag only master as latest
gitea/hedera-web/pipeline/pr-master This commit looks good Details
gitea/hedera-web/pipeline/head This commit looks good Details
2024-07-15 10:32:11 +02:00
Guillermo Bonet f57967cd17 Merge pull request 'feat: refs #7704 Change minQuantity' (!67) from 7704-itemMinimalQuantity into dev
gitea/hedera-web/pipeline/head This commit looks good Details
gitea/hedera-web/pipeline/pr-test Build queued... Details
Reviewed-on: verdnatura/hedera-web#67
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-12 07:43:13 +00:00
Guillermo Bonet 1c54922692 feat: refs #7704 Refactor
gitea/hedera-web/pipeline/pr-dev This commit looks good Details
2024-07-11 14:33:15 +02:00
Guillermo Bonet 8929f8c55a feat: refs #7704 Refactor
gitea/hedera-web/pipeline/pr-dev This commit looks good Details
2024-07-11 14:32:56 +02:00
Guillermo Bonet 7f2c645682 feat: refs #7704 Refactor
gitea/hedera-web/pipeline/pr-dev This commit looks good Details
2024-07-11 13:36:21 +02:00
Guillermo Bonet 099f494101 feat: refs #7704 Change minQuantity
gitea/hedera-web/pipeline/pr-dev This commit looks good Details
2024-07-11 11:40:11 +02:00
Juan Ferrer ddc5c2adc7 ci: refs #7643 Jenkinsfile code clean
gitea/hedera-web/pipeline/head This commit looks good Details
gitea/hedera-web/pipeline/pr-master This commit looks good Details
2024-07-10 12:48:01 +02:00
Juan Ferrer 16d1e1fd69 ci: refs #7643 Debuild image updated
gitea/hedera-web/pipeline/head This commit looks good Details
2024-07-10 12:37:24 +02:00
Juan Ferrer 340c68406c ci: refs #7643 Debuild image updated
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-10 12:36:35 +02:00
Juan Ferrer c2f7ee1be8 ci: refs #7643 Debuild image updated
gitea/hedera-web/pipeline/head This commit looks good Details
2024-07-10 12:30:56 +02:00
Juan Ferrer 4d81b6c5b2 ci: refs #7643 Debuild dput debug
gitea/hedera-web/pipeline/head This commit looks good Details
2024-07-10 12:19:57 +02:00
Juan Ferrer fba0c73402 ci: refs #7643 Debuild dput debug
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-10 12:18:05 +02:00
Juan Ferrer 5ac6652663 ci: refs #7643 Debuild dput debug
gitea/hedera-web/pipeline/head Something is wrong with the build of this commit Details
2024-07-10 11:31:08 +02:00
Juan Ferrer 21da29ab8d ci: refs #7643 Debuild dput debug
gitea/hedera-web/pipeline/head Something is wrong with the build of this commit Details
2024-07-10 11:23:18 +02:00
Juan Ferrer 1f373f1bc3 ci: refs #7643 Debuild dput debug
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-10 11:20:59 +02:00
Juan Ferrer 47acbb7ebb ci: refs #7643 Debuild dput debug
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-10 11:19:05 +02:00
Juan Ferrer f863d8a897 ci: refs #7643 Debuild debug
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-10 11:16:19 +02:00
Juan Ferrer 5186387162 ci: refs #7643 Reprepro debug
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-10 10:54:47 +02:00
Juan Ferrer fd11c1ea00 ci: refs #7643 Reprepro debug
gitea/hedera-web/pipeline/head Something is wrong with the build of this commit Details
2024-07-09 17:31:24 +02:00
Juan Ferrer 8a022aac66 ci: refs #7643 Reprepro debug
gitea/hedera-web/pipeline/head Something is wrong with the build of this commit Details
2024-07-09 17:03:57 +02:00
Juan Ferrer ddaff6afe9 ci: refs #7643 Reprepro debug
gitea/hedera-web/pipeline/head Something is wrong with the build of this commit Details
2024-07-09 16:55:20 +02:00
Juan Ferrer bdf7a16003 ci: refs #7643 Reprepro debug
gitea/hedera-web/pipeline/head This commit looks good Details
2024-07-09 15:43:55 +02:00
Juan Ferrer 3db9314dfd ci: refs #7643 Reprepro debug & docker deploy improve
gitea/hedera-web/pipeline/head This commit looks good Details
2024-07-09 12:16:31 +02:00
Juan Ferrer 7ff9e2e97d ci: refs #7643 Reprepro includedeb improve
gitea/hedera-web/pipeline/head Something is wrong with the build of this commit Details
2024-07-09 12:04:23 +02:00
Juan Ferrer 0d61a9de03 ci: refs #7643 Reprepro includedeb improve
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-09 11:38:58 +02:00
Juan Ferrer 979b1293a9 ci: refs #7643 Reprepro includedeb fix
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-09 10:45:22 +02:00
Juan Ferrer 29168a6927 ci: refs #7643 Reprepro & debuild fixes
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-09 10:38:42 +02:00
Juan Ferrer b62185289f ci: refs #7643 Reprepro & debuild fixes
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 14:22:15 +02:00
Juan Ferrer d66047c451 ci: refs #7643 Reprepro & debuild fixes
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 14:20:41 +02:00
Juan Ferrer 03be5f9a56 ci: refs #7643 Reprepro SSH credentials fix
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 14:11:04 +02:00
Juan Ferrer 96fd08b369 ci: refs #7643 Reprepro SSH credentials fix
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 13:55:23 +02:00
Juan Ferrer 36573342b7 ci: refs #7643 Reprepro SSH credentials debug
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 13:43:41 +02:00
Juan Ferrer 14451121ac ci: refs #7643 Reprepro SSH credentials debug
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 13:41:43 +02:00
Juan Ferrer 44a45a25b2 ci: refs #7643 Reprepro SSH credentials debug
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 13:36:39 +02:00
Juan Ferrer 7618e65105 ci: refs #7643 Reprepro SSH credentials debug
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 13:32:42 +02:00
Juan Ferrer 1efb84dd83 ci: refs #7643 Reprepro SSH credentials debug
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 13:20:40 +02:00
Juan Ferrer 90137ab08f ci: refs #7643 Reprepro SSH credentials debug
gitea/hedera-web/pipeline/head Something is wrong with the build of this commit Details
2024-07-05 13:18:18 +02:00
Juan Ferrer b73e292cb0 ci: refs #7643 Reprepro SSH credentials debug
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 13:07:53 +02:00
Juan Ferrer 444732460e ci: refs #7643 Reprepro SSH credentials fix
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 13:05:06 +02:00
Juan Ferrer ab88575c72 ci: refs #7643 Reprepro SSH credentials fix
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 13:02:48 +02:00
Juan Ferrer 5cf6ef5b1c ci: refs #7643 Reprepro SSH credentials fix
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 13:01:49 +02:00
Juan Ferrer dcf46094f0 ci: refs #7643 Reprepro SSH credentials fix
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 11:13:03 +02:00
Juan Ferrer c6589989d4 ci: refs #7643 Reprepro SSH credentials fix
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 11:11:29 +02:00
Juan Ferrer 59e7999385 ci: refs #7643 Reprepro SSH credentials fix
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 11:10:10 +02:00
Juan Ferrer 756fccaa78 ci: refs #7643 Reprepro SSH credentials fix
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 11:09:15 +02:00
Juan Ferrer 7174842cfa ci: refs #7643 Reprepro SSH credentials
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 11:08:44 +02:00
Juan Ferrer d6e7d3b025 ci: refs #7643 Reprepro fixes
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 10:34:27 +02:00
Juan Ferrer 5bc20e9e05 ci: refs #7643 Reprepro fixes
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 10:32:08 +02:00
Juan Ferrer 6be7bccff7 ci: refs #7643 Debuild debug
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 10:29:35 +02:00
Juan Ferrer bf5ba5dac1 ci: refs #7643 Debuild debug
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 10:20:07 +02:00
Juan Ferrer 0d2ac8f9fb ci: refs #7643 Debuild debug
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 10:07:37 +02:00
Juan Ferrer cb61ad5d11 ci: refs #7643 Debuild artifact
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-05 10:04:10 +02:00
Juan Ferrer 5abcf9e71d ci: refs #7643 Debuild image fixes
gitea/hedera-web/pipeline/head Something is wrong with the build of this commit Details
2024-07-05 09:48:29 +02:00
Juan Ferrer 0952a690a5 ci: refs #7643 Debuild image fixes
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-04 19:19:30 +02:00
Juan Ferrer cc5faf97da ci: refs #7643 Debuild image fixes
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-04 19:04:04 +02:00
Juan Ferrer 9507292a13 fix: refs #7643 Debuild stage debug
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-04 19:00:35 +02:00
Juan Ferrer 17baf12449 fix: refs #7643 Debuild stage debug
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-04 18:48:49 +02:00
Juan Ferrer 749189d726 fix: refs #7643 Debuild stage debug
gitea/hedera-web/pipeline/head Something is wrong with the build of this commit Details
2024-07-04 18:45:32 +02:00
Juan Ferrer 7a94c3a01e ci: refs #7643 Debuild image fixes
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-04 18:42:34 +02:00
Juan Ferrer c4977b7997 fix: refs #7643 Debuild stage debug
gitea/hedera-web/pipeline/head Something is wrong with the build of this commit Details
2024-07-04 18:10:31 +02:00
Juan Ferrer ca4457bf54 ci: refs #7643 Debuild output
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-04 16:28:42 +02:00
Juan Ferrer d1c4f9dba2 fix: refs #7643 Debuild stage debug
gitea/hedera-web/pipeline/head Something is wrong with the build of this commit Details
2024-07-04 16:21:11 +02:00
Juan Ferrer 921b029b06 fix: refs #7643 Update debuild image
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-04 11:51:48 +02:00
Juan Ferrer ff63cd11c3 fix: refs #7643 Reprepro stage debug
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-04 11:28:29 +02:00
Juan Ferrer 1f1043a43c fix: refs #7643 Reprepro stage debug
gitea/hedera-web/pipeline/head Something is wrong with the build of this commit Details
2024-07-04 11:24:45 +02:00
Juan Ferrer a868a5b540 fix: refs #7643 Reprepro stage debug
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-07-04 11:15:53 +02:00
Juan Ferrer baa596430e fix: refs #7643 Reprepro stage
gitea/hedera-web/pipeline/head Something is wrong with the build of this commit Details
2024-07-04 11:08:26 +02:00
Guillermo Bonet 5ca765486f Merge pull request 'test → master' (!65) from test into master
gitea/hedera-web/pipeline/head There was a failure building this commit Details
Reviewed-on: verdnatura/hedera-web#65
2024-06-25 07:11:48 +00:00
Guillermo Bonet 61fac85554 Version increased
gitea/hedera-web/pipeline/head This commit looks good Details
gitea/hedera-web/pipeline/pr-master This commit looks good Details
2024-06-25 08:36:13 +02:00
Guillermo Bonet 3a714debfc Merge pull request 'dev → test' (!64) from dev into test
gitea/hedera-web/pipeline/head There was a failure building this commit Details
Reviewed-on: verdnatura/hedera-web#64
2024-06-21 12:29:07 +00:00
Guillermo Bonet 647dd09013 Merge pull request 'fix: refs #7498 Download invoice out error' (!63) from 7498-fixInvoiceOuts into dev
gitea/hedera-web/pipeline/head This commit looks good Details
gitea/hedera-web/pipeline/pr-test Build started... Details
Reviewed-on: verdnatura/hedera-web#63
2024-06-11 06:54:44 +00:00
Guillermo Bonet 05c71c7425 refactor: refs #7498 Version increased
gitea/hedera-web/pipeline/pr-dev Build queued... Details
2024-06-11 08:54:33 +02:00
Guillermo Bonet 90e2b0abb5 refactor: refs #7498 Deleted method
gitea/hedera-web/pipeline/pr-dev This commit looks good Details
2024-06-07 08:51:03 +02:00
Guillermo Bonet bcbbee411f fix: refs #7498 Download invoice out error
gitea/hedera-web/pipeline/pr-master This commit looks good Details
gitea/hedera-web/pipeline/pr-dev This commit looks good Details
2024-05-29 10:45:34 +02:00
Guillermo Bonet 961ff02053 Merge pull request 'test' (!61) from test into master
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#61
2024-05-28 06:22:39 +00:00
Guillermo Bonet e7eb2a01fe Merge branch 'master' into test
gitea/hedera-web/pipeline/pr-master This commit looks good Details
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-05-28 06:20:48 +00:00
Juan Ferrer 98cefc8f0f feat: refs #7442 Kubernetes deploy
gitea/hedera-web/pipeline/pr-master This commit looks good Details
gitea/hedera-web/pipeline/head This commit looks good Details
2024-05-27 10:11:41 +02:00
Juan Ferrer e40a28b649 feat: refs #7442 Kubernetes deploy
gitea/hedera-web/pipeline/head Build queued... Details
gitea/hedera-web/pipeline/pr-master Build queued... Details
2024-05-27 10:11:03 +02:00
Guillermo Bonet f869e7413c Merge branch 'dev' into test
gitea/hedera-web/pipeline/pr-master This commit looks good Details
gitea/hedera-web/pipeline/head This commit looks good Details
2024-05-27 07:18:04 +02:00
Guillermo Bonet 29e800ea30 refs #7039 Version increased
gitea/hedera-web/pipeline/head This commit looks good Details
gitea/hedera-web/pipeline/pr-test There was a failure building this commit Details
2024-05-27 07:15:44 +02:00
Robert Ferrús 1eb98b772a Merge pull request 'feat: refs #7039 change country to name' (!57) from 7039-country-country into dev
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#57
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-05-15 09:04:33 +00:00
Guillermo Bonet 1fe6816c08 Version increased
gitea/hedera-web/pipeline/pr-master This commit looks good Details
gitea/hedera-web/pipeline/head This commit looks good Details
2024-05-14 14:17:26 +02:00
Javi Gallego 5bbc342471 package
gitea/hedera-web/pipeline/pr-master This commit looks good Details
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-05-14 13:37:32 +02:00
Javi Gallego d808fa71d1 changeLog
gitea/hedera-web/pipeline/pr-master This commit looks good Details
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-05-14 13:25:46 +02:00
Juan Ferrer ac226205b0 Merge pull request 'feat: refs #7108 deletes exchange-rate' (!59) from 7108 into test
gitea/hedera-web/pipeline/pr-master This commit looks good Details
gitea/hedera-web/pipeline/head There was a failure building this commit Details
Reviewed-on: verdnatura/hedera-web#59
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-05-14 08:51:27 +00:00
Guillermo Bonet 87f17409f7 Merge pull request 'test → master' (!60) from test into master
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#60
2024-05-14 07:20:35 +00:00
Javi Gallego ae70cbaaf4 feat: refs #7108 deletes exchange-rate
gitea/hedera-web/pipeline/pr-test This commit looks good Details
2024-05-09 09:20:07 +02:00
Guillermo Bonet 6e1613a26c Merge branch '7039-country-country' of https://gitea.verdnatura.es/verdnatura/hedera-web into 7039-country-country
gitea/hedera-web/pipeline/pr-dev This commit looks good Details
2024-05-07 14:05:45 +02:00
Guillermo Bonet 359ddb5d18 Fix 2024-05-07 14:05:44 +02:00
Guillermo Bonet d75fe3fc00 Merge branch 'dev' into 7039-country-country
gitea/hedera-web/pipeline/pr-dev This commit looks good Details
2024-05-07 11:54:14 +00:00
Guillermo Bonet e6cd88ee82 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/hedera-web into test
gitea/hedera-web/pipeline/head This commit looks good Details
gitea/hedera-web/pipeline/pr-master This commit looks good Details
2024-05-07 13:53:37 +02:00
Guillermo Bonet a405cba00b Version increased 2024-05-07 13:53:36 +02:00
Guillermo Bonet e4f55ca9e9 Merge pull request 'dev → test' (!58) from dev into test
gitea/hedera-web/pipeline/head There was a failure building this commit Details
Reviewed-on: verdnatura/hedera-web#58
2024-05-07 11:51:00 +00:00
Robert Ferrús d8ea9134d4 feat: refs #7039 change country to name
gitea/hedera-web/pipeline/pr-dev This commit looks good Details
2024-05-07 07:29:00 +02:00
Guillermo Bonet a96859b6bb Merge pull request 'refactor: refs #7258 Deleted dependences of vn2008' (!56) from 7258-byeViewsVn2008 into dev
gitea/hedera-web/pipeline/head This commit looks good Details
gitea/hedera-web/pipeline/pr-test This commit looks good Details
Reviewed-on: verdnatura/hedera-web#56
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-05-02 07:55:34 +00:00
Guillermo Bonet e210a09f6b Merge branch 'dev' into 7258-byeViewsVn2008
gitea/hedera-web/pipeline/pr-dev This commit looks good Details
2024-04-24 08:16:20 +00:00
Guillermo Bonet 5304a77f94 Merge branch 'test' into dev
gitea/hedera-web/pipeline/head This commit looks good Details
2024-04-24 10:06:48 +02:00
Guillermo Bonet 3f63da06f1 fix: refs #6492 Version increased
gitea/hedera-web/pipeline/head This commit looks good Details
2024-04-24 10:00:25 +02:00
Guillermo Bonet 7d120598bc refactor: refs #7258 Deleted dependences of vn2008
gitea/hedera-web/pipeline/pr-dev This commit looks good Details
2024-04-24 07:55:52 +02:00
Juan Ferrer 4cf91140f7 Merge pull request '#6492 replace procedure' (!55) from 6492-useAgencyVolume into master
gitea/hedera-web/pipeline/head There was a failure building this commit Details
Reviewed-on: verdnatura/hedera-web#55
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-04-23 14:08:14 +00:00
Jorge Penadés 06554b7dee fix: refs #6492 replace procedure
gitea/hedera-web/pipeline/pr-master This commit looks good Details
2024-04-23 12:02:04 +02:00
Juan Ferrer 83c6886ee6 feat(catalog): refs #7222 Set image aspect ratio to 1:1
gitea/hedera-web/pipeline/head This commit looks good Details
2024-04-17 10:10:40 +02:00
Jorge Penadés 4765bc78de Merge pull request 'feat: refs #6492 replace procedure' (!54) from 6492-replaceAgencyVolume into dev
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#54
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-04-12 06:49:16 +00:00
Jorge Penadés 0a9635feb2 feat: refs #6492 replace procedure
gitea/hedera-web/pipeline/pr-dev This commit looks good Details
2024-04-10 12:41:45 +02:00
Jorge Penadés 00c8e4b1e3 feat: refs #6492 replace procedure
gitea/hedera-web/pipeline/pr-dev This commit looks good Details
2024-04-10 12:35:44 +02:00
Guillermo Bonet 1414b6c96e refactor: refs #5167 Version increased
gitea/hedera-web/pipeline/pr-master This commit looks good Details
gitea/hedera-web/pipeline/head This commit looks good Details
2024-03-21 07:15:28 +01:00
Guillermo Bonet 244b3f939e Merge pull request 'refactor: refs #5167 Deleted provinces section' (!51) from 5167-removedProvince into master
gitea/hedera-web/pipeline/head There was a failure building this commit Details
Reviewed-on: verdnatura/hedera-web#51
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-03-21 06:03:58 +00:00
Guillermo Bonet 1d2f9061c5 refactor: refs #5167 Requested changes
gitea/hedera-web/pipeline/pr-master This commit looks good Details
2024-03-11 13:23:07 +01:00
Guillermo Bonet a121750fa7 refactor: refs #5167 Deleted provinces section
gitea/hedera-web/pipeline/pr-master This commit looks good Details
2024-03-11 08:52:43 +01:00
Guillermo Bonet 73ba16634e refactor: refs #5167 Deleted provinces section
gitea/hedera-web/pipeline/pr-master This commit looks good Details
2024-03-11 08:50:35 +01:00
Juan Ferrer 2515cbcee7 ci: HOTFIX Use version to tag docker images
gitea/hedera-web/pipeline/head This commit looks good Details
2024-02-22 09:41:39 +01:00
Juan Ferrer d1cdba800d Jenkinsfile refactor
gitea/hedera-web/pipeline/pr-master This commit looks good Details
gitea/hedera-web/pipeline/head This commit looks good Details
2024-02-22 09:25:38 +01:00
Juan Ferrer 02ddc87755 version increased
gitea/hedera-web/pipeline/pr-master This commit looks good Details
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-02-22 09:03:28 +01:00
Juan Ferrer 7689be689f Merge branch 'master' into test
gitea/hedera-web/pipeline/pr-master This commit looks good Details
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2024-02-22 08:56:16 +01:00
Juan Ferrer 33778629e6 Merge pull request 'dev' (!49) from dev into test
gitea/hedera-web/pipeline/head There was a failure building this commit Details
gitea/hedera-web/pipeline/pr-master There was a failure building this commit Details
Reviewed-on: verdnatura/hedera-web#49
2024-02-15 12:35:15 +00:00
Juan Ferrer 7f1d8ebb8e version updated
gitea/hedera-web/pipeline/head This commit looks good Details
gitea/hedera-web/pipeline/pr-test Build started... Details
gitea/hedera-web/pipeline/pr-dev This commit looks good Details
2024-02-15 13:34:20 +01:00
Juan Ferrer 4d8a67f499 Merge pull request 'test' (!48) from test into dev
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#48
2024-02-15 12:32:01 +00:00
Guillermo Bonet c6120af93b Merge pull request 'refactor: refs #6780 Deleted references to warehouse vn2008' (!47) from 6780-changeViewDependencesVn2008 into dev
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#47
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-02-02 08:16:55 +00:00
Guillermo Bonet 95f819c22f refactor: refs #6780 Deleted references to warehouse vn2008
gitea/hedera-web/pipeline/pr-dev This commit looks good Details
2024-02-01 09:46:16 +01:00
Juan Ferrer 496061fb3c refs #6200 Version increased
gitea/hedera-web/pipeline/head This commit looks good Details
2023-10-10 14:17:50 +02:00
Juan Ferrer 0b85c1230a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/hedera-web
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2023-10-10 12:46:42 +02:00
Juan Ferrer 3ed871cb4c refs #6200 fix 2023-10-10 12:46:05 +02:00
Juan Ferrer c7159a1e13 Merge pull request 'refs #6200 test into master' (!46) from test into master
gitea/hedera-web/pipeline/head Something is wrong with the build of this commit Details
Reviewed-on: verdnatura/hedera-web#46
2023-10-10 08:21:49 +00:00
Juan Ferrer fba880fb33 refs #6200 Version increased
gitea/hedera-web/pipeline/head There was a failure building this commit Details
gitea/hedera-web/pipeline/pr-dev Build queued... Details
2023-10-10 09:37:29 +02:00
Juan Ferrer 1535a557a8 refs #6200 Fixes: style & add to basket
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2023-10-09 21:08:40 +02:00
Juan Ferrer 4a09fe39a8 refs #6200 style fixes, mock local date
gitea/hedera-web/pipeline/head This commit looks good Details
2023-10-09 21:01:11 +02:00
Juan Ferrer 3977b258d3 refs #6200 Style fixes
gitea/hedera-web/pipeline/head This commit looks good Details
2023-10-09 20:20:01 +02:00
Juan Ferrer 6915e06c71 refs #6200 Minimal amount
gitea/hedera-web/pipeline/head This commit looks good Details
2023-10-09 19:51:59 +02:00
Juan Ferrer a474f9df05 Merge branch 'master' into test
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2023-10-09 19:06:44 +02:00
Juan Ferrer 620bd53262 refs #5879 Fixes: PHP max upload filesize
gitea/hedera-web/pipeline/head This commit looks good Details
2023-08-30 17:48:23 +02:00
Juan Ferrer 8f98597ea2 refs #5863 Fixes: Mailer, logout & run db
gitea/hedera-web/pipeline/head This commit looks good Details
2023-08-21 11:41:51 +02:00
Alex Moreno a2cd8a711e Merge pull request 'refs #5762 feat(changePassword): salix compatibility' (!44) from 5762-recover-password_salix2 into test
gitea/hedera-web/pipeline/head There was a failure building this commit Details
Reviewed-on: verdnatura/hedera-web#44
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-08-18 06:57:15 +00:00
Alex Moreno 08b4a3437c refs #5762 feat(changePassword): salix compatibility
gitea/hedera-web/pipeline/head This commit looks good Details
2023-08-07 07:25:11 +02:00
Juan Ferrer a59c44fb3a refs #5863 Version increased
gitea/hedera-web/pipeline/head This commit looks good Details
2023-08-02 08:49:49 +02:00
Juan Ferrer 2adfd2299a Merge pull request 'hotFix(logout): correct order' (!43) from hotFix_correctOrder_logout into master
gitea/hedera-web/pipeline/head There was a failure building this commit Details
Reviewed-on: verdnatura/hedera-web#43
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-07-28 11:25:16 +00:00
Juan Ferrer f929e67d76 Merge branch 'master' into hotFix_correctOrder_logout
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2023-07-28 11:24:56 +00:00
Juan Ferrer d37493b081 ticket #097414 Fix: Use client language
gitea/hedera-web/pipeline/head This commit looks good Details
2023-07-28 13:11:33 +02:00
Alex Moreno 0f3ddb1a99 hotFix(logout): correct order
gitea/hedera-web/pipeline/head This commit looks good Details
2023-07-28 10:16:28 +02:00
Juan Ferrer bb4e348d0c Merge pull request 'test into master' (!42) from test into master
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#42
2023-07-27 20:07:42 +00:00
Juan Ferrer 754b8cd6c4 refs #6079 Add tag 8 & modify france phone
gitea/hedera-web/pipeline/head This commit looks good Details
2023-07-27 21:55:17 +02:00
Alex Moreno 7bb067223a Merge pull request '5863_logout_remove_session' (!40) from 5863_logout_remove_session into test
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#40
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-07-14 11:04:56 +00:00
Alex Moreno 9363cdf5a4 refs #5863 fix remove user session
gitea/hedera-web/pipeline/head This commit looks good Details
2023-07-12 08:34:47 +02:00
Alex Moreno d17bc6115f refs #5863 logout remove $_SESSION['user']
gitea/hedera-web/pipeline/head This commit looks good Details
2023-07-12 07:17:20 +02:00
Javi Gallego 9475c26663 Merge pull request 'refs #5863 add echos in login' (!39) from 5863_service_add_echos2 into test
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#39
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-07-11 11:57:09 +00:00
Alex Moreno 607513452f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/hedera-web into 5863_service_add_echos2
gitea/hedera-web/pipeline/head This commit looks good Details
2023-07-11 11:36:50 +02:00
Alex Moreno 86be0278a6 refs #5863 add echos in login
gitea/hedera-web/pipeline/head This commit looks good Details
2023-07-11 11:35:15 +02:00
Alex Moreno a8f98d62ab Merge pull request 'refs #5863 add echos in login' (!38) from 5863_service_add_echos into test
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#38
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-07-11 07:21:12 +00:00
Alex Moreno 2af5851066 refs #5863 add echos in login 2023-07-11 09:18:34 +02:00
Javi Gallego 1470e77572 Merge pull request 'refs #5863 remove echos' (!37) from 5863-visit_user3 into test
gitea/hedera-web/pipeline/head There was a failure building this commit Details
Reviewed-on: verdnatura/hedera-web#37
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-07-10 07:23:01 +00:00
Alex Moreno 32cc865290 refs #5863 remove echos
gitea/hedera-web/pipeline/head This commit looks good Details
2023-07-10 09:17:16 +02:00
Javi Gallego 8bcfe9f50c Merge pull request 'refs #5863 echos' (!36) from 5863-visit_user2 into test
gitea/hedera-web/pipeline/head There was a failure building this commit Details
Reviewed-on: verdnatura/hedera-web#36
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-07-10 06:44:52 +00:00
Alex Moreno f638143e3e refs #5863 echos
gitea/hedera-web/pipeline/head This commit looks good Details
2023-07-10 08:43:15 +02:00
Javi Gallego 07bde10609 Merge pull request 'refs #5863 add echos' (!35) from 5863-visit_user into test
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#35
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-07-10 05:54:10 +00:00
Alex Moreno 4231365e4f refs #5863 add echos
gitea/hedera-web/pipeline/head This commit looks good Details
2023-07-10 07:52:24 +02:00
Juan Ferrer fa56a4e540 refs #5879 Jenkinsfile: debuild updated
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2023-06-20 17:29:01 +02:00
Juan Ferrer 5bcfd5897c Merge pull request 'refs #5879 test into dev' (!34) from test into dev
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#34
2023-06-20 15:20:29 +00:00
Juan Ferrer 572d4b7b83 Merge branch 'master' into test
gitea/hedera-web/pipeline/head This commit looks good Details
2023-06-20 17:18:54 +02:00
Juan Ferrer bbeb70eb6b refs #5879 Upgrade Debian image
gitea/hedera-web/pipeline/head This commit looks good Details
2023-06-20 16:56:19 +02:00
Juan Ferrer 2905a6ab57 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/hedera-web
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2023-06-20 16:08:14 +02:00
Juan Ferrer 5b84671d57 hotfix #097414 Version increased 2023-06-20 16:08:13 +02:00
Carlos Andrés 9146d28db5 Merge pull request 'hotfix-Ticket-#097414-traducción-meensaje-de-error' (!32) from hotfix-Ticket-#097414-traducción-meensaje-de-error into master
gitea/hedera-web/pipeline/head There was a failure building this commit Details
Reviewed-on: verdnatura/hedera-web#32
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-06-20 12:02:02 +00:00
Carlos Andrés 59242daa79 Merge branch 'master' into hotfix-Ticket-#097414-traducción-meensaje-de-error
gitea/hedera-web/pipeline/head This commit looks good Details
2023-06-20 12:01:38 +00:00
Juan Ferrer fd32b3f15a refs #5489 Version increased
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2023-06-16 08:28:05 +02:00
Juan Ferrer 56395aa91b refs #5489 Account.sync(): bcryptPassword not used, removed
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2023-06-15 13:14:01 +02:00
Carlos Andrés 2610448e79 hotfix Ticket #097414 traducción mensajes de error
gitea/hedera-web/pipeline/head This commit looks good Details
2023-06-15 10:06:28 +02:00
Carlos Andrés 9eba09ddf7 hotfix Ticket #097414 traducción mensajes de error
gitea/hedera-web/pipeline/head This commit looks good Details
2023-06-15 10:04:58 +02:00
Juan Ferrer 74980fbdd7 refs #5553 Insert/Update image table before save
gitea/hedera-web/pipeline/head This commit looks good Details
2023-04-14 10:39:59 +02:00
Juan Ferrer 01326dc91c Merge pull request 'test' (!31) from test into dev
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#31
2023-03-10 11:23:16 +00:00
Juan Ferrer 5ce2f46842 Merge pull request 'refs #3867 Fix: display message of forbidden errors' (!30) from master into test
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#30
2023-03-10 11:22:50 +00:00
Juan Ferrer 42f682739e refs #3867 Fix: display message of forbidden errors
gitea/hedera-web/pipeline/head This commit looks good Details
2023-03-07 08:50:12 +01:00
Juan Ferrer bbe7f2ea14 Merge pull request 'refs #3723 Set docker memory limit' (!29) from master into test
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#29
2023-03-06 08:31:52 +00:00
Juan Ferrer cdafea824e refs #3723 Set docker memory limit
gitea/hedera-web/pipeline/head This commit looks good Details
2023-03-06 09:25:02 +01:00
Juan Ferrer 5fce203252 Merge pull request 'test' (!28) from test into dev
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#28
2023-02-27 08:47:36 +00:00
Juan Ferrer 9945c8f1b6 Merge pull request 'master' (!27) from master into test
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#27
2023-02-27 08:46:45 +00:00
Juan Ferrer 1ef0d48ba7 refs #4253 Version increased
gitea/hedera-web/pipeline/head This commit looks good Details
2023-02-26 02:13:28 +01:00
Juan Ferrer 197758f2bc refs #4253 supplant security code uncommented 2023-02-26 02:12:45 +01:00
Juan Ferrer 511e925467 refs #5122 Show shopping bag icon in basket
gitea/hedera-web/pipeline/head This commit looks good Details
2023-02-24 08:59:45 +01:00
Juan Ferrer f47e7e07a7 refs #5122 Pending orders: Show taxable base instead of total
gitea/hedera-web/pipeline/head This commit looks good Details
2023-02-24 08:46:49 +01:00
Juan Ferrer b32be540f3 Merge pull request 'test' (!26) from test into dev
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#26
2023-02-23 19:28:45 +00:00
Juan Ferrer 4190aad94e Merge pull request 'master' (!25) from master into test
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#25
2023-02-23 19:22:05 +00:00
Juan Ferrer 9bfd42eaf8 refs #5122 Navigation improved, date shows year, fixes
gitea/hedera-web/pipeline/head This commit looks good Details
2023-02-23 20:19:56 +01:00
Juan Ferrer dd7185d5dd refs #5122 Backend fix: Return error code for user exceptions
gitea/hedera-web/pipeline/head This commit looks good Details
2023-02-23 17:05:19 +01:00
Juan Ferrer 10d8128133 refs #5122 Order check fixes
gitea/hedera-web/pipeline/head This commit looks good Details
2023-02-23 16:50:49 +01:00
Juan Ferrer b357c4a451 Merge pull request 'refs #5122 Version increased' (!24) from master into test
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#24
2023-02-23 13:40:14 +00:00
Juan Ferrer e5941266ed refs #5122 Version increased
gitea/hedera-web/pipeline/head This commit looks good Details
2023-02-23 14:36:36 +01:00
Juan Ferrer 592f79fcbd Merge pull request 'master' (!23) from master into test
gitea/hedera-web/pipeline/head There was a failure building this commit Details
Reviewed-on: verdnatura/hedera-web#23
2023-02-23 13:35:17 +00:00
Juan Ferrer 0abc6bdc23 refs #5122 Fix
gitea/hedera-web/pipeline/head There was a failure building this commit Details
2023-02-23 14:32:13 +01:00
Juan Ferrer 210b7e7806 Merge pull request 'refs #5253' (!22) from test into master
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#22
2023-02-23 09:30:42 +00:00
Juan Ferrer 92a4bc458c Merge pull request 'dev' (!21) from dev into test
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#21
2023-02-16 10:33:51 +00:00
Juan Ferrer 520e0c1eff refs #5161 Version increased
gitea/hedera-web/pipeline/head This commit looks good Details
2023-02-16 11:23:38 +01:00
Juan Ferrer afd23e08b7 Merge pull request 'refs #5122' (!20) from 5122-multipleBasket into dev
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#20
2023-02-15 19:57:41 +00:00
Juan Ferrer 18cdb4cc1b Merge branch 'dev' into 5122-multipleBasket
gitea/hedera-web/pipeline/head This commit looks good Details
2023-02-15 19:54:25 +00:00
Juan Ferrer ca5f80f6c3 refs #5122
gitea/hedera-web/pipeline/head This commit looks good Details
2023-02-15 17:18:54 +01:00
Juan Ferrer d1ff6889af Merge pull request '5122-multipleBasket' (!19) from 5122-multipleBasket into dev
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#19
2023-02-15 16:15:03 +00:00
Juan Ferrer a632a15242 refs #5122
gitea/hedera-web/pipeline/head This commit looks good Details
2023-02-15 17:13:25 +01:00
Juan Ferrer 67b6f77b12 refs #5122
gitea/hedera-web/pipeline/head This commit looks good Details
2023-02-15 14:07:09 +01:00
Juan Ferrer e8eab29887 Merge branch 'dev' into 5122-multipleBasket
gitea/hedera-web/pipeline/head This commit looks good Details
2023-02-14 17:10:34 +01:00
Juan Ferrer 326aeee127 Merge pull request 'test' (!18) from test into dev
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#18
2023-01-31 13:15:47 +00:00
Juan Ferrer bbb0089b59 Merge pull request 'master' (!17) from master into test
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#17
2023-01-31 13:15:19 +00:00
Juan Ferrer 406b2f8300 #4253 Hotfix: OutdatedVersionError not handled
gitea/hedera-web/pipeline/head This commit looks good Details
2023-01-31 14:09:01 +01:00
Juan Ferrer efc7342359 fixes #5174 Redsys TPV api migrated to salix
gitea/hedera-web/pipeline/head This commit looks good Details
2023-01-31 13:38:59 +01:00
Juan Ferrer 806c4cc3ad refs #5122 Checkpoint
gitea/hedera-web/pipeline/head This commit looks good Details
2023-01-30 11:08:26 +01:00
Juan Ferrer c463e967ca refs #3971 Form input locking when loading
gitea/hedera-web/pipeline/head This commit looks good Details
2023-01-16 16:57:48 +01:00
Juan Ferrer be43a38b38 refs #3971 Order confirm style fixes
gitea/hedera-web/pipeline/head This commit looks good Details
2023-01-16 14:18:07 +01:00
Juan Ferrer 59ed61ae9b refs #4253 Translation & UI fixes
gitea/hedera-web/pipeline/head This commit looks good Details
2023-01-16 13:59:11 +01:00
Juan Ferrer 17e54cfc60 Merge pull request 'test' (!16) from test into dev
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#16
2022-12-09 11:55:42 +00:00
Juan Ferrer baa9bb7cdf Merge pull request 'refs #3971 Fixes: Checkout, pay' (!15) from master into test
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#15
2022-12-09 11:55:18 +00:00
Juan Ferrer 87d75be910 refs #3971 Fixes: Checkout, pay
gitea/hedera-web/pipeline/head This commit looks good Details
2022-12-09 12:51:51 +01:00
Juan Ferrer ac629dc97b Merge pull request 'test' (!14) from test into dev
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#14
2022-12-05 09:21:44 +00:00
Juan Ferrer ff3320d590 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/hedera-web into test
gitea/hedera-web/pipeline/head This commit looks good Details
2022-12-02 19:24:38 +01:00
Juan Ferrer e8b727ab6c refs #4922 .quasar dir added to gitignore
gitea/hedera-web/pipeline/head This commit looks good Details
2022-12-02 09:18:09 +01:00
Juan Ferrer 5934ee3832 refs #3971 User supplant fixes
gitea/hedera-web/pipeline/head This commit looks good Details
2022-12-02 09:15:43 +01:00
Juan Ferrer 4f09574697 Merge pull request 'test' (!13) from test into dev
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#13
2022-12-01 08:07:57 +00:00
Juan Ferrer 6d95dfb999 Merge pull request 'master' (!12) from master into test
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#12
2022-12-01 08:07:08 +00:00
Juan Ferrer 1fa9b1e8b0 refs #3971 Order checkout hotfix
gitea/hedera-web/pipeline/head This commit looks good Details
2022-12-01 09:04:33 +01:00
Juan Ferrer 327508c3ee Merge pull request 'test' (!11) from test into master
gitea/hedera-web/pipeline/head This commit looks good Details
Reviewed-on: verdnatura/hedera-web#11
2022-12-01 07:54:27 +00:00
788 changed files with 53231 additions and 53393 deletions

View File

@ -1,9 +0,0 @@
root = true
[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

View File

@ -1,8 +0,0 @@
/dist
/src-bex/www
/src-capacitor
/src-cordova
/.quasar
/node_modules
.eslintrc.js
babel.config.js

View File

@ -1,86 +0,0 @@
module.exports = {
// https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy
// This option interrupts the configuration hierarchy at this file
// Remove this if you have an higher level ESLint config file (it usually happens into a monorepos)
root: true,
parserOptions: {
parser: '@babel/eslint-parser',
ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features
sourceType: 'module' // Allows for the use of imports
},
env: {
browser: true,
'vue/setup-compiler-macros': true
},
extends: ['standard'],
plugins: ['vue', 'prettier'],
globals: {
ga: 'readonly', // Google Analytics
cordova: 'readonly',
__statics: 'readonly',
__QUASAR_SSR__: 'readonly',
__QUASAR_SSR_SERVER__: 'readonly',
__QUASAR_SSR_CLIENT__: 'readonly',
__QUASAR_SSR_PWA__: 'readonly',
process: 'readonly',
Capacitor: 'readonly',
chrome: 'readonly'
},
// add your custom rules here
rules: {
// allow async-await
'generator-star-spacing': 'off',
// allow paren-less arrow functions
'arrow-parens': 'off',
'one-var': 'off',
'no-void': 'off',
'multiline-ternary': 'off',
'import/first': 'off',
'import/named': 'error',
'import/namespace': 'error',
'import/default': 'error',
'import/export': 'error',
'import/extensions': 'off',
'import/no-unresolved': 'off',
'import/no-extraneous-dependencies': 'off',
'prefer-promise-reject-errors': 'off',
semi: 'off',
// allow debugger during development only
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
},
overrides: [
{
files: ['src/**/*.{js,vue,scss}', 'quasar.config.js'], // Aplica ESLint solo a archivos .js, .vue y .scss dentro de src (Proyecto de quasar)
extends: [
// Base ESLint recommended rules
'eslint:recommended',
// Uncomment any of the lines below to choose desired strictness,
// but leave only one uncommented!
// See https://eslint.vuejs.org/rules/#available-rules
// 'plugin:vue/vue3-essential', // Priority A: Essential (Error Prevention)
'plugin:vue/vue3-strongly-recommended', // Priority B: Strongly Recommended (Improving Readability)
// 'plugin:vue/vue3-recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)
// https://github.com/prettier/eslint-config-prettier#installation
// usage with Prettier, provided by 'eslint-config-prettier'.
'prettier',
'plugin:cypress/recommended'
],
rules: {
semi: 'off',
'space-before-function-paren': 'off',
'prefer-promise-reject-errors': 'off',
'vue/no-multiple-template-root': 'off'
},
parserOptions: {
ecmaVersion: '2021'
},
plugins: ['vue']
}
]
};

15
.eslintrc.yml Normal file
View File

@ -0,0 +1,15 @@
extends: eslint:recommended
parserOptions:
ecmaVersion: 2017
sourceType: module
rules:
no-undef: 0
no-redeclare: 0
no-mixed-spaces-and-tabs: 0
no-console: 0
no-cond-assign: 0
no-unexpected-multiline: 0
brace-style: [error, 1tbs]
space-before-function-paren: [error, never]
padded-blocks: [error, never]
func-call-spacing: [error, never]

38
.gitignore vendored
View File

@ -1,36 +1,6 @@
build/
config.my.php
.DS_Store
.thumbs.db
node_modules
# Quasar core related directories
build/
dist/
config.my.php
.vscode/
.quasar
/dist
# Cordova related directories and files
/src-cordova/node_modules
/src-cordova/platforms
/src-cordova/plugins
/src-cordova/www
# Capacitor related directories and files
/src-capacitor/www
/src-capacitor/node_modules
# BEX related directories and files
/src-bex/www
/src-bex/js/core
# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# Editor directories and files
.idea
*.suo
*.ntvs*
*.njsproj
*.sln

3
.npmrc
View File

@ -1,3 +0,0 @@
# pnpm-related options
shamefully-hoist=true
strict-peer-dependencies=false

View File

@ -1,9 +0,0 @@
/* eslint-disable */
// https://github.com/michael-ciniawsky/postcss-load-config
module.exports = {
plugins: [
// to edit target browsers: use "browserslist" field in package.json
require('autoprefixer')
]
}

View File

@ -1,9 +0,0 @@
module.exports = {
printWidth: 80,
tabWidth: 4,
useTabs: false,
singleQuote: true,
bracketSpacing: true,
arrowParens: 'avoid',
trailingComma: 'none'
};

View File

@ -1,14 +0,0 @@
{
"recommendations": [
"dbaeumer.vscode-eslint",
"editorconfig.editorconfig",
"vue.volar",
"wayou.vscode-todo-highlight"
],
"unwantedRecommendations": [
"octref.vetur",
"hookyqr.beautify",
"dbaeumer.jshint",
"ms-vscode.vscode-typescript-tslint-plugin"
]
}

22
.vscode/launch.json vendored
View File

@ -1,22 +0,0 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Listen for XDebug",
"type": "php",
"request": "launch",
"port": 9000
},
{
"name": "Launch currently open script",
"type": "php",
"request": "launch",
"program": "${file}",
"cwd": "${fileDirname}",
"port": 9000
}
]
}

View File

@ -1,9 +0,0 @@
{
"editor.bracketPairColorization.enabled": true,
"editor.guides.bracketPairs": true,
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.codeActionsOnSave": ["source.fixAll.eslint"],
"eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"],
"cSpell.words": ["axios", "composables"]
}

View File

@ -1,5 +1,5 @@
# Not using buster because of bug: https://bugs.php.net/bug.php?id=78870
FROM debian:stretch-slim
FROM debian:bookworm-slim
ARG DEBIAN_FRONTEND=noninteractive
@ -23,19 +23,19 @@ RUN a2dissite 000-default
# NodeJs
RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
&& apt-get install -y --no-install-recommends nodejs
# Hedera
RUN curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \
&& echo "deb http://apt.verdnatura.es/ stretch main" \
RUN curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | tee /etc/apt/trusted.gpg.d/verdnatura.gpg \
&& echo "deb http://apt.verdnatura.es/ bookworm main" \
> /etc/apt/sources.list.d/vn.list \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
php-apcu \
php-image-text \
php-text-captcha \
php-apcu \
php-zip \
hedera-web \
cron

View File

@ -1,35 +1,58 @@
# Hedera
Hedera is the main web page for Verdnatura.
Hedera is the main web shop page for Verdnatura.
## Getting Started
## Prerequisites
Required dependencies.
Required applications.
* PHP >= 8.4
* Node.js >= 20.0
- PHP >= 7.0
- Node.js >= 18.0
Take a look to *debian/control* file to see additional dependencies.
Launch application for development.
Copy config.php to *config.my.php* and place your DB config there.
### Installing dependencies and launching
Pull from repository.
Run this commands on project root directory to install Node dependencies.
```
$ quasar dev
$ npm install
```
Install project dependences (debian/control).
Pull from repository [php-vn-lib](https://gitea.verdnatura.es/verdnatura/php-vn-lib) and install [dependences](https://gitea.verdnatura.es/verdnatura/php-vn-lib/src/branch/master/debian/control) of this project.
Configure config.php file.
Launch project fronted.
```
$ npm run front
```
Launch salix backend.
```
$ npm run db
$ npm run back
```
Launch project backend.
```
$ php -S 127.0.0.1:3002 -t . index.php
$ php -S 127.0.0.1:3001 -t . index.php
```
### Command line
Run server side method from command line.
```
$ php hedera-web.php -m method_path
$ php hedera-web.php -m method_path
```
## Built with
* [nodejs](https://nodejs.org/)
* [php](https://www.php.net/)
* [Webpack](https://webpack.js.org/)
* [MooTools](https://mootools.net/)
* [TinyMCE](https://www.tinymce.com/)
```

View File

@ -1,14 +0,0 @@
/* eslint-disable */
module.exports = api => {
return {
presets: [
[
'@quasar/babel-preset-app',
api.caller(caller => caller && caller.target === 'node')
? { targets: { node: 'current' } }
: {}
]
]
}
}

View File

@ -12,6 +12,8 @@
*
* - http://www.mydomain.org -> config.www.php
* - http://test.mydomain.org -> config.test.php
*
* Put the password in base64.
*/
return [
/**
@ -22,7 +24,7 @@ return [
,'port' => 3306
,'schema' => 'hedera'
,'user' => 'hedera-web'
,'pass' => ''
,'pass' => '' // base64 encoded
,'tz' => 'Europe/madrid'
]
];

View File

@ -1,32 +0,0 @@
const { defineConfig } = require('cypress');
module.exports = defineConfig({
e2e: {
baseUrl: 'http://localhost:8080/',
supportFile: 'src/test/cypress/support/index.js',
fixturesFolder: 'src/test/cypress/fixtures',
specPattern: 'src/test/cypress/integration/**/*.spec.js',
viewportHeight: 660,
viewportWidth: 1240,
experimentalMemoryManagement: true,
numTestsKeptInMemory: 0,
video: false,
screenshotOnRunFailure: false,
reporter: 'cypress-mochawesome-reporter',
reporterOptions: {
charts: true,
reportPageTitle: 'Hedera-Web E2E Reporter',
embeddedScreenshots: true,
reportDir: 'src/test/cypress/reports',
inlineAssets: true
},
setupNodeEvents(on, config) {
require('cypress-mochawesome-reporter/plugin')(on);
on('after:spec', (spec, results) => {
console.log('Finished running', spec.relative);
console.log('❌spec:', results.stats.failures);
console.log('✅spec:', results.stats.passes);
});
}
}
});

5
debian/changelog vendored Normal file
View File

@ -0,0 +1,5 @@
hedera-web (25.4.4) stable; urgency=low
* Initial Release.
-- Juan Ferrer Toribio <juan@verdnatura.es> Wed, 19 Aug 2015 12:00:00 +0200

1
debian/compat vendored Normal file
View File

@ -0,0 +1 @@
10

18
debian/control vendored Normal file
View File

@ -0,0 +1,18 @@
Source: hedera-web
Priority: optional
Maintainer: Juan Ferrer Toribio <juan@verdnatura.es>
Build-Depends: build-essential, debhelper, nodejs
Standards-Version: 3.9.3
Section: misc
Homepage: https://verdnatura.es
Vcs-Git: https://gitea.verdnatura.es/verdnatura/hedera-web
Package: hedera-web
Architecture: all
Depends: apache2 | httpd, nodejs, php-cli, php-vn-lib, php-apcu, php-imap, php-soap, libphp-phpmailer, php-gd, php-pear
Suggests: php-image-text, php-text-captcha, php-zip, cron
Section: misc
Priority: optional
Description: Verdnatura's web page
Web page used by Verdnatura, it includes user authetication, a simple CMS and
a webpshop.

24
debian/copyright vendored Normal file
View File

@ -0,0 +1,24 @@
Format: http://dep.debian.net/deps/dep5
Name: hedera-web
Source: https://gitea.verdnatura.es/verdnatura/hedera-web
Files: *
Copyright: 2011-2015 Juan Ferrer Toribio <juan@verdnatura.es>
License: GPL-3.0+
License: GPL-3.0+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
On Debian systems, the complete text of the GNU General Public
License can be found in "/usr/share/common-licenses/GPL-3".

8
debian/cron.d vendored Executable file
View File

@ -0,0 +1,8 @@
MAILTO=webmaster
*/1 * * * * root hedera-web.php -m misc/mail
*/2 * * * * root hedera-web.php -m edi/load
0 23 * * * root hedera-web.php -m edi/clean
0 5 * * * root hedera-web.php -m edi/update
0 0 * * * root hedera-web.php -m image/sync
0 1 * * * root /usr/share/hedera-web/utils/image-clean.sh > /dev/null
0 */1 * * * root /usr/share/hedera-web/utils/update-browscap.sh > /dev/null

19
debian/install vendored Normal file
View File

@ -0,0 +1,19 @@
apache.conf etc/hedera-web
config.php etc/hedera-web
php.ini etc/hedera-web
web usr/share/php/vn
doc/* usr/share/doc/hedera-web
hedera-web.php usr/share/hedera-web
forms usr/share/hedera-web
image usr/share/hedera-web
js usr/share/hedera-web
pages usr/share/hedera-web
reports usr/share/hedera-web
rest usr/share/hedera-web
utils usr/share/hedera-web
index.php usr/share/hedera-web
package.json usr/share/hedera-web
build usr/share/hedera-web
README.md usr/share/hedera-web
webpack.config.json usr/share/hedera-web
build-deps/node_modules usr/share/hedera-web

3
debian/links vendored Normal file
View File

@ -0,0 +1,3 @@
usr/share/hedera-web/hedera-web.php usr/bin/hedera-web.php
etc/hedera-web/apache.conf etc/apache2/conf-available/hedera-web.conf
etc/hedera-web/php.ini etc/php/8.2/apache2/conf.d/99-hedera-web.ini

16
debian/postinst vendored Executable file
View File

@ -0,0 +1,16 @@
#!/bin/bash
set -e
/usr/share/hedera-web/utils/update-browscap.sh > /dev/null
if [ -e /usr/share/apache2/apache2-maintscript-helper ]
then
. /usr/share/apache2/apache2-maintscript-helper
apache2_invoke enmod rewrite
apache2_invoke enmod headers
apache2_invoke enconf hedera-web.conf
fi
#service php7.3-fpm restart
#service cron restart

12
debian/postrm vendored Executable file
View File

@ -0,0 +1,12 @@
#!/bin/bash
set -e
if [ -e /usr/share/apache2/apache2-maintscript-helper ]
then
. /usr/share/apache2/apache2-maintscript-helper
apache2_invoke disconf hedera-web.conf
fi
#rm -rf /usr/share/hedera-web/node_modules
#service cron restart

18
debian/rules vendored Executable file
View File

@ -0,0 +1,18 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
%:
dh $@
clean:
npm run clean
dh_clean $@
build:
npm install --no-audit --prefer-offline
npm --omit=dev run build
mkdir -p build-deps
cp package.json package-lock.json build-deps
(cd build-deps && npm install --omit=dev --no-audit --prefer-offline)

1
debian/source.lintian-overrides vendored Normal file
View File

@ -0,0 +1 @@
hedera-web: package-contains-npm-ignore-file

BIN
doc/Htk.odg Executable file

Binary file not shown.

View File

@ -1,41 +1,9 @@
version: '3.7'
services:
main:
image: registry.verdnatura.es/hedera-web:${BRANCH_NAME:?}
image: registry.verdnatura.es/verdnatura/hedera-web:${TAG:?}
build:
context: .
dockerfile: Dockerfile
args:
- VERSION=${VERSION:?}
ports:
- 80
configs:
- source: config
target: /etc/hedera-web/config.my.php
volumes:
- /mnt/appdata:/mnt/storage
- /mnt/appdata/image:/var/lib/hedera-web/image-db
- /mnt/appdata/vn-access:/var/lib/hedera-web/vn-access
deploy:
replicas: ${MAIN_REPLICAS:?}
placement:
constraints:
- node.role == worker
cron:
image: registry.verdnatura.es/hedera-web:${BRANCH_NAME:?}
command: 'cron -f'
configs:
- source: config
target: /etc/hedera-web/config.my.php
volumes:
- /mnt/appdata:/mnt/storage
- /mnt/appdata/image:/var/lib/hedera-web/image-db
deploy:
replicas: ${CRON_REPLICAS:?}
placement:
constraints:
- node.role == worker
configs:
config:
external: true
name: ${PROJECT_NAME:?}-${BRANCH_NAME:?}

View File

@ -0,0 +1,43 @@
import './style.scss';
export default new Class({
Extends: Hedera.Form,
Template: require('./ui.xml')
,activate() {
this.$.userModel.setInfo('c', 'myClient', 'hedera');
this.$.addresses.setInfo('a', 'myAddress', 'hedera');
}
,onAddAddressClick() {
this.hash.setAll({
form: 'account/address',
address: 0
});
}
,onReturnClick() {
window.history.back();
}
,onSetDefaultClick(event, addressId) {
if (event.defaultPrevented) return;
this.$.defaultAddress.value = addressId;
Htk.Toast.showMessage(_('DefaultAddressModified'));
}
,async onRemoveAddressClick(form) {
if (confirm(_('AreYouSureDeleteAddress'))) {
await form.set('isActive', false);
await form.refresh();
}
}
,onEditAddressClick(address) {
this.hash.setAll({
form: 'account/address',
address
});
}
});

View File

@ -0,0 +1,8 @@
Addresses: Adreces
Return: Tornar
AddAddress: Afegir adreça
SetAsDefault: Establir com per defecte
RemoveAddress: Esborrar direcció
EditAddress: Modificar direcció
AreYouSureDeleteAddress: Estàs segur de que vols eliminar la direcció?
DefaultAddressModified: Adreça per defecte modificada

View File

@ -0,0 +1,8 @@
Addresses: Addresses
Return: Return
AddAddress: Add address
SetAsDefault: Set as default
RemoveAddress: Remove address
EditAddress: Edit address
AreYouSureDeleteAddress: Are you sure you want to delete the address?
DefaultAddressModified: Default address modified

View File

@ -0,0 +1,8 @@
Addresses: Direcciones
Return: Volver
AddAddress: Añadir dirección
SetAsDefault: Establecer como predeterminada
RemoveAddress: Borrar dirección
EditAddress: Modificar dirección
AreYouSureDeleteAddress: ¿Estás seguro de que quieres borrar la dirección?
DefaultAddressModified: Dirección por defecto modificada

View File

@ -0,0 +1,8 @@
Addresses: Adresses
Return: Retour
AddAddress: Ajouter une adresse
SetAsDefault: Définir par défaut
RemoveAddress: Supprimer l'adresse
EditAddress: Changement d'adresse
AreYouSureDeleteAddress: Souhaitez-vous vraiment supprier l'adresse?
DefaultAddressModified: Adresse par défaut modifiée

View File

@ -0,0 +1,8 @@
Addresses: Moradas
Return: Voltar
AddAddress: Adicionar Morada
SetAsDefault: Selecionar como pre-determinado
RemoveAddress: Eliminar Morada
EditAddress: Modificar Morada
AreYouSureDeleteAddress: Tens certeza que queres eliminar esta morada?
DefaultAddressModified: Endereço padrão modificado

View File

@ -0,0 +1,6 @@
hedera-address-list {
.htk-list .side {
padding-right: 16px;
}
}

View File

@ -0,0 +1,70 @@
<vn>
<vn-group>
<db-form id="user-form">
<db-model property="model" id="user-model" updatable="true">
SELECT id, defaultAddressFk
FROM myClient c
</db-model>
</db-form>
<db-model id="addresses" updatable="true">
SELECT a.id, a.nickname, p.name province, a.postalCode,
a.city, a.street, a.isActive
FROM myAddress a
LEFT JOIN vn.province p ON p.id = a.provinceFk
WHERE a.isActive
</db-model>
</vn-group>
<div id="title">
<h1><t>Addresses</t></h1>
</div>
<div id="actions">
<htk-bar-button
icon="add"
tip="_AddAddress"
on-click="this.onAddAddressClick()"/>
</div>
<div id="form" class="hedera-address-list">
<div class="box vn-w-sm">
<htk-radio-group
id="default-address"
column="defaultAddressFk"
form="user-form"/>
<htk-repeater model="addresses" form-id="address" class="htk-list">
<custom>
<div class="item clickable" on-click="this.onSetDefaultClick($event, address.id)">
<div class="side">
<htk-radio
radio-group="default-address"
val="{{address.id}}"
tip="_SetAsDefault"
name="test"/>
</div>
<div class="content">
<p class="important">
{{address.nickname}}
</p>
<p>
{{address.street}}
</p>
<p>
{{address.postalCode}}, {{address.city}}
</p>
</div>
<div
class="actions"
on-click="$event.preventDefault()">
<htk-button
icon="delete"
tip="_RemoveAddress"
on-click="this.onRemoveAddressClick($iter)"/>
<htk-button
icon="edit"
tip="_EditAddress"
on-click="this.onEditAddressClick(address.id)"/>
</div>
</div>
</custom>
</htk-repeater>
</div>
</div>
</vn>

View File

@ -0,0 +1,20 @@
export default new Class({
Extends: Hedera.Form,
Template: require('./ui.xml'),
activate() {
this.$.model.setInfo('a', 'myAddress', 'hedera', ['id'], 'id');
this.$.model.setDefault('clientFk', 'a',
new Sql.Function({schema: 'account', name: 'myUser_getId'}));
},
onStatusChange() {
if (this.$.iter.ready && this.hash.$.address == 0)
this.$.iter.insertRow();
},
onOperationsDone() {
Htk.Toast.showMessage(_('AddressChangedSuccessfully'));
window.history.back()
}
});

View File

@ -0,0 +1,10 @@
AddEditAddress: Afegir o modificar adreça
Name: Consignatari
Address: Direcció
City: Ciutat
ZipCode: Codi postal
Country: País
Province: Província
Return: Tornar
Accept: Acceptar
AddressChangedSuccessfully: Adreça modificada correctament

View File

@ -0,0 +1,10 @@
AddEditAddress: Add or edit address
Name: Consignee
Address: Address
City: City
ZipCode: Zip code
Country: Country
Province: Province
Return: Return
Accept: Accept
AddressChangedSuccessfully: Address changed successfully

View File

@ -0,0 +1,10 @@
AddEditAddress: Añadir o modificar dirección
Name: Consignatario
Address: Dirección
City: Ciudad
ZipCode: Código postal
Country: País
Province: Provincia
Return: Volver
Accept: Aceptar
AddressChangedSuccessfully: Dirección modificada correctamente

View File

@ -0,0 +1,10 @@
AddEditAddress: Ajouter ou modifier l'adresse
Name: Destinataire
Address: Numéro Rue
City: Ville
ZipCode: Code postal
Country: Pays
Province: Province
Return: Reviens
Accept: Accepter
AddressChangedSuccessfully: Adresse modifié avec succès

View File

@ -0,0 +1,10 @@
AddEditAddress: Adicionar ou modificar morada
Name: Consignatario
Address: Morada
City: Concelho
ZipCode: Código postal
Country: País
Province: Distrito
Return: Voltar
Accept: Aceitar
AddressChangedSuccessfully: Morada modificada corretamente

View File

@ -0,0 +1,87 @@
<vn>
<vn-group>
<vn-lot-query id="params">
<vn-spec name="address" type="Number"/>
</vn-lot-query>
<db-form id="iter" on-status-changed="this.onStatusChange()">
<db-model
id="model"
property="model"
updatable="true"
mode="ON_DEMAND"
lot="params"
on-operations-done="this.onOperationsDone()">
SELECT a.id, a.street, a.nickname, a.city,
a.postalCode, a.provinceFk, p.countryFk
FROM myAddress a
LEFT JOIN vn.province p ON p.id = a.provinceFk
WHERE a.id = #address
</db-model>
</db-form>
</vn-group>
<div id="title">
<h1><t>Configuration</t></h1>
</div>
<div id="actions">
<htk-bar-button
icon="close"
tip="_Return"
on-click="window.history.back()"/>
<htk-bar-button
icon="check"
tip="_Accept"
on-click="iter.performOperations()"/>
</div>
<div id="form" class="hedera-address">
<div class="form box vn-w-sm vn-pa-lg">
<h5 class="vn-mb-md">
<t>AddEditAddress</t>
</h5>
<div class="form-group">
<htk-entry
placeholder="_Name"
form="iter" column="nickname"/>
</div>
<div class="form-group">
<htk-entry
placeholder="_Address"
form="iter" column="street"/>
</div>
<div class="form-group">
<htk-entry
placeholder="_City"
form="iter" column="city"/>
</div>
<div class="form-group">
<htk-entry
placeholder="_ZipCode"
form="iter" column="postalCode"/>
</div>
<div class="form-group">
<htk-combo
placeholder="_Country"
form="iter" column="countryFk"
id="country"
one-way="true"
one-time="true">
<db-model property="model">
SELECT id, name FROM vn.country
ORDER BY name
</db-model>
</htk-combo>
</div>
<div class="form-group">
<htk-combo
placeholder="_Province"
column="provinceFk"
form="iter">
<db-model property="model" lot="country">
SELECT id, name FROM vn.province
WHERE countryFk = #id
ORDER BY name
</db-model>
</htk-combo>
</div>
</div>
</div>
</vn>

View File

@ -0,0 +1,13 @@
import './style.scss';
export default new Class({
Extends: Hedera.Form,
Template: require('./ui.xml'),
activate() {
this.$.userModel.setInfo('c', 'myClient', 'hedera');
this.$.userModel.setInfo('u', 'myUser', 'account');
this.$.changePassword.conn = this.conn
this.$.changePassword.user = this.gui.user
}
});

View File

@ -0,0 +1,26 @@
Configuration: Configuració
Personal information: Dades personals
Username: Nom d'usuari
Password: Contrasenya
Email: Correu electrònic
Display name: Nom a mostrar
Language: Idioma
Billing: Facturació
Receive invoices by email: Rebre factures per correu electrònic
Old password: Contrasenya antiga
New password: Nova contrasenya
Repeat password: Repetir contrasenya
Requirements: Requisits
Modify: Modificar
Password requirements: Requisits de contrasenya
characters long: caràcters de longitud
alphabetic characters: caràcters alfabètics
capital letters: majúscules
digits: dígits
symbols: símbols
Password changed!: Contrasenya modificada!
Password doesn't meet the requirements: ''
Passwords doesn't match: Les contrasenyes no coincideixen!
Passwords empty: Les contrasenyes en blanc
Addresses: Adreces
Change password: Canvia la contrasenya

View File

@ -0,0 +1,26 @@
Configuration: Configuration
Personal information: Personal information
Username: Username
Password: Password
Email: Email
Display name: Display name
Language: Language
Billing: Billing
Receive invoices by email: Receive invoices by email
Old password: Old password
New password: New password
Repeat password: Repeat password
Requirements: Requirements
Modify: Modify
Password requirements: Password requirements
characters long: characters long
alphabetic characters: alphabetic characters
capital letters: capital letters
digits: digits
symbols: 'symbols. Ej: $%&.'
Password changed!: Password changed!
Password doesn't meet the requirements: 'Password doesn''t meet the requirements, press info button for more details'
Passwords doesn't match: Passwords doesn't match
Passwords empty: Passwords empty
Addresses: Addresses
Change password: Change password

View File

@ -0,0 +1,28 @@
Configuration: Configuración
Personal information: Datos personales
Username: Nombre de usuario
Password: Contraseña
Email: Correo electrónico
Display name: Nombre a mostrar
Language: Idioma
Billing: Facturación
Receive invoices by email: Recibir facturas por correo electrónico
Old password: Contaseña antigua
New password: Nueva contraseña
Repeat password: Repetir contraseña
Requirements: Requisitos
Modify: Modificar
Password requirements: Requisitos de constraseña
characters long: carácteres de longitud
alphabetic characters: carácteres alfabéticos
capital letters: letras mayúsculas
digits: dígitos
symbols: 'símbolos. Ej: $%&.'
Password changed!: ¡Contraseña modificada!
Password doesn't meet the requirements: >-
La nueva contraseña no reune los requisitos de seguridad necesarios, pulsa en
info para más detalle
Passwords doesn't match: ¡Las contraseñas no coinciden!
Passwords empty: Contraseña vacía
Addresses: Direcciones
Change password: Cambiar contraseña

View File

@ -0,0 +1,26 @@
Configuration: Configuration
Personal information: Informations personnelles
Username: Utilisateur
Password: Mot de passe
Email: Courriel
Display name: Nom à afficher
Language: Langage
Billing: Facturation
Receive invoices by email: Recevoir des factures par e-mail
Old password: Ancien mot de passe
New password: Nouveau mot de passe
Repeat password: Répéter le mot de passe
Requirements: Exigences
Modify: Modifier
Password requirements: Mot de passe exigences
characters long: Longs caractères
alphabetic characters: les caractères alphabétiques
capital letters: lettres majuscules
digits: chiffres
symbols: 'symboles. Ej: $%&.'
Password changed!: Mot de passe modifié!
Password doesn't meet the requirements: ''
Passwords doesn't match: Les mots de passe ne correspondent pas!
Passwords empty: ''
Addresses: Adresses
Change password: Changer le mot de passe

View File

@ -0,0 +1,26 @@
Configuration: Configuração
Personal information: Dados pessoais
Username: Nome de usuario
Password: Palavra-passe
Email: E-Mail
Display name: Nome para mostrar
Language: Idioma
Billing: Facturação
Receive invoices by email: Receber facturas por e-mail
Old password: Palavra-passe antiga
New password: Nova Palavra-passe
Repeat password: Repetir Palavra-passe
Requirements: Requisitos
Modify: Modificar
Password requirements: Requisitos de Palavra-passe
characters long: caracteres
alphabetic characters: caracteres alfabéticos
capital letters: letras maiúsculas
digits: dígitos
symbols: 'símbolos. Ej: $%&.'
Password changed!: Palavra-passe Modificada!
Password doesn't meet the requirements: Palavra-passe não atende aos requisitos
Passwords doesn't match: As Palavras-Passe não coincidem!
Passwords empty: Palavra-passe vazia
Addresses: Moradas
Change password: Mudar Palavra-passe

View File

@ -0,0 +1,4 @@
.pass-info ul {
list-style-type: none;
}

72
forms/account/conf/ui.xml Normal file
View File

@ -0,0 +1,72 @@
<vn>
<vn-group>
<db-form id="user-form">
<db-model property="model" id="user-model" updatable="true">
SELECT u.id, u.name, u.email, u.nickname,
u.lang, c.isToBeMailed, c.id clientFk
FROM account.myUser u
LEFT JOIN myClient c
ON u.id = c.id
</db-model>
</db-form>
</vn-group>
<div id="title">
<h1><t>Configuration</t></h1>
</div>
<div id="actions">
<htk-bar-button
icon="place"
tip="_Addresses"
on-click="hash.setAll({form: 'account/address-list'})"/>
<htk-bar-button
icon="lock_reset"
tip="_Change password"
on-click="this.$.changePassword.open()"/>
</div>
<div id="form" class="conf">
<div class="form box vn-w-sm vn-pa-lg">
<h5 class="vn-mb-md">
<t>Personal information</t>
</h5>
<div class="form-group">
<htk-entry
placeholder="_Username"
disabled="true"
form="user-form"
column="name"/>
</div>
<div class="form-group">
<htk-entry
placeholder="_Email"
form="user-form"
column="email">
</htk-entry>
</div>
<div class="form-group">
<htk-entry
placeholder="_Display name"
form="user-form"
column="nickname"/>
</div>
<div class="form-group">
<htk-combo
placeholder="_Language"
form="user-form"
column="lang">
<db-model property="model">
<custom>
SELECT code, name FROM language WHERE isActive
</custom>
</db-model>
</htk-combo>
</div>
<div class="form-group">
<label>
<htk-check form="user-form" column="isToBeMailed"/>
<t>Receive invoices by email</t>
</label>
</div>
</div>
</div>
<htk-change-password id="change-password"/>
</vn>

View File

@ -0,0 +1,7 @@
import './style.scss';
export default new Class({
Extends: Hedera.Form,
Template: require('./ui.xml')
});

View File

@ -0,0 +1,11 @@
AccessLog: Registre d'accessos
'UserNumber:': 'N d''usuari:'
'User:': 'Usuari:'
'Phone:': 'Telèfon:'
'Mobile:': 'Mòbil:'
Access: Accés
OS: SO
Browser: Navegador
Version: Versió
Javascript: Javascript
Cookies: Cookies

View File

@ -0,0 +1,11 @@
AccessLog: Access log
'UserNumber:': 'User Number:'
'User:': 'User:'
'Phone:': 'Phone:'
'Mobile:': 'Mobile:'
Access: Access
OS: OS
Browser: Browser
Version: Version
Javascript: Javascript
Cookies: Cookies

View File

@ -0,0 +1,11 @@
AccessLog: Registro de accesos
'UserNumber:': 'Nº usuario:'
'User:': 'Usuario:'
'Phone:': 'Teléfono:'
'Mobile:': 'Móvil:'
Access: Acceso
OS: SO
Browser: Navegador
Version: Versión
Javascript: Javascript
Cookies: Cookies

View File

@ -0,0 +1,11 @@
AccessLog: Fiche d'accès
'UserNumber:': 'Numéro utilisateur:'
'User:': 'Utilisateur:'
'Phone:': 'Téléphone:'
'Mobile:': 'Portable:'
Access: Accès
OS: OS
Browser: Navigateur
Version: Version
Javascript: Javascript
Cookies: Cookies

View File

@ -0,0 +1,11 @@
AccessLog: Registro de acessos
'UserNumber:': 'Nº utilizador:'
'User:': 'Utilizador:'
'Phone:': 'Telefone:'
'Mobile:': 'Telemóvel:'
Access: Acceso
OS: OS
Browser: Navegador
Version: Versão
Javascript: Javascript
Cookies: Cookies

View File

@ -0,0 +1,12 @@
.access-log .form > p {
font-size: 1.2rem;
margin: .1em 0;
}
/* List */
.access-log .htk-list {
margin-top: 16px;
}

View File

@ -0,0 +1,50 @@
<vn>
<vn-group>
<db-form v-model="user">
<db-model property="model" lot="hash">
SELECT u.id, u.name user, u.nickname, u.email, c.phone, r.name role
FROM account.user u
JOIN account.role r ON r.id = u.role
LEFT JOIN vn.client c ON c.id = u.id
WHERE u.id = #user
</db-model>
</db-form>
</vn-group>
<div id="title">
<h1><t>AccessLog</t></h1>
</div>
<div id="form" class="access-log">
<div class="box vn-w-xs vn-pa-lg">
<div class="form">
<h4>{{user.nickname}}</h4>
<p>#{{user.id}} - {{user.user}}</p>
<p>{{user.role}}</p>
<p>{{user.email}}</p>
<p>{{user.phone}}</p>
</div>
</div>
<htk-repeater form-id="iter" class="box vn-w-xs htk-list vn-mt-md">
<db-model property="model" lot="hash">
SELECT u.stamp, a.platform, a.browser, a.version, a.javascript, a.cookies
FROM visitUser u
JOIN visitAccess c ON c.id = u.accessFk
JOIN visitAgent a ON a.id = c.agentFk
WHERE u.userFk = #user
ORDER BY u.stamp DESC
LIMIT 8
</db-model>
<custom>
<div class="item">
<div class="content">
<p>
{{Vn.Value.format(iter.stamp, _('%a, %e %b %Y at %T'))}}
</p>
<p>
{{iter.platform}} - {{iter.browser}} {{iter.version}}
</p>
</div>
</div>
</custom>
</htk-repeater>
</div>
</vn>

View File

@ -0,0 +1,33 @@
import './style.scss';
export default new Class({
Extends: Hedera.Form,
Template: require('./ui.xml')
,_timeoutId: null
,onModelStatusChange() {
if (!this.$.sessions.ready)
return;
if (this._timeoutId)
clearTimeout(this._timeoutId);
this._timeoutId = setTimeout(
() => this.$.sessions.refresh(), 60000);
}
,deactivate() {
clearTimeout(this._timeoutId);
}
,async onChangeUserClick(userName) {
await this.gui.supplantUser(userName);
this.hash.setAll({form: 'ecomerce/orders'});
}
,sessionsFunc() {
return 1;
}
});

View File

@ -0,0 +1,4 @@
Connections: Connexions
Refresh: Actualitzar
Visits: Visites
connections: connexions

View File

@ -0,0 +1,4 @@
Connections: Connections
Refresh: Refresh
Visits: Visits
connections: connections

View File

@ -0,0 +1,4 @@
Connections: Conexiones
Refresh: Actualizar
Visits: Visitas
connections: conexiones

View File

@ -0,0 +1,4 @@
Connections: Connexions
Refresh: Actualiser
Visits: Visites
connections: connexions

View File

@ -0,0 +1,4 @@
Connections: холболт
Refresh: Сэргээх
Visits: уулзалт
connections: холболт

View File

@ -0,0 +1,4 @@
Connections: Conexões
Refresh: actualização
Visits: Visualizações
connections: conexões

View File

@ -0,0 +1,9 @@
.action-bar .connections-sum {
padding: .4em;
background-color: #1e88e5;
border-radius: .1em;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}

View File

@ -0,0 +1,63 @@
<vn>
<div id="title">
<h1><t>Connections</t></h1>
</div>
<div id="actions">
<htk-bar-button
icon="refresh"
tip="_Refresh"
on-click="sessions.refresh()"/>
<div class="connections-sum">
<htk-text>
<db-calc-sum
property="param"
model="sessions"
func="sessionsFunc"/>
</htk-text>
<t>connections</t>
</div>
</div>
<div id="form" class="connections">
<htk-repeater form-id="iter" class="box htk-list vn-w-xs">
<db-model
property="model"
id="sessions"
on-status-changed="this.onModelStatusChange()">
SELECT vu.userFk userId, vu.stamp, u.nickname, s.lastUpdate,
a.platform, a.browser, a.version, u.name user
FROM userSession s
JOIN visitUser vu ON vu.id = s.userVisitFk
JOIN visitAccess ac ON ac.id = vu.accessFk
JOIN visitAgent a ON a.id = ac.agentFk
JOIN visit v ON v.id = a.visitFk
JOIN account.user u ON u.id = vu.userFk
ORDER BY lastUpdate DESC
</db-model>
<custom>
<a class="item"
href="{{`#!form=admin/access-log&amp;user=${iter.userId}`}}"
title="_Access log">
<div class="content">
<p class="important">
{{iter.nickname}}
</p>
<p>
{{Vn.Value.format(iter.stamp, '%a, %T')}} -
{{Vn.Value.format(iter.lastUpdate, '%T')}}
</p>
<p>
{{iter.platform}} - {{iter.browser}} {{iter.version}}
</p>
</div>
<div class="actions"
on-click="$event.preventDefault()">
<htk-button
tip="_Supplant user"
icon="supervisor_account"
on-click="this.onChangeUserClick(iter.user)"/>
</div>
</a>
</custom>
</htk-repeater>
</div>
</vn>

View File

@ -0,0 +1,10 @@
import './style.scss';
export default new Class({
Extends: Hedera.Form,
Template: require('./ui.xml'),
activate() {
this.$.items.setInfo('i', 'item', 'vn', ['id']);
}
});

View File

@ -0,0 +1,2 @@
Items: Artícles
Enter a search term: Introdueix un terme de cerca

View File

@ -0,0 +1,2 @@
Items: Items
Enter a search term: Enter a search term

View File

@ -0,0 +1,2 @@
Items: Artículos
Enter a search term: Introduce un término de búsqueda

View File

@ -0,0 +1,2 @@
Items: Articles
Enter a search term: Entrez un terme de recherche

View File

@ -0,0 +1,2 @@
Items: Ítens
Enter a search term: Digite um termo de pesquisa

View File

@ -0,0 +1,6 @@
.items .item .photo {
border-radius: 10px;
height: 80px;
width: 80px;
}

57
forms/admin/items/ui.xml Normal file
View File

@ -0,0 +1,57 @@
<vn>
<div id="title">
<h1><t>Items</t></h1>
</div>
<div id="actions">
<htk-search-entry form="hash" column="search"/>
</div>
<div id="form" class="items">
<htk-repeater
class="htk-list rows box vn-w-xs"
form-id="iter"
empty-message="_Enter a search term">
<db-model property="model" id="items" lot="hash">
SELECT i.id, i.longName, i.size, i.category,
i.value5, i.value6, i.value7,
i.image, im.updated
FROM vn.item i
LEFT JOIN image im
ON im.collectionFk = 'catalog'
AND im.name = i.image
WHERE i.isActive
AND (i.longName LIKE CONCAT('%', #search, '%') OR i.id = #search)
ORDER BY i.longName LIMIT 50
</db-model>
<custom>
<div class="item">
<div class="side vn-mr-md">
<htk-image
form="$iter"
column="image"
stamp-column="updated"
class="photo"
directory="catalog"
subdir="200x200"
full-dir="1600x900"
editable="true"
conn="conn"/>
</div>
<div class="content">
<p class="important">
{{iter.longName}}
</p>
<p class="tags">
{{iter.value5}} {{iter.value6}} {{iter.value7}}
</p>
<p>
{{iter.id}}
</p>
<p>
{{iter.image}}
</p>
</div>
</div>
</custom>
</htk-repeater>
</div>
</vn>

View File

@ -0,0 +1,7 @@
import './style.scss';
export default new Class({
Extends: Hedera.Form,
Template: require('./ui.xml')
});

View File

@ -0,0 +1,3 @@
ControlPanel: Panell de control
Module: Mòdul
Description: Descripció

View File

@ -0,0 +1,3 @@
ControlPanel: Control panel
Module: Module
Description: Description

View File

@ -0,0 +1,3 @@
ControlPanel: Panel de control
Module: Módulo
Description: Descripción

View File

@ -0,0 +1,3 @@
ControlPanel: Panneau de configuration
Module: Module
Description: Description

View File

@ -0,0 +1,3 @@
ControlPanel: Painel de controle
Module: Módulo
Description: Descrição

View File

@ -0,0 +1,50 @@
.cpanel .items > div {
max-width: 900px;
display: flex;
flex-wrap: wrap;
justify-content: center;
gap: 16px;
margin: 0 auto;
}
.cpanel .item {
display: flex;
flex-direction: column;
align-items: center;
margin: 0;
width: 140px;
padding: 15px;
text-align: center;
transition: background-color 250ms ease-out;
}
.cpanel .item:hover {
background-color: rgba(1, 1, 1, 0.05);
}
.cpanel .item > .htk-image {
display: flex;
justify-content: center;
align-items: center;
margin: 0;
float: left;
height: 80px;
}
.cpanel .item > .htk-image > img {
max-height: 60px;
max-width: 60px;
padding: 0;
}
.cpanel .item > h6 {
flex: none;
margin: .1em 0;
font-size: .9rem;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
.cpanel .item > .text-secondary {
flex: none;
margin: 0;
font-size: .8rem;
height: 40px;
overflow: hidden;
}

31
forms/admin/links/ui.xml Normal file
View File

@ -0,0 +1,31 @@
<vn>
<div id="title">
<h1><t>ControlPanel</t></h1>
</div>
<div id="form" class="cpanel">
<htk-repeater form-id="iter" class="items">
<db-model property="model">
<custom>
SELECT image, name, description, link FROM link
ORDER BY name
</custom>
</db-model>
<custom>
<a class="item box"
href="{{iter.link}}"
target="_blank">
<htk-image
value="{{iter.image}}"
directory="link"
subdir="full"/>
<h6>
{{iter.name}}
</h6>
<p class="text-secondary">
{{iter.description}}
</p>
</a>
</custom>
</htk-repeater>
</div>
</vn>

201
forms/admin/photos/index.js Normal file
View File

@ -0,0 +1,201 @@
import './style.scss';
var Status = {
NONE : 0
,WAITING : 1
,UPLOADING : 2
,UPLOADED : 3
};
export default new Class({
Extends: Hedera.Form,
Template: require('./ui.xml')
,filesData: []
,uploadCount: 0
,isUploading: false
,activate() {
this.$.schema.value = 'catalog';
}
,addFiles(files) {
if (!files)
return;
for (var i = 0; i < files.length; i++)
this.addFile(files[i]);
}
,addFile(file) {
var doc = document;
var li = doc.createElement('div');
var div = doc.createElement('div');
div.className = 'thumb';
li.appendChild(div);
var thumb = doc.createElement('img');
thumb.file = file;
div.appendChild(thumb);
var reader = new FileReader();
reader.onload = function(e) {
thumb.src = e.target.result;
};
reader.readAsDataURL(file);
var name = doc.createElement('input');
name.type = 'text';
name.value = getFileName(file.name);
li.appendChild(name);
var statusNode = doc.createElement('div');
statusNode.className = 'status';
li.appendChild(statusNode);
var fileData = {
li: li,
file: file,
name: name,
statusNode: statusNode
};
var button = new Htk.Button({
tip: 'Remove',
icon: 'delete'
});
button.node.addEventListener('click',
() => this.onFileRemove(fileData));
li.appendChild(button.node);
this.filesData.push(fileData);
this.$.fileList.appendChild(li);
this.setImageStatus(fileData, Status.NONE, 'add', _('Pending upload'));
}
,async onUploadClick() {
if (this.isUploading) return;
const uploadQueue = [];
let hasFiles = false;
for (const fileData of this.filesData) {
if (fileData.status !== Status.NONE) continue;
this.setImageStatus(
fileData, Status.WAITING, 'cloud_upload', _('Waiting for upload'));
fileData.name.disabled = true;
uploadQueue.push(fileData);
hasFiles = true;
}
if (!hasFiles) {
Htk.Toast.showWarning(_('There are no files to upload'));
return;
}
this.isUploading = true;
let hasErrors = false;
for (const fileData of uploadQueue) {
this.setImageStatus(
fileData, Status.UPLOADING, 'upload', _('Uploading file'));
const formData = new FormData();
formData.append('updateMatching', this.$.updateMatching.value);
formData.append('image', fileData.file);
formData.append('name', fileData.name.value);
formData.append('schema', this.$.schema.value);
formData.append('srv', 'json:image/upload');
try {
await this.conn.sendFormData(formData);
this.setImageStatus(
fileData, Status.UPLOADED, 'cloud_done', _('Image uploaded'));
} catch(err) {
this.setImageStatus(
fileData, Status.NONE, 'error', err.message);
fileData.name.disabled = false;
hasErrors = true;
}
}
this.isUploading = false;
if (hasErrors)
Htk.Toast.showError(_('Some errors happened on upload'));
else
Htk.Toast.showMessage(_('Upload finished successfully'));
}
,setImageStatus(fileData, status, icon, title) {
fileData.status = status;
var statusNode = fileData.statusNode;
Vn.Node.removeChilds(statusNode);
var iconNode = new Htk.Icon({name: icon});
statusNode.appendChild(iconNode.node);
statusNode.title = title ? title : '';
}
,onFileRemove(fileData) {
this.$.fileList.removeChild(fileData.li);
for (var i = 0; i < this.filesData.length; i++)
if (this.filesData[i] === fileData) {
this.filesData.splice(i, 1);
break;
}
}
,onClearClick() {
this.filesData = [];
Vn.Node.removeChilds(this.$.fileList);
}
,onDropzoneClick() {
this.$.file.click();
}
,onFileChange() {
this.addFiles(this.$.file.files);
}
,onDragEnter() {
this.$.dropzone.classList.add('dragover');
}
,onDragLeave() {
this.$.dropzone.classList.remove('dragover');
}
,onDragOver(event) {
event.preventDefault();
}
,onDragEnd(event) {
this.$.dropzone.classList.remove('dragover');
event.dataTransfer.clearData();
}
,onDrop(event) {
event.preventDefault();
this.addFiles(event.dataTransfer.files);
}
});
function getFileName(path) {
var barIndex = path.lastIndexOf('/');
if (barIndex === -1)
barIndex = path.lastIndexOf('\\');
if (barIndex === -1)
barIndex = 0;
var dotIndex = path.lastIndexOf('.');
if (dotIndex === -1)
dotIndex = 0;
return path.substr(barIndex, dotIndex);
}

View File

@ -0,0 +1,13 @@
Images: Imatges
Collection: Col·lecció
Click or drop files here: Prem o deixa anar els arxius aquí
Pending upload: Pujada pendent
Update items with matching id: Actualitzar els elements amb id coincident
Clear all: Netejar tot
Upload files: Pujar arxius
Waiting for upload: Esperant per pujar
Uploading file: Pujant fitxer
Image uploaded: Imatge pujada
Upload finished successfully: Imatges pujades correctament
Some errors happened on upload: Van ocórrer errors en pujar alguna de les imatges
There are no files to upload: No s'ha seleccionat arxius per pujar

View File

@ -0,0 +1,13 @@
Images: Images
Collection: Collection
Click or drop files here: Click or drop files here
Pending upload: Pending upload
Update items with matching id: Update items with matching id
Clear all: Clear all
Upload files: Upload files
Waiting for upload: Waiting for upload
Uploading file: Uploading file
Image uploaded: Image uploaded
Upload finished successfully: Upload finished successfully
Some errors happened on upload: Some errors happened on upload
There are no files to upload: There are no files to upload

View File

@ -0,0 +1,13 @@
Images: Imágenes
Collection: Colección
Click or drop files here: Pulsa o suelta los archivos aquí
Pending upload: Subida pendiente
Update items with matching id: Actualizar ítems con id coincidente
Clear all: Limpiar todo
Upload files: Subir archivos
Waiting for upload: Esperando para subir
Uploading file: Subiendo fichero
Image uploaded: Imagen subida
Upload finished successfully: Imágenes subidas correctamente
Some errors happened on upload: Ocurrieron errores al subir alguna de las imágenes
There are no files to upload: No se han seleccionado archivos para subir

View File

@ -0,0 +1,13 @@
Images: Images
Collection: Collection
Click or drop files here: Cliquez ici ou déposer des fichiers
Pending upload: Hausse en attente
Update items with matching id: Mettre à jour les éléments avec l'identifiant correspondant
Clear all: Tout effacer
Upload files: Upload Files
Waiting for upload: En attente de télécharger
Uploading file: Uploader des fichiers
Image uploaded: Fichier uploadé
Upload finished successfully: Les images téléchargées correctement
Some errors happened on upload: Des erreurs sont survenues lors du téléchargement des images
There are no files to upload: Aucun fichier sélectionné pour télécharger

View File

@ -0,0 +1,13 @@
Images: Imagens
Collection: Coleção
Click or drop files here: Clique ou solte arquivos aqui
Pending upload: Ascensão pendente
Update items with matching id: Atualizar itens com id correspondente
Clear all: Limpar tudo
Upload files: Fazer upload de arquivos
Waiting for upload: Esperando para enviar
Uploading file: Enviando arquivo
Image uploaded: Imagem Enviada
Upload finished successfully: Upload concluído com sucesso
Some errors happened on upload: Ocorreram erros ao subir alguma das imagens
There are no files to upload: Não há arquivos selecionados para upload

View File

@ -0,0 +1,81 @@
/* Dropzone */
.photos .dropzone {
background-color: white;
border-style: dashed;
border-radius: .4em;
border-color: #2196F3;
padding: 2em 1em;
text-align: center;
color: #666;
cursor: pointer;
}
.photos .dropzone.dragover {
color: #CCC;
border-style: solid;
}
.photos input[type=file] {
display: none;
}
/* File list */
.photos .file-list {
margin-top: 1em;
}
.photos .file-list > div {
height: 2.5em;
display: flex;
align-items: center;
}
.photos .file-list > div > * {
overflow: hidden;
}
.photos .file-list .thumb {
width: 2em;
padding-right: .5em;
text-align: center;
}
.photos .file-list .thumb > img {
max-height: 2em;
max-width: 2em;
vertical-align: middle;
}
.photos .file-list input {
flex: 1;
min-width: 0;
}
.photos .file-list .status {
cursor: pointer;
width: 1.2em;
padding-left: .5em;
padding-right: .5em;
}
.photos .file-list .status > .htk-icon {
display: block;
}
.photos .file-list .htk-button {
opacity: .2;
}
.photos .file-list .htk-button:hover {
background-color: transparent;
opacity: 1;
}
.photos .file-list .htk-button > img {
display: block;
}
/* Footer */
.photos .update-matching {
margin-top: 1.5em;
}
.photos .footer {
margin-top: 1.5em;
text-align: center;
}
.photos .footer > button {
font-size: 1.2rem;
margin-left: 1em;
}

50
forms/admin/photos/ui.xml Normal file
View File

@ -0,0 +1,50 @@
<vn>
<div id="title">
<h1><t>Images</t></h1>
</div>
<div id="form" class="photos">
<div class="box form vn-w-sm vn-pa-lg">
<div class="form-group">
<label><t>Collection</t></label>
<htk-combo id="schema">
<db-model property="model">
<custom>
SELECT name, `desc` FROM imageCollection ORDER BY `desc`
</custom>
</db-model>
</htk-combo>
</div>
<div id="dropzone" class="dropzone"
on-dragenter="onDragEnter"
on-dragleave="onDragLeave"
on-mouseout="onDragLeave"
on-dragover="onDragOver"
on-drop="onDrop"
on-dragend="onDragEnd"
on-click="onDropzoneClick">
<t>Click or drop files here</t>
</div>
<input
id="file"
type="file"
multiple="true"
name="image"
on-change="onFileChange"/>
<div id="file-list" class="file-list"/>
<div class="update-matching">
<label>
<htk-check id="update-matching" value="true"/>
<t>Update items with matching id</t>
</label>
</div>
<div class="footer">
<button class="thin" on-click="onClearClick">
<t>Clear all</t>
</button>
<button class="thin" on-click="onUploadClick">
<t>Upload files</t>
</button>
</div>
</div>
</div>
</vn>

View File

@ -0,0 +1,93 @@
import './style.scss';
export default new Class({
Extends: Hedera.Form,
Template: require('./ui.xml')
,activate() {
this.$.resultIndex.value = 0;
}
,clean() {
if (this._grid) {
this.$.gridHolder.removeChild(this._grid.node);
this._grid.unref();
this._grid = null;
}
}
,onExecuteClick() {
this.clean();
var model = new Db.Model({
conn: this.conn,
query: this.$.sql.value,
resultIndex: this.$.resultIndex.value,
updatable: this.$.updatable.value
});
model.on('status-changed', this.onModelChange, this);
}
,onCleanClick() {
this.clean();
}
,onModelChange(model, status) {
if (status !== Db.Model.Status.LOADING) {
model.disconnect('status-changed', this.onModelChange, this);
model.unref();
}
if (status !== Db.Model.Status.READY)
return;
Htk.Toast.showMessage(_('Query executed!'));
var gridHolder = this.$.gridHolder;
if (gridHolder.firstChild)
gridHolder.removeChilds(gridHolder.firstChild);
var grid = new Htk.Grid();
var columns = model.columns;
for (var i = 0; i < columns.length; i++) {
var c = columns[i];
switch (c.type) {
case Db.Conn.Type.BOOLEAN:
var column = new Htk.ColumnCheck();
break;
case Db.Conn.Type.INTEGER:
var column = new Htk.ColumnSpin();
break;
case Db.Conn.Type.DOUBLE:
var column = new Htk.ColumnSpin({digits: 2});
break;
case Db.Conn.Type.DATE:
var column = new Htk.ColumnDate({format: '%a, %e %b %Y'});
break;
case Db.Conn.Type.DATE_TIME:
var column = new Htk.ColumnDate({format: '%a, %e %b %Y, %T'});
break;
case Db.Conn.Type.STRING:
default:
var column = new Htk.ColumnText();
}
column.setProperties({
title: c.name,
editable: this.$.updatable.value,
columnIndex: i
});
grid.appendColumn(column);
}
grid.model = model;
gridHolder.appendChild(grid.node);
this._grid = grid;
}
});

View File

@ -0,0 +1,6 @@
Queries: Consultes
Execute: Executar
Clean: Netejar
SQL query: Consulta SQL
Updatable: Actualitzable
Query executed!: Consulta executada!

View File

@ -0,0 +1,6 @@
Queries: Queries
Execute: Execute
Clean: Clean
SQL query: SQL query
Updatable: Updatable
Query executed!: Query executed!

View File

@ -0,0 +1,6 @@
Queries: Consultas
Execute: Ejecutar
Clean: Limpiar
SQL query: Consulta SQL
Updatable: Actualizable
Query executed!: ¡Consulta ejecutada!

View File

@ -0,0 +1,6 @@
Queries: Queries
Execute: Execute
Clean: Clean
SQL query: SQL query
Updatable: Updatable
Query executed!: Query executed!

View File

@ -0,0 +1,6 @@
Queries: Consultas
Execute: Executar
Clean: Limpar
SQL query: Consulta SQL
Updatable: Actualizável
Query executed!: Consulta executada!

View File

@ -0,0 +1,10 @@
.queries textarea {
display: block;
width: 100%;
height: 8em;
}
.queries .result {
margin-top: 1em;
overflow: auto;
}

Some files were not shown because too many files have changed in this diff Show More