verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity
1,416 Commits 259 Branches 0 Tags 122 MiB
Commit Graph

528 Commits

Author SHA1 Message Date
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
Juan Ferrer Toribio f647e9e2d1 Modelos y código común para servicios loopback 2017-09-26 16:59:24 +02:00
Javi Gallego bf0bd37773 validacion del Iban 2017-09-25 17:40:02 +02:00
Javi Gallego 9b76d3d004 validaciones custom se bajan al cliente solo si son isExportable 2017-09-25 17:39:51 +02:00
Carlos a5df4afc0f refactor on routes.js 2017-09-22 13:06:38 +02:00
Carlos f588e3f046 linter errors corrected 2017-09-21 14:49:14 +02:00
Carlos 747d5f5e36 datasource.test files for the local test db plus dockerfile refactor 2017-09-21 14:46:42 +02:00
Vicente Falco 35ce85e3fc docker DB 2017-09-21 12:17:48 +02:00
Carlos 76b0b955cf fixed ESLint errores for the commited files. 2017-09-20 15:06:38 +02:00
Carlos 9ed9e13b54 jasmine ESLint plugging added to dev dependencies and refactor on all specs according to eslint rules. 2017-09-20 14:01:33 +02:00
Carlos e20dd82928 repaired ESLint to work everywhere, plus refactor on all package.json's that included ESLint dependencies. 2017-09-20 13:15:12 +02:00
Vicente Falco 6c3ac042f1 CreateUserProfile: save first email on account table and all emails on client table 2017-09-20 12:15:38 +02:00
Carlos 2e5989cc7f removed console.log from filter.js 2017-09-19 14:36:48 +02:00
Carlos e8d24a52ef basic-data.html info tag added, plus refactor on backend create.js and filter.js, plus spec commented until db docker implementation 2017-09-19 14:34:59 +02:00
Vicente Falco 93568237f0 boolean return method getRoleCustomer 2017-09-18 11:52:03 +02:00
Vicente Falco 7f6e9fc617 Service gets if a client has got a Role customer - 
getRoleCustomer
 2017-09-18 07:39:06 +02:00
Dani Herrero b288692b6c ticket json 2017-09-12 10:36:07 +02:00
Dani Herrero be24b31339 ticket.json 2017-09-12 07:39:45 +02:00
Carlos f5fd729634 e2e tests on clients path 2017-09-11 16:12:32 +02:00
Carlos 0cc707bc2c server-side tests settings and e2e settings 2017-09-10 20:04:22 +02:00
Carlos 9c80cd8466 server-side unit tests env setup 2017-09-08 14:37:55 +02:00
Carlos a9763e728c refactor for backend create.js transaction and it's html error notification for account implemented 2017-09-06 09:56:36 +02:00
Carlos 9607b2d897 transaction for account and client creation at create.js 2017-09-05 23:01:51 +02:00
Carlos e2d1103607 tarea Añadir email y user al formulario de creación de clientes 2017-09-05 16:15:11 +02:00
Joan Sanchez 4c9383038f Notification rest, mail log and error catch 2017-08-31 16:11:37 +02:00
Joan Sanchez 22b5e2e8bf Mailer mail.send() and mail.sendWithTemplate() 2017-08-30 14:50:46 +02:00
Vicente Falco 0656fea23b mailer: cambio email destinatario cuando no es production 2017-08-30 14:10:43 +02:00
Vicente Falco c3707cc1eb Docker Services 2017-08-30 09:58:10 +02:00
Javi Gallego cad2aaf121 campo isManaged para que no muestre todos los almacenes en los combobox 2017-08-29 12:21:00 +02:00
Javi Gallego 1743db2174 isEqualizated en Address 2017-08-22 14:27:09 +02:00
Juan Ferrer Toribio 5c80a8b4d7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-08-22 09:51:24 +02:00
Juan Ferrer Toribio c65d69c62f Archivos duplicados borrados 2017-08-22 09:51:13 +02:00
Dani Herrero 9fa608b11f bug fixed filter in clients 2017-07-13 13:12:09 +02:00
Dani Herrero 5e41f573f5 añadido campo Date al modelo de FakeProduction 2017-07-12 14:02:03 +02:00
Vicente Falco 139579e78f FakeProductionSql campo date 2017-07-12 08:53:55 +02:00
Vicente Falco ace002e02b time production 2017-07-12 08:21:36 +02:00
Vicente Falco 62b0a29f7c messageSend Production 2017-07-12 07:57:30 +02:00
Dani Herrero 22829aa218 nuevos iconos de módulos 2017-07-11 14:28:53 +02:00
Dani Herrero 4e087139b4 CAU 2593 Busqueda Avanzada - campo telefono busca en: phone or mobile 2017-07-11 11:18:42 +02:00
Dani Herrero c788ea5e29 config en minusculas 2017-07-11 10:34:25 +02:00