phyusin f73f7cd965 Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill

2018-02-23 15:29:36 +06:30

..

api

upsate

2018-02-20 14:15:01 +06:30

concerns

license update for token

2018-02-21 16:30:14 +06:30

crm

…

inventory

add shop detail info in inventory

2018-02-23 15:29:22 +06:30

oqs

check oqs edit in origami

2018-02-22 19:18:24 +06:30

origami

update conflic for pull master

2018-02-23 14:58:35 +06:30

reports

…

settings

…

transactions

…

application_controller.rb

update conflic for pull master

2018-02-23 14:58:35 +06:30

base_controller.rb

…

base_crm_controller.rb

license update, base controllers extends app controller

2018-02-21 16:42:19 +06:30

base_inventory_controller.rb

license update, base controllers extends app controller

2018-02-21 16:42:19 +06:30

base_oqs_controller.rb

license update, base controllers extends app controller

2018-02-21 16:42:19 +06:30

base_origami_controller.rb

update conflic for pull master

2018-02-23 14:58:35 +06:30

base_report_controller.rb

license update, base controllers extends app controller

2018-02-21 16:42:19 +06:30

base_waiter_controller.rb

license update, base controllers extends app controller

2018-02-21 16:42:19 +06:30

home_controller.rb

update conflic for pull master

2018-02-23 14:58:35 +06:30

install_controller.rb

…

print_settings_controller.rb

…

sym_control_controller.rb

…