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

// update stock tab

Browse Source
This commit is contained in:
Sarah Lorenzini
2013-08-05 12:13:43 +02:00
parent 9f11ecfd78
commit 6533ee4bec
11 changed files with 184 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl
+1 -1
View File
@@ -41,7 +41,7 @@
{if count($stock_cover_warehouses) > 0}
<div>
<label for="id_warehouse">{l s='Filter by warehouse:'}</label>
<select name="id_warehouse" onChange="$(this).parent().parent().submit();"">
<select name="id_warehouse" onChange="$(this).parent().parent().submit();">
{foreach from=$stock_cover_warehouses key=k item=i}
<option {if $i.id_warehouse == $stock_cover_cur_warehouse} selected="selected"{/if} value="{$i.id_warehouse}">{$i.name}</option>
{/foreach}
admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl
+63 -71
View File
@@ -44,77 +44,69 @@
<p>&nbsp;</p>
<table class="table_grid">
<tr>
<td>
<table
id="products_in_supply_order"
class="table"
cellpadding="0" cellspacing="0"
style="width: 100%; margin-bottom:10px;"
>
<thead>
<tr class="nodrag nodrop">
<th style="width: 150px">{l s='Reference'}</th>
<th style="width: 50px">{l s='EAN13'}</th>
<th style="width: 50px">{l s='UPC'}</th>
<th style="width: 150px">{l s='Supplier Reference'}</th>
<th>{l s='Name'}</th>
<th style="width: 100px">{l s='Unit Price (tax excl.)'}</th>
<th style="width: 100px">{l s='Quantity'}</th>
<th style="width: 100px">{l s='Discount rate'}</th>
<th style="width: 100px">{l s='Tax rate'}</th>
<th style="width: 40px">{l s='Delete'}</th>
</tr>
</thead>
<tbody>
{foreach $products_list AS $product}
<tr style="height:50px;">
<td>
{$product.reference}
<input type="hidden" name="input_check_{$product.id_product}_{$product.id_product_attribute}" value="{$product.checksum}" />
<input type="hidden" name="input_reference_{$product.id_product}_{$product.id_product_attribute}" value="{$product.reference}" />
<input type="hidden" name="input_id_{$product.id_product}_{$product.id_product_attribute}" value="{if isset($product.id_supply_order_detail)}{$product.id_supply_order_detail}{/if}" />
</td>
<td>
{$product.ean13}
<input type="hidden" name="input_ean13_{$product.id_product}_{$product.id_product_attribute}" value="{$product.ean13}" />
</td>
<td>
{$product.upc}
<input type="hidden" name="input_upc_{$product.id_product}_{$product.id_product_attribute}" value="{$product.upc}" />
</td>
<td>
{$product.supplier_reference}
<input type="hidden" name="input_supplier_reference_{$product.id_product}_{$product.id_product_attribute}" value="{$product.supplier_reference}" />
</td>
<td>
{$product.name}
<input type="hidden" name="input_name_{$product.id_product}_{$product.id_product_attribute}" value="{$product.name}" />
</td>
<td class="center">
{$currency->prefix}&nbsp;<input type="text" name="input_unit_price_te_{$product.id_product}_{$product.id_product_attribute}" value="{$product.unit_price_te|htmlentities}" size="8" />&nbsp;{$currency->suffix}
</td>
<td class="center">
<input type="text" name="input_quantity_expected_{$product.id_product}_{$product.id_product_attribute}" value="{$product.quantity_expected|htmlentities}" size="5" />
</td>
<td class="center">
<input type="text" name="input_discount_rate_{$product.id_product}_{$product.id_product_attribute}" value="{round($product.discount_rate, 4)}" size="5" />%
</td>
<td class="center">
<input type="text" name="input_tax_rate_{$product.id_product}_{$product.id_product_attribute}" value="{round($product.tax_rate, 4)}" size="5" />%
</td>
<td class="center">
<a href="#" id="deletelink|{$product.id_product}_{$product.id_product_attribute}" class="removeProductFromSupplyOrderLink">
<img src="../img/admin/delete.gif" alt="{l s='Remove this product from the order.'}" title="{l s='Remove this product from the order.'}" />
</a>
</td>
</tr>
{/foreach}
</tbody>
</table>
</td>
</tr>
<table
id="products_in_supply_order"
class="table"
>
<thead>
<tr class="nodrag nodrop">
<th width="150">{l s='Reference'}</th>
<th width="50">{l s='EAN13'}</th>
<th width="50">{l s='UPC'}</th>
<th width="150">{l s='Supplier Reference'}</th>
<th>{l s='Name'}</th>
<th width="100">{l s='Unit Price (tax excl.)'}</th>
<th width="100">{l s='Quantity'}</th>
<th width="100">{l s='Discount rate'}</th>
<th width="100">{l s='Tax rate'}</th>
<th width="40">{l s='Delete'}</th>
</tr>
</thead>
<tbody>
{foreach $products_list AS $product}
<tr>
<td>
{$product.reference}
<input type="hidden" name="input_check_{$product.id_product}_{$product.id_product_attribute}" value="{$product.checksum}" />
<input type="hidden" name="input_reference_{$product.id_product}_{$product.id_product_attribute}" value="{$product.reference}" />
<input type="hidden" name="input_id_{$product.id_product}_{$product.id_product_attribute}" value="{if isset($product.id_supply_order_detail)}{$product.id_supply_order_detail}{/if}" />
</td>
<td>
{$product.ean13}
<input type="hidden" name="input_ean13_{$product.id_product}_{$product.id_product_attribute}" value="{$product.ean13}" />
</td>
<td>
{$product.upc}
<input type="hidden" name="input_upc_{$product.id_product}_{$product.id_product_attribute}" value="{$product.upc}" />
</td>
<td>
{$product.supplier_reference}
<input type="hidden" name="input_supplier_reference_{$product.id_product}_{$product.id_product_attribute}" value="{$product.supplier_reference}" />
</td>
<td>
{$product.name}
<input type="hidden" name="input_name_{$product.id_product}_{$product.id_product_attribute}" value="{$product.name}" />
</td>
<td>
{$currency->prefix}&nbsp;<input type="text" name="input_unit_price_te_{$product.id_product}_{$product.id_product_attribute}" value="{$product.unit_price_te|htmlentities}" size="8" />&nbsp;{$currency->suffix}
</td>
<td>
<input type="text" name="input_quantity_expected_{$product.id_product}_{$product.id_product_attribute}" value="{$product.quantity_expected|htmlentities}" size="5" />
</td>
<td>
<input type="text" name="input_discount_rate_{$product.id_product}_{$product.id_product_attribute}" value="{round($product.discount_rate, 4)}" size="5" />%
</td>
<td>
<input type="text" name="input_tax_rate_{$product.id_product}_{$product.id_product_attribute}" value="{round($product.tax_rate, 4)}" size="5" />%
</td>
<td>
<a href="#" id="deletelink|{$product.id_product}_{$product.id_product_attribute}" class="removeProductFromSupplyOrderLink">
<img src="../img/admin/delete.gif" alt="{l s='Remove this product from the order.'}" title="{l s='Remove this product from the order.'}" />
</a>
</td>
</tr>
{/foreach}
</tbody>
</table>
</fieldset>
admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl
+1 -1
View File
@@ -37,7 +37,7 @@
{/foreach}
</select>
</div>
<div style="margin-top: 5px;">
<div>
<label for="filter_status">{l s='Choose not to display completed/canceled orders:'}</label>
<input type="checkbox" name="filter_status" class="noborder" onChange="$(this).parent().parent().submit();" {if $filter_status == 1}value="on" checked{/if}></input>
</div>
admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl
+27 -18
View File
@@ -25,10 +25,13 @@
{extends file="helpers/view/view.tpl"}
{block name="override_tpl"}
<div style="margin-top: 20px;">
<fieldset>
<legend>{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='General information'}</legend>
<table style="width: 400px;" classe="table">
<div class="row">
<fieldset class="col-lg-12">
<h3>
<i class="icon-info"></i>
{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='General information'}
</h3>
<table classe="table">
<tr>
<td>{l s='Creation date:'}</td>
<td>{$supply_order_creation_date}</td>
@@ -61,20 +64,26 @@
</fieldset>
</div>
<div style="margin-top: 20px;">
<fieldset>
<legend>{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Products:'}</legend>
<div class="row">
<fieldset class="col-lg-12">
<h3>
<i class="icon-dropbox"></i>
{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Products:'}
</h3>
{$supply_order_detail_content}
</fieldset>
</div>
<div style="margin-top: 20px;">
<fieldset>
<legend>{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Summary'}</legend>
<table style="width: 400px;" classe="table">
<div class="row">
<fieldset class="col-lg-12">
<h3>
<i class="icon-th-list"></i>
{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Summary'}
</h3>
<table classe="table">
<tr>
<th>{l s='Designation'}</th>
<th width="100px">{l s='Value'}</th>
<th>{l s='Value'}</th>
</tr>
<tr>
<td bgcolor="#000000"></td>
@@ -82,15 +91,15 @@
</tr>
<tr>
<td>{l s='Total (tax excl.)'}</td>
<td align="right">{$supply_order_total_te}</td>
<td>{$supply_order_total_te}</td>
</tr>
<tr>
<td>{l s='Discount'}</td>
<td align="right">{$supply_order_discount_value_te}</td>
<td>{$supply_order_discount_value_te}</td>
</tr>
<tr>
<td>{l s='Total with discount (tax excl.)'}</td>
<td align="right">{$supply_order_total_with_discount_te}</td>
<td>{$supply_order_total_with_discount_te}</td>
</tr>
<tr>
<td bgcolor="#000000"></td>
@@ -98,11 +107,11 @@
</tr>
<tr>
<td>{l s='Total Tax'}</td>
<td align="right">{$supply_order_total_tax}</td>
<td>{$supply_order_total_tax}</td>
</tr>
<tr>
<td>{l s='Total (tax incl.)'}</td>
<td align="right">{$supply_order_total_ti}</td>
<td>{$supply_order_total_ti}</td>
</tr>
<tr>
<td bgcolor="#000000"></td>
@@ -110,7 +119,7 @@
</tr>
<tr>
<td>{l s='Total to pay.'}</td>
<td align="right">{$supply_order_total_ti}</td>
<td>{$supply_order_total_ti}</td>
</tr>
</table>
</fieldset>