From 9a17ab5d9b4e6e05bb9600060b39c46082e58b81 Mon Sep 17 00:00:00 2001 From: Thein Lin Kyaw Date: Fri, 31 Jul 2020 08:58:56 +0630 Subject: [PATCH] current user shift order --- app/controllers/base_foodcourt_controller.rb | 3 ++- app/controllers/foodcourt/orders_controller.rb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/base_foodcourt_controller.rb b/app/controllers/base_foodcourt_controller.rb index 801f680d..6b356eb2 100644 --- a/app/controllers/base_foodcourt_controller.rb +++ b/app/controllers/base_foodcourt_controller.rb @@ -1,5 +1,6 @@ class BaseFoodcourtController < ActionController::Base - include LoginVerification, MultiTenancy + include MultiTenancy + include LoginVerification layout "foodcourt" before_action :check_user diff --git a/app/controllers/foodcourt/orders_controller.rb b/app/controllers/foodcourt/orders_controller.rb index b9fe6b77..14649a69 100755 --- a/app/controllers/foodcourt/orders_controller.rb +++ b/app/controllers/foodcourt/orders_controller.rb @@ -75,7 +75,7 @@ class Foodcourt::OrdersController < BaseFoodcourtController @status = "order" end end - @current_shift = ShiftSale.current_shift + @current_shift = current_user.current_shift || ShiftSale.current_shift status = ['completed', 'void'] @pending_sales = Sale.where('shift_sale_id = ? AND sale_status NOT IN (?)', @current_shift.id, status) @@ -86,7 +86,7 @@ class Foodcourt::OrdersController < BaseFoodcourtController end def current_shift_order_count - @current_shift = ShiftSale.current_shift + @current_shift = current_user.current_shift || ShiftSale.current_shift status = ['completed', 'void'] @pending_sales = Sale.where('shift_sale_id = ? AND sale_status NOT IN (?)', @current_shift.id, status) @pending_orders = Sale.pending_order('food_court')