super_good-solidus_taxjar 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76b48f5239948da1f17684991f5c22f66f2f4326
-  data.tar.gz: 3ea032a3d4659ed75142bf9eb338da2985309164
+  metadata.gz: 4fabc8235afd3cc52046d35cf5d88ec0cd17d8e7
+  data.tar.gz: 52067151ebe53c704c9e9afb168919a2438f064c
 SHA512:
-  metadata.gz: 554d571ac1eaf53f17cbb903ae3fd25efa2942dc23d77e9f6d07cdf18f637249732d73e0d5c859d614408eefd820a1d2f6bbd7aaebc4c4e99772ce612ce9ef8b
-  data.tar.gz: 6b72b4a99f1c7f68955ff07c8c45f1061209dd11e0300e322bd8101162a5fa240074a0e0f292824c68ce665f51e39da664d43cdc2c9544ca60540bc6c34b1b43
+  metadata.gz: 9df52cfcec3b89302cf1b652172a7fa9f3545554d6ddb448f4a901dd681cdc0a15b8a710027e620078a9c2620ffe6bfee52b059a5cdb719b85e8a53579e3750d
+  data.tar.gz: 7d33b0dd569cde3c71e8b0bc390d406a6ba7c04200f206b45ab531f6ed5fae8a6e825c2cf0876887243197ca3b9b39589efa7d684721b9d5136f47362326c4ba

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.6.0
+
+- Added `SuperGood::SolidusTaxJar.shipping_tax_label_maker` for customizing the labels on the tax adjustments on shipments.
+- Added `SuperGood::SolidusTaxJar.line_item_tax_label_maker` for customizing the labels on the line iteme tax adjustments.
+
 ## v0.5.0
 
 - Moved exception handler configuration to `SuperGood::SolidusTaxJar.exception_handler` from `SuperGood::SolidusTaxJar::TaxCalculator.exception_handler`. Now all the configuration options are in the same place.

data/lib/super_good/solidus_taxjar.rb

@@ -15,6 +15,8 @@ module SuperGood
       attr_accessor :test_mode
       attr_accessor :exception_handler
       attr_accessor :taxable_address_check
+      attr_accessor :shipping_tax_label_maker
+      attr_accessor :line_item_tax_label_maker
     end
 
     self.discount_calculator = ::SuperGood::SolidusTaxJar::DiscountCalculator
@@ -23,5 +25,7 @@ module SuperGood
       Rails.logger.error "An error occurred while fetching TaxJar tax rates - #{e}: #{e.message}"
     }
     self.taxable_address_check = ->(address) { true }
+    self.shipping_tax_label_maker = ->(shipment, shipping_tax) { "Sales Tax" }
+    self.line_item_tax_label_maker = ->(taxjar_line_item, spree_line_item) { "Sales Tax" }
   end
 end

data/lib/super_good/solidus_taxjar/tax_calculator.rb

@@ -35,12 +35,18 @@ module SuperGood
 
       def line_item_taxes
         @line_item_taxes ||=
-          taxjar_breakdown.line_items.map do |line_item|
+          taxjar_breakdown.line_items.map do |taxjar_line_item|
+            spree_line_item_id = taxjar_line_item.id.to_i
+
+            # Searching in memory because this association is loaded and most
+            # orders aren't going to have a huge number of line items.
+            spree_line_item = order.line_items.find { |li| li.id == spree_line_item_id }
+
             Spree::Tax::ItemTax.new(
-              item_id: line_item.id.to_i,
-              label: "Sales Tax",
+              item_id: spree_line_item_id,
+              label: line_item_tax_label(taxjar_line_item, spree_line_item),
               tax_rate: tax_rate,
-              amount: line_item.tax_collectable,
+              amount: taxjar_line_item.tax_collectable,
               included_in_price: false
             )
           end
@@ -67,7 +73,7 @@ module SuperGood
 
               tax_items << ::Spree::Tax::ItemTax.new(
                 item_id: shipment.id,
-                label: "Sales Tax",
+                label: shipping_tax_label(shipment, shipping_tax),
                 tax_rate: tax_rate,
                 amount: shipping_tax,
                 included_in_price: false
@@ -76,7 +82,7 @@ module SuperGood
 
             tax_items << ::Spree::Tax::ItemTax.new(
               item_id: shipments.last.id,
-              label: "Sales Tax",
+              label: shipping_tax_label(shipments.last, remaining_tax),
               tax_rate: tax_rate,
               amount: remaining_tax,
               included_in_price: false
@@ -133,6 +139,17 @@ module SuperGood
       def taxable_address?(address)
         SuperGood::SolidusTaxJar.taxable_address_check.(address)
       end
+
+      def shipping_tax_label(shipment, shipping_tax)
+        SuperGood::SolidusTaxJar.shipping_tax_label_maker.(
+          shipment,
+          shipping_tax
+        )
+      end
+
+      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
     end
   end
 end

data/lib/super_good/solidus_taxjar/version.rb

@@ -1,5 +1,5 @@
 module SuperGood
   module SolidusTaxJar
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super_good-solidus_taxjar
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jared Norman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-05 00:00:00.000000000 Z
+date: 2019-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core