1021 Commits

Author	SHA1	Message	Date
Pau	4e2741a9cd	Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente	2022-11-15 11:01:02 +01:00
Pau	31a0aae8e9	Fixed notification not getting inserted	2022-11-15 11:01:00 +01:00
Pau	2b3b2086d9	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-15 09:39:03 +00:00
Pau	f1b706d178	Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente	2022-11-15 10:37:13 +01:00
Pau	6339634756	refs #4457 move sql, remove await on front @2h	2022-11-15 10:37:12 +01:00
Vicent Llopis	b5f67425ff	Merge branch 'dev' into jenkins_backTest_solved	2022-11-15 08:54:05 +00:00
Pau	60d12826e4	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-15 07:59:53 +00:00
Pau	9d0cd36afe	Merge branch 'dev' into 4457'	2022-11-15 08:49:21 +01:00
Vicent Llopis	0637050375	fix: frontTest	2022-11-14 15:11:33 +01:00
Alexandre Riera	23ed6c6031	refs #3963 test front done	2022-11-14 14:30:35 +01:00
Alexandre Riera	99aa674995	refs #3963 working on mockup	2022-11-14 14:29:40 +01:00
Vicent Llopis	6e94d7f68e	fix: nombre variable incorrecto	2022-11-14 11:00:13 +01:00
Alexandre Riera	dc06ba7d89	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-14 09:58:18 +01:00
Alexandre Riera	7dd87b1ea8	refs #4700 icons future	2022-11-14 09:56:23 +01:00
Alexandre Riera	05f0eba741	Merge branch 'split-tour' into 3963-ticket-advance	2022-11-14 09:06:51 +01:00
Alexandre Riera	c16210dd8a	refs #4700 working on e2e	2022-11-11 15:58:11 +01:00
Alexandre Riera	117e2c03f5	refs #4700 tests back y empezando e2e	2022-11-10 15:54:00 +01:00
Pau	9004839e00	Merge branch '4484-ticket-withOutNegatives-default-true' of https://gitea.verdnatura.es/verdnatura/salix into 4484-ticket-withOutNegatives-default-true	2022-11-10 14:53:14 +01:00
Pau	01fe8c8997	requested changes	2022-11-10 14:53:08 +01:00
Pau	c15d40b237	Merge branch 'dev' into 4484-ticket-withOutNegatives-default-true	2022-11-10 08:45:15 +00:00
Pau	2704017486	check default true	2022-11-10 09:43:19 +01:00
Alexandre Riera	ff00066138	refs #4700 tests front y fixtures	2022-11-08 15:56:58 +01:00
Pau	2fc12dff52	#4457 @1h notifications working, need refactor ACL	2022-11-08 13:59:00 +01:00
Pau	e85505ee8e	#4457 implement notification system, @1h 30m	2022-11-08 12:26:01 +01:00
Alexandre Riera	896a7eb6f0	refs #4700 arreglar filtro y traducciones	2022-11-07 15:55:17 +01:00
Pau	a975f37fc3	Merge branch 'dev' into 4490-transfer-tickets-between-clients	2022-11-04 07:27:15 +00:00
Pau	42dd56a78c	Merge branch 'dev' into 4490-transfer-tickets-between-clients	2022-11-04 06:46:23 +00:00
Alexandre Riera	8e5f518eb6	refs #4753 texto y fecha sms cambiados	2022-11-03 14:16:11 +01:00
Vicent Llopis	3cc89c170c	Merge branch 'dev' into 3811-ticket.sale_updatePrice	2022-11-02 13:55:07 +00:00
Vicent Llopis	8a4aa6285b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-11-02 14:49:39 +01:00
Joan Sanchez	34997b72f5	Merge branch 'dev' into 3811-ticket.sale_updatePrice	2022-11-02 11:55:47 +00:00
Joan Sanchez	177b448441	Merge branch 'dev' into 4616-ticket.sale_mana	2022-11-02 06:42:35 +00:00
Pau	c576e503cf	fix httpBack.flush error	2022-10-27 09:05:05 +02:00
Pau	04514804b7	fix tests	2022-10-27 08:51:22 +02:00
Pau	d4a22f7962	Apply requested changes	2022-10-27 08:46:22 +02:00
Vicent Llopis	d1e2b1f7d5	refactor: tranducciones	2022-10-26 09:02:54 +02:00
Vicent Llopis	d4e2783630	refactor: corregidas traducciones, eliminado destroyAll y añadida transacción	2022-10-26 08:39:07 +02:00
Pau	d937a1b505	Add acl	2022-10-25 09:45:09 +02:00
Pau	a43e642ff7	Add transferclient	2022-10-25 09:23:46 +02:00
Vicent Llopis	f968b19d1e	fix: testFront	2022-10-21 09:08:17 +02:00
Vicent Llopis	2d0cb60b50	feat: check if uses mana	2022-10-21 08:55:05 +02:00
Vicent Llopis	51cad75298	fix: testFront	2022-10-20 08:17:15 +02:00
Vicent Llopis	9ea427dbfe	refactor: move front to back funcionality	2022-10-18 13:45:46 +02:00
Vicent Llopis	ae3e3c3c49	fix: id model duplicated	2022-10-18 12:37:06 +02:00
Vicent Llopis	5fce93abd5	refactor: change variables name	2022-10-18 11:47:37 +02:00
Vicent Llopis	423454d19e	feat: add date-picker	2022-10-18 11:47:22 +02:00
Alex Moreno	0bc018ec02	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-10-17 14:06:31 +02:00
Vicent Llopis	40075e7e21	fix: testFront	2022-10-14 14:38:47 +02:00
Vicent Llopis	2455a11c26	feat: changeMultipleDiscount uses the same popover than changeDiscount	2022-10-14 14:29:21 +02:00
Vicent Llopis	bb26fa6502	feat: add tFront	2022-10-07 13:49:42 +02:00
Vicent Llopis	deb8a00dfb	feat: add backRoutes	2022-10-07 10:47:54 +02:00
Vicent Llopis	1894492a2c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-07 09:26:51 +02:00
Vicent Llopis	d427c3a6db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4369-ticket.request.create_getItemTypeWorker	2022-10-06 11:48:31 +02:00
Vicent Llopis	37601934f5	feat: first option to delete and update	2022-10-06 11:40:46 +02:00
Vicent Llopis	a3a432c753	fix: delete one or more expeditions	2022-10-06 10:18:19 +02:00
Vicent Llopis	26d04ce2d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-06 10:08:29 +02:00
Joan Sanchez	3dbd304217	Updated unit tests	2022-10-04 09:21:24 +02:00
Joan Sanchez	c8bad23621	Tests	2022-10-04 07:41:40 +02:00
Vicent Llopis	11484edd10	feat: create new ticket	2022-10-03 15:18:07 +02:00
Joan Sanchez	21bb95fc88	CSV refactor	2022-10-03 08:28:47 +02:00
Alex Moreno	eec1d6df4a	add translation	2022-09-30 09:06:43 +02:00
Alex Moreno	2c691eb796	feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList	2022-09-26 14:49:11 +02:00
Vicent Llopis	c4649352a9	feat: add totalChecked	2022-09-23 08:50:11 +02:00
Vicent Llopis	2a64fde57c	feat: add option "move expedition"	2022-09-22 14:58:38 +02:00
Vicent Llopis	0fb7487191	feat: add getItemTypeWorker endpoint	2022-09-22 08:32:18 +02:00
Joan Sanchez	09bdee8b34	View & send PDF from loopback endpoint	2022-09-19 12:59:32 +02:00
Alex Moreno	8dd02ab6ee	quit console.logs	2022-09-06 15:08:28 +02:00
Alex Moreno	b4b6d61460	feat(ticket_boxing): fix getVideo	2022-08-03 14:57:39 +02:00
Alex Moreno	8a08b6f399	feat(ticket_boxing): return video stream	2022-08-02 15:15:05 +02:00
Alex Moreno	7d4dd7bb52	feat(boxing): return stream video	2022-08-01 15:03:17 +02:00
Alex Moreno	d040ecb743	feat(ticket): getVideo from shinobi	2022-08-01 07:59:04 +02:00
Carlos Jimenez Ruiz	333828c583	Moved invoiceOut, Ticket and Sales refund loginc to backend + tests	2022-07-14 13:40:50 +02:00
Carlos Jimenez Ruiz	d0e06a46d0	removed deprecated stowaway comp and usages	2022-07-01 09:15:07 +02:00
Joan Sanchez	f7d64e89ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-22 08:59:06 +02:00
Joan Sanchez	004f1390fc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-22 08:58:51 +02:00
Joan Sanchez	e7bf88c703	Fix order	2022-06-21 14:26:34 +02:00
Joan Sanchez	16d677528a	FIX: Sort by id as last field	2022-06-21 12:18:33 +02:00
Carlos Jimenez Ruiz	7c580da6b8	refactor(ticket.create): display only active addresses	2022-06-17 16:42:59 +02:00
Vicent Llopis	c125fd54eb	refactor: pull request changes	2022-05-20 12:08:12 +02:00
Vicent Llopis	0425b17b4e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund	2022-05-20 11:57:20 +02:00
Vicent Llopis	6441393249	refactor: pull request changes	2022-05-12 08:47:17 +02:00
Joan Sanchez	d39147689d	Merge branch 'dev' into 3771-ticket.expedition	2022-05-11 12:47:33 +00:00
Vicent Llopis	93e3ea103a	added frontTest	2022-05-04 12:05:46 +02:00
Vicent Llopis	9862960c99	comment frontTest	2022-05-04 12:00:39 +02:00
Vicent Llopis	38f5541ef4	execute jenkins test	2022-05-04 11:27:03 +02:00
Vicent Llopis	66685e7541	feat(ticket.expedition): add popover	2022-05-04 10:35:31 +02:00
Vicent Llopis	32ec755a35	fix: check if value.length	2022-04-28 08:26:38 +02:00
Vicent Llopis	7abceb8564	refactor: add frontTest	2022-04-26 13:08:06 +02:00
Vicent Llopis	6d35200607	updated front test	2022-04-25 10:10:59 +02:00
Vicent Llopis	789365799e	refactor: changed name	2022-04-25 08:45:50 +02:00
Vicent Llopis	2b9c656d21	feat(invoiceOut): add refund option	2022-04-22 11:46:28 +02:00
Vicent Llopis	4ffb61b75c	refactor: refund	2022-04-22 11:45:14 +02:00
Alex Moreno	7cecf1584b	feat(ticket): change isAvailable to itemShortage	2022-04-19 12:04:06 +02:00
Carlos Jimenez Ruiz	6015050eed	Merge branch 'dev' into 3830-ticket_sale	2022-04-13 09:12:14 +00:00
Carlos Jimenez Ruiz	080975208b	Merge branch 'dev' into 2958-vnDescriptor_OpenSummaryPopup	2022-04-13 08:12:28 +00:00
Vicent Llopis	013390fae9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale	2022-04-12 12:49:34 +02:00
Vicent Llopis	fefff80af4	pull request changes	2022-04-11 10:01:15 +02:00
Vicent Llopis	d88a404ce6	refactor: pull request changes	2022-04-11 10:01:00 +02:00
Vicent Llopis	655db502f7	refactor: pull request changes	2022-04-11 09:04:05 +02:00
Alex Moreno	786b7fa84f	feat(descriptor): button open summary popup	2022-04-11 08:02:05 +02:00