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

[*] Project : Orders should rely only on ps_order_cart_rule

Browse Source
This commit is contained in:
soufyan
2013-09-03 15:10:06 +02:00
parent 98f60d039b
commit cd7d604b75
3 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/Order.php
+1 -2
View File
@@ -712,11 +712,10 @@ class OrderCore extends ObjectModel
} }
public function getCartRules() public function getCartRules()
{ {
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT * SELECT *
FROM `'._DB_PREFIX_.'order_cart_rule` ocr FROM `'._DB_PREFIX_.'order_cart_rule` ocr
LEFT JOIN `'._DB_PREFIX_.'cart_rule` cr ON cr.`id_cart_rule` = ocr.`id_cart_rule`
WHERE ocr.`id_order` = '.(int)$this->id); WHERE ocr.`id_order` = '.(int)$this->id);
} }
classes/order/OrderCartRule.php
+5 -1
View File
@@ -46,6 +46,9 @@ class OrderCartRuleCore extends ObjectModel
/** @var float value (tax excl.) of voucher */ /** @var float value (tax excl.) of voucher */
public $value_tax_excl; public $value_tax_excl;
/** @var boolean value : voucher gives free shipping or not */
public $free_shipping;
/** /**
* @see ObjectModel::$definition * @see ObjectModel::$definition
@@ -59,7 +62,8 @@ class OrderCartRuleCore extends ObjectModel
'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' => 'isCleanHtml', '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),
'free_shipping' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool')
) )
); );
classes/order/OrderSlip.php
-13
View File
@@ -129,19 +129,6 @@ class OrderSlipCore extends ObjectModel
{ {
$products[$key] = $product; $products[$key] = $product;
$products[$key]['product_quantity'] = $slip_quantity[$product['id_order_detail']]; $products[$key]['product_quantity'] = $slip_quantity[$product['id_order_detail']];
if (count($cart_rules))
{
$order->setProductPrices($product);
$realProductPrice = $products[$key]['product_price'];
// Todo : must be updated to use the cart rules
foreach ($cart_rules as $cart_rule)
{
if ($cart_rule['reduction_percent'])
$products[$key]['product_price'] -= $realProductPrice * ($cart_rule['reduction_percent'] / 100);
elseif ($cart_rule['reduction_amount'])
$products[$key]['product_price'] -= (($cart_rule['reduction_amount'] * ($product['product_price_wt'] / $order->total_products_wt)) / (1.00 + ($product['tax_rate'] / 100)));
}
}
} }
return $order->getProducts($products); return $order->getProducts($products);
} }