Commit Graph

13509 Commits

Author SHA1 Message Date
Jon Elias 690d807ef1 Merge branch 'master' into Hotfix-ZoneExclusionDatedValue 2025-04-14 12:19:19 +00:00
Jon Elias ff6d2a71bf fix: fixed zone exclusion dated and fixed exclusion and inclusion when there was already an event 2025-04-14 13:44:53 +02:00
Javier Segarra f49f694970 Merge branch 'master' into hotfix_negative_available 2025-04-14 11:09:13 +00:00
Javier Segarra d399afcd89 Merge branch 'dev' into e2e_monitor 2025-04-14 10:39:54 +00:00
Jon Elias 7119cbbe89 Merge pull request 'Hotfix[ClientConsumption]: Fixed arrayData key' () from Hotfix-ClientConsumption into master
Reviewed-on: 
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-14 09:19:00 +00:00
Pau Rovira 2e8192ef7b Merge branch 'dev' into 8655-scrollUpButton 2025-04-14 09:13:39 +00:00
Javier Segarra dea2ddcd6c test: skip test 2025-04-14 11:12:13 +02:00
Javier Segarra b162dd7672 test: remove filter by column 2025-04-14 11:09:21 +02:00
Jon Elias 05311b8ffa fix: skip failing test 2025-04-14 10:56:28 +02:00
Javier Segarra d1440c1083 Merge branch 'dev' into e2e_monitor 2025-04-14 10:16:43 +02:00
Jon Elias 180153d8f0 fix: skip failing tests 2025-04-14 10:08:44 +02:00
Jon Elias 535bfa4347 fix: fixed arrayData key 2025-04-14 09:00:18 +02:00
Alex Moreno 6acd2e9e9f fix: add unremovableParams to VnFilterPanel for better filtering control 2025-04-14 08:38:16 +02:00
Pau Rovira 3bcafc5734 Merge branch 'dev' of https: refs #8655//gitea.verdnatura.es/verdnatura/salix-front into 8655-scrollUpButton 2025-04-14 07:19:15 +02:00
Pau Rovira 199a6c8cce Merge pull request 'fix: fixed CustomerConsumption errors when changing customer & downloading pdf' () from fix-CustomerConsumption into dev
Reviewed-on: 
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-04-14 05:17:46 +00:00
Pau Rovira 8309e2cddf Merge branch 'dev' into fix-CustomerConsumption 2025-04-14 05:13:42 +00:00
Guillermo Bonet 8e45abd041 Merge pull request 'refactor: refs #8289 Delete guessPriority method' (!1704) from 8289-routeGuessPriority into dev
Reviewed-on: #1704
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-14 05:02:24 +00:00
Guillermo Bonet b50ad72155 refactor: refs #8289 Delete guessPriority method 2025-04-13 09:42:08 +02:00
Guillermo Bonet c43f8f8af4 Merge branch 'test' into dev 2025-04-13 09:37:09 +02:00
Javier Segarra 510eab8af0 feat: fix minor bugs 2025-04-11 15:04:24 +02:00
Jon Elias 19481209d8 Merge pull request 'Fix[InputBic]: Fixed filter' (!1701) from Fix-AutoFillBic into dev
Reviewed-on: #1701
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-11 11:38:41 +00:00
Jon Elias 9410257822 Merge branch 'dev' into Fix-AutoFillBic 2025-04-11 11:33:09 +00:00
Benjamin Esteve 3a8f6455d3 refactor: refs #8862 update timeout settings for Cypress tests 2025-04-11 12:43:27 +02:00
Javi Gallego b321ab3240 Merge pull request 'refactor: refs #6696 remove VnUsesMana component and update related logic in TicketEditMana and TicketSale' (!1675) from 6696-manaAfterDepartment into dev
Reviewed-on: #1675
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-11 10:39:56 +00:00
Benjamin Esteve f3f1ec8039 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8862-testIsolationFalse 2025-04-11 12:38:25 +02:00
Javier Segarra b32a889dfe feat: updates 2025-04-11 12:30:37 +02:00
Benjamin Esteve 190310f285 Merge pull request 'refactor: refs #8833 streamline state color handling in Claim components' (!1691) from 8833-addColumnClassColor into dev
Reviewed-on: #1691
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-11 10:19:03 +00:00
Benjamin Esteve 01744012bc Merge branch '8862-testIsolationFalse' of https://gitea.verdnatura.es/verdnatura/salix-front into 8862-testIsolationFalse 2025-04-11 12:13:11 +02:00
Benjamin Esteve 0f17aa13ae refactor: refs #8862 update timeout settings for Cypress tests 2025-04-11 12:13:08 +02:00
Jon Elias 19fde32006 fix: fixed filter 2025-04-11 12:03:24 +02:00
Javi Gallego 1125067b09 Merge branch 'dev' into 6696-manaAfterDepartment 2025-04-11 12:02:55 +02:00
Javi Gallego 50ab4d28c2 Merge branch 'dev' into 6696-manaAfterDepartment 2025-04-11 12:01:57 +02:00
Benjamin Esteve d5a2c880cc Merge branch 'dev' into 8862-testIsolationFalse 2025-04-11 09:53:28 +00:00
Benjamin Esteve 76a2c8200f Merge branch 'dev' into 8833-addColumnClassColor 2025-04-11 09:13:22 +00:00
Jorge Penadés ce1aa3fb1b Merge pull request 'feat: refs #6564 add agency & ticket list' (!1108) from 6564-enhanceTicketAdvance into dev
Reviewed-on: #1108
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-11 09:11:10 +00:00
Jorge Penadés 8f141bba51 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance 2025-04-11 10:49:06 +02:00
Benjamin Esteve 5c6e97b42a feat: refs #8833 add neutral color variable and update state color handling in claim components 2025-04-11 10:44:57 +02:00
Javier Segarra 37bc464a98 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_negative_available 2025-04-11 10:06:21 +02:00
Javier Segarra 5fca08aaa2 test: add VnInputDateTime component tests 2025-04-11 10:05:47 +02:00
Benjamin Esteve 5225a9f57c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8833-addColumnClassColor 2025-04-11 09:45:18 +02:00
Javi Gallego 4e0450bf36 fix: rename variable for clarity in updateDiscount function 2025-04-11 07:52:41 +02:00
Javi Gallego bf1bb002e6 Merge branch 'dev' into 6696-manaAfterDepartment 2025-04-11 07:44:18 +02:00
Jon Elias 915776c4e8 Merge pull request 'Fix[Swift/Bic]: Fixed autocomplete when entering an iban' (!1697) from Fix-CustomerBillingData into dev
Reviewed-on: #1697
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-11 05:24:01 +00:00
Jon Elias f0a6fc00cf Merge branch 'dev' into Fix-CustomerBillingData 2025-04-11 04:11:15 +00:00
Jorge Penadés 96b57cab33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance 2025-04-10 18:22:38 +02:00
Jon Elias 6976569c42 Merge pull request 'Hotfix: SummaryProblems' (!1699) from Hotfix-TicketSummaryAddress into master
Reviewed-on: #1699
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-10 14:57:06 +00:00
Jon Elias 02b7afb9ec Merge branch 'Hotfix-TicketSummaryAddress' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-TicketSummaryAddress 2025-04-10 16:13:59 +02:00
Jon Elias 3027d579cf perf: deleted !important 2025-04-10 16:13:57 +02:00
Jon Elias 9e74a4a3f8 Merge branch 'master' into Hotfix-TicketSummaryAddress 2025-04-10 13:44:53 +00:00
Jon Elias 6b6118c66c fix: fixed recommended credit not showing correctly 2025-04-10 15:03:03 +02:00