rake

app/controllers/foodcourt/addorders_controller.rb

@@ -118,11 +118,11 @@ class Foodcourt::AddordersController < BaseFoodcourtController
        end
        items_arr.push(items)
      }
-    # begin
+
     if params[:order_source] == "quick_service" && params[:table_id].to_i == 0
-      customer_id = "CUS-000000000002" # for no customer id from mobile
+      customer_id = takeaway.customer_id # for no customer id from mobile
     else
-      customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
+      customer_id = params[:customer_id].present? ? params[:customer_id] : walkin.customer_id # for no customer id from mobile
     end
 
     @order = Order.new

app/controllers/foodcourt/dashboard_controller.rb

@@ -1,6 +1,6 @@
 class Foodcourt::DashboardController < BaseFoodcourtController
   def get_all_menu
-      @menus = Menu.includes(:menu_categories => {:menu_items => :menu_item_instances}).includes(:menu_categories => {:menu_items => :item_sets }).active.shop
+      @menus = Menu.includes(:menu_categories => {:menu_items => :menu_item_instances}).includes(:menu_categories => {:menu_items => :item_sets }).active
       @item_attributes = MenuItemAttribute.all.load
       @item_options = MenuItemOption.all.load
   end

app/controllers/settings/menus_controller.rb

@@ -5,7 +5,7 @@ class Settings::MenusController < ApplicationController
   # GET /settings/menus
   # GET /settings/menus.json
   def index
-     
+
     @settings_menus = Menu.all.page(params[:page]).per(10)
     respond_to do |format|
       format.html
@@ -31,7 +31,7 @@ class Settings::MenusController < ApplicationController
   # POST /settings/menus
   # POST /settings/menus.json
   def create
-     
+
     @settings_menu = Menu.new(settings_menu_params)
     @settings_menu.created_by = current_login_employee.name
     respond_to do |format|
@@ -75,7 +75,7 @@ class Settings::MenusController < ApplicationController
   end
 
   def export
-     
+
     @settings_menus = Menu.all.page(params[:page]).per(10)
     menu = Menu.find(params[:id])
 

app/views/layouts/_header.html.erb

@@ -25,9 +25,9 @@
                     <%if ShiftSale.current_open_shift(current_login_employee) %>
                         <%food_court = Lookup.find_by_lookup_type_and_value("food_court", "1")%>
                         <%if current_login_employee.role == "cashier" && food_court %>
-                            <a class="navbar-brand mbl_view" href="<%=foodcourt_food_court_path%>" style="margin-left: 20px;"> 
+                            <a class="navbar-brand mbl_view" href="<%=foodcourt_food_court_path%>" style="margin-left: 20px;">
                         <%else%>
-                            <a class="navbar-brand mbl_view" href="<%=origami_dashboard_path%>" style="margin-left: 20px;"> 
+                            <a class="navbar-brand mbl_view" href="<%=origami_dashboard_path%>" style="margin-left: 20px;">
                         <%end%>
                     <%else%>
                     <a class="navbar-brand mbl_view" href="" style="margin-left: 20px;">
@@ -161,15 +161,15 @@
                         </a>
                     </p>
                 </li>
-                <% end %>
-                <%food_court = Lookup.find_by_lookup_type_and_value("food_court", "1")%>
-                <% if food_court %>
-                <li>
-                    <p class="waves-effect waves-block p-l-30 m-b-5 close_cashier">
-                        <i class="material-icons font-7 logout_icon">close</i>
-                        <span class="font-15">Close Cashier</span>
-                    </p>
-                </li>
+                  <%food_court = Lookup.find_by_lookup_type_and_value("food_court", "1")%>
+                  <% if food_court %>
+                  <li>
+                      <p class="waves-effect waves-block p-l-30 m-b-5 close_cashier">
+                          <i class="material-icons font-7 logout_icon">close</i>
+                          <span class="font-15">Close Cashier</span>
+                      </p>
+                  </li>
+                  <% end %>
                 <% end %>
 
                 <li>

app/views/layouts/application.html.erb

@@ -39,7 +39,7 @@
     <%= render 'layouts/header' %>
     <section>
      <%food_court = Lookup.find_by_lookup_type_and_value("food_court", "1")%>
-     <% if food_court %>
+     <% if food_court && current_user.role=='cashier'%>
         <%= render 'layouts/foodcourt_left_sidebar' %>
       <% else %>
           <%= render 'layouts/left_sidebar' %>