From 9e599c78faefb0d8ba09a231509d951fec9f2894 Mon Sep 17 00:00:00 2001 From: bLeveque Date: Sat, 19 May 2012 15:26:28 +0000 Subject: [PATCH] [-] TR : Minor changes --- controllers/front/PdfInvoiceController.php | 10 ++++------ pdf/invoice-b2b.tpl | 2 +- pdf/invoice.tpl | 2 +- pdf/order-return.tpl | 2 +- themes/default/order-return.tpl | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/controllers/front/PdfInvoiceController.php b/controllers/front/PdfInvoiceController.php index 0772d210a..36f521e12 100644 --- a/controllers/front/PdfInvoiceController.php +++ b/controllers/front/PdfInvoiceController.php @@ -37,16 +37,15 @@ class PdfInvoiceControllerCore extends FrontController public function postProcess() { - $id_order = (int)Tools::getValue('id_order'); - if (!$this->context->customer->isLogged() && !Tools::getValue('secure_key')) Tools::redirect('index.php?controller=authentication&back=pdf-invoice'); if (!(int)Configuration::get('PS_INVOICE')) die(Tools::displayError('Invoices are disabled in this shop.')); - if (isset($id_order) && Validate::isUnsignedId($id_order)) - $order = new Order($id_order); + $id_order = (int)Tools::getValue('id_order'); + if (Validate::isUnsignedId($id_order)) + $order = new Order((int)$id_order); if (!isset($order) || !Validate::isLoadedObject($order)) die(Tools::displayError('Invoice not found')); @@ -84,5 +83,4 @@ class PdfInvoiceControllerCore extends FrontController return $template; } -} - +} \ No newline at end of file diff --git a/pdf/invoice-b2b.tpl b/pdf/invoice-b2b.tpl index c49e1d233..942e46e36 100755 --- a/pdf/invoice-b2b.tpl +++ b/pdf/invoice-b2b.tpl @@ -255,7 +255,7 @@ {if $order_invoice->getRestPaid()} - {l s='Total rest paid' pdf='true'} + {l s='Remaining Amount Due' pdf='true'} {displayPrice currency=$order->id_currency price=$order_invoice->getRestPaid()} {/if} diff --git a/pdf/invoice.tpl b/pdf/invoice.tpl index 5c113694c..b5bb479e1 100755 --- a/pdf/invoice.tpl +++ b/pdf/invoice.tpl @@ -265,7 +265,7 @@ {if $order_invoice->getRestPaid() > 0} - {l s='Total rest paid' pdf='true'} + {l s='Remaining Amount Due' pdf='true'} {displayPrice currency=$order->id_currency price=$order_invoice->getRestPaid()} {/if} diff --git a/pdf/order-return.tpl b/pdf/order-return.tpl index bba90e4b1..7545c8713 100755 --- a/pdf/order-return.tpl +++ b/pdf/order-return.tpl @@ -97,7 +97,7 @@ - + diff --git a/themes/default/order-return.tpl b/themes/default/order-return.tpl index 040ddcc9f..be16b496e 100644 --- a/themes/default/order-return.tpl +++ b/themes/default/order-return.tpl @@ -30,7 +30,7 @@

{l s='We have logged your return request.'}

{l s='Your package must be returned to us within'} {$nbdaysreturn} {l s='days of receiving your order.'}

{l s='Current status of your merchandise return:'} {$state_name|escape:'htmlall':'UTF-8'}

-

{l s='List of items marked as returned:'}

+

{l s='List of items to be returned:'}

{l s='ITEMS MARKED AS RETURNED' pdf='true'}{l s='ITEMS TO BE RETURNED' pdf='true'} {l s='REFERENCE' pdf='true'} {l s='QTY' pdf='true'}