From c65f623ed8eeff6be6802b967c71f067b6974ab6 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Thu, 28 Jan 2021 00:05:51 +0000
Subject: [PATCH] Memoize and simplify objects being checked in
 Order#provided_by_order_cycle?

---
 app/models/spree/order.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index 900cf0fe76..77965c54b4 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -831,8 +831,8 @@ module Spree
     end
 
     def provided_by_order_cycle?(line_item)
-      order_cycle_variants = order_cycle.andand.variants || []
-      order_cycle_variants.include? line_item.variant
+      @order_cycle_variant_ids ||= order_cycle&.variants&.map(&:id) || []
+      @order_cycle_variant_ids.include? line_item.variant_id
     end
 
     def require_customer?