diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index ac2092b6..e49c82e7 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -58,7 +58,7 @@ class Origami::RoomsController < BaseOrigamiController
     @room.bookings.active.each do |booking|
          if booking.sale_id.nil? && booking.booking_status != 'moved'
            @order_items = Array.new
-           @assigned_order_items = Array.new
+           # @assigned_order_items = Array.new
            booking.booking_orders.each do |booking_order|
               order = Order.find(booking_order.order_id)
               @customer = order.customer
@@ -79,10 +79,10 @@ class Origami::RoomsController < BaseOrigamiController
                     item.set_menu_items = arr_instance_item_sets
                   end
                   @order_items.push(item)
-                  assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
-                  if !assigned_order_items.nil?
-                    @assigned_order_items.push({item.order_items_id => assigned_order_items.assigned_order_item_id})
-                  end
+                  # assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
+                  # if !assigned_order_items.nil?
+                  #   @assigned_order_items.push({item.order_items_id => assigned_order_items.assigned_order_item_id})
+                  # end
                 end
               end
            end
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 70c0e723..efec7698 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -277,39 +277,19 @@
                       sub_total = sub_total + (order_item.price * order_item.qty)
 
                   # unless order_item.price == 0 %>
-                    <% if !@assigned_order_items.nil? %>
-                      <% @assigned_order_items.each do |assigned_order_item| %>
-                        <% if assigned_order_item.include? (order_item.order_items_id) %>
-                         <tr class="edit_order" data-id='<%= assigned_order_item[order_item.order_items_id] %>'>
-                           <td><%= count %></td>
-                           <td class='item-name'>
-                            <%= order_item.item_name %>
-                            <% if !order_item.set_menu_items.nil?  
-                              order_item.set_menu_items.each do |item_instance| %> 
-                              <br><span class="font-13"><%= item_instance %></span> 
-                            <% end 
-                            end %>
-                            </td>
-                           <td class='item-attr'><%= order_item.qty %></td>
-                           <td class='item-attr'><%= order_item.qty*order_item.price %></td>
-                         </tr>
-                        <% end %>
-                      <% end %>
-                    <% else %>
-                        <tr>
-                           <td><%= count %></td>
-                           <td class='item-name'>
-                            <%= order_item.item_name %>
-                            <% if !order_item.set_menu_items.nil?  
-                              order_item.set_menu_items.each do |item_instance| %> 
-                              <br><span class="font-13"><%= item_instance %></span> 
-                            <% end 
-                            end %>
-                            </td>
-                           <td class='item-attr'><%= order_item.qty %></td>
-                           <td class='item-attr'><%= order_item.qty*order_item.price %></td>
-                         </tr>
-                    <% end %>
+                     <tr class="edit_order" data-id='<%= order_item.order_items_id %>'>
+                       <td><%= count %></td>
+                       <td class='item-name'>
+                        <%= order_item.item_name %>
+                        <% if !order_item.set_menu_items.nil?  
+                          order_item.set_menu_items.each do |item_instance| %> 
+                          <br><span class="font-13"><%= item_instance %></span> 
+                        <% end 
+                        end %>
+                        </td>
+                       <td class='item-attr'><%= order_item.qty %></td>
+                       <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+                     </tr>
                  <%
 
                        # end
@@ -365,26 +345,7 @@
                   @order_items.each do |order_item |
                     count += 1
                   %>
-                   <% if !@assigned_order_items.nil? %>
-                      <% @assigned_order_items.each do |assigned_order_item| %>
-                        <% if assigned_order_item.include? (order_item.order_items_id) %>
-                        <tr class="edit_order" data-id='<%= assigned_order_item[order_item.order_items_id] %>'>
-                          <td><%= count %>
-                          <td class='item-name'>
-                            <%= order_item.item_name %>
-                            <% if !order_item.set_menu_items.nil?  
-                              order_item.set_menu_items.each do |item_instance| %> 
-                              <br><span class="font-13"><%= item_instance %></span> 
-                            <% end 
-                            end %>
-                          </td>
-                          <td class='item-attr'><%= order_item.qty %></td>
-                          <td class='item-attr'><%= order_item.qty*order_item.price %></td>
-                        </tr>
-                      <% end %>
-                    <% end %>
-                  <% else %>
-                    <tr>
+                    <tr class="edit_order" data-id='<%= order_item.order_items_id %>'>
                       <td><%= count %>
                       <td class='item-name'>
                         <%= order_item.item_name %>
@@ -397,7 +358,6 @@
                       <td class='item-attr'><%= order_item.qty %></td>
                       <td class='item-attr'><%= order_item.qty*order_item.price %></td>
                     </tr>
-                  <% end %>
 
                   <%
                    end