Commit Graph

426 Commits

Author SHA1 Message Date
Daniel Herrero a78292ffb8 merge conflicts 2018-03-01 12:55:07 +01:00
Daniel Herrero b92f8bdd43 tarea #105 esturcctura montada, falta rellenar datos 2018-03-01 12:51:35 +01:00
Javi Gallego c8eab7dc24 merge model-config 2018-03-01 11:57:33 +01:00
Javi Gallego f3b00f4b47 entidad recovery con list, create y tests 2018-03-01 11:55:28 +01:00
Juan 3d4ff56888 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-01 11:36:48 +01:00
Daniel Herrero 465d210b51 bug 103 falcar cliente, acl condicionales 2018-03-01 10:54:02 +01:00
Juan e6c44d74eb Client invoices 2018-02-28 20:55:44 +01:00
Juan b3037e2db9 Addresses E2E fixed 2018-02-28 13:07:58 +01:00
Juan a1ee22d153 #96 - Email validation errors fixed 2018-02-28 12:07:56 +01:00
Juan 688881fac4 Bug #97 - Show dash when no secured credit 2018-02-27 13:28:07 +01:00
Juan f9d6d63b6b #124 Validación de la description en observaciones de direcciones 2018-02-26 14:23:26 +01:00
Javi Gallego f4a244398a greuge con decimales y favicon 2018-02-23 12:51:36 +01:00
Juan Ferrer Toribio 1dfafe0d44 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-20 10:00:26 +01:00
Juan Ferrer Toribio eb0276183f E2E refactor, Snackbar with hide button, Dialog, bugs solved 2018-02-20 10:00:19 +01:00
Carlos Jimenez feabfc05d6 html indent refactors 2018-02-19 20:52:07 +01:00
Daniel Herrero 6fe1f96ef3 Bug fixeds and merge with test 2018-02-15 14:37:54 +01:00
Daniel Herrero 1b4fd50929 Bugs fixed: postalCode, credit list and validate DNI 2018-02-15 13:04:48 +01:00
Daniel Herrero a1dd3e1a77 Bug fixed postalCode in Adresses 2018-02-15 11:44:03 +01:00
Daniel Herrero 81b374d744 Merge conflicts 2018-02-15 10:51:31 +01:00
Carlos Jimenez 79c4aac3f5 corrected indentation on routes.json and added one path to services tests js 2018-02-14 15:56:22 +01:00
Daniel Herrero 21cc4e3320 semantic refactor 2018-02-14 14:04:47 +01:00
Carlos Jimenez 0bcc638af7 mini refactor on address edit 2018-02-13 09:32:07 +01:00
Juan Ferrer Toribio c4b184e5e8 vnCheck componentized, Client style changes 2018-02-12 13:16:49 +01:00
Juan Ferrer Toribio 88d50e3d00 Core refactor, first step 2018-02-10 16:18:01 +01:00
Daniel Herrero 6387f6cedb noteCreate fixed 2018-02-08 13:28:01 +01:00
Daniel Herrero d0432140d7 create address fixed 2018-02-08 12:57:57 +01:00
Daniel Herrero 71eaa53dae generic class to list models into view with mg-crud 2018-02-08 12:04:17 +01:00
Javi Gallego 378c04b123 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-08 09:44:32 +01:00
Daniel Herrero a3917aae32 addresses list improvement 2018-02-08 09:04:29 +01:00
Daniel Herrero a83bae465f new tests added into address-edit 2018-02-08 07:54:20 +01:00
Daniel Herrero 2cc6dfd553 changes in last test 2018-02-07 14:48:11 +01:00
Daniel Herrero 87d423fd52 new testing in address-edit 2018-02-07 14:47:08 +01:00
Javi Gallego 220baa717e roles de credito y greuges 2018-02-07 14:16:11 +01:00
Daniel Herrero d251227107 changes in logic address-edit 2018-02-07 13:26:21 +01:00
Daniel Herrero fb9ba713bd addresses observations finish 2018-02-07 13:10:22 +01:00
Carlos Jimenez 8de88aa046 small refactor on greuge list and fixtures 2018-02-07 08:47:04 +01:00
Daniel Herrero 7eee1cad50 address observations crud created 2018-02-06 15:09:31 +01:00
Daniel Herrero 806734fb13 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-06 07:01:47 +01:00
Carlos Jimenez 1a1f861205 front unit tests for address-edit, fiscal-data and removed spec file for search-panel as theres nothing to test anymore 2018-02-05 10:58:49 +01:00
Juan Ferrer Toribio 3e2e2f3c3a Client i18n now uses YAML format 2018-02-04 15:46:46 +01:00
Daniel Herrero f78f1413bd merge conflicts 2018-02-01 14:34:50 +01:00
Daniel Herrero 51cc783521 side front address observations 2018-02-01 13:28:45 +01:00
Juan Ferrer Toribio 3d6f9fbbca Backend tests refactor, bug fixes 2018-01-31 12:17:17 +01:00
Juan Ferrer Toribio 109f04c517 Merge 2018-01-30 16:34:32 +01:00
Juan Ferrer Toribio 7d7d179bdd Fontend tests fixed 2018-01-30 14:48:21 +01:00
Daniel Herrero 90fab7b01a address observations, list and view edit (TODO save) 2018-01-30 14:47:47 +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
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
Daniel Herrero 84e15ae80c moved card style 2018-01-25 14:12:45 +01:00
Carlos Jimenez 300f3d543a corrections 2018-01-18 15:27:35 +01:00
Daniel Herrero 8f9f14239e ficha cliente muestra los campos vacios 2018-01-17 09:00:41 +01:00
Daniel Herrero 7503179cb8 merge conflict 2018-01-16 13:56:09 +01:00
Daniel Herrero 397a764dc7 refactor de dropdown, textfield, focus y navegacion por tabs 2018-01-16 13:54:21 +01:00
Carlos Jimenez d20c38e21e greuge-create.js client unit tests 2018-01-15 09:39:06 +01:00
Carlos Jimenez 9240c36685 added property name to the html form for the watcher to show the right error messages when the form is empty 2018-01-11 22:18:38 +01:00
Daniel Herrero 1a772978b0 eliminados los segundos de la fecha en greuge 2018-01-10 11:29:41 +01:00
Daniel Herrero 9d5ae5a665 greuge shipped with time 2018-01-10 10:48:02 +01:00
Carlos Jimenez 245025453a translation for amount 2018-01-09 13:50:39 +01:00
Carlos Jimenez b3ddeaf4a7 credit refactor to build employee name and surname on client side 2018-01-05 08:06:21 +01:00
Daniel Herrero 86209e43cd card item structure 2017-12-20 14:36:12 +01:00
Daniel Herrero c04020d0e7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-12-14 15:09:46 +01:00
Daniel Herrero 3e1d6ee4e5 bug fixed in address pagination 2017-12-14 15:08:07 +01:00
Carlos Jimenez 868a76756e Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2017-12-14 14:57:54 +01:00
Carlos Jimenez 3bffedf86d refactor on all e2e paths plus addresses path test for EQtax propagation 2017-12-14 14:56:20 +01:00
Daniel Herrero e2d3daf6ea removed attr style from html 2017-12-14 14:28:54 +01:00
Daniel Herrero 59061927c6 new style in client 2017-12-14 13:48:29 +01:00
Daniel Herrero c9ff880591 style bug fixed in descriptor 2017-12-14 13:29:18 +01:00
Daniel Herrero 34953e3a71 arreglado teste del nuevo descriptor para client 2017-12-14 12:43:28 +01:00
Daniel Herrero 3ec5594e71 new client descriptor 2017-12-14 10:11:34 +01:00
Daniel Herrero da3fd1672d create greuge with intial data 2017-12-13 15:13:13 +01:00
Daniel Herrero b8f50b64da Componente datePicker añadido atributo todate, (hoy como fecha por defecto) 2017-12-13 14:11:48 +01:00
Daniel Herrero 9fe0aadff8 modelos con inicial mayuscula 2017-12-13 13:40:21 +01:00
Daniel Herrero b8a6340afd [R12 - T16] REST para mandatos 2017-12-13 08:24:14 +01:00
Daniel Herrero 786d321794 Tarea #14 Interfaz lista mandatos 2017-12-13 08:04:53 +01:00
Carlos Jimenez de71e5a454 translations for some form fields 2017-12-11 12:41:55 +01:00
Carlos Jimenez 92fe65b898 repairs on e2e tests completed plus Fiscal Data Path completed 2017-12-07 13:35:40 +01:00
Carlos Jimenez 08bfb80912 refactor to fix and update testing fixtures 2017-12-05 11:21:48 +01:00
Javi Gallego f575a6b570 merge descriptor 2017-12-04 08:22:50 +01:00
Javi Gallego 8755d4846a merge 2017-12-04 08:17:29 +01:00
Daniel Herrero d1eacedcc1 credito en card 2017-11-30 14:48:47 +01:00
Daniel Herrero 30d59a6843 tests fixed 2017-11-30 14:05:47 +01:00
Daniel Herrero c8dcf2b971 posibilidad de añadir paramateros a las rutas 2017-11-30 14:00:07 +01:00
Daniel Herrero 7d32f95c23 creada clase para listar modelos relacionados con el modelo cliente 2017-11-30 13:37:21 +01:00
Daniel Herrero c8b510f09f quitado el credito de la vista forma de pago 2017-11-30 13:01:11 +01:00
Daniel Herrero ea9c5f3457 tests arreglados 2017-11-30 10:13:34 +01:00
Daniel Herrero 83301070e7 created quitado desde lado cliente 2017-11-30 09:37:13 +01:00
Daniel Herrero 1416cab07a greuge ya crea 2017-11-30 09:33:32 +01:00
Daniel Herrero 78f4685001 mejora visual en las listas de credito y greuge 2017-11-30 07:41:14 +01:00
Daniel Herrero d5550c3402 greuge list 100% and create 90% 2017-11-29 14:14:08 +01:00
Daniel Herrero 03d4e2f470 correccion visual en lista de creditos 2017-11-29 11:41:14 +01:00
Daniel Herrero 261d9408ee credit list terminado 2017-11-29 09:42:59 +01:00
Daniel Herrero 9638f5b529 ruta acceso greuge y objetos 2017-11-29 07:36:02 +01:00
Daniel Herrero d3e7f3eca2 Crear credito 2017-11-28 13:59:16 +01:00
Daniel Herrero f76a258fce client credit list terminado 2017-11-28 13:21:26 +01:00
Daniel Herrero a44d39f040 identación en listado de credito 2017-11-28 12:58:54 +01:00
Daniel Herrero 9df3d30c40 listado de crédito de cliente 2017-11-28 12:58:05 +01:00
Daniel Herrero 438c573ec1 internacionalizacion menu izquierda client 2017-11-28 12:57:51 +01:00
Joan Sanchez 09d788faaa Escritos, servicio print 2017-11-27 15:08:18 +01:00
Javi Gallego a16f8b29c2 vnCard con nuevo formato 2017-11-24 07:39:05 +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
Javi Gallego 583e7c34bc Añadir activo a datos fiscal-data 2017-11-22 08:35:09 +01:00
Javi Gallego af5a4d65a9 cambio de fuente de raleway a roboto 2017-11-22 07:56:31 +01:00
Daniel Herrero e7d19da8f5 added sales person property into create new client 2017-11-21 14:53:09 +01:00
Daniel Herrero cf4c208eea Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-21 14:52:13 +01:00
Daniel Herrero 8af0959d08 error corregido con tag acl repetido 2017-11-21 14:52:06 +01:00
Javi Gallego 26920bb124 adaptacion de border radius y notes con nuevo diseño 2017-11-21 14:22:59 +01:00
Javi Gallego a71d0ed8bc border radius en scss 2017-11-21 14:22:30 +01:00
Javi Gallego 52cbd1a870 eliminacion del style vn-empty, ahora se llama vn-auto 2017-11-21 12:44:28 +01:00
Javi Gallego 78eda1c70e errores de traduccion 2017-11-21 12:07:37 +01:00
Daniel Herrero 13c15bb5b3 production with searchbar 2017-11-21 11:12:52 +01:00
Daniel Herrero c615df2c1e test comentados pendientes revision con Carlos 2017-11-21 07:52:29 +01:00
Daniel Herrero ea35c1feda new searchBar 2017-11-16 15:05:45 +01:00
Daniel Herrero d5d8145fee bugs fixed 2017-11-15 13:05:11 +01:00
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