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

6841 Commits

Author SHA1 Message Date
Alex Moreno 08204aa5f0 refactor(InvoiceInBasicData): use VnDms 2024-11-04 13:02:39 +01:00
Jon Elias e26fdfe4a3 Merge pull request '#7206 added inactive label and corrected minor errors' (!889) from 7206-ModifySelectAddress into dev 
Reviewed-on: verdnatura/salix-front#889
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-29 13:05:38 +00:00
Jon Elias 282999c49e fix: refs #7206 deleted duplicate code 2024-10-29 13:23:15 +01:00
Jon Elias bf480c20f8 Merge branch '7206-ModifySelectAddress' of https://gitea.verdnatura.es/verdnatura/salix-front into 7206-ModifySelectAddress 2024-10-29 13:22:01 +01:00
Jon Elias 8be4210138 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7206-ModifySelectAddress 2024-10-29 13:21:56 +01:00
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 89dfc0aff5 Merge pull request '#6896 fix Order module problems' (!817) from Fix_OrderModuleProblems into dev 
Reviewed-on: verdnatura/salix-front#817
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-29 11:20:13 +00:00
Jon Elias 9104e13a6d Merge branch 'dev' into Fix_OrderModuleProblems 2024-10-29 11:19:21 +00:00
Alex Moreno 53887277ca Merge pull request 'fix: refs #7283 filter' (!887) from 7283-itemFilterWorkerBuyer into dev 
Reviewed-on: verdnatura/salix-front#887
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-29 10:43:32 +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 df7f9b47d3 Merge pull request 'refactor: refs #7266 Changed method name' (!884) from 7266-buyLabelSupplier into dev 
Reviewed-on: verdnatura/salix-front#884
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-10-29 06:04:21 +00:00
Guillermo Bonet b8ecf40777 Merge branch 'dev' into 7266-buyLabelSupplier 2024-10-29 06:03:07 +00:00
Jorge Penadés 458c6b0f42 Merge pull request 'feat: refs #7524 add front test' (!881) from 7524-addTests into dev 
Reviewed-on: verdnatura/salix-front#881
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-28 13:43:04 +00:00
Jorge Penadés fecf9fddff Merge branch 'dev' into 7524-addTests 2024-10-28 13:41:41 +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
Jorge Penadés 934b32092b chore: refs #7524 fix test 2024-10-28 14:21:03 +01:00
Jorge Penadés a73a451cd8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7524-addTests 2024-10-28 14:19:36 +01:00
Guillermo Bonet 15977357d9 refactor: refs #7266 Changed method name 2024-10-28 14:11:34 +01:00
Jon Elias d4f92812cf Merge pull request '#7970 notify changes in lines' (!877) from 7970-NotifySaleChanges into dev 
Reviewed-on: verdnatura/salix-front#877
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-28 12:41:47 +00:00
Jon Elias 76dd27638a Merge branch 'dev' into 7970-NotifySaleChanges 2024-10-28 12:40:47 +00:00
Carlos Satorres a9092251a8 Merge pull request 'fix: refs #7283 item filters' (!880) from 7283-fixItemFilters into dev 
Reviewed-on: verdnatura/salix-front#880
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-28 12:28:04 +00:00
Jorge Penadés a1105f2ef1 feat: refs #7524 add front test 2024-10-28 13:24:46 +01: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 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