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

[-] Project : #PSCFV-2633 #PSCFV-2622 - Fix problems with multishipping and order payment & invoice

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15797 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-06-01 15:40:32 +00:00
parent 54fd1c0dcb
commit d02787dc97
15 changed files with 376 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/OrderInvoice.php
+39 -8
View File
@@ -442,11 +442,11 @@ class OrderInvoiceCore extends ObjectModel
return $carrier;
}
/**
* @since 1.5
* @static
* @param $id_order_invoice
*/
/**
* @since 1.5
* @static
* @param $id_order_invoice
*/
public static function getCarrierId($id_order_invoice)
{
$sql = 'SELECT `id_carrier`
@@ -496,6 +496,39 @@ class OrderInvoiceCore extends ObjectModel
return round($this->total_paid_tax_incl - $this->getTotalPaid(), 2);
}
/**
* Get global rest to paid
* This method will return something different of the method getRestPaid if
* there is an other invoice linked to the payments of the current invoice
* @since 1.5.0.13
*/
public function getGlobalRestPaid()
{
static $cache;
if (!isset($cache[$this->id]))
{
$res = Db::getInstance()->getRow('
SELECT SUM(sub.paid) paid, SUM(sub.to_paid) to_paid
FROM (
SELECT
op.amount as paid, SUM(oi.total_paid_tax_incl) to_paid
FROM `'._DB_PREFIX_.'order_invoice_payment` oip1
INNER JOIN `'._DB_PREFIX_.'order_invoice_payment` oip2
ON oip2.id_order_payment = oip1.id_order_payment
INNER JOIN `'._DB_PREFIX_.'order_invoice` oi
ON oi.id_order_invoice = oip2.id_order_invoice
INNER JOIN `'._DB_PREFIX_.'order_payment` op
ON op.id_order_payment = oip2.id_order_payment
WHERE oip1.id_order_invoice = '.(int)$this->id.'
GROUP BY op.id_order_payment
) sub');
$cache[$this->id] = round($res['to_paid'] - $res['paid'], 2);
}
return $cache[$this->id];
}
/**
* @since 1.5.0.2
* @return bool Is paid ?
@@ -511,9 +544,7 @@ class OrderInvoiceCore extends ObjectModel
*/
public function getOrderPaymentCollection()
{
$order_payments = new Collection('OrderPayment');
$order_payments->where('id_order_invoice', '=', $this->id);
return $order_payments;
return OrderPayment::getByInvoiceId($this->id);
}
/**