Commit Graph

692 Commits

Author SHA1 Message Date
Javi Gallego 595cbfbed6 quitado el antiguo campo de iva 2018-02-13 14:19:06 +01:00
Javi Gallego a50c3d565e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-13 13:29:28 +01:00
Javi Gallego b5db0abbf1 Creacion sin relevancy y acl de clientObservation 2018-02-12 12:02:00 +01:00
Carlos Jimenez 813e160499 pagination for item log plus more fixtures 2018-02-12 12:01:39 +01:00
Carlos Jimenez 845dfc77bb Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-12 10:53:43 +01:00
Carlos Jimenez 100b5a09ed fixtures for item log 2018-02-12 10:53:03 +01:00
Juan Ferrer Toribio b45ab59076 Updated template datasources.json 2018-02-09 15:10:33 +01:00
Juan Ferrer Toribio f79b70e264 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-09 12:43:17 +01:00
Juan Ferrer Toribio d369db9dc0 Debug fixes 2018-02-09 12:43:14 +01:00
Vicente Falco 58d5e7add9 Services Jenkins 2018-02-09 12:26:27 +01:00
Carlos Jimenez 540a65476b fixtures updated 2018-02-09 08:54:53 +01:00
Carlos Jimenez e11e0be029 fixtures for addresses listed for Bruce Banner are now enough to trigger pagination 2018-02-08 14:40:32 +01:00
Vicente Falco 725fe79022 package md5 2018-02-08 13:11:15 +01:00
Vicente Falco d6b010387a service auth package md5 2018-02-08 13:06:12 +01:00
Daniel Herrero 4ec0a3c46d item history 2018-02-08 12:04:33 +01:00
Carlos Jimenez 76f808e7f6 itemLog for item history refactor 2018-02-08 11:40:06 +01:00
Javi Gallego 378c04b123 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-08 09:44:32 +01:00
Vicente Falco 6011a2ecaf Docker 2018-02-08 08:30:24 +01:00
Vicente Falco bf7a286b1c Dockerfile 2018-02-08 07:15:25 +01:00
Juan Ferrer Toribio 45606303fe Script to import local-db changes, fixtures fixed, structure updated 2018-02-07 19:55:47 +01:00
Juan Ferrer Toribio f84bf44550 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-07 16:45:50 +01:00
Juan Ferrer Toribio 4876f36190 Local database structure updated & import changes script 2018-02-07 16:45:40 +01:00
Carlos Jimenez 03faa09284 item history functionality, awaiting for clientfilters refactor 2018-02-07 15:06:21 +01:00
SAMBA\bernat 249a622e2d update fixtures 2018-02-07 14:45:04 +01:00
Vicente Falco c61748ec95 Dockerfile Services 2018-02-07 14:37:26 +01:00
Javi Gallego 220baa717e roles de credito y greuges 2018-02-07 14:16:11 +01:00
Carlos Jimenez 3d7d0762b6 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-07 13:49:05 +01:00
Carlos Jimenez de9f7a5545 item history 2018-02-07 13:48:55 +01:00
Juan Ferrer Toribio fda8750304 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-07 10:29:27 +01:00
Juan Ferrer Toribio 0fc1dc0faa Address id fixtures, gulpfile clean, eslint no-empty 2018-02-07 10:29:23 +01:00
Carlos Jimenez 93ef3c7fea item history js files implementation 2018-02-07 08:49:27 +01:00
Carlos Jimenez 8de88aa046 small refactor on greuge list and fixtures 2018-02-07 08:47:04 +01:00
Juan Ferrer Toribio 853b16bd81 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-07 08:30:20 +01:00
Carlos Jimenez 86aab2ca31 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-06 16:23:22 +01:00
Daniel Herrero 7eee1cad50 address observations crud created 2018-02-06 15:09:31 +01:00
Carlos Jimenez 335847358f fixtures addition plus item en.yml created 2018-02-06 14:03:09 +01:00
Juan Ferrer Toribio 65e197d555 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-06 09:10:57 +01:00
Daniel Herrero f0356eb047 join addressObservation into list Addresses service 2018-02-06 07:59:36 +01:00
Juan Ferrer Toribio 5ff996a4c7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-05 19:34:12 +01:00
Juan Ferrer Toribio 90ce07881a Gulpfile refactor, SQL scripts 2018-02-05 19:34:04 +01:00
Joan Sanchez 692a226b69 El servicio de Nginx ahora se inicia desde Gulp. Añadido alias de instalacion "gulp i". 2018-02-05 19:22:38 +01:00
Juan Ferrer Toribio 89c745244a YAML configuration, client module register simplified 2018-02-04 19:39:56 +01:00
Juan Ferrer Toribio cf2f8b77ff Log removed 2018-02-03 23:54:31 +01:00
Juan Ferrer Toribio d1096a270f Bugs solved in Nginx starting scripts 2018-02-03 23:46:52 +01:00
Juan Ferrer Toribio 4a388f241c Gulp refactor 2018-02-03 23:07:28 +01:00
Juan Ferrer Toribio 681310d9b6 Dockerfile bug 2018-02-03 22:56:49 +01:00
Juan Ferrer Toribio e7d3ff9272 Refactor gulp and config 2018-02-03 22:53:02 +01:00
Juan Ferrer Toribio ca7e299fbc Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-03 20:14:52 +01:00
Juan Ferrer Toribio 597299b1c5 Autogenerated Nginx config and docker compose 2018-02-03 20:14:44 +01:00
Carlos Jimenez 48f6f5a18d successfully moved all specs from services/client/c../m../client alongside their respective js files 2018-02-02 16:24:22 +01:00
Javi Gallego ac8db83582 README fixes, bugfixes for windows 2018-02-02 09:51:38 +01:00
Juan Ferrer Toribio aae0cd9128 Merge 2018-02-01 12:55:06 +01:00
Juan Ferrer Toribio 57479aaf76 Bug fixes 2018-02-01 12:52:58 +01:00
Carlos Jimenez 03116ed595 item descriptor now shows itemTags ordered by priority 2018-02-01 10:05:20 +01:00
Juan Ferrer Toribio b5e5b5bd6b Merge 2018-02-01 08:50:26 +01:00
Juan Ferrer Toribio 52db3bbf2f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-01 08:49:10 +01:00
SAMBA\bernat 94693c3a7e structure dblocal syncronize with produccion 2018-02-01 08:46:13 +01:00
Carlos Jimenez b01b333481 inserts sql updated for items 2018-02-01 08:32:48 +01:00
Juan Ferrer Toribio 87b3ac995d Development environment now points to local database by default 2018-01-31 14:56:55 +01:00
Juan Ferrer Toribio 9090c56c64 Backend tests fixed 2018-01-31 13:40:26 +01:00
Juan Ferrer Toribio cba0645f92 Merge with dev 2018-01-31 12:19:34 +01:00
Juan Ferrer Toribio 3d6f9fbbca Backend tests refactor, bug fixes 2018-01-31 12:17:17 +01:00
Carlos Jimenez cd027a3e12 refactor to avoid using import on backend testing env 2018-01-31 12:02:35 +01:00
Carlos Jimenez 215ae09b70 refactor to remove import from backend testing in order to use require 2018-01-31 11:15:12 +01:00
Juan Ferrer Toribio 109f04c517 Merge 2018-01-30 16:34:32 +01:00
Carlos Jimenez 801926bd27 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-01-30 15:49:26 +01:00
Carlos Jimenez d700d3a905 routes backend unit test completed 2018-01-30 15:49:22 +01:00
Daniel Herrero 90fab7b01a address observations, list and view edit (TODO save) 2018-01-30 14:47:47 +01:00
Daniel Herrero 7eab262175 CRUD item basic data finish 2018-01-30 08:59:43 +01:00
Juan Ferrer Toribio 9d92b9def7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-01-30 08:59:12 +01:00
Carlos Jimenez 7c36daf496 backend unit test for routes logout 2018-01-29 21:20:04 +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
Carlos Jimenez 09f244bc62 backend unit test for the try to define loginUrl 2018-01-29 14:39:08 +01:00
Carlos Jimenez ea3988351c Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-01-29 14:28:47 +01:00
Carlos Jimenez ba6a1f0f16 backend unit test for routes login 2018-01-29 14:28:31 +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
SAMBA\bernat 71d587764c update fixtures 2018-01-26 14:12:41 +01:00
Carlos Jimenez 0e88c2c4e7 renived private method tests and implemented HeadLessChrome on Karma and removed Firefox as browser 2018-01-26 12:13:39 +01:00
Carlos Jimenez 6dba8c7a40 salesperson back end unit tests plus small refactor on addresses, employee and filter specs 2018-01-26 11:23:53 +01:00
Carlos Jimenez 8dafd8c3b0 roles backend unit tests plus typos corrected on card and filer specs 2018-01-26 09:00:16 +01:00
SAMBA\bernat 9f5b42d149 localDB Update 2018-01-26 08:26:01 +01:00
Carlos Jimenez 28096df321 nightmare controlles now the snackbarTimeout with nightmareModifiers.js plus small db update 2018-01-26 08:01:26 +01:00
Daniel Herrero 56e868c3dd Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-01-25 13:37:40 +01:00
Daniel Herrero abed869052 onErrorSrc directive for images 2018-01-25 13:37:27 +01:00
Carlos Jimenez 092efc80c1 greuge filter backend unit test 2018-01-25 11:40:54 +01:00
Carlos Jimenez 506d6e0688 small file name refactor and client employee backend unit tests 2018-01-24 15:13:42 +01:00
Carlos Jimenez 48aef1f9b0 client Card backend unit tests 2018-01-24 13:45:32 +01:00
SAMBA\bernat 16a193071c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-01-24 08:13:42 +01:00
SAMBA\bernat ab7f064800 merging dev 2018-01-24 08:13:14 +01:00
Carlos Jimenez 8801c20071 added restoreFixtures to a afterAll method on create and addressesPropagateRe spec files 2018-01-24 08:09:39 +01:00
SAMBA\bernat 74e8e93ffd add fixtures and update the structure DB 2018-01-24 08:06:49 +01:00
Carlos Jimenez 108fb92d73 removed unnused code placed during testing steps 2018-01-23 16:41:28 +01:00
Carlos Jimenez 0d8feaef60 addressesPropagateRe backend unit tests 2018-01-23 15:59:21 +01:00
Carlos Jimenez 83f4a2d6bd back end unit tests for addresses plus refactor on fixtures stuff 2018-01-23 14:18:46 +01:00
Carlos Jimenez f8736bc599 total greuge backend unit test error handling added 2018-01-23 09:33:23 +01:00
Carlos Jimenez 5341c5bbf1 client create backend unit test plus error handling refactor 2018-01-23 09:32:19 +01:00
Carlos Jimenez dd89df9a71 fixtures restart implementation 2018-01-21 17:47:24 +01:00
Carlos Jimenez 468b9195ac typo corrected 2018-01-19 13:07:03 +01:00
Carlos Jimenez 072f02aacb greuge backend unit tests for filter and totalGreuge finished 2018-01-19 13:05:25 +01:00
Carlos Jimenez a60d8f120c greuge filter unit test 2018-01-19 07:55:41 +01:00
Carlos Jimenez 300f3d543a corrections 2018-01-18 15:27:35 +01:00
Carlos Jimenez 2a0b52b094 disabled malfuctioning test 2018-01-17 14:52:35 +01:00
Carlos Jimenez 125c8019ed greuge filter backend unit test file 2018-01-17 14:50:21 +01:00
Daniel Herrero 044786661a Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-01-17 14:28:35 +01:00
Daniel Herrero c4ff568ec8 model expense create and added into Item's basic data view 2018-01-17 14:28:06 +01:00
Carlos Jimenez 984540a3f2 back end refactor for the fixtures setup plus some test on client create() 2018-01-17 12:46:26 +01:00
Carlos Jimenez bfcbf23de8 setup for back end unit test up and runing, fixtures pending 2018-01-16 21:39:40 +01:00
Carlos Jimenez 633386d62f removed uniqueness validation for name 2018-01-15 14:47:48 +01:00
Carlos Jimenez 178e4ccb28 e2e mandate path plus fixtures update 2018-01-12 14:20:28 +01:00
Carlos Jimenez bb06a54df2 removed validatesPresenceOf() from client and greuge to add required: true on their models 2018-01-11 22:11:35 +01:00
Carlos Jimenez d9438e6b77 form validations now validates imputs being empty when dirty plus e2e updated tests for it. 2018-01-11 13:16:39 +01:00
Carlos Jimenez 8664b6cc7d eslint rules error corrected 2018-01-11 11:41:14 +01:00
Carlos Jimenez 959e5b4543 greuge validations 2018-01-11 11:22:56 +01:00
Carlos Jimenez 96a0b0dd3a Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-01-10 14:04:08 +01:00
Carlos Jimenez b2bfcb7b3f docker container time correction plus small refactor on validator.js 2018-01-10 14:03:52 +01:00
Daniel Herrero 586ad2911c item create 2018-01-10 12:49:52 +01:00
Daniel Herrero beed136e3c item validations 2018-01-09 14:54:18 +01:00
Carlos Jimenez 268162c3f7 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-01-09 13:53:54 +01:00
Carlos Jimenez c3d6a9c043 fixed client observations to apply eslint rules plus bug fixed in datePicker 2018-01-09 13:53:21 +01:00
Daniel Herrero d245f7c4f2 model taxGroup changed 2018-01-09 11:25:35 +01:00
Carlos Jimenez 22d482f1c6 gulp task created to run fixtures before e2e tests 2018-01-08 09:42:16 +01:00
Carlos Jimenez c1e798790f e2e path for add credit and gulp tasks for faster fixtures in progress 2018-01-08 08:12:39 +01:00
Carlos Jimenez b3eac25e8a vn2008 structure update for credit employee 2018-01-05 08:59:30 +01:00
Carlos Jimenez b3ddeaf4a7 credit refactor to build employee name and surname on client side 2018-01-05 08:06:21 +01:00
Carlos Jimenez 8e25216c3b fixtures for mandate 2018-01-04 12:33:25 +01:00
Carlos Jimenez 68d4d60d7d fixtures for greuge added plus jasmineHelpers enabled 2018-01-04 11:43:28 +01:00
Joan Sanchez ca25280743 Deshabilitada conexión SMTP en entorno test 2018-01-03 13:41:22 +01:00
SAMBA\bernat 492902e637 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-01-03 12:01:31 +01:00
SAMBA\bernat 151cf6be50 Refactor on DBlocal files 2018-01-03 12:00:59 +01:00
Carlos Jimenez 8c6131322f Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-01-02 08:06:47 +01:00
Carlos Jimenez f2872da4db validation client side unit tests 2018-01-02 08:05:50 +01:00
Joan Sanchez 21894ca0f8 Configuración en entorno test 2017-12-27 09:44:27 +01:00
Joan Sanchez de3d294cdb Recuperación de contraseña en bienvenida cliente 2017-12-26 11:02:09 +01:00
Joan Sanchez e834644c5d Actualizados nombres de columnas en vista cliente. 2017-12-26 10:11:43 +01:00
Joan Sanchez e94d29f97b Errores de renderización imágenes adjuntas. Escritos de cliente deutor. 2017-12-26 10:02:47 +01:00
Daniel Herrero 3fe9e3d325 bug fixed in model item 2017-12-21 14:08:40 +01:00
Daniel Herrero 723a4143f6 changed model name 2017-12-21 11:47:01 +01:00
Daniel Herrero 7acb047ec9 Item: interfaz crear item 2017-12-20 12:40:29 +01:00
Daniel Herrero 75c77fcdc6 filtro de items 2017-12-20 12:20:59 +01:00
Daniel Herrero dc03c5f453 modelos para el microservicio item 2017-12-20 09:53:50 +01:00
Daniel Herrero 29c75d3d8d model Itemype added 2017-12-19 14:58:14 +01:00
Daniel Herrero 5bc375d324 list items with images 2017-12-19 14:28:19 +01:00
Daniel Herrero 55691b4cc9 nuevo micro servicio Item 2017-12-19 12:29:35 +01:00
Daniel Herrero f0c9b2beca new module articles, structure 2017-12-19 11:05:07 +01:00
SAMBA\bernat edb29c7ced updated localDb01Structure.sql for vn.client and vn2008.client 2017-12-18 14:59:39 +01:00
Carlos Jimenez a0b1e13804 micro refactor at sql inserts file 2017-12-15 08:22:34 +01:00
Daniel Herrero 3e1d6ee4e5 bug fixed in address pagination 2017-12-14 15:08:07 +01:00
Daniel Herrero 9fe0aadff8 modelos con inicial mayuscula 2017-12-13 13:40:21 +01:00
Daniel Herrero 69934a4869 [R12 - T16] Bug corregido, faltaba la asociacion con cliente para el modelo Mandate 2017-12-13 09:05:58 +01:00