Nweni 417d64ecae fixed conflict after merch dev for current shop

2019-12-02 19:30:24 +06:30

..

loader_service

add loader service api

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

order_reserve

fixed conflict after merch dev for current shop

2019-12-02 19:30:24 +06:30

payment

fixed conflict after merch dev for current shop

2019-12-02 19:30:24 +06:30

restaurant

card payment

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

api_controller.rb

fixed conflict after merch dev for current shop

2019-12-02 19:30:24 +06:30

authenticate_controller.rb

Verify

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

bill_controller.rb

fixed conflict after merch dev for current shop

2019-12-02 19:30:24 +06:30

bookings_controller.rb

…

call_waiters_controller.rb

fixed conflict after merch dev for current shop

2019-12-02 19:30:24 +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 after merch dev for current shop

2019-12-02 19:30:24 +06:30

payments_controller.rb

order from app

2019-11-28 15:52:50 +06:30

sale_items_controller.rb

…

shifts_controller.rb

…

shops_controller.rb

customer create

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

sound_effect_controller.rb

Single database for multiple shops

2019-12-02 17:19:28 +06:30

survey_controller.rb

fixed conflict after merge with dev

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

sync_controller.rb

…

verifications_controller.rb

card payment

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

void_controller.rb

request bill error on promotion. fix for compute sale's totals on promotion.

2019-11-08 20:35:26 +06:30