[-] FO : #PSFV-755 - Fix bug with bad total paid real
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14398 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
@@ -164,7 +164,7 @@ abstract class PaymentModuleCore extends Module
|
||||
$order->gift_message = $cart->gift_message;
|
||||
$order->conversion_rate = $currency->conversion_rate;
|
||||
$amount_paid = !$dont_touch_amount ? Tools::ps_round((float)$amount_paid, 2) : $amount_paid;
|
||||
$order->total_paid_real = $amount_paid;
|
||||
$order->total_paid_real = 0;
|
||||
$order->total_products = (float)$cart->getOrderTotal(false, Cart::ONLY_PRODUCTS, $product_list, $id_carrier);
|
||||
$order->total_products_wt = (float)$cart->getOrderTotal(true, Cart::ONLY_PRODUCTS, $product_list, $id_carrier);
|
||||
|
||||
@@ -524,7 +524,7 @@ abstract class PaymentModuleCore extends Module
|
||||
// Join PDF invoice
|
||||
if ((int)Configuration::get('PS_INVOICE') && $order_status->invoice && $order->invoice_number)
|
||||
{
|
||||
$pdf = new PDF($order->getInvoicesCollection(), PDF::TEMPLATE_INVOICE, $this->context->smarty);
|
||||
$pdf = new PDF($order->getInvoicesCollection(), PDF::TEMPLATE_INVOICE, $this->context->smarty);
|
||||
$file_attachement['content'] = $pdf->render(false);
|
||||
$file_attachement['name'] = Configuration::get('PS_INVOICE_PREFIX', (int)$order->id_lang).sprintf('%06d', $order->invoice_number).'.pdf';
|
||||
$file_attachement['mime'] = 'application/pdf';
|
||||
|
||||
Reference in New Issue
Block a user