7655 Commits

All Branches

Search

Author	SHA1	Message	Date
Bernat Exposito Domenech	7d6ac265b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index	2020-07-09 08:17:03 +02:00
Joan Sanchez	1fa2bd1e1d	Merge pull request 'fix bugs in ticket weekly' (#328) from 2338-ticket_weekly into dev ... Reviewed-on: #328 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-07-09 06:14:21 +00:00
Joan Sanchez	c04d9b0854	Merge branch 'dev' into 2338-ticket_weekly	2020-07-08 16:22:54 +00:00
Joan Sánchez	b00f6e6d04	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-07-07 15:13:01 +02:00
Joan Sánchez	7efba25603	Removed role salesPerson for a ticket request	2020-07-07 15:12:36 +02:00
Joan Sanchez	6aca80b075	Merge branch 'dev' into 2338-ticket_weekly	2020-07-07 12:34:04 +00:00
Joan Sanchez	778c38df89	Merge pull request 'export structure' (#325) from 2343-exportar_produccion into dev ... Reviewed-on: #325 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-07-07 06:26:33 +00:00
Joan Sanchez	53d672152b	Merge branch 'dev' into 2343-exportar_produccion	2020-07-07 06:19:12 +00:00
Bernat Exposito Domenech	122dacffb5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index	2020-07-06 10:20:59 +02:00
Bernat Exposito Domenech	ee704b302c	update order filter	2020-07-06 10:20:45 +02:00
Carlos Jimenez Ruiz	6a88ce2779	Merge pull request 'descriptor can now have 4 quicklinks' (#332) from 2295-add_quicklinks into dev ... Reviewed-on: #332 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-07-03 14:55:34 +00:00
Carlos Jimenez Ruiz	8794932949	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2295-add_quicklinks	2020-07-03 16:44:36 +02:00
Carlos Jimenez Ruiz	f2e1f00ae3	using csss variables plus a traduction	2020-07-03 16:43:45 +02:00
Carlos Jimenez Ruiz	b47787c560	Merge pull request '1786-input_validation_Jest' (#331) from 1786-input_validation_Jest into dev ... Reviewed-on: #331 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-07-03 14:34:46 +00:00
Carlos Jimenez Ruiz	663b5fb9aa	descriptor can now have 4 quicklinks	2020-07-03 13:28:49 +02:00
Carlos Jimenez Ruiz	1839bb43d3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1786-input_validation_Jest	2020-07-03 12:13:51 +02:00
Carlos Jimenez Ruiz	018e17487e	imput validation is ok with Jest	2020-07-03 12:13:42 +02:00
Carlos Jimenez Ruiz	3284ef5b55	Merge pull request 'id is now shown in black' (#330) from 2340-descriptor_id into dev ... Reviewed-on: #330 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-07-02 14:06:19 +00:00
Carlos Jimenez Ruiz	8b040a119f	id is now shown in black	2020-07-02 15:20:11 +02:00
Joan Sanchez	1e4d432db8	Merge pull request '1368-ticket_sale_refactor' (#327) from 1368-ticket_sale_refactor into dev ... Reviewed-on: #327 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-07-02 12:57:42 +00:00
Carlos Jimenez Ruiz	1b22a110d4	e2e conflict solved	2020-07-02 14:03:01 +02:00
Carlos Jimenez Ruiz	543342d710	e2e list sale fix	2020-07-02 10:31:34 +02:00
Carlos Jimenez Ruiz	36f4998e75	e2e nad canCreateTicket unit tests	2020-07-02 09:35:52 +02:00
Bernat Exposito Domenech	c42c6c19d6	changes in order index	2020-07-02 07:46:55 +02:00
Joan Sanchez	23664dd3c5	Refresh total on sale changes	2020-07-01 15:00:48 +02:00
Carlos Jimenez Ruiz	c801d8a969	Merge branch '1368-ticket_sale_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor	2020-07-01 14:45:53 +02:00
Carlos Jimenez Ruiz	354123dc86	e2e toolkit 2.0 + refactors	2020-07-01 14:45:48 +02:00
Joan Sanchez	b40e09a6cb	Methods refactor & updated back unit tests	2020-07-01 14:28:05 +02:00
Joan Sanchez	78ee6f1aff	Updated unit tests	2020-07-01 12:53:56 +02:00
Joan Sanchez	0a327087ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor	2020-07-01 11:57:16 +02:00
Joan Sanchez	defe7e7a17	Added front unit tests	2020-07-01 11:57:01 +02:00
Joan Sanchez	3d04b15b1b	Merge pull request '2344 ticket sale descuento usuario' (#326) from #2344-ticket-sale--descuento--al-usuario into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-30 12:54:43 +00:00
Javi Gallego	f57e332503	Merge branch 'dev' into #2344-ticket-sale--descuento--al-usuario	2020-06-30 13:25:33 +02:00
Joan Sanchez	ae90d30725	Merge pull request 'fix date in a front test' (#329) from 2355-front_test_zone into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-30 11:24:42 +00:00
Javi Gallego	05b0d7e906	test ok	2020-06-30 12:34:51 +02:00
Carlos Jimenez Ruiz	1dfd0c26ef	Merge branch '1368-ticket_sale_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor	2020-06-30 11:15:28 +02:00
Carlos Jimenez Ruiz	b451b400bf	e2e toolkit	2020-06-30 11:15:20 +02:00
Javi Gallego	039eec7d26	test excepto fallo e2e	2020-06-30 10:16:22 +02:00
Joan Sanchez	d530be9349	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor	2020-06-30 10:01:38 +02:00
Joan Sanchez	a0f625d019	Changed methods order, minor fixes	2020-06-30 10:01:30 +02:00
Joan Sanchez	c9d94ca814	Reset watcher changes if there's no new data to save	2020-06-30 09:37:09 +02:00
Bernat Exposito Domenech	e7a866553c	fix test	2020-06-30 09:15:08 +02:00
Bernat Exposito Domenech	d77297941f	fix date in a front test	2020-06-30 09:08:08 +02:00
Bernat Exposito Domenech	d414db73de	order index add buton and columns	2020-06-30 08:32:04 +02:00
Javi Gallego	db06626675	refactor	2020-06-29 14:26:27 +02:00
Joan Sanchez	2c23f3417a	Sale selection fixes	2020-06-29 11:43:53 +02:00
Joan Sanchez	789769ad7d	Destroy edit prop fix	2020-06-29 09:38:42 +02:00
Bernat Exposito Domenech	faee28cb01	fix bugs in ticket weekly	2020-06-29 09:35:18 +02:00
Javi Gallego	87de2bd2fb	Merge branch 'dev' into #2344-ticket-sale--descuento--al-usuario	2020-06-29 07:37:27 +02:00
Bernat Exposito Domenech	ea1eb16060	export structure	2020-06-29 07:32:08 +02:00