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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Improve displaying ID preferences
Damian Legawiecfe61df35a91d
diff --git a/admin/app/helpers/spree/admin/base_helper.rb b/admin/app/helpers/spree/admin/base_helper.rbindex 9bb5ad43b7..b9edab2e00 100644--- a/admin/app/helpers/spree/admin/base_helper.rb+++ b/admin/app/helpers/spree/admin/base_helper.rb@@ -346,6 +346,32 @@ module Spreeendendend++ # Formats a preference value for display+ # Handles special cases like zone_ids, user_ids, country_id that should show names instead of IDs+ # @param key [Symbol] the preference key+ # @param value [Object] the preference value+ # @return [String] the formatted value+ def format_preference_value(key, value)+ return Spree.t(:unlimited) if value.blank?++ case key+ when :zone_ids+ zone_ids = Array(value).reject(&:blank?).map(&:to_i)+ return Spree.t(:none) if zone_ids.empty?++ Spree::Zone.where(id: zone_ids).pluck(:name).join(', ')+ when :user_ids+ user_ids = Array(value).reject(&:blank?).map(&:to_i)+ return Spree.t(:none) if user_ids.empty?++ Spree.user_class.where(id: user_ids).map { |u| u.try(:email) || u.id }.join(', ')+ when :country_id+ Spree::Country.find_by(id: value)&.name || value+ else+ value.is_a?(Array) ? value.reject(&:blank?).join(', ') : value+ end+ endendendenddiff --git a/admin/app/views/spree/admin/shared/_preferences.html.erb b/admin/app/views/spree/admin/shared/_preferences.html.erbindex 31219a4c13..378c68f08c 100644--- a/admin/app/views/spree/admin/shared/_preferences.html.erb+++ b/admin/app/views/spree/admin/shared/_preferences.html.erb@@ -4,7 +4,7 @@<% next if value.blank? && key != :max_quantity %><% next if key == :eligible_values %><span><%= Spree.t(key) %>:</span>- <strong><%= value.blank? ? Spree.t(:unlimited) : value %></strong>+ <strong><%= format_preference_value(key, value) %></strong><% end %></p>-<% end %>\ No newline at end of file+<% end %>diff --git a/admin/spec/helpers/spree/admin/base_helper_spec.rb b/admin/spec/helpers/spree/admin/base_helper_spec.rbindex 11793aa8c8..19a789d435 100644--- a/admin/spec/helpers/spree/admin/base_helper_spec.rb+++ b/admin/spec/helpers/spree/admin/base_helper_spec.rb@@ -1,6 +1,74 @@require 'spec_helper'describe Spree::Admin::BaseHelper do+ describe '#format_preference_value' do+ context 'with zone_ids' do+ let!(:zone1) { create(:zone, name: 'North America') }+ let!(:zone2) { create(:zone, name: 'Europe') }++ it 'returns zone names instead of IDs' do+ result = helper.format_preference_value(:zone_ids, [zone1.id.to_s, zone2.id.to_s])+ expect(result).to include('North America')+ expect(result).to include('Europe')+ end++ it 'filters out blank values' do+ result = helper.format_preference_value(:zone_ids, ['', zone1.id.to_s])+ expect(result).to eq('North America')+ end++ it 'returns None for empty array after filtering' do+ result = helper.format_preference_value(:zone_ids, ['', ''])+ expect(result).to eq(Spree.t(:none))+ end+ end++ context 'with user_ids' do+ let!(:user1) { create(:user, email: '[email protected]') }+ let!(:user2) { create(:user, email: '[email protected]') }++ it 'returns user emails instead of IDs' do+ result = helper.format_preference_value(:user_ids, [user1.id.to_s, user2.id.to_s])+ expect(result).to include('[email protected]')+ expect(result).to include('[email protected]')+ end++ it 'filters out blank values' do+ result = helper.format_preference_value(:user_ids, ['', user1.id.to_s])+ expect(result).to eq('[email protected]')+ end+ end++ context 'with country_id' do+ let!(:country) { create(:country, name: 'United States') }++ it 'returns country name instead of ID' do+ result = helper.format_preference_value(:country_id, country.id)+ expect(result).to eq('United States')+ end++ it 'returns the original value if country not found' do+ result = helper.format_preference_value(:country_id, 999999)+ expect(result).to eq(999999)+ end+ end++ context 'with other preferences' do+ it 'returns Unlimited for blank values' do+ expect(helper.format_preference_value(:max_quantity, nil)).to eq(Spree.t(:unlimited))+ expect(helper.format_preference_value(:max_quantity, '')).to eq(Spree.t(:unlimited))+ end++ it 'returns the value as-is for simple values' do+ expect(helper.format_preference_value(:min_quantity, 10)).to eq(10)+ end++ it 'joins array values with commas' do+ expect(helper.format_preference_value(:tags, %w[a b c])).to eq('a, b, c')+ end+ end+ end+describe '#spree_time_ago' doit 'returns the local time ago with a tooltip' dotime = Time.zone.parse('2025-10-21 12:00')diff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex cf7767f729..5bc05fedb5 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -2349,6 +2349,7 @@ en:use_shipping_address: Use Shipping Addressused: Useduser: User+ user_ids: Usersuser_not_found: User not founduser_rule:choose_users: 'Input the full email address of a registered customer(s) in the search field to whom this discount should apply:'@@ -2409,6 +2410,7 @@ en:zipcode: Zip Codezipcode_required: Zip Code Requiredzone: Zone+ zone_ids: Zoneszones: Zonesviews:pagination: