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

// revert r11153

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11164 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
aFolletete
2011-12-13 09:50:21 +00:00
parent 9329793e65
commit 7d67b9cc6e
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/Order.php
+3 -5
View File
@@ -147,8 +147,8 @@ class OrderCore extends ObjectModel
*/ */
public $reference; public $reference;
protected $webserviceParameters = array( protected $webserviceParameters = array(
'objectMethods' => array('add' => 'addWs'), 'objectMethods' => array('add' => 'addWs'),
@@ -1091,9 +1091,7 @@ class OrderCore extends ObjectModel
FROM `'._DB_PREFIX_.'order_carrier` FROM `'._DB_PREFIX_.'order_carrier`
WHERE `id_order` = '.(int)$order_invoice->id_order.' WHERE `id_order` = '.(int)$order_invoice->id_order.'
AND `id_order_invoice` IS NOT NULL'); AND `id_order_invoice` IS NOT NULL');
$order_carrier = new OrderCarrier(); $order_carrier = new OrderCarrier($id_order_carrier);
$order_carrier->id_carrier = $this->id_carrier;
$order_carrier->id_order = $this->id;
$order_carrier->id_order_invoice = (int)$order_invoice->id; $order_carrier->id_order_invoice = (int)$order_invoice->id;
$order_carrier->update(); $order_carrier->update();