Skip to content

Commit 17a134b

Browse files
committed
Fix broken order edit shipment
As an administrator I want to create and edit orders as an enterprise manager viewing the edit page with different shipping methods can edit shipping method Failure/Error: expect(page).to have_content "Shipping: #{different_shipping_method_for_distributor1.name}" expected to find text "Shipping: Different" in "Logged in as : [email protected] Account Logout Store DASHBOARD PRODUCTS ORDER CYCLES ORDERS REPORTS ENTERPRISES CUSTOMERS Order # R813516688 CANCEL ACTIONS BACK TO ORDER LIST John Doe - ADD PRODUCT NAME OR SKU (ENTER AT LEAST FIRST 4 CHARACTERS OF PRODUCT NAME) Select a variant 100 - PENDING ITEM DESCRIPTION PRICE QUANTITY TOTAL Product #3 - 9924 - 1g, S $10.00 1 x none $10.00 Product #4 - 5548 - 1g, S $10.00 1 x none $10.00 Product #5 - 8080 - 1g, S $10.00 1 x none $10.00 Product #6 - 3591 - 1g, S $10.00 1 x none $10.00 Product #7 - 6461 - 1g, S $10.00 1 x none $10.00 Product #8 - 4071 - 1g, S $110.00 1 x none $110.00 SHIPPING METHOD Different $0.00 Normal $0.00 Different $0.00 Tracking: U10000 LINE ITEM ADJUSTMENTS NAME AMOUNT Tax 1 10.0%: $10.00 ORDER ADJUSTMENTS NAME AMOUNT Transaction fee: $0.00 ORDER TOTAL $160.00 DISTRIBUTION Distributor: Enterprise 4 Order cycle: Order Cycle 2 UPDATE AND RECALCULATE FEES or BACK ORDER INFORMATION STATUS COMPLETE TOTAL : $160.00 SHIPMENT : PENDING PAYMENT : BALANCE DUE DATE COMPLETED : November 08, 2020 1:51 AM ORDER DETAILS CUSTOMER DETAILS ADJUSTMENTS PAYMENTS RETURN AUTHORIZATIONS" # ./spec/features/admin/order_spec.rb:291:in `block (5 levels) in <top (required)>'
1 parent c79f4a8 commit 17a134b

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

app/controllers/api/shipments_controller.rb

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def update
3030
@shipment.adjustment.open
3131
end
3232

33-
@shipment.update(params[:shipment])
33+
@shipment.update(shipment_params[:shipment])
3434

3535
if unlock == 'yes'
3636
@shipment.adjustment.close
@@ -88,7 +88,7 @@ def find_order
8888

8989
def find_and_update_shipment
9090
@shipment = @order.shipments.find_by!(number: params[:id])
91-
@shipment.update(params[:shipment]) if params[:shipment].present?
91+
@shipment.update(shipment_params[:shipment]) if shipment_params[:shipment].present?
9292
@shipment.reload
9393
end
9494

@@ -101,5 +101,12 @@ def scoped_variant(variant_id)
101101
def get_or_create_shipment(stock_location_id)
102102
@order.shipment || @order.shipments.create(stock_location_id: stock_location_id)
103103
end
104+
105+
def shipment_params
106+
params.permit(
107+
[:id, :order_id, :variant_id, :quantity,
108+
{ shipment: [:tracking, :selected_shipping_rate_id] }]
109+
)
110+
end
104111
end
105112
end

0 commit comments

Comments
 (0)