wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
8,480 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

8480 Commits

Author SHA1 Message Date
Jon Elias 57e53e43c6 Merge branch '6242-AddHasRoundingField' of https://gitea.verdnatura.es/verdnatura/salix-front into 6242-AddHasRoundingField 2025-01-14 07:14:47 +01:00
Jon Elias 1f622317e7 refactor: refs #6242 deleted v-for 2025-01-14 07:14:46 +01:00
Jon Elias 29e8bb6344 Merge branch 'dev' into 6242-AddHasRoundingField 2025-01-13 10:41:13 +00:00
Jon Elias 390dd05a06 Merge branch '6242-AddHasRoundingField' of https://gitea.verdnatura.es/verdnatura/salix-front into 6242-AddHasRoundingField 2025-01-13 11:38:46 +01:00
Jon Elias 21f0c80bc9 refactor: refs #6242 add TicketProblems component in descriptor 2025-01-13 11:38:45 +01:00
Alex Moreno ce698522c3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-13 10:23:41 +01:00
Alex Moreno d761af6537 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-13 10:23:27 +01:00
Jon Elias 330d0dd637 Merge pull request '#8225 use VnMoreOptions' (!1194) from 8225-UseSameMoreOptions into dev 
Reviewed-on: verdnatura/salix-front#1194
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 09:17:17 +00:00
Alex Moreno bb8e9c5baa Merge branch 'dev' into 8225-UseSameMoreOptions 2025-01-13 09:14:24 +00:00
Javi Gallego 7018f09ad1 Merge pull request 'feat: refs #8298 add price optimum input and update translations for bonus and price optimum' (!1185) from 8298-zonePriceOptimum into dev 
Reviewed-on: verdnatura/salix-front#1185
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 08:41:49 +00:00
Jon Elias f229ef1cd8 Merge branch 'dev' into 8225-UseSameMoreOptions 2025-01-13 07:35:38 +00:00
Jon Elias 413d567ffb refactor: refs #8225 requested changes 2025-01-13 08:34:32 +01:00
Pablo Natek 8ce4fc38e2 Merge pull request 'feat: add decimal places for longitude and latitude inputs in CustomerAddressEdit' (!1199) from fixDecimalP into master 
Reviewed-on: verdnatura/salix-front#1199
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-01-13 07:03:16 +00:00
Pablo Natek fb5d76737d feat: add decimal places for longitude and latitude inputs in CustomerAddressEdit 2025-01-13 08:01:05 +01:00
Jose Antonio Tubau e65b53fad0 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1140) from 8316-claimCardWithVnCardBeta into dev 
Reviewed-on: verdnatura/salix-front#1140
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 06:35:51 +00:00
Jose Antonio Tubau a8706b3daa Merge branch 'dev' into 8316-claimCardWithVnCardBeta 2025-01-13 06:34:35 +00:00
Alex Moreno 6b8f6c464c Merge pull request 'feat: refs #8372 workerPBX' (!1192) from 8372-workerPBX into dev 
Reviewed-on: verdnatura/salix-front#1192
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-10 12:39:00 +00:00
Alex Moreno a28d9280a4 Merge branch 'dev' into 8372-workerPBX 2025-01-10 12:38:01 +00:00
Jon Elias 57c538c9c9 fix: refs #8225 invoice in translations 2025-01-10 10:49:07 +01:00
Jon Elias ac1515e107 feat: refs #8225 added worker and zone modules 2025-01-10 10:27:03 +01:00
Jon Elias 69bcab0ec4 feat: refs #8225 added invoiceIn and travel module 2025-01-10 10:25:16 +01:00
Jon Elias 300d64b076 feat: refs #8225 added entry module and fixed translations 2025-01-10 10:22:37 +01:00
Jon Elias 774c714755 feat: refs #8225 added route and shelving module 2025-01-10 10:14:56 +01:00
Jon Elias 5d9227723e feat: refs #8225 added account and invoiceOut modules 2025-01-10 10:10:16 +01:00
Jon Elias 1b986f4b4c feat: refs #8225 use it in claim, item and order modules 2025-01-10 10:03:51 +01:00
Jon Elias 95712728d6 feat: refs #8225 added moreOptions and use it in customer and ticket summary 2025-01-10 10:00:42 +01:00
PAU ROVIRA ROSALENY 6cc400a975 Merge pull request 'fix: fixed InvoiceIn filter translations' (!1193) from invoiceInTranslations into dev 
Reviewed-on: verdnatura/salix-front#1193
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-01-10 08:38:46 +00:00
PAU ROVIRA ROSALENY 27aa2969e8 fix: fixed InvoiceIn filter translations 2025-01-10 07:34:29 +01:00
Robert Ferrús 0057932bfa feat: refs #8372 workerPBX 2025-01-09 14:46:53 +01:00
Carlos Satorres db67b8f01a Merge pull request 'fix: fix confirmRequest' (!1191) from hotfix-7283itemRequestConfirm into master 
Reviewed-on: verdnatura/salix-front#1191
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-09 11:53:15 +00:00
Carlos Satorres 2837d2e5af Merge branch 'master' into hotfix-7283itemRequestConfirm 2025-01-09 11:51:37 +00:00
Jon Elias fe4a681894 Merge branch 'dev' into 6242-AddHasRoundingField 2025-01-09 09:17:02 +00:00
Jon Elias 4fe6b7584d Merge branch '6242-AddHasRoundingField' of https://gitea.verdnatura.es/verdnatura/salix-front into 6242-AddHasRoundingField 2025-01-09 10:15:50 +01:00
Jon Elias fd68e997c5 refactor: refs #6242 forgotten translations 2025-01-09 10:15:48 +01:00
Alex Moreno 288919f695 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-09 10:11:56 +01:00
Alex Moreno 45365ba933 Merge pull request 'hotFix: refs #8264 parallelism' (!1182) from 8264-hotFix_globalInvoicing_paralellism into master 
Reviewed-on: verdnatura/salix-front#1182
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-01-09 09:11:37 +00:00
Alex Moreno 3a7f46856a Merge branch 'master' into 8264-hotFix_globalInvoicing_paralellism 2025-01-09 09:10:19 +00:00
PAU ROVIRA ROSALENY c6a9c55ddc Merge pull request 'fix: removed unused searchbar' (!1190) from 8322-workerDepartment into dev 
Reviewed-on: verdnatura/salix-front#1190
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-09 09:02:37 +00:00
PAU ROVIRA ROSALENY 343c1b538a Merge branch 'dev' into 8322-workerDepartment 2025-01-09 09:01:42 +00:00
Alex Moreno c95d2d7eac Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-09 09:54:26 +01:00
Alex Moreno e36e9b5617 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-09 09:54:15 +01:00
Carlos Satorres 135266a300 Merge branch 'master' into hotfix-7283itemRequestConfirm 2025-01-09 08:54:09 +00:00
Alex Moreno a317006cc4 fix: refs #8316 ref="claimFilterRef" 2025-01-09 09:52:44 +01:00
Carlos Satorres 5882ee8463 fix: fix confirmRequest 2025-01-09 09:44:37 +01:00
Jon Elias c379491df0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6242-AddHasRoundingField 2025-01-09 09:37:40 +01:00
Alex Moreno f45612f058 Merge pull request 'perf_redirectTransition' (!1178) from perf_redirectTransition into test 
Reviewed-on: verdnatura/salix-front#1178
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-01-09 08:16:53 +00:00
PAU ROVIRA ROSALENY e9ea70de19 fix: removed unused searchbar 2025-01-09 08:03:59 +00:00
Alex Moreno f668a4bac4 Merge branch 'test' into perf_redirectTransition 2025-01-09 08:00:57 +00:00
Alex Moreno 3f167ffd3a fix: hotFix if not date return null/undefined 2025-01-09 09:00:29 +01:00
Jon Elias a4e415f0ab Merge branch 'dev' into 6242-AddHasRoundingField 2025-01-09 07:55:52 +00:00