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

12139 Commits

Author SHA1 Message Date
Pablo Natek c3d51259c4 Merge branch 'master' into hotFixTravelSummaryDialog 2025-03-31 10:31:24 +00:00
Pablo Natek ba2084e906 refactor: update TravelSummary and TravelList components for improved data fetching and summary view 2025-03-31 12:30:16 +02:00
Pablo Natek 668745981f Merge pull request 'fix: update filter in TravelCard to include route parameter' (!1651) from hotFix_travelCard_addWhere into master 
Reviewed-on: verdnatura/salix-front#1651
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2025-03-31 06:36:19 +00:00
Alex Moreno 17821917ea Merge branch 'master' into hotFix_travelCard_addWhere 2025-03-28 13:17:34 +00:00
Jorge Penadés 74a7b39108 Merge pull request 'refactor: refs #8718 simplify VnAccountNumber component and remove obsolete tests' (!1645) from 8718-hotfix-vnAccount into master 
Reviewed-on: verdnatura/salix-front#1645
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-28 13:04:29 +00:00
Javier Segarra fe2024c26a Merge branch 'master' into 8718-hotfix-vnAccount 2025-03-28 12:28:15 +00:00
Pablo Natek 1a1a859edc Merge branch 'master' into hotFix_travelCard_addWhere 2025-03-28 09:58:45 +00:00
Javier Segarra cb4c740319 Merge pull request 'hotfix_ticketSale_hasChanges' (!1650) from hotfix_ticketSale_hasChanges into master 
Reviewed-on: verdnatura/salix-front#1650
 2025-03-27 20:21:25 +00:00
Jon Elias c9e7411c90 Merge branch 'master' into hotfix_ticketSale_hasChanges 2025-03-27 14:04:07 +00:00
Alex Moreno c4ab00ffd2 fix: update filter in TravelCard to include route parameter 2025-03-27 14:56:22 +01:00
Javier Segarra 6e84341aea perf: add await 2025-03-27 13:06:29 +01:00
Javier Segarra a91a0146fe fix: hasChanges 2025-03-27 13:03:21 +01:00
Pablo Natek ba875ba5da Merge pull request 'fix: correct badge color logic in EntryList based on time difference' (!1646) from fixColorOnEntryList into master 
Reviewed-on: verdnatura/salix-front#1646
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-27 11:46:54 +00:00
Pablo Natek e06201c3d0 Merge branch 'master' into fixColorOnEntryList 2025-03-27 11:08:36 +00:00
Pablo Natek 07cb49f7a1 fix: comment out checkBadgeDate function in entryList.spec.js for clarity 2025-03-27 11:41:51 +01:00
Javier Segarra d45990c4a1 fix: monitorClients and monitorOrders descriptors 2025-03-27 10:37:26 +01:00
Pablo Natek 5966fe5390 fix: correct badge color logic in EntryList based on time difference 2025-03-27 09:09:50 +01:00
Javier Segarra 90a49a8513 Merge pull request 'hotfix_rowClickActions' (!1643) from hotfix_rowClickActions into master 
Reviewed-on: verdnatura/salix-front#1643
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-03-26 15:32:02 +00:00
Javier Segarra 28d7878b80 Merge branch 'master' into hotfix_rowClickActions 2025-03-26 15:21:38 +00:00
Jorge Penadés b464344cd0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 8718-hotfix-vnAccount 2025-03-26 16:02:08 +01:00
Jorge Penadés dd4e872fcc refactor: refs #8718 simplify VnAccountNumber component and remove obsolete tests 2025-03-26 16:00:50 +01:00
Alex Moreno 61083b54bf Merge pull request 'fix: update filter in EntryCard to include route parameter' (!1644) from hotFix_entryCard_addWhere into master 
Reviewed-on: verdnatura/salix-front#1644
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2025-03-26 13:39:31 +00:00
Alex Moreno bca84c54af fix: update filter in EntryCard to include route parameter 2025-03-26 14:19:09 +01:00
Javier Segarra 6528e76abb Merge branch 'master' into hotfix_rowClickActions 2025-03-26 13:50:08 +01:00
Javier Segarra 59f250fd65 fix: refactor click handling for state column in MonitorTickets.vue 2025-03-26 13:49:48 +01:00
Javier Segarra 3e0c6e0214 feat: add row click functionality to open customer and order summary tabs 2025-03-26 13:33:40 +01:00
Pablo Natek 0eda125579 Merge pull request 'feat: add rounded CC field to travel summary and translations' (!1639) from ccRoundedFix into master 
Reviewed-on: verdnatura/salix-front#1639
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-26 12:16:30 +00:00
Pablo Natek dcc45cf3d4 test: skip TicketList test suite 2025-03-26 12:38:53 +01:00
Pablo Natek ef2ce0500e test: mark route cloning test as skipped for task 8814 2025-03-26 12:05:32 +01:00
Pablo Natek 1a1b399606 fix: move warning badge condition to the correct position in getBadgeAttrs function 2025-03-26 09:57:40 +01:00
Pablo Natek eb4c05bc02 Merge branch 'ccRoundedFix' of https://gitea.verdnatura.es/verdnatura/salix-front into ccRoundedFix 2025-03-26 09:55:28 +01:00
Pablo Natek 42d613429f test: mark specific tests as skipped for tasks 8814 and 8779 2025-03-26 09:55:26 +01:00
Pablo Natek 117bc84ec9 Merge branch 'master' into ccRoundedFix 2025-03-26 07:42:47 +00:00
Alex Moreno bbc03ddcad fix: remove duplicated department selection from MonitorTicketFilter 2025-03-26 08:30:20 +01:00
Pablo Natek df396c08ea Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into ccRoundedFix 2025-03-26 07:48:23 +01:00
Pablo Natek 02e29c167a feat: add rounded CC field to travel summary and translations 2025-03-26 07:46:39 +01:00
Pablo Natek 77f0e7b492 Merge pull request 'fix: update default DMS code and improve filter handling in various components' (!1637) from someHotFixes into master 
Reviewed-on: verdnatura/salix-front#1637
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-25 13:32:41 +00:00
Pablo Natek 31205d40d3 fix: update default DMS code and improve filter handling in various components 2025-03-25 14:01:29 +01:00
Javier Segarra a519014685 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front 2025-03-25 11:41:07 +01:00
Javier Segarra af5a850311 fix: remove create prop departmentFk 2025-03-25 11:41:04 +01:00
Javier Segarra aa869f2bd8 Merge pull request 'HOTFIX: use store instead formData' (!1634) from hotfix_ticket_basicdata into master 
Reviewed-on: verdnatura/salix-front#1634
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-25 09:22:33 +00:00
Javier Segarra 0014356b33 fix: use store instead formData 2025-03-25 10:08:58 +01:00
Alex Moreno ca4e02a2bf chore: update changelog 2025-03-25 08:39:19 +01:00
Alex Moreno c6b36a64cb Merge pull request 'fix: refs #8602 disable use-like option in EntryBuys component' (!1632) from 8602-warmFix into test 
Reviewed-on: verdnatura/salix-front#1632
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-25 06:36:22 +00:00
Alex Moreno 4223680b60 Merge branch 'test' into 8602-warmFix 2025-03-25 05:30:37 +00:00
Pablo Natek 8da61655e2 fix: refs #8602 disable use-like option in EntryBuys component 2025-03-24 23:02:05 +01:00
Alex Moreno 075f81a104 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-24 15:10:38 +01:00
Alex Moreno a2594d2ab0 Merge pull request 'feat: implement onBeforeSave function to handle form data updates' (!1629) from hotFix_claim_basicData into master 
Reviewed-on: verdnatura/salix-front#1629
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-24 14:10:27 +00:00
Alex Moreno 95b566993a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-24 14:53:13 +01:00
Alex Moreno ec456b5ac8 Merge branch 'master' into hotFix_claim_basicData 2025-03-24 13:52:52 +00:00