From b31fa3208a08f39a161f76437b968aebb93f9d2d Mon Sep 17 00:00:00 2001 From: Jared Norman Date: Tue, 5 Feb 2019 11:51:39 -0800 Subject: Make shipping tax label configurable --- lib/super_good/solidus_taxjar.rb | 2 ++ lib/super_good/solidus_taxjar/tax_calculator.rb | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'lib/super_good') diff --git a/lib/super_good/solidus_taxjar.rb b/lib/super_good/solidus_taxjar.rb index 1ab40ec..9a32d9f 100644 --- a/lib/super_good/solidus_taxjar.rb +++ b/lib/super_good/solidus_taxjar.rb @@ -15,6 +15,7 @@ module SuperGood attr_accessor :test_mode attr_accessor :exception_handler attr_accessor :taxable_address_check + attr_accessor :shipping_tax_label_maker end self.discount_calculator = ::SuperGood::SolidusTaxJar::DiscountCalculator @@ -23,5 +24,6 @@ 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" } end end diff --git a/lib/super_good/solidus_taxjar/tax_calculator.rb b/lib/super_good/solidus_taxjar/tax_calculator.rb index d2b7b74..a2eb8ca 100644 --- a/lib/super_good/solidus_taxjar/tax_calculator.rb +++ b/lib/super_good/solidus_taxjar/tax_calculator.rb @@ -67,7 +67,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 +76,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 +133,13 @@ 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 end end end -- cgit v1.2.3