raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-09 23:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify shipment controller params

Browse Source
This commit is contained in:
Matt-Yorkley
2021-04-30 12:16:22 +01:00
parent 932d000c9d
commit 045ce73c83
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/api/v0/shipments_controller.rb
View File

@@ -34,7 +34,7 @@ module Api
@shipment.fee_adjustment.open
end
@shipment.update(shipment_params[:shipment])
@shipment.update(shipment_params)
if unlock == 'yes'
@shipment.fee_adjustment.close
@@ -94,7 +94,7 @@ module Api
def find_and_update_shipment
@shipment = @order.shipments.find_by!(number: params[:id])
@shipment.update(shipment_params[:shipment]) if shipment_params[:shipment].present?
@shipment.update(shipment_params)
@shipment.reload
end
@@ -113,10 +113,9 @@ module Api
end
def shipment_params
params.permit(
[:id, :order_id, :variant_id, :quantity,
{ shipment: [:tracking, :selected_shipping_rate_id] }]
)
return {} unless params.has_key? :shipment
params.require(:shipment).permit(:tracking, :selected_shipping_rate_id)
end
end
end