From a0e6b64e981de4abab3f5fe0465e8d7cfb021e2a Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Sun, 21 Feb 2021 10:24:52 +0000 Subject: [PATCH] Update Order serializer --- app/serializers/api/order_detailed_serializer.rb | 2 +- spec/controllers/api/orders_controller_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/serializers/api/order_detailed_serializer.rb b/app/serializers/api/order_detailed_serializer.rb index 5fa36dcddc..fd625b6936 100644 --- a/app/serializers/api/order_detailed_serializer.rb +++ b/app/serializers/api/order_detailed_serializer.rb @@ -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 diff --git a/spec/controllers/api/orders_controller_spec.rb b/spec/controllers/api/orders_controller_spec.rb index 2dfd2dd035..0bda9d464d 100644 --- a/spec/controllers/api/orders_controller_spec.rb +++ b/spec/controllers/api/orders_controller_spec.rb @@ -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",