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

7026 Commits

Author SHA1 Message Date
Carlos Satorres f2803a6313 fix: refs #7283 item filters 2024-10-28 13:08:19 +01:00
Jon Elias c997081303 Merge branch 'Fix_OrderModuleProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems 2024-10-28 12:59:26 +01:00
Jon Elias cab5a165d2 refactor: changed confirmOrder directory 2024-10-28 12:59:25 +01:00
Jon Elias ac3013205e Merge branch 'dev' into 7970-NotifySaleChanges 2024-10-28 11:46:02 +00:00
Jon Elias 3d4ca2bc67 refactor: refs #7970 added emit 2024-10-28 12:45:13 +01:00
Jon Elias 639e08406e Merge branch 'dev' into Fix_OrderModuleProblems 2024-10-28 11:22:23 +00:00
Jon Elias ea05637bf2 Merge branch 'Fix_OrderModuleProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems 2024-10-28 12:21:28 +01:00
Jon Elias 17b1921af6 feat: added composable to confirm orders 2024-10-28 12:21:26 +01:00
Jon Elias 30f88070ff Merge pull request '#7193 modified parking to use the scope' (!879) from 7193-ParkingCreateScope into dev 
Reviewed-on: verdnatura/salix-front#879
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-28 10:48:03 +00:00
Jon Elias e5a221d073 Merge branch '7970-NotifySaleChanges' of https://gitea.verdnatura.es/verdnatura/salix-front into 7970-NotifySaleChanges 2024-10-28 11:44:50 +01:00
Jon Elias 9347bb1ef5 refactor: refs #7970 refactored VnConfirm to emit events 2024-10-28 11:44:49 +01:00
Jon Elias 68478c4d13 Merge branch '7193-ParkingCreateScope' of https://gitea.verdnatura.es/verdnatura/salix-front into 7193-ParkingCreateScope 2024-10-28 11:37:33 +01:00
Jon Elias 2cde850132 fix: refs #7193 fixed e2e test 2024-10-28 11:37:32 +01:00
Jon Elias 18a71e63e1 Merge branch 'dev' into 7193-ParkingCreateScope 2024-10-28 09:41:08 +00:00
Jon Elias df1c123444 feat: refs #7193 modified parking to use the scope and corrected small errors 2024-10-28 10:39:45 +01:00
Carlos Satorres 9d37d78e8b Merge pull request 'fix: itemType redirection and fix filters' (!878) from fix_itemType-redirection into dev 
Reviewed-on: verdnatura/salix-front#878
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-10-28 09:22:33 +00:00
Alex Moreno ffee9fb27c Merge branch 'dev' into fix_itemType-redirection 2024-10-28 09:14:21 +00:00
Alex Moreno bc8a87b267 chore: typo 2024-10-28 09:58:07 +01:00
Alex Moreno cca255507a fix: itemType redirection and fix filters 2024-10-28 09:57:25 +01:00
Jorge Penadés bb106e25a0 Merge pull request 'fix: refs #7524 e2e & worker module' (!876) from 7524-fixE2e into dev 
Reviewed-on: verdnatura/salix-front#876
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-28 08:51:17 +00:00
Jon Elias 454be43884 Merge branch 'dev' into 7970-NotifySaleChanges 2024-10-28 07:17:06 +00:00
Jon Elias ca6547e174 feat: refs #7970 notify changes 2024-10-28 07:48:11 +01:00
William Buezas c93f152060 fix: order catalog fixes 2024-10-27 15:27:53 -03:00
Jorge Penadés 0cc0e82aaa feat: refs #8078 add shortcut multi selection 2024-10-27 14:48:44 +01:00
Jorge Penadés 1da86900e6 fix: refs #7524 e2e & worker module 2024-10-27 13:43:38 +01:00
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
William Buezas 211da859bd fix: catalog view category and type filter 2024-10-25 08:57:16 -03: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
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