Commit Graph

3185 Commits

Author SHA1 Message Date
gerard 67afda853c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-23 12:31:14 +02:00
gerard b558d79757 Tarea #551 /workerMana/getCurrentWorkerMana.js 2018-08-23 12:31:04 +02:00
Joan Sanchez d39ef8827f fixed ticket filter back-end test 2018-08-23 10:48:44 +02:00
Joan Sanchez c7ff42b409 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-23 10:08:15 +02:00
Joan Sanchez be6b2aa247 updated ticket filter #461 2018-08-23 10:08:06 +02:00
Carlos Jimenez 67fdaecebd Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-23 09:09:54 +02:00
Carlos Jimenez d8075a09e2 refactor of spec file 2018-08-23 09:09:37 +02:00
Carlos Jimenez be85c784ed #529 item/updateTaxes.js Backend unit tests 2018-08-23 09:09:21 +02:00
gerard 7f6f99dc49 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-23 08:58:35 +02:00
gerard c803a754d5 watcher deleted because it was causing bugs in this section 2018-08-23 08:58:28 +02:00
Carlos Jimenez f03cdba029 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-22 14:38:31 +02:00
Carlos Jimenez 7a86beb16a #546 services/loopback/common/methods/ticket/list.js Backend unit tests 2018-08-22 14:38:19 +02:00
gerard 8ff2e40998 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-22 14:24:47 +02:00
gerard 399d43ce79 Tarea #551 /workerMana/getCurrentWorkerMana.js Backend unit tests 2018-08-22 14:24:33 +02:00
Carlos Jimenez 7d488217b5 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-22 13:30:07 +02:00
Carlos Jimenez 7db3a96adc #504 client/item/src/search-panel/index.js Front unit test 2018-08-22 13:29:54 +02:00
Joan Sanchez 544ed62153 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-22 13:28:10 +02:00
Joan Sanchez 997c4c52f9 added backend summary test #520 2018-08-22 13:28:01 +02:00
Carlos Jimenez c91163f7d1 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-22 12:55:49 +02:00
Carlos Jimenez b20ecc307b Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-22 12:55:23 +02:00
Carlos Jimenez 7abeebeecb #503 client/item/src/index/index.js Front unit test 2018-08-22 12:55:15 +02:00
gerard 901c0f609b bugs with date definition solved 2018-08-22 12:55:13 +02:00
gerard e391b22eaf Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-22 12:41:25 +02:00
gerard 05ea1dcbf1 Tarea #494 /directives/bind.js Front unit test 2018-08-22 12:41:00 +02:00
Carlos Jimenez 700e5f1dfb #525 item/filter.js Backend unit tests 2018-08-22 11:12:36 +02:00
gerard e38e45c3fe temporally desactivated waiting for fixtures changes 2018-08-22 09:56:59 +02:00
Carlos Jimenez 05ae6bd534 #548 ticket/summary.js Backend unit tests 2018-08-22 09:20:34 +02:00
gerard 5a4f6e2e1e Tarea #528 /item/getSummary.js Backend unit tests 2018-08-22 09:09:16 +02:00
gerard 1dd4ffcc13 method updated 2018-08-22 09:08:11 +02:00
gerard 0fcbb383ee Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-22 08:25:03 +02:00
gerard 05c1528195 Tarea #533 /sale/removes.js Backend unit tests 2018-08-22 08:24:54 +02:00
Carlos Jimenez 22666af20b removed unused tests 2018-08-22 07:30:44 +02:00
Carlos Jimenez 76a44a6543 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-21 15:02:05 +02:00
Carlos Jimenez 1c19e6c3a9 #553 address backend unit tests 2018-08-21 14:59:04 +02:00
gerard e7f544b459 Revert "updated backend test"
This reverts commit fdefb2eb21.
2018-08-21 14:28:42 +02:00
gerard 5ef47060c7 updated backend test 2018-08-21 14:22:19 +02:00
gerard fdefb2eb21 updated backend test 2018-08-21 14:20:38 +02:00
gerard dd3f13942f Tarea #468 /address/edit/index.js Front unit test 2018-08-21 14:13:11 +02:00
gerard e359fd4d16 Tarea #542 /methods/ticket/getSales.js Backend unit tests 2018-08-21 14:03:58 +02:00
Joan Sanchez 300b2c2a07 catalog filter #581 2018-08-21 13:38:16 +02:00
gerard 46eb1e6f98 Tarea #528 /methods/item/getSummary.js Backend unit tests 2018-08-21 13:31:25 +02:00
gerard fc95597a96 Tarea #505 /summary/index.js Front unit test 2018-08-21 13:14:18 +02:00
gerard 86805769fe Tarea #505 /summary/index.js Front unit test 2018-08-21 13:13:51 +02:00
gerard 6f8fa86786 Tarea #533 /sale/removes.js Backend unit tests 2018-08-21 12:56:32 +02:00
gerard ea785bd9a1 Tarea #542 2018-08-21 11:29:42 +02:00
gerard c48b8c4b99 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-21 11:27:54 +02:00
gerard 8d1cf0c02f Tarea #567 /ticket-tracking/changeState.js Backend unit tests 2018-08-21 11:27:42 +02:00
Joan Sanchez 10350ac97e css & eslint fix 2018-08-21 10:54:01 +02:00
Carlos Jimenez 0ca8d1a2ad #544 /ticket/getTotalVolume.js Backend unit tests 2018-08-21 09:35:14 +02:00
Carlos Jimenez 3d533b04ea Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-21 09:06:52 +02:00