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

// Fix some problems with getPackageShippingCost

Browse Source
This commit is contained in:
mDeflotte
2011-12-02 10:48:26 +00:00
parent 4d8fcb347c
commit 0602a2dbdb
4 changed files with 145 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/Order.php
+31 -2
View File
@@ -318,7 +318,36 @@ class OrderCore extends ObjectModel
}
return $this->_deleteProduct($orderDetail, (int)($quantity));
}
/**
* This function return products of the orders
* It's similar to Order::getProducts but witrh similar outputs of Cart::getProducts
*
* @return array
*/
public function getCartProducts()
{
$product_id_list = array();
foreach ($this->getProducts() as $product)
$product_id_list[] = $this->id_address_delivery.'_'
.$product['product_id'].'_'
.$product['product_attribute_id'].'_'
.(isset($product['id_customization']) ? $product['id_customization'] : '0');
$product_list = array();
foreach ($cart->getProducts() as $product)
{
$key = $this->id_address_delivery.'_'
.$product['id_product'].'_'
.$product['id_product_attribute'].'_'
.(isset($product['id_customization']) ? $product['id_customization'] : '0');
if (in_array($key, $product_id_list))
$product_list[] = $product;
}
return $product_list;
}
/* DOES delete the product */
protected function _deleteProduct($orderDetail, $quantity)
{
@@ -340,7 +369,7 @@ class OrderCore extends ObjectModel
$cart->update();
/* Update order */
$shippingDiff = $this->total_shipping - $cart->getPackageShippingCost();
$shippingDiff = $this->total_shipping - $cart->getPackageShippingCost($this->id_carrier, true, null, $this->getCartProducts());
$this->total_products -= $productPriceWithoutTax;
// After upgrading from old version