8233 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	cec7de7fc6	Merge branch 'dev' into Fix-ItemFixedPrice	2025-01-03 10:12:59 +00:00
Jon Elias	551498e0a5	Merge branch 'dev' into Fix-IntegrationE2ETests	2025-01-03 10:12:52 +00:00
Jon Elias	c9179c101e	fix: e2e tests	2025-01-03 11:11:04 +01:00
Alex Moreno	9a631a61f9	fix: refs #8197 redirection	2025-01-03 10:46:43 +01:00
Alex Moreno	e7a0c826c7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-01-03 09:25:56 +01:00
Alex Moreno	cd44a443c2	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-01-03 09:25:45 +01:00
Alex Moreno	80a99d1261	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-01-03 09:24:06 +01:00
Pablo Natek	ef201a8322	Merge pull request 'feat: refs #7301 enhance VnDateBadge styling and improve ItemLastEntries component' (!1161) from 7301-warmFix into test ... Reviewed-on: #1161 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-03 08:02:50 +00:00
Jon Elias	a6ac9c9d3f	refactor: item fixedPrice	2025-01-03 08:12:50 +01:00
Pablo Natek	7eb11c497b	Merge branch 'test' into 7301-warmFix	2025-01-02 13:48:39 +00:00
Jon Elias	1eaa81d243	Merge pull request 'Hotfix: ZoneExlcusion dated field' (!1165) from Hotfix-ZoneEventExclusionDate into master ... Reviewed-on: #1165 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-01-02 13:38:02 +00:00
Jon Elias	272d69d9e1	fix: dated field	2025-01-02 14:33:09 +01:00
Pablo Natek	6e38a23852	Merge pull request 'Warmfix: Zone exclusion dated field' (!1164) from Warmfix-ZoneExclusionEvent into test ... Reviewed-on: #1164 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-01-02 13:24:49 +00:00
Jon Elias	e648b82ecc	fix: dated field	2025-01-02 14:23:13 +01:00
PAU ROVIRA ROSALENY	93ba88f236	feat: refs #8322 added department changes	2025-01-02 13:31:37 +01:00
PAU ROVIRA ROSALENY	8eccf557f0	Merge branch 'dev' into 8322-worker	2025-01-02 12:04:55 +00:00
Pablo Natek	fb21bcc02e	feat: refs #7301 enhance VnDateBadge styling and improve ItemLastEntries component	2025-01-02 11:38:04 +01:00
Jon Elias	1cecea4aee	feat: refs #7202 added new field	2025-01-02 10:04:57 +01:00
Alex Moreno	d7b7850f62	fix: duplicate transalation after test to dev	2025-01-02 08:04:39 +01:00
Alex Moreno	a7e04557dc	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-01-02 07:52:47 +01:00
Alex Moreno	a65b8432d8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-01-02 07:51:39 +01:00
Jon Elias	16065b6342	Merge pull request 'Hotfix: zone events postcode select' (!1154) from Hotfix-ZoneEventSelect into master ... Reviewed-on: #1154 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-31 12:34:38 +00:00
Jon Elias	9525eef025	Merge branch 'master' into Hotfix-ZoneEventSelect	2024-12-31 12:33:33 +00:00
Jon Elias	27bbd7695f	Merge pull request 'Hotfix: use mapKey prop to show all ocurrencies' (!1157) from Hotfix-VnSms into master ... Reviewed-on: #1157 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-12-31 12:28:35 +00:00
Jon Elias	65a54b12e6	fix: use map-key prop to show all ocurrencies	2024-12-31 13:11:59 +01:00
Javier Segarra	d7bcc5b358	Merge pull request 'hotfix: CustomerConsumption campaignFilter' (!1156) from hotfix_customerConsumption_campaignFilter into master ... Reviewed-on: #1156 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-12-31 09:59:18 +00:00
Javier Segarra	b6161a41e8	perf: use dateRange	2024-12-31 10:48:07 +01:00
Javier Segarra	229130409a	fix: init fix	2024-12-31 10:45:37 +01:00
Jon Elias	582b4f68e0	Merge branch 'dev' into Fix-EntrySummary	2024-12-31 05:36:01 +00:00
Jon Elias	90c5aefac3	fix: entry summary view and build warnings	2024-12-31 06:14:23 +01:00
Javi Gallego	fdc0a856ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-12-30 14:53:11 +01:00
Javi Gallego	d67ae3cafb	style: update CustomerBalance.vue to set label color	2024-12-30 14:53:08 +01:00
Javi Gallego	cea24f4720	Merge pull request 'test: refs #7052 add unit tests for EditTableCellValueForm component' (!1104) from 7052-testEditTableCellValueForm into dev ... Reviewed-on: #1104 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-12-30 13:37:10 +00:00
Javi Gallego	d16e2e81e4	Merge branch 'dev' into 7052-testEditTableCellValueForm	2024-12-30 13:35:32 +00:00
Jon Elias	7e15d3c7a4	Merge branch 'master' into Hotfix-ZoneEventSelect	2024-12-30 13:05:27 +00:00
Jon Elias	3c7880d02f	fix: zone events postcode select	2024-12-30 14:02:23 +01:00
Javi Gallego	55ab9fea3e	test: refs #7052 remove .only from EditTableCellValueForm test suite	2024-12-30 08:55:00 +01:00
Jose Antonio Tubau	fc648530bb	Merge pull request '#8266 change expedition item name' (!1073) from 8266-changeExpeditionItemNameFront into dev ... Reviewed-on: #1073 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-30 07:04:32 +00:00
Jose Antonio Tubau	3cd861edee	Merge branch 'dev' into 8266-changeExpeditionItemNameFront	2024-12-30 07:03:36 +00:00
Javi Gallego	5784c079ce	Merge pull request '7924-itemInsepction' (!1114) from 7924-itemInsepction into dev ... Reviewed-on: #1114 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-29 09:10:43 +00:00
Javi Gallego	286e460638	Merge branch 'dev' into 7924-itemInsepction	2024-12-29 09:09:30 +00:00
Javi Gallego	1e0d444e85	refactor: refs #7052 remove unnecessary console logs from EditTableCellValueForm tests	2024-12-29 10:06:30 +01:00
Javi Gallego	53c1040cd8	refactor: refs #7052 move EditTableCellValueForm tests to a new location and enhance test coverage	2024-12-29 10:05:56 +01:00
Javi Gallego	6acf6f8131	Merge branch 'dev' into 7052-testEditTableCellValueForm	2024-12-29 09:44:12 +01:00
Jose Antonio Tubau	120f7892a8	Merge branch 'dev' into 8266-changeExpeditionItemNameFront	2024-12-27 14:06:33 +00:00
PAU ROVIRA ROSALENY	2eb7b7af13	refactor: refs #8322 changed translations	2024-12-27 14:58:16 +01:00
PAU ROVIRA ROSALENY	4b80800182	Merge branch 'dev' into 8322-worker	2024-12-27 13:56:28 +00:00
PAU ROVIRA ROSALENY	b03efbc977	refactor: refs #8322 changed Worker component to use VnSection/VnCardBeta	2024-12-27 14:51:23 +01:00
Javier Segarra	a297bb7f4a	Merge pull request 'perf: remove unused variables' (!1138) from warmfix_noUsedVars into test ... Reviewed-on: #1138 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-12-27 12:40:25 +00:00
Javier Segarra	7cc4d760dd	perf: remove unused variables	2024-12-27 12:02:34 +01:00