phyusin c14960fc96 remove conflict data

2018-04-25 15:10:10 +06:30

..

order_reserve

remove conflict data

2018-04-25 15:10:10 +06:30

restaurant

remove skip auth from api and check user modified

2018-04-09 09:58:22 +06:30

api_controller.rb

api cloud update

2018-04-23 16:23:00 +06:30

authenticate_controller.rb

update limit tablet autorized

2018-01-10 17:59:20 +06:30

bill_controller.rb

update cable for cloud

2018-04-25 13:18:54 +06:30

bookings_controller.rb

update api authenticate

2018-04-09 10:53:16 +06:30

call_waiters_controller.rb

update cable for cloud

2018-04-25 13:18:54 +06:30

check_in_process_controller.rb

check time

2018-04-09 16:23:16 +06:30

customers_controller.rb

…

discounts_controller.rb

…

invoices_controller.rb

…

memberships_controller.rb

…

move_controller.rb

…

orders_controller.rb

update api authenticate

2018-04-09 10:53:16 +06:30

payments_controller.rb

check payment method

2018-03-30 15:24:51 +06:30

sale_items_controller.rb

…

survey_controller.rb

Pull From Master

2018-04-06 13:42:11 +06:30