Phyo 0138ae2efa Fix Conflict

2017-08-16 18:38:41 +06:30

..

accounts_controller.rb

update authorize

2017-06-23 09:41:48 +06:30

cashier_terminals_controller.rb

update authorize

2017-06-23 09:41:48 +06:30

dining_charges_controller.rb

CalculatePriceInDiningCharges

2017-08-16 10:46:03 +06:30

employees_controller.rb

…

lookups_controller.rb

update lookup

2017-07-31 17:33:06 +06:30

membership_actions_controller.rb

update authorize

2017-06-23 09:41:48 +06:30

membership_settings_controller.rb

update control member for osaka

2017-07-12 19:43:56 +06:30

menu_categories_controller.rb

update authorize

2017-06-23 09:41:48 +06:30

menu_item_attributes_controller.rb

update authorize

2017-06-23 09:41:48 +06:30

menu_item_instances_controller.rb

update authorize

2017-06-23 09:41:48 +06:30

menu_item_options_controller.rb

update authorize

2017-06-23 09:41:48 +06:30

menus_controller.rb

update authorize

2017-06-23 09:41:48 +06:30

order_queue_stations_controller.rb

OQS bug fix

2017-07-02 15:26:52 +06:30

payment_method_settings_controller.rb

update authorize

2017-06-23 09:41:48 +06:30

processing_items_controller.rb

…

products_controller.rb

CRUDforProducts

2017-08-16 18:19:20 +06:30

promotions_controller.rb

Promotion CRUD

2017-08-16 18:36:23 +06:30

rooms_controller.rb

…

set_menu_items_controller.rb

…

simple_menu_items_controller.rb

…

tables_controller.rb

…

tax_profiles_controller.rb

update authorize

2017-06-23 09:41:48 +06:30

zones_controller.rb

update authorize

2017-06-23 09:41:48 +06:30