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

Update Order serializer

Browse Source
This commit is contained in:
Matt-Yorkley
2021-02-21 10:24:52 +00:00
parent a42651d543
commit a0e6b64e98
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/serializers/api/order_detailed_serializer.rb
View File

@@ -12,7 +12,7 @@ module Api
def adjustments
adjustments = object.all_adjustments.where(
adjustable_type: ["Spree::Order", "Spree::Shipment"]
adjustable_type: ["Spree::Order", "Spree::Shipment", "Spree::Payment"]
).order(label: :desc)
ActiveModel::ArraySerializer.new(adjustments, each_serializer: Api::AdjustmentSerializer)
end

2
spec/controllers/api/orders_controller_spec.rb
View File

@@ -244,7 +244,7 @@ module Api
expect(json_response[:adjustments].first).to include(
'label' => "Transaction fee",
'amount' => order.adjustments.payment_fee.first.amount.to_s
'amount' => order.all_adjustments.payment_fee.first.amount.to_s
)
expect(json_response[:adjustments].second).to include(
'label' => "Shipping",