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

[-] FO: Fix #PSCFV-4992

Browse Source
This commit is contained in:
rGaillard
2012-10-16 09:58:54 +00:00
parent 78f557c29f
commit a0422e94de
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AddressFormat.php
+1
View File
@@ -496,6 +496,7 @@ class AddressFormatCore extends ObjectModel
$reflect = new ReflectionObject($address); $reflect = new ReflectionObject($address);
$public_properties = $reflect->getProperties(ReflectionProperty::IS_PUBLIC); $public_properties = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
foreach ($public_properties as $property) foreach ($public_properties as $property)
if (isset($address->{$property->getName()}))
$layoutData['object'][$property->getName()] = $address->{$property->getName()}; $layoutData['object'][$property->getName()] = $address->{$property->getName()};
} }
return $layoutData; return $layoutData;
classes/Cart.php
+1
View File
@@ -518,6 +518,7 @@ class CartCore extends ObjectModel
// Reset the cache before the following return, or else an empty cart will add dozens of queries // Reset the cache before the following return, or else an empty cart will add dozens of queries
$products_ids = array(); $products_ids = array();
$pa_ids = array(); $pa_ids = array();
if ($result)
foreach ($result as $row) foreach ($result as $row)
{ {
$products_ids[] = $row['id_product']; $products_ids[] = $row['id_product'];
classes/CartRule.php
+8 -5
View File
@@ -1096,11 +1096,14 @@ class CartRuleCore extends ObjectModel
AND cr.id_cart_rule NOT IN (SELECT id_cart_rule FROM '._DB_PREFIX_.'cart_cart_rule WHERE id_cart = '.(int)$context->cart->id.') AND cr.id_cart_rule NOT IN (SELECT id_cart_rule FROM '._DB_PREFIX_.'cart_cart_rule WHERE id_cart = '.(int)$context->cart->id.')
ORDER BY priority'); ORDER BY priority');
$cartRules = ObjectModel::hydrateCollection('CartRule', $result); if ($result)
{
foreach ($cartRules as $cartRule) $cart_rules = ObjectModel::hydrateCollection('CartRule', $result);
if ($cartRule->checkValidity($context, false, false)) if ($cart_rules)
$context->cart->addCartRule($cartRule->id); foreach ($cart_rules as $cart_rule)
if ($cart_rule->checkValidity($context, false, false))
$context->cart->addCartRule($cart_rule->id);
}
} }
/** /**