verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 63 Releases Wiki Activity
1,083 Commits 269 Branches 0 Tags 126 MiB
Commit Graph

403 Commits

Author SHA1 Message Date
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
Dani Herrero 35d213874e merge 2017-07-11 10:32:54 +02:00
Vicente Falco f1fda284cb varios cambios 2017-07-11 09:36:11 +02:00
Dani Herrero bbd09b3d36 eliminado console.log 2017-07-06 14:48:05 +02:00
Dani Herrero 2b7abef98f corregido filtro principal 2017-07-06 14:46:22 +02:00
Juan Ferrer Toribio 5929b8be32 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-07-06 13:04:51 +02:00
Juan Ferrer Toribio 46e9029be3 Directorio obsoleto borrado 2017-07-06 13:04:43 +02:00
Dani Herrero 283d2ab440 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-07-06 12:58:54 +02:00
Dani Herrero 25ac346b2b filtro principal y ajustes css 2017-07-06 12:58:50 +02:00
Vicente Falco d8727b380c change-worker 2017-07-06 12:21:19 +02:00
Vicente Falco a7af81383b merge 2017-07-06 11:31:26 +02:00
Vicente Falco 607c781f15 merge 2017-07-06 11:28:06 +02:00
Dani Herrero 0339fdaef1 cambio de hora funcionando 2017-07-06 11:05:26 +02:00
Vicente Falco 525c8bbcf8 merge 2017-07-06 10:39:52 +02:00
Vicente Falco 15fee03060 Endpoint change-time 2017-07-06 09:55:28 +02:00
Dani Herrero 4b767aa61f tooltip template 2017-07-06 09:26:26 +02:00
Vicente Falco d2e0051b38 Endpoint RouteFk 2017-07-06 08:45:33 +02:00
Vicente Falco c47c88dd10 model Routes 2017-07-04 10:13:17 +02:00
nelo e26838063b rutas 2017-07-03 14:29:44 +02:00
nelo f993504157 rutas 2017-07-03 14:29:09 +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 37c1c654b7 get correct user sender 2017-06-29 14:15:23 +02:00
nelo c5363155c4 send message 2017-06-29 14:08:57 +02:00
Dani Herrero d8f4e0489e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-06-29 13:56:56 +02:00
Dani Herrero 491ea3b796 dropDown with search and columHeader preview icon 2017-06-29 13:56:52 +02:00
nelo 2e7a225249 rawsql with promises 2017-06-29 11:48:57 +02:00
nelo ddcec00c4f change time 2017-06-29 09:48:00 +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 4890a69238 page and offset filter FakeProduction 2017-06-22 09:09:31 +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 a4d9c3008a agencies 2017-06-21 08:00:34 +02:00
nelo df320908ae Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-06-21 07:28:07 +02:00
nelo ce15b68a92 list for all models 2017-06-21 07:28:03 +02:00
Dani Herrero 7c28d42be0 merge conflicts 2017-06-20 15:02:23 +02:00
Dani Herrero d444980ab1 [En progreso] nuevo componente vnGridHeader para ordenación de tablas 2017-06-20 15:00:27 +02:00
nelo 509dab5ce4 list states 2017-06-20 13:14:20 +02:00
nelo 50e086fbc0 list for my model 2017-06-20 13:06:13 +02:00
nelo 729ddf3358 warehouses inventory 2017-06-20 10:40:04 +02:00
nelo 80b9815a57 callback error list warehouses, change-state 2017-06-15 11:59:15 +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 6996352029 get warehouses 2017-06-14 12:55:10 +02:00
nelo 16302e1f9a problemas con riesgo 2017-06-14 12:16:53 +02:00
Dani Herrero 888f5c0cc6 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-06-14 09:58:36 +02:00
Dani Herrero e43827ab28 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 
# Conflicts:
#	services/production/common/methods/ticket-state/change-state.js
 2017-06-14 09:58:30 +02:00
nelo 956264a529 fake son con notas 2017-06-14 09:56:08 +02:00
Dani Herrero afff93cce6 Tooltip: admite html, Localizador: añadido icono con información adicional 2017-06-14 09:54:00 +02:00
nelo 3da67266bb promesa para obtener usuario 2017-06-14 08:54:45 +02:00
nelo 6adc734f69 change state ticket 2017-06-13 13:57:40 +02:00
nelo 87857488c0 modificaciones fake son 2017-06-13 12:00:11 +02:00
nelo cbc364db38 get states production 2017-06-13 11:26:54 +02:00
nelo ecf347e7e2 modificaciones fake 2017-06-13 09:07:14 +02:00
nelo c24c126734 fake son de tickets 
my model tiene el meted raw sql
 2017-06-13 08:44:40 +02:00
Joan Sanchez e4f9420697 Parser de estilos en plantillas para el servicio mailer. 2017-06-12 13:41:02 +02:00
Joan Sanchez 9aa549cfc5 No mostrar dia de pago en metodo de pago por tarjeta. 2017-06-08 16:53:10 +02:00
Vicente Falco dbb1632632 nginx docker 2017-06-08 11:08:45 +02:00
Joan Sanchez e178bd8676 Traducciones de plantillas y mostrar nuevos datos de facturación en servicio mailer. 2017-06-07 19:29:16 +02:00
Joan Sanchez 73c5f5581f Cambios en servicio mailer 2017-06-07 15:28:42 +02:00
Vicente Falco 3ffa020564 nginx docker 2017-06-07 09:09:35 +02:00
Vicente Falco 7ec66e862c nginx 2017-06-07 09:07:58 +02:00
Vicente Falco 00dd05ba6d Docker 2017-06-07 08:43:25 +02:00
nelo ce256b395e tarea gula para copiar los ficheros comunes 
puerto 3004 para production
 2017-06-07 08:38:48 +02:00
nelo 47f9d29686 servicio production creado 2017-06-06 08:21:38 +02:00
Vicente Falco 622884d31c Docker nginx 2017-06-05 09:22:36 +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 8cd312e145 Errores solucionados 2017-06-02 15:39:16 +02:00
Juan Ferrer Toribio f9842000d3 Codigo gulp reorganizado, errores redirección solucionados 2017-06-02 15:23:19 +02:00
Juan Ferrer Toribio 481a2219ce Ruta desarrollo http://localhost:5000, producción 80 2017-06-02 09:29:14 +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 fb8e62c840 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-06-01 13:31:47 +02:00
Dani Herrero cd750cb86f ACL corregido error 2017-06-01 13:31:42 +02:00
Juan Ferrer Toribio 2ac41f390a Carpetas renombradas, plantillas configuración 2017-06-01 09:58:24 +02:00
Dani Herrero 0cc64bf285 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-06-01 09:32:01 +02:00
Dani Herrero a3dda662ae ACLs, json configuracion y script SQL 2017-06-01 09:31:57 +02:00
Joan Sanchez bb75fd783c merge 2017-06-01 08:52:25 +02:00
Joan Sanchez c9968cf550 Eliminado logger y renombradas carpetas 2017-06-01 08:51:29 +02:00
Dani Herrero cf9e2f3d14 arreglado fallo al actualizar el consignatario predeterminado 2017-06-01 08:44:37 +02:00
Dani Herrero dd9ec548e1 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-06-01 08:29:15 +02:00
Dani Herrero 8815b927ac merge solved conflicts 2017-06-01 08:29:01 +02:00
Juan Ferrer Toribio 410f0490c6 Errores solucionados 2017-06-01 08:28:52 +02:00
Juan Ferrer Toribio 94bdcd66e7 Errores solucionados 2017-06-01 08:28:12 +02:00
Dani Herrero b9c43ec961 fixed pass 2017-06-01 08:26:48 +02:00
Juan Ferrer Toribio 5507c84670 Errores solucionados 2017-06-01 08:25:59 +02:00
Juan Ferrer Toribio 7f661afa1a Errores solucionados 2017-06-01 08:24:57 +02:00
Dani Herrero 6dcf37fc5a logger fixed 2017-06-01 08:20:05 +02:00
Dani Herrero 36a5051634 arreglos en merge 2 2017-06-01 08:01:49 +02:00
Dani Herrero 342ca3bd30 arreglos de conflictos 2017-06-01 07:59:41 +02:00
Dani Herrero 25bac942a3 merge 2017-06-01 07:10:28 +02:00
Juan Ferrer Toribio 0c82c83ca3 Errores solucionados, configuración mailer, eslint 2017-05-31 18:19:55 +02:00
Joan Sanchez b2c5fe8a28 dependencia path 2017-05-31 14:59:05 +02:00
Joan Sanchez a4d8574321 Cambios en servicio mailer 2017-05-31 14:55:41 +02:00
Joan Sanchez 552559adaa Service mailer, plantillas y traducciones 2017-05-31 13:46:18 +02:00
Vicente Falco f2e5b4824e merge 2017-05-31 13:00:16 +02:00
Vicente Falco 3acca753bb merge 2017-05-31 13:00:16 +02:00
Vicente Falco 89c90b0af2 merge 2017-05-31 12:57:18 +02:00
Vicente Falco fae56408bb merge 2017-05-31 12:57:18 +02:00
Dani Herrero 96dd6de8a6 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-31 12:56:42 +02:00
Dani Herrero 72d5e3e0a3 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-31 12:56:42 +02:00
Dani Herrero b8287efdc2 kanban: asociar envío escrito con cambio de valor 2017-05-31 12:56:37 +02:00
Dani Herrero 528dcac06f kanban: asociar envío escrito con cambio de valor 2017-05-31 12:56:37 +02:00
nelo c8424f98f4 paginación en clientes 
arreglado problema de búsqueda
 2017-05-31 10:58:48 +02:00
nelo 9e550e746a 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 9cea151f4d 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
Dani Herrero cadbb2b6c2 Añadidos ACLs del servicio client 2017-05-30 14:17:01 +02:00
Vicente Falco 2dab567b98 gulp services y service mailer 2017-05-30 08:50:16 +02:00
Vicente Falco 65cc23b280 gulp services y service mailer 2017-05-30 08:50:16 +02:00
Joan Sanchez 04aadb76a2 Service mailer 2017-05-30 08:06:14 +02:00
Joan Sanchez 609c13efbf Service mailer 2017-05-30 08:06:14 +02:00
Vicente Falco 3d43bf57cd mailer docker 2017-05-29 13:57:18 +02:00
Vicente Falco 0ad4558c17 nginx 2017-05-29 13:48:20 +02:00