661 Commits

Author	SHA1	Message	Date
Jorge Penadés	53aec24790	chore: refs #4074 drop workerCreate	2024-08-02 09:04:16 +02:00
Jon Elias	cf90007023	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-07-30 14:33:28 +02:00
Alex Moreno	026c632a4c	feat(customer): improve basicData to balance	2024-07-26 09:47:28 +02:00
Jon Elias	8ceee6f182	fix: fix conflicts	2024-07-25 07:06:27 +02:00
Jon Elias	3a9116987c	Merge branch 'dev' into 7717_fixOrderCatalog	2024-07-24 08:35:24 +00:00
Jon Elias	a7a1b7801c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule	2024-07-23 13:25:58 +02:00
Jon Elias	12370b6437	feat: refs #6346 new wagon type section	2024-07-23 13:22:54 +02:00
Jon Elias	18dac38fb2	Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer	2024-07-23 09:14:14 +02:00
Jon Elias	33ad8fcb9d	refactor: refs #7014 improved route.js & deleted RouteMain	2024-07-23 09:12:00 +02:00
Javier Segarra	7c8ddf9c2b	Merge branch 'dev' into 6321_negative_tickets	2024-07-20 00:22:37 +02:00
Jon Elias	eb2df02ad6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-07-19 14:55:09 +02:00
Jon Elias	7f376c8ea4	fix: refs #7717 fix catalog filter, searchbar redirect and search	2024-07-19 14:53:44 +02:00
Javier Segarra	c45ff7009c	Merge branch 'dev' into 6321_negative_tickets	2024-07-18 22:04:30 +02:00
Jon Elias	94aa3bc7a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End	2024-07-15 12:47:59 +02:00
Javier Segarra	be86b69079	fix: ticket menu order and i18n	2024-07-15 11:53:10 +02:00
Javier Segarra	8ea1fb6793	Merge branch 'dev' into feature/TicketDms	2024-07-15 09:30:10 +00:00
Javier Segarra	c56610515c	Merge branch 'dev' into TicketDms	2024-07-15 11:29:27 +02:00
Pablo Natek	35a165b9f3	Merge branch 'dev' into 7129-finishMigration	2024-07-15 09:25:52 +00:00
Pablo Natek	9098e63793	refactor: refs #7129 refactor with vnTable	2024-07-12 10:41:18 +02:00
Jon Elias	a4a9572c96	feat: refs #7323 fixed tests, changed calendar styles and fix workerCreate	2024-07-12 09:16:32 +02:00
Javier Segarra	c5c96bf51b	Merge branch 'dev' into feature/SaleTracking	2024-07-09 09:41:45 +02:00
Javier Segarra	3f2b675d07	feat: change ticketDms leftMenuItem position	2024-07-09 09:15:20 +02:00
Javier Segarra	cededb54e8	Merge branch 'dev' into feature/TicketDms	2024-07-09 09:14:40 +02:00
Javier Segarra	6bd119abc3	Merge branch 'dev' into 6896_Order_End	2024-07-08 13:01:34 +00:00
Jon Elias	7d90b536b0	Merge branch 'dev' into 6899_InvoiceOut_End	2024-07-08 09:32:32 +00:00
Javier Segarra	aabd575854	Merge branch 'dev' into feature/TicketPackages	2024-07-08 10:55:14 +02:00
Javier Segarra	84462fe201	Merge branch 'dev' into feature/TicketComponents	2024-07-08 10:14:13 +02:00
Javier Segarra	f87b806406	Merge branch 'dev' into feature/TicketPhotos	2024-07-08 10:10:24 +02:00
Javier Segarra	a303942f76	Merge branch 'dev' into feature/TicketExpedition	2024-07-08 08:05:33 +00:00
Jon Elias	0436dbae51	fix: refs #6896 fixed OrderList path	2024-07-05 10:21:02 +02:00
Javier Segarra	9d4cfbd90c	Merge branch 'dev' into feature/TicketPackages	2024-07-05 09:28:31 +02:00
William Buezas	decf33c0b7	small changes	2024-07-04 09:46:10 -03:00
Jon Elias	1b839a89f7	refactor: refs #6896 Order migration	2024-07-04 13:35:27 +02:00
Javier Segarra	d6cc447989	Merge branch 'dev' into feature/SaleTracking	2024-07-04 10:44:50 +02:00
Javier Segarra	14e26f0285	Merge branch 'dev' into feature/TicketComponents	2024-07-04 09:40:00 +02:00
Jon Elias	fcc8d59cb3	Merge branch 'dev' into 6899_InvoiceOut_End	2024-07-04 06:28:17 +00:00
Javier Segarra	f52ba11f42	Merge remote-tracking branch 'origin/dev' into 6321_negative_tickets	2024-07-03 23:07:25 +02:00
William Buezas	91eb966586	Ticket photos	2024-07-03 14:44:36 -03:00
Jon Elias	7914387735	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899_InvoiceOut_End	2024-07-03 09:46:54 +02:00
Pablo Natek	61bd1eaf04	merge dev	2024-07-03 09:33:04 +02:00
Javier Segarra	d15dc7336b	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-03 08:26:27 +02:00
William Buezas	5c36ad14f4	Ticket components	2024-07-02 21:33:19 -03:00
Javier Segarra	8a94701422	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-02 20:32:08 +02:00
Jon Elias	06f8121ede	Merge branch 'dev' into 6899_InvoiceOut_End	2024-07-02 15:24:52 +02:00
Jon Elias	cdbbd576e3	refactor: refs #6899 end invoiceOut migration with VnTable	2024-07-02 14:54:14 +02:00
William Buezas	9179dc7432	Ticket package	2024-07-02 09:35:18 -03:00
Javier Segarra	c3d97231d2	Merge branch 'dev' into 6321_negative_tickets	2024-07-02 12:20:58 +02:00
Pablo Natek	2ad9530b1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-add-e2e-to-route	2024-07-02 09:58:46 +02:00
Javier Segarra	68298b9ba6	feat: rreplace eti by labeler	2024-07-01 19:03:17 +02:00
William Buezas	dfed211578	Fix bad git pull merge	2024-07-01 11:10:50 -03:00
Javier Segarra	3f5f918684	Merge branch 'dev' into feature/TicketExpedition	2024-07-01 15:12:40 +02:00
Javier Segarra	7896e3d7f9	Merge branch 'dev' into feature/TicketDms	2024-07-01 14:59:09 +02:00
Javier Segarra	0cbd7c9cae	Merge branch 'dev' into feature/TicketService	2024-07-01 14:53:08 +02:00
Javier Segarra	527c565ca9	Merge branch 'dev' into feature/TicketTracking	2024-07-01 14:50:23 +02:00
Javier Segarra	9bb75b8305	Merge branch 'dev' into feature/TicketVolume	2024-07-01 14:48:12 +02:00
Javier Segarra	eeab4ed915	updates	2024-07-01 13:18:19 +02:00
Javier Segarra	0dfdb1edb0	Merge branch '7648_customerEntries' into 7648_dev_customerEntries	2024-07-01 12:27:07 +02:00
Javier Segarra	71900b15a6	feat: newsection and i18n	2024-07-01 12:18:58 +02:00
Alex Moreno	128303939b	fix(ticket router): typo	2024-07-01 07:41:58 +02:00
Pablo Natek	a69235e4d4	fix: refs #7404 add e2e and fix route	2024-07-01 07:39:35 +02:00
William Buezas	768b619904	Sale tracking	2024-06-30 17:43:21 -03:00
Javier Segarra	9f68c380da	Merge branch 'dev' into feature/TicketExpedition	2024-06-29 00:32:33 +02:00
Javier Segarra	946a2d4823	Merge branch 'dev' into feature/TicketService	2024-06-28 13:24:24 +02:00
William Buezas	db4c3a6799	Changes	2024-06-27 11:46:31 -03:00
William Buezas	0e8106af17	Resolve conflicts	2024-06-26 17:21:31 -03:00
William Buezas	fd03336c7a	Resolve conflicts	2024-06-26 09:12:23 -03:00
William Buezas	8ee4fa2e7d	Resolve conflicts	2024-06-26 08:39:56 -03:00
William Buezas	ad950f33c6	WIP	2024-06-26 08:27:36 -03:00
Carlos Satorres	c570f2058b	Merge branch 'dev' into 7409-workerBalance	2024-06-26 09:37:52 +00:00
Jon Elias	f596a9b5f7	fix: refs #7014 fix wagon module	2024-06-26 07:26:35 +02:00
Jon Elias	42df3894ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer	2024-06-26 07:16:42 +02:00
Javier Segarra	120a119b38	Merge branch 'dev' into feature/TicketTracking	2024-06-25 23:05:11 +02:00
Javier Segarra	151978160b	fix: ticket order	2024-06-25 23:01:26 +02:00
Javier Segarra	ff02e5d160	Merge branch 'dev' into feature/WeeklyTickets	2024-06-25 22:59:16 +02:00
Javier Segarra	7a2b334a64	Merge branch 'dev' into feature/TicketTracking	2024-06-25 22:41:15 +02:00
Javier Segarra	c45c24e983	Merge branch 'dev' into feature/TicketPurchaseRequest	2024-06-25 22:31:52 +02:00
Javier Segarra	1a2b4739c3	Merge branch 'dev' into feature/TicketBasicData	2024-06-25 22:27:18 +02:00
Carlos Satorres	6e33a2930b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance	2024-06-25 17:04:47 +02:00
Javier Segarra	1e080d02ed	Merge branch 'dev' into feature/WeeklyTickets	2024-06-25 14:48:31 +02:00
Javier Segarra	049174232a	Merge branch 'dev' into feature/TicketsFuture	2024-06-25 14:24:38 +02:00
Javier Segarra	5685d99cd6	Merge branch 'dev' into feature/TicketsAdvance	2024-06-25 14:22:00 +02:00
William Buezas	8e538fb463	WIP	2024-06-25 08:27:25 -03:00
Carlos Satorres	49b86672f5	Merge branch 'dev' into 7406-workerFormation	2024-06-25 11:18:05 +00:00
Jon Elias	e8111502c0	refactor: refs #7014 deleted main files and changed route files	2024-06-25 10:28:48 +02:00
William Buezas	fb12d4ddc0	WIP	2024-06-24 17:24:36 -03:00
William Buezas	4effba1580	Ticket dms	2024-06-24 16:38:41 -03:00
William Buezas	91df35fcae	Ticket volume	2024-06-24 11:12:49 -03:00
William Buezas	17e9d95702	Ticket notes	2024-06-24 09:02:29 -03:00
Javier Segarra	01816613f2	Merge branch 'dev' into 7323_department_descriptor_routerLink	2024-06-21 12:50:14 +00:00
William Buezas	5cf183607d	WIP	2024-06-21 09:20:03 -03:00
Javier Segarra	63b8ca46a3	Merge branch 'dev' into feature/TicketLog	2024-06-21 11:33:29 +02:00
Carlos Satorres	87a9ee5ccb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance	2024-06-21 09:50:38 +02:00
Carlos Satorres	fdedf7bf57	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-21 08:42:57 +02:00
William Buezas	9f1dd4d74d	WIP	2024-06-20 09:41:53 -03:00
William Buezas	00ebbbfc78	Ticket log	2024-06-20 08:40:05 -03:00
William Buezas	0afd7f4ae1	Ticket tracking	2024-06-19 10:22:20 -03:00
William Buezas	b3a4dd3f79	Ticket purchase request	2024-06-19 08:16:20 -03:00
Alex Moreno	819d1230c4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-19 09:57:31 +02:00
Carlos Satorres	ac28a6728a	refs #7409 change icon	2024-06-19 08:41:36 +02:00
William Buezas	bb208040bb	Last changes	2024-06-18 11:47:35 -03:00