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.

Add currency preference to TieredFlatRate calculator (#14545)

Damian Legawiecae1689605575
diff --git a/spree/core/app/models/spree/calculator/tiered_flat_rate.rb b/spree/core/app/models/spree/calculator/tiered_flat_rate.rb
index c4de9a1173..761b393a60 100644
--- a/spree/core/app/models/spree/calculator/tiered_flat_rate.rb
+++ b/spree/core/app/models/spree/calculator/tiered_flat_rate.rb
@@ -3,6 +3,7 @@ require_dependency 'spree/calculator'
module Spree
class Calculator::TieredFlatRate < Calculator
preference :base_amount, :decimal, default: 0
+ preference :currency, :string, default: -> { Spree::Store.default.default_currency }
preference :tiers, :hash, default: {}
before_validation do
@@ -18,7 +19,10 @@ module Spree
Spree.t(:tiered_flat_rate)
end
- def compute(object)
+ def compute(object = nil)
+ return 0 unless object&.currency.present?
+ return 0 unless preferred_currency.casecmp(object.currency.upcase).zero?
+
base, amount = preferred_tiers.sort.reverse.detect { |b, _| object.amount >= b }
amount || preferred_base_amount
end
diff --git a/spree/core/config/locales/en.yml b/spree/core/config/locales/en.yml
index d310cfe0e1..ee65c21d71 100644
--- a/spree/core/config/locales/en.yml
+++ b/spree/core/config/locales/en.yml
@@ -29,6 +29,7 @@ en:
zipcode: Zip Code
spree/calculator/tiered_flat_rate:
preferred_base_amount: Base Amount
+ preferred_currency: Currency
preferred_tiers: Tiers
spree/calculator/tiered_percent:
preferred_base_percent: Base Percent
diff --git a/spree/core/spec/models/spree/calculator/tiered_flat_rate_spec.rb b/spree/core/spec/models/spree/calculator/tiered_flat_rate_spec.rb
index 170c176192..2520ee7e3b 100644
--- a/spree/core/spec/models/spree/calculator/tiered_flat_rate_spec.rb
+++ b/spree/core/spec/models/spree/calculator/tiered_flat_rate_spec.rb
@@ -28,10 +28,12 @@ describe Spree::Calculator::TieredFlatRate, type: :model do
before do
calculator.preferred_base_amount = 10
+ calculator.preferred_currency = 'USD'
calculator.preferred_tiers = {
100 => 15,
200 => 20
}
+ allow(line_item).to receive_messages(currency: 'USD')
end
context 'when amount falls within the first tier' do
@@ -45,5 +47,37 @@ describe Spree::Calculator::TieredFlatRate, type: :model do
it { is_expected.to eq 15 }
end
+
+ context 'when currency does not match' do
+ before do
+ calculator.preferred_currency = 'GBP'
+ allow(line_item).to receive_messages(amount: 150)
+ end
+
+ it { is_expected.to eq 0 }
+ end
+
+ context 'when currency is blank' do
+ before do
+ calculator.preferred_currency = ''
+ allow(line_item).to receive_messages(amount: 150)
+ end
+
+ it { is_expected.to eq 0 }
+ end
+
+ context 'when object currency is nil' do
+ before do
+ allow(line_item).to receive_messages(amount: 150, currency: nil)
+ end
+
+ it { is_expected.to eq 0 }
+ end
+
+ context 'when there is no object' do
+ subject { calculator.compute }
+
+ it { is_expected.to eq 0 }
+ end
end
end