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
|
bb46980f3f
|
focus deleted
|
2018-10-03 11:28:50 +02:00 |
|
Gerard
|
5eb83ed01e
|
Tarea #600 Refactor to make it compatible with logs
|
2018-10-03 11:27:55 +02:00 |
|
Gerard
|
a607ac9efb
|
Tarea #600 History section in client
|
2018-10-03 11:27:05 +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 |
 Joan Sanchez
|
98d035a961
|
upgraded packages
|
2018-10-03 09:16:00 +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 |
|
Joan Sanchez
|
374d845d4b
|
Descriptor/card/quicklinks fix #656
|
2018-10-03 08:00:19 +02:00 |
|
Carlos Jimenez
|
0537dad01d
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-10-02 16:41:50 +02:00 |
|
Gerard
|
1ea93211dc
|
typo with acl fixed
|
2018-10-02 14:16:37 +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 |