merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Applied a fix for a bug related to shipping modules creating problem when being used with cart rules

This commit is contained in:
Prashant Singh 2019-07-15 16:04:25 +05:30
parent 9f9e0b6a68
commit 7952253e18
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/Webkul/Discount/src/Helpers/Discount.php
View File

@ -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;