super_good-solidus_taxjar 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84ac328950ff3ed0fc1356c29580c91645e7df28
-  data.tar.gz: 8147769f9ec1d1200a3ccedda9f5f8eeaa5b49d9
+  metadata.gz: 802c6668a1ea106f680f6c0fcffa87ae3ab118c4
+  data.tar.gz: 46c432958f8131ea6625187a645ce8e3bcf3fb5c
 SHA512:
-  metadata.gz: cbb8c135412d4ecc4ff7ecfa5381db365374e0230de52e6661220ac8e61e6dd949bc66538110939eb1c8d8d01c902b1895f965f285e97bfb46fe5d5c7f0746ce
-  data.tar.gz: fccfe6065ee953781850628dc88f6548765b599928cfe10abda480515683649b5c8b450b3fbdebcf9c4911e3c62fc24acb0c985109bdad3ded2aeee3c3980f47
+  metadata.gz: b06a684114911d7c4b166cd62790e7bc4bb0af0778252453367e90210aa9c7c84b4306c358a7fa530af88601de9ccb3a335f4502b26e16060fb26960cfe0314f
+  data.tar.gz: 4a88564733603bc1d7d8d7e8be69f77c80bbb27e57f33ea8dca476862d3c4203020d6c24c30acae443756cbf5dc0ec6d8f95bb4d01a6d4daeae27598c16b8143

data/lib/super_good/solidus_taxjar/api.rb

@@ -26,10 +26,6 @@ module SuperGood
         )
       end
 
-      private
-
-      attr_reader :taxjar_client
-
       def order_params(order)
         tax_address = order.tax_address
 
@@ -47,12 +43,20 @@ module SuperGood
               id: line_item.id,
               quantity: line_item.quantity,
               unit_price: line_item.price,
-              discount: -line_item.promo_total,
+              discount: discount(line_item),
               product_tax_code: line_item.tax_category&.tax_code
             }
           end
         }
       end
+
+      private
+
+      attr_reader :taxjar_client
+
+      def discount(line_item)
+        ::SuperGood::SolidusTaxJar.discount_calculator.new(line_item).discount
+      end
     end
   end
 end

data/lib/super_good/solidus_taxjar/discount_calculator.rb

@@ -0,0 +1,17 @@
+module SuperGood
+  module SolidusTaxJar
+    class DiscountCalculator
+      def initialize(line_item)
+        @line_item = line_item
+      end
+
+      def discount
+        -line_item.promo_total
+      end
+
+      private
+
+      attr_reader :line_item
+    end
+  end
+end

data/lib/super_good/solidus_taxjar/tax_calculator.rb

@@ -16,6 +16,7 @@ module SuperGood
       end
 
       def calculate
+        return no_tax if SuperGood::SolidusTaxJar.test_mode
         return no_tax if order.tax_address.empty? || order.line_items.none?
 
         cache do
@@ -120,27 +121,13 @@ module SuperGood
       end
 
       def cache_key
-        tax_address = order.tax_address
-
-        {
-          to_country: tax_address.country.iso,
-          to_zip: tax_address.zipcode,
-          to_city: tax_address.city,
-          to_state: tax_address&.state&.abbr || tax_address.state_name,
-          to_street: tax_address.address1,
-
-          shipping: order.shipment_total,
-
-          line_items: order.line_items.map do |line_item|
-            {
-              id: line_item.id,
-              quantity: line_item.quantity,
-              unit_price: line_item.price,
-              discount: -line_item.adjustment_total,
-              product_tax_code: line_item.tax_category&.tax_code
-            }
-          end.hash
-        }
+        api.order_params(order).transform_values do |value|
+          case value
+          when Array, Hash then value.hash
+          else
+            value
+          end
+        end
       end
     end
   end

data/lib/super_good/solidus_taxjar/version.rb

@@ -1,5 +1,5 @@
 module SuperGood
   module SolidusTaxJar
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/super_good/solidus_taxjar.rb

@@ -2,11 +2,19 @@ require 'solidus_core'
 require 'solidus_support'
 require 'taxjar'
 
+require "super_good/solidus_taxjar/version"
+require "super_good/solidus_taxjar/api"
+require "super_good/solidus_taxjar/tax_calculator"
+require "super_good/solidus_taxjar/discount_calculator"
+
 module SuperGood
   module SolidusTaxJar
+    class << self
+      attr_accessor :discount_calculator
+      attr_accessor :test_mode
+    end
+
+    self.discount_calculator = ::SuperGood::SolidusTaxJar::DiscountCalculator
+    self.test_mode = false
   end
 end
-
-require "super_good/solidus_taxjar/version"
-require "super_good/solidus_taxjar/api"
-require "super_good/solidus_taxjar/tax_calculator"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: super_good-solidus_taxjar
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jared Norman
@@ -169,6 +169,7 @@ files:
 - bin/setup
 - lib/super_good/solidus_taxjar.rb
 - lib/super_good/solidus_taxjar/api.rb
+- lib/super_good/solidus_taxjar/discount_calculator.rb
 - lib/super_good/solidus_taxjar/tax_calculator.rb
 - lib/super_good/solidus_taxjar/version.rb
 - super_good-solidus_taxjar.gemspec