Alex Moreno
0a0e4dfca7
Merge branch 'test' into warmFix_remove_keepData
2025-04-01 12:59:46 +00:00
Alex Moreno
c15e4dcf32
Merge pull request 'fix: simplify data fetching logic in VnCard.vue' ( !1656 ) from fix_vnCard_url into test
...
Reviewed-on: verdnatura/salix-front#1656
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-01 11:27:37 +00:00
Alex Moreno
c09254d204
Merge branch 'test' into fix_vnCard_url
2025-04-01 11:04:15 +00:00
Alex Moreno
06e5188146
refactor: remove keepData property from components and update related logic
2025-04-01 13:02:49 +02:00
Alex Moreno
590afaba93
fix: update condition for rendering QChip in VnOrder component
2025-04-01 12:39:26 +02:00
Alex Moreno
e6e4b49d44
Merge branch 'test' into fix_vnCard_url
2025-04-01 09:57:20 +00:00
Alex Moreno
da148c5435
test: skip invoice deletion test and add spinner waits in VnShortcuts
2025-04-01 11:56:05 +02:00
Javier Segarra
49fafa2b34
Merge pull request 'hotfix_ticketSale_handle_notifications' ( !1660 ) from hotfix_ticketSale_handle_notifications into master
...
Reviewed-on: verdnatura/salix-front#1660
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-04-01 09:20:32 +00:00
Alex Moreno
246e4429bd
refactor: update getArrayData function to accept entityId for improved data fetching
2025-04-01 11:04:36 +02:00
Javier Segarra
98a4ac450d
Merge branch 'master' into hotfix_ticketSale_handle_notifications
2025-04-01 08:55:26 +00:00
PAU ROVIRA ROSALENY
35886999e4
fix: rollback
2025-04-01 07:54:41 +00:00
PAU ROVIRA ROSALENY
79fdaffbc8
fix: fixed CustomerTicket table order
2025-04-01 07:42:30 +00:00
Jon Elias
9f05984e80
Merge pull request 'Hotfix[CustomerAddress]: Fixed buttons disabled when there are no changes' ( !1641 ) from Hotfix-CustomerAddress into master
...
Reviewed-on: verdnatura/salix-front#1641
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-01 06:08:11 +00:00
Alex Moreno
8e66be1874
Merge branch 'dev' into fix_vnCard_url
2025-04-01 05:38:57 +00:00
Alex Moreno
40d59846fa
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
2025-04-01 07:28:11 +02:00
Alex Moreno
68a86e9fcd
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
2025-04-01 07:25:42 +02:00
Alex Moreno
7c5ce312cc
Merge branch 'master' into Hotfix-CustomerAddress
2025-04-01 05:20:59 +00:00
Jose Antonio Tubau
1c3eee9695
Merge pull request 'test: refs #8717 add integration test for agencyModes' ( !1545 ) from 8717-reviewAndFixAgencySection into dev
...
Reviewed-on: verdnatura/salix-front#1545
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-01 05:19:05 +00:00
Jose Antonio Tubau
e9ebb3ad8a
Merge branch 'dev' into 8717-reviewAndFixAgencySection
2025-04-01 04:44:23 +00:00
Javier Segarra
d81a14737c
Merge pull request 'fix: remove reserved ticket functionality from TicketProblems and TicketSaleMoreActions components' ( !1600 ) from hotfix_remove_reserved into master
...
Reviewed-on: verdnatura/salix-front#1600
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-03-31 21:50:48 +00:00
Javier Segarra
61cdf2c3c7
Merge branch 'master' into hotfix_remove_reserved
2025-03-31 21:38:47 +00:00
Javier Segarra
a81f8fcdaf
feat: add noOne
2025-03-31 14:43:15 +02:00
Javier Segarra
5ade9fd133
fix: add trycatch to handle notifications
2025-03-31 14:43:00 +02:00
Alex Moreno
95950b7485
refactor(VnCard): use prop.url when init
2025-03-31 13:27:28 +02:00
Alex Moreno
a937b2d3ac
Merge pull request ' #8449 - vnLogFilter' ( !1640 ) from 8449-vnLogFilter into dev
...
Reviewed-on: verdnatura/salix-front#1640
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-03-31 11:13:16 +00:00
Pablo Natek
767a6302e1
Merge pull request 'refactor: update TravelSummary and TravelList components for improved data fetching and summary view' ( !1658 ) from hotFixTravelSummaryDialog into master
...
Reviewed-on: verdnatura/salix-front#1658
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-31 10:56:40 +00:00
Alex Moreno
2f6b98a0bf
fix: refs #8449 update data-key attribute in VnTableFilter and related components
2025-03-31 12:50:32 +02:00
Alex Moreno
519ae66226
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_vnCard_url
2025-03-31 12:39:05 +02:00
Alex Moreno
497eb3a8bb
refactor(VnLog): refs #8449 clear filters when has userParams
2025-03-31 12:35:13 +02:00
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
Jose Antonio Tubau
1f41e3c8d1
Merge branch 'dev' into 8717-reviewAndFixAgencySection
2025-03-31 10:17:23 +00:00
Alex Moreno
5066cd8179
Merge branch 'dev' of https: refs #8449//gitea.verdnatura.es/verdnatura/salix-front into 8449-vnLogFilter
2025-03-31 11:44:02 +02:00
Jose Antonio Tubau
c205693131
Merge pull request '8440-createVehicleNotes' ( !1638 ) from 8440-createVehicleNotes into dev
...
Reviewed-on: verdnatura/salix-front#1638
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-03-31 09:01:35 +00:00
Jose Antonio Tubau
2bd0e88e3b
Merge branch 'dev' into 8440-createVehicleNotes
2025-03-31 08:39:35 +00:00
Javier Segarra
8c75ec41d8
Merge pull request ' #8667 : Modified ClientPayment' ( !1622 ) from 8667-FixClientNewPayment into dev
...
Reviewed-on: verdnatura/salix-front#1622
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-03-31 08:17:33 +00:00
Jon Elias
6cee67733d
Merge branch 'dev' into 8667-FixClientNewPayment
2025-03-31 07:54:41 +00:00
Pablo Natek
6dad310665
Merge pull request 'fix: adjust styles in ExtraCommunity.vue for better layout and readability' ( !1655 ) from fixOverFlow into dev
...
Reviewed-on: verdnatura/salix-front#1655
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-31 07:54:26 +00:00
Javier Segarra
ddfed3a59d
Merge branch 'master' into hotfix_remove_reserved
2025-03-31 07:51:58 +00:00
Alex Moreno
36f142800f
refactor: simplify data fetching logic in VnCard.vue
2025-03-31 09:51:36 +02:00
Pablo Natek
5b23a3ebc6
Merge branch 'dev' into fixOverFlow
2025-03-31 07:26:10 +00:00
Javi Gallego
9fdc8a1042
fix: update state color for 'managed' to 'loses' in ClaimList.vue
2025-03-31 08:51:37 +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
Jose Antonio Tubau
2d03b3a0b7
Merge branch 'dev' into 8440-createVehicleNotes
2025-03-31 06:34:06 +00:00
Javier Segarra
d60d7da33c
fix: improve monitorClient.department
2025-03-28 14:31:11 +01: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
Jose Antonio Tubau
033fe3375f
Merge branch '8717-reviewAndFixAgencySection' of https://gitea.verdnatura.es/verdnatura/salix-front into 8717-reviewAndFixAgencySection
2025-03-28 13:20:04 +01:00
Jose Antonio Tubau
4fbcb82234
fix: refs #8717 update AgencyCard to include filter by agency ID and correct locale key casing
2025-03-28 13:20:02 +01:00