Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Added `TaxCategory#default` method

Damian Legawiecd28de70a483f
diff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rb
index edc2229de4..fcc5e42bdb 100644
--- a/core/app/models/spree/product.rb
+++ b/core/app/models/spree/product.rb
@@ -274,7 +274,7 @@ module Spree
# Returns tax category for Product
# @return [Spree::TaxCategory]
def tax_category
- @tax_category ||= super || TaxCategory.find_by(is_default: true)
+ @tax_category ||= super || TaxCategory.default
end
# Adding properties and option types on creation based on a chosen prototype
diff --git a/core/app/models/spree/tax_category.rb b/core/app/models/spree/tax_category.rb
index fe0afd56c5..0732969bdd 100644
--- a/core/app/models/spree/tax_category.rb
+++ b/core/app/models/spree/tax_category.rb
@@ -12,9 +12,17 @@ module Spree
has_many :variants, dependent: :nullify
before_save :set_default_category
+ after_update :delete_cache
+ after_create :delete_cache
self.whitelisted_ransackable_attributes = %w[name is_default tax_code]
+ def self.default
+ Rails.cache.fetch('default_tax_category') do
+ find_by(is_default: true)
+ end
+ end
+
def set_default_category
# set existing default tax category to false if this one has been marked as default
@@ -22,5 +30,11 @@ module Spree
tax_category.update_columns(is_default: false, updated_at: Time.current)
end
end
+
+ private
+
+ def delete_cache
+ Rails.cache.delete('default_tax_category')
+ end
end
end
diff --git a/core/spec/models/spree/tax_category_spec.rb b/core/spec/models/spree/tax_category_spec.rb
index 909bd2fe65..0bd726abd5 100644
--- a/core/spec/models/spree/tax_category_spec.rb
+++ b/core/spec/models/spree/tax_category_spec.rb
@@ -25,7 +25,14 @@ describe Spree::TaxCategory, type: :model do
end
end
- context '#destroy' do
+ describe '.default' do
+ it 'returns the default tax category' do
+ tax_category = create(:tax_category, is_default: true)
+ expect(Spree::TaxCategory.default).to eq(tax_category)
+ end
+ end
+
+ describe '#destroy' do
let!(:tax_category) { create(:tax_category) }
let!(:tax_rate) { create(:tax_rate, tax_category: tax_category) }
let!(:product) { create(:product, tax_category: tax_category) }