diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php index ba07dbe72..509d77d3b 100644 --- a/classes/order/OrderInvoice.php +++ b/classes/order/OrderInvoice.php @@ -1015,7 +1015,7 @@ class OrderInvoiceCore extends ObjectModel $payments = OrderPaymentDetail::getByInvoiceId($this->id); foreach ($payments as $payment) { /** @var OrderPayment $payment */ - $amount += $payment['amount']; + $amount += ($payment['amount'] / $payment['conversion_rate']); } Cache::store($cache_id, $amount); return $amount; diff --git a/classes/pdf/HTMLTemplateInvoice.php b/classes/pdf/HTMLTemplateInvoice.php index 3dd144161..c071404f0 100644 --- a/classes/pdf/HTMLTemplateInvoice.php +++ b/classes/pdf/HTMLTemplateInvoice.php @@ -650,6 +650,8 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate $footer['additional_service_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 0, null, $idsOrderDetail) + $totalDemandsPriceTI; $footer['total_convenience_fee_te'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT, $idsOrderDetail); $footer['total_convenience_fee_ti'] = $this->order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT, $idsOrderDetail); + $footer['total_paid_real'] = $this->order_invoice->getTotalPaid(); + $data = array( 'cart_htl_data' => $cart_htl_data, 'service_product_data' => $service_product_data, diff --git a/config/defines.inc.php b/config/defines.inc.php index 4a86b1930..3e319225f 100644 --- a/config/defines.inc.php +++ b/config/defines.inc.php @@ -26,7 +26,7 @@ /* Debug only */ if (!defined('_PS_MODE_DEV_')) { - define('_PS_MODE_DEV_', false); + define('_PS_MODE_DEV_', true); } /* Compatibility warning */ define('_PS_DISPLAY_COMPATIBILITY_WARNING_', false); diff --git a/pdf/invoice.total-tab.tpl b/pdf/invoice.total-tab.tpl index 2f70c1267..4de340a56 100644 --- a/pdf/invoice.total-tab.tpl +++ b/pdf/invoice.total-tab.tpl @@ -138,7 +138,7 @@ {l s='Due Amount' pdf='true'} - {displayPrice currency=$order->id_currency price=($order->total_paid - $order->total_paid_real)} + {displayPrice currency=$order->id_currency price=($footer.total_paid_tax_incl - $footer.total_paid_real)} {/if}