7723 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Joan Sanchez	beb1dd4973	absenceType fixture	2020-06-27 12:16:56 +02:00
Javi Gallego	962436b8bb	2344 ticket sale descuento usuario	2020-06-25 17:12:53 +02:00
Carlos Jimenez Ruiz	bd1ea0f8a0	Merge pull request 'added total price of services' (#324) from 2342_service_charge into dev ... Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-06-23 15:18:04 +00:00
Joan Sanchez	a8377950f5	Fixes	2020-06-23 16:39:20 +02:00
Carlos Jimenez Ruiz	9d88b9359a	removed unused column	2020-06-23 16:07:07 +02:00
Carlos Jimenez Ruiz	984e8fd794	added total price of services	2020-06-23 14:53:41 +02:00
Carlos Jimenez Ruiz	cd5ec02e42	Merge pull request 'refactor delete zone' (#323) from 2335-zone_descriptor into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-06-23 12:15:00 +00:00
Carlos Jimenez Ruiz	31b1599f2c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2335-zone_descriptor	2020-06-23 13:49:15 +02:00
Carlos Jimenez Ruiz	99ccd8f45e	Merge pull request 'add message before delete a line on a claim' (#321) from 2328-claim_detail into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-06-23 11:43:23 +00:00
Joan Sanchez	d4c78b46c1	1368 - First sale refactor	2020-06-23 13:40:49 +02:00
Carlos Jimenez Ruiz	ec6a3e00f7	removed unused argument in test	2020-06-23 13:26:21 +02:00
Carlos Jimenez Ruiz	bc9ab1a837	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2328-claim_detail	2020-06-23 13:10:12 +02:00
Carlos Jimenez Ruiz	020d02be4f	Merge pull request 'refactor order index' (#319) from 2322-order_index into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-06-23 11:09:32 +00:00
Bernat Exposito Domenech	2275541bb1	change on-response for on-accept	2020-06-23 12:46:24 +02:00
Carlos Jimenez Ruiz	7c72cd8f2d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2322-order_index	2020-06-23 12:33:16 +02:00
Carlos Jimenez Ruiz	bfe8c2b272	Merge pull request '902 - Added unit tests' (#318) from 902-zone_unit_tests into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-06-23 10:16:44 +00:00
Carlos Jimenez Ruiz	1b683f5dc0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 902-zone_unit_tests	2020-06-23 11:41:18 +02:00
Carlos Jimenez Ruiz	5a225b05ba	Merge pull request 'add restrictions in ticket descriptor' (#317) from 2061-ticket_descriptor into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-06-23 09:39:42 +00:00
Bernat Exposito Domenech	ee2a4771ff	delete coment code	2020-06-23 11:22:33 +02:00
Bernat Exposito Domenech	6a021b5767	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2061-ticket_descriptor	2020-06-23 10:00:50 +02:00
Joan Sanchez	c600576b7a	Merge pull request 'field unit test + jest and babel-jest versions upgraded + readme update' (#322) from 2185_field_unit_tests into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-23 07:19:19 +00:00
Bernat Exposito Domenech	e96df49622	refactor delete zone	2020-06-23 07:38:36 +02:00
Carlos Jimenez Ruiz	837ec554d3	field unit test + jest and babel-jest versions upgraded + readme update	2020-06-22 15:59:29 +02:00
Joan Sanchez	356c1a7b45	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-22 11:54:50 +02:00
Joan Sanchez	a55981adea	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-06-22 11:53:48 +02:00
Joan Sanchez	4ad3334de6	Allow change to discount 0%	2020-06-22 11:49:44 +02:00
Joan Sanchez	3cb783740f	Added unit tests	2020-06-22 10:01:55 +02:00
Joan Sanchez	8729d1c765	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-19 10:35:57 +02:00
Joan Sanchez	7bd26c0d8d	Merge branch 'master' into test	2020-06-19 10:33:33 +02:00
Joan Sanchez	2930b60adc	Entitlement rate	2020-06-19 10:28:08 +02:00
Joan Sanchez	41eeaeef0b	Entitlement rate	2020-06-19 09:58:09 +02:00
Carlos Jimenez Ruiz	b8f03f20e1	Merge pull request '2319_show_delivery_note' (#320) from 2319_show_delivery_note into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-18 13:40:28 +00:00