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

// Merging multishipping branche on 1.5

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10259 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2011-11-18 11:13:31 +00:00
parent 8a1bd2eb2d
commit 5e6ab08a00
41 changed files with 2870 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/OrderDetail.php
+2 -2
View File
@@ -522,13 +522,13 @@ class OrderDetailCore extends ObjectModel
* @param object $cart
* @param int $id_order_status
*/
public function createList(Order $order, Cart $cart, $id_order_state)
public function createList(Order $order, Cart $cart, $id_order_state, $product_list)
{
$this->vat_address = new Address((int)($order->{Configuration::get('PS_TAX_ADDRESS_TYPE')}));
$this->customer = new Customer((int)($order->id_customer));
$this->id_order = $order->id;
$products = $cart->getProducts();
$products = $product_list;
$this->outOfStock = false;
foreach ($products as $product)