raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-27 06:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2728 from luisramos0/2-0-ship-method-ctrl

Browse Source 
[Spree Upgrade] Remove use of Order#shipping_method_id from ShippingMethodsControllerDecorator
This commit is contained in:
Maikel
2018-09-24 08:54:03 +10:00
committed by GitHub
parent 3c4ec62352 57bb1fec9a
commit 9b10fbde2d
2 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/controllers/spree/admin/shipping_methods_controller_decorator.rb
View File

@@ -5,22 +5,10 @@ module Spree
before_filter :load_hubs, only: [:new, :edit, :create, :update]
# Sort shipping methods by distributor name
# ! Code copied from Spree::Admin::ResourceController with two added lines
def collection
return parent.send(controller_name) if parent_data.present?
collection = super
collection = collection.managed_by(spree_current_user).by_name
collection = if model_class.respond_to?(:accessible_by) &&
!current_ability.has_block?(params[:action], model_class)
model_class.accessible_by(current_ability, action)
else
model_class.scoped
end
collection = collection.managed_by(spree_current_user).by_name # This line added
# This block added
if params.key? :enterprise_id
distributor = Enterprise.find params[:enterprise_id]
collection = collection.for_distributor(distributor)
@@ -29,14 +17,10 @@ module Spree
collection
end
# This method was originally written because ProductDistributions referenced shipping
# methods, and deleting a referenced shipping method would break all the reports that
# queried it.
# This has changed, and now all we're protecting is Orders, which is a spree resource.
# Do we really need to protect it ourselves? Does spree do this, or provide some means
# of preserving the shipping method information for past orders?
# Spree allows soft deletes of shipping_methods but our reports are not adapted to that.
# So, this method prevents the deletion (even soft) of shipping_methods that are referenced in orders.
def do_not_destroy_referenced_shipping_methods
order = Order.where(:shipping_method_id => @object).first
order = Order.joins(shipments: :shipping_rates).where( spree_shipping_rates: { :shipping_method_id => @object } ).first
if order
flash[:error] = I18n.t(:shipping_method_destroy_error, number: order.number)
redirect_to collection_url and return