767 Commits

Author	SHA1	Message	Date
Javi Gallego	220baa717e	roles de credito y greuges	2018-02-07 14:16:11 +01:00
Carlos Jimenez	3d7d0762b6	Merge branch 'dev' of http://git.verdnatura.es/salix into dev	2018-02-07 13:49:05 +01:00
Carlos Jimenez	de9f7a5545	item history	2018-02-07 13:48:55 +01:00
Juan Ferrer Toribio	fda8750304	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2018-02-07 10:29:27 +01:00
Juan Ferrer Toribio	0fc1dc0faa	Address id fixtures, gulpfile clean, eslint no-empty	2018-02-07 10:29:23 +01:00
Carlos Jimenez	93ef3c7fea	item history js files implementation	2018-02-07 08:49:27 +01:00
Carlos Jimenez	8de88aa046	small refactor on greuge list and fixtures	2018-02-07 08:47:04 +01:00
Juan Ferrer Toribio	853b16bd81	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2018-02-07 08:30:20 +01:00
Carlos Jimenez	86aab2ca31	Merge branch 'dev' of http://git.verdnatura.es/salix into dev	2018-02-06 16:23:22 +01:00
Daniel Herrero	7eee1cad50	address observations crud created	2018-02-06 15:09:31 +01:00
Carlos Jimenez	335847358f	fixtures addition plus item en.yml created	2018-02-06 14:03:09 +01:00
Juan Ferrer Toribio	65e197d555	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2018-02-06 09:10:57 +01:00
Daniel Herrero	f0356eb047	join addressObservation into list Addresses service	2018-02-06 07:59:36 +01:00
Juan Ferrer Toribio	5ff996a4c7	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2018-02-05 19:34:12 +01:00
Juan Ferrer Toribio	90ce07881a	Gulpfile refactor, SQL scripts	2018-02-05 19:34:04 +01:00
Joan Sanchez	692a226b69	El servicio de Nginx ahora se inicia desde Gulp. Añadido alias de instalacion "gulp i".	2018-02-05 19:22:38 +01:00
Juan Ferrer Toribio	89c745244a	YAML configuration, client module register simplified	2018-02-04 19:39:56 +01:00
Juan Ferrer Toribio	cf2f8b77ff	Log removed	2018-02-03 23:54:31 +01:00
Juan Ferrer Toribio	d1096a270f	Bugs solved in Nginx starting scripts	2018-02-03 23:46:52 +01:00
Juan Ferrer Toribio	4a388f241c	Gulp refactor	2018-02-03 23:07:28 +01:00
Juan Ferrer Toribio	681310d9b6	Dockerfile bug	2018-02-03 22:56:49 +01:00
Juan Ferrer Toribio	e7d3ff9272	Refactor gulp and config	2018-02-03 22:53:02 +01:00
Juan Ferrer Toribio	ca7e299fbc	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2018-02-03 20:14:52 +01:00
Juan Ferrer Toribio	597299b1c5	Autogenerated Nginx config and docker compose	2018-02-03 20:14:44 +01:00
Carlos Jimenez	48f6f5a18d	successfully moved all specs from services/client/c../m../client alongside their respective js files	2018-02-02 16:24:22 +01:00
Javi Gallego	ac8db83582	README fixes, bugfixes for windows	2018-02-02 09:51:38 +01:00
Juan Ferrer Toribio	aae0cd9128	Merge	2018-02-01 12:55:06 +01:00
Juan Ferrer Toribio	57479aaf76	Bug fixes	2018-02-01 12:52:58 +01:00
Carlos Jimenez	03116ed595	item descriptor now shows itemTags ordered by priority	2018-02-01 10:05:20 +01:00
Juan Ferrer Toribio	b5e5b5bd6b	Merge	2018-02-01 08:50:26 +01:00
Juan Ferrer Toribio	52db3bbf2f	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2018-02-01 08:49:10 +01:00
SAMBA\bernat	94693c3a7e	structure dblocal syncronize with produccion	2018-02-01 08:46:13 +01:00
Carlos Jimenez	b01b333481	inserts sql updated for items	2018-02-01 08:32:48 +01:00
Juan Ferrer Toribio	87b3ac995d	Development environment now points to local database by default	2018-01-31 14:56:55 +01:00
Juan Ferrer Toribio	9090c56c64	Backend tests fixed	2018-01-31 13:40:26 +01:00
Juan Ferrer Toribio	cba0645f92	Merge with dev	2018-01-31 12:19:34 +01:00
Juan Ferrer Toribio	3d6f9fbbca	Backend tests refactor, bug fixes	2018-01-31 12:17:17 +01:00
Carlos Jimenez	cd027a3e12	refactor to avoid using import on backend testing env	2018-01-31 12:02:35 +01:00
Carlos Jimenez	215ae09b70	refactor to remove import from backend testing in order to use require	2018-01-31 11:15:12 +01:00
Juan Ferrer Toribio	109f04c517	Merge	2018-01-30 16:34:32 +01:00
Carlos Jimenez	801926bd27	Merge branch 'dev' of http://git.verdnatura.es/salix into dev	2018-01-30 15:49:26 +01:00
Carlos Jimenez	d700d3a905	routes backend unit test completed	2018-01-30 15:49:22 +01:00
Daniel Herrero	90fab7b01a	address observations, list and view edit (TODO save)	2018-01-30 14:47:47 +01:00
Daniel Herrero	7eab262175	CRUD item basic data finish	2018-01-30 08:59:43 +01:00
Juan Ferrer Toribio	9d92b9def7	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2018-01-30 08:59:12 +01:00
Carlos Jimenez	7c36daf496	backend unit test for routes logout	2018-01-29 21:20:04 +01:00
Juan Ferrer Toribio	f688090cba	i18n on backend, improved backend error handling, redundant model-config removed	2018-01-29 19:57:00 +01:00
Carlos Jimenez	09f244bc62	backend unit test for the try to define loginUrl	2018-01-29 14:39:08 +01:00
Carlos Jimenez	ea3988351c	Merge branch 'dev' of http://git.verdnatura.es/salix into dev	2018-01-29 14:28:47 +01:00
Carlos Jimenez	ba6a1f0f16	backend unit test for routes login	2018-01-29 14:28:31 +01:00
Juan Ferrer Toribio	f4a790f87c	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2018-01-29 12:38:08 +01:00
Juan Ferrer Toribio	a3188b204f	Views migrated to vn schema, Node v8, Error handling, async-await, bugs solved	2018-01-29 12:37:54 +01:00
SAMBA\bernat	71d587764c	update fixtures	2018-01-26 14:12:41 +01:00
Carlos Jimenez	0e88c2c4e7	renived private method tests and implemented HeadLessChrome on Karma and removed Firefox as browser	2018-01-26 12:13:39 +01:00
Carlos Jimenez	6dba8c7a40	salesperson back end unit tests plus small refactor on addresses, employee and filter specs	2018-01-26 11:23:53 +01:00
Carlos Jimenez	8dafd8c3b0	roles backend unit tests plus typos corrected on card and filer specs	2018-01-26 09:00:16 +01:00
SAMBA\bernat	9f5b42d149	localDB Update	2018-01-26 08:26:01 +01:00
Carlos Jimenez	28096df321	nightmare controlles now the snackbarTimeout with nightmareModifiers.js plus small db update	2018-01-26 08:01:26 +01:00
Daniel Herrero	56e868c3dd	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2018-01-25 13:37:40 +01:00
Daniel Herrero	abed869052	onErrorSrc directive for images	2018-01-25 13:37:27 +01:00
Carlos Jimenez	092efc80c1	greuge filter backend unit test	2018-01-25 11:40:54 +01:00
Carlos Jimenez	506d6e0688	small file name refactor and client employee backend unit tests	2018-01-24 15:13:42 +01:00
Carlos Jimenez	48aef1f9b0	client Card backend unit tests	2018-01-24 13:45:32 +01:00
SAMBA\bernat	16a193071c	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2018-01-24 08:13:42 +01:00
SAMBA\bernat	ab7f064800	merging dev	2018-01-24 08:13:14 +01:00
Carlos Jimenez	8801c20071	added restoreFixtures to a afterAll method on create and addressesPropagateRe spec files	2018-01-24 08:09:39 +01:00
SAMBA\bernat	74e8e93ffd	add fixtures and update the structure DB	2018-01-24 08:06:49 +01:00
Carlos Jimenez	108fb92d73	removed unnused code placed during testing steps	2018-01-23 16:41:28 +01:00
Carlos Jimenez	0d8feaef60	addressesPropagateRe backend unit tests	2018-01-23 15:59:21 +01:00
Carlos Jimenez	83f4a2d6bd	back end unit tests for addresses plus refactor on fixtures stuff	2018-01-23 14:18:46 +01:00
Carlos Jimenez	f8736bc599	total greuge backend unit test error handling added	2018-01-23 09:33:23 +01:00
Carlos Jimenez	5341c5bbf1	client create backend unit test plus error handling refactor	2018-01-23 09:32:19 +01:00
Carlos Jimenez	dd89df9a71	fixtures restart implementation	2018-01-21 17:47:24 +01:00
Carlos Jimenez	468b9195ac	typo corrected	2018-01-19 13:07:03 +01:00
Carlos Jimenez	072f02aacb	greuge backend unit tests for filter and totalGreuge finished	2018-01-19 13:05:25 +01:00
Carlos Jimenez	a60d8f120c	greuge filter unit test	2018-01-19 07:55:41 +01:00
Carlos Jimenez	300f3d543a	corrections	2018-01-18 15:27:35 +01:00
Carlos Jimenez	2a0b52b094	disabled malfuctioning test	2018-01-17 14:52:35 +01:00
Carlos Jimenez	125c8019ed	greuge filter backend unit test file	2018-01-17 14:50:21 +01:00
Daniel Herrero	044786661a	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2018-01-17 14:28:35 +01:00
Daniel Herrero	c4ff568ec8	model expense create and added into Item's basic data view	2018-01-17 14:28:06 +01:00
Carlos Jimenez	984540a3f2	back end refactor for the fixtures setup plus some test on client create()	2018-01-17 12:46:26 +01:00
Carlos Jimenez	bfcbf23de8	setup for back end unit test up and runing, fixtures pending	2018-01-16 21:39:40 +01:00
Carlos Jimenez	633386d62f	removed uniqueness validation for name	2018-01-15 14:47:48 +01:00
Carlos Jimenez	178e4ccb28	e2e mandate path plus fixtures update	2018-01-12 14:20:28 +01:00
Carlos Jimenez	bb06a54df2	removed validatesPresenceOf() from client and greuge to add required: true on their models	2018-01-11 22:11:35 +01:00
Carlos Jimenez	d9438e6b77	form validations now validates imputs being empty when dirty plus e2e updated tests for it.	2018-01-11 13:16:39 +01:00
Carlos Jimenez	8664b6cc7d	eslint rules error corrected	2018-01-11 11:41:14 +01:00
Carlos Jimenez	959e5b4543	greuge validations	2018-01-11 11:22:56 +01:00
Carlos Jimenez	96a0b0dd3a	Merge branch 'dev' of http://git.verdnatura.es/salix into dev	2018-01-10 14:04:08 +01:00
Carlos Jimenez	b2bfcb7b3f	docker container time correction plus small refactor on validator.js	2018-01-10 14:03:52 +01:00
Daniel Herrero	586ad2911c	item create	2018-01-10 12:49:52 +01:00
Daniel Herrero	beed136e3c	item validations	2018-01-09 14:54:18 +01:00
Carlos Jimenez	268162c3f7	Merge branch 'dev' of http://git.verdnatura.es/salix into dev	2018-01-09 13:53:54 +01:00
Carlos Jimenez	c3d6a9c043	fixed client observations to apply eslint rules plus bug fixed in datePicker	2018-01-09 13:53:21 +01:00
Daniel Herrero	d245f7c4f2	model taxGroup changed	2018-01-09 11:25:35 +01:00
Carlos Jimenez	22d482f1c6	gulp task created to run fixtures before e2e tests	2018-01-08 09:42:16 +01:00
Carlos Jimenez	c1e798790f	e2e path for add credit and gulp tasks for faster fixtures in progress	2018-01-08 08:12:39 +01:00
Carlos Jimenez	b3eac25e8a	vn2008 structure update for credit employee	2018-01-05 08:59:30 +01:00
Carlos Jimenez	b3ddeaf4a7	credit refactor to build employee name and surname on client side	2018-01-05 08:06:21 +01:00
Carlos Jimenez	8e25216c3b	fixtures for mandate	2018-01-04 12:33:25 +01:00
Carlos Jimenez	68d4d60d7d	fixtures for greuge added plus jasmineHelpers enabled	2018-01-04 11:43:28 +01:00
Joan Sanchez	ca25280743	Deshabilitada conexión SMTP en entorno test	2018-01-03 13:41:22 +01:00
SAMBA\bernat	492902e637	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2018-01-03 12:01:31 +01:00
SAMBA\bernat	151cf6be50	Refactor on DBlocal files	2018-01-03 12:00:59 +01:00
Carlos Jimenez	8c6131322f	Merge branch 'dev' of http://git.verdnatura.es/salix into dev	2018-01-02 08:06:47 +01:00
Carlos Jimenez	f2872da4db	validation client side unit tests	2018-01-02 08:05:50 +01:00
Joan Sanchez	21894ca0f8	Configuración en entorno test	2017-12-27 09:44:27 +01:00
Joan Sanchez	de3d294cdb	Recuperación de contraseña en bienvenida cliente	2017-12-26 11:02:09 +01:00
Joan Sanchez	e834644c5d	Actualizados nombres de columnas en vista cliente.	2017-12-26 10:11:43 +01:00
Joan Sanchez	e94d29f97b	Errores de renderización imágenes adjuntas. Escritos de cliente deutor.	2017-12-26 10:02:47 +01:00
Daniel Herrero	3fe9e3d325	bug fixed in model item	2017-12-21 14:08:40 +01:00
Daniel Herrero	723a4143f6	changed model name	2017-12-21 11:47:01 +01:00
Daniel Herrero	7acb047ec9	Item: interfaz crear item	2017-12-20 12:40:29 +01:00
Daniel Herrero	75c77fcdc6	filtro de items	2017-12-20 12:20:59 +01:00
Daniel Herrero	dc03c5f453	modelos para el microservicio item	2017-12-20 09:53:50 +01:00
Daniel Herrero	29c75d3d8d	model Itemype added	2017-12-19 14:58:14 +01:00
Daniel Herrero	5bc375d324	list items with images	2017-12-19 14:28:19 +01:00
Daniel Herrero	55691b4cc9	nuevo micro servicio Item	2017-12-19 12:29:35 +01:00
Daniel Herrero	f0c9b2beca	new module articles, structure	2017-12-19 11:05:07 +01:00
SAMBA\bernat	edb29c7ced	updated localDb01Structure.sql for vn.client and vn2008.client	2017-12-18 14:59:39 +01:00
Carlos Jimenez	a0b1e13804	micro refactor at sql inserts file	2017-12-15 08:22:34 +01:00
Daniel Herrero	3e1d6ee4e5	bug fixed in address pagination	2017-12-14 15:08:07 +01:00
Daniel Herrero	9fe0aadff8	modelos con inicial mayuscula	2017-12-13 13:40:21 +01:00
Daniel Herrero	69934a4869	[R12 - T16] Bug corregido, faltaba la asociacion con cliente para el modelo Mandate	2017-12-13 09:05:58 +01:00
Daniel Herrero	b8a6340afd	[R12 - T16] REST para mandatos	2017-12-13 08:24:14 +01:00
Daniel Herrero	5c54550283	refactorizacion de production, menos watchers	2017-12-12 14:00:02 +01:00
Daniel Herrero	34016dfa1e	production: asignar tickets	2017-12-12 12:26:18 +01:00
Carlos Jimenez	a8d79a578f	e2e pay method path until due day	2017-12-11 12:33:27 +01:00
Carlos Jimenez	78a2887ab3	several repairs on both e2e paths create client and edit basic data plus some required refactors	2017-12-05 15:28:48 +01:00
Carlos Jimenez	08bfb80912	refactor to fix and update testing fixtures	2017-12-05 11:21:48 +01:00
Javi Gallego	8755d4846a	merge	2017-12-04 08:17:29 +01:00
Joan Sanchez	02fb54efa9	merge	2017-11-22 20:55:44 +01:00
Joan Sanchez	774f577edd	Ruta de validación de token en servicio Auth	2017-11-22 20:54:20 +01:00
Daniel Herrero	aae137d35e	changed datasource in employeeList service	2017-11-22 13:35:05 +01:00
Daniel Herrero	ba73869fd3	changes in getRoleCustomer service	2017-11-22 13:24:36 +01:00
Daniel Herrero	3bd913cbd9	changed datasource in salesperson service	2017-11-22 13:19:51 +01:00
Javi Gallego	bfd584487f	limpieza de models auth obsoleto, ahora vn	2017-11-22 12:43:12 +01:00
Javi Gallego	b3e8b4542a	model client con la nueva nomenclatura	2017-11-22 08:59:21 +01:00
Daniel Herrero	e7d19da8f5	added sales person property into create new client	2017-11-21 14:53:09 +01:00
Daniel Herrero	28c4cdfa5f	removed eslint problems	2017-11-21 11:59:43 +01:00
Daniel Herrero	730d52169e	bug fixed in salesperson query	2017-11-21 11:50:37 +01:00
Daniel Herrero	13c15bb5b3	production with searchbar	2017-11-21 11:12:52 +01:00
Joan Sanchez	a138554301	Cambiada ruta de petición al desactivar cliente.	2017-11-20 18:56:53 +01:00
Daniel Herrero	96f1db5cb7	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2017-11-16 15:06:04 +01:00
Daniel Herrero	ea35c1feda	new searchBar	2017-11-16 15:05:45 +01:00
Juan Ferrer Toribio	e03d257930	Errores en spinner	2017-11-16 13:47:18 +01:00
Juan Ferrer Toribio	519a55fac7	Merge, errores en spinner solucionados	2017-11-16 13:46:56 +01:00
Juan Ferrer Toribio	67829f5694	Correcciones varias	2017-11-16 12:35:07 +01:00
Vicente Falco	79e09e32e3	client: dni validation	2017-11-16 12:02:45 +01:00
Daniel Herrero	5c1f4321ed	removed favicon	2017-11-16 07:51:42 +01:00
Daniel Herrero	be286f6057	favicon moved	2017-11-16 07:16:10 +01:00
Daniel Herrero	dfb5552181	new Favicon	2017-11-15 14:39:46 +01:00
Daniel Herrero	d4a0cf205d	bug fixed in edit addresses	2017-11-15 12:11:35 +01:00
Daniel Herrero	d19ebe0c8c	bug fixed list producction	2017-11-14 11:20:12 +01:00
Carlos	77ccc0e8af	temp favicon.ico (to update once we have the right one)	2017-11-14 08:24:01 +01:00
Carlos	29149b1b58	corrected some eslint errors and small refactor	2017-11-13 22:15:44 +01:00
Carlos	154c06e7f4	added hasToInvoiceByAddress checkbox to client > billingData	2017-11-13 11:47:41 +01:00
Daniel Herrero	6ea0f05054	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2017-11-09 14:27:23 +01:00
Daniel Herrero	17143883f8	address data changes	2017-11-09 14:27:01 +01:00
Carlos	7223922251	typo corrected at dblocal fixtures plus renamed files and selectors added	2017-11-09 13:54:06 +01:00
Daniel Herrero	b77395762c	bug fixed in address	2017-11-09 13:22:54 +01:00
Daniel Herrero	3d33c21cc8	removed eslint errors	2017-11-09 08:59:40 +01:00
Daniel Herrero	d2491bfbf4	refact production list	2017-11-09 08:54:41 +01:00
Vicente Falco	10c52a75b9	microservices: configuration	2017-11-09 07:45:46 +01:00
Vicente Falco	14820fbb3e	merge	2017-11-09 07:34:17 +01:00
Vicente Falco	20a6728ed6	microservices: boot	2017-11-09 07:34:02 +01:00
Vicente Falco	a9cab91acc	Production Package	2017-11-08 20:06:00 +01:00
Vicente Falco	9cddb00a19	Client: Request Package	2017-11-08 18:27:31 +01:00
Vicente Falco	18121e1d9d	docker context	2017-11-08 17:44:10 +01:00
Vicente Falco	2de3ccff8e	Docker auth	2017-11-08 17:40:15 +01:00
Vicente Falco	c03e5297a2	Docker loopback	2017-11-08 17:24:23 +01:00
Vicente Falco	254615331a	Docker: Faster	2017-11-08 17:04:08 +01:00
Daniel Herrero	f71dfa53ef	refact list production	2017-11-08 14:59:46 +01:00
Vicente Falco	1d109f2371	docker	2017-11-08 14:11:33 +01:00
Daniel Herrero	063b97d3e1	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2017-11-08 13:42:41 +01:00
Daniel Herrero	061ae64c50	production filtering in temporary table	2017-11-08 13:42:33 +01:00
Vicente Falco	0a107ba0bc	docker	2017-11-08 09:57:51 +01:00
Vicente Falco	b1f17349c3	Docker changes	2017-11-07 19:21:11 +01:00
Daniel Herrero	5a1aca198b	localizador rutas maquetacion 90%	2017-11-07 11:22:33 +01:00
Vicente Falco	e04cda0f35	service Production: bugs	2017-10-31 09:26:11 +01:00
Carlos	d839ba2aca	local db inserts update	2017-10-27 13:39:50 +02:00
Vicente Falco	ac8797f24d	Client Service: Employee List active	2017-10-25 13:47:39 +02:00
Carlos	2eeae6cc36	local DB user emails inserts updated to fix bug plus gitignore	2017-10-25 14:48:23 +08:00
Joan Sanchez	9d6eeba1a3	merge	2017-10-25 00:39:34 +02:00
Joan Sanchez	13981ae023	Quita contraseña de smtp.test.json	2017-10-25 00:38:02 +02:00
Vicente Falco	e7223ef493	Client: email from Account not required	2017-10-24 14:29:53 +02:00
Vicente Falco	a58d530523	Client: add notes	2017-10-24 14:10:09 +02:00
Vicente Falco	64497d70e1	Client Address: Change default address	2017-10-24 13:37:27 +02:00
Carlos	ea001f44b1	SQL changes for localDB docker	2017-10-24 12:47:58 +02:00
Vicente Falco	1c5a65928e	change on services, docker localDB y jasmime	2017-10-24 08:56:18 +02:00
Vicente Falco	b32f0b199f	mailer localDB	2017-10-22 14:03:04 +02:00
Joan Sanchez	7b2506df80	setup-printer translation, added client-welcome report	2017-10-20 14:03:25 +02:00
Joan Sanchez	ac21ceb399	Vista previa de email, desde el parámetro isPreview	2017-10-19 12:47:05 +02:00
Daniel Herrero	83d262ec32	agencyService changes to agencyMode	2017-10-19 09:21:34 +02:00
Daniel Herrero	9159af69f4	correciones varias	2017-10-19 09:12:27 +02:00
Dani Herrero	070cd764b6	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2017-10-19 07:16:51 +02:00
Dani Herrero	59577bcb7f	bug fixed rawSQL	2017-10-18 15:06:38 +02:00
Carlos	09a24fe8e8	fixtures	2017-10-18 14:48:39 +02:00
Dani Herrero	3d52031dc2	cambios en validacion de credito de cliente	2017-10-18 12:51:33 +02:00
vicentefalco	a0955cf50d	docker dbLocal	2017-10-18 06:41:17 +02:00
Dani Herrero	a366ef1fc1	facke active drivers rest created	2017-10-17 12:22:19 +02:00
Dani Herrero	5514ec222a	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2017-10-17 09:41:08 +02:00
Dani Herrero	09f54b40d0	parse vars in filer routes	2017-10-17 09:40:56 +02:00
Joan Sanchez	d66fed5a3d	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2017-10-17 09:01:51 +02:00
Dani Herrero	22ccf278a4	config file	2017-10-17 08:45:51 +02:00
unknown	eab51e1b9d	Respuesta json en peticiones, auth, escrito impresoras	2017-10-17 08:22:59 +02:00
Juan Ferrer Toribio	0962fa19e5	Eliminando codigo redundante v5	2017-10-13 16:54:07 +02:00
Juan Ferrer Toribio	8fc14348d7	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2017-10-13 16:23:08 +02:00
Juan Ferrer Toribio	5f1066ff03	Eliminando codigo redundante v3	2017-10-13 16:23:00 +02:00
Juan Ferrer Toribio	4267b5fe0a	Eliminando código redundante v2	2017-10-13 16:22:45 +02:00
Vicente Falco	09e7e7f4ce	DockerFile db local	2017-10-13 08:53:54 +02:00
Juan Ferrer Toribio	ad24380043	Merge	2017-10-11 16:00:36 +02:00
Juan Ferrer Toribio	08da6c9713	Eliminando código redundante v1	2017-10-11 15:36:47 +02:00
dherrero	f24e16b81d	moved model agency	2017-10-11 15:00:18 +02:00
dherrero	e52b31ceb3	service validations moved into generic folder	2017-10-11 14:10:51 +02:00
dherrero	760d63ec6c	removed unused files	2017-10-11 13:03:05 +02:00
dherrero	4dae59aa09	zone model and rest api	2017-10-11 12:47:02 +02:00
dherrero	cf36d7d6be	module routes: front dev 80%	2017-10-11 12:09:22 +02:00
dherrero	911fbb2f8b	filtro de rutas con paginación	2017-10-11 09:18:26 +02:00
dherrero	5a07973789	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2017-10-10 15:01:21 +02:00
dherrero	eeda5b45fd	routes change model and first look	2017-10-10 15:01:10 +02:00
joan	c3d611adb2	Login sin url de redirección	2017-10-10 14:45:13 +02:00
dherrero	2d7e3f8dfe	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2017-10-10 11:14:45 +02:00
dherrero	96235a6752	route service models	2017-10-10 11:14:35 +02:00
Vicente Falco	48cac24d88	Jenkins y routes	2017-10-10 11:09:47 +02:00
dherrero	431032177c	new micro-service route: need reinstall all dependencies	2017-10-05 14:26:04 +02:00
Dani Herrero	dd004fdc89	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2017-10-04 13:32:44 +02:00
Dani Herrero	0925451364	spread equivalent tax in all addresses	2017-10-04 13:32:26 +02:00
Joan Sanchez	9ebd705aea	Errores en servicio de autenficación solucionados.	2017-10-04 13:27:38 +02:00
Dani Herrero	9fbc404aa1	bug fixed in formatCard function	2017-10-04 09:07:14 +02:00
Dani Herrero	8e5eca5629	validation client credit - refact	2017-10-04 08:33:51 +02:00
Dani Herrero	2aed5d088c	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2017-10-04 08:18:49 +02:00
Dani Herrero	627d27ad51	validate client credit	2017-10-04 08:18:31 +02:00
Joan Sanchez	666928b1a9	Auth login json response	2017-10-03 14:44:11 +02:00
Dani Herrero	4e309b67f0	bug fixed on LoadMore action in autocomplete	2017-10-03 09:16:02 +02:00
Joan Sanchez	aef9659798	Mailer: Autentificación token por ruta. Fix creditClassification	2017-10-02 11:19:55 +02:00
Javi Gallego	19e7e0d76b	cambio de enabled y default por isEnabled y isDefaultAddress	2017-09-29 14:41:30 +02:00
Dani Herrero	ecf88f6b66	new address list	2017-09-28 14:34:18 +02:00
Dani Herrero	70e4b22e8a	get address return province data	2017-09-28 11:29:01 +02:00
Dani Herrero	1d47bf58f1	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2017-09-28 09:14:31 +02:00
Dani Herrero	62cc0c3c9e	sales person formated	2017-09-28 09:13:42 +02:00
Vicente Falco	895b3435c4	getRoleCustomer return object not array of object	2017-09-28 08:41:45 +02:00
Joan Sanchez	677e8ddd62	Token authenticate, solunion notification	2017-09-27 17:44:51 +02:00
Dani Herrero	bc20725c6c	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2017-09-27 09:25:39 +02:00
Dani Herrero	fbd5fea126	[finish] active salesPerson service	2017-09-27 09:25:33 +02:00
Carlos	79438f31cb	Merge branch 'dev' of https://git.verdnatura.es/salix into dev ... * 'dev' of https://git.verdnatura.es/salix: active salesperson service in progress	2017-09-27 08:55:38 +02:00
Carlos	6798655869	removed unused file	2017-09-27 08:54:37 +02:00
Dani Herrero	4eeb5df74f	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2017-09-27 07:22:44 +02:00
Dani Herrero	43a55f60c4	active salesperson service in progress	2017-09-27 07:22:40 +02:00