From f4bcf6c6d5782c998ce6cab7df6100bcbf0aede7 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Thu, 16 Apr 2020 00:05:12 +0200
Subject: [PATCH] Eager-load line_item associations in order

---
 app/models/spree/order_decorator.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb
index 85b86c4169..7fa3af05e6 100644
--- a/app/models/spree/order_decorator.rb
+++ b/app/models/spree/order_decorator.rb
@@ -263,7 +263,11 @@ Spree::Order.class_eval do
   end
 
   def line_item_variants
-    line_items.map(&:variant)
+    if line_items.loaded?
+      line_items.map(&:variant)
+    else
+      line_items.includes(:variant).map(&:variant)
+    end
   end
 
   # Show already bought line items of this order cycle