Commit Graph

1181 Commits

Author SHA1 Message Date
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
Joan Sanchez 677e8ddd62 Token authenticate, solunion notification 2017-09-27 17:44:51 +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 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
Carlos 959f09d272 more tests 2017-09-27 08:09:10 +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
Carlos 0a17a59f2d client unit tests for autocomplete field() 2017-09-26 18:21:11 +02:00
Juan Ferrer Toribio f647e9e2d1 Modelos y código común para servicios loopback 2017-09-26 16:59:24 +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 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 05456cd185 small refactor on webpack.config.js 2017-09-21 15:02:46 +02:00
Carlos f588e3f046 linter errors corrected 2017-09-21 14:49:14 +02:00
Carlos 4473b97c1f Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  refactoring autocomplete: input readonly and autofucos on search input
  bug fixed in address edit with watcher
2017-09-21 14:47:04 +02:00
Carlos 747d5f5e36 datasource.test files for the local test db plus dockerfile refactor 2017-09-21 14:46:42 +02:00
Dani Herrero 235cc2d8f6 refactoring autocomplete: input readonly and autofucos on search input 2017-09-21 13:10:30 +02:00
Dani Herrero 4b2f709879 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-09-21 12:25:07 +02:00
Dani Herrero 490ff51fa6 bug fixed in address edit with watcher 2017-09-21 12:24:14 +02:00
Vicente Falco 092696514f merge 2017-09-21 12:18:29 +02:00
Vicente Falco 35ce85e3fc docker DB 2017-09-21 12:17:48 +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