verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity
4,350 Commits 268 Branches 0 Tags 125 MiB
Commit Graph

1606 Commits

Author SHA1 Message Date
Gerard 060ab04084 #723 order.summary 2018-10-10 12:55:04 +02:00
Gerard 5dabb5625c merge 2018-10-10 11:50:30 +02:00
Bernat d391d86f02 update fixtures table orderRow and rowcomponent, fix test 2018-10-10 11:17:55 +02:00
Joan Sanchez 31d655b130 Create ticket with transaction 2018-10-10 09:59:42 +02:00
Gerard 274e44368e #723 Added getTaxes to get the total taxes of an order 2018-10-08 15:21:06 +02:00
Javi Gallego 8c0e68313b Tarea #719 2018-10-08 14:56:34 +02:00
Gerard a4e72a0476 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-08 14:35:44 +02:00
Gerard 3f7b9bea1c test commented 2018-10-08 14:35:36 +02:00
Carlos Jimenez 6283f31f5a params are now defined for future maintenance 2018-10-08 14:13:18 +02:00
Joan Sanchez 33c4ed73ca updated docker dump order #714 2018-10-08 13:37:57 +02:00
Carlos Jimenez 979660dac3 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-08 11:12:53 +02:00
Gerard 16902fab8f added getUserConfig test 2018-10-08 11:03:28 +02:00
Gerard 034cf526a6 Bug #701 Refactorizar los métodos de loopback que utilicen Self.update() 2018-10-08 11:02:56 +02:00
Carlos Jimenez fa385cd9d6 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-08 11:00:49 +02:00
Carlos Jimenez 7d5c325abe #709 PRECEDURE vn.buyUltimate() unit test 2018-10-08 10:59:19 +02:00
Carlos Jimenez 97c86efb84 #713 PROCEDURE vn.buyUltimateFromInterval() unit test 2018-10-08 10:59:05 +02:00
Joan Sanchez 300c7a3cfe userConfig fix 2018-10-08 08:14:25 +02:00
Bernat ec3a448396 update structure cau 8409 2018-10-08 07:42:05 +02:00
Joan Sanchez f7e042320d regularize claim #656 2018-10-08 07:31:55 +02:00
Bernat 427d702a8e update fixtures userConfig 2018-10-05 14:57:58 +02:00
Gerard c990877bda set userFk null in tests 2018-10-05 13:06:11 +02:00
Gerard ead7397bb3 console logs removed 2018-10-05 13:05:34 +02:00
Gerard d1ea2ddf25 Tarea #614 nueva sección cuenta 2018-10-05 13:04:41 +02:00
Gerard 0481cac14e Tarea #614 nueva sección cuenta 2018-10-05 13:01:46 +02:00
Bernat 47a50be560 updatefixtures userConfig 2018-10-05 12:21:52 +02:00
Bernat 708ca020a2 update ACL 2018-10-05 11:53:23 +02:00
Bernat 69961d5b00 update fixtures and fix test GetTaxes 2018-10-05 09:32:46 +02:00
Carlos Jimenez 1b1fcb0396 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-04 14:42:53 +02:00
Carlos Jimenez af2803deda #709 PROCEDURE vn.buyUltimate() unit test 2018-10-04 14:42:44 +02:00
Bernat ea017dde5c update ACL and table clientLog 2018-10-04 14:01:52 +02:00
Carlos Jimenez efc477f42d Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-04 13:32:38 +02:00
Carlos Jimenez ffd3dd3986 #686 PROCEDURE unit test vn.ticketCreateWithUser 2018-10-04 13:32:28 +02:00
Bernat 313ce8af6e add table userConfig 2018-10-04 11:20:17 +02:00
Bernat c2e1eaa005 update fixtures 2018-10-04 10:06:32 +02:00
Carlos Jimenez b6068e9150 #697 PROCEDURE ticketCalculateClon unit test 2018-10-04 08:46:56 +02:00
Carlos Jimenez 90831167a1 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-03 15:53:05 +02:00
Carlos Jimenez 57b9f8b359 #678 Tests importToNewRefundTicket 2018-10-03 15:46:57 +02:00
Gerard a7bd76a218 agencyMode now can be null 2018-10-03 14:05:25 +02:00
Gerard e53beea7cb Tarea #600 make it test friendly 2018-10-03 13:22:24 +02:00
Carlos Jimenez c1893be92a Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-03 12:55:10 +02:00
Gerard 6259d4611d Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-03 12:54:31 +02:00
Gerard 1972a40c48 Tarea #600 make it test friendly 2018-10-03 12:54:13 +02:00
Gerard b74da9da84 Tarea #600 changed client.update for update attributes to make it compatible with logs 2018-10-03 12:53:30 +02:00
Carlos Jimenez d30b307bd3 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-03 12:36:19 +02:00
Bernat 0980c00451 update acl 2018-10-03 12:30:38 +02:00
Carlos Jimenez cba95e6c76 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-03 11:46:54 +02:00
Carlos Jimenez 91237a87ef refactor on spec files 2018-10-03 11:40:51 +02:00
Gerard 5eb83ed01e Tarea #600 Refactor to make it compatible with logs 2018-10-03 11:27:55 +02:00
Carlos Jimenez 76da96cc48 fixtures restored 2018-10-03 10:50:09 +02:00
Gerard 43cbdefa22 Tarea #600 loggable 2018-10-03 09:37:34 +02:00
Bernat 316a7f8429 update fixtures new table orderticket 2018-10-03 08:26:05 +02:00
Bernat bbb221cc0c update fixtures orders and fix test 2018-10-03 08:12:34 +02:00
Carlos Jimenez 0537dad01d Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-02 16:41:50 +02:00
Joan Sanchez 99d2ebb332 acl fix 2018-10-02 12:03:39 +02:00
Carlos Jimenez 8d60b3c1bc Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-02 11:33:40 +02:00
Joan Sanchez b8d09bddb4 Import ticket sales #693 to claim actions 2018-10-02 09:52:38 +02:00
Carlos Jimenez 2e018e61c4 refactor para uso correcto de modelos loopback y ticketCalculateClon 2018-10-02 09:41:30 +02:00
Bernat 3de2bb85a2 update structure db 2018-10-02 09:16:27 +02:00
Bernat 6875e7da11 update structure db 2018-10-02 07:28:12 +02:00
Bernat 82fba82f2d update fixtures and fix test 2018-10-01 14:57:51 +02:00
Carlos Jimenez 91e85dc1ec Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-01 14:42:49 +02:00
Bernat 0ed2f9518b update structure 2018-10-01 13:55:07 +02:00
Bernat d9601ec4ac export structure db from production and fix test 2018-10-01 13:46:09 +02:00
Joan Sanchez f03fd334da added claim pickup order template 2018-10-01 10:58:44 +02:00
Carlos Jimenez f9bb1128a2 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-01 09:23:56 +02:00
Joan Sanchez 1e604d92b4 Sale tracking get state from saleTracking instead of ticket. #695 2018-10-01 08:17:36 +02:00
Joan Sanchez 12824b1564 Added client web payment #673 2018-09-28 15:00:12 +02:00
Carlos Jimenez 146f3c8139 #685 PROCEDURE unit test vn.logAddWithUser 2018-09-28 13:55:21 +02:00
Carlos Jimenez 8ce2912344 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-09-28 13:52:18 +02:00
Bernat 1002b39694 refactor test #649 2018-09-28 08:43:00 +02:00
Carlos Jimenez eaf902f28f Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-09-27 13:13:13 +02:00
Carlos Jimenez 0f2b19a4eb typo correction 2018-09-27 13:13:02 +02:00
Bernat 7a0dad9db3 update fixtures add 2 clients 2018-09-27 13:04:45 +02:00
gerard 9405e49c8a acl fixed 2018-09-27 12:58:19 +02:00
Bernat 46a62854d6 refactor test updateBillingData 2018-09-27 10:03:11 +02:00
Carlos Jimenez 504096d702 amends for #655 claim action 2018-09-27 09:50:31 +02:00
Joan Sanchez 07d5226169 Disabled route module 2018-09-27 08:55:59 +02:00
Joan Sanchez a0c1388cf0 fixed billing data 2018-09-27 08:46:58 +02:00
Carlos Jimenez b3a53fbe82 #686 PROCEDURE unit test vn.ticketCreateWithUser 2018-09-26 15:49:35 +02:00
Carlos Jimenez 79fc3bd7dc #678 planificacion de tests db + small refactor on new.js 2018-09-26 15:48:33 +02:00
Carlos Jimenez f84e11c5b5 #655 [FALTA PLANIFICACION] claim.action añadir acciones 2018-09-26 11:16:52 +02:00
Carlos Jimenez 9bc8687a85 Back end dependencies adjusted for #655 2018-09-25 14:39:08 +02:00
Carlos Jimenez d40597deef Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-09-25 13:14:50 +02:00
Carlos Jimenez fadaaae51a task added to spec file 2018-09-25 13:12:03 +02:00
Joan Sanchez cef2d91c9c added build version for route caching & package fix #448 2018-09-25 11:44:21 +02:00
Bernat 20a4e1619f update fixtures 2018-09-25 09:07:43 +02:00
Joan Sanchez 4388a6dbff added Agency module 2018-09-25 08:53:57 +02:00
Bernat 7afa99f25d add new models and update structure db 2018-09-25 08:47:11 +02:00
Bernat 837af23497 update models agency and agencyMode and update fixtures 2018-09-24 12:57:21 +02:00
Bernat 79737fc508 update fixtures 2018-09-24 12:03:01 +02:00
Joan Sanchez 564370180c zone basic data 2018-09-24 10:43:54 +02:00
Bernat 6fc85b0e5a refactor fixtures, and fix / refactor test 2018-09-21 15:01:51 +02:00
Joan Sanchez 9c1197b68f updated qlabel download link 2018-09-21 12:36:11 +02:00
Bernat 2cd2c6bdae update model agency 2018-09-21 07:28:26 +02:00
Bernat 6b64b2b419 update structure db 2018-09-20 12:57:17 +02:00
Javi Gallego 03c6aef542 arreglo bug en createFromSales backTest 2018-09-20 07:49:38 +02:00
Joan Sanchez bd6bebaf49 translation fix 2018-09-20 07:24:05 +02:00
Joan Sanchez d5ca385ccd added zone index & zone create 2018-09-19 15:05:07 +02:00
gerard fd08bb96dd fdescribe deleted 2018-09-19 13:18:23 +02:00
Bernat cb17a1dc79 update structure db 2018-09-19 12:57:46 +02:00
Javi Gallego 87447661b2 merge 2018-09-19 07:42:53 +02:00
Javi Gallego 68e075c496 #654 Permisos en claim.basicData 2018-09-19 07:41:07 +02:00
gerard 8d6b6cd2a8 updated translations 2018-09-18 14:38:17 +02:00
gerard 834d779154 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-18 14:37:15 +02:00
gerard fa9c3f4759 Tarea #602 Investigar hook 2018-09-18 14:36:41 +02:00
Joan Sanchez 9aff95904d Added model rewriteDbError() method & fixed tag bug #597 & #662 2018-09-18 10:11:51 +02:00
Carlos Jimenez f1e5fdfa0b Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-09-18 08:58:26 +02:00
Carlos Jimenez 7bc2d0339d order is now deleted upon execution 2018-09-18 08:58:15 +02:00
Joan Sanchez f387673b80 catalogFilter back unit test fixed with different orderFk 2018-09-18 08:55:39 +02:00
gerard 18fe2e16af updated test 2018-09-17 15:10:46 +02:00
gerard 4fb31f9522 Tarea #658 dialogo de añadir cantidad 2018-09-17 14:30:39 +02:00
Bernat 702690e949 update fixtures cau 8198 2018-09-17 13:13:33 +02:00
Bernat df02c35068 update fixtures 2018-09-14 14:59:14 +02:00
gerard df85500ab5 added UserError 2018-09-14 14:45:29 +02:00
gerard 0926e481ed Tarea #601 dialogo de añadir cantidad 2018-09-14 14:44:46 +02:00
Bernat ec960eab76 update structure db 2018-09-14 13:47:50 +02:00
Carlos Jimenez e90af6b851 #593 Refactor card/descriptor/descriptor-popover 2018-09-14 13:43:51 +02:00
Joan Sanchez 8feba9f5eb catalogFilter back test 2018-09-14 09:37:54 +02:00
Joan Sanchez fa31010069 catalog filters #598 2018-09-14 09:10:30 +02:00
gerard 3fafadf5c8 Bug #657 mandar una notificacion al comercial de un cliente falla 2018-09-14 08:08:38 +02:00
gerard d60308f72b Bug #651 test 2018-09-13 15:29:38 +02:00
gerard d39365b63b Bug #651 Al borrar un ticket no se cambia su estado a eliminado test 2018-09-13 15:13:42 +02:00
Carlos Jimenez 447044faf9 task updated #651 Al borrar un ticket no se cambia su estado a eliminado 2018-09-13 14:33:09 +02:00
Carlos Jimenez 7211277b25 amends on spec file 2018-09-13 14:29:59 +02:00
gerard a2506a787e updated description 2018-09-13 12:39:56 +02:00
gerard 910d758117 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-13 12:36:59 +02:00
gerard fe80a6b8c8 Bug #651 Al borrar un ticket no se cambia su estado a eliminado 2018-09-13 12:36:52 +02:00
Bernat 24f89156e4 update fixtures, fix test and selectors 2018-09-13 12:32:33 +02:00
Bernat e6bc71ee33 update fixtures table packaging 2018-09-13 11:08:31 +02:00
gerard 7e309e5f62 Bug #650 En la seccion claim detail no aparecen las sales reclamables 2018-09-13 10:05:39 +02:00
Carlos Jimenez 516552c59f removed a console log 2018-09-12 15:40:52 +02:00
Carlos Jimenez fe6eb7dfd7 fixtures update for #604 create claim part of the path 2018-09-12 15:19:53 +02:00
Bernat 367604654c update fixtures and fix test 2018-09-11 15:09:15 +02:00
Javi Gallego 6169486bb0 fix test createFromSales 2018-09-11 13:56:40 +02:00
Javi Gallego b6cc8c2fe0 merge 2018-09-11 13:44:49 +02:00
Javi Gallego c9ec4aee7e #612 añadir reclamacion 2018-09-11 12:49:31 +02:00
gerard 0102c4f673 Tarea #601 boton + abrir el cuadro de dialogo de añadir cantidad 2018-09-11 09:38:37 +02:00
Joan Sanchez a4c730cf65 enabled routes module #616 2018-09-07 09:40:45 +02:00
gerard 92b47466d7 Bug #645 no se pueden añadir greuges desde salix 2018-09-07 08:27:26 +02:00
gerard 8f4592f71f Tarea #596 /sale/getClaimableFromTicket.js Backend 2018-09-06 16:49:13 +02:00
gerard 767a1b02d9 Tarea #603 /item/getDiary.js Backend unit tests 2018-09-06 16:18:17 +02:00
Bernat d38540a53f itemDiary procedure fixed in local 2018-09-06 15:13:34 +02:00
Joan Sanchez cee940f4fa order client descriptor #609 2018-09-06 12:47:25 +02:00
Bernat 3d6593b020 update structure db local 2018-09-06 11:51:24 +02:00
Javi Gallego 588308cf1e merge 2018-09-06 11:15:53 +02:00
Bernat ee4e6b0b19 update fixtures table ticket 2018-09-06 11:09:26 +02:00
Bernat aef4bfaf4f update structure DB, fixturesDB and fix test 2018-09-06 10:42:43 +02:00
gerard c424e845d1 Tarea #606 claim.summary 2018-09-05 13:47:15 +02:00
Juan bf0e1eeaf3 CrudModel: improved, docs, bugs fixed 2018-09-05 13:01:21 +02:00
gerard dacdc39a28 Tarea #447 claim.action 2018-09-05 11:35:34 +02:00
Bernat a98ae9d4ae add new fixtures for table sample 2018-09-05 11:07:05 +02:00
Carlos Jimenez 9b6b08400f lint warnings corrected + en json 2018-09-05 08:27:50 +02:00
Carlos Jimenez 566c8e619e #604 e2e de la seccion ticket.sale fallo de traducciones 2018-09-04 16:59:46 +02:00
Joan Sanchez d3406fecde claim search-panel & connector-mysql fix date 2018-09-04 15:08:36 +02:00
Bernat ba51c0cc97 update fixtures table sale, saleComponent and fix test 2018-09-04 14:52:38 +02:00
Bernat 21903c6414 update fixtures table sale and fix test 2018-09-04 14:10:59 +02:00
Carlos Jimenez eab15e7598 the removed line was making the translation to work on the opposite way 2018-09-04 13:53:04 +02:00
Javi Gallego dda12c4b62 #460 expedition 2018-09-04 11:57:41 +02:00
Bernat b2317491f5 update fixtures tickets alias and fix test 2018-09-04 09:50:39 +02:00
Joan Sanchez 6c682875a0 mailer css removed justify text. Fixed chrome image content-type. 2018-09-03 13:54:18 +02:00
Joan Sanchez 1597d3c847 ticket filter fix 2018-08-31 15:18:53 +02:00
Joan Sanchez 8879005854 fixed ticket list pagination 2018-08-31 12:39:57 +02:00
Carlos Jimenez bc2554e6f9 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-31 11:25:30 +02:00
Joan Sanchez ff3c37f692 itemDiary procedure 2018-08-31 08:07:01 +02:00
Joan Sanchez f3fc211dfa removed unused routes, filter and crud routes #409 2018-08-31 07:53:38 +02:00
Carlos Jimenez 58042027cf small refactors 2018-08-30 16:15:30 +02:00
Javi Gallego 87b0908ee4 cambio asociado al warehouse 2018-08-30 11:44:39 +02:00
Javi Gallego c4e0fc74a3 Bug #452 quitamos servicio production 2018-08-30 11:02:50 +02:00
Carlos Jimenez aff9f57833 #444 claim basic data 2018-08-29 09:45:37 +02:00
Carlos Jimenez b9cd86af11 traducciones 2018-08-29 08:29:54 +02:00
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 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
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
Joan Sanchez 997c4c52f9 added backend summary test #520 2018-08-22 13:28:01 +02:00
gerard e391b22eaf Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-22 12:41:25 +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 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 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
Carlos Jimenez 0ca8d1a2ad #544 /ticket/getTotalVolume.js Backend unit tests 2018-08-21 09:35:14 +02:00
gerard 48670b9724 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-21 08:13:45 +02:00
gerard 1bc7ea4815 Bug #589 Si cambia el estado de un ticket no se guarda el historico 2018-08-21 08:13:35 +02:00
Carlos Jimenez d2eaa62461 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-21 08:08:49 +02:00
Carlos Jimenez e925146c73 #547 ticket/new.js Backend unit tests plus order new refactor 2018-08-21 08:08:39 +02:00
gerard ca523e634c Bug #589 cambiar el estado desde ticket.sales no guarda el historico 2018-08-21 07:39:01 +02:00
gerard d364025b19 added translations 2018-08-20 14:51:13 +02:00
Carlos Jimenez f942732d48 #555 item model back unit test 2018-08-20 10:06:00 +02:00
Carlos Jimenez 065f2126bf #564 new.js Backend unit tests 2018-08-17 16:12:05 +02:00
Joan Sanchez 7c4eda87a2 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-17 15:03:53 +02:00
Joan Sanchez a60720d1ed Ticket packaging refactor + front test updated 2018-08-17 14:53:25 +02:00
Bernat 42fa3d0e69 update fixtures table client 2018-08-17 14:52:54 +02:00
Carlos Jimenez d0fff2135e Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-17 13:26:07 +02:00
Carlos Jimenez 8706f5c6c0 #531 moveToTicket.js Backend unit tests 2018-08-17 13:23:07 +02:00
Bernat 77641666da update fixtures table client 2018-08-17 13:14:10 +02:00
Carlos Jimenez 8ccab773c0 corrected a problem where dynamic dates were giving false test failures 2018-08-17 09:56:50 +02:00
Carlos Jimenez a6be927a1f small refactor 2018-08-17 09:29:00 +02:00
Joan Sanchez 4fff408e68 back test priceDifference 2018-08-17 08:41:30 +02:00
Bernat 6e6cf47c5a update procedure agencyHourGetLanded 2018-08-16 14:31:11 +02:00
Carlos Jimenez 5e9c3461e6 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-16 14:00:50 +02:00
Carlos Jimenez 2e88957c8b #534 reserve.js Backend unit tests 2018-08-16 14:00:37 +02:00
Joan Sanchez 611f612068 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-16 13:12:20 +02:00
Joan Sanchez 1786602187 Change landed on shipped change #458 2018-08-16 13:12:18 +02:00
Carlos Jimenez 51e5e76edd #527 getLastEntries.js unit tests + fixtures + threeKastActive refactor 2018-08-16 12:10:56 +02:00
Carlos Jimenez 8f385798b6 corrected errors 2018-08-14 14:52:39 +02:00
Carlos Jimenez 5cfd5c7605 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-14 14:32:40 +02:00
Carlos Jimenez 25b5cfe99f #549 threeLastActive.js Backend unit tests 2018-08-14 14:32:27 +02:00
Joan Sanchez 0efa85c2fb updated ticket filter 2018-08-14 13:36:02 +02:00
Carlos Jimenez 35a8a7d7dc Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-14 12:50:10 +02:00
Carlos Jimenez 0c3072fb13 #536 updatePrice.js backend unit test 2018-08-14 12:48:12 +02:00
Bernat 829f9d33cd add new procedure agencyHourGetLanded 2018-08-14 12:03:20 +02:00
Carlos Jimenez be132e33cb #561 getTotalVolume.js back unit test + servicesDir added to spec files 2018-08-14 11:52:10 +02:00
Carlos Jimenez c14fe295d7 #474 descriptor-popover Front unit test and refactor of other test 2018-08-14 09:12:28 +02:00
Carlos Jimenez 27bc339721 #522 updateBillingData.js Backend unit tests 2018-08-13 16:54:34 +02:00
Carlos Jimenez 24ad4a83a1 #521 updateBasicData.js Backend unit tests 2018-08-13 14:52:05 +02:00
Carlos Jimenez 9268fdb2da #523 updateFiscalData.js Backend unit tests plus refactor 2018-08-13 14:10:03 +02:00
Carlos Jimenez bd2befe3ef removed an fdescribe, added servicesDir to some spec files and refactors 2018-08-13 13:11:37 +02:00
Carlos Jimenez 51f7958612 removed unexpected focus on describe 2018-08-13 12:46:56 +02:00
Carlos Jimenez fbe0cf2111 #556 state back end unit test 2018-08-13 12:46:11 +02:00
gerard c62ed68d28 Tarea #541 /methods/ticket/deleted.js Backend unit tests 2018-08-10 17:18:21 +02:00
gerard 4076934644 Tarea #541 /methods/ticket/deleted.js 2018-08-10 17:17:53 +02:00
gerard ac90bb3b18 /ticket/getSalesPersonMana.js Backend unit tests 2018-08-10 16:31:44 +02:00
gerard 06a3f0b6bc /order/getTotal.js Backend unit tests 2018-08-10 16:30:18 +02:00
gerard 3875f4298c filter modified to get the prices of a product 2018-08-10 16:15:17 +02:00
gerard 9b2a2b7a9f translations added 2018-08-10 13:22:11 +02:00
Carlos Jimenez b43f8d2d58 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-10 12:05:48 +02:00
Carlos Jimenez b4d2e29d5f #537 updateQuantity.js Backend unit tests 2018-08-10 12:05:36 +02:00
Joan Sanchez a3d15965ab packaging & component back tests 2018-08-10 11:40:48 +02:00
Joan Sanchez f15d8c3087 front & back tests 2018-08-09 12:54:29 +02:00
Joan Sanchez 2fc7c0a807 Fixed translations 2018-08-09 08:57:16 +02:00
gerard feb80006ab Tarea #562 /order/getVolumes.js 2018-08-08 16:15:53 +02:00
gerard 505ad27217 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-08 14:45:39 +02:00
gerard 4b0a75cc0c Bug #422 refactorizar el summary y el card de item y añadir el visible y el available 2018-08-08 14:44:45 +02:00
gerard 1d15e82a64 Bug #422 refactorizar el summary de item 2018-08-08 14:42:57 +02:00
Joan Sanchez 671c6bd3ff Ticket list refactor. Ticket problems, ticket total #245 & #461 2018-08-08 14:26:54 +02:00
Bernat 3fef95aeef update fixtures ticket 21 changes for Gerard 2018-08-07 18:57:32 +02:00
gerard 93810c381b translations added 2018-08-07 16:10:10 +02:00
gerard 65ffade0a3 Tarea #438 order.line 2018-08-07 16:04:42 +02:00
gerard da9a783843 Tarea #438 order.line 2018-08-07 15:48:55 +02:00
gerard 4c45db1c16 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-07 15:41:42 +02:00
gerard f2be6cac17 Tarea #545 /ticket/isEditable.js Backend unit tests 2018-08-07 15:38:44 +02:00
Carlos Jimenez e094fe4456 #568 ticket-packaging.js Backend unit tests 2018-08-07 15:04:06 +02:00
Carlos Jimenez a44719c1ec #552 account.js backend unit tests 2018-08-07 12:17:34 +02:00
Carlos Jimenez 9bd69baaf1 #569 ticket tracking back unit tests plus tiny refactor 2018-08-07 11:06:40 +02:00
Bernat 3b3bc52b53 add procedure orderListTax 2018-08-06 21:00:44 +02:00
Bernat e067420255 update fixtures, change id item 6 for 71 2018-08-06 20:10:39 +02:00
Carlos Jimenez 1a7930308c the test now fails if the tests fails to get into the catch and an item gets cloned 2018-08-06 14:34:44 +02:00
Joan Sanchez 8228f49eed Fixed ticket basic data message type 2018-08-06 14:25:11 +02:00
Joan Sanchez a0bae4ab46 Updated letter-debtor sample 2018-08-06 14:09:37 +02:00
Carlos Jimenez 084896c69a #524 backend clone.js unit tests 2018-08-06 12:00:29 +02:00
Carlos Jimenez ddf138007b Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-03 12:02:39 +02:00
Carlos Jimenez 1d4de8c3bd added selectors for #459 e2e lineas de ticket 2018-08-03 12:02:04 +02:00
Bernat c177bc7ab9 fix test and fixtures for itemTags updated 2018-08-03 08:29:38 +02:00
gerard 19e72c86cf added translations 2018-08-02 15:35:48 +02:00
gerard 9e39c28b51 Translations updated 2018-08-02 11:06:30 +02:00
gerard 71a559783c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-02 10:54:08 +02:00
gerard 49ea108771 Bug #571 usuario con privilegios cambia el estado de un ticket bloqueado 2018-08-02 10:54:03 +02:00
Joan Sanchez ff0f0436af Fixed locales: client & back-end validations, back-end UserError. #464 2018-08-02 09:49:00 +02:00
Bernat bde19ffdc8 update fixtures, fix problems with item Visible and Available 2018-08-01 19:33:22 +02:00
Carlos Jimenez d8fb0b2d95 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-01 14:01:59 +02:00
Carlos Jimenez d799ac8100 renamed spec files accordingly plus linter and indentation corrections 2018-08-01 14:01:42 +02:00
Bernat 0c6ae08d4a change idWorker from to users and fix back unit test 2018-08-01 13:24:38 +02:00
Bernat 0447d2f521 update fixtures 2018-07-31 15:03:53 +02:00
Carlos Jimenez 5aae572566 renamed spec files plus fixtures update for ticket basicdata #462 e2e 2018-07-31 13:49:54 +02:00
Joan Sanchez 4103f7fcf6 Added sample create #440 2018-07-31 11:08:22 +02:00
Bernat 81c6546e96 update fixtures 2018-07-30 20:45:26 +02:00
Bernat 8e1ef327c2 add model ClaimDevelopment 2018-07-30 20:16:25 +02:00
Bernat c3956b2354 add model ClaimDevelopment 2018-07-30 15:41:02 +02:00
Bernat 1ec3777f4a update fixtures and fix test 2018-07-30 15:21:12 +02:00
Bernat 23b7e5a0cc update fixtures and add new models for claim module 2018-07-30 14:10:09 +02:00
gerard 97cbb4fb25 Iban validation for french clients desactivated 2018-07-27 15:13:01 +02:00
Joan Sanchez 23993ce717 updated model sample & clientSample 2018-07-27 11:18:27 +02:00
Bernat 4e2ff17121 add new models and fixtures 2018-07-25 20:47:07 +02:00
Joan Sanchez 2433d7684d Change page title #426 2018-07-25 15:14:03 +02:00
gerard b68f34d3d4 Tarea #427 mover create order de ticket a order 2018-07-24 13:48:31 +02:00
gerard 81dc09999f Tarea #406 order.volumen 2018-07-24 12:57:07 +02:00
gerard a7ec730216 bug with barcodes solved 2018-07-24 12:56:07 +02:00