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.

Add `Spree::Account::OrdersController#load_order_details` to load order and its shipments (#12711)

Łukasz Adamczykab96a4d07321
diff --git a/storefront/app/controllers/spree/account/orders_controller.rb b/storefront/app/controllers/spree/account/orders_controller.rb
index c8e9e2d15c..54acf14e9d 100644
--- a/storefront/app/controllers/spree/account/orders_controller.rb
+++ b/storefront/app/controllers/spree/account/orders_controller.rb
@@ -1,16 +1,15 @@
module Spree
module Account
class OrdersController < BaseController
+ before_action :load_order_details, only: :show
+
# GET /account/orders
def index
@orders = orders_scope.order(created_at: :desc).page(params[:page]).per(25)
end
# GET /account/orders/:id
- def show
- @order = orders_scope.find_by!(number: params[:id])
- @shipments = @order.shipments.includes(:stock_location, :address, selected_shipping_rate: :shipping_method, inventory_units: :line_item)
- end
+ def show; end
private
@@ -29,6 +28,11 @@ module Spree
def order_finder
Spree::Dependencies.completed_order_finder.constantize
end
+
+ def load_order_details
+ @order = orders_scope.find_by!(number: params[:id])
+ @shipments = @order.shipments.includes(:stock_location, :address, selected_shipping_rate: :shipping_method, inventory_units: :line_item)
+ end
end
end
end