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

2018-02-27 11:09:40 +06:30

..

api

…

concerns

update token mismatch

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

crm

…

inventory

add shop detail info in inventory

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

oqs

change assigned item id to order item id

2018-02-26 10:01:35 +06:30

origami

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

2018-02-27 11:09:40 +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

update token mismatch

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

base_inventory_controller.rb

update token mismatch

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

base_oqs_controller.rb

update token mismatch

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

base_origami_controller.rb

update token mismatch

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

base_report_controller.rb

update token mismatch

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

base_waiter_controller.rb

update token mismatch

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

home_controller.rb

fixed conflic when pull master item remark

2018-02-26 17:02:46 +06:30

install_controller.rb

…

print_settings_controller.rb

update token mismatch

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

sym_control_controller.rb

…