diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 52ebdd2c..ea2e6662 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -3,12 +3,15 @@ class Oqs::EditController < BaseOqsController
   	assigned_item_id = params[:id]
     @link_type = params[:type]
     @dining_type = nil
-    if params[:type] != 'oqs'
+    if params[:type] == 'oqs'
+      assigned_item = AssignedOrderItem.find(assigned_item_id)
+      @order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_instance_code='#{ assigned_item.instance_code }'")
+    else
+      assigned_item = OrderItem.find(assigned_item_id)
       dining = DiningFacility.find_by_id(params[:type])
       @dining_type = dining.type
+      @order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_instance_code='#{ assigned_item.item_instance_code }'")
     end
-    assigned_item = AssignedOrderItem.find(assigned_item_id)
-    @order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_instance_code='#{ assigned_item.instance_code }'");    
   end
 
   def update
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index eedbfdfc..c33a02fa 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -62,7 +62,7 @@ class Origami::HomeController < BaseOrigamiController
     @dining.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
           if booking.booking_orders.empty?
             @booking = booking
           else
@@ -85,10 +85,10 @@ class Origami::HomeController < 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
                 accounts = @customer.tax_profiles
                 puts accounts.to_json
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index d50d5182..19223467 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -288,26 +288,7 @@
                                   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>
+                                    <tr class="edit_order" data-id='<%= order_item.order_items_id %>'>
                                       <td><%= count %></td>
                                       <td class='item-name'>
                                         <%= order_item.item_name %>
@@ -320,7 +301,6 @@
                                       <td class='item-attr'><%= order_item.qty %></td>
                                       <td class='item-attr'><%= order_item.qty*order_item.price %></td>
                                     </tr>
-                                  <% end %>
                               <%
 
                                 # end
@@ -387,40 +367,19 @@
                           @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>
-                                <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 %>
-
+                          <tr class="edit_order" data-id='<%= 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
                         %>