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

[-] BO : #PSCFV-3112 - Fix bug with payment by cheque and multishipping

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16294 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-07-09 16:30:12 +00:00
parent 649cb9af43
commit e8b686d928
5 changed files with 94 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/Order.php
+19 -16
View File
@@ -1070,8 +1070,8 @@ class OrderCore extends ObjectModel
return false;
}
public static function getLastInvoiceNumber()
{
public static function getLastInvoiceNumber()
{
return Db::getInstance()->getValue('
SELECT MAX(`number`)
FROM `'._DB_PREFIX_.'order_invoice`
@@ -1081,7 +1081,7 @@ class OrderCore extends ObjectModel
/**
* This method allows to generate first invoice of the current order
*/
public function setInvoice()
public function setInvoice($use_existing_payment = false)
{
if (!$this->hasInvoice())
{
@@ -1129,19 +1129,22 @@ class OrderCore extends ObjectModel
WHERE `id_order` = '.(int)$order_invoice->id_order);
// Update order payment
$id_order_payment = Db::getInstance()->getValue('
SELECT id_order_payment FROM `'._DB_PREFIX_.'order_payment` op
INNER JOIN `'._DB_PREFIX_.'orders` o
ON o.reference = op.order_reference
WHERE id_order = '.(int)$order_invoice->id_order);
if ($id_order_payment)
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'order_invoice_payment`
SET
`id_order_invoice` = '.(int)$order_invoice->id.',
`id_order_payment` = '.(int)$id_order_payment.',
`id_order` = '.(int)$order_invoice->id_order);
if ($use_existing_payment)
{
$id_order_payment = Db::getInstance()->getValue('
SELECT MAX(id_order_payment) FROM `'._DB_PREFIX_.'order_payment` op
INNER JOIN `'._DB_PREFIX_.'orders` o
ON o.reference = op.order_reference
WHERE id_order = '.(int)$order_invoice->id_order);
if ($id_order_payment)
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'order_invoice_payment`
SET
`id_order_invoice` = '.(int)$order_invoice->id.',
`id_order_payment` = '.(int)$id_order_payment.',
`id_order` = '.(int)$order_invoice->id_order);
}
// Update order cart rule
Db::getInstance()->execute('