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.

FIX checkout zone (#13027)

brozekbe4963b3490f
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index 20968fc074..198d677d1d 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -342,7 +342,7 @@ module Spree
end
def supported_shipping_zones
- @supported_shipping_zones ||= if checkout_zone_id.present?
+ @supported_shipping_zones ||= if checkout_zone.present?
[checkout_zone]
else
Spree::Zone.includes(zone_members: :zoneable).all
diff --git a/core/app/models/spree/zone.rb b/core/app/models/spree/zone.rb
index 926d1118a0..2ce9d7e511 100644
--- a/core/app/models/spree/zone.rb
+++ b/core/app/models/spree/zone.rb
@@ -21,6 +21,7 @@ module Spree
after_save :remove_defunct_members
after_save :remove_previous_default, if: %i[default_tax? saved_change_to_default_tax?]
+ before_destroy :nullify_checkout_zone
alias members zone_members
accepts_nested_attributes_for :zone_members, allow_destroy: true, reject_if: proc { |a| a['zoneable_id'].blank? }
@@ -205,5 +206,11 @@ module Spree
members << member
end
end
+
+ def nullify_checkout_zone
+ if id == Spree::Store.current.checkout_zone_id
+ Spree::Store.current.update(checkout_zone_id: nil)
+ end
+ end
end
end
diff --git a/core/spec/models/spree/zone_spec.rb b/core/spec/models/spree/zone_spec.rb
index bd3e6e5f70..7fd0f657dc 100644
--- a/core/spec/models/spree/zone_spec.rb
+++ b/core/spec/models/spree/zone_spec.rb
@@ -42,6 +42,18 @@ describe Spree::Zone, type: :model do
expect(zone_with_default_tax.reload).not_to be_default_tax
end
end
+
+ describe '#nullify_checkout_zone' do
+ let!(:zone) { create(:zone) }
+
+ it 'is expected to nullify checkout zone' do
+ Spree::Store.current.update(checkout_zone: zone)
+
+ expect { zone.destroy }
+ .to change { Spree::Store.current.reload.checkout_zone_id }
+ .to(nil)
+ end
+ end
end
context 'when there is only one qualifying zone' do