Daniel Herrero
c8b510f09f
quitado el credito de la vista forma de pago
2017-11-30 13:01:11 +01:00
Daniel Herrero
7d8c28f9d3
added test to dropDown
2017-11-30 10:16:33 +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
4667b39b1a
bug fixed in datePicker, onclick action added
2017-11-30 08:10:44 +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
d816853b6c
column-header posibilidad de columna no ordenable
2017-11-29 09:37:08 +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
Daniel Herrero
005c8072b9
Production: al filtrar persiste el orden
2017-11-28 09:24:59 +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
Daniel Herrero
c386b6aaea
actualizacion de la material design cuando un elemento está bloquedo por ACL
2017-11-23 14:53:37 +01:00
Daniel Herrero
7cb64edf04
ajustes de etiquetas html y css
2017-11-23 14:09:38 +01:00
Daniel Herrero
00bd4a7696
nuevo comportamiento para dropDown, abrir arriba
2017-11-23 14:07:55 +01:00
Daniel Herrero
5ad2c70400
bug fixed in production and production filters
2017-11-23 08:35:17 +01:00
Daniel Herrero
bd5e2a5d91
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-11-22 13:10:40 +01:00
Daniel Herrero
27c2444fa4
bugs fixed in autoComplete
2017-11-22 13:10:33 +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
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
719168565c
Errores en el login no se mostraban
2017-11-16 14:30:17 +01:00
Juan Ferrer Toribio
e03d257930
Errores en spinner
2017-11-16 13:47:18 +01:00
Daniel Herrero
11da1dad8d
locator, production and route modules only to developer acl
2017-11-15 13:16:40 +01:00
Daniel Herrero
e071fbb926
changes acls to merge with test
2017-11-15 13:13:51 +01:00
Daniel Herrero
dd14ddb8bd
production only acl to developers
2017-11-15 13:11:04 +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
dce3ae7520
created storage services
2017-11-15 07:12:52 +01:00
Carlos
2bb87dc195
unit test for autocomplete - tested filterSearch functionality
2017-11-14 11:05:40 +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
ed64c3b50a
vn icon css changes for main menu
2017-11-13 14:17:09 +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
563c49b785
disable all module routes if not permission
2017-11-09 12:51:46 +01:00
Daniel Herrero
c74bafae7e
acl in routes
2017-11-09 11:39:41 +01:00
Daniel Herrero
865d106d4f
bug fixed in autocomplete
2017-11-09 10:11:59 +01:00
Carlos
f6d9f44df4
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
refact list production
docker
production filtering in temporary table
docker compose
docker
2017-11-08 15:46:51 +01:00
Carlos
60a478e5c6
selectors.js refactor plus e2e tests
2017-11-08 15:43:34 +01:00
Daniel Herrero
f71dfa53ef
refact list production
2017-11-08 14:59:46 +01:00
Daniel Herrero
061ae64c50
production filtering in temporary table
2017-11-08 13:42:33 +01:00
Daniel Herrero
ec0eb7f1d1
test fixed
2017-11-07 11:43:18 +01:00
Daniel Herrero
5a1aca198b
localizador rutas maquetacion 90%
2017-11-07 11:22:33 +01:00
Daniel Herrero
ed3ee81292
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-11-07 10:00:32 +01:00
Daniel Herrero
7f3df756c8
continuacion con la maquetacion del localizador de rutas
2017-11-07 09:59:49 +01:00
Vicente Falco
8bb43edcfc
route: delete gesdoc
2017-11-07 08:47:12 +01:00
Vicente Falco
fd1c174453
merge
2017-11-03 07:05:05 +01:00
Vicente Falco
9c1086bd4c
merge
2017-11-03 07:04:38 +01:00
Daniel Herrero
ae2ecb6d73
tabla localizador de rutas maquetada
2017-11-02 14:57:36 +01:00
Daniel Herrero
f0b4e1ff71
structure module locator
2017-11-02 14:10:28 +01:00
Daniel Herrero
4f840c71e3
new icon-menu
2017-11-02 13:27:35 +01:00
Vicente Falco
74e2b2b04d
merge
2017-11-02 13:09:59 +01:00
Daniel Herrero
93661fe8e3
new module locator
2017-11-02 11:13:20 +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
Daniel Herrero
83d63547ff
sprint3 pantallas de rutas
2017-11-02 08:18:37 +01:00
Daniel Herrero
76b5903770
refactor dataPicker
2017-10-31 10:40:12 +01:00
Daniel Herrero
ee7c4e214f
bug fixed in dataPicker
2017-10-31 09:44:24 +01:00
Vicente Falco
e04cda0f35
service Production: bugs
2017-10-31 09:26:11 +01:00
Daniel Herrero
bec05a1925
route basic data structure
2017-10-31 08:42:43 +01:00
Carlos
2be39c0deb
setting up spec files for the next directive to test
2017-10-24 08:34:50 +02:00
Carlos
0a8a682376
finished client side unit test for directive id
2017-10-24 08:08:58 +02:00
Carlos
f6c1f5f137
lient side unit test for id directive
2017-10-24 07:57:25 +02:00
Carlos
c88023182a
client side unit test for vnFocus directive tests
2017-10-23 16:25:47 +02:00
Carlos
4e1d2db3cb
unit test for dialog directive plus small refactors
2017-10-23 10:47:56 +02:00
Carlos
abb59189ff
aclService mock removed as dependencies were corrected on previous commit: 3badf2a
2017-10-20 11:18:44 +02:00
Carlos
8bb2536f90
multi-check unit test repairs
2017-10-20 10:42:55 +02:00
Carlos
3badf2a48a
refactor to move aclService from salix to Core
2017-10-20 08:39:30 +02:00
Carlos
a530c67336
client side unit test for acl directive plus small refactor
2017-10-19 19:11:49 +02:00
Carlos
e8473d56fb
correction of expect at acl directive unit test
2017-10-19 15:41:58 +02:00
Carlos
94bfe50818
client side unit test for acl directive, comment added about directive behavior.
2017-10-19 15:40:00 +02:00
Daniel Herrero
82b75d3b70
bugFixed multiCheck onBlur action
2017-10-19 14:13:28 +02:00
Daniel Herrero
d72904a69e
Bug fixed in multiCheck
2017-10-19 12:31:55 +02:00
Daniel Herrero
83d262ec32
agencyService changes to agencyMode
2017-10-19 09:21:34 +02:00
Carlos
b5d90dfbc6
micro refactor and deletion of unused file.
2017-10-18 14:33:34 +02:00
Dani Herrero
3d52031dc2
cambios en validacion de credito de cliente
2017-10-18 12:51:33 +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
4cfc6f23d9
small test added to the watcher
2017-10-17 12:33:37 +02:00
Carlos
5073527c93
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
facke active drivers rest created
parse vars in filer routes
Respuesta json en peticiones, auth, escrito impresoras
2017-10-17 12:29:59 +02:00
Carlos
56182fb4b1
finished client side unit test for watcher
2017-10-17 12:27:32 +02:00
Dani Herrero
a366ef1fc1
facke active drivers rest created
2017-10-17 12:22:19 +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
Carlos
496fd22b60
Client side unit test for watcher until $onDestroy
2017-10-13 18:26:38 +02:00
Carlos
d7668c278d
Client side unit tests for spinner
2017-10-13 17:35:47 +02:00
Juan Ferrer Toribio
bcec5326f2
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-13 16:54:12 +02:00
Carlos
c1ea17a377
client side unit test for multi-check
2017-10-13 16:43:11 +02:00
Carlos
91b9c0bcf9
client side unit test for multi check until switchChecks()
2017-10-13 16:26:47 +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
4267b5fe0a
Eliminando código redundante v2
2017-10-13 16:22:45 +02:00
Carlos
7cf57d05f1
Client side unit test for grid-header
2017-10-13 10:45:06 +02:00
Carlos
311d80d902
Client side unit test for drop-down
2017-10-13 10:23:28 +02:00
dherrero
f24e16b81d
moved model agency
2017-10-11 15:00:18 +02:00
dherrero
80bbd9e5d4
bug fixed in datePicker
2017-10-11 14:21:32 +02:00
dherrero
e52b31ceb3
service validations moved into generic folder
2017-10-11 14:10:51 +02:00
dherrero
4563ee1b58
removed console.log
2017-10-11 13:25:03 +02:00
Carlos
a62285ff9e
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
zone model and rest api
module routes: front dev 80%
filtro de rutas con paginación
routes change model and first look
Login sin url de redirección
2017-10-11 12:57:26 +02:00
Carlos
3e44e927e8
client side unit test for dropdown until setScrollPosition
2017-10-11 12:57:13 +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
eeda5b45fd
routes change model and first look
2017-10-10 15:01:10 +02:00
dherrero
1bc3a0bdd7
autocomplete bug fixed in loadMore button
2017-10-10 12:56:03 +02:00
dherrero
bf903d8b1e
textfield: icons position changed
2017-10-10 12:37:52 +02:00
dherrero
96235a6752
route service models
2017-10-10 11:14:35 +02:00
Carlos
c341009489
CLient side unit test for dialog onKeypress()
2017-10-09 14:30:23 +02:00
Carlos
aec32f5e4a
client side unit test for dialog onBackgroundMouseDown()
2017-10-06 16:30:51 +02:00
Carlos
022450000e
micro-refactor on spec file
2017-10-06 15:36:25 +02:00
Carlos
e6acc57fae
client side unit test for dialog onButtonClick()
2017-10-06 15:33:21 +02:00
Carlos
1301fefe68
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
new micro-service route: need reinstall all dependencies
estructure for new module route
bug fixed autocomplete and width dropdown
2017-10-05 14:29:11 +02:00
Carlos
de9d9e53e2
client side unit test for dialog
2017-10-05 14:28:57 +02:00
dherrero
4d487e7980
estructure for new module route
2017-10-05 12:38:28 +02:00
dherrero
0c84722755
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-05 11:04:30 +02:00
dherrero
562ffed388
bug fixed autocomplete and width dropdown
2017-10-05 11:04:22 +02:00
Carlos
231bd9f813
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
watcher: removed unnecessary injection
removed unnecessary function in equals.js
watcher renamed properties
refactor watcher
2017-10-05 09:58:28 +02:00
Carlos
28909da94e
client side unit test for column-header
2017-10-05 09:58:15 +02:00
dherrero
5b100e502c
watcher: removed unnecessary injection
2017-10-05 09:53:40 +02:00
dherrero
c4d6fd91db
removed unnecessary function in equals.js
2017-10-05 09:51:27 +02:00
dherrero
e2312d954d
watcher renamed properties
2017-10-05 09:31:28 +02:00
dherrero
8df67ad95e
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-05 09:21:24 +02:00
dherrero
601cf6db25
refactor watcher
2017-10-05 09:20:40 +02:00
Carlos
485ef528b7
correct eslint errors in the commited files
2017-10-05 08:59:16 +02:00
Carlos
1b47d85828
client side unit test for textfield
2017-10-04 16:02:53 +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
Carlos
2402469f39
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
bug fixed modified data object
2017-10-04 13:28:02 +02:00
Carlos
92e1754571
client unit test for paging plus rly small refactors
2017-10-04 13:27:39 +02:00
Dani Herrero
245112438e
bug fixed modified data object
2017-10-04 10:54:29 +02:00
Carlos
9f7170f773
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
validation client credit - refact
validate client credit
AutoLoad items with "scroll" (1st version)
2017-10-04 08:47:28 +02:00
Carlos
946d7f8824
Autocomplete spec updated, icon-menu spec completed and small refactors in dialog, drop-down and icon-menu
2017-10-04 08:47:16 +02:00
Dani Herrero
2aed5d088c
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-04 08:18:49 +02:00
Carlos
c39b29128c
client side unit test for datePicker
2017-10-03 14:41:35 +02:00
Dani Herrero
2db36a56bb
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-03 12:10:43 +02:00
Dani Herrero
bc8d319714
AutoLoad items with "scroll" (1st version)
2017-10-03 12:10:30 +02:00
Carlos
73964ac387
removed unsed files and commented code for deprecated date-picker.js
2017-10-03 11:54:09 +02:00
Carlos
d121517569
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
dropdown: new style in -no more results-
2017-10-03 11:33:54 +02:00
Carlos
57b03790a3
Autocomplete client side unit tests finished
2017-10-03 11:32:25 +02:00
Dani Herrero
5ef97c209d
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-03 09:25:41 +02:00
Dani Herrero
1f5f0a0fda
dropdown: new style in -no more results-
2017-10-03 09:25:25 +02:00
Carlos
7d1bc60112
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
bug fixed on LoadMore action in autocomplete
2017-10-03 09:19:02 +02:00
Carlos
106d7d8364
autocomplete client side unit test for findItems() with multiple
2017-10-03 09:18:12 +02:00
Dani Herrero
4e309b67f0
bug fixed on LoadMore action in autocomplete
2017-10-03 09:16:02 +02:00
Dani Herrero
ff6801c8e8
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-03 07:10:52 +02:00
Dani Herrero
9afb992225
autocomplete changes on initialData
2017-10-03 07:10:37 +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
1662c9d241
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-09-28 14:34:40 +02:00
Dani Herrero
ecf88f6b66
new address list
2017-09-28 14:34:18 +02:00
Carlos
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
Carlos
86fdb010ae
Autocomplete client side unit test for findItems
2017-09-28 12:37:45 +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
Carlos
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
Carlos
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
Dani Herrero
35454c5c53
moved textfield styles
2017-09-27 12:44:33 +02:00
Dani Herrero
9d41a70416
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-09-27 12:27:38 +02:00
Dani Herrero
6aed24a02c
textfield: clear icon dinamic display
2017-09-27 12:27:18 +02:00
Carlos
5dc0608f86
error corrected
2017-09-27 11:58:35 +02:00
Carlos
ef7ee12373
client side unit test for autocomplete field() query functionality
2017-09-27 11:51:25 +02:00
Carlos
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
Carlos
9ae7898c19
client side unit test for autocomplete field() > setValue()
2017-09-27 09:42:59 +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
959f09d272
more tests
2017-09-27 08:09:10 +02:00
Carlos
0a17a59f2d
client unit tests for autocomplete field()
2017-09-26 18:21:11 +02:00
Carlos
3a666ef764
client unit test for autocomplete displayValue(), some functionality remains wild i.e. item.checked = false;
2017-09-26 14:10:55 +02:00
Carlos
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
Dani Herrero
235cc2d8f6
refactoring autocomplete: input readonly and autofucos on search input
2017-09-21 13:10:30 +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
a222a7a8d1
tooltip translate refactor
2017-09-21 09:33:02 +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
f6399596ce
autocomplete-v2 renamed
2017-09-20 14:25:43 +02:00
Dani Herrero
4b1e88cc1c
removed autocomplete folder
2017-09-20 14:23:53 +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
07f8309d36
quitado autocomplete anterior
2017-09-20 13:56:47 +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
e76f1d74f9
corrected small typo at datePicker.js
2017-09-19 15:03:39 +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
e525f1da30
Merge branch 'dev' into autocomplete-v2
2017-09-19 07:17:56 +02:00
Carlos
2721b87e57
client path e2e tests refactor
2017-09-15 12:24:37 +02:00
Dani Herrero
6651f70e07
autocomplete recatoring 80%
2017-09-14 13:40:55 +02:00
Carlos
bd20f76274
test for autocomplete client side
2017-09-14 09:22:49 +02:00
Dani Herrero
f9b3657440
refactoring 30%
2017-09-13 14:59:58 +02:00
Dani Herrero
99155e09fb
vn-title bug fixed
2017-09-13 13:34:57 +02:00
Dani Herrero
e177b3698d
deleted unnecessary files
2017-09-13 11:43:00 +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
Dani Herrero
c90be5bd04
bug fixed: login
2017-09-12 12:45:29 +02:00
Carlos
22f2d3e7f3
texfield refactor
2017-09-12 11:44:56 +02:00
Carlos
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
Carlos
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
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
aeaa417a4e
refactor at app.js to remove troublesome console.log()
2017-08-30 15:39:48 +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
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
Dani Herrero
45849e4daa
corregido CAU 2594 cambios en datos de facturación
2017-07-13 13:49:45 +02:00
Dani Herrero
1fc059273f
corregido error al destruir popover en searchBar
2017-07-13 13:32:23 +02:00
Dani Herrero
9fa608b11f
bug fixed filter in clients
2017-07-13 13:12:09 +02:00
Dani Herrero
7dfed60e7d
bug fixed in new datepicker and material design label effect
2017-07-13 11:03:22 +02:00
Dani Herrero
a06ac62b91
datepicker with timezone
2017-07-13 08:58:48 +02:00
Dani Herrero
3cf33fe48b
datepicker regex data with timezone
2017-07-13 08:55:39 +02:00
Dani Herrero
cd2560c8c6
bug fixed datepicker
2017-07-12 14:57:40 +02:00
Dani Herrero
f2c0dd3ab7
pruebas con date-picker y material
2017-07-12 14:32:15 +02:00
Dani Herrero
da3fddd9d2
estilos date-picker
2017-07-12 13:32:42 +02:00
Dani Herrero
17186c4035
nuevo date-picker
2017-07-12 13:32:25 +02:00
Dani Herrero
22829aa218
nuevos iconos de módulos
2017-07-11 14:28:53 +02:00
Dani Herrero
e22e9c7f13
refresh filter when clear model
2017-07-11 10:59:09 +02:00
Dani Herrero
b93c3f50e3
cambiando searchBar
2017-07-11 10:35:23 +02:00
Dani Herrero
2f6047d241
merge
2017-07-11 10:00:29 +02:00
Dani Herrero
81726e0a09
columnHeader change icon, style
2017-07-11 08:59:12 +02:00
Dani Herrero
2b7abef98f
corregido filtro principal
2017-07-06 14:46:22 +02:00
Dani Herrero
142cc920de
bug de multi seleccion corregido, cambio estilos
2017-07-06 14:21:55 +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
Dani Herrero
25ac346b2b
filtro principal y ajustes css
2017-07-06 12:58:50 +02:00
Juan Ferrer Toribio
6f581e033a
Merge
2017-07-06 12:43:37 +02:00
Dani Herrero
0339fdaef1
cambio de hora funcionando
2017-07-06 11:05:26 +02:00
Dani Herrero
3c1847134b
Front acoplado al endpoint RouteFk
2017-07-06 09:02:27 +02:00
Dani Herrero
51ac5f5262
correccion ortográfica
2017-07-05 14:59:40 +02:00
Dani Herrero
81749e906d
refactorizacion popover
2017-07-05 14:41:10 +02:00
Dani Herrero
53af148def
corregido error popover
2017-07-05 14:01:03 +02:00
Dani Herrero
e4e01c4970
añadida id ruta en tabla, internacionalizacion y mejora de popover
2017-07-05 13:02:49 +02:00
Dani Herrero
ffe21e6947
corrección para popover anidados
2017-07-05 09:47:24 +02:00
Dani Herrero
76d9546355
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-07-03 14:50:52 +02:00
Dani Herrero
f670c0f4fd
Localizador: restablecer filtros, datePicker con formato 'es'
2017-07-03 14:50:48 +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
Dani Herrero
461fc3c9a6
internacionalización por subir
2017-06-30 09:09:48 +02:00
Dani Herrero
3bb1eef43d
bug fixed in dropDown
2017-06-29 14:28:22 +02:00
Dani Herrero
6365a06cbb
Servicio mensaje de alerta modificado
2017-06-29 14:13:01 +02:00
nelo
8e177fcb2d
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-06-29 14:09:11 +02:00
Dani Herrero
372cfe718b
Localizador: warehouseFk por defecto
2017-06-29 14:09:04 +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
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
nelo
ddcec00c4f
change time
2017-06-29 09:48:00 +02:00
Dani Herrero
df614b4943
bugs fixed
2017-06-29 08:13:30 +02:00
Dani Herrero
5e2be42247
bugs fixed
2017-06-28 14:59:54 +02:00
Dani Herrero
5b5523e6b6
refactorización vnProductionTable
2017-06-28 14:53:26 +02:00
Dani Herrero
bfdd8ecd8e
Localizador: acciones separadas a nuevo componente vnProductionActions
2017-06-28 14:48:07 +02:00
Dani Herrero
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
nelo
7b38d2f188
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-06-28 08:57:37 +02:00
nelo
80121de6c3
change state
...
message send
change time
2017-06-28 08:57:33 +02:00
Dani Herrero
c2b351a777
Cambio de hora y refactorizacion del vnMultiCheck
2017-06-28 08:55:01 +02:00
Dani Herrero
b9704a2b91
corregido fallo en vnMultiCheck
2017-06-26 14:52:43 +02:00
Dani Herrero
4480431a08
estilos en vnMultiCheck
2017-06-26 14:41:08 +02:00
Dani Herrero
8b6e7fdc40
nuevo componente vnMultiCheck
2017-06-26 13:53:52 +02:00
Dani Herrero
fabe0cde7c
front: send message action
2017-06-26 10:52:22 +02:00
Dani Herrero
fcfef2c8b7
cambio en accion envio de mensaje
2017-06-26 09:39:21 +02:00
Dani Herrero
a96e3a57b6
corregido id ticket por ticketFk
2017-06-26 09:22:28 +02:00
Dani Herrero
6fd77dda74
cambio en filtros
2017-06-26 09:07:40 +02:00
Dani Herrero
17994a2cc5
internacionalizacion
2017-06-26 08:35:31 +02:00
dhan82
c69ada432d
internacionalizacion (reverted from commit f419946766
)
2017-06-26 08:32:57 +02:00
dhan82
f419946766
internacionalizacion
2017-06-26 08:28:16 +02:00
Dani Herrero
09e805fd3a
Ordenación en campos correcto, autocomplete con clear
2017-06-22 15:04:02 +02:00
Dani Herrero
2bdbda6192
Localizador, cambio estlios, añadido paginador, order by
2017-06-22 12:03:01 +02:00
Dani Herrero
05b6c81a1b
dropDown con filtro
2017-06-21 13:16:37 +02:00
Dani Herrero
3796741371
primera versión del componente vnGridHeader para ordenación de tablas
2017-06-21 09:46:31 +02:00
Dani Herrero
d444980ab1
[En progreso] nuevo componente vnGridHeader para ordenación de tablas
2017-06-20 15:00:27 +02:00
Dani Herrero
ca19369093
Production: modal para mensajes, filtros búsqueda en front 100%
2017-06-20 09:27:49 +02:00
Dani Herrero
bcdc31d8d9
arreglo en autocomplete para admitir valores por defecto
2017-06-15 15:00:43 +02:00
Dani Herrero
1ca5e20494
añadido callBack cambio estados
2017-06-15 12:00:51 +02:00
Dani Herrero
5f2aa345ba
iconMenu arreglo de posicion del DropDown interno
2017-06-15 11:22:47 +02:00
Dani Herrero
f346e5e83c
arreglos en drop-down
2017-06-15 08:26:03 +02:00
Dani Herrero
9072b100f9
tooltip admite plantilla html, icon-menu forzado de posicion en dropDown
2017-06-15 07:45:01 +02:00
Dani Herrero
afff93cce6
Tooltip: admite html, Localizador: añadido icono con información adicional
2017-06-14 09:54:00 +02:00
Dani Herrero
7713d0bd6f
cambio estilos dropdown
2017-06-13 14:57:09 +02:00
Dani Herrero
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
Dani Herrero
f274335997
interfaz gráfica y correcciones varias
2017-06-08 14:57:23 +02:00
Dani Herrero
491241398a
localizador y tooltip arreglo estilos
2017-06-08 10:05:11 +02:00
Dani Herrero
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
Dani Herrero
6123278945
en progreso: interfaz gráfica
2017-06-07 15:03:12 +02:00
Dani Herrero
51a700b6ce
date-picker v1
2017-06-07 13:27:57 +02:00
Juan Ferrer Toribio
5d789b0e71
Locales
2017-06-07 08:39:40 +02:00
Dani Herrero
9eaae2269b
client: localizador al 6%
2017-06-06 15:02:03 +02:00
Dani Herrero
9fcdb28d14
cambio en routes e interfaz localizador al 5%
2017-06-06 13:06:47 +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
Dani Herrero
bb91c026da
corregido error aviso cambio de método pago
2017-06-01 14:50:55 +02:00