Commit Graph

588 Commits

Author SHA1 Message Date
Joan Sanchez 0e75555bcd Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 08:51:07 +02:00
Vicent Llopis c5efc17fe9 refactr: update test
gitea/salix/pipeline/head This commit looks good Details
2022-04-04 13:56:36 +02:00
Vicent Llopis 5f2424dc44 feat(ticket): add option 'refund all' in descriptor menu
gitea/salix/pipeline/head This commit looks good Details
2022-04-04 13:26:53 +02:00
Vicent Llopis 86350b2afa feat(ticket_sale): add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 14:00:53 +02:00
Vicent Llopis a5ca116571 feat(ticket_sale): add mana options 2022-03-29 13:42:37 +02:00
Joan Sanchez 52b61d16ac Merge pull request '3638-export_database' (#899) from 3638-export_database into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #899
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-03-23 10:43:14 +00:00
Carlos Jimenez Ruiz 728a5de311 Merge branch 'dev' into 3625-ticket_log_routeFk
gitea/salix/pipeline/head This commit looks good Details
2022-03-21 11:56:44 +00:00
Vicent Llopis a9b6dcacfe included sms test
gitea/salix/pipeline/head This commit looks good Details
2022-03-17 08:13:18 +01:00
Vicent Llopis a3dbec82bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database 2022-03-17 07:59:07 +01:00
Alex Moreno 4dea046c97 feat(ticket_log): add routeFk log
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 10:07:39 +01:00
Vicent Llopis 6a91fe6c11 solved backTest
gitea/salix/pipeline/head This commit looks good Details
2022-03-10 14:43:07 +01:00
Alex Moreno e8d7ce7cc7 refactor(ticket): change role productionBoss to deliveryBoss
gitea/salix/pipeline/head This commit looks good Details
2022-03-07 14:50:51 +01:00
Alex Moreno a136d8b03d accept array in params
gitea/salix/pipeline/head This commit looks good Details
2022-03-07 10:10:45 +01:00
Carlos Jimenez Ruiz 2647b4e423 Merge branch 'dev' into 3595-item-waste-folding
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 10:05:07 +00:00
Carlos Jimenez Ruiz bf0734ca67 excluded 3 test suites until db export
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 10:46:14 +01:00
Alex Moreno 4e5e6dccca fix(test): change movable expeted
gitea/salix/pipeline/head This commit looks good Details
2022-02-10 10:15:43 +01:00
Alex Moreno dc47af7224 feat(ticket): isEmpty ticketRequest not necessary isOk 2022-02-03 11:51:50 +01:00
Alex Moreno 91b6dcee05 fix(test): fixed bugs non compatible ECMA options
gitea/salix/pipeline/head This commit looks good Details
2022-02-02 14:33:16 +01:00
Joan Sanchez 8be7f9153e Removed non compatible ECMA options
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 14:50:24 +01:00
Alex Moreno 60adb6f37c translations
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 07:21:34 +01:00
Alex Moreno b25ffa8feb feat(ticket_step-two): redirect to new ticket
gitea/salix/pipeline/head This commit looks good Details
2022-01-28 09:15:41 +01:00
Alex Moreno f8a0094321 word movible
gitea/salix/pipeline/head This commit looks good Details
2022-01-26 08:54:48 +01:00
Alex Moreno 57e4b400c9 Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2022-01-26 07:12:57 +01:00
Alex Moreno 442d58f59b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-26 07:11:22 +01:00
Alex Moreno f67a4355db refactor(ticket_sale): split e2e, change name backTest
gitea/salix/pipeline/head This commit looks good Details
2022-01-25 15:09:29 +01:00
Alex Moreno 6d9afd5f4c feat(ticket_sale): role restriction to create payBack
gitea/salix/pipeline/head This commit looks good Details
2022-01-21 11:40:48 +01:00
Alex Moreno 9ddf11c6bc test(ticket): update to advanceable
gitea/salix/pipeline/head This commit looks good Details
2022-01-18 12:49:16 +01:00
Alex Moreno 8e1c3e107c refactor(ticket): advanceable code
gitea/salix/pipeline/head This commit looks good Details
2022-01-18 12:48:39 +01:00
Alex Moreno b8355320f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 14:50:10 +01:00
Alex Moreno 83d2dd2d80 refacto(ticket_volume): tests and front js
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 13:17:06 +01:00
Alex Moreno 5824acf3bc change tests to advanceable
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 10:12:13 +01:00
Alex Moreno 61859a23c9 feat(ticket): getAdvanceable
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-17 07:14:29 +01:00
Alex Moreno c87e3e1210 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2022-01-13 07:20:23 +01:00
Alex Moreno 757fe73ecd test(ticket_volume): backTest
gitea/salix/pipeline/head This commit looks good Details
2022-01-12 14:55:20 +01:00
Alex Moreno fba09e8c40 feat(ticket_volume): volume for packingType
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-12 14:02:58 +01:00
Carlos Jimenez Ruiz cc3e2fbc3a can't transfer claimed sales without claimManager role
gitea/salix/pipeline/head This commit looks good Details
2022-01-12 10:17:51 +01:00
Alex Moreno 5462af91ee extract to variable
gitea/salix/pipeline/head This commit looks good Details
2022-01-10 11:38:02 +01:00
Alex Moreno 860499db82 refactor(ticket): add more text in error when change zone
gitea/salix/pipeline/head This commit looks good Details
2022-01-07 08:28:57 +01:00
Alex Moreno e609994efa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 21:01:18 +01:00
Alex Moreno 18b6efe8f1 test(ticket_basic-data): test and fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 20:58:58 +01:00
Vicent Llopis 6bd48ab30b delete comment
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 15:06:57 +01:00
Vicent Llopis bdb42437ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 14:45:40 +01:00
Vicent Llopis 5c899d28c3 feat(ticket_sale): add tests and refactor backRoute name
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 14:43:53 +01:00
Alex Moreno 831bfb0352 change route for hasRoute
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 08:52:39 +01:00
Alex Moreno 405494c85b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index 2021-12-21 08:31:17 +01:00
Vicent Llopis e30fb0fb37 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono
gitea/salix/pipeline/head There was a failure building this commit Details
2021-12-21 07:10:19 +01:00
Alex Moreno 50db693e51 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head There was a failure building this commit Details
2021-12-20 13:50:50 +01:00
Alex Moreno b0019d09ad feat(ticket_basic-data_step-two): adapted for available and transfer sales in back
gitea/salix/pipeline/head There was a failure building this commit Details
2021-12-20 13:50:31 +01:00
Joan Sanchez 872f5b488b Merge branch 'dev' into 3411-route_ticket_fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-12-20 09:40:34 +00:00
Alex Moreno 850ea2ef39 getVisible sql
gitea/salix/pipeline/head This commit looks good Details
2021-12-17 12:38:56 +01:00
Alex Moreno 87f994aa77 test(ticket_basci-data_step-two): back and front
gitea/salix/pipeline/head This commit looks good Details
2021-12-16 08:14:27 +01:00
Vicent Llopis a6b755138f feat(abono): add option "abono" in ticket_sale
gitea/salix/pipeline/head There was a failure building this commit Details
2021-12-15 15:24:45 +01:00
Alex Moreno 3e91929d0d half test
gitea/salix/pipeline/head This commit looks good Details
2021-12-15 15:16:21 +01:00
Alex Moreno e01d676bb1 feat(ticket_basic-data_step-two): show visible and option withoutNegatives
gitea/salix/pipeline/head This commit looks good Details
2021-12-15 14:45:45 +01:00
Alex Moreno 5960d40891 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 12:43:40 +01:00
Alex Moreno 9cfe6b5b7a feat(ticket): filter by route
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 12:05:06 +01:00
Joan Sanchez f2a8992410 fix(ticketIndex): excluded collectionFk property from date ranges
gitea/salix/pipeline/head This commit looks good Details
Refs: 3431
2021-12-14 09:17:00 +01:00
Vicent Llopis ac3dc039fe feat: add fixtures of ticket and update test
gitea/salix/pipeline/head This commit looks good Details
2021-12-01 12:49:53 +01:00
Alex Moreno 75e32feb16 refactor ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2021-12-01 11:39:48 +01:00
Alex Moreno decd4b5a95 separate sql procedures
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 15:13:20 +01:00
Alex Moreno d5c0be5a9d refactor(ticket_sale): logic and tests
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 13:47:16 +01:00
Alex Moreno 815826e891 refactor(ticket): modify transferSales.js for avoid unnecessary logs
gitea/salix/pipeline/head This commit looks good Details
2021-11-25 11:23:18 +01:00
Joan Sanchez 8ede14ab40 fix(sales): update price on any change affecting the ticket total
gitea/salix/pipeline/head This commit looks good Details
Refs: 3363
2021-11-24 09:25:24 +01:00
Vicent Llopis 0849f40df7 feat: update backTest
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 11:44:29 +01:00
Vicent Llopis f60fa5a852 change receiver to requesterId
gitea/salix/pipeline/head This commit looks good Details
2021-10-27 12:22:32 +02:00
Vicent Llopis d94e2900d0 feat(ticket-request): send rocket message when ticket-reques is denied
gitea/salix/pipeline/head This commit looks good Details
2021-10-27 12:16:37 +02:00
Carlos Jimenez Ruiz c4c1aa929a refactor(endpoints): corrected indentation and removed unused code
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 16:00:50 +02:00
Carlos Jimenez Ruiz de7af0fee2 fix(transaction): priceDifference now commits its created transaction 2021-10-15 15:59:59 +02:00
Carlos Jimenez Ruiz 270b2802c8 refactor(transactions): added transaction to sendChechingPresence and corrected a typo
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 15:31:13 +02:00
Carlos Jimenez Ruiz 580ba36357 refactor(jasmine): usage of done on async functions is deprecated 2021-10-15 14:45:41 +02:00
Carlos Jimenez Ruiz 35a2a71602 refactor(sales): transaction correctly passed to findById 2021-10-14 16:16:00 +02:00
Carlos Jimenez Ruiz cb7d1b24e8 refactor(ticket): all ticket endpoints are using transactions now
gitea/salix/pipeline/head This commit looks good Details
2021-10-07 09:57:07 +02:00
Carlos Jimenez Ruiz 392c4dcba3 refactor(sale): ticket.sale endpoints now use transactions 2021-09-29 08:27:18 +02:00
Carlos Jimenez Ruiz cb3d0678ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions 2021-09-24 10:09:51 +02:00
Carlos Jimenez Ruiz 8c446edc9e Merge branch 'dev' into 3098-item_tag_productor
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 08:02:19 +00:00
Carlos Jimenez Ruiz 23ba5657c5 refactor(sales): ticket sales now shows item.subName 2021-09-22 15:14:29 +02:00
Carlos Jimenez Ruiz cc90a08f03 refactor(ticket): ticket endpoins now can receive transactions 2021-09-21 18:48:59 +02:00
Joan Sanchez 08cba0a9c8 fix(filter): search limit by date range was not being applied
gitea/salix/pipeline/head This commit looks good Details
Refs: 3059
2021-09-21 15:49:59 +02:00
Carlos Jimenez Ruiz 6b465f9150 Merge branch 'dev' into 3068-ticket_colletion
gitea/salix/pipeline/head This commit looks good Details
2021-09-02 13:07:57 +00:00
Joan Sanchez 0b704db353 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-09-02 08:56:19 +02:00
Joan Sanchez b68e99b412 fix(invoice): invoicing was throwing a transaction error
gitea/salix/pipeline/head This commit looks good Details
Refs: 3077
2021-09-02 08:55:41 +02:00
Joan Sanchez 7a98613ef8 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-09-01 11:48:21 +02:00
Joan Sanchez 0370cbf207 feat(Searchbar): You can now filter by a ticket collection
gitea/salix/pipeline/head This commit looks good Details
Refs: 3068
2021-09-01 11:27:24 +02:00
Joan Sanchez a0efe5f896 Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 06:27:23 +00: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 2b4afdd04d ticket module transactions + tests 2021-08-12 11:21:59 +02:00
Carlos Jimenez Ruiz 708c0035c0 deprecated changeWorker as it is no longer in use 2021-08-12 11:06:49 +02:00
Javi Gallego 3b9bdc18bf funciona
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-12 09:23:19 +02:00
Carlos Jimenez Ruiz da7bda2d0e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions 2021-08-11 16:06:52 +02:00
Joan Sanchez 8e84f98629 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global 2021-08-09 12:59:00 +02:00
Carlos Jimenez Ruiz 870314277f add sale and canbeInvoice refactor + tests 2021-08-05 13:32:35 +02:00
Joan Sanchez 41a1b3d909 2984 - Global invoicing endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-02 13:35:38 +02:00
Carlos Jimenez Ruiz a771fd584f minor refactors + missing transaction on discount
gitea/salix/pipeline/head This commit looks good Details
2021-07-30 10:29:57 +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
Joan Sanchez 9d855a80d5 3028 - Added visible column on ticket sales
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 12:33:27 +02:00
Joan Sanchez 3246101574 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 14:03:28 +02:00
Joan Sanchez 319a168b89 Removed focus
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 13:43:13 +02:00
Joan Sanchez 7e836e570f 2983 - Invoice tickets
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 16:10:26 +02:00
Joan Sanchez 33d03c8f21 Merge branch 'dev' into 2950-alertlevel_to_alertlevel_id
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 06:15:05 +00:00