Yan 30df25d78a Merge branch 'master' into oqs

2017-06-23 19:22:07 +06:30

..

api

accounts and discount updated

2017-06-23 17:05:08 +06:30

concerns

…

crm

fix with merge

2017-06-23 19:20:00 +06:30

oqs

updating oqs

2017-06-23 19:01:33 +06:30

origami

fix with merge

2017-06-23 19:20:00 +06:30

reports

update report and customer

2017-06-22 13:35:20 +06:30

settings

fixed fonflict

2017-06-21 10:22:43 +06:30

transactions

update crm customer and bind customer and queue

2017-06-23 17:03:52 +06:30

application_controller.rb

update crm customer and bind customer and queue

2017-06-23 17:03:52 +06:30

base_controller.rb

…

base_crm_controller.rb

…

base_oqs_controller.rb

…

base_origami_controller.rb

…

base_report_controller.rb

daily sale report

2017-06-18 16:38:46 +06:30

base_waiter_controller.rb

…

home_controller.rb

…

install_controller.rb

…

print_settings_controller.rb

…