Aung Myo 9757c34a09 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service

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

..

api

conflict data

2018-02-06 18:12:59 +06:30

concerns

…

crm

…

inventory

update inventory hide and cancan update

2017-11-30 11:19:15 +06:30

oqs

remove conflict data in oqs/home_controller.rb

2018-02-09 10:20:43 +06:30

origami

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service

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

reports

…

settings

…

transactions

…

application_controller.rb

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service

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

base_controller.rb

…

base_crm_controller.rb

…

base_inventory_controller.rb

…

base_oqs_controller.rb

…

base_origami_controller.rb

update pull split bill

2018-02-09 14:31:34 +06:30

base_report_controller.rb

…

base_waiter_controller.rb

…

home_controller.rb

update shop.name

2018-02-09 14:58:08 +06:30

install_controller.rb

…

print_settings_controller.rb

…

sym_control_controller.rb

update license and sym_master

2018-02-13 15:12:09 +06:30