Commit Graph

261 Commits

Author SHA1 Message Date
Daniel Herrero 44dde2b705 searchbar clean filters 2017-11-15 12:53:32 +01:00
Daniel Herrero d4a0cf205d bug fixed in edit addresses 2017-11-15 12:11:35 +01:00
Daniel Herrero bb4c43c2bd cambios en formularios de client 2017-11-15 09:38:39 +01:00
Daniel Herrero 78fd0d4d16 recargo y vies movidos de vista 2017-11-15 08:41:54 +01:00
Daniel Herrero 83965b20ee Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-14 08:56:28 +01:00
Daniel Herrero a84fc8c1b6 new autoComplete option to custom filter 2017-11-14 08:45:56 +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
Carlos f1eba5d27c translation refactor for fiscal data 2017-11-09 13:29:51 +01:00
Daniel Herrero c74bafae7e acl in routes 2017-11-09 11:39:41 +01:00
Carlos 60a478e5c6 selectors.js refactor plus e2e tests 2017-11-08 15:43:34 +01:00
Vicente Falco 74e2b2b04d merge 2017-11-02 13:09:59 +01:00
Daniel Herrero 3d9c46f08e enlaces pp en modulos cliente y rutas 2017-11-02 09:58:28 +01:00
Daniel Herrero 1d1f377a18 error con checkboxes y su anchura 2017-11-02 08:46:09 +01:00
Vicente Falco e04cda0f35 service Production: bugs 2017-10-31 09:26:11 +01:00
Daniel Herrero 83d262ec32 agencyService changes to agencyMode 2017-10-19 09:21:34 +02:00
Carlos 85ec628ae6 refactor to load controller on the beforeEach in all spec files for client side unit tests 2017-10-17 14:24:40 +02:00
Carlos 5e1be3bc53 client side unit test for vnWatcher until submit[controller.save] plus small refactor for other files plus deletion of unused file 2017-10-16 15:20:40 +02:00
dherrero 601cf6db25 refactor watcher 2017-10-05 09:20:40 +02:00
Dani Herrero 0925451364 spread equivalent tax in all addresses 2017-10-04 13:32:26 +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
Dani Herrero fbd5fea126 [finish] active salesPerson service 2017-09-27 09:25:33 +02:00
Carlos b41f5a3996 unit tests for autocompelete showDropDown plus small correction in other two files. 2017-09-26 10:26:21 +02:00
Dani Herrero 490ff51fa6 bug fixed in address edit with watcher 2017-09-21 12:24:14 +02:00
Carlos ec4adc7552 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  billing data with acls
2017-09-21 10:27:10 +02:00
Carlos f716721836 info tag for emails updated and html and es.json files addapted. 2017-09-21 10:26:46 +02:00
Dani Herrero 922ae5c848 billing data with acls 2017-09-21 10:23:51 +02:00
Dani Herrero 32d816ba60 translate in info tag 2017-09-21 09:06:51 +02:00
Carlos 1e494ec08b refactor plus front-end unit repairs 2017-09-21 08:48:25 +02:00
Dani Herrero aa4bfb4f51 change password permission 2017-09-21 07:53:23 +02:00
Dani Herrero d8ba5ecdcb Merge branch 'autocomplete-v2' into dev 2017-09-20 14:10:16 +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
Dani Herrero 1dad2147ca autocomplete con seleccion multiple 2017-09-20 13:52:53 +02:00
Dani Herrero d81d36217a transclude funcionando 2017-09-20 11:50:53 +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
Dani Herrero 99155e09fb vn-title bug fixed 2017-09-13 13:34:57 +02:00
Dani Herrero a200fb8143 textfield with info 2017-09-13 10:59:34 +02:00
Dani Herrero 2fd58af254 refactoring textfield finished 2017-09-13 09:45:42 +02:00
Dani Herrero cccc0ade2b refactoring textfield, validations pending 2017-09-12 15:02:14 +02:00
Carlos 12270f21f9 changed tittes to english and small refactor on address-create spec 2017-09-08 09:53:37 +02:00
Carlos 5570ec1c33 translation changes 2017-09-06 15:37:42 +02:00
Carlos eb1a844930 translation changes 2017-09-06 14:23:06 +02:00
Carlos fb41fbd963 refactor en fical-data.html 2017-09-06 12:49:36 +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 e2d1103607 tarea Añadir email y user al formulario de creación de clientes 2017-09-05 16:15:11 +02:00
Carlos e43e3211d0 descriptor unit test 2017-09-04 17:15:07 +02:00
Carlos 352e68ed58 refactor in all client specs to next describes accordingly 2017-09-04 15:06:43 +02:00
Carlos 6c13fce8a9 front client specs ES6 refactor 2017-09-04 14:39:58 +02:00
Carlos 62c15fbafa create client onSubmit callback tested 2017-09-04 12:46:19 +02:00
Carlos fa64931cc2 search-panel spec plus small refactor on it's js and html template. 2017-09-04 09:47:25 +02:00
Carlos a732d796e8 unit test for notes and index plus small refactor on notes.js 2017-09-01 13:03:02 +02:00
Carlos fd39993794 note-create unit test 2017-09-01 09:20:22 +02:00
Carlos abe576078e removed unused httpBackend code 2017-09-01 08:49:22 +02:00
Carlos b63b92f5ef refactor on various specs and commented malfuctioning code for future fixing. 2017-09-01 08:47:28 +02:00
Carlos 3fd0a4f49d create.js OnSubmit() unit test 2017-08-31 19:40:22 +02:00
Carlos c2e0a081e2 unit test for billing-data create and index 2017-08-31 19:15:17 +02:00
Carlos 60c46b5fb7 small refactor on address-edit.spec.js 2017-08-31 08:55:17 +02:00
Carlos f813d052aa unit test for address-create.js and address-edit.js 2017-08-31 08:53:17 +02:00
Carlos 0461b3a429 vnClientCard unit test 2017-08-30 16:05:34 +02:00
Carlos 1721509ce4 returnDialog() unit test 2017-08-30 15:30:49 +02:00
Carlos 20d82cde50 checkPaymentChanges unit test 2017-08-30 12:30:48 +02:00
Carlos 5e8f95dd65 Billing data copyData and submit unit tests plus small refactor at billing-data.js 2017-08-30 08:38:41 +02:00
Carlos d3600858ee billing data copyData test 2017-08-29 15:14:18 +02:00
Carlos 5bf59f4c25 commented failing spec and injected vnCore dependencies to cliente module. 2017-08-29 13:27:43 +02:00
Carlos 1eb0c594be unit test for web-access and bug fixes at watcher.js 2017-08-29 12:33:48 +02:00
Vicente Falco 46a69f3842 Merge remote-tracking branch 'origin/unit-tests' into dev 2017-08-25 11:49:26 +02:00
Carlos 29dd3ef67c removed unused code 2017-08-25 09:03:43 +02:00
Eist fbb10cc2c0 unit testing environment 2017-08-25 08:42:53 +02:00
Javi Gallego 1743db2174 isEqualizated en Address 2017-08-22 14:27:09 +02:00
Dani Herrero 45849e4daa corregido CAU 2594 cambios en datos de facturación 2017-07-13 13:49:45 +02:00
Dani Herrero 22829aa218 nuevos iconos de módulos 2017-07-11 14:28:53 +02:00
Juan Ferrer Toribio 6f581e033a Merge 2017-07-06 12:43:37 +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
Dani Herrero 06537bcf8d filtro de trabajadores y llamada a validaciones opcional 2017-07-03 08:38:45 +02:00
Joan Sanchez 73c5f5581f Cambios en servicio mailer 2017-06-07 15:28:42 +02:00
Juan Ferrer Toribio 5d789b0e71 Locales 2017-06-07 08:39: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
Dani Herrero bb91c026da corregido error aviso cambio de método pago 2017-06-01 14:50:55 +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 a3dda662ae ACLs, json configuracion y script SQL 2017-06-01 09:31:57 +02:00
Dani Herrero 67de66d6c5 mensajes de notificación enviada / error 2017-05-31 13:47:40 +02:00
Dani Herrero 981b763cd8 corrección errata ortográfica 2017-05-31 13:01:15 +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 b8287efdc2 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
Dani Herrero 11c3b2de2d renombrado de archivos parte 1 2017-05-31 09:46:05 +02:00
Dani Herrero 87c38a0d89 creada factoria q retorna los modulos disponibles para el usuario, ACL 2017-05-30 09:54:35 +02:00
Dani Herrero 9ce12b2e53 nuevo home con acceso directo a los módulos 2017-05-30 09:06:11 +02:00
Dani Herrero 571692f4ca Añadidos estilos a elementos desabilitados, mejora de directiva vnAcl 2017-05-25 14:23:19 +02:00
Juan Ferrer Toribio 041be5ec93 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-25 12:52:49 +02:00
Juan Ferrer Toribio 1482b842bd Errores solucionados 2017-05-25 12:52:38 +02:00
Dani Herrero f12c66027b Eliminada prueba de directiva vnAcl en último commit 2017-05-25 11:56:34 +02:00
Dani Herrero 81f9de098d ACLs , permisos a nivel de rutas, menu y componentes 2017-05-25 11:48:10 +02:00
Juan Ferrer Toribio 345f2e55a5 vnAutocomplete: Acepta plantillas 2017-05-24 13:24:32 +02:00
Juan Ferrer Toribio bcd4cedbcd Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-23 16:12:47 +02:00
Dani Herrero 27073fe9d7 leftMenu : estado activo, Routes.json: nueva jerarquía de rutas 2017-05-23 14:36:54 +02:00
Juan Ferrer Toribio 5b9fcf868a 401 redirecciona a login, vnAutocomplete: campos seleccionados 2017-05-23 14:05:26 +02:00
Dani Herrero 434002b308 separda la facturación en 2 modulos 2017-05-23 10:58:17 +02:00
Dani Herrero bda48488fc Client card, uso de mgCrud. Routes: añadido estado abstract 2017-05-23 09:20:21 +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
Vicente Falco 51c145158b Error Guardar consignatario 2017-05-18 13:27:45 +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 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 39f5f55714 merge 2017-05-17 13:18:20 +02:00
Vicente Falco 73f464cae5 merge 2017-05-17 13:15:16 +02:00
Juan Ferrer Toribio 5db994e263 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-17 12:14:17 +02:00
Juan Ferrer Toribio a7bfd5122a Errores gulp solucionados 2017-05-17 12:07:42 +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
Vicente Falco ba6b9c5a89 fiscal-data IBAN html 2017-05-16 13:44:25 +02:00
Juan Ferrer Toribio c4978b24fb Errores eslint, scripts dev 2017-05-16 12:37:48 +02:00
Juan Ferrer Toribio 60a3b049de Campos renombrados 2017-05-12 15:21:37 +02:00
Juan Ferrer Toribio fbd3f4c623 Errores solucionados 2017-05-12 14:46:19 +02:00
Juan Ferrer Toribio 88992438e2 Errores solucionados 2017-05-12 13:58:08 +02:00
Juan Ferrer Toribio ebb59d1eef Errores en relaciones solucionados 2017-05-12 13:36:12 +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
Juan Ferrer Toribio 0efdd3565e Modelos loopback 2017-05-09 14:04:44 +02:00
Juan Ferrer Toribio 0da217e9bc Errores solucionados 2017-05-05 13:32:07 +02:00
Juan Ferrer Toribio ce2d7936af Integración con MySQL, errores solucionados 2017-04-28 15:04:29 +02:00
Vicente Falco 4bc1cf455b notes: Crear 2017-03-10 11:18:16 +01:00
Vicente Falco 5e66bef50c Clientes: Recordar campos busqueda avanzada 2017-03-10 07:19:43 +01:00
Juan Ferrer Toribio 7059eadfc7 Correciones varias 2017-03-07 17:11:56 +01:00
Juan Ferrer Toribio 398ede37d0 Correcciones varias 2017-03-07 13:01:24 +01:00
Juan Ferrer Toribio 3a16f09494 bug validaciones, eslint en formato yml 2017-03-07 12:37:59 +01:00
Vicente Falco 2cb110feee consignatario sin bind 2017-03-06 11:44:02 +01:00
nelo 8ed24880bc Activate solucionado sus errores 2017-03-01 10:48:27 +01:00
Juan Ferrer Toribio 2cc7d96dce Eslint 2017-03-01 09:55:17 +01:00
nelo 807d1c4ab9 cambio aspa en textfield
modificado funcionario getModifiedData
el descriptor no envía datos al servidor
2017-02-28 12:07:16 +01:00
Juan Ferrer Toribio c6ac5a8bdd Errores solucionados 2017-02-24 13:03:23 +01:00
Juan Ferrer Toribio 0f360db06e mgCrud v2 2017-02-21 16:21:55 +01:00
Juan Ferrer Toribio c694f00644 mgCrud v1 2017-02-21 11:36:43 +01:00
Juan Ferrer Toribio efac73f4bc mgCrud como modulo npm externo, vnFocus sobre botones 2017-02-08 17:28:23 +01:00
Juan Ferrer Toribio f4a5274a9a Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix 2017-02-08 15:57:57 +01:00
Vicente Falco 71cad27187 focus 2017-02-08 14:45:27 +01:00
Juan Ferrer Toribio e15a03e0ea Errores solucionados 2017-02-08 12:47:10 +01:00
Juan Ferrer Toribio 51c58d9a9b mg-crud añadida, filtro phone 2017-02-08 12:45:55 +01:00
Juan Ferrer Toribio 558ad8f393 Errores solucionados 2017-02-07 17:38:30 +01:00