Nweni 6fbf30c950 fixed conflict

2019-11-25 09:26:21 +06:30

..

loader_service

add loader service api

2019-11-13 13:34:11 +06:30

order_reserve

…

payment

shop code

2019-11-22 18:24:02 +06:30

restaurant

order

2019-11-19 18:15:25 +06:30

api_controller.rb

add loader service api

2019-11-13 13:34:11 +06:30

authenticate_controller.rb

shop code

2019-11-22 18:24:02 +06:30

bill_controller.rb

shop code

2019-11-22 18:24:02 +06:30

bookings_controller.rb

…

call_waiters_controller.rb

shop code

2019-11-22 18:24:02 +06:30

check_in_process_controller.rb

…

customers_controller.rb

…

discounts_controller.rb

…

invoices_controller.rb

…

memberships_controller.rb

…

move_controller.rb

…

orders_controller.rb

fixed conflict

2019-11-25 09:26:21 +06:30

payments_controller.rb

…

sale_items_controller.rb

…

shifts_controller.rb

…

shops_controller.rb

customer create

2019-11-19 09:16:55 +06:30

sound_effect_controller.rb

…

survey_controller.rb

shop code

2019-11-22 18:24:02 +06:30

sync_controller.rb

…

verifications_controller.rb

changes in verification

2019-11-22 18:03:41 +06:30

void_controller.rb

…