From 7952253e1892d5eea8b35a266ce01133f8da9ff1 Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Mon, 15 Jul 2019 16:04:25 +0530
Subject: [PATCH] Applied a fix for a bug related to shipping modules creating
 problem when being used with cart rules

---
 .../Webkul/Discount/src/Helpers/Discount.php  | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php
index bce1770dd..44a3ce93e 100644
--- a/packages/Webkul/Discount/src/Helpers/Discount.php
+++ b/packages/Webkul/Discount/src/Helpers/Discount.php
@@ -192,6 +192,16 @@ abstract class Discount
 
         $actualShippingRate = new $shippingRate;
         $actualShippingRate = $actualShippingRate->calculate();
+        if (is_array($actualShippingRate)) {
+            foreach($actualShippingRate as $actualRate) {
+                if ($actualRate->method == $cart->selected_shipping_rate->method) {
+                    $actualShippingRate = $actualRate;
+
+                    break;
+                }
+            }
+        }
+
         $actualShippingPrice = $actualShippingRate->price;
         $actualShippingBasePrice = $actualShippingRate->base_price;
 
@@ -268,6 +278,17 @@ abstract class Discount
 
             $actualShippingRate = new $shippingRate;
             $actualShippingRate = $actualShippingRate->calculate();
+
+            if (is_array($actualShippingRate)) {
+                foreach($actualShippingRate as $actualRate) {
+                    if ($actualRate->method == $cart->selected_shipping_rate->method) {
+                        $actualShippingRate = $actualRate;
+
+                        break;
+                    }
+                }
+            }
+
             $actualShippingPrice = $actualShippingRate->price;
             $actualShippingBasePrice = $actualShippingRate->base_price;
             $cartShippingRate = $cart->selected_shipping_rate;