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

[-] Core : Fixed a lot of issue with free shipping vouchers #PSCFV-7325

Browse Source
This commit is contained in:
Damien Metzger
2013-02-04 16:00:46 +01:00
parent a6a0dee0ca
commit 2bf3df1c7d
8 changed files with 60 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/Order.php
+7 -1
View File
@@ -1027,7 +1027,7 @@ class OrderCore extends ObjectModel
* @param int $id_order_invoice
* @return bool
*/
public function addCartRule($id_cart_rule, $name, $values, $id_order_invoice = 0)
public function addCartRule($id_cart_rule, $name, $values, $id_order_invoice = 0, $free_shipping = null)
{
$order_cart_rule = new OrderCartRule();
$order_cart_rule->id_order = $this->id;
@@ -1036,6 +1036,12 @@ class OrderCore extends ObjectModel
$order_cart_rule->name = $name;
$order_cart_rule->value = $values['tax_incl'];
$order_cart_rule->value_tax_excl = $values['tax_excl'];
if ($free_shipping === null)
{
$cart_rule = new CartRule($id_cart_rule);
$free_shipping = $cart_rule->free_shipping;
}
$order_cart_rule->free_shipping = (int)$free_shipping;
$order_cart_rule->add();
}