12671 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	f5dd0834b4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-03-27 14:49:06 +01:00
Alex Moreno	69da78b655	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-03-27 14:48:58 +01:00
Pablo Natek	ba875ba5da	Merge pull request 'fix: correct badge color logic in EntryList based on time difference' (!1646) from fixColorOnEntryList into master ... Reviewed-on: #1646 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-27 11:46:54 +00:00
Pablo Natek	e06201c3d0	Merge branch 'master' into fixColorOnEntryList	2025-03-27 11:08:36 +00:00
Pablo Natek	07cb49f7a1	fix: comment out checkBadgeDate function in entryList.spec.js for clarity	2025-03-27 11:41:51 +01:00
Pablo Natek	3caa4abe9e	Merge pull request 'refactor: refs #8699 adjust column alignment in ExtraCommunity.vue for better readability' (!1647) from 8699-align-correctly-extra-comunity-columns into dev ... Reviewed-on: #1647 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-27 10:39:43 +00:00
Javier Segarra	d45990c4a1	fix: monitorClients and monitorOrders descriptors	2025-03-27 10:37:26 +01:00
Pablo Natek	169ebbe593	refactor: refs #8699 adjust alignment and sortable property for percentage column in ExtraCommunity.vue	2025-03-27 09:43:00 +01:00
Pablo Natek	04b0bb1db9	refactor: refs #8699 remove sortable property from percentage column in ExtraCommunity.vue	2025-03-27 09:40:36 +01:00
Pablo Natek	321493b6b6	refactor: refs #8699 adjust column alignment in ExtraCommunity.vue for better readability	2025-03-27 09:37:04 +01:00
Pablo Natek	5966fe5390	fix: correct badge color logic in EntryList based on time difference	2025-03-27 09:09:50 +01:00
Javier Segarra	a398f87f62	Merge pull request '#8772 - update VnLinkPhone for displaying phone numbers' (!1603) from 8772-align_linkPhone into dev ... Reviewed-on: #1603 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-03-27 06:24:19 +00:00
Javier Segarra	e0bac2c033	Merge branch 'dev' into 8772-align_linkPhone	2025-03-26 19:04:56 +00:00
Javier Segarra	90a49a8513	Merge pull request 'hotfix_rowClickActions' (!1643) from hotfix_rowClickActions into master ... Reviewed-on: #1643 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-03-26 15:32:02 +00:00
Javier Segarra	28d7878b80	Merge branch 'master' into hotfix_rowClickActions	2025-03-26 15:21:38 +00:00
Alex Moreno	ebdc835d97	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-03-26 14:41:55 +01:00
Alex Moreno	53aa46bfbf	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-03-26 14:41:51 +01:00
Alex Moreno	61083b54bf	Merge pull request 'fix: update filter in EntryCard to include route parameter' (!1644) from hotFix_entryCard_addWhere into master ... Reviewed-on: #1644 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-03-26 13:39:31 +00:00
Alex Moreno	bca84c54af	fix: update filter in EntryCard to include route parameter	2025-03-26 14:19:09 +01:00
Javier Segarra	6528e76abb	Merge branch 'master' into hotfix_rowClickActions	2025-03-26 13:50:08 +01:00
Javier Segarra	59f250fd65	fix: refactor click handling for state column in MonitorTickets.vue	2025-03-26 13:49:48 +01:00
Javier Segarra	3e0c6e0214	feat: add row click functionality to open customer and order summary tabs	2025-03-26 13:33:40 +01:00
Alex Moreno	671d553e93	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-03-26 13:26:01 +01:00
Alex Moreno	522e900e55	test: enable previously skipped tests in route and ticket list	2025-03-26 13:23:56 +01:00
Pablo Natek	0eda125579	Merge pull request 'feat: add rounded CC field to travel summary and translations' (!1639) from ccRoundedFix into master ... Reviewed-on: #1639 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-26 12:16:30 +00:00
Jon Elias	415d44a33a	Merge pull request '#7358: Added chip in Navbar to show environment' (!1618) from 7358-AddChipInNavbar into dev ... Reviewed-on: #1618 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-26 11:44:56 +00:00
Pablo Natek	dcc45cf3d4	test: skip TicketList test suite	2025-03-26 12:38:53 +01:00
Jon Elias	bbcdb1c361	Merge branch 'dev' into 7358-AddChipInNavbar	2025-03-26 11:22:56 +00:00
Pablo Natek	ef2ce0500e	test: mark route cloning test as skipped for task 8814	2025-03-26 12:05:32 +01:00
Benjamin Esteve	ceb18df7ff	Merge pull request 'feat: refs #8118 add VnDropdown component and integrate it into Claim and Ticket summaries' (!1517) from 8118-createComponentVnDropdown into dev ... Reviewed-on: #1517 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2025-03-26 10:32:29 +00:00
Jon Elias	97a143fa4d	Merge branch 'dev' into 7358-AddChipInNavbar	2025-03-26 10:21:23 +00:00
Benjamin Esteve	c20dd788d9	Merge branch 'dev' into 8118-createComponentVnDropdown	2025-03-26 09:45:10 +00:00
Jorge Penadés	40418c421b	Merge pull request '#8388 fix invoice-in' (!1587) from 8388-fixInvoiceIn into dev ... Reviewed-on: #1587 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-03-26 09:41:44 +00:00
Jorge Penadés	c3299d967b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn	2025-03-26 10:10:39 +01:00
Alex Moreno	1b280ef9fc	refactor: rename cardDescriptor to vnDescriptor in localization files	2025-03-26 10:03:53 +01:00
Alex Moreno	4e83c31d35	feat: refs #6994 create ParkingDescriptorProxy to VnLog	2025-03-26 09:59:11 +01:00
Pablo Natek	1a1b399606	fix: move warning badge condition to the correct position in getBadgeAttrs function	2025-03-26 09:57:40 +01:00
Pablo Natek	eb4c05bc02	Merge branch 'ccRoundedFix' of https://gitea.verdnatura.es/verdnatura/salix-front into ccRoundedFix	2025-03-26 09:55:28 +01:00
Pablo Natek	42d613429f	test: mark specific tests as skipped for tasks 8814 and 8779	2025-03-26 09:55:26 +01:00
Benjamin Esteve	bd1a38fd0e	Merge branch 'dev' into 8118-createComponentVnDropdown	2025-03-26 08:30:21 +00:00
Alex Moreno	382432636f	Merge pull request 'fix(VnLog): refs #6994 simplify value binding and improve descriptor handling' (!1636) from 6994-fix_vnLogValue_whenIsString into dev ... Reviewed-on: #1636 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-03-26 08:29:35 +00:00
Benjamin Esteve	c85c84e50a	Merge branch 'dev' into 8118-createComponentVnDropdown	2025-03-26 08:10:55 +00:00
Alex Moreno	e4bb2938e2	Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString	2025-03-26 08:07:23 +00:00
Benjamin Esteve	e3084ea39c	Merge pull request 'fix: refs #8790 format code and update default SMS message in SendSmsDialog component' (!1619) from 8790-smsPredefinedText into dev ... Reviewed-on: #1619 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-03-26 08:02:14 +00:00
Alex Moreno	74b8bbc189	Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString	2025-03-26 07:53:39 +00:00
Pablo Natek	117bc84ec9	Merge branch 'master' into ccRoundedFix	2025-03-26 07:42:47 +00:00
Benjamin Esteve	ee0b5558ad	Merge branch 'dev' into 8790-smsPredefinedText	2025-03-26 07:40:58 +00:00
Benjamin Esteve	c35b8fa293	Merge branch 'dev' into 8118-createComponentVnDropdown	2025-03-26 07:38:34 +00:00
Alex Moreno	209a3caac9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-03-26 08:32:00 +01:00
Alex Moreno	bbc03ddcad	fix: remove duplicated department selection from MonitorTicketFilter	2025-03-26 08:30:20 +01:00