From b3242041e5f93f1ff9ef54e7a06a56eadbffb3d2 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Tue, 21 Apr 2020 01:25:41 +0200
Subject: [PATCH] Return earlier (before scoping process, if possible)

---
 app/services/cart_service.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/services/cart_service.rb b/app/services/cart_service.rb
index f47f27ccba..dcd4c23138 100644
--- a/app/services/cart_service.rb
+++ b/app/services/cart_service.rb
@@ -33,10 +33,12 @@ class CartService
   def attempt_cart_add(variant_id, quantity, max_quantity = nil)
     quantity = quantity.to_i
     max_quantity = max_quantity.to_i if max_quantity
+    return unless quantity > 0
+
     variant = Spree::Variant.find(variant_id)
     scoper.scope(variant)
 
-    return unless quantity > 0 && valid_variant?(variant)
+    return unless valid_variant?(variant)
 
     cart_add(variant, quantity, max_quantity)
   end