Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Include line items in Shipment serializer in Storefront API (#11644)

Damian Legawiec4793a28a3fde
diff --git a/api/app/controllers/spree/api/v2/storefront/checkout_controller.rb b/api/app/controllers/spree/api/v2/storefront/checkout_controller.rb
index 5248f44b4b..04a4cc7618 100644
--- a/api/app/controllers/spree/api/v2/storefront/checkout_controller.rb
+++ b/api/app/controllers/spree/api/v2/storefront/checkout_controller.rb
@@ -150,7 +150,7 @@ module Spree
shipping_rates_serializer.new(
shipments,
params: serializer_params,
- include: [:shipping_rates, :stock_location]
+ include: [:shipping_rates, :stock_location, :line_items]
).serializable_hash
end
end
diff --git a/api/app/serializers/spree/v2/storefront/shipment_serializer.rb b/api/app/serializers/spree/v2/storefront/shipment_serializer.rb
index a07e3c2796..aaf3feb10e 100644
--- a/api/app/serializers/spree/v2/storefront/shipment_serializer.rb
+++ b/api/app/serializers/spree/v2/storefront/shipment_serializer.rb
@@ -15,6 +15,9 @@ module Spree
has_one :selected_shipping_rate, serializer: :shipping_rate
belongs_to :stock_location
+ has_many :line_items do |shipment|
+ shipment.line_items
+ end
end
end
end
diff --git a/api/spec/requests/spree/api/v2/storefront/checkout_spec.rb b/api/spec/requests/spree/api/v2/storefront/checkout_spec.rb
index 8d95309ec4..00062a9e06 100644
--- a/api/spec/requests/spree/api/v2/storefront/checkout_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/checkout_spec.rb
@@ -714,7 +714,7 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
expect(json_response['data'][0]).to have_type('shipment')
expect(json_response['data'][0]).to have_relationships(:shipping_rates)
expect(json_response['included']).to be_present
- expect(json_response['included'].size).to eq(shipment.shipping_rates.count + 1)
+ expect(json_response['included'].size).to eq(shipment.shipping_rates.count + 2)
[{shipping_method: shipping_method, shipping_rate: shipping_rate}, {shipping_method: shipping_method_2, shipping_rate: shipping_rate_2}].each do |shipping|
expect(json_response['included']).to include(have_type('shipping_rate').and have_attribute(:name).with_value(shipping[:shipping_method].name))
expect(json_response['included']).to include(have_type('shipping_rate').and have_attribute(:shipping_method_id).with_value(shipping[:shipping_method].id))
@@ -730,6 +730,7 @@ describe 'API V2 Storefront Checkout Spec', type: :request do
end
expect(json_response['included']).to include(have_type('stock_location').and have_id(shipment.stock_location_id.to_s))
expect(json_response['included']).to include(have_type('stock_location').and have_attribute(:name).with_value(shipment.stock_location.name))
+ expect(json_response['included']).to include(have_type('line_item').and have_id(shipment.line_items.first.id.to_s))
end
end