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.

Changed delivery method price labels to format percentages without view helpers (#14835)

Damian Legawiec901c2443f9ed
diff --git a/spree/core/app/models/spree/delivery_method.rb b/spree/core/app/models/spree/delivery_method.rb
index 8015108698..7f058061c8 100644
--- a/spree/core/app/models/spree/delivery_method.rb
+++ b/spree/core/app/models/spree/delivery_method.rb
@@ -437,7 +437,7 @@ module Spree
elsif calculator.is_a?(Spree::Calculator::Shipping::FlexiRate)
Spree::Money.new(calculator.preferred_first_item, { currency: calculator.preferred_currency }).to_s
elsif calculator.is_a?(Spree::Calculator::Shipping::FlatPercentItemTotal)
- ActionController::Base.helpers.number_to_percentage(calculator.preferred_flat_percent, precision: 2)
+ ActiveSupport::NumberHelper.number_to_percentage(calculator.preferred_flat_percent, precision: 2)
else
''
end
diff --git a/spree/core/spec/models/spree/delivery_method_spec.rb b/spree/core/spec/models/spree/delivery_method_spec.rb
index a9c3cd65bb..f964ca29e7 100644
--- a/spree/core/spec/models/spree/delivery_method_spec.rb
+++ b/spree/core/spec/models/spree/delivery_method_spec.rb
@@ -399,6 +399,14 @@ describe Spree::DeliveryMethod, type: :model do
it { expect(delivery_method.display_estimated_price).to eq('Flat rate: Free') }
end
+
+ context 'with a percentage of the item total' do
+ let(:delivery_method) do
+ build(:delivery_method, calculator: Spree::Calculator::Shipping::FlatPercentItemTotal.new(preferred_flat_percent: 12.5))
+ end
+
+ it { expect(delivery_method.display_estimated_price).to eq("#{I18n.t('spree.flat_percent')}: 12.50%") }
+ end
end
describe '#available_pickup_locations' do
let(:delivery_method) { create(:delivery_method, store: @default_store) }