remove conflict data

2018-02-27 14:35:21 +06:30
parent 3e0943275f 4d556cff43
commit adefd8c034
49 changed files with 1989 additions and 363 deletions
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -90,14 +90,17 @@ class Origami::HomeController < BaseOrigamiController
                  #   @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