dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix some problems with getPackageShippingCost

Browse Source
This commit is contained in:
mDeflotte
2011-12-02 10:48:26 +00:00
parent bfb0101a19
commit a85c5d4cd2
4 changed files with 145 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/CartRule.php
+10 -9
View File
@@ -452,16 +452,17 @@ class CartRuleCore extends ObjectModel
if ($this->free_shipping)
{
if (!$this->carrier_restriction)
$reductionValue += $context->cart->getPackageShippingCost($context->cart->id_carrier, $useTax = true, $context->country);
elseif ($context->cart->id_carrier)
$reductionValue += $context->cart->getTotalShippingCost(null, $useTax = true, $context->country);
else
{
$id_cart_rule = (int)Db::getInstance()->getValue('
SELECT crc.id_cart_rule
FROM '._DB_PREFIX_.'cart_rule_carrier crc
WHERE crc.id_cart_rule = '.(int)$this->id.'
AND crc.id_carrier = '.(int)$context->cart->id_carrier);
if ($id_cart_rule)
$reductionValue += $context->cart->getPackageShippingCost($context->cart->id_carrier, $useTax, $context->country);
foreach ((int)Db::getInstance()->executeS('
SELECT crc.id_cart_rule, crc.id_carrier
FROM '._DB_PREFIX_.'cart_rule_carrier crc
WHERE crc.id_cart_rule = '.(int)$this->id.'
AND crc.id_carrier = '.(int)$context->cart->id_carrier)
as $cart_rule
)
$reductionValue += $context->cart->getCarrierCost($cart_rule['id_carrier'], $useTax, $context->country);
}
}