10342 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	da9f94c76b	Merge pull request '#8606: Fix Zone module' (!1402) from 8606-FixZoneModule into dev ... Reviewed-on: #1402 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-19 06:53:39 +00:00
Jon Elias	5e7989aa0a	Merge branch 'dev' into 8606-FixZoneModule	2025-02-19 06:51:28 +00:00
Javier Segarra	e0c7e0519d	Merge pull request 'Merge pull request 'fix: style' (!1425) from warmfix_vntable_card_style' (!1428) from down_warmfix_style_vntable_card into dev ... Reviewed-on: #1428 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-02-18 17:14:52 +00:00
Javier Segarra	b8b195b570	fix: style w-80	2025-02-18 13:57:44 +00:00
Javier Segarra	bb2ba2b599	Merge branch 'dev' into down_warmfix_style_vntable_card	2025-02-18 13:46:33 +00:00
Alex Moreno	630a578522	build: init version	2025-02-18 13:39:05 +01:00
Alex Moreno	52503c221d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-02-18 13:38:23 +01:00
Alex Moreno	4ccae7981c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-02-18 13:38:14 +01:00
Alex Moreno	11277795d8	Merge pull request '8627-devToTest' (!1421) from 8627-devToTest into test ... Reviewed-on: #1421 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-18 12:37:36 +00:00
Alex Moreno	53fc5c4c80	Merge branch 'test' into 8627-devToTest	2025-02-18 12:35:52 +00:00
Alex Moreno	7b41728958	test: refs #8627 fix formModel	2025-02-18 13:25:39 +01:00
Javier Segarra	d3104939ae	Merge branch 'dev' into down_warmfix_style_vntable_card	2025-02-18 12:17:27 +00:00
Jorge Penadés	6bef98bd10	Merge pull request 'fix: refs #8571 safely delete Authorization header from config in useCau' (!1429) from 8571-hotfix-preventNull into master ... Reviewed-on: #1429 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-18 12:01:25 +00:00
Jon Elias	91e06d5ef9	Merge pull request '#8555: Added new filter' (!1372) from 8555-AddNewFilterField into dev ... Reviewed-on: #1372 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-18 11:46:15 +00:00
Jorge Penadés	c3f786214f	fix: refs #8571 safely delete Authorization header from config in useCau	2025-02-18 12:45:11 +01:00
Alex Moreno	cdccabcb32	fix: refs #8627 formModel default null	2025-02-18 12:44:56 +01:00
Jon Elias	b386041f8e	Merge branch 'dev' into 8555-AddNewFilterField	2025-02-18 11:43:18 +00:00
Javier Segarra	e03a18a62a	Merge pull request 'fix: style' (!1425) from warmfix_vntable_card_style into test ... Reviewed-on: #1425 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-02-18 11:37:29 +00:00
Jose Antonio Tubau	c47ca095c5	Merge pull request 'fix: add data-cy attribute to card button for improved testing' (!1417) from warmFix_fixedMyEntryTest into dev ... Reviewed-on: #1417 Reviewed-by: Pablo Natek <pablone@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-18 11:29:45 +00:00
Alex Moreno	ea872ec246	Merge branch 'dev' into warmFix_fixedMyEntryTest	2025-02-18 11:28:37 +00:00
Alex Moreno	11848a1cd7	fix: refs #8627 routeDescriptor	2025-02-18 11:46:53 +01:00
Javier Segarra	d56e20d057	Merge pull request 'fix: style' (!1425) from warmfix_vntable_card_style into test ... Reviewed-on: #1425 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-02-18 10:40:57 +00:00
Jon Elias	a2bb7c44f3	Merge branch 'dev' into 8606-FixZoneModule	2025-02-18 10:36:52 +00:00
Jon Elias	927c40e356	refactor: refs #8606 translations	2025-02-18 11:34:53 +01:00
Javier Segarra	b3e724c684	fix: style	2025-02-18 11:34:03 +01:00
Alex Moreno	485d9203c2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8627-devToTest	2025-02-18 10:57:24 +01:00
Javier Segarra	20cb9f91e8	Merge pull request 'fix: customer address change id' (!1424) from fix_customerAddress_redirect into dev ... Reviewed-on: #1424 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2025-02-18 09:52:41 +00:00
Javier Segarra	bb507973d4	fix: customer address change id	2025-02-18 10:47:36 +01:00
Alex Moreno	e514c9cf73	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8627-devToTest	2025-02-18 10:34:56 +01:00
Alex Moreno	ee582b52b4	Merge pull request 'fix: refs #6943 rollback' (!1420) from 6943-fixVnCardConflicts into dev ... Reviewed-on: #1420 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-18 09:34:18 +00:00
Alex Moreno	4d49404105	fix(TicketProblems): refs #8627 fix isTaxDataChecked and add claim	2025-02-18 10:28:39 +01:00
Jorge Penadés	a766ba1633	fix: refs #6943 rollback	2025-02-18 10:22:26 +01:00
Guillermo Bonet	a7a592505b	Merge branch 'test' into dev	2025-02-18 10:13:59 +01:00
Guillermo Bonet	a3c91d702d	Merge branch 'master' into test	2025-02-18 10:13:46 +01:00
Guillermo Bonet	79d29fc071	Merge pull request 'fix: refs #8225 update email verification condition in WorkerDescriptorMenu' (!1419) from 8225-hotfix-condition into master ... Reviewed-on: #1419 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-18 09:13:02 +00:00
Jorge Penadés	ced34ccec3	fix: refs #8225 update email verification condition in WorkerDescriptorMenu	2025-02-18 10:08:28 +01:00
Jon Elias	8955c3c1a6	refactor: refs #8606 modified upcoming deliveries view	2025-02-18 09:48:33 +01:00
Javier Segarra	a8d0f4374e	Merge pull request 'hotfix ticketSale_discount' (!1416) from hotfix_ticketSale_discount into master ... Reviewed-on: #1416 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-18 08:08:56 +00:00
Jon Elias	5ce7c7f597	fix: refs #8606 fixed list e2e test	2025-02-18 09:05:38 +01:00
Javier Segarra	ab62cd5627	Merge branch 'master' into hotfix_ticketSale_discount	2025-02-18 08:02:22 +00:00
Alex Moreno	bbaca64cc9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-02-18 08:57:39 +01:00
Alex Moreno	ec24b928a9	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-02-18 08:55:59 +01:00
Alex Moreno	8a81621076	Merge pull request '8622-testToMaster' (!1411) from 8622-testToMaster into master ... Reviewed-on: #1411 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-18 07:54:23 +00:00
Jose Antonio Tubau	190e5a8b2d	Merge branch 'dev' into warmFix_fixedMyEntryTest	2025-02-18 06:35:14 +00:00
Jose Antonio Tubau	aa0ac3fc26	fix: add data-cy attribute to card button for improved testing	2025-02-18 07:32:54 +01:00
Alex Moreno	f7f3146e77	chore: refs #8622 changelog	2025-02-18 07:24:54 +01:00
Alex Moreno	29920a2939	Merge pull request 'test: refs #8372 update submit button selector in InvoiceInVat spec' (!1414) from 8372-fixVatTest into dev ... Reviewed-on: #1414 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-18 06:23:51 +00:00
Javier Segarra	93401dfcdc	fix: use mana in ticketSale.discount	2025-02-18 00:40:39 +01:00
Javier Segarra	6bb758b88c	fix: reload table when apply discount	2025-02-18 00:40:13 +01:00
Javier Segarra	07e6cebf04	Merge pull request 'Warmfix: style card mode' (!1398) from warmfix_style_vnTable_card into test ... Reviewed-on: #1398 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-17 17:42:30 +00:00