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

// Avoid some crashes

Browse Source
This commit is contained in:
dMetzger
2011-11-23 08:39:49 +00:00
parent 594b0cff75
commit 674a8a554e
3 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+1 -1
View File
@@ -1716,7 +1716,7 @@ class AdminControllerCore extends Controller
} }
else if ($submitted_action = Tools::getValue('submitAction'.$this->table)) else if ($submitted_action = Tools::getValue('submitAction'.$this->table))
$this->action = $submitted_action; $this->action = $submitted_action;
else if (Tools::getValue('submitAdd'.$this->table)) else if (Tools::getValue('submitAdd'.$this->table) || Tools::getValue('submitAdd'.$this->table.'AndStay'))
{ {
// case 1: updating existing entry // case 1: updating existing entry
if ((int)(Tools::getValue('id_'.$this->table))) if ((int)(Tools::getValue('id_'.$this->table)))
classes/Cart.php
+22 -22
View File
@@ -1629,30 +1629,30 @@ class CartCore extends ObjectModel
$products = $product_list; $products = $product_list;
// Checking discounts in cart // Checking discounts in cart
if (Discount::isFeatureActive()) // if (Discount::isFeatureActive())
$discounts = $this->getDiscounts(true); // $discounts = $this->getDiscounts(true);
else // else
$discounts = null; // $discounts = null;
if ($discounts) // if ($discounts)
foreach ($discounts AS $id_discount) // foreach ($discounts AS $id_discount)
if ($id_discount['id_discount_type'] == Discount::FREE_SHIPPING) // if ($id_discount['id_discount_type'] == Discount::FREE_SHIPPING)
{ // {
if ($id_discount['minimal'] > 0) // if ($id_discount['minimal'] > 0)
{ // {
$total_cart = 0; // $total_cart = 0;
$categories = Discount::getCategories((int)($id_discount['id_discount'])); // $categories = Discount::getCategories((int)($id_discount['id_discount']));
if (sizeof($categories)) // if (sizeof($categories))
foreach($complete_product_list AS $product) // foreach($complete_product_list AS $product)
if (Product::idIsOnCategoryId((int)($product['id_product']), $categories)) // if (Product::idIsOnCategoryId((int)($product['id_product']), $categories))
$total_cart += $product['total_wt']; // $total_cart += $product['total_wt'];
if ($total_cart >= $id_discount['minimal']) // if ($total_cart >= $id_discount['minimal'])
return 0; // return 0;
} // }
else // else
return 0; // return 0;
} // }
// Order total in default currency without fees // Order total in default currency without fees
$order_total = $this->getOrderTotal(true, Cart::ONLY_PRODUCTS_WITHOUT_SHIPPING, $product_list); $order_total = $this->getOrderTotal(true, Cart::ONLY_PRODUCTS_WITHOUT_SHIPPING, $product_list);
classes/CartRule.php
+3 -3
View File
@@ -154,7 +154,7 @@ class CartRuleCore extends ObjectModel
Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_carrier` WHERE `id_cart_rule` = '.(int)$this->id); Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_carrier` WHERE `id_cart_rule` = '.(int)$this->id);
Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_group` WHERE `id_cart_rule` = '.(int)$this->id); Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_group` WHERE `id_cart_rule` = '.(int)$this->id);
Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_country` WHERE `id_cart_rule` = '.(int)$this->id); Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_country` WHERE `id_cart_rule` = '.(int)$this->id);
Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_cart_rule` WHERE `id_cart_rule_1` = '.(int)$this->id.' OR `id_cart_rule_2` = '.(int)$this->id); Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_combination` WHERE `id_cart_rule_1` = '.(int)$this->id.' OR `id_cart_rule_2` = '.(int)$this->id);
Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule` WHERE `id_cart_rule` = '.(int)$this->id); Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule` WHERE `id_cart_rule` = '.(int)$this->id);
Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_value` WHERE `id_product_rule` NOT IN (SELECT `id_product_rule` FROM `'._DB_PREFIX_.'cart_rule_product_rule`)'); Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_value` WHERE `id_product_rule` NOT IN (SELECT `id_product_rule` FROM `'._DB_PREFIX_.'cart_rule_product_rule`)');
} }
@@ -171,8 +171,8 @@ class CartRuleCore extends ObjectModel
INSERT INTO `'._DB_PREFIX_.'cart_rule_country` (`id_cart_rule`, `id_country`) INSERT INTO `'._DB_PREFIX_.'cart_rule_country` (`id_cart_rule`, `id_country`)
(SELECT '.(int)$id_cart_rule_destination.', id_country FROM `'._DB_PREFIX_.'cart_rule_country` WHERE `id_cart_rule` = '.(int)$id_cart_rule_source.')'); (SELECT '.(int)$id_cart_rule_destination.', id_country FROM `'._DB_PREFIX_.'cart_rule_country` WHERE `id_cart_rule` = '.(int)$id_cart_rule_source.')');
Db::getInstance()->Execute(' Db::getInstance()->Execute('
INSERT INTO `'._DB_PREFIX_.'cart_rule_cart_rule` (`id_cart_rule_1`, `id_cart_rule_2`) INSERT INTO `'._DB_PREFIX_.'cart_rule_combination` (`id_cart_rule_1`, `id_cart_rule_2`)
(SELECT '.(int)$id_cart_rule_destination.', IF(id_cart_rule_1 != '.(int)$id_cart_rule_source.', id_cart_rule_1, id_cart_rule_2) FROM `'._DB_PREFIX_.'cart_rule_cart_rule` (SELECT '.(int)$id_cart_rule_destination.', IF(id_cart_rule_1 != '.(int)$id_cart_rule_source.', id_cart_rule_1, id_cart_rule_2) FROM `'._DB_PREFIX_.'cart_rule_combination`
WHERE `id_cart_rule_1` = '.(int)$id_cart_rule_source.' OR `id_cart_rule_2` = '.(int)$id_cart_rule_source.')'); WHERE `id_cart_rule_1` = '.(int)$id_cart_rule_source.' OR `id_cart_rule_2` = '.(int)$id_cart_rule_source.')');
// Todo : should be changed soon, be must be copied too // Todo : should be changed soon, be must be copied too