Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add dependent: :destroy for ShippingMethodZones join model #2175

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/app/models/spree/shipping_method.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion core/app/models/spree/zone.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down