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

[-] BO : Credit slips now appear in document section

Browse Source
This commit is contained in:
fSerny
2011-12-22 18:02:04 +00:00
parent 667dac5b95
commit 5d76d8cb8a
5 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/orders/_documents.tpl
+16 -12
View File
@@ -10,30 +10,34 @@
</thead>
<tbody>
{foreach from=$order->getDocuments() item=document}
{*if TYPE DOCUMENT = INVOICE *}
<tr class="invoice_line" id="invoice_{$document->id}">
{*/if*}
{if get_class($document) eq 'OrderInvoice'}
<tr class="invoice_line" id="invoice_{$document->id}">
{elseif get_class($document) eq 'OrderSlip'}
<tr class="invoice_line" id="orderslip_{$document->id}">
{/if}
<td class="document_date">{dateFormat date=$document->date_add}</td>
<td class="document_type">Invoice</td>
<td class="document_number"><a target="_blank" href="pdf.php?pdf&id_order_invoice={$document->id}">{$document->getInvoiceNumberFormatted($current_id_lang)} <img src="../img/admin/details.gif" alt="{l s='See the invoice'}" /></a></td>
<td class="document_type">{if get_class($document) eq 'OrderInvoice'}Invoice{elseif get_class($document) eq 'OrderSlip'}Credit Slip{/if}</td>
<td class="document_number"><a target="_blank" href="{if get_class($document) eq 'OrderInvoice'}pdf.php?pdf&id_order_invoice={$document->id}{elseif get_class($document) eq 'OrderSlip'}pdf.php?id_order_slip={$document->id}{/if}">{if get_class($document) eq 'OrderInvoice'}{$document->getInvoiceNumberFormatted($current_id_lang)}{elseif get_class($document) eq 'OrderSlip'}{l s='#'}{'%06d'|sprintf:$document->id}{/if} <img src="../img/admin/details.gif" alt="{l s='See the invoice'}" /></a></td>
<td class="document_amount">
{*if TYPE DOCUMENT = INVOICE *}
{if get_class($document) eq 'OrderInvoice'}
{displayPrice price=$document->total_paid_tax_incl currency=$currency->id}&nbsp;
{if $document->getRestPaid()}
<span style="color:red;font-weight:bold;">({displayPrice price=$document->getRestPaid() currency=$currency->id} {l s='not paid'})</span>
{/if}
{*/if*}
{/if}
</td>
<td class="right document_action">
{*if TYPE DOCUMENT = INVOICE *}
{if get_class($document) eq 'OrderInvoice'}
{if $document->getRestPaid()}
<a href="#" class="js-set-payment" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}" title="{l s='Set payment form'}"><img src="../img/admin/money_add.png" alt="{l s='Set payment form'}" /></a>
{/if}
<a href="#" onclick="$('#invoiceNote{$document->id}').show(); return false;" title="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}"><img src="../img/admin/note.png" alt="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}"{if $document->note eq ''} class="js-disabled-action"{/if} /></a>
{*/if*}
{/if}
</td>
</tr>
{*if TYPE DOCUMENT = INVOICE *}
{if get_class($document) eq 'OrderInvoice'}
<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">
@@ -49,7 +53,7 @@
</form>
</td>
</tr>
{*/if*}
{/if}
{foreachelse}
<tr>
<td colspan="5" class="center">
@@ -59,4 +63,4 @@
</tr>
{/foreach}
</tbody>
</table>
</table>
admin-dev/themes/template/orders/view.tpl
+1 -12
View File
@@ -692,18 +692,7 @@
{/if}
</div>
<div style="float: left; margin-left: 40px">
<fieldset style="width: 400px;">
<legend><img src="../img/admin/slip.gif" alt="{l s='Credit slip'}" />{l s='Credit slip'}</legend>
{if (!sizeof($slips))}
{l s='No slip for this order.'}
{else}
{foreach from=$slips item=slip}
({dateFormat date=$slip['date_upd']}) : <b><a href="pdf.php?id_order_slip={$slip['id_order_slip']}">{l s='#'}{'%06d'|sprintf:$slip['id_order_slip']}</a></b><br />
{/foreach}
{/if}
</fieldset>
</div>
<div class="clear">&nbsp;</div>
<br /><br /><a href="{$currentIndex}&token={$smarty.get.token}"><img src="../img/admin/arrow2.gif" /> {l s='Back to list'}</a><br />