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

5041 Commits

Author SHA1 Message Date
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
Carlos Satorres a43a6aec82 refs #7355 fix Rol, alias 2024-07-08 09:59:07 +02: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
Carlos Satorres cbc055fba2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration 2024-07-08 07:33:20 +02:00
Carlos Satorres e1a25e3cf4 refs #7355 fix create Rol 2024-07-08 07:32:50 +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 1cfa2edc01 fix: i18n 2024-07-05 21:18:41 +02:00
Javier Segarra 356db41eac Merge branch 'dev' into feature/TicketPackages 2024-07-05 19:02:58 +00:00
Jorge Penadés aab823abd5 feat: refs #6943 wip consumption filter 2024-07-05 17:49:09 +02:00
William Buezas b87e88ae7f Handle quantity empty value 2024-07-05 12:04:18 -03:00
Jorge Penadés f723e6f058 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer 2024-07-05 16:49:32 +02:00
Jorge Penadés 028ae0b9ac chore: refs #7197 drop space 2024-07-05 16:44:17 +02:00
William Buezas 3490ba1a8c Add input type number 2024-07-05 11:36:37 -03:00
Jorge Penadés 4b709caf42 chore: refs #7197 idrop useless class 2024-07-05 16:32:49 +02:00
William Buezas 0adbd3e6d2 Ticket advance filter 2024-07-05 11:29:06 -03:00
Jorge Penadés a0ccb239b1 chore: refs #7197 improve form filling in Cypress tests 2024-07-05 16:25:49 +02:00
Jorge Penadés 6de7696fd1 fix: refs #7197 rollback crudModel 2024-07-05 16:00:37 +02:00
Jorge Penadés 904fbae251 fix: refs #7197 rollback crudModel 2024-07-05 15:58:08 +02:00
Jorge Penadés 3dd2745dde fix: refs #7197 rollback crudModel 2024-07-05 15:56:57 +02:00
Jorge Penadés 9e44896305 chore: refs #7197 fix tests 2024-07-05 15:41:53 +02: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 2e3970c0cc refs #7355 fix accountAlias 2024-07-05 13:18:46 +02:00
Jorge Penadés 1efdd38cfe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-05 13:07:44 +02:00
Jorge Penadés a11dd6a5e9 feat: refs #6943 lock grid mode 2024-07-05 13:05:57 +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
Jorge Penadés 04422a1052 refactor: #6943 wip use vnTable CustomerCredits 2024-07-05 12:27:02 +02:00
Jorge Penadés d5e916ff58 refactor: wip use vnTable CustomerCredits 2024-07-05 12:25:21 +02:00
Jorge Penadés 8fbaf43b82 fix: refs #6943 drop padding-left checkbox & create wrap mode vnRow 2024-07-05 12:04:43 +02:00
Jorge Penadés ff7f375347 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer 2024-07-05 11:49:59 +02:00
Carlos Satorres 592829c7a3 fix #7355 fix acls list 2024-07-05 11:33:36 +02:00