summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJared Norman <jared@super.gd>2019-03-12 15:29:17 -0700
committerGitHub <noreply@github.com>2019-03-12 15:29:17 -0700
commitc4f94da7c5692a36b4e816d301370405fb497771 (patch)
tree25070d55736e58f1f650ce3974a301f83f77decf
parent9a83ec4cda37760aad82373dc422cadbb33eddfe (diff)
parentf8332269a25e7e8b84b2bfe9aa28f06cbf6a3141 (diff)
Merge pull request #1 from JuanCrg90/add-empty-check-method
Add incomplete_address? check method
-rw-r--r--lib/super_good/solidus_taxjar/tax_calculator.rb12
-rw-r--r--lib/super_good/solidus_taxjar/version.rb2
-rw-r--r--spec/super_good/solidus_taxjar/tax_calculator_spec.rb12
3 files changed, 24 insertions, 2 deletions
diff --git a/lib/super_good/solidus_taxjar/tax_calculator.rb b/lib/super_good/solidus_taxjar/tax_calculator.rb
index 5052814..327e248 100644
--- a/lib/super_good/solidus_taxjar/tax_calculator.rb
+++ b/lib/super_good/solidus_taxjar/tax_calculator.rb
@@ -12,7 +12,7 @@ module SuperGood
def calculate
return no_tax if SuperGood::SolidusTaxJar.test_mode
- return no_tax if order.tax_address.empty? || order.line_items.none?
+ return no_tax if incomplete_address?(order.tax_address) || order.line_items.none?
return no_tax unless taxable_address? order.tax_address
cache do
@@ -150,6 +150,16 @@ module SuperGood
def line_item_tax_label(taxjar_line_item, spree_line_item)
SuperGood::SolidusTaxJar.line_item_tax_label_maker.(taxjar_line_item, spree_line_item)
end
+
+ def incomplete_address?(tax_address)
+ [
+ tax_address.address1,
+ tax_address.city,
+ tax_address&.state&.abbr || tax_address.state_name,
+ tax_address.zipcode,
+ tax_address.country.iso
+ ].any?(&:blank?)
+ end
end
end
end
diff --git a/lib/super_good/solidus_taxjar/version.rb b/lib/super_good/solidus_taxjar/version.rb
index 3d780d9..ead2b37 100644
--- a/lib/super_good/solidus_taxjar/version.rb
+++ b/lib/super_good/solidus_taxjar/version.rb
@@ -1,5 +1,5 @@
module SuperGood
module SolidusTaxJar
- VERSION = "0.6.0"
+ VERSION = "0.6.1"
end
end
diff --git a/spec/super_good/solidus_taxjar/tax_calculator_spec.rb b/spec/super_good/solidus_taxjar/tax_calculator_spec.rb
index a13f564..0d390ec 100644
--- a/spec/super_good/solidus_taxjar/tax_calculator_spec.rb
+++ b/spec/super_good/solidus_taxjar/tax_calculator_spec.rb
@@ -78,6 +78,10 @@ RSpec.describe ::SuperGood::SolidusTaxJar::TaxCalculator do
let(:address) do
::Spree::Address.new(
first_name: "Ronnie James",
+ zipcode: "90210",
+ address1: "9900 Wilshire Blvd",
+ city: "Beverly Hills",
+ state_name: "California",
country: ::Spree::Country.new(iso: "US")
)
end
@@ -95,6 +99,10 @@ RSpec.describe ::SuperGood::SolidusTaxJar::TaxCalculator do
let(:address) do
::Spree::Address.new(
first_name: "Ronnie James",
+ zipcode: "90210",
+ address1: "9900 Wilshire Blvd",
+ city: "Beverly Hills",
+ state_name: "California",
country: ::Spree::Country.new(iso: "US")
)
end
@@ -123,6 +131,10 @@ RSpec.describe ::SuperGood::SolidusTaxJar::TaxCalculator do
let(:address) do
::Spree::Address.new(
first_name: "Ronnie James",
+ zipcode: "90210",
+ address1: "9900 Wilshire Blvd",
+ city: "Beverly Hills",
+ state_name: "California",
country: ::Spree::Country.new(iso: "US")
)
end