wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
4,624 Commits 154 Branches 0 Tags 24 MiB
Commit Graph

4624 Commits

Author SHA1 Message Date
Javi Gallego 32d2087bce feat: #7348 restore template 2024-07-08 12:56:34 +02:00
Javi Gallego 815a544244 Merge branch 'dev' into 7348-client-hasDailyInvoice 2024-07-08 12:44:06 +02:00
Jon Elias 03d47d0145 Merge pull request '#6899 end invoiceOut migration with VnTable' (!513) from 6899_InvoiceOut_End into dev 
Reviewed-on: verdnatura/salix-front#513
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-08 09:34:43 +00:00
Jon Elias 7d90b536b0 Merge branch 'dev' into 6899_InvoiceOut_End 2024-07-08 09:32:32 +00:00
Javier Segarra a73892723f Merge pull request '#6825 - vnTable_searchBtn_sticky' (!488) from 6825_vnTable_searchBtn_sticky into dev 
Reviewed-on: verdnatura/salix-front#488
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-08 09:07:16 +00:00
Javier Segarra fcbe6827e3 Merge branch 'dev' into 6825_vnTable_searchBtn_sticky 2024-07-08 11:06:31 +02:00
Javier Segarra 67e6386939 Merge pull request '#7185 - Multiple toast errors when logout' (!521) from 7185_logoutErrorsToast into dev 
Reviewed-on: verdnatura/salix-front#521
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-08 08:58:48 +00:00
Javier Segarra 500d582100 Merge branch 'dev' into 7185_logoutErrorsToast 2024-07-08 08:57:51 +00:00
Javier Segarra 9b0fb8001f Merge pull request 'Ticket packages' (!528) from hyervoni/salix-front-mindshore:feature/TicketPackages into dev 
Reviewed-on: verdnatura/salix-front#528
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-08 08:56:00 +00:00
Javier Segarra aabd575854 Merge branch 'dev' into feature/TicketPackages 2024-07-08 10:55:14 +02:00
Javier Segarra 869fd66840 Merge pull request 'Ticket components' (!522) from hyervoni/salix-front-mindshore:feature/TicketComponents into dev 
Reviewed-on: verdnatura/salix-front#522
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-08 08:15:00 +00:00
Javier Segarra 84462fe201 Merge branch 'dev' into feature/TicketComponents 2024-07-08 10:14:13 +02:00
Javier Segarra 5a09caa3b5 Merge pull request 'Ticket photos' (!534) from hyervoni/salix-front-mindshore:feature/TicketPhotos into dev 
Reviewed-on: verdnatura/salix-front#534
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-08 08:11:09 +00:00
Javier Segarra f87b806406 Merge branch 'dev' into feature/TicketPhotos 2024-07-08 10:10:24 +02:00
Javier Segarra 22faaf8186 Merge pull request 'Ticket expedition' (!499) from hyervoni/salix-front-mindshore:feature/TicketExpedition into dev 
Reviewed-on: verdnatura/salix-front#499
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-08 08:06:15 +00:00
Javier Segarra a303942f76 Merge branch 'dev' into feature/TicketExpedition 2024-07-08 08:05:33 +00:00
Alex Moreno d2c4c65b00 fix 2024-07-08 09:05:03 +02:00
Alex Moreno 5be762d781 refactors 2024-07-08 09:00:01 +02:00
Alex Moreno 5ec40ac6cf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5 2024-07-08 08:29:06 +02:00
William Buezas 1de091da47 Initial value of quantity 0 2024-07-05 17:03:31 -03:00
William Buezas 98595e9ce4 Add ticket price 2024-07-05 16:53:39 -03:00
Javier Segarra 356db41eac Merge branch 'dev' into feature/TicketPackages 2024-07-05 19:02:58 +00:00
William Buezas b87e88ae7f Handle quantity empty value 2024-07-05 12:04:18 -03:00
William Buezas 3490ba1a8c Add input type number 2024-07-05 11:36:37 -03:00
Alex Moreno ab5347d302 fix: e2e and min-height vnTable 2024-07-05 14:58:02 +02:00
Alex Moreno 2e02027a00 fix: cardDescriptor 2024-07-05 14:11:50 +02:00
Jon Elias e975279e2f Merge branch '6899_InvoiceOut_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899_InvoiceOut_End 2024-07-05 14:05:59 +02:00
Jon Elias 41052cce28 refactor: refs #6899 corrected api call 2024-07-05 14:05:57 +02:00
Jon Elias 6a4eb9f3b8 Merge branch 'dev' into 6899_InvoiceOut_End 2024-07-05 12:03:25 +00:00
Jon Elias 5112ae7e1a Merge branch '6899_InvoiceOut_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899_InvoiceOut_End 2024-07-05 14:02:25 +02:00
Jon Elias a634d8d6e6 refactor: refs #6899 deleted comments 2024-07-05 14:02:24 +02:00
Jon Elias fe530aa1c6 Merge branch 'dev' into 6896_Order_End 2024-07-05 11:36:37 +00:00
Jon Elias 2f173ac2e7 refactor: refs #6896 requested changes & deleted basicData and Lines warnings 2024-07-05 13:35:45 +02:00
Carlos Satorres 53a75954d1 Merge pull request 'refs #7366 fix travel' (!529) from 7366-fixTravels into dev 
Reviewed-on: verdnatura/salix-front#529
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-05 10:28:37 +00:00
Carlos Satorres ae7bb14382 Merge branch 'dev' into 7366-fixTravels 2024-07-05 10:27:45 +00:00
Alex Moreno 3a117a9f0e feat: add ClaimSummaryAction 2024-07-05 10:51:20 +02:00
Javier Segarra c2da14e59a perf: remove warningsCLI 2024-07-05 10:42:52 +02:00
Jon Elias e08a7710cf Merge branch 'dev' into 6899_InvoiceOut_End 2024-07-05 08:21:28 +00:00
Jon Elias 0436dbae51 fix: refs #6896 fixed OrderList path 2024-07-05 10:21:02 +02:00
Jon Elias 516a0642ab Merge branch '6899_InvoiceOut_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899_InvoiceOut_End 2024-07-05 10:16:53 +02:00
Jon Elias 9aa283a612 fix: refs #6899 fix openReport call 2024-07-05 10:16:52 +02:00
Javier Segarra da3a601741 feat: move Qbtn 2024-07-05 10:02:07 +02:00
Javier Segarra 60481861ee test: fix myentry.spec.js 2024-07-05 09:46:18 +02:00
Guillermo Bonet 7fae6b92a1 hotfix: refs #6769 Minor changes 2024-07-05 09:45:13 +02:00
Javier Segarra 7201fd6d21 fix: remove warnings 2024-07-05 09:41:36 +02:00
Javier Segarra df01967e2e perf: remove unnecessary import 2024-07-05 09:41:12 +02:00
Javier Segarra d2867857fc Merge branch 'dev' into 6825_vnTable_searchBtn_sticky 2024-07-05 09:40:40 +02:00
Javier Segarra 4ebcb420c3 test: fix myEntry 2024-07-05 09:31:05 +02:00
Javier Segarra 9d4cfbd90c Merge branch 'dev' into feature/TicketPackages 2024-07-05 09:28:31 +02:00
Jon Elias 44edccb905 refactor: refs #6896 fixed create order function 2024-07-05 09:27:20 +02:00