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

// AdminSupplierOrdersController : updated (fixed with modifications of HelperList & AdminController + update_receipt)

Browse Source
This commit is contained in:
bMancone
2011-11-07 13:05:07 +00:00
parent 8747306424
commit f79a6facbf
5 changed files with 245 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/helper/list/list_content.tpl
+3 -2
View File
@@ -82,8 +82,9 @@
{$tr.$key}
{elseif isset($params.type) && $params.type == 'datetime'}
{$tr.$key}
{elseif isset($params.type) && $params.type == 'editable'}
<input type="text" name="{$key}" value="{$tr.$key}">
{* If type is 'editable', an input is created *}
{elseif isset($params.type) && $params.type == 'editable' && isset($tr.id)}
<input type="text" class="{$key}" name="{$key}_{$tr.id}" value="{$tr.$key}">
{elseif isset($params.callback)}
{$tr.$key}
{elseif isset($tr.$key) && $key == 'color'}
admin-dev/themes/template/supplier_orders/view.tpl
+87 -80
View File
@@ -23,87 +23,94 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<div>
<h2>{l s='Supplier Order'} #{$supplier_order_reference}</h2>
</div>
<div style="margin-top: 20px;">
<fieldset>
<legend>{l s='Order'} #{$supplier_order_reference}</legend>
<table style="width: 400px;" classe="table">
<tr>
<td>{l s='Employee:'}</td>
<td>{$supplier_order_employee}</td>
</tr>
<tr>
<td>{l s='Last update:'}</td>
<td>{$supplier_order_last_update}</td>
</tr>
<tr>
<td>{l s='Delivery expected:'}</td>
<td>{$supplier_order_expected}</td>
</tr>
</table>
</fieldset>
</div>
{extends file="helper/view/view.tpl"}
<div style="margin-top: 20px;">
<fieldset>
<legend>{l s='Products'}</legend>
{$supplier_order_detail_content}
</fieldset>
</div>
{block name="override_tpl"}
<div style="margin-top: 20px;">
<fieldset>
<legend>{l s='Summary'}</legend>
<table style="width: 400px;" classe="table">
<tr>
<th>{l s='Designation'}</th>
<th width='60px'>{l s='Value'}</th>
</tr>
<tr>
<td bgcolor="#000000"></td>
<td bgcolor="#000000"></td>
</tr>
<tr>
<td>{l s='Total TE'}</td>
<td>{$supplier_order_total_te}</td>
</tr>
<tr>
<td>{l s='Discount'}</td>
<td>{$supplier_order_discount_value_te}</td>
</tr>
<tr>
<td>{l s='Total with discount TE'}</td>
<td>{$supplier_order_total_with_discount_te}</td>
</tr>
<tr>
<td bgcolor="#000000"></td>
<td bgcolor="#000000"></td>
</tr>
<tr>
<td>{l s='Total Tax'}</td>
<td>{$supplier_order_total_tax}</td>
</tr>
<tr>
<td>{l s='Total TI'}</td>
<td>{$supplier_order_total_ti}</td>
</tr>
<tr>
<td bgcolor="#000000"></td>
<td bgcolor="#000000"></td>
</tr>
<tr>
<td>{l s='TOTAL TO PAY'}</td>
<td>{$supplier_order_total_ti}</td>
</tr>
</table>
</fieldset>
</div>
<div>
<h2>{l s='Supplier Order'} #{$supplier_order_reference}</h2>
</div>
<div style="margin-top: 20px;">
<fieldset>
<legend>{l s='Order'} #{$supplier_order_reference}</legend>
<table style="width: 400px;" classe="table">
<tr>
<td>{l s='Employee:'}</td>
<td>{$supplier_order_employee}</td>
</tr>
<tr>
<td>{l s='Last update:'}</td>
<td>{$supplier_order_last_update}</td>
</tr>
<tr>
<td>{l s='Delivery expected:'}</td>
<td>{$supplier_order_expected}</td>
</tr>
</table>
</fieldset>
</div>
<div style="margin-top: 20px;">
<fieldset>
<legend>{l s='Products'}</legend>
{$supplier_order_detail_content}
</fieldset>
</div>
<div style="margin-top: 20px;">
<fieldset>
<legend>{l s='Summary'}</legend>
<table style="width: 400px;" classe="table">
<tr>
<th>{l s='Designation'}</th>
<th width='60px'>{l s='Value'}</th>
</tr>
<tr>
<td bgcolor="#000000"></td>
<td bgcolor="#000000"></td>
</tr>
<tr>
<td>{l s='Total TE'}</td>
<td>{$supplier_order_total_te}</td>
</tr>
<tr>
<td>{l s='Discount'}</td>
<td>{$supplier_order_discount_value_te}</td>
</tr>
<tr>
<td>{l s='Total with discount TE'}</td>
<td>{$supplier_order_total_with_discount_te}</td>
</tr>
<tr>
<td bgcolor="#000000"></td>
<td bgcolor="#000000"></td>
</tr>
<tr>
<td>{l s='Total Tax'}</td>
<td>{$supplier_order_total_tax}</td>
</tr>
<tr>
<td>{l s='Total TI'}</td>
<td>{$supplier_order_total_ti}</td>
</tr>
<tr>
<td bgcolor="#000000"></td>
<td bgcolor="#000000"></td>
</tr>
<tr>
<td>{l s='TOTAL TO PAY'}</td>
<td>{$supplier_order_total_ti}</td>
</tr>
</table>
</fieldset>
</div>
<div style="margin-top: 20px;">
<a href="{$current}&token={$token}">
<img src="../img/admin/arrow2.gif" />{l s='Back to supplier orders'}
</a>
</div>
<div style="margin-top: 20px;">
<a href="{$current}&token={$token}">
<img src="../img/admin/arrow2.gif" />{l s='Back to supplier orders'}
</a>
</div>
{/block}