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.

Fixed `Admin::BaseHelper#preference_field` for `currency` fields (#13653)

Damian Legawiec772ff85626e5
diff --git a/spree/admin/app/helpers/spree/admin/base_helper.rb b/spree/admin/app/helpers/spree/admin/base_helper.rb
index 0cda9356a3..6515f9e325 100644
--- a/spree/admin/app/helpers/spree/admin/base_helper.rb
+++ b/spree/admin/app/helpers/spree/admin/base_helper.rb
@@ -214,7 +214,7 @@ module Spree
case key
when :currency
content_tag(:div, form.label("preferred_#{key}", Spree.t(key, scope: i18n_scope)) +
- form.select("preferred_#{key}", current_store.supported_currencies.split(','), {}, { data: { controller: 'autocomplete-select' }, disabled: current_store.supported_currencies.split(',').count == 1 }),
+ form.select("preferred_#{key}", current_store.supported_currencies_list, {}, { data: { controller: 'autocomplete-select' } }),
class: 'form-group', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
else
if object.preference_type(key).to_sym == :boolean
diff --git a/spree/admin/spec/helpers/spree/admin/base_helper_spec.rb b/spree/admin/spec/helpers/spree/admin/base_helper_spec.rb
index 19a789d435..1bae9f5fd8 100644
--- a/spree/admin/spec/helpers/spree/admin/base_helper_spec.rb
+++ b/spree/admin/spec/helpers/spree/admin/base_helper_spec.rb
@@ -82,6 +82,91 @@ describe Spree::Admin::BaseHelper do
end
end
+ describe '#preference_field' do
+ let(:store) { @default_store }
+ let(:calculator) { build(:flat_rate_calculator) }
+ let(:form) do
+ ActionView::Helpers::FormBuilder.new('calculator', calculator, helper, {})
+ end
+
+ before do
+ allow(helper).to receive(:current_store).and_return(store)
+ end
+
+ it 'returns nil when object does not have the preference' do
+ expect(helper.preference_field(calculator, form, :nonexistent_key)).to be_nil
+ end
+
+ context 'with a currency preference' do
+ let!(:usd_market) { create(:market, store: store, currency: 'USD') }
+ let!(:eur_market) { create(:market, store: store, currency: 'EUR') }
+
+ it 'renders a select field with supported currencies as options' do
+ html = helper.preference_field(calculator, form, :currency)
+
+ expect(html).to have_css('div.form-group')
+ expect(html).to have_css('select[name="calculator[preferred_currency]"]')
+ expect(html).to have_css('label[for="calculator_preferred_currency"]')
+ expect(html).to have_css('option', text: 'USD')
+ expect(html).to have_css('option', text: 'EUR')
+ end
+
+ it 'sets the correct id on the wrapper div' do
+ html = helper.preference_field(calculator, form, :currency)
+
+ expect(html).to have_css('div#spree-calculator-flatrate-preference-currency')
+ end
+
+ it 'includes the autocomplete-select data controller' do
+ html = helper.preference_field(calculator, form, :currency)
+
+ expect(html).to have_css('select[data-controller="autocomplete-select"]')
+ end
+ end
+
+ context 'with a boolean preference' do
+ it 'renders a checkbox field' do
+ html = helper.preference_field(calculator, form, :apply_only_on_full_priced_items)
+
+ expect(html).to have_css('div.form-group.custom-control.form-checkbox')
+ expect(html).to have_css('input[type="checkbox"][name="calculator[preferred_apply_only_on_full_priced_items]"]')
+ end
+
+ it 'renders the label with custom-control-label class' do
+ html = helper.preference_field(calculator, form, :apply_only_on_full_priced_items)
+
+ expect(html).to have_css('label.custom-control-label')
+ end
+
+ it 'sets the correct id on the label' do
+ html = helper.preference_field(calculator, form, :apply_only_on_full_priced_items)
+
+ expect(html).to have_css('label#spree-calculator-flatrate-preference-apply_only_on_full_priced_items')
+ end
+ end
+
+ context 'with a decimal preference' do
+ it 'renders a number field' do
+ html = helper.preference_field(calculator, form, :amount)
+
+ expect(html).to have_css('div.form-group')
+ expect(html).to have_css('input[type="number"][name="calculator[preferred_amount]"]')
+ end
+
+ it 'sets the correct id on the wrapper div' do
+ html = helper.preference_field(calculator, form, :amount)
+
+ expect(html).to have_css('div#spree-calculator-flatrate-preference-amount')
+ end
+
+ it 'renders a label for the field' do
+ html = helper.preference_field(calculator, form, :amount)
+
+ expect(html).to have_css('label[for="calculator_preferred_amount"]')
+ end
+ end
+ end
+
describe '#render_admin_partials' do
before do
# Set up test partials