Gerard
|
31fa66e052
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-10-16 13:18:32 +02:00 |
|
Gerard
|
aaa9a0a1be
|
Bug #635 item.data
|
2018-10-16 13:18:24 +02:00 |
 Joan Sanchez
|
3826456a5a
|
added bankEntity billing data #704
|
2018-10-16 13:06:58 +02:00 |
Bernat
|
f9f1ae8c70
|
new model claimRatio
|
2018-10-16 11:17:02 +02:00 |
|
Bernat
|
b6ac4ff900
|
add new model clientRisk
|
2018-10-16 08:36:25 +02:00 |
|
Gerard
|
a78ffbdaa5
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-10-15 13:20:18 +02:00 |
|
Joan Sanchez
|
1773af841b
|
hour fix
|
2018-10-15 11:48:03 +02:00 |
|
Joan Sanchez
|
589be52c6a
|
Order filter & added model getSetValues() #722
|
2018-10-15 11:43:57 +02:00 |
|
Gerard
|
5729f19a52
|
Bug #730 test
|
2018-10-15 11:33:23 +02:00 |
|
Gerard
|
f32f63f3c5
|
Bug #730 test
|
2018-10-15 11:29:17 +02:00 |
|
Gerard
|
7ed52d455d
|
Bug #730 order.catalog no añade lineas
|
2018-10-15 10:48:06 +02:00 |
Carlos Jimenez
|
3151bca0bd
|
#710 PROCEDURE vn.ticketComponentUpdateSale() unit test
|
2018-10-14 17:09:05 +02:00 |
|
Carlos Jimenez
|
b6ba23282c
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-10-14 17:07:13 +02:00 |
|
Gerard
|
a9d99fc16c
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-10-11 15:01:00 +02:00 |
|
Gerard
|
7f6a2bba79
|
xcluded test
|
2018-10-11 15:00:53 +02:00 |
|
Bernat
|
f80c9134e1
|
update acl
|
2018-10-11 11:01:58 +02:00 |
|
Bernat
|
1607a340d2
|
new model defaulter
|
2018-10-11 10:56:28 +02:00 |
|
Bernat
|
ba7a703ee7
|
update fixtures
|
2018-10-11 09:53:18 +02:00 |
|
Joan Sanchez
|
693a68ea26
|
vn-icon-button hide required acl buttons #708
|
2018-10-11 09:41:30 +02:00 |
 Javi Gallego
|
377edd4f71
|
merge locale
|
2018-10-11 09:17:19 +02:00 |
|
Javi Gallego
|
bf8ed25c06
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-10-11 09:15:14 +02:00 |
|
Javi Gallego
|
9beb4885a0
|
Test #691 los e2e ya no usan developer
|
2018-10-11 09:14:26 +02:00 |
|
Bernat
|
0d99b6926f
|
update acl
|
2018-10-11 08:09:30 +02:00 |
|
Bernat
|
ac1d9ddfcc
|
update structure db
|
2018-10-11 07:45:51 +02:00 |
|
Gerard
|
a016d4de31
|
Tarea #723 TESTS
|
2018-10-10 14:13:53 +02:00 |
|
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 |