From a93c4945fbfa9f98b8e3074f1c4391fd883da296 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Wed, 4 May 2022 18:30:45 +0530
Subject: [PATCH] Shipping File Updated

---
 packages/Webkul/Shipping/src/Shipping.php | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Shipping/src/Shipping.php b/packages/Webkul/Shipping/src/Shipping.php
index 9dcacd558..1d3842252 100755
--- a/packages/Webkul/Shipping/src/Shipping.php
+++ b/packages/Webkul/Shipping/src/Shipping.php
@@ -102,7 +102,7 @@ class Shipping
             if (! isset($rates[$rate->carrier])) {
                 $rates[$rate->carrier] = [
                     'carrier_title' => $rate->carrier_title,
-                    'rates'         => []
+                    'rates'         => [],
                 ];
             }
 
@@ -132,7 +132,7 @@ class Shipping
                 'code'         => $object->getCode(),
                 'method'       => $object->getMethod(),
                 'method_title' => $object->getTitle(),
-                'description'  => $object->getDescription()
+                'description'  => $object->getDescription(),
             ];
         }
 
@@ -147,8 +147,20 @@ class Shipping
      */
     public function isMethodCodeExists($shippingMethodCode)
     {
-        $activeShippingMethods = collect($this->getShippingMethods());
+        $shippingMethods = $this->collectRates()['shippingMethods'] ?? [];
 
-        return $activeShippingMethods->contains('method', $shippingMethodCode);
+        if (empty($shippingMethods) || ! $shippingMethods) {
+            return false;
+        }
+
+        foreach ($shippingMethods as $shippingMethod) {
+            foreach ($shippingMethod['rates'] as $rate) {
+                if ($rate->method === $shippingMethodCode) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
     }
 }