Merge pull request #2175 from jordan-brough/dependent-destroy-shippin…

…g-method-zones Add `dependent: :destroy` for ShippingMethodZones join model
solidusio · Aug 23, 2017 · 3f6a29e · 3f6a29e
2 parents a3836f3 + d99ef8b
commit 3f6a29e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/app/models/spree/shipping_method.rb b/core/app/models/spree/shipping_method.rb
@@ -16,7 +16,7 @@ class ShippingMethod < Spree::Base
     has_many :shipments, through: :shipping_rates
     has_many :cartons, inverse_of: :shipping_method
 
-    has_many :shipping_method_zones
+    has_many :shipping_method_zones, dependent: :destroy
     has_many :zones, through: :shipping_method_zones
 
     belongs_to :tax_category, -> { with_deleted }, class_name: 'Spree::TaxCategory'

diff --git a/core/app/models/spree/zone.rb b/core/app/models/spree/zone.rb
@@ -8,7 +8,7 @@ class Zone < Spree::Base
       has_many :states, source_type: "Spree::State"
     end
 
-    has_many :shipping_method_zones
+    has_many :shipping_method_zones, dependent: :destroy
     has_many :shipping_methods, through: :shipping_method_zones
 
     validates :name, presence: true, uniqueness: { allow_blank: true }