Commit Graph

1338 Commits

Author SHA1 Message Date
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 c9564e817a test(ticket_volume): frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-01-12 14:04:16 +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
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
Carlos Jimenez Ruiz 7dbf03ed72 front unit test and e2e for change state
gitea/salix/pipeline/head This commit looks good Details
2021-12-30 10:45:19 +01:00
Carlos Jimenez Ruiz 48e4628c48 refactor(ticket.summary): change state button is now dropdown
gitea/salix/pipeline/head This commit looks good Details
2021-12-30 09:49:11 +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 19e50d2156 fix(ticket_sale): front test
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 15:00:06 +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
Carlos Jimenez Ruiz 1440f29784 Merge branch 'dev' into 3423-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2021-12-20 10:01:08 +00: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 be3e8ddd98 feat(ticket_descriptor): add field client.id
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 12:59:53 +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 85721dcf45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale 2021-11-30 09:51:30 +01:00
Joan Sanchez 5c342ae463 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 09:11:40 +01:00
Alex Moreno 8ea3307230 feat(ticket_sale): allow multi-check for recalculatePrice
gitea/salix/pipeline/head This commit looks good Details
2021-11-29 08:30:36 +01:00
Joan Sanchez e4d7d957eb Rectified icons
gitea/salix/pipeline/head This commit looks good Details
2021-11-26 14:48:55 +01:00
Joan Sanchez 452d4557d1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-11-26 14:11:33 +01:00
Joan Sanchez bcca33bc33 Updated icons 2021-11-26 13:04:07 +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
Joan Sanchez 07dcdab1ef fix(sale): disabled clear icons
gitea/salix/pipeline/head This commit looks good Details
2021-11-23 09:57:19 +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
Alex Moreno caf6320d53 feat(ticket): default ticketAction for salesAssistant
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 14:27:05 +01:00
Joan Sanchez 2bc20242e6 fix(salesMonitor): allow scope days to zero
gitea/salix/pipeline/head This commit looks good Details
2021-11-16 13:43:30 +01:00
Carlos Jimenez Ruiz c011a82edc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 14:40:50 +01:00
Carlos Jimenez Ruiz 4fe7d4f566 ticket index rollback 2021-11-11 17:17:48 +01:00
Carlos Jimenez Ruiz d87e8ac226 refactor(entry.lastBuys): usage of smart table on latests buys
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-10 17:07:16 +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
Carlos Jimenez Ruiz 04a31f4cff vn table now receives show buttons options
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-29 16:55:19 +02:00
Carlos Jimenez Ruiz 11f24372e5 autocomplete options added to smart table
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-29 15:52:04 +02:00
Joan Sanchez dfb2b0b3d8 Updated checked property
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-28 09:09:52 +02:00
Joan Sanchez bfc9228eef Restored ticket table and added table compatibility on contextmenu
gitea/salix/pipeline/head This commit looks good Details
2021-10-28 09:06:03 +02:00
Carlos Jimenez Ruiz b27a443729 show/hide columns and load default view
gitea/salix/pipeline/head This commit looks good Details
2021-10-27 17:11:33 +02:00
Vicent Llopis cd6f0057a1 test
gitea/salix/pipeline/head This commit looks good Details
2021-10-27 13:41:59 +02:00
Vicent Llopis b1b6d93c8e change column value : checkbox for text
gitea/salix/pipeline/head This commit looks good Details
2021-10-27 13:39:38 +02: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 c976f1ed07 multiple search by column feature
gitea/salix/pipeline/head This commit looks good Details
2021-10-26 17:16:01 +02:00
Joan Sanchez bf386929d3 Deletion ammends and selection fixed
gitea/salix/pipeline/head This commit looks good Details
2021-10-25 17:18:57 +02:00
Carlos Jimenez Ruiz 7ce58c5f33 sorting arrows for multiple columns
gitea/salix/pipeline/head This commit looks good Details
2021-10-25 14:20:17 +02:00
Joan Sanchez d5264486c7 Simplified to one component
gitea/salix/pipeline/head This commit looks good Details
2021-10-23 14:26:42 +02:00
Joan Sanchez e6304d026c feat(smart-table): added smart-table and smart-table-menu components
gitea/salix/pipeline/head This commit looks good Details
2021-10-22 15:01:54 +02:00
Alex Moreno 1cb0cda3a8 fix(sale): delete :: in image
gitea/salix/pipeline/head This commit looks good Details
2021-10-19 10:26:00 +02:00
Joan Sanchez ee1a7952ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv
gitea/salix/pipeline/head This commit looks good Details
2021-10-18 09:44:27 +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 05df98939b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 14:47:34 +02:00
Carlos Jimenez Ruiz 580ba36357 refactor(jasmine): usage of done on async functions is deprecated 2021-10-15 14:45:41 +02:00
Joan Sanchez d5cf57fbb1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-10-15 14:07:48 +02:00
Joan Sanchez 85b4730c6c feat(monitor): show client risk to future on tickets
gitea/salix/pipeline/head This commit looks good Details
Refs: 2624
2021-10-15 10:49:23 +02:00
Carlos Jimenez Ruiz 35a2a71602 refactor(sales): transaction correctly passed to findById 2021-10-14 16:16:00 +02:00
Joan Sanchez e641a947b3 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-10-08 09:51:42 +02:00
Joan Sanchez e6b60d73f1 Added unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-10-07 13:36:23 +02:00
Joan Sanchez 4610ed83d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-07 10:28:06 +02:00
Joan Sanchez 82a14088d0 Added options to invoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-07 10:04:50 +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 0b46e9ce35 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-10-04 10:21:09 +02:00
Joan Sanchez 6b59bdd01c fix(descriptorMenu): show PDF regeneration option
gitea/salix/pipeline/head This commit looks good Details
2021-10-04 10:19:53 +02:00
Carlos Jimenez Ruiz 16b27c2074 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions 2021-10-04 09:23:28 +02:00
Joan Sanchez 580231d30b Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-10-01 14:59:12 +02:00
Joan Sanchez 313db4960e refactor(invoice): Show generate PDF option if it was never generated before
Refs: 3162
2021-10-01 14:59:08 +02:00
Joan Sanchez 68178bdb1f Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-10-01 14:48:25 +02:00
Joan Sanchez f60c754c59 refactor(invoice): Show generate PDF option if it was never generated before
gitea/salix/pipeline/head There was a failure building this commit Details
Refs: 3162
2021-10-01 14:31:42 +02:00
Joan Sanchez 1ec20e250c feat(invoice): Send invoice and delivery-note on CSV format
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-01 12:41:31 +02:00
Carlos Jimenez Ruiz 156ecb32ec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-09-29 08:27:53 +02:00
Carlos Jimenez Ruiz 392c4dcba3 refactor(sale): ticket.sale endpoints now use transactions 2021-09-29 08:27:18 +02:00
Joan Sanchez 06b49f36b6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-09-28 10:03:00 +02:00
Joan Sanchez 19d3b19e5a Updated translation
gitea/salix/pipeline/head This commit looks good Details
2021-09-28 09:59:00 +02:00
Joan Sanchez ee0e1e122b Removed crudModel default params
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 13:02:20 +02:00
Joan Sanchez 4ea0f92c35 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 12:54:22 +02:00
Joan Sanchez 4545a5c8fa fix(filter): single search results don't use scopeDates
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 12:51:20 +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 5f0e2825b8 Merge branch 'dev' into 3059-ticket_index_filter
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 07:46:09 +00:00