7603 Commits

All Branches

Search

Author	SHA1	Message	Date
Javi Gallego	87de2bd2fb	Merge branch 'dev' into #2344-ticket-sale--descuento--al-usuario	2020-06-29 07:37:27 +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
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
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
Carlos Jimenez Ruiz	e6a72d0f09	clean code refactor	2020-06-18 15:26:15 +02:00
Carlos Jimenez Ruiz	3c2a392cb8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note	2020-06-18 13:51:00 +02:00
Carlos Jimenez Ruiz	4d97357213	update estate without model.refresh()	2020-06-18 13:50:52 +02:00
Joan Sanchez	322085ffd7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-18 13:15:45 +02:00
Joan Sanchez	fcec710d7c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-06-18 13:13:47 +02:00
Joan Sanchez	7c45858764	Sms dialog fix	2020-06-18 12:59:37 +02:00
Joan Sanchez	fa73911452	Added tests	2020-06-18 12:43:33 +02:00
Bernat Exposito Domenech	9af33d1b96	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2322-order_index	2020-06-18 11:23:35 +02:00
Bernat Exposito Domenech	84bacfd379	add message before delete a line on a claim	2020-06-18 10:10:42 +02:00
Joan Sanchez	765d3c7553	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-18 07:19:57 +02:00
Joan Sanchez	6ab6fc20ca	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-06-18 07:19:30 +02:00
Joan Sanchez	43a48994e0	Image path fix	2020-06-17 16:33:58 +02:00
Carlos Jimenez Ruiz	edea60dd94	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note	2020-06-17 15:38:49 +02:00
Carlos Jimenez Ruiz	2abd45f498	setDelivered and open delivery notes and tests	2020-06-17 15:38:37 +02:00
Joan Sanchez	24d3cd74d9	Upgrade Node version	2020-06-17 15:13:11 +02:00
Joan Sanchez	1d484d4fdf	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-17 15:03:14 +02:00
Joan Sanchez	ac6a7e122c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-06-17 15:02:57 +02:00
Joan Sanchez	7f3a431ae8	PM2 Min TLS v1.0	2020-06-17 14:07:14 +02:00
Joan Sanchez	b46cc20511	Min TLS v1.0	2020-06-17 14:03:14 +02:00
Joan Sanchez	fd97845979	Revert "Removed sms excluded tests" ... This reverts commit 30912bd5e9.	2020-06-17 14:00:04 +02:00