Commit Graph

3469 Commits

Author SHA1 Message Date
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
Joan Sanchez d0d27c147b Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-04 13:27:59 +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
Joan Sanchez 9ebd705aea Errores en servicio de autenficación solucionados. 2017-10-04 13:27:38 +02:00
Dani Herrero 245112438e bug fixed modified data object 2017-10-04 10:54:29 +02:00
Dani Herrero 6963051974 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-04 09:07:29 +02:00
Dani Herrero 9fbc404aa1 bug fixed in formatCard function 2017-10-04 09:07:14 +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 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 024aca6c17 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-03 14:45:22 +02:00
Joan Sanchez 666928b1a9 Auth login json response 2017-10-03 14:44:11 +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
Carlos 58a80d2062 version para Jenkins 2017-10-02 12:08:06 +02:00
Joan Sanchez aef9659798 Mailer: Autentificación token por ruta. Fix creditClassification 2017-10-02 11:19:55 +02:00
Vicente Falco 8fa1599102 Conflicto rama dev 2017-10-01 19:59:35 +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