Commit Graph

1173 Commits

Author SHA1 Message Date
Alexandre Riera 4feb2bea2c working on e2e
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 10:57:15 +01:00
Alexandre Riera b7c9d6ea50 refs #3963 front and back tests fixed
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 15:30:00 +01:00
Pau 4e2741a9cd Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 11:01:02 +01:00
Pau 31a0aae8e9 Fixed notification not getting inserted 2022-11-15 11:01:00 +01:00
Pau 2b3b2086d9 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 09:39:03 +00:00
Pau f1b706d178 Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 10:37:13 +01:00
Pau 6339634756 refs #4457 move sql, remove await on front @2h 2022-11-15 10:37:12 +01:00
Vicent Llopis b5f67425ff Merge branch 'dev' into jenkins_backTest_solved
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 08:54:05 +00:00
Pau 60d12826e4 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 07:59:53 +00:00
Pau 9d0cd36afe Merge branch 'dev' into 4457'
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 08:49:21 +01:00
Vicent Llopis 0637050375 fix: frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 15:11:33 +01:00
Alexandre Riera 23ed6c6031 refs #3963 test front done
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 14:30:35 +01:00
Alexandre Riera 99aa674995 refs #3963 working on mockup
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 14:29:40 +01:00
Vicent Llopis 6e94d7f68e fix: nombre variable incorrecto
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 11:00:13 +01:00
Alexandre Riera dc06ba7d89 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:58:18 +01:00
Alexandre Riera 7dd87b1ea8 refs #4700 icons future
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:56:23 +01:00
Alexandre Riera 05f0eba741 Merge branch 'split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:06:51 +01:00
Alexandre Riera c16210dd8a refs #4700 working on e2e
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 15:58:11 +01:00
Alexandre Riera 117e2c03f5 refs #4700 tests back y empezando e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-10 15:54:00 +01:00
Pau 9004839e00 Merge branch '4484-ticket-withOutNegatives-default-true' of https://gitea.verdnatura.es/verdnatura/salix into 4484-ticket-withOutNegatives-default-true
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:53:14 +01:00
Pau 01fe8c8997 requested changes 2022-11-10 14:53:08 +01:00
Pau c15d40b237 Merge branch 'dev' into 4484-ticket-withOutNegatives-default-true
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 08:45:15 +00:00
Pau 2704017486 check default true
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 09:43:19 +01:00
Alexandre Riera ff00066138 refs #4700 tests front y fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 15:56:58 +01:00
Pau 2fc12dff52 #4457 @1h notifications working, need refactor ACL
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-08 13:59:00 +01:00
Pau e85505ee8e #4457 implement notification system, @1h 30m
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-08 12:26:01 +01:00
Alexandre Riera 896a7eb6f0 refs #4700 arreglar filtro y traducciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 15:55:17 +01:00
Pau a975f37fc3 Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 07:27:15 +00:00
Pau 42dd56a78c Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 06:46:23 +00:00
Alexandre Riera 8e5f518eb6 refs #4753 texto y fecha sms cambiados
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 14:16:11 +01:00
Vicent Llopis 3cc89c170c Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 13:55:07 +00:00
Vicent Llopis 8a4aa6285b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:49:39 +01:00
Joan Sanchez 34997b72f5 Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 11:55:47 +00:00
Joan Sanchez 177b448441 Merge branch 'dev' into 4616-ticket.sale_mana
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 06:42:35 +00:00
Pau c576e503cf fix httpBack.flush error 2022-10-27 09:05:05 +02:00
Pau 04514804b7 fix tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 08:51:22 +02:00
Pau d4a22f7962 Apply requested changes 2022-10-27 08:46:22 +02:00
Vicent Llopis d1e2b1f7d5 refactor: tranducciones 2022-10-26 09:02:54 +02:00
Vicent Llopis d4e2783630 refactor: corregidas traducciones, eliminado destroyAll y añadida transacción
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:39:07 +02:00
Pau d937a1b505 Add acl
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:45:09 +02:00
Pau a43e642ff7 Add transferclient
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:23:46 +02:00
Vicent Llopis f968b19d1e fix: testFront
gitea/salix/pipeline/head This commit looks good Details
2022-10-21 09:08:17 +02:00
Vicent Llopis 2d0cb60b50 feat: check if uses mana
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 08:55:05 +02:00
Vicent Llopis 51cad75298 fix: testFront
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 08:17:15 +02:00
Vicent Llopis 9ea427dbfe refactor: move front to back funcionality
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 13:45:46 +02:00
Vicent Llopis ae3e3c3c49 fix: id model duplicated
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 12:37:06 +02:00
Vicent Llopis 5fce93abd5 refactor: change variables name
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 11:47:37 +02:00
Vicent Llopis 423454d19e feat: add date-picker 2022-10-18 11:47:22 +02:00
Alex Moreno 0bc018ec02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:06:31 +02:00
Vicent Llopis 40075e7e21 fix: testFront
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 14:38:47 +02:00
Vicent Llopis 2455a11c26 feat: changeMultipleDiscount uses the same popover than changeDiscount 2022-10-14 14:29:21 +02:00
Vicent Llopis bb26fa6502 feat: add tFront
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 13:49:42 +02:00
Vicent Llopis deb8a00dfb feat: add backRoutes
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 10:47:54 +02:00
Vicent Llopis 1894492a2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 09:26:51 +02:00
Vicent Llopis d427c3a6db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4369-ticket.request.create_getItemTypeWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 11:48:31 +02:00
Vicent Llopis 37601934f5 feat: first option to delete and update
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 11:40:46 +02:00
Vicent Llopis a3a432c753 fix: delete one or more expeditions
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-06 10:18:19 +02:00
Vicent Llopis 26d04ce2d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 10:08:29 +02:00
Joan Sanchez 3dbd304217 Updated unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 09:21:24 +02:00
Joan Sanchez c8bad23621 Tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 07:41:40 +02:00
Vicent Llopis 11484edd10 feat: create new ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 15:18:07 +02:00
Joan Sanchez 21bb95fc88 CSV refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 08:28:47 +02:00
Alex Moreno eec1d6df4a add translation
gitea/salix/pipeline/head This commit is unstable Details
2022-09-30 09:06:43 +02:00
Alex Moreno 2c691eb796 feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 14:49:11 +02:00
Vicent Llopis c4649352a9 feat: add totalChecked
gitea/salix/pipeline/head This commit looks good Details
2022-09-23 08:50:11 +02:00
Vicent Llopis 2a64fde57c feat: add option "move expedition"
gitea/salix/pipeline/head This commit is unstable Details
2022-09-22 14:58:38 +02:00
Vicent Llopis 0fb7487191 feat: add getItemTypeWorker endpoint
gitea/salix/pipeline/head This commit looks good Details
2022-09-22 08:32:18 +02:00
Joan Sanchez 09bdee8b34 View & send PDF from loopback endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-19 12:59:32 +02:00
Alex Moreno 8dd02ab6ee quit console.logs
gitea/salix/pipeline/head This commit looks good Details
2022-09-06 15:08:28 +02:00
Alex Moreno b4b6d61460 feat(ticket_boxing): fix getVideo
gitea/salix/pipeline/head This commit is unstable Details
2022-08-03 14:57:39 +02:00
Alex Moreno 8a08b6f399 feat(ticket_boxing): return video stream
gitea/salix/pipeline/head This commit looks good Details
2022-08-02 15:15:05 +02:00
Alex Moreno 7d4dd7bb52 feat(boxing): return stream video
gitea/salix/pipeline/head This commit looks good Details
2022-08-01 15:03:17 +02:00
Alex Moreno d040ecb743 feat(ticket): getVideo from shinobi
gitea/salix/pipeline/head This commit looks good Details
2022-08-01 07:59:04 +02:00
Carlos Jimenez Ruiz 333828c583 Moved invoiceOut, Ticket and Sales refund loginc to backend + tests
gitea/salix/pipeline/head This commit looks good Details
2022-07-14 13:40:50 +02:00
Carlos Jimenez Ruiz d0e06a46d0 removed deprecated stowaway comp and usages
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-01 09:15:07 +02:00
Joan Sanchez f7d64e89ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-22 08:59:06 +02:00
Joan Sanchez 004f1390fc Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2022-06-22 08:58:51 +02:00
Joan Sanchez e7bf88c703 Fix order
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 14:26:34 +02:00
Joan Sanchez 16d677528a FIX: Sort by id as last field
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 12:18:33 +02:00
Carlos Jimenez Ruiz 7c580da6b8 refactor(ticket.create): display only active addresses
gitea/salix/pipeline/head This commit looks good Details
2022-06-17 16:42:59 +02:00
Vicent Llopis c125fd54eb refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:08:12 +02:00
Vicent Llopis 0425b17b4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund 2022-05-20 11:57:20 +02:00
Vicent Llopis 6441393249 refactor: pull request changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-12 08:47:17 +02:00
Joan Sanchez d39147689d Merge branch 'dev' into 3771-ticket.expedition
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 12:47:33 +00:00
Vicent Llopis 93e3ea103a added frontTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-04 12:05:46 +02:00
Vicent Llopis 9862960c99 comment frontTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-04 12:00:39 +02:00
Vicent Llopis 38f5541ef4 execute jenkins test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-04 11:27:03 +02:00
Vicent Llopis 66685e7541 feat(ticket.expedition): add popover
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-04 10:35:31 +02:00
Vicent Llopis 32ec755a35 fix: check if value.length
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 08:26:38 +02:00
Vicent Llopis 7abceb8564 refactor: add frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-04-26 13:08:06 +02:00
Vicent Llopis 6d35200607 updated front test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-25 10:10:59 +02:00
Vicent Llopis 789365799e refactor: changed name
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-25 08:45:50 +02:00
Vicent Llopis 2b9c656d21 feat(invoiceOut): add refund option
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-22 11:46:28 +02:00
Vicent Llopis 4ffb61b75c refactor: refund 2022-04-22 11:45:14 +02:00
Alex Moreno 7cecf1584b feat(ticket): change isAvailable to itemShortage
gitea/salix/pipeline/head This commit looks good Details
2022-04-19 12:04:06 +02:00
Carlos Jimenez Ruiz 6015050eed Merge branch 'dev' into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 09:12:14 +00:00
Carlos Jimenez Ruiz 080975208b Merge branch 'dev' into 2958-vnDescriptor_OpenSummaryPopup
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 08:12:28 +00:00
Vicent Llopis 013390fae9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 12:49:34 +02:00
Vicent Llopis fefff80af4 pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:01:15 +02:00
Vicent Llopis d88a404ce6 refactor: pull request changes 2022-04-11 10:01:00 +02:00
Vicent Llopis 655db502f7 refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 09:04:05 +02:00
Alex Moreno 786b7fa84f feat(descriptor): button open summary popup
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 08:02:05 +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 23cb8c1215 refactor(ticket_sale): update frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-03-30 09:54:01 +02:00
Vicent Llopis b78ecc06d2 fix(ticker_sale): only show mana options if currentWorker has mana
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-30 09:29:57 +02:00
Vicent Llopis c15aea213f feat(ticket_sale): add front test
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 13:42:56 +02:00
Vicent Llopis a5ca116571 feat(ticket_sale): add mana options 2022-03-29 13:42:37 +02:00
Alex Moreno aeb1eed421 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3615-print_deliveryNote
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 12:31:38 +01:00
Alex Moreno 0dc1848870 feat(print_deliveryNote): add withoutPrices type
gitea/salix/pipeline/head This commit looks good Details
2022-03-22 15:13:34 +01:00
Alex Moreno 7fc82cbfeb feat(ticket_descriptor-menu): add show proforma
gitea/salix/pipeline/head This commit looks good Details
2022-03-22 10:32:26 +01:00
Alex Moreno ca35c88be4 feat(print_deliveryNote): add proforma type
gitea/salix/pipeline/head This commit looks good Details
2022-03-22 07:38:14 +01:00
Joan Sanchez 00c53a7709 3668 - Deprecated field "isOfficial"
gitea/salix/pipeline/head This commit looks good Details
2022-03-18 11:06:16 +01:00
Alex Moreno 4046617eab short form
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 13:37:44 +01:00
Alex Moreno ab6b5aa803 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3352-docuware
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 13:14:34 +01:00
Alex Moreno 8bbb5d5c27 variable name
gitea/salix/pipeline/head This commit looks good Details
2022-02-21 11:28:00 +01:00
Alex Moreno 0f4649c50f feat(ticket_descriptor-menu): docuware implemented
gitea/salix/pipeline/head This commit looks good Details
2022-02-21 08:48:53 +01:00
Alex Moreno 89eee042b5 refactor(ticket_basic-data): zeroFill and move getMovable
gitea/salix/pipeline/head This commit looks good Details
2022-02-17 08:02:02 +01:00
Alex Moreno 3aeb2adb56 feat(ticket): docuware pdf
gitea/salix/pipeline/head There was a failure building this commit Details
2022-02-16 14:57:47 +01:00
Alex Moreno b4bed608ab refactor(ticket): getMovable
gitea/salix/pipeline/head This commit looks good Details
2022-02-09 15:01:02 +01:00
Joan Sanchez a8900b06b7 Merge branch 'dev' into 3258-import_buys
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 10:57:39 +00:00
Alex Moreno 60adb6f37c translations
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 07:21:34 +01:00
Joan Sanchez e618423ef8 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2022-01-31 12:27:42 +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 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
Carlos Jimenez Ruiz 4ac071d55c #3521 refactor(descriptor): navigation to index after deletion 2022-01-20 11:06:15 +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 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 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 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
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 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
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 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
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
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
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 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
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
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 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
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 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
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
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 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
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 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
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 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
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 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
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
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 5d8a9938d6 formattedAddress tests amended for postcode 2021-06-13 19:16:35 +02:00
Carlos Jimenez Ruiz 48f80fad8f added postcode to summary + basic data translation 2021-06-13 19:11:05 +02:00
Carlos Jimenez Ruiz fc3af7b6a6 ticket expedition now shows scan worker and scanned date
gitea/salix/pipeline/head This commit looks good Details
2021-06-09 14:25:50 +02:00
Carlos Jimenez Ruiz f969323a86 ticket create now takes clientFk from params
gitea/salix/pipeline/head This commit looks good Details
2021-06-08 17:30:00 +02:00
Joan Sanchez 5962a68d15 HOTFIX: Sort by zone hour
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 12:40:27 +02:00
Joan Sanchez a594e63566 Chip color
gitea/salix/pipeline/head This commit looks good Details
2021-06-01 11:39:40 +02:00
Joan Sanchez 27cd54bef1 Updated icons title
gitea/salix/pipeline/head This commit looks good Details
2021-05-27 11:41:45 +02:00
Joan Sanchez 920e7b1daf E2E fixes
gitea/salix/pipeline/head This commit looks good Details
2021-05-26 13:05:58 +02:00
Joan Sanchez 099ff657e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 14:08:02 +02:00
Joan Sanchez 26cc3a3dec 2891 - Show problems on tickets sales
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 10:01:18 +02:00
Carlos Jimenez Ruiz 2a4ff5a97b fixed a problem where warehouseFk wasn't yet defined upon updateStock call
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 10:31:51 +02:00
Carlos Jimenez Ruiz 9a1b6e4653 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2920-item_descriptor_user_warehouse
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 15:33:23 +02:00
Carlos Jimenez Ruiz 5c18c5c94c ticket module descriptor now takes warehouseFk from the ticket 2021-05-21 15:31:28 +02:00