0
0
Fork 0
Commit Graph

7360 Commits

Author SHA1 Message Date
Alex Moreno e7d0ecf6bb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-25 10:40:57 +02:00
Javier Segarra ff559384aa perf: refs #6943 #6943 merge command 2024-10-25 10:33:59 +02:00
Javier Segarra 21c4468fce Merge branch 'dev' into 6943_customer_spec 2024-10-25 10:33:34 +02:00
Alex Moreno 100dfbec3e Merge branch 'dev' into 8087-nuevoCampoTravel 2024-10-25 08:14:09 +00:00
Carlos Andrés 9e57c5e452 feat: refs #8087 Traspasar redadas a travels 2024-10-25 10:13:09 +02:00
Carlos Andrés 4c1e4aedd2 feat: refs #8087 Traspasar redadas a travels 2024-10-25 10:03:09 +02:00
Jon Elias 88fe60e296 Merge pull request 'Warmfix: packaging type field showing repetitive values' (!856) from Fix-CustomerSummaryTable into test
Reviewed-on: verdnatura/salix-front#856
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-25 08:02:24 +00:00
Jon Elias 139744d90b Merge branch 'test' into Fix-CustomerSummaryTable 2024-10-25 08:01:28 +00:00
Jon Elias 1daa8be635 perf: optimize get packing type function 2024-10-25 09:41:28 +02:00
Carlos Satorres a01e685d5d Merge pull request '#7283 #7831 itemMigration' (!553) from 7283-itemMigration into dev
Reviewed-on: verdnatura/salix-front#553
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-10-25 07:09:13 +00:00
Carlos Satorres 0cb5f34b15 Merge branch 'dev' into 7283-itemMigration 2024-10-25 07:08:16 +00:00
Alex Moreno c274641334 Merge pull request 'fix: better performance' (!869) from warmFix_accountAcls into dev
Reviewed-on: verdnatura/salix-front#869
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-10-25 06:52:31 +00:00
Carlos Satorres 69aec0cd83 Merge branch 'dev' into warmFix_accountAcls 2024-10-25 06:18:47 +00:00
Carlos Satorres 0aec073cf1 Merge pull request 'fix: entryFilters' (!872) from fix-entryFilters into dev
Reviewed-on: verdnatura/salix-front#872
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-25 06:18:07 +00:00
Carlos Satorres e8d2a40daf fix: entryFilters 2024-10-25 08:11:31 +02:00
Jon Elias e13090bb3b feat: refs #8038 added new functionality in VnSelect and refactor styles 2024-10-25 07:01:58 +02:00
Jon Elias 1889dd02e4 Merge branch 'master' into Hotfix-RecalculatePriceReload 2024-10-25 04:49:34 +00:00
Jon Elias 9ba16e4116 Merge branch 'Hotfix-RecalculatePriceReload' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-RecalculatePriceReload 2024-10-25 06:48:11 +02:00
Jon Elias 994237260e refactor: changed name of emitted event 2024-10-25 06:48:09 +02:00
Carlos Andrés 12c236276d feat: refs #8087 Traspasar redadas a travels 2024-10-24 19:32:20 +02:00
Alex Moreno 92e147355f fix: better performance 2024-10-24 15:13:05 +02:00
Alex Moreno 1e04ead780 perf: refs #8036 currentFilter 2024-10-24 15:11:58 +02:00
Carlos Satorres 67a5d10a5e Merge branch 'dev' into 7283-itemMigration 2024-10-24 13:10:23 +00:00
Javier Segarra 855979d22d perf: refs #7283 #7283 i18n params 2024-10-24 14:59:14 +02:00
Javier Segarra 791af46202 Merge pull request 'Warmfix: CreateNewPostcodeForm sync fields and sort selects' (!867) from warmfix_createNewPostcodeForm into test
Reviewed-on: verdnatura/salix-front#867
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-24 12:49:05 +00:00
Javier Segarra 9a518ed990 Merge branch 'test' into warmfix_createNewPostcodeForm 2024-10-24 12:48:25 +00:00
Alex Moreno e739f42ddf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8036-arrayData_exprBuilder_after 2024-10-24 14:46:00 +02:00
Alex Moreno fd72f4dd45 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-24 14:45:34 +02:00
Alex Moreno 9daed096db Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-24 14:45:23 +02:00
Alex Moreno e86afd57a0 Merge pull request 'feat: refs #8039 canceledError not notify' (!850) from 8039-canceledError_not_notify into dev
Reviewed-on: verdnatura/salix-front#850
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2024-10-24 12:44:19 +00:00
Javier Segarra 26de0cf72f perf: remove limit 2024-10-24 12:39:49 +00:00
Alex Moreno d529676ab5 Merge pull request 'fix: refs #7652 datakey' (!868) from 7652-hotfix-descriptorKey into master
Reviewed-on: verdnatura/salix-front#868
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-24 12:36:39 +00:00
Jorge Penadés 4828e32c9e fix: refs #7652 datakey 2024-10-24 14:26:16 +02:00
Jon Elias 7a4e43a025 Merge branch 'master' into Hotfix-RecalculatePriceReload 2024-10-24 12:13:48 +00:00
Jorge Penadés e26692fa51 Merge pull request '#7524 hotfix-vnProgressModal' (!866) from 7524-hotfix-vnProgressModal into master
Reviewed-on: verdnatura/salix-front#866
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-10-24 12:10:26 +00:00
Carlos Satorres 8cee3ac713 Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-10-24 14:08:14 +02:00
Carlos Satorres c2043902f8 fix: refs #7283 fix required 2024-10-24 14:08:11 +02:00
Javier Segarra 70dcadc57d Actualizar src/components/CreateNewPostcodeForm.vue 2024-10-24 11:52:13 +00:00
Carlos Satorres 92ff8c188e Merge branch 'dev' into 7283-itemMigration 2024-10-24 11:39:33 +00:00
Carlos Satorres 551b81e421 Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-10-24 13:38:16 +02:00
Carlos Satorres 671d9fd6fb fix: refs #7283 itemtype fix 2024-10-24 13:38:13 +02:00
Jorge Penadés 823c354ef1 fix: refs #7524 vnProgressModal 2024-10-24 13:27:08 +02:00
Jorge Penadés f52b4c9a59 fix: refs #7524 vnProgressModal 2024-10-24 13:24:45 +02:00
Carlos Andrés 64f36c7d4b feat: refs #8087 Traspasar redadas a travels 2024-10-24 12:35:11 +02:00
Javier Segarra 3f640c650b perf: refs #7283 #7283 handle i18n 2024-10-24 12:32:15 +02:00
Alex Moreno cb2780fe6f Merge pull request 'refactor: refs #7524 use VnTable' (!861) from 7524-hotfix-useVnTable into master
Reviewed-on: verdnatura/salix-front#861
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-24 10:31:44 +00:00
Jorge Penadés c9cfb2b1cf fix: refs #7524 changes 2024-10-24 12:29:46 +02:00
Jon Elias c9e82f2caf refactor: deleted log 2024-10-24 12:04:54 +02:00
Jon Elias b02199eb07 fix: reload window when price is recalculated 2024-10-24 12:03:49 +02:00
Alex Moreno 48fdc9e624 Merge pull request '#7524 warmfix-useVnTable' (!862) from 7524-warmfix-useVnTable into test
Reviewed-on: verdnatura/salix-front#862
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-24 09:45:54 +00:00