Commit Graph

177 Commits

Author SHA1 Message Date
Alex Moreno f337f82b35 feat(claim): add packages, and next button
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 12:51:33 +01:00
Carlos Jimenez Ruiz 63fc58b6ba Merge branch 'dev' into 3649-claim_log
gitea/salix/pipeline/head This commit looks good Details
2022-03-03 12:00:02 +00:00
Alex Moreno a05223681e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3620-claim_change_state 2022-03-02 10:43:06 +01:00
Carlos Jimenez Ruiz 2b0f54c3aa Merge branch 'dev' into 3646-claim-summary
gitea/salix/pipeline/head This commit looks good Details
2022-03-02 09:17:19 +00:00
Alex Moreno 44318903e7 feat(claim): add log section
gitea/salix/pipeline/head This commit looks good Details
2022-03-01 15:15:58 +01:00
Alex Moreno 60e908d82a feat(claim_summary): parentReload(), and test 2022-02-28 12:40:44 +01:00
Alex Moreno 5434dd3baf feat(claim_index): implemented smart-table and change state in summary
gitea/salix/pipeline/head There was a failure building this commit Details
2022-02-28 07:57:46 +01:00
Alex Moreno fc3a46eb26 refactor(claim): removed importTicketSales and fix tests
gitea/salix/pipeline/head This commit looks good Details
2022-02-24 13:52:26 +01:00
Joan Sanchez 9d298c2a5e Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 12:07:05 +01:00
Alex Moreno 1250382209 missing zero
gitea/salix/pipeline/head This commit looks good Details
2022-02-03 09:52:17 +01:00
Alex Moreno 001aed3cb5 fix(claim): filter created 2022-02-02 14:32:16 +01:00
Carlos Jimenez Ruiz d86aa5535c refactor(createFromSales): now claimManager can claim any time
gitea/salix/pipeline/head This commit looks good Details
2022-01-04 16:16:39 +01:00
Joan Sanchez 46d7a6e765 Added unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-11-19 09:24:49 +01:00
Joan Sanchez 8c5f0d3019 feat(createClaim): disallow claim creation for a ticket delivered more than seven days ago
Refs: 3278
2021-11-19 09:24:31 +01:00
Carlos Jimenez Ruiz 1d253fc53d definitions corrected for myOptions of endpoints 2021-11-18 11:17:30 +01:00
Carlos Jimenez Ruiz 7a7bbe2ba8 more module transactions
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 16:46:44 +02:00
Carlos Jimenez Ruiz 9578895f95 backend unit tests adapted
gitea/salix/pipeline/head This commit looks good Details
2021-07-29 17:40:45 +02:00
Carlos Jimenez Ruiz 8d682f4e03 chat notifications for many sales modifications 2021-07-29 17:20:57 +02:00
Carlos Jimenez Ruiz dd3473b93d small refactors correcting constants and adding transactions 2021-07-12 12:50:15 +02:00
Carlos Jimenez Ruiz 3b2b4e3819 client module changes for transactions
gitea/salix/pipeline/head This commit looks good Details
2021-07-08 15:53:30 +02:00
Carlos Jimenez Ruiz 10c7aa70d6 claim module transactions for filter, summary and isEditable 2021-07-05 12:00:49 +02:00
Carlos Jimenez Ruiz 8344a58ab8 updated client/worker/user IDs on tests
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 13:24:23 +02:00
Joan Sanchez a5c3ba3926 2921 - Changed the ticket url of rocket notifications
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 10:26:58 +02:00
Carlos Jimenez Ruiz 5843140cf5 minor refactor for code usage instead of description
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 12:27:26 +02:00
Joan Sanchez d4c6695629 2631 - Notify status change to incomplete
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 07:45:00 +02:00
Carlos Jimenez Ruiz e025368af1 updaloadFile transaction commit conditional
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 10:17:16 +02:00
Carlos Jimenez Ruiz 8797444553 importTicketSales refactor + tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 15:42:29 +02:00
Carlos Jimenez Ruiz c1f457c263 allowContentTypes and removeFile refactors 2021-03-29 15:42:14 +02:00
Carlos Jimenez Ruiz 740cc79bc0 uploadFile refactor 2021-03-29 15:19:43 +02:00
Carlos Jimenez Ruiz de2a17e840 removeFile and filter refactors 2021-03-29 15:18:49 +02:00
Carlos Jimenez Ruiz 8d8bdacd86 updateClaimAction refactor + tests 2021-03-29 15:18:14 +02:00
Carlos Jimenez Ruiz 3054cbcadb updateClaim refactor + tests 2021-03-29 15:17:10 +02:00
Carlos Jimenez Ruiz c4cbc064c9 regularice claim refactor + test 2021-03-29 15:15:58 +02:00
Carlos Jimenez Ruiz ee79f23185 createFromSales refactor + tests 2021-03-29 15:14:23 +02:00
Joan Sanchez 6da84e46c1 Added throw error
gitea/salix/pipeline/head This commit looks good Details
2021-03-22 10:20:04 +01:00
Joan Sanchez 6210e60896 2669 - Changes to the translate values function
gitea/salix/pipeline/head This commit looks good Details
2021-03-19 19:20:19 +01:00
Joan Sanchez 1ba1d27ba0 2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-27 13:10:39 +01:00
Bernat Exposito Domenech a5e6f99b1f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary 2020-10-29 08:06:50 +01:00
Joan Sanchez 3675f7ed34 2511 - Changed salesAssitant role to claimManager
gitea/salix/pipeline/head This commit looks good Details
2020-10-26 12:16:57 +01:00
Bernat Exposito Domenech 58168e78ab test, translate and supplier searpanel, summary
gitea/salix/pipeline/head There was a failure building this commit Details
2020-10-26 08:38:43 +01:00
Bernat Exposito Domenech 0f6e1eae24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary 2020-10-21 08:22:51 +02:00
Bernat Exposito Domenech 256206ace4 supplier summary dscriptor and card
gitea/salix/pipeline/head There was a failure building this commit Details
2020-10-20 09:44:44 +02:00
Carlos Jimenez Ruiz dd6035606f some more tests fixed + refactors 2020-10-15 18:57:27 +02:00
Carlos Jimenez Ruiz c04b7a0657 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 10:31:06 +02:00
Carlos Jimenez Ruiz b6b84cfea7 more tests fixed + small refactors 2020-10-08 16:00:19 +02:00
Bernat Exposito Domenech 3d39467613 refactor updateclaim
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 14:23:35 +02:00
Bernat Exposito Domenech e6b4d21ddb refactor updateClaim
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 10:57:40 +02:00
Carlos Jimenez Ruiz 89fb980f14 some tests fixed 2020-10-06 10:15:27 +02:00
Carlos Jimenez Ruiz 1e55632b94 refactor & fix regularize claim and prices Diff
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 13:28:02 +02:00
Carlos Jimenez Ruiz bde6c4495d e2e path updated + 2 new tasks for broken tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-16 16:10:43 +02:00
Carlos Jimenez Ruiz 5b69ce983c salesPersonUser replaces salesPerson relation
gitea/salix/pipeline/head This commit looks good Details
2020-09-15 19:43:07 +02:00
Joan Sanchez b848fa52f2 2385 - Replaced worker nickname
gitea/salix/pipeline/head This commit looks good Details
2020-09-03 15:11:16 +02:00
Carlos Jimenez Ruiz 0e4fc7e2bd removed unused code.
gitea/salix/pipeline/head This commit looks good Details
2020-08-14 18:43:57 +02:00
Carlos Jimenez Ruiz 69cc18be12 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2330-Implement_print_service_testing 2020-08-14 18:42:51 +02:00
Carlos Jimenez Ruiz a679ebfce8 quick fix for updateClaim from other branch 2020-08-14 18:42:45 +02:00
Carlos Jimenez Ruiz b711728999 ultimate edition deluxe
gitea/salix/pipeline/head This commit looks good Details
2020-08-14 17:47:13 +02:00
Carlos Jimenez Ruiz 3df9ae2946 section no longer nukes salesPerson-user relation
gitea/salix/pipeline/head This commit looks good Details
2020-08-14 17:10:59 +02:00
Joan Sanchez 171deeb82c Merge branch 'dev' into 2350-order_index
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 11:12:34 +00:00
Joan Sanchez 7b61e129ff HOTFIX: Change claim claimed quantity
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-09 13:24:56 +02:00
Bernat Exposito Domenech 122dacffb5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index
gitea/salix/pipeline/head This commit looks good Details
2020-07-06 10:20:59 +02:00
Bernat Exposito Domenech ee704b302c update order filter
gitea/salix/pipeline/head This commit looks good Details
2020-07-06 10:20:45 +02:00
Joan Sanchez b40e09a6cb Methods refactor & updated back unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-07-01 14:28:05 +02:00
Bernat Exposito Domenech d80d520fba fix claim.beggining
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-16 12:00:38 +02:00
Bernat Exposito Domenech b33f42d05e add restrictions in claim detail
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-16 07:47:46 +02:00
Bernat Exposito 49d4f881ad Merge pull request '2296-fix_back_test' (#295) from 2296-fix_back_test into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-05 07:15:10 +00:00
Bernat Exposito Domenech 3a6efebfd9 skipp back test and create task 2304 2020-06-04 14:22:56 +02:00
Joan Sanchez e2391e5595 Changes made
gitea/salix/pipeline/head This commit looks good Details
2020-06-04 10:12:54 +02:00
Joan Sanchez 30c721b0e2 Added ACL
gitea/salix/pipeline/head This commit looks good Details
2020-06-04 08:21:08 +02:00
Joan Sanchez 0695ec01bc Updated unit test
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-04 07:53:06 +02:00
Joan Sanchez f39719cc46 2281 - Added claim pickup checkbox
gitea/salix/pipeline/head This commit has test failures Details
2020-06-03 14:46:58 +02:00
Carlos Jimenez Ruiz 245827e8d5 corrected a typo
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 09:28:50 +02:00
Joan Sanchez 309b4dafe9 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 14:03:15 +02:00
Joan Sanchez 4aea769797 2246 Added claim state priority field
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 13:46:45 +02:00
Joan Sanchez 42bec3a944 1833 Claim action refactor
gitea/salix/pipeline/head This commit looks good Details
2020-05-15 14:47:19 +02:00
Joan Sanchez 9b085d13e1 Updated back unit test
gitea/salix/pipeline/head This commit looks good Details
2020-05-14 17:32:52 +02:00
Joan Sanchez 2bb17f4a00 Requested changes
gitea/salix/pipeline/head This commit has test failures Details
2020-05-14 17:15:54 +02:00
Joan Sanchez 62d27e45e2 Updated unit tests
gitea/salix/pipeline/head This commit has test failures Details
2020-05-14 14:01:34 +02:00
Joan Sanchez 94a219760c 2223 Added pickup checkbox
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-13 15:04:57 +02:00
Joan Sanchez fd45c41210 removed focus
gitea/salix/2094-claim_send_chat This commit looks good Details
2020-02-13 15:01:24 +01:00
Joan Sanchez 5360c407d5 updated unit test
gitea/salix/2094-claim_send_chat This commit looks good Details
2020-02-13 14:46:18 +01:00
Joan Sanchez be07e33e5f updated unit test
gitea/salix/2094-claim_send_chat This commit looks good Details
2020-02-13 14:39:33 +01:00
Joan Sanchez 39470e837b 2094 Regularize claim send chat even if doesn't have destination
gitea/salix/2094-claim_send_chat This commit looks good Details
2020-02-13 13:20:31 +01:00
Joan Sanchez 57acca2f5e refactor & updated tests
gitea/salix/2018-deprecate_message_send This commit looks good Details
2020-01-23 13:31:07 +01:00
Joan Sanchez 5273e90a30 Added params to ticket method & updated unit tests
gitea/salix/1935-ticket_create_auto_fill This commit looks good Details
2019-12-26 07:12:34 +01:00
Javi Gallego ec081e6a3a campo claimDestinationFk ya no esta como required
gitea/salix/1912 This commit looks good Details
2019-12-12 13:53:54 +01:00
Javi Gallego 3c36526f12 E2E fix for windows plus refactors 2019-11-28 12:54:34 +01:00
Joan Sanchez 3c144ea0cd transaction changes
gitea/salix/1762-worker_dms There was a failure building this commit Details
2019-11-22 13:46:38 +01:00
Javi Gallego c736e4de29 #1850 descomentar test back
gitea/salix/dev There was a failure building this commit Details
2019-11-18 12:32:50 +01:00
Javi Gallego 03a4da307d Tarea #1848 test back arreglados/comentados
gitea/salix/dev This commit looks good Details
2019-10-31 12:54:16 +01:00
Joan Sanchez e2a7c09e4a Uploadfile parameters are now required + fixed date filters
gitea/salix/dev This commit looks good Details
2019-10-21 08:31:14 +02:00
Joan Sanchez 81097287fa #1755 create claim only for non removed tickets
gitea/salix/dev This commit looks good Details
2019-10-14 11:44:54 +02:00
Bernat f28305de9b Refactor #1698 claim.basic-data al llamar a updateClaim tener en cuenta el campo roleFk
gitea/salix/dev This commit looks good Details
2019-09-26 09:13:18 +02:00
Joan Sanchez 335f92173c updated transactions
gitea/salix/dev There was a failure building this commit Details
2019-09-18 15:11:09 +02:00
Joan Sanchez 6f508838c9 claim.action falla el boton import #1679
gitea/salix/dev This commit looks good Details
2019-09-04 13:39:01 +02:00
Javi Gallego 2b14a9050e Bug/Test #1679 claim.action falla el boton import
gitea/salix/dev This commit has test failures Details
2019-09-04 12:17:33 +02:00
Joan Sanchez 50c989a267 Add attendedBy and salesPerson filters #1661
gitea/salix/dev This commit looks good Details
2019-09-02 12:23:49 +02:00
Joan Sanchez a5486ec694 Get allowed content-types from model #1598
gitea/salix/dev This commit looks good Details
2019-08-08 08:37:03 +02:00
Joan Sanchez fb4ce77c01 claim upload pictures #1593
gitea/salix/dev This commit looks good Details
2019-07-30 08:51:38 +02:00
Carlos Jimenez Ruiz 4ac419b419 #1528 e2e claim/detail 2019-07-02 14:44:36 +02:00
Joan Sanchez dae43bb9b0 transactions refactor #1546
gitea/salix/dev This commit has test failures Details
2019-06-21 08:26:59 +02:00