raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Splitting changeable_order_from_number out into separate method

Browse Source
This commit is contained in:
Rob Harrington
2017-05-17 12:38:17 +10:00
parent 22b5dafad2
commit daab0dfd7a
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/spree/orders_controller_decorator.rb
View File

@@ -224,16 +224,18 @@ Spree::OrdersController.class_eval do
n == Float::INFINITY ? 2147483647 : n
end
# If a specific order is mentioned, check that it is COMPLETE, that changes
# are allowed and that the user has access. Return nil if not.
def order_to_update
return @order_to_update if defined? @order_to_update
return @order_to_update = current_order unless params[:id]
@order_to_update = begin
order = Spree::Order.complete.find_by_number(params[:id])
order = nil unless order.andand.changes_allowed? && can?(:update, order)
order
end
@order_to_update = changeable_order_from_number
end
# If a specific order is requested, return it if it is COMPLETE and
# changes are allowed and the user has access. Return nil if not.
def changeable_order_from_number
order = Spree::Order.complete.find_by_number(params[:id])
return nil unless order.andand.changes_allowed? && can?(:update, order)
order
end
def check_at_least_one_line_item