Skip to content

Commit

Permalink
Merge pull request solidusio#590 from bonobos/determine_order_user_hook
Browse files Browse the repository at this point in the history
refactor #determine_order_user helper method
  • Loading branch information
magnusvk committed Dec 17, 2015
2 parents c091d02 + 8bb4ffc commit ed358ad
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions api/app/controllers/spree/api/orders_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,7 @@ def cancel

def create
authorize! :create, Order

order_user = if order_params[:user_id]
Spree.user_class.find(order_params[:user_id])
else
current_api_user
end

@order = Spree::Core::Importer::Order.import(order_user, order_params)
@order = Spree::Core::Importer::Order.import(determine_order_user, order_params)
respond_with(@order, default_template: :show, status: 201)
end

Expand Down Expand Up @@ -116,6 +109,15 @@ def normalize_params
params[:order][:bill_address_attributes] = params[:order].delete(:bill_address) if params[:order][:bill_address].present?
end

# @api public
def determine_order_user
if order_params[:user_id].present?
Spree.user_class.find(order_params[:user_id])
else
current_api_user
end
end

def permitted_order_attributes
can?(:admin, Spree::Order) ? (super + admin_order_attributes) : super
end
Expand Down

0 comments on commit ed358ad

Please sign in to comment.