fixed conflict after merch dev for current shop

2019-12-02 19:30:24 +06:30
parent 6ad2f320df 937f40e7c1
commit 417d64ecae
92 changed files with 1611 additions and 350 deletions
--- a/app/controllers/origami/order_reservation_controller.rb
+++ b/app/controllers/origami/order_reservation_controller.rb
@@ -4,6 +4,8 @@ class Origami::OrderReservationController < BaseOrigamiController
  	@order = OrderReservation.latest_order #.active
    @count_on_order = OrderReservation.get_count_on_order
    @count_on_completed = OrderReservation.get_count_on_completed
+
+    @shop = Shop.current_shop
    @receipt_bill = check_receipt_bill
  end