remove conflict

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