verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity
10,984 Commits 259 Branches 0 Tags 122 MiB
Commit Graph

1270 Commits

Author SHA1 Message Date
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
Carlos Jimenez Ruiz 14b92e530a 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 09:37:37 +02:00
Carlos Jimenez Ruiz 8fc17f05c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3098-item_tag_productor
gitea/salix/pipeline/head This commit looks good Details
2021-09-23 17:35:07 +02:00
Carlos Jimenez Ruiz 368f54b872 refactor(tags): unified the style rules for tags under fetched-tags component and all display subName if present
gitea/salix/pipeline/head This commit looks good Details
2021-09-23 17:19:47 +02: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
Javi Gallego 3365eadf5e Merge branch 'dev' into 2995-supplierAccount-modificaciones 2021-09-21 14:02:07 +02:00
Joan Sanchez 079f99ca0d fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination
gitea/salix/pipeline/head This commit looks good Details 
Refs: 3093
 2021-09-17 08:50:22 +02:00
Javi Gallego 8160912fe7 Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 10:41:26 +02:00
Joan Sanchez 13f78359d5 fix(bank): the search by bank was not differentiating between numerical values and string values
gitea/salix/pipeline/head This commit looks good Details 
Refs: 3084
 2021-09-03 14:00:47 +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
Joan Sanchez 74dfa9f757 3063 - Get item from card without a name
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 11:23:46 +02:00
Javi Gallego cffe25d41f Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-18 12:38:41 +02:00
Javi Gallego 78a98cd6b7 shrink-datetime
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-15 08:35:14 +02:00
Joan Sanchez 23b73aaa41 Merge branch 'dev' into 3038-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 15:28:58 +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 e1fe2aa5b5 added the claim icon to the ticket summary lines
gitea/salix/pipeline/head Build started... Details
2021-08-13 12:30:22 +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
Carlos Jimenez Ruiz 51a8077f4d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3033-price_and_discount_ticket_sale_popover
gitea/salix/pipeline/head This commit looks good Details
2021-08-03 11:17:07 +02:00
Carlos Jimenez Ruiz 3d2de99129 vn-popover containing non-descriptor components now relocates correctly for ticket.sale
gitea/salix/pipeline/head This commit looks good Details
2021-08-03 11:16:43 +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
Carlos Jimenez Ruiz 88ecaff1d2 prevented an error if resultant length is 0
gitea/salix/pipeline/head This commit looks good Details
2021-07-27 16:17:47 +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 249f5074df Show client id
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 10:57:17 +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 92b6318c79 Ammends
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 13:31:04 +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 d30a3490fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2983-ticket_invoice
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 15:21:47 +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
Carlos Jimenez Ruiz 08360bfdc4 deprecated alertLevel.alertLevel now using alertLevel.id
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 18:01:33 +02:00
Carlos Jimenez Ruiz d67e36212f added validation for the dms id field
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 11:59:21 +02:00
Carlos Jimenez Ruiz e2ff3ff17f validation message for dup entry 2021-06-28 13:30:49 +02:00
Carlos Jimenez Ruiz 0e47cf72e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing 2021-06-28 11:19:07 +02:00
Joan Sanchez 65ac3fc205 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild
gitea/salix/pipeline/head This commit looks good Details
2021-06-28 08:58:27 +02:00
Joan Sanchez ef9f3b13e4 html fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-28 08:28:31 +02:00
Carlos Jimenez Ruiz 8b9bfb4ba0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing
gitea/salix/pipeline/head This commit looks good Details
2021-06-25 10:12:52 +02:00
Carlos Jimenez Ruiz 832452df95 ticketDms import 2021-06-25 10:12:41 +02:00
Carlos Jimenez Ruiz 2548fdc891 #3000 add buyer to ticket isEditable 2021-06-25 09:46:18 +02:00
Joan Sanchez 0941b2423e 2983 - Invoice tickets
gitea/salix/pipeline/head This commit looks good Details
2021-06-24 13:33:51 +02:00
Joan Sanchez 362c404aba Css fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-24 09:16:59 +02:00
Carlos Jimenez Ruiz 9389bbf779 front unit tests fix
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 13:32:23 +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 deaade92b0 Shortened packing type
gitea/salix/pipeline/head This commit looks good Details
2021-06-22 14:27:45 +02:00
Carlos Jimenez Ruiz 4656b2e25a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2960-ticket_basicdata_add_alias
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 15:54:41 +02:00
Carlos Jimenez Ruiz 1afae3d56d address nickname now gets updated when client or address updates 2021-06-18 15:54:33 +02:00
Joan Sanchez 8695fadc18 Merge branch 'dev' into 2948-ticket_sale_itemPackingType
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 05:21:01 +00:00
Joan Sanchez bbbf008076 Added done() to async beforeAll()
gitea/salix/pipeline/head This commit looks good Details
2021-06-17 16:09:17 +02:00
Carlos Jimenez Ruiz b906a8e91d added ticket.nickname to basicdata
gitea/salix/pipeline/head This commit looks good Details
2021-06-17 11:52:12 +02:00
Javi Gallego e2f32a60fd cambio campos en front 2021-06-17 07:30:22 +02:00
Carlos Jimenez Ruiz 7370269e4d ticket.sale now shows Packing type 2021-06-16 17:06:11 +02:00
Carlos Jimenez Ruiz 88a5443d64 table style changes
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 15:52:46 +02:00
Carlos Jimenez Ruiz e85b7b9817 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination 2021-06-14 12:07:54 +02:00
Carlos Jimenez Ruiz f36b54f97b invoiceOut summary tickets pagination + refactor 2021-06-14 11:38:57 +02:00
Carlos Jimenez Ruiz 5d8a9938d6 formattedAddress tests amended for postcode 2021-06-13 19:16:35 +02:00