Merge pull request #13 from SuperGoodSoft/feature/order-matters

Taxable Order Check

1 files changed, 5 insertions, 0 deletions

diff --git a/lib/super_good/solidus_taxjar/tax_calculator.rb b/lib/super_good/solidus_taxjar/tax_calculator.rb
index 0ddd50f..c7d44a9 100644
--- a/lib/super_good/solidus_taxjar/tax_calculator.rb
+++ b/lib/super_good/solidus_taxjar/tax_calculator.rb
@@ -13,6 +13,7 @@ module SuperGood
       def calculate
         return no_tax if SuperGood::SolidusTaxJar.test_mode
         return no_tax if incomplete_address?(order.tax_address) || order.line_items.none?
+        return no_tax unless taxable_order? order
         return no_tax unless taxable_address? order.tax_address
 
         cache do
@@ -133,6 +134,10 @@ module SuperGood
         SuperGood::SolidusTaxJar.exception_handler
       end
 
+      def taxable_order?(order)
+        SuperGood::SolidusTaxJar.taxable_order_check.(order)
+      end
+
       def taxable_address?(address)
         SuperGood::SolidusTaxJar.taxable_address_check.(address)
       end