phyusin a17a240a2e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

2018-02-28 10:07:17 +06:30

..

api

…

concerns

nothing change

2018-02-27 15:34:58 +06:30

crm

…

inventory

…

oqs

remove conflict data

2018-02-27 14:35:21 +06:30

origami

remove conflict data

2018-02-27 14:35:21 +06:30

reports

remove conflict data

2018-02-27 14:35:21 +06:30

settings

…

transactions

…

application_controller.rb

check shop detail

2018-02-27 17:24:56 +06:30

base_controller.rb

…

base_crm_controller.rb

license and local move to base action and update other base

2018-02-27 11:41:24 +06:30

base_inventory_controller.rb

license and local move to base action and update other base

2018-02-27 11:41:24 +06:30

base_oqs_controller.rb

license and local move to base action and update other base

2018-02-27 11:41:24 +06:30

base_origami_controller.rb

remove conflict data

2018-02-27 14:35:21 +06:30

base_report_controller.rb

remove conflict data

2018-02-27 14:35:21 +06:30

base_waiter_controller.rb

remove conflict data

2018-02-27 14:35:21 +06:30

home_controller.rb

remove conflict data

2018-02-27 14:35:21 +06:30

install_controller.rb

…

print_settings_controller.rb

…

sym_control_controller.rb

…