1331 Commits

Author	SHA1	Message	Date
Carlos Satorres	80ee73a59b	refs #4764 creacion de métodos y back	2023-05-05 10:01:15 +02:00
Carlos Satorres	8119d38414	Merge branch 'dev'	2023-05-05 09:35:39 +02:00
Juan Ferrer	a48e197e46	refs #5517 E2E fixes	2023-05-05 08:12:38 +02:00
Alex Moreno	c1ea1acc8c	refs #4614 fear(ticket): add 'set weight' funcionality	2023-04-26 13:49:08 +02:00
Alex Moreno	11d1900859	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor	2023-04-25 09:40:36 +02:00
Carlos Satorres	1088422360	refs #4764 boton abonar y datos	2023-04-24 13:14:38 +02:00
Vicent Llopis	9b432bac85	refs #5542 fix: test	2023-04-24 08:57:10 +02:00
Vicent Llopis	38e5660e61	refs #5542 refactorizado "abono" para que siempre cree un único ticket abono	2023-04-21 13:59:28 +02:00
Carlos Satorres	a9caa92f5c	refs #4764 boton abonar	2023-04-21 12:46:01 +02:00
Pablo Natek	de3b4f37c2	Merge branch 'dev' into 5075-client_balance	2023-04-21 05:54:00 +00:00
Joan Sanchez	a0d8ed1433	E2e fixes	2023-04-18 11:33:36 +02:00
Alex Moreno	560b5b374f	Merge branch 'dev' into 5075-client_balance	2023-04-18 05:37:12 +00:00
Carlos Satorres	a2ddbd8a66	refs #5284 test update	2023-04-13 14:04:10 +02:00
Carlos Satorres	90268a79b0	refs #5284 test createClaim	2023-04-13 13:41:10 +02:00
Carlos Satorres	44eab101cc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5284-fueraPlazo	2023-04-13 08:44:56 +02:00
Pablo Natek	c928274e24	Merge branch 'dev' into 5075-client_balance	2023-04-11 13:19:54 +00:00
Vicent Llopis	cd6a6f65b3	Merge branch '5327-ticket.sale_ordenarPorColumnas' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas	2023-04-11 07:45:20 +02:00
Vicent Llopis	cc9ce65678	test	2023-04-11 07:44:25 +02:00
Vicent Llopis	faab024e24	test	2023-04-06 09:59:45 +02:00
Joan Sanchez	ea60e31361	Merge pull request '5432-propiedadesBotonMas' (!1396) from 5432-propiedadesBotonMas into dev ... Reviewed-on: #1396 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-30 05:19:28 +00:00
Carlos Satorres	bf5f1011e8	refs #5490 traducción corregida	2023-03-28 14:56:20 +02:00
Pablo Natek	2c01ebf681	Merge branch 'dev' into 5075-client_balance	2023-03-28 13:26:17 +02:00
Vicent Llopis	0579c563b9	refs #5327 ordernar por columnas	2023-03-22 15:03:12 +01:00
Carlos Satorres	f0f2a8c731	refs #5432 quitar comentario	2023-03-20 13:41:32 +01:00
Carlos Satorres	a670795f9d	refs #5432 mod ng-show, add tooltip and disabled	2023-03-20 13:22:21 +01:00
Carlos Andrés	67f9cae2f2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-03-14 09:04:45 +01:00
Vicent Llopis	e20464cc7c	update css	2023-03-08 13:14:06 +01:00
Carlos Satorres	955e55a7f4	refs #5284 new onCreateClaimAccepted y createClaim	2023-03-07 15:43:48 +01:00
Vicent Llopis	e39690c2c9	merge with dev	2023-03-06 10:21:10 +01:00
Vicent Llopis	5248fd7fcf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-03-06 10:20:57 +01:00
Vicent Llopis	8a1a7d7159	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5240-ticket.sale-tracking	2023-03-01 08:20:28 +01:00
Carlos Andrés	4cc6485cbd	refs #5000 Invoicing RC	2023-02-23 09:25:23 +01:00
Alexandre Riera	42b8f08a4d	refs #5168 checked sales with logs	2023-02-22 12:14:17 +01:00
Vicent Llopis	432c8a9ab8	refactor: cambiados estilos de los chips	2023-02-21 10:56:46 +01:00
Joan Sanchez	86dd299292	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-17 13:33:52 +01:00
Joan Sanchez	ceab11cc41	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-17 13:33:34 +01:00
Joan Sanchez	527caf9ca0	refactor(zerofill): deprecated zerofill and removed function ... Refs: #5207	2023-02-17 11:19:35 +01:00
Vicent Llopis	73ae45c2c0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-15 15:08:58 +01:00
Alexandre Riera	e5e86de8d2	Merge branch 'dev' into 5152-ticketBasicData-stepTwo	2023-02-14 07:07:12 +00:00
Alexandre Riera	76ed4d2d4b	refs #5194 fixed tests	2023-02-13 10:16:28 +01:00
Vicent Llopis	4da8546bdf	Merge branch 'dev' into 2952-ticket.sale-tracking_part2	2023-02-13 07:14:28 +00:00
Pau	294b4acbe2	Merge branch 'dev' into 5181-ticket.summary-recargo	2023-02-13 06:03:21 +00:00
Alexandre Riera	6cb815faaf	.	2023-02-10 10:13:41 +01:00
Alexandre Riera	a468fb2c66	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance	2023-02-10 09:02:44 +01:00
Alexandre Riera	194069c0c2	refs #5194 fixed stock, lines	2023-02-10 08:46:54 +01:00
Alex Moreno	bbf68a88a7	feat: sendEmail checkBox and docuware open clientBalanceCreate with default data	2023-02-09 10:26:55 +01:00
Joan Sanchez	ebee9144b4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-09 09:16:30 +01:00
Joan Sanchez	461799f137	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-02-09 08:56:30 +01:00
Alexandre Riera	ef5b29d6f3	hotfix ticketFutureAdvance warehouse	2023-02-08 13:47:35 +01:00
Alexandre Riera	4413c8828b	refs #5152 added confirmation popup	2023-02-08 10:54:21 +01:00
Pau	86e6672e49	Merge branch 'dev' into 5181-ticket.summary-recargo	2023-02-07 13:39:36 +00:00
Vicent Llopis	cec7602e1b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-07 13:44:53 +01:00
Vicent Llopis	499c9fa706	refactor	2023-02-06 14:03:38 +01:00
Vicent Llopis	a2f93e68b1	feat: add 'parking' column	2023-02-06 13:57:04 +01:00
Alex Moreno	575784c870	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-03 10:03:59 +01:00
Pau	6c8609e180	Merge branch 'dev' into 5181-ticket.summary-recargo	2023-02-03 07:52:14 +00:00
Vicent Llopis	508bce73bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-03 08:41:35 +01:00
Pau	199dd2ba8d	Merge branch 'dev' into 5181-ticket.summary-recargo	2023-02-03 06:09:38 +00:00
Alex Moreno	6c772643a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-02 11:55:11 +01:00
Pau	cadd525380	Merge branch 'dev' into 5174-refactor-ticket-weekly	2023-02-02 08:36:07 +00:00
Alexandre Riera	5f656a894f	buscador	2023-02-02 08:52:38 +01:00
Pau	dcd74bacc0	refs #5181 @1h30	2023-02-01 08:32:22 +01:00
Alex Moreno	2528b2d3ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-01 07:10:51 +01:00
Alexandre Riera	3622eda589	refs #5131 added lines liters to origin ticket	2023-01-31 15:09:16 +01:00
Alexandre Riera	19d7e7e610	refs #5131 totalWithVat order	2023-01-31 14:23:40 +01:00
Alexandre Riera	b70557ee86	refs #5131 agencies icon	2023-01-31 14:20:08 +01:00
Alexandre Riera	87bef62e35	refs #5131 hasStock refers to origin	2023-01-31 13:21:51 +01:00
Alexandre Riera	331b278726	refs #5131 checkbox pending origin destination	2023-01-31 13:00:25 +01:00
Pau	20ffcff219	Merge branch 'dev' into 5174-refactor-ticket-weekly	2023-01-31 10:57:56 +00:00
Alexandre Riera	c121f184b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5077-horaEnvio-ticketBasicData	2023-01-31 11:43:26 +01:00
Alex Moreno	4740cdbbb9	fix: e2e	2023-01-31 10:37:18 +01:00
Pau	b1de5bc94e	refs #5174, fix banch being created from another branch and not from dev	2023-01-27 10:06:46 +01:00
Alexandre Riera	35157207dd	refs #5077 hours set 00:00:00 only when date change	2023-01-27 10:05:03 +01:00
Vicent Llopis	366748a136	fix: se la pasa la fecha shipped para calcular el visible y disponible	2023-01-26 14:00:29 +01:00
Vicent Llopis	caf1dcd690	feat: añadido almacén por defecto	2023-01-25 15:19:33 +01:00
Alex Moreno	1f52d04d4e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-24 15:01:26 +01:00
Alex Moreno	8a844917ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-23 08:07:14 +01:00
Vicent Llopis	9523991b04	fix: mostrar descriptor worker en vez de item	2023-01-20 12:45:02 +01:00
Vicent Llopis	ab1a9389cb	fix: cambiados de donde coge el item id	2023-01-20 12:37:41 +01:00
Alexandre Riera	c47cac7d55	refs #5020 isActive column added, filter in front	2023-01-17 08:54:26 +01:00
Alexandre Riera	fea76f29e7	Merge branch 'dev' into 4866-detalle-faltas	2023-01-17 07:31:45 +00:00
Alex Moreno	e27a559416	refactor: replace all Date	2023-01-16 15:18:24 +01:00
Alexandre Riera	b78bebf27c	refs #5061 added hour in date, changed ipt filter	2023-01-16 12:22:22 +01:00
Alex Moreno	9a3fea99ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send	2023-01-13 13:45:10 +01:00
Alex Moreno	def41c011c	feat(docuware_upload): send to trash last file	2023-01-13 13:33:59 +01:00
Joan Sanchez	c489c4c6a9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-01-13 08:55:01 +01:00
Alex Moreno	5bb66fec3f	test(docuware): back tests	2023-01-12 15:16:38 +01:00
Pau	d5a7691b9c	add controller function	2023-01-12 12:56:51 +01:00
Pau	b6de50848a	refs #5081 fix sms faltas	2023-01-12 11:48:44 +01:00
Joan Sanchez	882cf6b9c1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-01-12 08:36:24 +01:00
Alex Moreno	c2f4648b5c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send	2023-01-12 07:54:09 +01:00
Alex Moreno	9f324483d6	refactor(docuware): only use axios and refactor all	2023-01-11 15:19:09 +01:00
Alex Moreno	b8fe919b2a	feat(docuware): upload deliveryNote file	2023-01-10 15:03:23 +01:00
Alex Moreno	382aad2622	feat(docuware): upload and send pdf	2023-01-09 15:11:53 +01:00
Alex Moreno	46f36e1de1	try	2023-01-04 15:03:45 +01:00
Vicent Llopis	415fa04e3b	refs #2952 feat: add chips	2023-01-03 13:06:30 +01:00
Vicent Llopis	fa58ac2462	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2023-01-03 09:13:47 +01:00
Vicent Llopis	d5b626434b	refactor: add translations, change css...	2022-12-28 12:42:51 +01:00
Vicent Llopis	ab0af27f8b	refactor: delete changes in ticket.sale-checked	2022-12-28 12:23:41 +01:00
Vicent Llopis	d0ae97e41b	refactor: move changes from ticket.sale-checked to ticket.sale-tracking	2022-12-28 12:16:23 +01:00
Alexandre Riera	30197e9e15	Merge branch 'dev' into 4866-detalle-faltas	2022-12-28 09:07:26 +00:00
Vicent Llopis	3dd0c79629	feat: add ItemShelvingSales/filter	2022-12-27 15:00:49 +01:00
Alexandre Riera	c06c3dc6a7	refs #4957 saleChecked deleted	2022-12-27 11:50:58 +01:00
Vicent Llopis	d3a9e9ac89	delete: columnas que ya no existen en la tabla	2022-12-23 12:17:24 +01:00
Vicent Llopis	16c20e4700	feat: add itemShelvingSale popup	2022-12-23 12:08:16 +01:00
Vicent Llopis	682b6d8961	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2022-12-23 09:59:21 +01:00
Alexandre Riera	aec22fad9d	Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas	2022-12-23 08:16:36 +01:00
Vicent Llopis	8880a83b89	feat: añadido saleTracking	2022-12-21 15:03:41 +01:00
Vicent Llopis	06075aa17b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms	2022-12-21 12:15:21 +01:00
Vicent Llopis	3a33750890	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2022-12-21 10:11:37 +01:00
Alexandre Riera	081ef7fc99	Merge branch 'dev' into 3963-ticket-advance	2022-12-21 07:30:17 +00:00
Pau	c9b4e1ab9a	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-21 06:38:20 +00:00
Vicent Llopis	799c26796e	feat: añadidos chips	2022-12-20 15:19:05 +01:00
Pau	90b36bf1ab	Fix missing report for the invoice electronic notification	2022-12-20 14:21:01 +01:00
Alexandre Riera	62152d1668	Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas	2022-12-20 12:16:40 +01:00
Alexandre Riera	721123381c	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-20 11:54:22 +01:00
Alexandre Riera	8403af7db5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-12-20 11:37:40 +01:00
Alexandre Riera	342eec1e41	refs #3963 autoload fixed	2022-12-20 11:36:58 +01:00
Alexandre Riera	b356839148	refs #3963 autoload fixed	2022-12-20 11:36:37 +01:00
Alexandre Riera	284f9f418b	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-20 09:54:47 +01:00
Alexandre Riera	6ef282feda	refs #4962 updated merge, changed autoload, changed tf->Future	2022-12-20 09:54:28 +01:00
Pau	5a01e49f27	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-19 12:25:58 +00:00
Alexandre Riera	45b02c3bc6	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-16 13:45:25 +01:00
Alexandre Riera	98c9e0ac50	refs #4962 autoload added and second header	2022-12-16 13:42:23 +01:00
Alex Moreno	2a8a928ac5	feat: create invoiceIn	2022-12-16 10:36:18 +01:00
Alexandre Riera	855f00b1c9	Merge branch '4700-split-tour' into 3963-ticket-advance	2022-12-16 09:51:40 +01:00
Alexandre Riera	2baa4a1954	refs #4962 ticket tour future refactor	2022-12-14 12:26:18 +01:00
Alexandre Riera	050010c09f	refs #4700 success translation	2022-12-13 14:03:37 +01:00
Alexandre Riera	dce48a8a93	refs #4700 corrections	2022-12-13 14:00:46 +01:00
Alexandre Riera	72c27f7176	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-13 12:37:56 +01:00
Alexandre Riera	704cb71b61	refs #4866 instance log added and e2e done	2022-12-07 13:53:59 +01:00
Alex Moreno	b769845a28	hotFix: not transfer all sales if all sales is negatives	2022-11-30 14:29:44 +01:00
Alexandre Riera	cd8d5efa88	corrections	2022-11-29 10:29:18 +01:00
Vicent Llopis	d15e2551a2	feat: add frontTest	2022-11-25 12:16:01 +01:00
Alexandre Riera	8fec0670ea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-25 10:25:46 +01:00
Pau	8f98082910	refs #4791 @2h	2022-11-25 09:59:02 +01:00
Vicent Llopis	84c6604dd9	feat: enviar sms con cambios en el pedido	2022-11-24 15:04:15 +01:00
Pau	7c71e40cc5	Merge branch 'dev' into 4791-refactor-sendsms	2022-11-24 13:15:54 +00:00
Pau	f74b257d75	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-24 09:27:49 +00:00
Vicent Llopis	6f2a7a5cef	feat: enviar sms con cambios en las líneas	2022-11-23 15:15:40 +01:00
Pau	a8520f851c	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-23 08:28:07 +00:00
Pau	ad38f50ae3	Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente	2022-11-23 08:55:46 +01:00
Pau	ade2e777d6	refs #4457 @30min requested changes	2022-11-23 08:55:44 +01:00
Pau	b6ff1d99b1	Merge branch '4791-refactor-sendsms' of https://gitea.verdnatura.es/verdnatura/salix into 4791-refactor-sendsms	2022-11-23 08:20:13 +01:00
Pau	0b6d7eaffc	refs #4791 @30min fix broken test	2022-11-23 08:20:12 +01:00
Pau	bb640da8f0	Merge branch 'dev' into 4789-search-ticket-without-invoice	2022-11-22 13:44:23 +00:00
Alexandre Riera	6656ea4f54	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-22 10:20:42 +01:00
Alexandre Riera	2651081838	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-11-22 10:15:31 +01:00
Pau	3b66da20ca	Merge branch 'dev' into 4791-refactor-sendsms	2022-11-22 07:01:33 +00:00
Pau	4bd643143b	requested changes refs #4791 @1h	2022-11-22 07:59:18 +01:00
Pau	cb6ae41c13	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-21 13:45:28 +00:00
Pau	fc08b27fb6	Merge branch 'dev' into 4789-search-ticket-without-invoice	2022-11-21 13:42:53 +00:00
Pau	153f5f56fa	fix test refs #4791 @30min	2022-11-21 09:11:17 +01:00
Pau	4e97d931f7	refs #4791 @2h	2022-11-21 08:45:45 +01:00
Joan Sanchez	d7729654ee	fix(ordersFilter): wrong table schema	2022-11-17 16:48:31 +01:00
Pau	a733bc8c2f	refs #4789 hasInvoice on ticket searchbar @3h30m	2022-11-16 13:36:26 +01:00
Alexandre Riera	66002968f6	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-16 11:10:21 +01:00
Alexandre Riera	489df60afc	suggested filter added	2022-11-16 11:10:00 +01:00
Alexandre Riera	4feb2bea2c	working on e2e	2022-11-16 10:57:15 +01:00
Alexandre Riera	b7c9d6ea50	refs #3963 front and back tests fixed	2022-11-15 15:30:00 +01:00
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