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

11717 Commits

Author SHA1 Message Date
Alex Moreno f737148de7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8197-remove-backwards_compatibility 2025-03-11 08:24:02 +01:00
Alex Moreno 5ca5c77437 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-11 08:20:11 +01:00
Alex Moreno a2a7bdb762 test: skip Client balance tests in Cypress 2025-03-11 08:20:06 +01:00
Javi Gallego 852e72eb90 fix: update shelving options to use URL for data retrieval in ClaimAction component 2025-03-11 07:41:30 +01:00
Javi Gallego 2eeef91a1e fix(ClaimAction): update shelving options to use URL instead of static data 2025-03-10 20:33:39 +01:00
Alex Moreno d53d1a5ad3 chore: update CHANGELOG for version 25.10 with new features, changes, and fixes 2025-03-10 15:01:23 +01:00
Alex Moreno a49b2851a8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-10 14:14:29 +01:00
Alex Moreno 0e06f1fdb4 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-10 14:14:19 +01:00
Alex Moreno 3ca91d957e Merge branch 'dev' into 8197-remove-backwards_compatibility 2025-03-10 12:47:58 +00:00
Alex Moreno 3b930e1f58 Merge pull request 'refactor: refs #8197 rename VnCardBeta to VnCard' (!1582) from 8197-vnCardBeta_toStable into dev 
Reviewed-on: verdnatura/salix-front#1582
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-03-10 12:46:55 +00:00
Alex Moreno 2009d1a857 Merge branch 'dev' into 8197-vnCardBeta_toStable 2025-03-10 11:36:33 +00:00
Alex Moreno 18909b429d test(OrderList): fix inconsistency 2025-03-10 12:36:19 +01:00
Carlos Satorres 614d1a742a Merge pull request '8583-workerE2ETest' (!1570) from 8583-workerE2ETest into dev 
Reviewed-on: verdnatura/salix-front#1570
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-10 11:32:57 +00:00
Alex Moreno 5653ed6b18 fix: handle optional company code in CustomerMandates component 2025-03-10 12:23:08 +01:00
Carlos Satorres 4b1946c93b Merge branch 'dev' into 8583-workerE2ETest 2025-03-10 10:50:07 +00:00
Carlos Satorres 3647dbe17c Merge branch '8583-workerE2ETest' of https://gitea.verdnatura.es/verdnatura/salix-front into 8583-workerE2ETest 2025-03-10 11:39:52 +01:00
Carlos Satorres 1a824cd363 fix: refs #8583 fix AddCard 2025-03-10 11:39:49 +01:00
Javier Segarra ae7e9d85aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-10 11:27:37 +01:00
Javier Segarra 7a244412ef test: skip random fail test 2025-03-10 11:27:35 +01:00
Alex Moreno 47f6d59d79 Merge branch 'dev' into 8197-vnCardBeta_toStable 2025-03-10 10:07:25 +00:00
Alex Moreno 18871d5808 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-10 11:05:42 +01:00
Alex Moreno abce10b4ee fix(Jenkinsfile): reduce parallel Cypress test execution from 3 to 2 2025-03-10 11:05:40 +01:00
Jose Antonio Tubau d4151a33d3 Merge pull request '8472-unifyStileForMoreCreateDialogSlot' (!1577) from 8472-unifyStileForMoreCreateDialogSlot into dev 
Reviewed-on: verdnatura/salix-front#1577
Reviewed-by: Jose Antonio Tubau <jtubau@verdnatura.es>
 2025-03-10 09:09:51 +00:00
Jose Antonio Tubau aa377f44c0 Merge branch 'dev' into 8472-unifyStileForMoreCreateDialogSlot 2025-03-10 09:02:30 +00:00
Alex Moreno 960f2296b6 Merge branch 'dev' into 8197-vnCardBeta_toStable 2025-03-10 08:57:53 +00:00
Alex Moreno 919fd78ed0 Merge branch 'dev' into 8197-remove-backwards_compatibility 2025-03-10 08:57:37 +00:00
Alex Moreno f627b1b775 test(TicketList): fix inconsistency 2025-03-10 09:57:10 +01:00
Alex Moreno 2eeb0548aa Merge branch '8197-remove-backwards_compatibility' of https://gitea.verdnatura.es/verdnatura/salix-front into 8197-remove-backwards_compatibility 2025-03-10 09:54:38 +01:00
Alex Moreno bd72ccbb05 test: refs #8197 comment out ticket list tests for refactoring 2025-03-10 09:54:36 +01:00
Alex Moreno 4fbc0a8eb3 Merge branch 'dev' into 8197-remove-backwards_compatibility 2025-03-10 08:34:35 +00:00
Alex Moreno c61c644e46 refactor: refs #8197 simplify menu retrieval logic in LeftMenu component 2025-03-10 09:34:15 +01:00
Jose Antonio Tubau f65a317537 Merge branch 'dev' into 8472-unifyStileForMoreCreateDialogSlot 2025-03-10 08:29:43 +00:00
Jon Elias 069197a5d1 Merge branch 'dev' into 8197-vnCardBeta_toStable 2025-03-10 08:27:39 +00:00
Carlos Satorres f1b9b8ffd2 Merge pull request 'fix: refs #8731 customerBalance and test' (!1578) from 8731-customerBalanceFix into master 
Reviewed-on: verdnatura/salix-front#1578
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-10 08:22:13 +00:00
Alex Moreno e9d46ee259 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-10 09:21:31 +01:00
Alex Moreno e6554027ce Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-10 09:21:19 +01:00
Alex Moreno 434696581b refactor: refs #8197 rename VnCardBeta to VnCard 2025-03-10 09:10:56 +01:00
Carlos Satorres 2effb2b9bd Merge branch '8731-customerBalanceFix' of https://gitea.verdnatura.es/verdnatura/salix-front into 8731-customerBalanceFix 2025-03-10 09:08:39 +01:00
Carlos Satorres 18c927adb2 fix: refs #8731 required Date 2025-03-10 09:08:36 +01:00
Alex Moreno 31a7aef2d9 Merge branch 'master' into 8731-customerBalanceFix 2025-03-10 07:59:16 +00:00
Carlos Satorres 677477df8d fix: refs #8731 clean code 2025-03-10 08:43:03 +01:00
Carlos Satorres dc600a568b fix: refs #8731 remove logs 2025-03-10 08:42:14 +01:00
Carlos Satorres 1dce660239 Merge branch 'dev' into 8583-workerE2ETest 2025-03-10 07:38:45 +00:00
Jose Antonio Tubau a9302c8033 Merge branch 'dev' into 8472-unifyStileForMoreCreateDialogSlot 2025-03-10 08:24:38 +01:00
Carlos Satorres 1c48a6d504 fix: refs #8731 customerBalance 2025-03-10 08:14:35 +01:00
Carlos Satorres 0f8754e242 Merge pull request 'fix: refs #8727 hotfix customerMandate' (!1580) from 8727-fixCustomerMandate into master 
Reviewed-on: verdnatura/salix-front#1580
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-10 06:39:38 +00:00
Carlos Satorres 3a104fb51e fix: refs #8727 hotfix customerMandate 2025-03-10 07:29:20 +01:00
Alex Moreno 1f6667fbce Merge pull request '8322-Wagon' (!1569) from 8322-Wagon into dev 
Reviewed-on: verdnatura/salix-front#1569
 2025-03-07 12:37:27 +00:00
Carlos Satorres 95d5e5c4ae Merge branch 'dev' into 8583-workerE2ETest 2025-03-07 12:21:50 +00:00
Carlos Satorres e2fa5a87eb fix: refs #8731 customerBalance and test 2025-03-07 13:19:58 +01:00