verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 61 Releases Wiki Activity
3,235 Commits 275 Branches 0 Tags 113 MiB
Commit Graph

314 Commits

Author SHA1 Message Date
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
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
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 d4a0cf205d bug fixed in edit addresses 2017-11-15 12:11:35 +01:00
Carlos 154c06e7f4 added hasToInvoiceByAddress checkbox to client > billingData 2017-11-13 11:47:41 +01:00
Daniel Herrero 17143883f8 address data changes 2017-11-09 14:27:01 +01:00
Daniel Herrero b77395762c bug fixed in address 2017-11-09 13:22:54 +01:00
Vicente Falco 10c52a75b9 microservices: configuration 2017-11-09 07:45:46 +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 c03e5297a2 Docker loopback 2017-11-08 17:24:23 +01:00
Vicente Falco 254615331a Docker: Faster 2017-11-08 17:04:08 +01:00
Vicente Falco 1d109f2371 docker 2017-11-08 14:11: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
Vicente Falco ac8797f24d Client Service: Employee List active 2017-10-25 13:47:39 +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
Vicente Falco 1c5a65928e change on services, docker localDB y jasmime 2017-10-24 08:56:18 +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 59577bcb7f bug fixed rawSQL 2017-10-18 15:06:38 +02:00
Dani Herrero 3d52031dc2 cambios en validacion de credito de cliente 2017-10-18 12:51:33 +02:00
Juan Ferrer Toribio 0962fa19e5 Eliminando codigo redundante v5 2017-10-13 16:54:07 +02:00
Juan Ferrer Toribio 5f1066ff03 Eliminando codigo redundante v3 2017-10-13 16:23:00 +02:00
Juan Ferrer Toribio 08da6c9713 Eliminando código redundante v1 2017-10-11 15:36:47 +02:00
dherrero e52b31ceb3 service validations moved into generic folder 2017-10-11 14:10:51 +02:00
Dani Herrero 0925451364 spread equivalent tax in all addresses 2017-10-04 13:32:26 +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 627d27ad51 validate client credit 2017-10-04 08:18:31 +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 fbd5fea126 [finish] active salesPerson service 2017-09-27 09:25:33 +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 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
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
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
Vicente Falco c3707cc1eb Docker Services 2017-08-30 09:58:10 +02:00
Javi Gallego 1743db2174 isEqualizated en Address 2017-08-22 14:27:09 +02:00
Dani Herrero 9fa608b11f bug fixed filter in clients 2017-07-13 13:12:09 +02:00
Dani Herrero 4e087139b4 CAU 2593 Busqueda Avanzada - campo telefono busca en: phone or mobile 2017-07-11 11:18:42 +02:00
nelo d5d5c3079a corrección errores brocal 2017-07-03 14:23:53 +02:00
Vicente Falco ba2d803f28 merge 2017-07-03 14:20:06 +02:00
Vicente Falco 9e6bd8522e vies 2017-07-03 14:19:47 +02:00
nelo ffe85cca17 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-07-03 09:42:55 +02:00
nelo 9b68abef9d allowBlank client 2017-07-03 09:42:51 +02:00
Vicente Falco e3e7c9f863 endpoint ListadoTrabajadores 2017-06-30 09:26:55 +02:00
nelo c5363155c4 send message 2017-06-29 14:08:57 +02:00
nelo 2e7a225249 rawsql with promises 2017-06-29 11:48:57 +02:00
nelo 80121de6c3 change state 
message send
change time
 2017-06-28 08:57:33 +02:00
nelo d996a56a1e new fake production table 
list filter with fields
 2017-06-22 14:51:37 +02:00
nelo 26e1e9a71b list ticket fake production 2017-06-21 13:29:01 +02:00
nelo a7a4a211e2 fake production in table 2017-06-21 12:11:38 +02:00
nelo ce15b68a92 list for all models 2017-06-21 07:28:03 +02:00
nelo 50e086fbc0 list for my model 2017-06-20 13:06:13 +02:00
nelo b86f71bb25 llamamos al servicio client para obtener el empleado 
cambiamos el estado
 2017-06-15 11:02:50 +02:00
nelo 18ff74b17f get user and employee 2017-06-14 14:27:16 +02:00
nelo 3da67266bb promesa para obtener usuario 2017-06-14 08:54:45 +02:00
nelo c24c126734 fake son de tickets 
my model tiene el meted raw sql
 2017-06-13 08:44:40 +02:00
Juan Ferrer Toribio 609c984426 Loopback 3, errores solucionados, codigo reorganizado 2017-06-05 09:01:21 +02:00
Juan Ferrer Toribio b427361156 Loopback 3, Errores solucionados 2017-06-03 13:01:47 +02:00
Juan Ferrer Toribio 80e6b0c666 Merge 2017-06-01 18:48:11 +02:00
Juan Ferrer Toribio 61829e1ae4 Validación credito beta 2017-06-01 18:23:41 +02:00
nelo 60de6056c1 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-06-01 14:39:26 +02:00
nelo b18c2c4966 Administración solo recargo equivalencia 
Razón social único
Si no hay comercial, modificar los datos
 2017-06-01 14:39:22 +02:00
Dani Herrero 55a66c992c Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-06-01 14:05:31 +02:00
Dani Herrero 310ad81a69 emails separados con coma 2017-06-01 14:05:23 +02:00
Vicente Falco f4ed484b90 Notas: Anadir usuario 2017-06-01 13:52:13 +02:00
Dani Herrero a3dda662ae ACLs, json configuracion y script SQL 2017-06-01 09:31:57 +02:00
Dani Herrero cf9e2f3d14 arreglado fallo al actualizar el consignatario predeterminado 2017-06-01 08:44:37 +02:00
nelo c8424f98f4 paginación en clientes 
arreglado problema de búsqueda
 2017-05-31 10:58:48 +02:00
Dani Herrero 11c3b2de2d renombrado de archivos parte 1 2017-05-31 09:46:05 +02:00
Dani Herrero 74a0eedb47 Añadidos ACLs del servicio client 2017-05-30 14:17:01 +02:00
Juan Ferrer Toribio 025bd4224e Errores en validación solucionados 2017-05-26 17:05:33 +02:00
Juan Ferrer Toribio daaf73a143 Errores validacion solucionados 2017-05-26 14:44:56 +02:00
Juan Ferrer Toribio 64813b3fd3 Errores en validación solucionados 2017-05-26 14:39:59 +02:00
Juan Ferrer Toribio 3d71f454a0 Errores en validación IBAN solucionados 2017-05-26 14:39:36 +02:00
Vicente Falco 51f112fc02 Validar campos loopback diferentes modelos 2017-05-26 14:06:21 +02:00
Juan Ferrer Toribio 1482b842bd Errores solucionados 2017-05-25 12:52:38 +02:00
Juan Ferrer Toribio 345f2e55a5 vnAutocomplete: Acepta plantillas 2017-05-24 13:24:32 +02:00
Juan Ferrer Toribio 5b9fcf868a 401 redirecciona a login, vnAutocomplete: campos seleccionados 2017-05-23 14:05:26 +02:00
Juan Ferrer Toribio ac3f7c2da0 Autenticación: errores solucionados 2017-05-22 11:04:37 +02:00
Juan Ferrer Toribio 5cfdd51cf4 Integración usuarios, errores solucionados 2017-05-21 18:36:07 +02:00
Juan Ferrer Toribio 72415ebeb2 ACLs 2017-05-18 17:54:23 +02:00
Juan Ferrer Toribio c4cb0906ad Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-18 17:35:51 +02:00
Juan Ferrer Toribio a2ac778c9a Peticiones XHR con token 2017-05-18 17:35:07 +02:00
nelo a031f31a05 restablecido filtre 2017-05-18 13:59:02 +02:00
nelo 7691449e52 restablecido filtre 2017-05-18 13:40:42 +02:00
nelo 5e965f485f eliminado el filter de MyModel 2017-05-18 11:55:46 +02:00
nelo b4d167bbb7 header.js 2017-05-18 11:54:39 +02:00
nelo 2aa7c9731d Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-18 08:18:53 +02:00
Juan Ferrer Toribio 2c7a37c4b6 Errores solucionados, modelos loopback ocultados 2017-05-17 21:38:02 +02:00
Juan Ferrer Toribio 9d4acfc64f Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-17 21:23:54 +02:00
Juan Ferrer Toribio 4eff9d451b Autenticación por token 2017-05-17 21:23:47 +02:00
nelo 726bb73ca0 Todos heredan de MyModel 2017-05-17 14:58:23 +02:00
Vicente Falco 5f9160c172 ng-disabled vn-textfield 2017-05-17 14:04:02 +02:00
nelo e4559c3959 Corrección error autocomplete 
Separado meted activate
Separado meted addresses
 2017-05-17 09:45:34 +02:00
nelo ae3f9db948 VnAutocomplete ya no carga los datos cuando los datos se pueden bandera. 
Creado el método card en client para listar el cliente con sus datos para el combo.
 2017-05-17 08:19:03 +02:00
Juan Ferrer Toribio 60a3b049de Campos renombrados 2017-05-12 15:21:37 +02:00
Juan Ferrer Toribio 88992438e2 Errores solucionados 2017-05-12 13:58:08 +02:00
Juan Ferrer Toribio 34e0537b64 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-12 13:36:56 +02:00
Juan Ferrer Toribio ebb59d1eef Errores en relaciones solucionados 2017-05-12 13:36:12 +02:00
Vicente Falco 4df1a7898c Merge commit 'd93c6e18853e572c097b9f8fee4885b6ab17ebae' into dev 2017-05-12 13:05:54 +02:00
Vicente Falco d93c6e1885 Jenkins - Docker 2017-05-12 12:41:35 +02:00
nelo 89f397da2c Arreglado ClientObservation 2017-05-12 11:20:32 +02:00
Juan Ferrer Toribio b7fb0bca98 Relaciones arregladas 2017-05-12 11:14:55 +02:00
nelo 8ce3325f06 Renombrado Chanel a ContactChannel 2017-05-11 14:19:43 +02:00
nelo 495e3b7c5e creado el modelo Chanel. 
Se puede seleccionar en el cliente.
 2017-05-11 13:01:33 +02:00
Vicente Falco 27d086843f Jenkins - Docker 2017-05-11 12:07:33 +02:00
Juan Ferrer Toribio 85184d71eb Modelo modificado 2017-05-10 17:18:25 +02:00