From 40cd6aacc8d8573a33ac313896a812df18449239 Mon Sep 17 00:00:00 2001 From: NyanLinHtut Date: Wed, 18 Dec 2019 14:18:59 +0630 Subject: [PATCH] fixed second display --- app/controllers/foodcourt/food_court_controller.rb | 8 ++++++++ app/controllers/origami/food_court_controller.rb | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/app/controllers/foodcourt/food_court_controller.rb b/app/controllers/foodcourt/food_court_controller.rb index 13f72dc3..a955cf92 100644 --- a/app/controllers/foodcourt/food_court_controller.rb +++ b/app/controllers/foodcourt/food_court_controller.rb @@ -14,6 +14,14 @@ class Foodcourt::FoodCourtController < ApplicationController @menu = [] @cashier_type = "food_court" #checked quick_service only + + display_type = Lookup.find_by_lookup_type("display_type") + if !display_type.nil? && display_type.value.to_i ==2 + @display_type = display_type.value + else + @display_type = nil + end + @quick_service_only = true lookup_dine_in = Lookup.collection_of('dinein_cashier') if !lookup_dine_in.empty? diff --git a/app/controllers/origami/food_court_controller.rb b/app/controllers/origami/food_court_controller.rb index 16766001..29154eca 100644 --- a/app/controllers/origami/food_court_controller.rb +++ b/app/controllers/origami/food_court_controller.rb @@ -22,6 +22,14 @@ class Origami::FoodCourtController < ApplicationController @tables = Table.all.active.where("shop_code='#{@shop.shop_code}'").order('status desc') @rooms = Room.all.active.where("shop_code='#{@shop.shop_code}'").order('status desc') @cashier_type = "food_court" + + display_type = Lookup.find_by_lookup_type("display_type") + if !display_type.nil? && display_type.value.to_i ==2 + @display_type = display_type.value + else + @display_type = nil + end + #checked quick_service only @quick_service_only = true lookup_dine_in = Lookup.where("shop_code='#{@shop.shop_code}'").collection_of('dinein_cashier')