ecf88f6b66
new address list
2017-09-28 14:34:18 +02:00
0742a4e098
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
get address return province data
sales person formated
getRoleCustomer return object not array of object
Token authenticate, solunion notification
2017-09-28 12:38:05 +02:00
86fdb010ae
Autocomplete client side unit test for findItems
2017-09-28 12:37:45 +02:00
70e4b22e8a
get address return province data
2017-09-28 11:29:01 +02:00
1d47bf58f1
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-09-28 09:14:31 +02:00
62cc0c3c9e
sales person formated
2017-09-28 09:13:42 +02:00
895b3435c4
getRoleCustomer return object not array of object
2017-09-28 08:41:45 +02:00
720cf89204
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
moved textfield styles
textfield: clear icon dinamic display
2017-09-27 14:10:42 +02:00
66c80fd5bd
small refactor in autocomplete.js and some more client side unit test for field() > multiField() and displayValue()
2017-09-27 14:10:03 +02:00
35454c5c53
moved textfield styles
2017-09-27 12:44:33 +02:00
9d41a70416
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-09-27 12:27:38 +02:00
6aed24a02c
textfield: clear icon dinamic display
2017-09-27 12:27:18 +02:00
5dc0608f86
error corrected
2017-09-27 11:58:35 +02:00
ef7ee12373
client side unit test for autocomplete field() query functionality
2017-09-27 11:51:25 +02:00
7b391ef9a1
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
[finish] active salesPerson service
2017-09-27 09:44:16 +02:00
9ae7898c19
client side unit test for autocomplete field() > setValue()
2017-09-27 09:42:59 +02:00
bc20725c6c
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-09-27 09:25:39 +02:00
fbd5fea126
[finish] active salesPerson service
2017-09-27 09:25:33 +02:00
959f09d272
more tests
2017-09-27 08:09:10 +02:00
0a17a59f2d
client unit tests for autocomplete field()
2017-09-26 18:21:11 +02:00
3a666ef764
client unit test for autocomplete displayValue(), some functionality remains wild i.e. item.checked = false;
2017-09-26 14:10:55 +02:00
b41f5a3996
unit tests for autocompelete showDropDown plus small correction in other two files.
2017-09-26 10:26:21 +02:00
Javi Gallego
9b76d3d004
validaciones custom se bajan al cliente solo si son isExportable
2017-09-25 17:39:51 +02:00
235cc2d8f6
refactoring autocomplete: input readonly and autofucos on search input
2017-09-21 13:10:30 +02:00
490ff51fa6
bug fixed in address edit with watcher
2017-09-21 12:24:14 +02:00
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
f716721836
info tag for emails updated and html and es.json files addapted.
2017-09-21 10:26:46 +02:00
922ae5c848
billing data with acls
2017-09-21 10:23:51 +02:00
a222a7a8d1
tooltip translate refactor
2017-09-21 09:33:02 +02:00
32d816ba60
translate in info tag
2017-09-21 09:06:51 +02:00
1e494ec08b
refactor plus front-end unit repairs
2017-09-21 08:48:25 +02:00
aa4bfb4f51
change password permission
2017-09-21 07:53:23 +02:00
f6399596ce
autocomplete-v2 renamed
2017-09-20 14:25:43 +02:00
4b1e88cc1c
removed autocomplete folder
2017-09-20 14:23:53 +02:00
d8ba5ecdcb
Merge branch 'autocomplete-v2' into dev
2017-09-20 14:10:16 +02:00
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
07f8309d36
quitado autocomplete anterior
2017-09-20 13:56:47 +02:00
1dad2147ca
autocomplete con seleccion multiple
2017-09-20 13:52:53 +02:00
d81d36217a
transclude funcionando
2017-09-20 11:50:53 +02:00
e76f1d74f9
corrected small typo at datePicker.js
2017-09-19 15:03:39 +02:00
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
e525f1da30
Merge branch 'dev' into autocomplete-v2
2017-09-19 07:17:56 +02:00
2721b87e57
client path e2e tests refactor
2017-09-15 12:24:37 +02:00
6651f70e07
autocomplete recatoring 80%
2017-09-14 13:40:55 +02:00
bd20f76274
test for autocomplete client side
2017-09-14 09:22:49 +02:00
f9b3657440
refactoring 30%
2017-09-13 14:59:58 +02:00
99155e09fb
vn-title bug fixed
2017-09-13 13:34:57 +02:00
e177b3698d
deleted unnecessary files
2017-09-13 11:43:00 +02:00
a200fb8143
textfield with info
2017-09-13 10:59:34 +02:00
2fd58af254
refactoring textfield finished
2017-09-13 09:45:42 +02:00
cccc0ade2b
refactoring textfield, validations pending
2017-09-12 15:02:14 +02:00
c90be5bd04
bug fixed: login
2017-09-12 12:45:29 +02:00
22f2d3e7f3
texfield refactor
2017-09-12 11:44:56 +02:00
8cad612a59
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
textfield canvia las cadenas vacias a null
2017-09-08 09:53:56 +02:00
12270f21f9
changed tittes to english and small refactor on address-create spec
2017-09-08 09:53:37 +02:00
Javi Gallego
207addf2c3
textfield canvia las cadenas vacias a null
2017-09-07 19:35:17 +02:00
5570ec1c33
translation changes
2017-09-06 15:37:42 +02:00
eb1a844930
translation changes
2017-09-06 14:23:06 +02:00
fb41fbd963
refactor en fical-data.html
2017-09-06 12:49:36 +02:00
a9763e728c
refactor for backend create.js transaction and it's html error notification for account implemented
2017-09-06 09:56:36 +02:00
e2d1103607
tarea Añadir email y user al formulario de creación de clientes
2017-09-05 16:15:11 +02:00
e43e3211d0
descriptor unit test
2017-09-04 17:15:07 +02:00
352e68ed58
refactor in all client specs to next describes accordingly
2017-09-04 15:06:43 +02:00
6c13fce8a9
front client specs ES6 refactor
2017-09-04 14:39:58 +02:00
62c15fbafa
create client onSubmit callback tested
2017-09-04 12:46:19 +02:00
fa64931cc2
search-panel spec plus small refactor on it's js and html template.
2017-09-04 09:47:25 +02:00
a732d796e8
unit test for notes and index plus small refactor on notes.js
2017-09-01 13:03:02 +02:00
fd39993794
note-create unit test
2017-09-01 09:20:22 +02:00
abe576078e
removed unused httpBackend code
2017-09-01 08:49:22 +02:00
b63b92f5ef
refactor on various specs and commented malfuctioning code for future fixing.
2017-09-01 08:47:28 +02:00
3fd0a4f49d
create.js OnSubmit() unit test
2017-08-31 19:40:22 +02:00
c2e0a081e2
unit test for billing-data create and index
2017-08-31 19:15:17 +02:00
60c46b5fb7
small refactor on address-edit.spec.js
2017-08-31 08:55:17 +02:00
f813d052aa
unit test for address-create.js and address-edit.js
2017-08-31 08:53:17 +02:00
0461b3a429
vnClientCard unit test
2017-08-30 16:05:34 +02:00
aeaa417a4e
refactor at app.js to remove troublesome console.log()
2017-08-30 15:39:48 +02:00
1721509ce4
returnDialog() unit test
2017-08-30 15:30:49 +02:00
20d82cde50
checkPaymentChanges unit test
2017-08-30 12:30:48 +02:00
5e8f95dd65
Billing data copyData and submit unit tests plus small refactor at billing-data.js
2017-08-30 08:38:41 +02:00
d3600858ee
billing data copyData test
2017-08-29 15:14:18 +02:00
5bf59f4c25
commented failing spec and injected vnCore dependencies to cliente module.
2017-08-29 13:27:43 +02:00
1eb0c594be
unit test for web-access and bug fixes at watcher.js
2017-08-29 12:33:48 +02:00
46a69f3842
Merge remote-tracking branch 'origin/unit-tests' into dev
2017-08-25 11:49:26 +02:00
29dd3ef67c
removed unused code
2017-08-25 09:03:43 +02:00
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
41182abb6e
cambio en watcher sustitucion de la función copy de Angular, para que ignore en las copias los campos vacios
2017-07-13 14:55:07 +02:00
45849e4daa
corregido CAU 2594 cambios en datos de facturación
2017-07-13 13:49:45 +02:00
1fc059273f
corregido error al destruir popover en searchBar
2017-07-13 13:32:23 +02:00
9fa608b11f
bug fixed filter in clients
2017-07-13 13:12:09 +02:00
7dfed60e7d
bug fixed in new datepicker and material design label effect
2017-07-13 11:03:22 +02:00
a06ac62b91
datepicker with timezone
2017-07-13 08:58:48 +02:00
3cf33fe48b
datepicker regex data with timezone
2017-07-13 08:55:39 +02:00
cd2560c8c6
bug fixed datepicker
2017-07-12 14:57:40 +02:00
f2c0dd3ab7
pruebas con date-picker y material
2017-07-12 14:32:15 +02:00
da3fddd9d2
estilos date-picker
2017-07-12 13:32:42 +02:00
17186c4035
nuevo date-picker
2017-07-12 13:32:25 +02:00
22829aa218
nuevos iconos de módulos
2017-07-11 14:28:53 +02:00
e22e9c7f13
refresh filter when clear model
2017-07-11 10:59:09 +02:00
b93c3f50e3
cambiando searchBar
2017-07-11 10:35:23 +02:00
2f6047d241
merge
2017-07-11 10:00:29 +02:00
81726e0a09
columnHeader change icon, style
2017-07-11 08:59:12 +02:00
2b7abef98f
corregido filtro principal
2017-07-06 14:46:22 +02:00
142cc920de
bug de multi seleccion corregido, cambio estilos
2017-07-06 14:21:55 +02:00
5929b8be32
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-07-06 13:04:51 +02:00
25ac346b2b
filtro principal y ajustes css
2017-07-06 12:58:50 +02:00
6f581e033a
Merge
2017-07-06 12:43:37 +02:00
0339fdaef1
cambio de hora funcionando
2017-07-06 11:05:26 +02:00
3c1847134b
Front acoplado al endpoint RouteFk
2017-07-06 09:02:27 +02:00
51ac5f5262
correccion ortográfica
2017-07-05 14:59:40 +02:00
81749e906d
refactorizacion popover
2017-07-05 14:41:10 +02:00
53af148def
corregido error popover
2017-07-05 14:01:03 +02:00
e4e01c4970
añadida id ruta en tabla, internacionalizacion y mejora de popover
2017-07-05 13:02:49 +02:00
ffe21e6947
corrección para popover anidados
2017-07-05 09:47:24 +02:00
76d9546355
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-07-03 14:50:52 +02:00
f670c0f4fd
Localizador: restablecer filtros, datePicker con formato 'es'
2017-07-03 14:50:48 +02:00
d5d5c3079a
corrección errores brocal
2017-07-03 14:23:53 +02:00
ba2d803f28
merge
2017-07-03 14:20:06 +02:00
9e6bd8522e
vies
2017-07-03 14:19:47 +02:00
06537bcf8d
filtro de trabajadores y llamada a validaciones opcional
2017-07-03 08:38:45 +02:00
461fc3c9a6
internacionalización por subir
2017-06-30 09:09:48 +02:00
3bb1eef43d
bug fixed in dropDown
2017-06-29 14:28:22 +02:00
6365a06cbb
Servicio mensaje de alerta modificado
2017-06-29 14:13:01 +02:00
8e177fcb2d
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-06-29 14:09:11 +02:00
372cfe718b
Localizador: warehouseFk por defecto
2017-06-29 14:09:04 +02:00
c5363155c4
send message
2017-06-29 14:08:57 +02:00
d8f4e0489e
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-06-29 13:56:56 +02:00
491ea3b796
dropDown with search and columHeader preview icon
2017-06-29 13:56:52 +02:00
2e7a225249
rawsql with promises
2017-06-29 11:48:57 +02:00
e9c0fa5cc9
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
# Conflicts:
# client/production/src/index/index.js
2017-06-29 09:52:45 +02:00
ddcec00c4f
change time
2017-06-29 09:48:00 +02:00
df614b4943
bugs fixed
2017-06-29 08:13:30 +02:00
5e2be42247
bugs fixed
2017-06-28 14:59:54 +02:00
5b5523e6b6
refactorización vnProductionTable
2017-06-28 14:53:26 +02:00
bfdd8ecd8e
Localizador: acciones separadas a nuevo componente vnProductionActions
2017-06-28 14:48:07 +02:00
6815ab2b3c
Localizador: paginación y ordenación desde front, selector actua sobre todos los elementos (no solo sobre los que se muestran)
2017-06-28 13:12:01 +02:00
7b38d2f188
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-06-28 08:57:37 +02:00
80121de6c3
change state
...
message send
change time
2017-06-28 08:57:33 +02:00
c2b351a777
Cambio de hora y refactorizacion del vnMultiCheck
2017-06-28 08:55:01 +02:00
b9704a2b91
corregido fallo en vnMultiCheck
2017-06-26 14:52:43 +02:00
4480431a08
estilos en vnMultiCheck
2017-06-26 14:41:08 +02:00
8b6e7fdc40
nuevo componente vnMultiCheck
2017-06-26 13:53:52 +02:00
fabe0cde7c
front: send message action
2017-06-26 10:52:22 +02:00
fcfef2c8b7
cambio en accion envio de mensaje
2017-06-26 09:39:21 +02:00
a96e3a57b6
corregido id ticket por ticketFk
2017-06-26 09:22:28 +02:00
6fd77dda74
cambio en filtros
2017-06-26 09:07:40 +02:00
17994a2cc5
internacionalizacion
2017-06-26 08:35:31 +02:00
c69ada432d
internacionalizacion (reverted from commit f419946766)
2017-06-26 08:32:57 +02:00
f419946766
internacionalizacion
2017-06-26 08:28:16 +02:00
09e805fd3a
Ordenación en campos correcto, autocomplete con clear
2017-06-22 15:04:02 +02:00
2bdbda6192
Localizador, cambio estlios, añadido paginador, order by
2017-06-22 12:03:01 +02:00
05b6c81a1b
dropDown con filtro
2017-06-21 13:16:37 +02:00
3796741371
primera versión del componente vnGridHeader para ordenación de tablas
2017-06-21 09:46:31 +02:00
d444980ab1
[En progreso] nuevo componente vnGridHeader para ordenación de tablas
2017-06-20 15:00:27 +02:00
ca19369093
Production: modal para mensajes, filtros búsqueda en front 100%
2017-06-20 09:27:49 +02:00
bcdc31d8d9
arreglo en autocomplete para admitir valores por defecto
2017-06-15 15:00:43 +02:00
1ca5e20494
añadido callBack cambio estados
2017-06-15 12:00:51 +02:00
5f2aa345ba
iconMenu arreglo de posicion del DropDown interno
2017-06-15 11:22:47 +02:00
f346e5e83c
arreglos en drop-down
2017-06-15 08:26:03 +02:00
9072b100f9
tooltip admite plantilla html, icon-menu forzado de posicion en dropDown
2017-06-15 07:45:01 +02:00
afff93cce6
Tooltip: admite html, Localizador: añadido icono con información adicional
2017-06-14 09:54:00 +02:00
7713d0bd6f
cambio estilos dropdown
2017-06-13 14:57:09 +02:00
e09f60a53a
Nuevos componentes: drop-down, icon-menu. Refactorización de icon e icon-button (pasados a componentes sin template manager)
2017-06-13 13:08:06 +02:00
f274335997
interfaz gráfica y correcciones varias
2017-06-08 14:57:23 +02:00
491241398a
localizador y tooltip arreglo estilos
2017-06-08 10:05:11 +02:00
3806e9e591
nueva directiva vn-tooltip
2017-06-08 09:29:03 +02:00
Joan Sanchez
984dc1e908
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-06-07 15:29:11 +02:00
Joan Sanchez
73c5f5581f
Cambios en servicio mailer
2017-06-07 15:28:42 +02:00
6123278945
en progreso: interfaz gráfica
2017-06-07 15:03:12 +02:00
51a700b6ce
date-picker v1
2017-06-07 13:27:57 +02:00
5d789b0e71
Locales
2017-06-07 08:39:40 +02:00
9eaae2269b
client: localizador al 6%
2017-06-06 15:02:03 +02:00
9fcdb28d14
cambio en routes e interfaz localizador al 5%
2017-06-06 13:06:47 +02:00
609c984426
Loopback 3, errores solucionados, codigo reorganizado
2017-06-05 09:01:21 +02:00
b427361156
Loopback 3, Errores solucionados
2017-06-03 13:01:47 +02:00
8cd312e145
Errores solucionados
2017-06-02 15:39:16 +02:00
f9842000d3
Codigo gulp reorganizado, errores redirección solucionados
2017-06-02 15:23:19 +02:00
481a2219ce
Ruta desarrollo http://localhost:5000 , producción 80
2017-06-02 09:29:14 +02:00
bb91c026da
corregido error aviso cambio de método pago
2017-06-01 14:50:55 +02:00
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
a3dda662ae
ACLs, json configuracion y script SQL
2017-06-01 09:31:57 +02:00
67de66d6c5
mensajes de notificación enviada / error
2017-05-31 13:47:40 +02:00
981b763cd8
corrección errata ortográfica
2017-05-31 13:01:15 +02:00
96dd6de8a6
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-31 12:56:42 +02:00
b8287efdc2
kanban: asociar envío escrito con cambio de valor
2017-05-31 12:56:37 +02:00
c8424f98f4
paginación en clientes
...
arreglado problema de búsqueda
2017-05-31 10:58:48 +02:00
39bb122ee1
renombrado de archivos parte 2
2017-05-31 10:28:39 +02:00
11c3b2de2d
renombrado de archivos parte 1
2017-05-31 09:46:05 +02:00
74a0eedb47
Añadidos ACLs del servicio client
2017-05-30 14:17:01 +02:00
87c38a0d89
creada factoria q retorna los modulos disponibles para el usuario, ACL
2017-05-30 09:54:35 +02:00
9ce12b2e53
nuevo home con acceso directo a los módulos
2017-05-30 09:06:11 +02:00
034bd93c99
Errores
2017-05-29 13:38:44 +02:00
025bd4224e
Errores en validación solucionados
2017-05-26 17:05:33 +02:00
0f4ac0edbb
Console.log eliminado
2017-05-26 14:42:01 +02:00
3d71f454a0
Errores en validación IBAN solucionados
2017-05-26 14:39:36 +02:00
d3ef7dde86
Error en validación length solucionado
2017-05-26 13:26:12 +02:00
a73b2eba0d
Errores solucionados
2017-05-26 13:14:47 +02:00
f6888af74a
Inicio de vn-home
2017-05-25 14:50:35 +02:00
571692f4ca
Añadidos estilos a elementos desabilitados, mejora de directiva vnAcl
2017-05-25 14:23:19 +02:00
041be5ec93
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-25 12:52:49 +02:00
Dani Herrero
Carlos
Vicente Falco
Javi Gallego
Juan Ferrer Toribio
nelo
dhan82
Joan Sanchez