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

[-] BO : #PSTEST-795 : Display date from and date to filters in list

Browse Source
This commit is contained in:
lLefevre
2012-02-23 15:19:02 +00:00
parent ce4cb3d2bc
commit 4c33b2b5cc
4 changed files with 652 additions and 645 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/helpers/list/list_header.tpl
+2 -2
View File
@@ -199,8 +199,8 @@
<option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option> <option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option>
</select> </select>
{elseif $params.type == 'date' || $params.type == 'datetime'} {elseif $params.type == 'date' || $params.type == 'datetime'}
{l s='From'} <input type="text" class="filter datepicker" id="{$name_id}_0" name="{$name}[0]" value="{if isset($value.0)}$value.0{/if}"{if isset($params.width)} style="width:70px"{/if}/><br /> {l s='From'} <input type="text" class="filter datepicker" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($value.0)}$value.0{/if}"{if isset($params.width)} style="width:70px"{/if}/><br />
{l s='To'} <input type="text" class="filter datepicker" id="{$name_id}_1" name="{$name}[1]" value="{if isset($value.1)}$value.1{/if}"{if isset($params.width)} style="width:70px"{/if}/> {l s='To'} <input type="text" class="filter datepicker" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($value.1)}$value.1{/if}"{if isset($params.width)} style="width:70px"{/if}/>
{elseif $params.type == 'select'} {elseif $params.type == 'select'}
{if isset($params.filter_key)} {if isset($params.filter_key)}
<select onchange="$('#submitFilterButton{$table}').focus();$('#submitFilterButton{$table}').click();" name="{$table}Filter_{$params.filter_key}" {if isset($params.width)} style="width:{$params.width}px"{/if}> <select onchange="$('#submitFilterButton{$table}').focus();$('#submitFilterButton{$table}').click();" name="{$table}Filter_{$params.filter_key}" {if isset($params.width)} style="width:{$params.width}px"{/if}>
classes/helper/HelperList.php
+4
View File
@@ -560,6 +560,10 @@ class HelperListCore extends Helper
$value = ''; $value = '';
$name = $this->table.'Filter_'.(isset($params['filter_key']) ? $params['filter_key'] : $key); $name = $this->table.'Filter_'.(isset($params['filter_key']) ? $params['filter_key'] : $key);
$name_id = str_replace('!', '__', $name); $name_id = str_replace('!', '__', $name);
$params['id_date'] = $name_id;
$params['name_date'] = $name;
$this->context->controller->addJqueryUI('ui.datepicker'); $this->context->controller->addJqueryUI('ui.datepicker');
break; break;
controllers/admin/AdminSpecificPriceRuleController.php
+4 -3
View File
@@ -100,13 +100,14 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
'type' => 'decimal' 'type' => 'decimal'
), ),
'from' => array( 'from' => array(
'title' => $this->l('From'), 'title' => $this->l('Beginning'),
'align' => 'center', 'align' => 'center',
'type' => 'date' 'type' => 'date',
), ),
'to' => array( 'to' => array(
'title' => $this->l('To'), 'title' => $this->l('End'),
'align' => 'center', 'align' => 'center',
'type' => 'date'
), ),
); );
translations/fr/admin.php
+642 -640
View File
File diff suppressed because it is too large Load Diff