git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

current user shift order

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-07-31 08:58:56 +06:30
parent 10d95a727f
commit 9a17ab5d9b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/base_foodcourt_controller.rb
View File

@@ -1,5 +1,6 @@
class BaseFoodcourtController < ActionController::Base
include LoginVerification, MultiTenancy
include MultiTenancy
include LoginVerification
layout "foodcourt"
before_action :check_user

4
app/controllers/foodcourt/orders_controller.rb
View File

@@ -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')