Nweni d41d957688 fixed conflict after merge with dev

2019-11-28 16:47:12 +06:30

..

loader_service

…

order_reserve

fixed conflict after merge with dev

2019-11-28 16:47:12 +06:30

payment

…

restaurant

…

api_controller.rb

…

authenticate_controller.rb

Verify

2019-11-27 09:36:30 +06:30

bill_controller.rb

…

bookings_controller.rb

…

call_waiters_controller.rb

…

check_in_process_controller.rb

…

customers_controller.rb

…

discounts_controller.rb

…

invoices_controller.rb

…

memberships_controller.rb

UI change

2017-10-23 11:38:10 +06:30

move_controller.rb

…

orders_controller.rb

…

payments_controller.rb

…

sale_items_controller.rb

…

shifts_controller.rb

…

shops_controller.rb

…

sound_effect_controller.rb

…

survey_controller.rb

…

sync_controller.rb

…

verifications_controller.rb

card payment

2019-11-27 15:05:42 +06:30

void_controller.rb

…