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

12122 Commits

Author SHA1 Message Date
Javier Segarra 32fde59fba Merge pull request 'fix: solve problem when discount is 0' (!1586) from hotfix_ticketSale_updateDiscountTo0 into master 
Reviewed-on: verdnatura/salix-front#1586
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-03-12 11:58:26 +00:00
Jose Antonio Tubau 2d7e16764e Merge branch 'dev' into 8626-addTestCasesInRouteListTest 2025-03-12 12:50:15 +01:00
Alex Moreno d078969dd6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-12 12:48:07 +01:00
Alex Moreno 8f2865d7e2 chore: reduce page load timeout in Cypress configuration 2025-03-12 12:45:40 +01:00
Alex Moreno 9ca77ed3f1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-12 12:44:12 +01:00
Jose Antonio Tubau 8a3b9fe80d Merge pull request 'feat: refs #8721 add ticket navigation and update route columns' (!1554) from 8721-addBtnToTicketsListOfRoute into dev 
Reviewed-on: verdnatura/salix-front#1554
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-12 11:42:38 +00:00
Javier Segarra 428a3bfb5c Merge branch 'master' into hotfix_ticketSale_updateDiscountTo0 2025-03-12 11:40:56 +00:00
Pablo Natek cee2bb5111 feat: refs #8602 remove unused URL property from VnTable in ClaimList component 2025-03-12 12:40:46 +01:00
Jon Elias 9b2b488ca6 Merge pull request 'Hotfix[ZoneLocationsTree]: Fixed node fetching and adapted to back data' (!1589) from Hotfix-ZoneLocationsGetLeaves into master 
Reviewed-on: verdnatura/salix-front#1589
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-12 11:36:15 +00:00
Jon Elias 4900751bfc chore: try fix cypress bug 2025-03-12 11:34:02 +01:00
Jose Antonio Tubau deef93b0e9 Merge branch 'dev' into 8721-addBtnToTicketsListOfRoute 2025-03-12 10:33:41 +00:00
Jon Elias 5cb17fa4c9 chore: try fix cypress bug 2025-03-12 11:26:26 +01:00
Jon Elias ee54b38271 chore: try fix cypress bug 2025-03-12 11:25:31 +01:00
Jose Antonio Tubau 75adb54761 Merge pull request 'test: refs #8659 enhance AgencyWorkCenter tests with data attributes and improved messages' (!1483) from 8659-fixAgencyWorkCenterE2eTest into dev 
Reviewed-on: verdnatura/salix-front#1483
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-12 10:20:05 +00:00
Jon Elias 7a36c10128 chore: try fix cypress bug 2025-03-12 11:15:02 +01:00
Alex Moreno 72e793dc47 Merge branch 'dev' into 8659-fixAgencyWorkCenterE2eTest 2025-03-12 10:09:11 +00:00
Jose Antonio Tubau 91efa3c631 Merge pull request 'refactor: refs #8630 add vehicle translations and enhance route list columns' (!1431) from 8630-refactorRouteSectionsAndLocalizations into dev 
Reviewed-on: verdnatura/salix-front#1431
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2025-03-12 10:08:52 +00:00
Jon Elias c47e46dc5d test: updated pageLoadTimeout 2025-03-12 11:04:26 +01:00
Jose Antonio Tubau a109f54b7b test: refs #8630 disable destination change tests for issue #8756 2025-03-12 10:31:29 +01:00
Jose Antonio Tubau 47ec11e880 Merge branch 'dev' into 8721-addBtnToTicketsListOfRoute 2025-03-12 09:07:38 +00:00
Javier Segarra c89081fbb5 Merge branch 'hotfix_ticketSale_updateDiscountTo0' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_ticketSale_updateDiscountTo0 2025-03-12 10:01:44 +01:00
Jon Elias afb0e912d6 test: fix selectOption wait to ariaControl is visible 2025-03-12 10:01:33 +01:00
Javier Segarra 9306f88b99 fix: ticketSale 2025-03-12 09:59:44 +01:00
Jose Antonio Tubau 02834cd066 Merge branch 'dev' into 8630-refactorRouteSectionsAndLocalizations 2025-03-12 09:56:17 +01:00
Alex Moreno e42260207d Merge branch 'dev' into 8659-fixAgencyWorkCenterE2eTest 2025-03-12 08:46:57 +00:00
Jon Elias cb64dfdb41 Merge branch 'Hotfix-ZoneLocationsGetLeaves' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-ZoneLocationsGetLeaves 2025-03-12 09:46:03 +01:00
Jon Elias 2bcc0cdefe test: fix selectOption wait to ariaControl is visible 2025-03-12 09:46:02 +01:00
Jose Antonio Tubau 29a55987fe Merge pull request 'fix: refs #8616 update binding syntax for is-editable prop in AgencyList.vue' (!1446) from 8616-fixWarningsRouteSection into dev 
Reviewed-on: verdnatura/salix-front#1446
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2025-03-12 08:11:58 +00:00
Javier Segarra 44198ae7a7 fix: reset rows selected 2025-03-12 08:56:43 +01:00
Javier Segarra bf41ab168d feat: add icon deleted 2025-03-12 08:55:48 +01:00
Javier Segarra 01e8fe9eee Merge branch 'master' into hotfix_ticketSale_updateDiscountTo0 2025-03-12 08:55:13 +01:00
Jose Antonio Tubau c748f390c7 fix: refs #8630 remove duplicated locations 2025-03-12 08:45:17 +01:00
Jose Antonio Tubau 934a1ea671 Merge branch 'warmFix_8688-fixAgencyFilters' of https://gitea.verdnatura.es/verdnatura/salix-front into warmFix_8688-fixAgencyFilters 2025-03-12 08:35:39 +01:00
Jose Antonio Tubau b72642f517 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into warmFix_8688-fixAgencyFilters 2025-03-12 08:35:33 +01:00
Jose Antonio Tubau 579b15e6d7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8630-refactorRouteSectionsAndLocalizations 2025-03-12 08:33:50 +01:00
Jose Antonio Tubau a3dfd2cb4b Merge branch 'dev' into 8616-fixWarningsRouteSection 2025-03-12 07:24:10 +00:00
Alex Moreno 12a693d8cb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-12 08:14:09 +01:00
Alex Moreno 5a0ac63987 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-12 08:14:03 +01:00
Benjamin Esteve 1e935b1c61 Merge pull request '#8041 - unifyClassLink' (!1510) from 8041-unifyClassLink into dev 
Reviewed-on: verdnatura/salix-front#1510
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2025-03-12 06:27:52 +00:00
Jon Elias d22d5208e7 Merge branch 'master' into Hotfix-ZoneLocationsGetLeaves 2025-03-11 14:24:32 +00:00
Jose Antonio Tubau d5784630a3 Merge branch 'dev' into 8616-fixWarningsRouteSection 2025-03-11 14:15:09 +00:00
Jon Elias b9e5ed7346 fix: fixed node fetching and adapted to back data 2025-03-11 15:07:10 +01:00
Pablo Natek 6b8bba77af feat: refs #8602 add sorting options for select fields and update locale files with supplier name 2025-03-11 14:44:31 +01:00
Benjamin Esteve 3d33208228 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8041-unifyClassLink 2025-03-11 14:15:23 +01:00
Alex Moreno f089b3bf4c Merge pull request '8197-remove-backwards_compatibility' (!1583) from 8197-remove-backwards_compatibility into dev 
Reviewed-on: verdnatura/salix-front#1583
Reviewed-by: Jon Elias <jon@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-11 13:13:00 +00:00
Javier Segarra 06a0ac931a Merge branch 'master' into hotfix_ticketSale_updateDiscountTo0 2025-03-11 12:37:49 +00:00
Javier Segarra 0e10abc338 test: solve fail test 2025-03-11 13:37:39 +01:00
Pablo Natek 230bd17ed5 Merge branch 'dev' into 8616-fixWarningsRouteSection 2025-03-11 12:26:48 +00:00
Alex Moreno 7b5ca3c2be Merge branch 'dev' into 8197-remove-backwards_compatibility 2025-03-11 12:08:50 +00:00
Benjamin Esteve 4c12af8ec2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8041-unifyClassLink 2025-03-11 12:57:40 +01:00