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

// Advanced stock management bootstraping

Browse Source
This commit is contained in:
Jerome Nadaud
2013-10-02 14:48:23 +02:00
parent dec213aecf
commit 3ce163449e
6 changed files with 109 additions and 95 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
+36 -33
View File
@@ -24,40 +24,43 @@
*} *}
{extends file="helpers/list/list_header.tpl"} {extends file="helpers/list/list_header.tpl"}
{block name=override_header} {block name=override_header}
<div class="filter-stock-extended"> <fieldset>
<form id="stock_cover" type="get" class="form-horizontal"> <h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
<input type="hidden" name="controller" value="AdminStockCover" /> <div class="filter-stock-extended">
<input type="hidden" name="token" value="{$token}" /> <form id="stock_cover" type="get" class="form-horizontal">
{if count($stock_cover_periods) > 1} <input type="hidden" name="controller" value="AdminStockCover" />
<div class="form-group"> <input type="hidden" name="token" value="{$token}" />
<label for="coverage_period" class="control-label col-lg-3">{l s='Filter by period:'}</label> {if count($stock_cover_periods) > 1}
<div class="col-lg-9"> <div class="form-group">
<select name="coverage_period" onChange="$(this).parent().parent().submit();"> <label for="coverage_period" class="control-label col-lg-3">{l s='Filter by period:'}</label>
{foreach from=$stock_cover_periods key=k item=i} <div class="col-lg-9">
<option {if $i == $stock_cover_cur_period} selected="selected"{/if} value="{$i}">{$k}</option> <select name="coverage_period" onChange="$(this).parent().parent().submit();">
{/foreach} {foreach from=$stock_cover_periods key=k item=i}
</select> <option {if $i == $stock_cover_cur_period} selected="selected"{/if} value="{$i}">{$k}</option>
{/foreach}
</select>
</div>
</div> </div>
</div> {/if}
{/if} {if count($stock_cover_warehouses) > 0}
{if count($stock_cover_warehouses) > 0} <div class="form-group">
<div class="form-group"> <label for="id_warehouse" class="control-label col-lg-3">{l s='Filter by warehouse:'}</label>
<label for="id_warehouse" class="control-label col-lg-3">{l s='Filter by warehouse:'}</label> <div class="col-lg-9">
<div class="col-lg-9"> <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}
{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>
<option {if $i.id_warehouse == $stock_cover_cur_warehouse} selected="selected"{/if} value="{$i.id_warehouse}">{$i.name}</option> {/foreach}
{/foreach} </select>
</select> </div>
</div> </div>
</div> {/if}
{/if} <div class="form-group">
<div class="form-group"> <label for="warn_days" class="control-label col-lg-3">{l s='Highlight when coverage (in days) is less than:'}</label>
<label for="warn_days" class="control-label col-lg-3">{l s='Highlight when coverage (in days) is less than:'}</label> <div class="col-lg-9">
<div class="col-lg-9"> <input name="warn_days" type="text" size="3" onChange="$(this).parent().parent().submit();" value="{if isset($stock_cover_warn_days)}{$stock_cover_warn_days}{/if}" />
<input name="warn_days" type="text" size="3" onChange="$(this).parent().parent().submit();" value="{if isset($stock_cover_warn_days)}{$stock_cover_warn_days}{/if}" /> </div>
</div> </div>
</div> </form>
</form> </div>
</div> </fieldset>
{/block} {/block}
admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl
+20 -17
View File
@@ -24,22 +24,25 @@
*} *}
{extends file="helpers/list/list_header.tpl"} {extends file="helpers/list/list_header.tpl"}
{block name=override_header} {block name=override_header}
<div class="filter-stock"> <fieldset>
<form id="stock_instant_state" type="get" class="form-horizontal"> <h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
<input type="hidden" name="controller" value="AdminStockInstantState" /> <div class="filter-stock">
<input type="hidden" name="token" value="{$token}" /> <form id="stock_instant_state" type="get" class="form-horizontal">
{if count($stock_instant_state_warehouses) > 0} <input type="hidden" name="controller" value="AdminStockInstantState" />
<div id="stock_instant_state_form_warehouse" class="form-group"> <input type="hidden" name="token" value="{$token}" />
<label for="id_warehouse" class="control-label col-lg-3">{l s='Filter by warehouse:'}</label> {if count($stock_instant_state_warehouses) > 0}
<div class="col-lg-9"> <div id="stock_instant_state_form_warehouse" class="form-group">
<select name="id_warehouse" onChange="$(this).parent().parent().submit();"> <label for="id_warehouse" class="control-label col-lg-3">{l s='Filter by warehouse:'}</label>
{foreach from=$stock_instant_state_warehouses key=k item=i} <div class="col-lg-9">
<option {if $i.id_warehouse == $stock_instant_state_cur_warehouse} selected="selected"{/if} value="{$i.id_warehouse}">{$i.name}</option> <select name="id_warehouse" onChange="$(this).parent().parent().submit();">
{/foreach} {foreach from=$stock_instant_state_warehouses key=k item=i}
</select> <option {if $i.id_warehouse == $stock_instant_state_cur_warehouse} selected="selected"{/if} value="{$i.id_warehouse}">{$i.name}</option>
{/foreach}
</select>
</div>
</div> </div>
</div> {/if}
{/if} </form>
</form> </div>
</div> </fieldset>
{/block} {/block}
admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl
+19 -16
View File
@@ -25,21 +25,24 @@
{extends file="helpers/list/list_header.tpl"} {extends file="helpers/list/list_header.tpl"}
{block name=override_header} {block name=override_header}
{if count($list_warehouses) > 0} {if count($list_warehouses) > 0}
<div class="filter-stock"> <fieldset>
<form type="get" class="form-horizontal"> <h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
<input type="hidden" name="controller" value="AdminStockMvt" /> <div class="filter-stock">
<input type="hidden" name="token" value="{$token}" /> <form type="get" class="form-horizontal">
<div class="form-group"> <input type="hidden" name="controller" value="AdminStockMvt" />
<label for="id_warehouse" class="control-label col-lg-3">{l s='Filter movements by warehouse:'}</label> <input type="hidden" name="token" value="{$token}" />
<div class="col-lg-9"> <div class="form-group">
<select name="id_warehouse" onChange="$(this).parent().submit();"> <label for="id_warehouse" class="control-label col-lg-3">{l s='Filter movements by warehouse:'}</label>
{foreach $list_warehouses as $warehouse} <div class="col-lg-9">
<option {if $warehouse.id_warehouse == $current_warehouse}selected="selected"{/if} value="{$warehouse.id_warehouse}">{$warehouse.name}</option> <select name="id_warehouse" onChange="$(this).parent().submit();">
{/foreach} {foreach $list_warehouses as $warehouse}
</select> <option {if $warehouse.id_warehouse == $current_warehouse}selected="selected"{/if} value="{$warehouse.id_warehouse}">{$warehouse.name}</option>
{/foreach}
</select>
</div>
</div> </div>
</div> </form>
</form> {/if}
{/if} </div>
</div> </fieldset>
{/block} {/block}
admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl
+24 -21
View File
@@ -25,28 +25,31 @@
{extends file="helpers/list/list_header.tpl"} {extends file="helpers/list/list_header.tpl"}
{block name=override_header} {block name=override_header}
{if isset($warehouses) && count($warehouses) > 0 && isset($filter_status)} {if isset($warehouses) && count($warehouses) > 0 && isset($filter_status)}
<div class="filter-stock-extended"> <fieldset>
<form id="supply_orders" type="get" class="form-horizontal"> <h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
<input type="hidden" name="controller" value="AdminSupplyOrders" /> <div class="filter-stock-extended">
<input type="hidden" name="token" value="{$token}" /> <form id="supply_orders" type="get" class="form-horizontal">
<div class="form-group"> <input type="hidden" name="controller" value="AdminSupplyOrders" />
<label for="id_warehouse" class="control-label col-lg-3">{l s='Filter by warehouse:'}</label> <input type="hidden" name="token" value="{$token}" />
<div class="col-lg-9"> <div class="form-group">
<select name="id_warehouse" onChange="$(this).parent().parent().submit();"> <label for="id_warehouse" class="control-label col-lg-3">{l s='Filter by warehouse:'}</label>
{foreach from=$warehouses key=k item=i} <div class="col-lg-9">
<option {if $i.id_warehouse == $current_warehouse} selected="selected"{/if} value="{$i.id_warehouse}">{$i.name}</option> <select name="id_warehouse" onChange="$(this).parent().parent().submit();">
{/foreach} {foreach from=$warehouses key=k item=i}
</select> <option {if $i.id_warehouse == $current_warehouse} selected="selected"{/if} value="{$i.id_warehouse}">{$i.name}</option>
{/foreach}
</select>
</div>
</div> </div>
</div> <div class="form-group">
<div class="form-group"> <div class="checkbox col-lg-3 col-lg-push-3">
<div class="checkbox col-lg-3 col-lg-push-3"> <label for="filter_status">
<label for="filter_status"> <input type="checkbox" name="filter_status" class="noborder" onChange="$(this).parent().parent().submit();" {if $filter_status == 1}value="on" checked{/if} /> {l s='Choose not to display completed/canceled orders:'}
<input type="checkbox" name="filter_status" class="noborder" onChange="$(this).parent().parent().submit();" {if $filter_status == 1}value="on" checked{/if} /> {l s='Choose not to display completed/canceled orders:'} </label>
</label> </div>
</div> </div>
</div> </form>
</form> </div>
</div> </fieldset>
{/if} {/if}
{/block} {/block}
controllers/admin/AdminStockInstantStateController.php
+6 -3
View File
@@ -75,19 +75,22 @@ class AdminStockInstantStateControllerCore extends AdminController
), ),
'physical_quantity' => array( 'physical_quantity' => array(
'title' => $this->l('Physical quantity'), 'title' => $this->l('Physical quantity'),
'width' => 80, 'class' => 'fixed-width-xs',
'align' => 'center',
'orderby' => true, 'orderby' => true,
'search' => false 'search' => false
), ),
'usable_quantity' => array( 'usable_quantity' => array(
'title' => $this->l('Usable quantity'), 'title' => $this->l('Usable quantity'),
'width' => 80, 'class' => 'fixed-width-xs',
'align' => 'center',
'orderby' => true, 'orderby' => true,
'search' => false, 'search' => false,
), ),
'real_quantity' => array( 'real_quantity' => array(
'title' => $this->l('Real quantity'), 'title' => $this->l('Real quantity'),
'width' => 80, 'class' => 'fixed-width-xs',
'align' => 'center',
'orderby' => false, 'orderby' => false,
'search' => false, 'search' => false,
'hint' => $this->l('Physical quantity (usable) - Client orders + Supply Orders'), 'hint' => $this->l('Physical quantity (usable) - Client orders + Supply Orders'),
controllers/admin/AdminStockMvtController.php
+4 -5
View File
@@ -67,7 +67,6 @@ class AdminStockMvtControllerCore extends AdminController
), ),
'sign' => array( 'sign' => array(
'title' => $this->l('Sign'), 'title' => $this->l('Sign'),
'width' => 100,
'align' => 'center', 'align' => 'center',
'type' => 'select', 'type' => 'select',
'filter_key' => 'a!sign', 'filter_key' => 'a!sign',
@@ -79,15 +78,16 @@ class AdminStockMvtControllerCore extends AdminController
-1 => 'remove_stock.png', -1 => 'remove_stock.png',
1 => 'add_stock.png' 1 => 'add_stock.png'
), ),
'class' => 'fixed-width-xs'
), ),
'physical_quantity' => array( 'physical_quantity' => array(
'title' => $this->l('Quantity'), 'title' => $this->l('Quantity'),
'filter_key' => 'a!physical_quantity' 'align' => 'center',
'filter_key' => 'a!physical_quantity',
'class' => 'fixed-width-sm'
), ),
'price_te' => array( 'price_te' => array(
'title' => $this->l('Price (tax excl.)'), 'title' => $this->l('Price (tax excl.)'),
'width' => 70,
'align' => 'right',
'type' => 'price', 'type' => 'price',
'currency' => true, 'currency' => true,
'filter_key' => 'a!price_te' 'filter_key' => 'a!price_te'
@@ -102,7 +102,6 @@ class AdminStockMvtControllerCore extends AdminController
), ),
'date_add' => array( 'date_add' => array(
'title' => $this->l('Date'), 'title' => $this->l('Date'),
'align' => 'right',
'type' => 'datetime', 'type' => 'datetime',
'filter_key' => 'a!date_add' 'filter_key' => 'a!date_add'
), ),