remove conflict data

app/controllers/origami/home_controller.rb

@@ -62,6 +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
           if booking.booking_orders.empty?
             @booking = booking
           else
@@ -84,15 +85,22 @@ 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
                 end
-                accounts = @customer.tax_profiles
-                puts accounts.to_json
-                puts "sssssssssss"
-                puts @customer.tax_profiles
-                @account_arr =[]
-                accounts.each do |acc|
-                  account = TaxProfile.find(acc)
-                  @account_arr.push(account)
+                @account_arr = Array.new
+                if @customer.tax_profiles
+                  accounts = @customer.tax_profiles
+                  puts accounts.to_json
+                  puts "sssssssssss"
+                  puts @customer.tax_profiles
+                  @account_arr =[]
+                  accounts.each do |acc|
+                    account = TaxProfile.find(acc)
+                    @account_arr.push(account)
+                  end
                 end
               end
             end