From 51664da16944e49ea8cac224b273ec438be872ff Mon Sep 17 00:00:00 2001 From: phyusin Date: Mon, 23 Jul 2018 11:16:45 +0630 Subject: [PATCH] check tax profile for move --- app/controllers/origami/moveroom_controller.rb | 8 +++++--- app/controllers/origami/movetable_controller.rb | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/controllers/origami/moveroom_controller.rb b/app/controllers/origami/moveroom_controller.rb index f3c45594..8626b372 100755 --- a/app/controllers/origami/moveroom_controller.rb +++ b/app/controllers/origami/moveroom_controller.rb @@ -30,8 +30,10 @@ class Origami::MoveroomController < BaseOrigamiController accounts = @customer.tax_profiles @account_arr =[] accounts.each do |acc| - account = TaxProfile.find(acc) - @account_arr.push(account) + account = TaxProfile.find_by_id(acc) + if !account.nil? + @account_arr.push(account) + end end end @status_order = 'order' @@ -50,7 +52,7 @@ class Origami::MoveroomController < BaseOrigamiController # accounts = @customer.tax_profiles # @account_arr =[] # accounts.each do |acc| - # account = TaxProfile.find(acc) + # account = TaxProfile.find_by_id(acc) # @account_arr.push(account) # end # end diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb index 41b09c93..fd9a819e 100755 --- a/app/controllers/origami/movetable_controller.rb +++ b/app/controllers/origami/movetable_controller.rb @@ -36,8 +36,10 @@ class Origami::MovetableController < BaseOrigamiController accounts = @customer.tax_profiles @account_arr =[] accounts.each do |acc| - account = TaxProfile.find(acc) - @account_arr.push(account) + account = TaxProfile.find_by_id(acc) + if !account.nil? + @account_arr.push(account) + end end end end @@ -57,7 +59,7 @@ class Origami::MovetableController < BaseOrigamiController # accounts = @customer.tax_profiles # @account_arr =[] # accounts.each do |acc| - # account = TaxProfile.find(acc) + # account = TaxProfile.find_by_id(acc) # @account_arr.push(account) # end # end