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.

Fix delivery range formatting for shipping methods (#12830)

Gabriel Zortéa Lovisona9f4983d8773
diff --git a/core/app/models/spree/shipping_method.rb b/core/app/models/spree/shipping_method.rb
index 42d29b5351..cfd002252e 100644
--- a/core/app/models/spree/shipping_method.rb
+++ b/core/app/models/spree/shipping_method.rb
@@ -93,7 +93,7 @@ module Spree
if estimated_transit_business_days_min == estimated_transit_business_days_max
estimated_transit_business_days_min.to_s
else
- "#{estimated_transit_business_days_min}-#{estimated_transit_business_days_max}"
+ [estimated_transit_business_days_min, estimated_transit_business_days_max].compact.join("-")
end
end
diff --git a/core/spec/models/spree/shipping_method_spec.rb b/core/spec/models/spree/shipping_method_spec.rb
index 1b4b832400..232eecf7cd 100644
--- a/core/spec/models/spree/shipping_method_spec.rb
+++ b/core/spec/models/spree/shipping_method_spec.rb
@@ -183,6 +183,20 @@ describe Spree::ShippingMethod, type: :model do
it { expect(shipping_method.delivery_range).to eq('1') }
end
+
+ context "when only one transit day value is set" do
+ context "when only minimum day is set" do
+ let(:shipping_method) { build(:shipping_method, estimated_transit_business_days_min: 1) }
+
+ it { expect(shipping_method.delivery_range).to eq('1') }
+ end
+
+ context "when only maximum day is set" do
+ let(:shipping_method) { build(:shipping_method, estimated_transit_business_days_max: 2) }
+
+ it { expect(shipping_method.delivery_range).to eq('2') }
+ end
+ end
end
describe '#display_estimated_price' do