7229 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	511a5bc614	Merge pull request 'feat: add Options Style in AddressList from TicketCrete' (!999) from hotfix_addressSelect_optionFormat into master ... Reviewed-on: #999 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-26 14:09:46 +00:00
Javier Segarra	1af90f695e	Merge branch 'master' into hotfix_addressSelect_optionFormat	2024-11-26 12:42:41 +00:00
Carlos Andrés	b20803e6b9	Actualizar src/pages/Travel/Card/TravelBasicData.vue	2024-11-26 12:31:23 +00:00
Carlos Satorres	75986bf7a8	Merge pull request 'fix: hotfix travel' (!1003) from hotfix-7366travel into master ... Reviewed-on: #1003 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-11-26 12:17:06 +00:00
Carlos Satorres	c5f2be688c	fix: fix true	2024-11-26 13:12:53 +01:00
Carlos Satorres	4008f50781	fix: remove	2024-11-26 13:08:28 +01:00
Carlos Satorres	728055352d	fix: fix raidDays	2024-11-26 13:06:55 +01:00
Carlos Satorres	ad8d5b5e9a	fix: hotfix travel	2024-11-26 13:00:38 +01:00
Javier Segarra	ac1153b14c	feat: add Options style in AddressList from OrderCreate	2024-11-26 12:26:18 +01:00
Javier Segarra	0e9fe82d3d	Merge branch 'master' into hotfix_addressSelect_optionFormat	2024-11-26 12:23:39 +01:00
Javier Segarra	63536ea0f5	feat: add Options style in AddressList from OrderCreate	2024-11-26 12:17:33 +01:00
Jorge Penadés	9c5125a4d2	Merge pull request '#8232 change default scopeDays' (!1000) from 8232-changeDefaultScopeDays into master ... Reviewed-on: #1000 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-26 09:44:18 +00:00
Jorge Penadés	15c1898044	feat: refs #8232 hide only if it is null	2024-11-26 10:42:14 +01:00
Jorge Penadés	a33f801543	refactor: refs #8232 use composable	2024-11-26 10:19:54 +01:00
Jorge Penadés	84adc40c18	feat: refs #8232 change default scopeDays	2024-11-26 10:16:53 +01:00
Alex Moreno	7feea110a6	fix(CustomerSummary): fixed CustomerSummaryTable max width	2024-11-26 09:29:09 +01:00
Alex Moreno	2076072eeb	fix(TicketSale): set old quantity when error	2024-11-26 09:21:51 +01:00
Alex Moreno	8fbf7fed43	fix(TicketSale): throw error when it should	2024-11-26 09:05:46 +01:00
Alex Moreno	1e4cda6c6a	fix(OrderCatalogFilter): remove limit	2024-11-26 07:39:37 +01:00
Alex Moreno	1ce1f1f8e0	Merge pull request '8231_testToMaster_2448' (!997) from 8231_testToMaster_2448 into master ... Reviewed-on: #997 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-11-26 06:28:29 +00:00
Javier Segarra	c3510aea60	feat: add Options Style in AddressList from TicketCrete	2024-11-26 00:18:42 +01:00
Javier Segarra	7e924bc791	Merge branch '8231_testToMaster_2448' of https://gitea.verdnatura.es/verdnatura/salix-front into 8231_testToMaster_2448	2024-11-25 14:59:29 +01:00
Javier Segarra	2ead484026	test: refs #8231 fix VnLocation	2024-11-25 14:59:26 +01:00
Alex Moreno	594fc60eec	chore: refs #8231 add changelog	2024-11-25 14:49:10 +01:00
Alex Moreno	fbd57dc96b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-25 13:02:58 +01:00
Jon Elias	843c54fcc1	Merge pull request 'Hotfix: ZoneLocationsTree' (!995) from Fix-ZoneLocationsTree2 into master ... Reviewed-on: #995 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-25 11:56:30 +00:00
Alex Moreno	8e7cb9c46e	fix: zoneLocationsTree check selected sons	2024-11-25 12:54:15 +01:00
Jon Elias	f3429297cf	Merge branch 'master' into Fix-ZoneLocationsTree2	2024-11-25 11:20:17 +00:00
Jon Elias	d191d88e81	refactor: modified button to prevent submit	2024-11-25 12:19:20 +01:00
Jorge Penadés	6c30ea9e7a	Merge pull request '#8207 hotfix-tableActions' (!991) from 8207-hotfix-tableActions into master ... Reviewed-on: #991 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-25 11:13:45 +00:00
Jorge Penadés	e994ae72b6	fix: refs #8207 add filter to reset	2024-11-25 12:08:37 +01:00
Jorge Penadés	a1284cefc2	refactor: refs #8207 add update fn	2024-11-25 12:01:28 +01:00
Jon Elias	c558636799	refactor: requested changes	2024-11-25 11:12:11 +01:00
Jorge Penadés	a3f56aaf24	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 8207-hotfix-tableActions	2024-11-25 10:27:00 +01:00
Jon Elias	1dedf00fef	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-ZoneLocationsTree2	2024-11-25 09:24:58 +01:00
Jon Elias	a1aa9337c8	fix: show data and fixed search button when excluding a location	2024-11-25 09:21:20 +01:00
Alex Moreno	e10e0d01e6	fix: zoneEventExclusion form dated	2024-11-24 11:53:40 +01:00
Jorge Penadés	8b52629b0b	refactor: refs #8207 improve logic	2024-11-22 15:55:30 +01:00
Jorge Penadés	3a4c0e729a	refactor: refs #8207 improve logic	2024-11-22 15:52:22 +01:00
Jorge Penadés	9d8698fa2f	refactor: refs #8207 improve logic	2024-11-22 15:49:07 +01:00
Jorge Penadés	661cc0b5ee	refactor: refs #8207 improve logic	2024-11-22 15:37:48 +01:00
Alex Moreno	01ffb663f1	fix(ClaimList): stateCode orderBy priority	2024-11-22 15:14:03 +01:00
Jorge Penadés	0eeb22d40a	chore: refs #8207 drop useless code	2024-11-22 13:56:30 +01:00
Jorge Penadés	7048f96565	refactor: refs #8207 imrove logic	2024-11-22 13:55:22 +01:00
Jorge Penadés	50fbf64cf9	fix: refs #8207 update btn wip	2024-11-22 13:33:35 +01:00
Jorge Penadés	c72fa52851	fix: refs #8207 auto-refresh	2024-11-22 13:03:23 +01:00
Alex Moreno	14d2ddfa83	fix: merge errors	2024-11-22 12:40:07 +01:00
Alex Moreno	4913cf2c29	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-22 12:10:04 +01:00
Javier Segarra	651b67e98f	Merge pull request 'fix: orderCatalogFilter and fix useArrayData' (!989) from hotFix_orderCatalogFilter_refactor_fix into master ... Reviewed-on: #989 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-22 10:24:18 +00:00
Alex Moreno	94361f18fa	Merge branch 'master' into hotFix_orderCatalogFilter_refactor_fix	2024-11-22 10:23:10 +00:00