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

4317 Commits

Author SHA1 Message Date
Jon Elias cff9831b88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases 2024-06-25 15:21:44 +02:00
Javier Segarra 0715e86530 Merge branch 'dev' into feature/WeeklyTickets 2024-06-25 12:49:14 +00:00
Javier Segarra d29bf09535 remove warnings 2024-06-25 14:48:39 +02:00
Javier Segarra 1e080d02ed Merge branch 'dev' into feature/WeeklyTickets 2024-06-25 14:48:31 +02:00
Jon Elias 1538e7dc7e Merge pull request 'feat: refs #6739 transferInvoice new checkbox and functionality' (!352) from 6739-invoiceOut into dev 
Reviewed-on: verdnatura/salix-front#352
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-25 12:46:20 +00:00
Jon Elias 5aca8104be Merge branch '6739-invoiceOut' of https://gitea.verdnatura.es/verdnatura/salix-front into 6739-invoiceOut 2024-06-25 14:41:13 +02:00
Jon Elias 31f8ab7c07 refactor: refs #6739 fix redirect transferInvoice 2024-06-25 14:41:11 +02:00
Jon Elias 975c844d65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6739-invoiceOut 2024-06-25 14:37:50 +02:00
Javier Segarra 4c8912e779 Merge pull request 'Tickets future' (!461) from hyervoni/salix-front-mindshore:feature/TicketsFuture into dev 
Reviewed-on: verdnatura/salix-front#461
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-25 12:30:34 +00:00
Javier Segarra 3374b84f38 Merge branch 'dev' into feature/TicketsFuture 2024-06-25 12:26:53 +00:00
Alex Moreno 1b544e0ff0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-25 14:24:59 +02:00
Alex Moreno 0776db2e0f warmFix: correct id 2024-06-25 14:24:58 +02:00
Javier Segarra 049174232a Merge branch 'dev' into feature/TicketsFuture 2024-06-25 14:24:38 +02:00
Javier Segarra 1a79f733f0 Merge pull request 'Tickets advance' (!462) from hyervoni/salix-front-mindshore:feature/TicketsAdvance into dev 
Reviewed-on: verdnatura/salix-front#462
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-25 12:23:40 +00:00
Javier Segarra 5685d99cd6 Merge branch 'dev' into feature/TicketsAdvance 2024-06-25 14:22:00 +02:00
Javier Segarra b47e20852e Merge pull request 'feature/TicketSale' (!445) from hyervoni/salix-front-mindshore:feature/TicketSale into dev 
Reviewed-on: verdnatura/salix-front#445
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-25 12:19:59 +00:00
Javier Segarra 603cbde09f Merge branch 'dev' into feature/TicketSale 2024-06-25 12:19:17 +00:00
William Buezas 4de347d0e8 Rmove nav navigation and organize buttons 2024-06-25 09:19:12 -03:00
William Buezas ba8145eabb Add required rule to VnInputTime and VnInputDate 2024-06-25 08:43:10 -03:00
Jorge Penadés b0cd40ab2f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection 2024-06-25 13:41:12 +02:00
William Buezas 54e3eb6f0d Add required rule to VnInputTime and VnInputDate 2024-06-25 08:40:21 -03:00
Javier Segarra 0816105e5f Merge branch 'feature/TicketBasicData' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/TicketBasicData 2024-06-25 13:35:49 +02:00
Javier Segarra 9817ae8c2c fix: column hidden v-if 2024-06-25 13:35:16 +02:00
William Buezas 266657fab5 Fix total difference 2024-06-25 08:35:11 -03:00
Alex Moreno 10a663b400 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-25 13:33:23 +02:00
Alex Moreno d7cc983f29 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-25 13:33:19 +02:00
Jorge Penadés 8d921322c4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection 2024-06-25 13:32:39 +02:00
Carlos Satorres c644abe571 Merge pull request '7406-workerFormation' (!405) from 7406-workerFormation into dev 
Reviewed-on: verdnatura/salix-front#405
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-25 11:31:46 +00:00
Jorge Penadés 239cdd74b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection 2024-06-25 13:27:50 +02:00
William Buezas 8e538fb463 WIP 2024-06-25 08:27:25 -03:00
Carlos Satorres 49b86672f5 Merge branch 'dev' into 7406-workerFormation 2024-06-25 11:18:05 +00:00
Alex Moreno d55d6ec06e Merge pull request 'master to test' (!483) from master into test 
Reviewed-on: verdnatura/salix-front#483
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-25 11:17:10 +00:00
Jorge Penadés e26ef0bf66 Merge pull request '#7578 add data-key attribute to CardSummary components' (!482) from 7578-hotfix-itemsWithName into master 
Reviewed-on: verdnatura/salix-front#482
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-25 11:08:23 +00:00
Jorge Penadés ff33923b7a feat: refs #7578 add data-key attribute to CardSummary components 2024-06-25 12:49:54 +02:00
Javier Segarra 1eaa0c9ce2 perf: replace ItemPicture in favour of VnImg 2024-06-25 12:39:21 +02:00
Javier Segarra 0c42bba779 perf: remove ItemPicture 2024-06-25 12:39:05 +02:00
Javier Segarra 98510c1d38 Merge remote-tracking branch 'origin/6977-ClonedURL' into feature/TicketSale 2024-06-25 12:38:53 +02:00
Javier Segarra 54d7263d13 Merge remote-tracking branch 'origin/dev' into feature/TicketSale 2024-06-25 12:23:32 +02:00
Carlos Satorres a705245783 refs #7406 fix pr 2024-06-25 12:18:02 +02:00
Jon Elias 2ab105dda5 feat: refs #6826 added rol summary link 2024-06-25 12:03:41 +02:00
Jorge Penadés 3c810254a4 fix: refs #7623 redirect 2024-06-25 11:40:07 +02:00
Javier Segarra d10f6b4d6c replace value sale.itemFk 2024-06-25 10:33:15 +02:00
Javier Segarra 5a66af341f fix: state translations 2024-06-25 10:07:36 +02:00
Jorge Penadés 9dc9162e8e fix: refs #7197 amount reactivity 2024-06-25 09:50:44 +02:00
Javier Segarra ea7ee97867 proposals 2024-06-25 09:35:21 +02:00
Jorge Penadés 262742fee3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-06-25 09:23:05 +02:00
Alex Moreno 86524fe9e2 Merge pull request '7631_testToMaster_2426' (!480) from 7631_testToMaster_2426 into master 
Reviewed-on: verdnatura/salix-front#480
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-06-25 06:40:04 +00:00
Alex Moreno d421cefeb1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-25 07:32:17 +02:00
William Buezas fb12d4ddc0 WIP 2024-06-24 17:24:36 -03:00
Jorge Penadés 11aadddd55 refactor: refs #7197 use invoiceInSearchbar & queryParams 2024-06-24 17:00:46 +02:00