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.

Add `Store#default_country_iso` setter (#12313)

Damian Legawiec3ad9b367cccc
diff --git a/admin/app/views/spree/admin/products/form/_status.html.erb b/admin/app/views/spree/admin/products/form/_status.html.erb
index 62ccbdccb1..e6c26919aa 100644
--- a/admin/app/views/spree/admin/products/form/_status.html.erb
+++ b/admin/app/views/spree/admin/products/form/_status.html.erb
@@ -3,8 +3,8 @@
<h5 class="card-title"><%= Spree.t(:status) %></h5>
</div>
<div class="card-body">
- <div class="row">
- <div data-hook="new_product_status" class="col-6">
+ <div class="row mb-3">
+ <div class="col-6">
<div class="form-group">
<%= f.label :status, Spree.t(:status) %>
<%= help_bubble(Spree.t('admin.products.status_form.status')) if show_product_status_help_bubble? %>
diff --git a/admin/lib/spree/admin.rb b/admin/lib/spree/admin.rb
index b66cc1fb09..fd2824d7fa 100644
--- a/admin/lib/spree/admin.rb
+++ b/admin/lib/spree/admin.rb
@@ -5,7 +5,6 @@ require 'sprockets/railtie'
require 'active_link_to'
require 'chartkick'
-require 'countries/global'
require 'country_select'
require 'currency_select'
require 'groupdate'
diff --git a/admin/spree_admin.gemspec b/admin/spree_admin.gemspec
index 826d865f8e..0045810546 100644
--- a/admin/spree_admin.gemspec
+++ b/admin/spree_admin.gemspec
@@ -32,7 +32,6 @@ Gem::Specification.new do |s|
s.add_dependency 'active_link_to'
s.add_dependency 'bootstrap', '~> 4.6', '>= 4.6.2.1'
s.add_dependency 'chartkick', '~> 5.0'
- s.add_dependency 'countries'
s.add_dependency 'country_select', '~> 6.0'
s.add_dependency 'currency_select'
s.add_dependency 'dartsass-rails', '~> 0.5'
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index 14ca8af92a..7d450ae3ec 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -183,6 +183,30 @@ module Spree
Spree::Store.all.map(&:supported_locales_list).flatten.uniq
end
+ def default_country_iso=(iso)
+ return if iso.blank?
+
+ @default_country_iso = iso
+
+ country = Spree::Country.by_iso(iso)
+
+ if country.present?
+ self.default_country = country
+ elsif iso_country = ::Country[iso]
+ new_country = Spree::Country.create!(
+ iso_name: iso_country.local_name&.upcase,
+ iso: iso_country.alpha2,
+ iso3: iso_country.alpha3,
+ name: iso_country.local_name,
+ numcode: iso_country.number,
+ states_required: Spree::Address::STATES_REQUIRED.include?(iso),
+ zipcode_required: !Spree::Address::NO_ZIPCODE_ISO_CODES.include?(iso)
+ )
+
+ self.default_country = new_country
+ end
+ end
+
def default_menu(location)
menu = menus.find_by(location: location, locale: default_locale) || menus.find_by(location: location)
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index c4b3122a21..51b0b36a65 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -16,6 +16,7 @@ require 'acts-as-taggable-on'
require 'auto_strip_attributes'
require 'awesome_nested_set'
require 'cancan'
+require 'countries/global'
require 'friendly_id'
require 'kaminari'
require 'monetize'
diff --git a/core/spec/models/spree/store_spec.rb b/core/spec/models/spree/store_spec.rb
index aa74d7ad62..9d451fd103 100644
--- a/core/spec/models/spree/store_spec.rb
+++ b/core/spec/models/spree/store_spec.rb
@@ -528,6 +528,30 @@ describe Spree::Store, type: :model do
end
end
+ describe '#default_country_iso=' do
+ let(:store) { build(:store) }
+
+ context 'when country is not found' do
+ it 'sets the default country' do
+ expect(Spree::Country.find_by(iso: 'GB')).to be_nil
+ expect { store.default_country_iso = 'GB' }.to change(Spree::Country, :count).by(1)
+ expect(store.default_country).to be_an_instance_of(Spree::Country)
+ expect(store.default_country.iso).to eq('GB')
+ expect(store.default_country.numcode.to_s).to eq(::Country['GB'].number)
+ expect(store.default_country_iso).to eq('GB')
+ end
+ end
+
+ context 'when country is found' do
+ let!(:country) { create(:country, iso: 'GB') }
+
+ it 'sets the default country' do
+ expect { store.default_country_iso = 'GB' }.not_to change(Spree::Country, :count)
+ expect(store.default_country.iso).to eq('GB')
+ end
+ end
+ end
+
describe '#unique_name' do
let!(:store) { build(:store) }
diff --git a/core/spree_core.gemspec b/core/spree_core.gemspec
index d5ffccde10..8a31c1f80b 100644
--- a/core/spree_core.gemspec
+++ b/core/spree_core.gemspec
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
s.add_dependency 'awesome_nested_set', '~> 3.3', '>= 3.3.1'
s.add_dependency 'carmen', '>= 1.0'
s.add_dependency 'cancancan', '~> 3.2'
+ s.add_dependency 'countries'
s.add_dependency 'friendly_id', '~> 5.2', '>= 5.2.1'
s.add_dependency 'highline', '>= 2', '< 4' # Necessary for the install generator
s.add_dependency 'kaminari', '~> 1.2'