remove conflict

app/controllers/origami/addorders_controller.rb

@@ -18,7 +18,12 @@ class Origami::AddordersController < BaseOrigamiController
     if check_mobile
       @webview = true  
     end
-
+    display_type = Lookup.find_by_lookup_type("display_type")
+     if !display_type.nil? && display_type.value==2
+        @display_type = display_type.value
+      else
+        @display_type = nil
+     end
    # if params[:menu] == "true"
      @menus    = []
      @menu     = []

app/controllers/origami/home_controller.rb

@@ -111,6 +111,19 @@ class Origami::HomeController < BaseOrigamiController
     if !lookup_spit_bill[0].nil?
       @split_bill = lookup_spit_bill[0][1]
     end
+
+    #for edit order open & close
+    @edit_order_origami = true
+    lookup_edit_order = Lookup.collection_of('edit_order')
+    if !lookup_edit_order.empty?
+      lookup_edit_order.each do |edit_order|
+        if edit_order[0].downcase == "editorderorigami" 
+          if edit_order[1] == '0' && (current_login_employee.role == 'cashier' || current_login_employee.role == 'waiter')
+            @edit_order_origami = false
+          end
+        end
+      end
+    end
   end
 
 def check_emp_access_code

app/controllers/origami/rooms_controller.rb

@@ -137,6 +137,19 @@ class Origami::RoomsController < BaseOrigamiController
     if !lookup_spit_bill[0].nil?
       @split_bill = lookup_spit_bill[0][1]
     end
+
+    #for edit order open & close
+    @edit_order_origami = true
+    lookup_edit_order = Lookup.collection_of('edit_order')
+    if !lookup_edit_order.empty?
+      lookup_edit_order.each do |edit_order|
+        if edit_order[0].downcase == "editorderorigami" 
+          if edit_order[1] == '0' && (current_login_employee.role == 'cashier' || current_login_employee.role == 'waiter')
+            @edit_order_origami = false
+          end
+        end
+      end
+    end
   end
 
 end

app/controllers/origami/second_display_controller.rb

@@ -8,24 +8,27 @@ class Origami::SecondDisplayController < BaseOrigamiController
   end
 
   def customer_view
-   if params[:status]!= "billed"
-     tax_profiles = TaxProfile.all.order("order_by asc")
-   else
-     tax_profiles = nil
-   end
-   if ENV["SERVER_MODE"] == 'cloud'
-        from = request.subdomain  + "." + request.domain
-      else 
-        from = ""
+    display_type = Lookup.find_by_lookup_type("display_type")
+     if !display_type.nil? && display_type.value==2
+         if params[:status]!= "billed"
+       tax_profiles = TaxProfile.all.order("order_by asc")
+     else
+       tax_profiles = nil
+     end
+     if ENV["SERVER_MODE"] == 'cloud'
+          from = request.subdomain  + "." + request.domain
+        else 
+          from = ""
+        end
+        ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status],from:from
       end
-      ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status],from:from
   # end
   end
   #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
+  # helper_method :shop_detail
+  # def shop_detail
+  #   @shop = Shop.first
+  # end
 
 
 end