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

6774 Commits

Author SHA1 Message Date
Guillermo Bonet 0537213a58 Merge pull request 'feat: refs #7006 itemTypeLog added' (!825) from 7006-itemTypeLog into dev 
Reviewed-on: verdnatura/salix-front#825
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-25 12:32:37 +00:00
Alex Moreno d14f2bd638 Merge branch 'dev' into 7006-itemTypeLog 2024-10-25 12:30:07 +00:00
Guillermo Bonet 494fc66c06 feat: refs #7006 itemType basic data new inputs 2024-10-25 14:14:51 +02:00
Guillermo Bonet 8edba36a74 feat: refs #7006 itemType basic data new inputs 2024-10-25 13:46:36 +02:00
Alex Moreno c127fee467 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-25 13:08:37 +02:00
Alex Moreno c1e4c45318 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-25 13:08:26 +02:00
Guillermo Bonet 57a3504a7f Merge branch 'dev' into 7006-itemTypeLog 2024-10-25 11:06:49 +00:00
Alex Moreno 48a1e6b15d Merge pull request 'fix: performance addEventListeners' (!874) from fix_performance into master 
Reviewed-on: verdnatura/salix-front#874
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-25 11:06:41 +00:00
Alex Moreno 5b24aa4570 fix: performance addEventListeners 2024-10-25 12:58:23 +02:00
Jorge Penadés 1b05a5173d Merge pull request 'fix: refs #7943 use summary' (!873) from 7943-fixWorker into dev 
Reviewed-on: verdnatura/salix-front#873
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-25 09:54:14 +00:00
Jorge Penadés cdb73f7a17 fix: refs #7943 use correct data-key 2024-10-25 11:50:20 +02:00
Jorge Penadés bb51a9e687 fix: refs #7943 use summary 2024-10-25 11:38:00 +02:00
Jon Elias 32a9a40392 Merge pull request 'Hotfix: reload window when price is recalculated' (!863) from Hotfix-RecalculatePriceReload into master 
Reviewed-on: verdnatura/salix-front#863
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-25 09:32:23 +00:00
Alex Moreno fc175666b1 Merge pull request '#6943 add comands to solve tests' (!851) from 6943_customer_spec into dev 
Reviewed-on: verdnatura/salix-front#851
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-25 09:08:09 +00:00
Javier Segarra 6bb6cd8d93 Merge branch 'dev' into 6943_customer_spec 2024-10-25 08:55:04 +00:00
Javier Segarra 02f682ac0b perf: refs #6943 #6943 merge command 2024-10-25 10:53:19 +02:00
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
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 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
Alex Moreno 92e147355f fix: better performance 2024-10-24 15:13:05 +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 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