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
Nice country dropdowns in admin
Damian Legawiec96180c4c9049
diff --git a/backend/engines/admin/app/views/spree/admin/markets/_form.html.erb b/backend/engines/admin/app/views/spree/admin/markets/_form.html.erbindex 9cc8bdc36e..6e7dd6e85c 100644--- a/backend/engines/admin/app/views/spree/admin/markets/_form.html.erb+++ b/backend/engines/admin/app/views/spree/admin/markets/_form.html.erb@@ -8,9 +8,7 @@<div class="card-body"><%= f.spree_text_field :name, required: true %>- <%= f.spree_collection_select :country_ids, @countries, :id, :name,- { label: Spree.t(:countries), required: true, autocomplete: true },- { multiple: true } %>+ <%= f.spree_select :country_ids, @countries.map { |country| ["#{Spree::Country.iso_to_emoji_flag(country.iso)} #{country.name}", country.id] }, { include_blank: false, label: Spree.t(:default_country), autocomplete: true, multiple: true } %><%= f.spree_select :currency, currency_options(f.object.currency), { label: Spree.t(:currency), required: true, autocomplete: true } %>@@ -22,7 +20,7 @@options_from_collection_for_select(all_locales_options, :last, :first, f.object.supported_locales&.split(',')),{ multiple: true, autocomplete: true, hint: Spree.t('admin.markets.supported_locales_hint') } %>- <hr class="my-6" />+ <hr class="my-6"><%= f.spree_check_box :tax_inclusive %><%= f.spree_check_box :default %>diff --git a/backend/engines/admin/app/views/spree/admin/stores/form/_checkout.html.erb b/backend/engines/admin/app/views/spree/admin/stores/form/_checkout.html.erbindex e6e148e401..96e674fab7 100644--- a/backend/engines/admin/app/views/spree/admin/stores/form/_checkout.html.erb+++ b/backend/engines/admin/app/views/spree/admin/stores/form/_checkout.html.erb@@ -14,7 +14,7 @@<%= link_to Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'text-blue' %></span>- <%= f.spree_select :default_country_iso, Spree::Country.pluck(:name, :iso), { include_blank: false, label: Spree.t(:default_country), autocomplete: true, help: Spree.t(:default_country_help) } %>+ <%= f.spree_select :default_country_iso, Spree::Country.pluck(:name, :iso).map { |name, iso| ["#{Spree::Country.iso_to_emoji_flag(iso)} #{name}", iso] }, { include_blank: false, label: Spree.t(:default_country), autocomplete: true, help: Spree.t(:default_country_help) } %><hr class="my-6" />diff --git a/backend/engines/core/app/models/spree/country.rb b/backend/engines/core/app/models/spree/country.rbindex 3c01be4112..71f5965d9c 100644--- a/backend/engines/core/app/models/spree/country.rb+++ b/backend/engines/core/app/models/spree/country.rb@@ -23,6 +23,19 @@ module Spreeself == store.default_countryend+ def self.to_tom_select_json+ pluck(:name, :id, :iso).map do |name, id, iso|+ {+ id: id,+ name: "#{iso_to_emoji_flag(iso)} #{name}"+ }+ end.as_json+ end++ def self.iso_to_emoji_flag(iso)+ iso.upcase.chars.map { |c| (c.ord + 127397).chr(Encoding::UTF_8) }.join+ end+def <=>(other)name <=> other.nameend