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

[-] FO : free gift fixed

Browse Source
This commit is contained in:
dMetzger
2012-01-26 17:17:18 +00:00
parent a715093000
commit 47debd52ae
4 changed files with 5 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cart.php
+3 -7
View File
@@ -274,8 +274,6 @@ class CartCore extends ObjectModel
public function getCartRules() public function getCartRules()
{ {
// TODO : add cache
// If the cart has not been saved, then there can't be any cart rule applied // If the cart has not been saved, then there can't be any cart rule applied
if (!CartRule::isFeatureActive() || !$this->id) if (!CartRule::isFeatureActive() || !$this->id)
return array(); return array();
@@ -307,15 +305,11 @@ class CartCore extends ObjectModel
$row['description'] = $row['name']; $row['description'] = $row['name'];
} }
// TODO Clean the following line, this line generate bug because getCartRule method not exists
//$results = $this->getCartRule();
return $result; return $result;
} }
public function getDiscountsCustomer($id_cart_rule) public function getDiscountsCustomer($id_cart_rule)
{ {
// Todo: see uses and change name
if (!CartRule::isFeatureActive()) if (!CartRule::isFeatureActive())
return 0; return 0;
@@ -703,6 +697,9 @@ class CartCore extends ObjectModel
'id_cart' => (int)$this->id 'id_cart' => (int)$this->id
))) )))
return false; return false;
if ((int)$cartRule->gift_product)
return $this->updateQty(1, $cartRule->gift_product);
return true; return true;
} }
@@ -1303,7 +1300,6 @@ class CartCore extends ObjectModel
$order_total_products = $order_total; $order_total_products = $order_total;
// Todo: consider optimizations
if ($type == Cart::ONLY_DISCOUNTS) if ($type == Cart::ONLY_DISCOUNTS)
$order_total = 0; $order_total = 0;
classes/order/OrderCartRule.php
+1 -1
View File
@@ -58,7 +58,7 @@ class OrderCartRuleCore extends ObjectModel
'id_order' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), 'id_order' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
'id_cart_rule' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), 'id_cart_rule' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
'id_order_invoice' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), 'id_order_invoice' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
'name' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true), 'name' => array('type' => self::TYPE_STRING, 'validate' => 'isCleanHtml', 'required' => true),
'value' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat', 'required' => true), 'value' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat', 'required' => true),
'value_tax_excl' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat', 'required' => true) 'value_tax_excl' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat', 'required' => true)
) )
install-new/data/db_structure.sql
-12
View File
@@ -259,18 +259,6 @@ CREATE TABLE `PREFIX_cart_rule_combination` (
PRIMARY KEY (`id_cart_rule_1`, `id_cart_rule_2`) PRIMARY KEY (`id_cart_rule_1`, `id_cart_rule_2`)
); );
CREATE TABLE `PREFIX_cart_rule_manufacturer` (
`id_cart_rule` int(10) unsigned NOT NULL,
`id_manufacturer` int(10) unsigned NOT NULL,
PRIMARY KEY (`id_cart_rule`, `id_manufacturer`)
);
CREATE TABLE `PREFIX_cart_rule_supplier` (
`id_cart_rule` int(10) unsigned NOT NULL,
`id_supplier` int(10) unsigned NOT NULL,
PRIMARY KEY (`id_cart_rule`, `id_supplier`)
);
CREATE TABLE `PREFIX_cart_rule_product_rule_group` ( CREATE TABLE `PREFIX_cart_rule_product_rule_group` (
`id_product_rule_group` int(10) unsigned NOT NULL auto_increment, `id_product_rule_group` int(10) unsigned NOT NULL auto_increment,
`id_cart_rule` int(10) unsigned NOT NULL, `id_cart_rule` int(10) unsigned NOT NULL,
install-new/upgrade/sql/1.5.0.4.sql
+1 -14
View File
@@ -31,19 +31,6 @@ CREATE TABLE `PREFIX_category_shop` (
/* PHP:update_mailalerts_add_column_idshop(); */; /* PHP:update_mailalerts_add_column_idshop(); */;
CREATE TABLE `PREFIX_cart_rule_manufacturer` (
`id_cart_rule` int(10) unsigned NOT NULL,
`id_manufacturer` int(10) unsigned NOT NULL,
PRIMARY KEY (`id_cart_rule`, `id_manufacturer`)
);
CREATE TABLE `PREFIX_cart_rule_supplier` (
`id_cart_rule` int(10) unsigned NOT NULL,
`id_supplier` int(10) unsigned NOT NULL,
PRIMARY KEY (`id_cart_rule`, `id_supplier`)
);
CREATE TABLE `PREFIX_cart_rule_product_rule_group` ( CREATE TABLE `PREFIX_cart_rule_product_rule_group` (
`id_product_rule_group` int(10) unsigned NOT NULL auto_increment, `id_product_rule_group` int(10) unsigned NOT NULL auto_increment,
`id_cart_rule` int(10) unsigned NOT NULL, `id_cart_rule` int(10) unsigned NOT NULL,
@@ -56,4 +43,4 @@ INSERT INTO `PREFIX_cart_rule_product_rule_group` (`id_product_rule_group`, `id_
); );
ALTER TABLE `PREFIX_cart_rule_product_rule` CHANGE `id_cart_rule` `id_product_rule_group` int(10) unsigned NOT NULL; ALTER TABLE `PREFIX_cart_rule_product_rule` CHANGE `id_cart_rule` `id_product_rule_group` int(10) unsigned NOT NULL;
ALTER TABLE `PREFIX_cart_rule_product_rule` CHANGE `type` ENUM('products', 'categories', 'attributes', 'manufacturers', 'suppliers') NOT NULL; ALTER TABLE `PREFIX_cart_rule_product_rule` CHANGE `type` `type` ENUM('products', 'categories', 'attributes', 'manufacturers', 'suppliers') NOT NULL;