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

[-] TR : Minor changes

Browse Source
This commit is contained in:
bLeveque
2012-05-19 15:26:28 +00:00
parent d41ee7e5f8
commit 9e599c78fa
5 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/PdfInvoiceController.php
+3 -5
View File
@@ -37,16 +37,15 @@ class PdfInvoiceControllerCore extends FrontController
public function postProcess() public function postProcess()
{ {
$id_order = (int)Tools::getValue('id_order');
if (!$this->context->customer->isLogged() && !Tools::getValue('secure_key')) if (!$this->context->customer->isLogged() && !Tools::getValue('secure_key'))
Tools::redirect('index.php?controller=authentication&back=pdf-invoice'); Tools::redirect('index.php?controller=authentication&back=pdf-invoice');
if (!(int)Configuration::get('PS_INVOICE')) if (!(int)Configuration::get('PS_INVOICE'))
die(Tools::displayError('Invoices are disabled in this shop.')); die(Tools::displayError('Invoices are disabled in this shop.'));
if (isset($id_order) && Validate::isUnsignedId($id_order)) $id_order = (int)Tools::getValue('id_order');
$order = new Order($id_order); if (Validate::isUnsignedId($id_order))
$order = new Order((int)$id_order);
if (!isset($order) || !Validate::isLoadedObject($order)) if (!isset($order) || !Validate::isLoadedObject($order))
die(Tools::displayError('Invoice not found')); die(Tools::displayError('Invoice not found'));
@@ -85,4 +84,3 @@ class PdfInvoiceControllerCore extends FrontController
return $template; return $template;
} }
} }
pdf/invoice-b2b.tpl
+1 -1
View File
@@ -255,7 +255,7 @@
{if $order_invoice->getRestPaid()} {if $order_invoice->getRestPaid()}
<tr style="line-height:5px;color:red;"> <tr style="line-height:5px;color:red;">
<td style="text-align: right; font-weight: bold">{l s='Total rest paid' pdf='true'}</td> <td style="text-align: right; font-weight: bold">{l s='Remaining Amount Due' pdf='true'}</td>
<td style="width: 15%; text-align: right;">{displayPrice currency=$order->id_currency price=$order_invoice->getRestPaid()}</td> <td style="width: 15%; text-align: right;">{displayPrice currency=$order->id_currency price=$order_invoice->getRestPaid()}</td>
</tr> </tr>
{/if} {/if}
pdf/invoice.tpl
+1 -1
View File
@@ -265,7 +265,7 @@
{if $order_invoice->getRestPaid() > 0} {if $order_invoice->getRestPaid() > 0}
<tr style="line-height:5px;color:red;"> <tr style="line-height:5px;color:red;">
<td style="text-align: right; font-weight: bold">{l s='Total rest paid' pdf='true'}</td> <td style="text-align: right; font-weight: bold">{l s='Remaining Amount Due' pdf='true'}</td>
<td style="width: 15%; text-align: right;">{displayPrice currency=$order->id_currency price=$order_invoice->getRestPaid()}</td> <td style="width: 15%; text-align: right;">{displayPrice currency=$order->id_currency price=$order_invoice->getRestPaid()}</td>
</tr> </tr>
{/if} {/if}
pdf/order-return.tpl
+1 -1
View File
@@ -97,7 +97,7 @@
<td style="width: 80%; text-align: right"> <td style="width: 80%; text-align: right">
<table style="width: 100%"> <table style="width: 100%">
<tr style="line-height:6px;"> <tr style="line-height:6px;">
<td style="text-align: left; background-color: #4D4D4D; color: #FFF; padding-left: 10px; font-weight: bold; width: 60%">{l s='ITEMS MARKED AS RETURNED' pdf='true'}</td> <td style="text-align: left; background-color: #4D4D4D; color: #FFF; padding-left: 10px; font-weight: bold; width: 60%">{l s='ITEMS TO BE RETURNED' pdf='true'}</td>
<td style="background-color: #4D4D4D; color: #FFF; text-align: left; font-weight: bold; width: 20%">{l s='REFERENCE' pdf='true'}</td> <td style="background-color: #4D4D4D; color: #FFF; text-align: left; font-weight: bold; width: 20%">{l s='REFERENCE' pdf='true'}</td>
<td style="background-color: #4D4D4D; color: #FFF; text-align: center; font-weight: bold; width: 20%">{l s='QTY' pdf='true'}</td> <td style="background-color: #4D4D4D; color: #FFF; text-align: center; font-weight: bold; width: 20%">{l s='QTY' pdf='true'}</td>
</tr> </tr>
themes/default/order-return.tpl
+1 -1
View File
@@ -30,7 +30,7 @@
<p class="bold">{l s='We have logged your return request.'}</p> <p class="bold">{l s='We have logged your return request.'}</p>
<p>{l s='Your package must be returned to us within'} {$nbdaysreturn} {l s='days of receiving your order.'}</p> <p>{l s='Your package must be returned to us within'} {$nbdaysreturn} {l s='days of receiving your order.'}</p>
<p>{l s='Current status of your merchandise return:'} <span class="bold">{$state_name|escape:'htmlall':'UTF-8'}</span></p> <p>{l s='Current status of your merchandise return:'} <span class="bold">{$state_name|escape:'htmlall':'UTF-8'}</span></p>
<p>{l s='List of items marked as returned:'}</p> <p>{l s='List of items to be returned:'}</p>
</div> </div>
<div id="order-detail-content" class="table_block"> <div id="order-detail-content" class="table_block">
<table class="std"> <table class="std">