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

// change image for partial and standard refund

Browse Source 
[-] BO : fixed bug on updating of document table when adding a product

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11859 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
aFolletete
2011-12-28 15:40:03 +00:00
parent 8e36d7d247
commit 5a8ad9cb1d
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/orders/_documents.tpl
+2 -2
View File
@@ -75,7 +75,7 @@
{if !isset($document->is_delivery)}
<tr id="invoiceNote{$document->id}" style="display:none" class="current-edit">
<td colspan="5">
<form action="{$currentIndex}&viewOrder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}" method="post">
<form action="{$currentIndex}&viewOrder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}" method="post">
<p>
<label for="editNote{$document->id}" class="t">{l s='Note'}</label>
<input type="hidden" name="id_order_invoice" value="{$document->id}" />
@@ -94,7 +94,7 @@
<tr>
<td colspan="5" class="center">
<h3>{l s='No document is available'}</h3>
<p><a class="button" href="{$currentIndex}&viewOrder&submitGenerateInvoice&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">{l s='Generate invoice'}</a></p>
<p><a class="button" href="{$currentIndex}&viewOrder&submitGenerateInvoice&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">{l s='Generate invoice'}</a></p>
</td>
</tr>
{/foreach}
admin-dev/themes/template/orders/_shipping.tpl
+1 -1
View File
@@ -1,6 +1,6 @@
<table class="table" width="100%" cellspacing="0" cellpadding="0" id="shipping_table">
<colgroup>
<col width="10%"></col>
<col width="15%"></col>
<col width="15%"></col>
<col width=""></col>
<col width="10%"></col>
admin-dev/themes/template/orders/view.tpl
+7 -9
View File
@@ -78,20 +78,20 @@
</div>
<div class="metadata-command">
<dl>
<dt>{l s='Date'}: </dt>
<dt>{l s='Date:'} </dt>
<dd>{dateFormat date=$order->date_add full=true}</dd>
|</dl>
<dl>
<dt>{if (sizeof($messages) > 1)}{l s='messages'}{else}{l s='message'}{/if}: </dt>
<dt>{l s='Message:'}</dt>
<dd>{sizeof($messages)}</dd>
|</dl>
<dl>
<dt>{if (sizeof($products) > 1)}{l s='products'}{else}{l s='product'}{/if}: </dt>
<dd>{sizeof($products)}</dd>
<dt>{l s='Product:'}</dt>
<dd id="product_number">{sizeof($products)}</dd>
|</dl>
<dl>
<dt>{l s='Total'}: </dt>
<dd>{displayPrice price=$order->total_paid_tax_incl currency=$currency->id}</dd>
<dt>{l s='Total:'}</dt>
<dd class="total_paid">{displayPrice price=$order->total_paid_tax_incl currency=$currency->id}</dd>
</dl>
<div class="clear"></div>
</div>
@@ -228,14 +228,12 @@
<form id="formAddPayment" method="post" action="{$currentIndex}&viewOrder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<table class="table" width="100%" cellspacing="0" cellpadding="0">
<colgroup>
<col width="10%"></col>
<col width="15%"></col>
<col width=""></col>
<col width="20%"></col>
<col width="10%"></col>
<col width="10%"></col>
<col width="1%"></col>
</colgroup>
<thead>
<tr>