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

// Supply order bootstraping

Browse Source
This commit is contained in:
Jerome Nadaud
2013-10-02 18:59:21 +02:00
parent f891f64cc4
commit 75771e0723
3 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl
+2 -2
View File
@@ -34,7 +34,7 @@
<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="$('#supply_orders').submit();">
{foreach from=$warehouses key=k item=i} {foreach from=$warehouses key=k item=i}
<option {if $i.id_warehouse == $current_warehouse} selected="selected"{/if} value="{$i.id_warehouse}">{$i.name}</option> <option {if $i.id_warehouse == $current_warehouse} selected="selected"{/if} value="{$i.id_warehouse}">{$i.name}</option>
{/foreach} {/foreach}
@@ -44,7 +44,7 @@
<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="$('#supply_orders').submit();" {if $filter_status == 1}value="on" checked{/if} /> {l s='Choose not to display completed/canceled orders:'}
</label> </label>
</div> </div>
</div> </div>
admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl
+1 -8
View File
@@ -108,12 +108,5 @@
</fieldset> </fieldset>
</div> </div>
</div> </div>
<fieldset> {$supply_order_detail_content}
<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>
{/block} {/block}
controllers/admin/AdminSupplyOrdersController.php
+1 -4
View File
@@ -1477,7 +1477,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
public function displayCreateSupplyOrderLink($token = null, $id) public function displayCreateSupplyOrderLink($token = null, $id)
{ {
if (!array_key_exists('CreateSupplyOrder', self::$cache_lang)) if (!array_key_exists('CreateSupplyOrder', self::$cache_lang))
self::$cache_lang['CreateSupplyOrder'] = $this->l('Use this template to create a supply order.'); self::$cache_lang['CreateSupplyOrder'] = $this->l('Use this template to create a supply order');
if (!array_key_exists('CreateSupplyOrderConfirm', self::$cache_lang)) if (!array_key_exists('CreateSupplyOrderConfirm', self::$cache_lang))
self::$cache_lang['CreateSupplyOrderConfirm'] = $this->l('Are you sure you want to use this template?'); self::$cache_lang['CreateSupplyOrderConfirm'] = $this->l('Are you sure you want to use this template?');
@@ -1583,20 +1583,17 @@ class AdminSupplyOrdersControllerCore extends AdminController
$this->fields_list = array( $this->fields_list = array(
'date_add' => array( 'date_add' => array(
'title' => $this->l('Last update'), 'title' => $this->l('Last update'),
'width' => 50,
'align' => 'left', 'align' => 'left',
'type' => 'datetime', 'type' => 'datetime',
'havingFilter' => true 'havingFilter' => true
), ),
'employee' => array( 'employee' => array(
'title' => $this->l('Employee'), 'title' => $this->l('Employee'),
'width' => 100,
'align' => 'left', 'align' => 'left',
'havingFilter' => true 'havingFilter' => true
), ),
'quantity' => array( 'quantity' => array(
'title' => $this->l('Quantity received'), 'title' => $this->l('Quantity received'),
'width' => 100,
'align' => 'left', 'align' => 'left',
'havingFilter' => true 'havingFilter' => true
), ),