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

12921 Commits

Author SHA1 Message Date
Benjamin Esteve c516ae1e12 Merge pull request 'refactor: refs #8673 replace VnPopup with inline display of evaNotes in ExtraCommunity.vue' (!1633) from 8673-viewEntryNotesField into dev 
Reviewed-on: verdnatura/salix-front#1633
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2025-03-28 11:55:33 +00:00
Benjamin Esteve 89d9c22c6a Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-28 11:34:12 +00:00
Javier Segarra cce3a0cef8 Merge branch 'test' into warmfix_monitorClients 2025-03-28 12:03:29 +01:00
Javier Segarra 50fb8a31a6 test: fix test 2025-03-28 12:03:15 +01:00
Alex Moreno e05d3140a3 Merge branch 'dev' into 8449-vnLogFilter 2025-03-28 10:55:43 +00:00
Pablo Natek ff30ca898c fix: adjust styles in ExtraCommunity.vue for better layout and readability 2025-03-28 11:07:34 +01:00
Pablo Natek 1a1a859edc Merge branch 'master' into hotFix_travelCard_addWhere 2025-03-28 09:58:45 +00:00
Javier Segarra a49c8891a7 fix: params.departmentFk i18n and ticketFilter.groupedStates 2025-03-28 10:22:08 +01:00
Javier Segarra ec723a884b fix: vnMoreOptions label 2025-03-28 09:52:23 +01:00
Benjamin Esteve feec9a7100 Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-28 08:36:52 +00:00
Alex Moreno ea694a606a Merge pull request 'feat: refs #8534 implement navigation and state query guards for improved routing control' (!1621) from 8534-wait_queries into dev 
Reviewed-on: verdnatura/salix-front#1621
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-28 08:32:16 +00:00
Benjamin Esteve cc41c90d8e Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-28 07:39:20 +00:00
Alex Moreno 7648fc6743 refactor: refs #8534 simplify stateQueryGuard usage and improve test structure 2025-03-28 08:06:51 +01:00
Alex Moreno 5c2c761eb0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8534-wait_queries 2025-03-28 07:18:51 +01:00
Javier Segarra 2a3e072b1b feat: add departmentFk to user data and filter clients by department 2025-03-28 01:25:38 +01:00
Javier Segarra dcf0b906f4 Merge branch 'master' into hotfix_remove_reserved 2025-03-27 20:22:54 +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
Javier Segarra 195fc7efd2 Merge branch 'dev' into 8667-FixClientNewPayment 2025-03-27 20:16:36 +00:00
Javier Segarra 7bc793cfb7 Merge branch 'dev' into 8717-reviewAndFixAgencySection 2025-03-27 20:15:57 +00:00
Javier Segarra 71755025a6 Merge branch 'master' into hotfix_remove_reserved 2025-03-27 19:42:57 +00:00
Jose Antonio Tubau 0aa4c1c527 test: refs #8717 skip RouteAutonomous test suite 2025-03-27 16:12:03 +01:00
Jose Antonio Tubau 34c18d2baa test: refs #8717 update invoice creation test to ensure save button visibility 2025-03-27 15:31:55 +01:00
Jon Elias c9e7411c90 Merge branch 'master' into hotfix_ticketSale_hasChanges 2025-03-27 14:04:07 +00:00
Jon Elias 3fc56700e4 Merge branch 'Hotfix-CustomerAddress' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-CustomerAddress 2025-03-27 15:03:12 +01:00
Jon Elias 60899ef2d2 perf: clean payload 2025-03-27 15:03:11 +01:00
Alex Moreno c4ab00ffd2 fix: update filter in TravelCard to include route parameter 2025-03-27 14:56:22 +01:00
Alex Moreno f5dd0834b4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-27 14:49:06 +01:00
Alex Moreno 69da78b655 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-27 14:48:58 +01:00
Alex Moreno 6e27edcf54 Merge branch 'dev' into 8449-vnLogFilter 2025-03-27 13:14:55 +00:00
Jose Antonio Tubau 1805e1e553 Merge branch 'dev' into 8440-createVehicleNotes 2025-03-27 12:59:27 +00:00
Jon Elias dcd5d357ae Merge branch 'master' into Hotfix-CustomerAddress 2025-03-27 12:37:30 +00:00
Jon Elias c743ad4ac1 Merge branch 'dev' into 8667-FixClientNewPayment 2025-03-27 12:37:25 +00: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
Benjamin Esteve c1536bd762 refactor: refs #8673 simplify evaNotes display logic in ExtraCommunity.vue 2025-03-27 12:54:52 +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
Benjamin Esteve 0d1f2f33e0 refactor: refs #8673 enhance display of evaNotes in ExtraCommunity.vue with conditional rendering 2025-03-27 12:27:42 +01:00
Benjamin Esteve 0b6ee4ba70 Merge branch 'dev' of https: refs #8673//gitea.verdnatura.es/verdnatura/salix-front into 8673-viewEntryNotesField 2025-03-27 12:13:11 +01: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
Pablo Natek 3caa4abe9e Merge pull request 'refactor: refs #8699 adjust column alignment in ExtraCommunity.vue for better readability' (!1647) from 8699-align-correctly-extra-comunity-columns into dev 
Reviewed-on: verdnatura/salix-front#1647
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-27 10:39:43 +00:00
Javier Segarra d45990c4a1 fix: monitorClients and monitorOrders descriptors 2025-03-27 10:37:26 +01:00
Pablo Natek 169ebbe593 refactor: refs #8699 adjust alignment and sortable property for percentage column in ExtraCommunity.vue 2025-03-27 09:43:00 +01:00
Pablo Natek 04b0bb1db9 refactor: refs #8699 remove sortable property from percentage column in ExtraCommunity.vue 2025-03-27 09:40:36 +01:00
Alex Moreno 75a20f7ca7 Merge branch 'dev' into 8449-vnLogFilter 2025-03-27 08:39:31 +00:00
Pablo Natek 321493b6b6 refactor: refs #8699 adjust column alignment in ExtraCommunity.vue for better readability 2025-03-27 09:37:04 +01:00
Benjamin Esteve 4765fda63b Merge branch '8673-viewEntryNotesField' of https://gitea.verdnatura.es/verdnatura/salix-front into 8673-viewEntryNotesField 2025-03-27 09:32:08 +01:00
Benjamin Esteve 04cc5e80f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8673-viewEntryNotesField 2025-03-27 09:31:46 +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 67e0791f34 fix: update order list tests to remove only and skip modifiers 2025-03-27 09:03:40 +01:00