current shop changes

2019-11-28 18:33:56 +06:30
parent d41d957688
commit 3a85f1e319
9 changed files with 59 additions and 46 deletions
--- a/app/controllers/origami/order_reservation_controller.rb
+++ b/app/controllers/origami/order_reservation_controller.rb
@@ -98,7 +98,7 @@ class Origami::OrderReservationController < BaseOrigamiController
  end

  def get_order_info
-    order_reservation = OrderReservation.where("status = 'new' and shop_code='#{@shop.shop_code}'").count()
+    order_reservation = OrderReservation.where("status = 'new' and shop_code='#{current_shop.shop_code}'").count()
    render :json => order_reservation
  end