Carlos Jimenez
|
9054c32aba
|
niche validation fix
|
2018-02-23 15:20:24 +01:00 |
Juan Ferrer Toribio
|
bff00dc98e
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-23 13:05:00 +01:00 |
|
Juan Ferrer Toribio
|
cfc4b01fb0
|
Item tax form and service
|
2018-02-23 13:04:44 +01:00 |
 Javi Gallego
|
f4a244398a
|
greuge con decimales y favicon
|
2018-02-23 12:51:36 +01:00 |
|
Juan Ferrer Toribio
|
fdf2f017a0
|
DB upgraded
|
2018-02-23 11:59:58 +01:00 |
Daniel Herrero
|
632a5209c1
|
item Tags faltan test
|
2018-02-23 08:09:09 +01:00 |
Vicente Falco
|
443c888d73
|
merge
|
2018-02-23 07:18:26 +01:00 |
|
Vicente Falco
|
b3d692aaa0
|
Docker nginx
|
2018-02-23 07:17:33 +01:00 |
|
Javi Gallego
|
51f8d01d24
|
Error de roles solucionado a falta de dump
|
2018-02-22 16:17:30 +01:00 |
|
Daniel Herrero
|
10e47acd6b
|
item clonation finish
|
2018-02-22 13:40:23 +01:00 |
|
Daniel Herrero
|
91b7be32fb
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-22 11:20:22 +01:00 |
|
Daniel Herrero
|
43eef84ecf
|
renamed item models to kebab-case
|
2018-02-22 11:20:08 +01:00 |
Bernat Exposito
|
f92c6faa22
|
fixed blocking errors on e2e due to snackbar restet time plus fixtures permisions
|
2018-02-22 10:03:58 +01:00 |
|
Bernat Exposito
|
e377e9e452
|
update fixtures and mudole itemTag.json
|
2018-02-21 13:44:25 +01:00 |
|
Javi Gallego
|
41dfa9f9a1
|
creacion de ACL en diferentes modelos
|
2018-02-21 09:28:17 +01:00 |
|
Bernat Exposito
|
2daed2bda9
|
import fixtures from DB produccion and create unique index for vn2008.Articles_nicho
|
2018-02-20 15:01:59 +01:00 |
|
Daniel Herrero
|
60e2d8132b
|
itemBotanical
|
2018-02-20 14:30:02 +01:00 |
|
Daniel Herrero
|
ada3d9480b
|
bug fixed acl obervationType
|
2018-02-20 14:05:05 +01:00 |
|
Carlos Jimenez
|
6b70556320
|
acls are back to obersvation-type.json properties
|
2018-02-20 13:38:04 +01:00 |
|
Carlos Jimenez
|
4251ee20e4
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-20 12:26:29 +01:00 |
|
Carlos Jimenez
|
144d5a2bf0
|
issue 40 completed: niches
|
2018-02-20 12:25:51 +01:00 |
|
Bernat Exposito
|
4c26879fdb
|
update fixtures edi.genus/specie
|
2018-02-20 11:16:02 +01:00 |
SAMBA\bernat
|
20229cf3e1
|
update fixtures
|
2018-02-19 13:39:31 +01:00 |
|
SAMBA\bernat
|
171d0f5867
|
update changes05-articles_nicho
|
2018-02-19 13:21:15 +01:00 |
|
SAMBA\bernat
|
0f1004f5de
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-19 12:52:33 +01:00 |
|
SAMBA\bernat
|
3018898cad
|
update fixtures / alter table vn2008.articles_nicho
|
2018-02-19 12:50:14 +01:00 |
|
Carlos Jimenez
|
84bc505937
|
adapted test to show now 6 sales person
|
2018-02-19 11:58:02 +01:00 |
|
Carlos Jimenez
|
b8e6a8d0b3
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-19 11:56:05 +01:00 |
|
Carlos Jimenez
|
dcf5bf61da
|
backend unit test for barcode duplicity plus e2e path completed
|
2018-02-19 11:55:45 +01:00 |
|
SAMBA\bernat
|
f4735b4666
|
update fixtures Botanical
|
2018-02-19 09:42:40 +01:00 |
|
SAMBA\bernat
|
f2d5d58513
|
fixtures for Barcode and itemPlacement
|
2018-02-16 14:58:51 +01:00 |
|
SAMBA\bernat
|
2390ee3b01
|
update fixtures / script for automatic change update in the BD
|
2018-02-16 13:01:04 +01:00 |
|
Juan Ferrer Toribio
|
2240b4f6d8
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-15 16:11:54 +01:00 |
|
Juan Ferrer Toribio
|
e6a753d1cf
|
Addresses ordered by nickname
|
2018-02-15 16:11:44 +01:00 |
|
Daniel Herrero
|
6fe1f96ef3
|
Bug fixeds and merge with test
|
2018-02-15 14:37:54 +01:00 |
|
Daniel Herrero
|
754cfbc7b0
|
MD5 in password web access
|
2018-02-15 14:35:04 +01:00 |
|
Daniel Herrero
|
505ff1dcfe
|
removed role from activeSalesPerson
|
2018-02-15 13:11:23 +01:00 |
|
Daniel Herrero
|
1b4fd50929
|
Bugs fixed: postalCode, credit list and validate DNI
|
2018-02-15 13:04:48 +01:00 |
|
Daniel Herrero
|
a3cfb155e0
|
new models: genus, item-botanical, specie
|
2018-02-15 10:58:02 +01:00 |
|
Daniel Herrero
|
81b374d744
|
Merge conflicts
|
2018-02-15 10:51:31 +01:00 |
|
Carlos Jimenez
|
3abc4c7a68
|
backend unit test for crudItemBarcodes
|
2018-02-14 16:49:19 +01:00 |
|
Carlos Jimenez
|
bde655bd1e
|
merge
|
2018-02-14 14:32:26 +01:00 |
|
Carlos Jimenez
|
6e1d3135d5
|
mini refactor on routes.json and crudAddressObervations
|
2018-02-14 14:24:14 +01:00 |
|
Carlos Jimenez
|
61cd4acca5
|
item-barcode functionality plus front end tests
|
2018-02-14 14:22:35 +01:00 |
|
Daniel Herrero
|
fea4b379c7
|
Bug #78 Fixed
|
2018-02-14 14:06:01 +01:00 |
|
Juan Ferrer Toribio
|
87dfa49692
|
Bugs with webpack assets solved
|
2018-02-14 12:52:24 +01:00 |
|
Juan Ferrer Toribio
|
e4595da2a7
|
E2E test partially fixed
|
2018-02-14 10:03:00 +01:00 |
|
Juan Ferrer Toribio
|
fd0d5b70be
|
Solved bug that caused main webpack assets incorrecly cached by browsers (Deployment should be tested)
|
2018-02-13 23:01:28 +01:00 |
|
Juan Ferrer Toribio
|
8be4e0fb1f
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-13 22:40:17 +01:00 |
|
Juan Ferrer Toribio
|
72830652b4
|
Documented Gulpfile, improved 'docker-wait' to handle errors
|
2018-02-13 22:40:02 +01:00 |
|
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 |
|
Daniel Herrero
|
b8a6340afd
|
[R12 - T16] REST para mandatos
|
2017-12-13 08:24:14 +01:00 |
|
Daniel Herrero
|
5c54550283
|
refactorizacion de production, menos watchers
|
2017-12-12 14:00:02 +01:00 |
|
Daniel Herrero
|
34016dfa1e
|
production: asignar tickets
|
2017-12-12 12:26:18 +01:00 |
|
Carlos Jimenez
|
a8d79a578f
|
e2e pay method path until due day
|
2017-12-11 12:33:27 +01:00 |
|
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 |
|
Joan Sanchez
|
02fb54efa9
|
merge
|
2017-11-22 20:55:44 +01:00 |
|
Joan Sanchez
|
774f577edd
|
Ruta de validación de token en servicio Auth
|
2017-11-22 20:54:20 +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 |
|
Daniel Herrero
|
13c15bb5b3
|
production with searchbar
|
2017-11-21 11:12:52 +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
|
5c1f4321ed
|
removed favicon
|
2017-11-16 07:51:42 +01:00 |
|
Daniel Herrero
|
be286f6057
|
favicon moved
|
2017-11-16 07:16:10 +01:00 |
|
Daniel Herrero
|
dfb5552181
|
new Favicon
|
2017-11-15 14:39:46 +01:00 |
|
Daniel Herrero
|
d4a0cf205d
|
bug fixed in edit addresses
|
2017-11-15 12:11:35 +01:00 |
|
Daniel Herrero
|
d19ebe0c8c
|
bug fixed list producction
|
2017-11-14 11:20:12 +01:00 |
Carlos
|
77ccc0e8af
|
temp favicon.ico (to update once we have the right one)
|
2017-11-14 08:24:01 +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 |
|
Daniel Herrero
|
6ea0f05054
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-11-09 14:27:23 +01:00 |
|
Daniel Herrero
|
17143883f8
|
address data changes
|
2017-11-09 14:27:01 +01:00 |
|
Carlos
|
7223922251
|
typo corrected at dblocal fixtures plus renamed files and selectors added
|
2017-11-09 13:54:06 +01:00 |
|
Daniel Herrero
|
b77395762c
|
bug fixed in address
|
2017-11-09 13:22:54 +01:00 |
|
Daniel Herrero
|
3d33c21cc8
|
removed eslint errors
|
2017-11-09 08:59:40 +01:00 |
|
Daniel Herrero
|
d2491bfbf4
|
refact production list
|
2017-11-09 08:54:41 +01:00 |
|
Vicente Falco
|
10c52a75b9
|
microservices: configuration
|
2017-11-09 07:45:46 +01:00 |
|
Vicente Falco
|
14820fbb3e
|
merge
|
2017-11-09 07:34:17 +01:00 |
|
Vicente Falco
|
20a6728ed6
|
microservices: boot
|
2017-11-09 07:34:02 +01:00 |
|
Vicente Falco
|
a9cab91acc
|
Production Package
|
2017-11-08 20:06:00 +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
|
2de3ccff8e
|
Docker auth
|
2017-11-08 17:40:15 +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 |
|
Daniel Herrero
|
f71dfa53ef
|
refact list production
|
2017-11-08 14:59:46 +01:00 |
|
Vicente Falco
|
1d109f2371
|
docker
|
2017-11-08 14:11:33 +01:00 |
|
Daniel Herrero
|
063b97d3e1
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-11-08 13:42:41 +01:00 |
|
Daniel Herrero
|
061ae64c50
|
production filtering in temporary table
|
2017-11-08 13:42: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 |
|
Daniel Herrero
|
5a1aca198b
|
localizador rutas maquetacion 90%
|
2017-11-07 11:22:33 +01:00 |
|
Vicente Falco
|
e04cda0f35
|
service Production: bugs
|
2017-10-31 09:26:11 +01:00 |
|
Carlos
|
d839ba2aca
|
local db inserts update
|
2017-10-27 13:39:50 +02:00 |
|
Vicente Falco
|
ac8797f24d
|
Client Service: Employee List active
|
2017-10-25 13:47:39 +02:00 |
|
Carlos
|
2eeae6cc36
|
local DB user emails inserts updated to fix bug plus gitignore
|
2017-10-25 14:48:23 +08:00 |
|
Joan Sanchez
|
9d6eeba1a3
|
merge
|
2017-10-25 00:39:34 +02:00 |
|
Joan Sanchez
|
13981ae023
|
Quita contraseña de smtp.test.json
|
2017-10-25 00:38:02 +02:00 |
|
Vicente Falco
|
e7223ef493
|
Client: email from Account not required
|
2017-10-24 14:29:53 +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 |
|
Carlos
|
ea001f44b1
|
SQL changes for localDB docker
|
2017-10-24 12:47:58 +02:00 |
|
Vicente Falco
|
1c5a65928e
|
change on services, docker localDB y jasmime
|
2017-10-24 08:56:18 +02:00 |
|
Vicente Falco
|
b32f0b199f
|
mailer localDB
|
2017-10-22 14:03:04 +02:00 |
|
Joan Sanchez
|
7b2506df80
|
setup-printer translation, added client-welcome report
|
2017-10-20 14:03:25 +02:00 |
|
Joan Sanchez
|
ac21ceb399
|
Vista previa de email, desde el parámetro isPreview
|
2017-10-19 12:47:05 +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
|
070cd764b6
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-10-19 07:16:51 +02:00 |
|
Dani Herrero
|
59577bcb7f
|
bug fixed rawSQL
|
2017-10-18 15:06:38 +02:00 |
|
Carlos
|
09a24fe8e8
|
fixtures
|
2017-10-18 14:48:39 +02:00 |
|
Dani Herrero
|
3d52031dc2
|
cambios en validacion de credito de cliente
|
2017-10-18 12:51:33 +02:00 |
vicentefalco
|
a0955cf50d
|
docker dbLocal
|
2017-10-18 06:41:17 +02:00 |
|
Dani Herrero
|
a366ef1fc1
|
facke active drivers rest created
|
2017-10-17 12:22:19 +02:00 |
|
Dani Herrero
|
5514ec222a
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-10-17 09:41:08 +02:00 |
|
Dani Herrero
|
09f54b40d0
|
parse vars in filer routes
|
2017-10-17 09:40:56 +02:00 |
|
Joan Sanchez
|
d66fed5a3d
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-10-17 09:01:51 +02:00 |
|
Dani Herrero
|
22ccf278a4
|
config file
|
2017-10-17 08:45:51 +02:00 |
unknown
|
eab51e1b9d
|
Respuesta json en peticiones, auth, escrito impresoras
|
2017-10-17 08:22:59 +02:00 |
|
Juan Ferrer Toribio
|
0962fa19e5
|
Eliminando codigo redundante v5
|
2017-10-13 16:54:07 +02:00 |
|
Juan Ferrer Toribio
|
8fc14348d7
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-10-13 16:23:08 +02:00 |
|
Juan Ferrer Toribio
|
5f1066ff03
|
Eliminando codigo redundante v3
|
2017-10-13 16:23:00 +02:00 |
|
Juan Ferrer Toribio
|
4267b5fe0a
|
Eliminando código redundante v2
|
2017-10-13 16:22:45 +02:00 |
|
Vicente Falco
|
09e7e7f4ce
|
DockerFile db local
|
2017-10-13 08:53:54 +02:00 |
|
Juan Ferrer Toribio
|
ad24380043
|
Merge
|
2017-10-11 16:00:36 +02:00 |
|
Juan Ferrer Toribio
|
08da6c9713
|
Eliminando código redundante v1
|
2017-10-11 15:36:47 +02:00 |
|
dherrero
|
f24e16b81d
|
moved model agency
|
2017-10-11 15:00:18 +02:00 |
|
dherrero
|
e52b31ceb3
|
service validations moved into generic folder
|
2017-10-11 14:10:51 +02:00 |
|
dherrero
|
760d63ec6c
|
removed unused files
|
2017-10-11 13:03:05 +02:00 |
|
dherrero
|
4dae59aa09
|
zone model and rest api
|
2017-10-11 12:47:02 +02:00 |
|
dherrero
|
cf36d7d6be
|
module routes: front dev 80%
|
2017-10-11 12:09:22 +02:00 |
|
dherrero
|
911fbb2f8b
|
filtro de rutas con paginación
|
2017-10-11 09:18:26 +02:00 |
|
dherrero
|
5a07973789
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-10-10 15:01:21 +02:00 |
|
dherrero
|
eeda5b45fd
|
routes change model and first look
|
2017-10-10 15:01:10 +02:00 |
|
joan
|
c3d611adb2
|
Login sin url de redirección
|
2017-10-10 14:45:13 +02:00 |
|
dherrero
|
2d7e3f8dfe
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-10-10 11:14:45 +02:00 |
|
dherrero
|
96235a6752
|
route service models
|
2017-10-10 11:14:35 +02:00 |
|
Vicente Falco
|
48cac24d88
|
Jenkins y routes
|
2017-10-10 11:09:47 +02:00 |
|
dherrero
|
431032177c
|
new micro-service route: need reinstall all dependencies
|
2017-10-05 14:26:04 +02:00 |
|
Dani Herrero
|
dd004fdc89
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-10-04 13:32:44 +02:00 |
|
Dani Herrero
|
0925451364
|
spread equivalent tax in all addresses
|
2017-10-04 13:32:26 +02:00 |
|
Joan Sanchez
|
9ebd705aea
|
Errores en servicio de autenficación solucionados.
|
2017-10-04 13:27:38 +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
|
2aed5d088c
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-10-04 08:18:49 +02:00 |
|
Dani Herrero
|
627d27ad51
|
validate client credit
|
2017-10-04 08:18:31 +02:00 |
|
Joan Sanchez
|
666928b1a9
|
Auth login json response
|
2017-10-03 14:44:11 +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
|
bc20725c6c
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-09-27 09:25:39 +02:00 |
|
Dani Herrero
|
fbd5fea126
|
[finish] active salesPerson service
|
2017-09-27 09:25:33 +02:00 |
|
Carlos
|
79438f31cb
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
active salesperson service in progress
|
2017-09-27 08:55:38 +02:00 |
|
Carlos
|
6798655869
|
removed unused file
|
2017-09-27 08:54:37 +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
|
a5df4afc0f
|
refactor on routes.js
|
2017-09-22 13:06:38 +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 |
|
Vicente Falco
|
35ce85e3fc
|
docker DB
|
2017-09-21 12:17:48 +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 |
|
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 |