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

5415 Commits

Author SHA1 Message Date
Jon Elias 00b4e885c1 Merge branch 'dev' into 7206-ModifySelectAddress 2024-10-29 12:19:19 +00:00
Jon Elias 476ef1dedd feat: refs #7206 added inactive label and corrected minor errors 2024-10-29 13:14:42 +01:00
Jon Elias 9104e13a6d Merge branch 'dev' into Fix_OrderModuleProblems 2024-10-29 11:19:21 +00:00
Alex Moreno c7c1343c06 Merge branch 'dev' into 7283-itemFilterWorkerBuyer 2024-10-29 10:42:39 +00:00
Jon Elias 1ff77abaf5 Merge branch 'dev' into Fix_OrderModuleProblems 2024-10-29 08:26:16 +00:00
Jon Elias 5663064dd8 refactor: modified composable 2024-10-29 09:23:49 +01:00
Alex Moreno 42fbdff5bd test: fix e2e 2024-10-29 08:48:06 +01:00
Carlos Satorres 96f894cc6c fix: refs #7283 filter 2024-10-29 08:17:18 +01:00
Guillermo Bonet b8ecf40777 Merge branch 'dev' into 7266-buyLabelSupplier 2024-10-29 06:03:07 +00:00
Carlos Andrés b8ba313132 Merge pull request 'feat: refs #8087 Traspasar redadas a travels' (!864) from 8087-nuevoCampoTravel into dev 
Reviewed-on: verdnatura/salix-front#864
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-28 13:29:05 +00:00
Guillermo Bonet 15977357d9 refactor: refs #7266 Changed method name 2024-10-28 14:11:34 +01:00
Jon Elias 76dd27638a Merge branch 'dev' into 7970-NotifySaleChanges 2024-10-28 12:40:47 +00:00
Carlos Satorres d252f6d2a3 fix: refs #7283 fix preview 2024-10-28 13:22:33 +01:00
Carlos Satorres 965c2f7b20 fix: refs #7283 preview 2024-10-28 13:16:51 +01:00
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 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 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
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
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
Jorge Penadés 1da86900e6 fix: refs #7524 e2e & worker module 2024-10-27 13:43:38 +01: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 5b24aa4570 fix: performance addEventListeners 2024-10-25 12:58:23 +02: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
Alex Moreno e7d0ecf6bb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-25 10:40:57 +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 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 0cb5f34b15 Merge branch 'dev' into 7283-itemMigration 2024-10-25 07:08:16 +00:00
Carlos Satorres 69aec0cd83 Merge branch 'dev' into warmFix_accountAcls 2024-10-25 06:18:47 +00:00
Carlos Satorres e8d2a40daf fix: entryFilters 2024-10-25 08:11:31 +02:00