 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 |
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
|
d9601ec4ac
|
export structure db from production and fix test
|
2018-10-01 13:46:09 +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
|
12824b1564
|
Added client web payment #673
|
2018-09-28 15:00:12 +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 |
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
|
a0c1388cf0
|
fixed billing data
|
2018-09-27 08:46:58 +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
|
9bc8687a85
|
Back end dependencies adjusted for #655
|
2018-09-25 14:39:08 +02:00 |
|
Joan Sanchez
|
cef2d91c9c
|
added build version for route caching & package fix #448
|
2018-09-25 11:44:21 +02:00 |
|
Bernat
|
837af23497
|
update models agency and agencyMode and update fixtures
|
2018-09-24 12:57:21 +02:00 |
|
Bernat
|
6fc85b0e5a
|
refactor fixtures, and fix / refactor test
|
2018-09-21 15:01:51 +02:00 |
|
Bernat
|
2cd2c6bdae
|
update model agency
|
2018-09-21 07:28:26 +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 |
 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
|
e90af6b851
|
#593 Refactor card/descriptor/descriptor-popover
|
2018-09-14 13:43:51 +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
|
fe80a6b8c8
|
Bug #651 Al borrar un ticket no se cambia su estado a eliminado
|
2018-09-13 12:36:52 +02:00 |
|
Bernat
|
367604654c
|
update fixtures and fix test
|
2018-09-11 15:09:15 +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
|
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
|
aef4bfaf4f
|
update structure DB, fixturesDB and fix test
|
2018-09-06 10:42:43 +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 |
|
Bernat
|
b2317491f5
|
update fixtures tickets alias and fix test
|
2018-09-04 09:50:39 +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 |
|
Joan Sanchez
|
f3fc211dfa
|
removed unused routes, filter and crud routes #409
|
2018-08-31 07:53:38 +02:00 |
|
Javi Gallego
|
c4e0fc74a3
|
Bug #452 quitamos servicio production
|
2018-08-30 11:02:50 +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
|
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 |
|
Carlos Jimenez
|
0ca8d1a2ad
|
#544 /ticket/getTotalVolume.js Backend unit tests
|
2018-08-21 09:35:14 +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
|
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 |
|
Joan Sanchez
|
a60720d1ed
|
Ticket packaging refactor + front test updated
|
2018-08-17 14:53:25 +02:00 |
|
Carlos Jimenez
|
8706f5c6c0
|
#531 moveToTicket.js Backend unit tests
|
2018-08-17 13:23:07 +02:00 |
|
Carlos Jimenez
|
8ccab773c0
|
corrected a problem where dynamic dates were giving false test failures
|
2018-08-17 09:56:50 +02:00 |
|
Joan Sanchez
|
4fff408e68
|
back test priceDifference
|
2018-08-17 08:41:30 +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
|
0c3072fb13
|
#536 updatePrice.js backend unit test
|
2018-08-14 12:48:12 +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
|
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
|
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 |
|
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 |
|
gerard
|
93810c381b
|
translations added
|
2018-08-07 16:10:10 +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
|
a44719c1ec
|
#552 account.js backend unit tests
|
2018-08-07 12:17:34 +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 |
|
Carlos Jimenez
|
084896c69a
|
#524 backend clone.js unit tests
|
2018-08-06 12:00:29 +02:00 |
|
Carlos Jimenez
|
1d4de8c3bd
|
added selectors for #459 e2e lineas de ticket
|
2018-08-03 12:02:04 +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 |
|
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 |
|
Joan Sanchez
|
4103f7fcf6
|
Added sample create #440
|
2018-07-31 11:08:22 +02:00 |
|
Bernat
|
1ec3777f4a
|
update fixtures and fix test
|
2018-07-30 15:21:12 +02:00 |
|
gerard
|
97cbb4fb25
|
Iban validation for french clients desactivated
|
2018-07-27 15:13:01 +02:00 |
|
Joan Sanchez
|
2433d7684d
|
Change page title #426
|
2018-07-25 15:14:03 +02:00 |
|
gerard
|
a7ec730216
|
bug with barcodes solved
|
2018-07-24 12:56:07 +02:00 |
|
Joan Sanchez
|
bea6378f6a
|
Change shipment date on landed data selection. #410
|
2018-07-24 12:14:35 +02:00 |
|
gerard
|
7e62f2afa7
|
excluded french TIN test as it has been disabled
|
2018-07-24 11:36:07 +02:00 |
|
gerard
|
3dfa4bfc04
|
Bug #425 Split no funciona en produccion
|
2018-07-24 11:27:04 +02:00 |
|
Joan Sanchez
|
896c033594
|
added order catalogue #408
|
2018-07-24 09:35:23 +02:00 |
|
Bernat
|
78f3376c20
|
export production structure DB to local
|
2018-07-24 07:34:14 +02:00 |
|
gerard
|
72d9212262
|
Bug #422 refactorizar el summary de item y añadir el visible y avaible
|
2018-07-23 09:58:07 +02:00 |
|
gerard
|
51e96d0bbf
|
Tarea #417 quitar de item.clone la foto
|
2018-07-18 14:34:45 +02:00 |
|
Joan Sanchez
|
ebf38e225e
|
Deleted unused filter methods, fixed summary css
|
2018-07-18 13:18:40 +02:00 |
|
gerard
|
1542e38746
|
quitada la validacion del dni frances
|
2018-07-18 09:49:04 +02:00 |
|
Joan Sanchez
|
291c00e2da
|
Show address city & province on ticket summary #414
|
2018-07-18 09:23:51 +02:00 |
|
Javi Gallego
|
56344ac301
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-17 13:11:20 +02:00 |
|
Joan Sanchez
|
ef71f5c7cf
|
item & ticket crud-refactor #372
|
2018-07-17 08:44:31 +02:00 |