From 40d815d39b5ce285330dbcadb94fc5fc9543634c Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Fri, 10 Sep 2021 10:21:44 +0530
Subject: [PATCH] One Method Created

---
 .../Webkul/Checkout/src/Traits/CartTools.php    | 17 +++++++++++++++++
 .../src/Http/Controllers/CartController.php     |  8 +-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/packages/Webkul/Checkout/src/Traits/CartTools.php b/packages/Webkul/Checkout/src/Traits/CartTools.php
index 2196a5262..7f8181b56 100644
--- a/packages/Webkul/Checkout/src/Traits/CartTools.php
+++ b/packages/Webkul/Checkout/src/Traits/CartTools.php
@@ -95,6 +95,23 @@ trait CartTools
         }
     }
 
+    /**
+     * This method will deactivate the current cart if
+     * buy now is active.
+     *
+     * @return void
+     */
+    public function deactivateCurrentCartIfBuyNowIsActive()
+    {
+        if (request()->get('is_buy_now')) {
+            if ($deactivatedCart = $this->getCart()) {
+                session()->put('deactivated_cart_id', $deactivatedCart->id);
+
+                $this->deActivateCart();
+            }
+        }
+    }
+
     /**
      * This method will reactivate the cart which is deactivated at the the time of buy now functionality.
      *
diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php
index acc77ca30..f885ad43e 100755
--- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php
@@ -68,13 +68,7 @@ class CartController extends Controller
     public function add($id)
     {
         try {
-            if (request()->get('is_buy_now')) {
-                if ($deactivatedCart = Cart::getCart()) {
-                    session()->put('deactivated_cart_id', $deactivatedCart->id);
-
-                    Cart::deActivateCart();
-                }
-            }
+            Cart::deactivateCurrentCartIfBuyNowIsActive();
 
             $result = Cart::addProduct($id, request()->all());