Yan 6d0cfd17ac merge with origin master

2017-06-18 12:50:07 +06:30

..

api/origami

…

channels

…

crm

…

origami

…

settings

…

transactions

…

application.js

update search and crm

2017-06-14 00:09:54 +06:30

cable.js

update customer amount

2017-06-13 10:36:40 +06:30

CRM.js

assign queue and other bug

2017-06-18 00:03:09 +06:30

membership_actions.coffee

…

OQS.js

merge with origin master

2017-06-18 12:50:07 +06:30

origami.js

rescue member call and update oqs and js route bug

2017-06-18 03:20:19 +06:30

payment.js

Update

2017-06-14 10:07:31 +06:30

print_settings.coffee

…

report.js

update customer amount

2017-06-13 10:36:40 +06:30

transactions.js

update search

2017-06-14 00:11:03 +06:30