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

[+] BO Orders

Browse Source
This commit is contained in:
Kevin Granger
2013-07-26 18:54:28 +02:00
parent c1e4b812f9
commit 9f9c0ef416
12 changed files with 204 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+1 -1
View File
@@ -5089,7 +5089,7 @@ body.fixed-top {
border-radius: 5px;
-webkit-box-shadow: rgba(0, 0, 0, 0.1) 0 0 7px, white 0 0 0 4px inset;
box-shadow: rgba(0, 0, 0, 0.1) 0 0 7px, white 0 0 0 4px inset; }
#content form legend {
#content legend {
float: left;
padding: 0 0 0 0;
margin: 5px 0 15px 0;
admin-dev/themes/default/css/admin-theme.sass
+1 -1
View File
@@ -53,7 +53,7 @@ body.fixed-top
background-color: $bg-content-color
@include border-radius(5px)
@include box-shadow(rgba(black,0.10) 0 0 7px, white 0 0 0 4px inset)
form legend
legend
float: left
padding: 0 0 0 0
margin: 5px 0 15px 0
admin-dev/themes/default/template/helpers/form/form.tpl
+16 -6
View File
@@ -283,6 +283,7 @@
</div>
</div>
{elseif $input.type == 'textarea'}
{if isset($input.lang) AND $input.lang}
{foreach $languages as $language}
@@ -312,6 +313,7 @@
{else}
<textarea name="{$input.name}" id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}" cols="{$input.cols}" rows="{$input.rows}" {if isset($input.autoload_rte) && $input.autoload_rte}class="rte autoload_rte {if isset($input.class)}{$input.class}{/if}"{/if}>{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}</textarea>
{/if}
{elseif $input.type == 'checkbox'}
{foreach $input.values.query as $value}
{assign var=id_checkbox value=$input.name|cat:'_'|cat:$value[$input.values.id]}
@@ -395,12 +397,20 @@
value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
{elseif $input.type == 'date'}
<input type="text"
data-hex="true"
{if isset($input.class)}class="{$input.class}"
{else}class="datepicker"{/if}
name="{$input.name}"
value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
<div class="row">
<div class="input-group col-lg-4">
<input type="text"
data-hex="true"
{if isset($input.class)}class="{$input.class}"
{else}class="datepicker"{/if}
name="{$input.name}"
value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
<span class="input-group-addon">
<i class="icon-calendar-empty"></i>
</span>
</div>
</div>
{elseif $input.type == 'free'}
{$fields_value[$input.name]}
{/if}
admin-dev/themes/default/template/helpers/list/list_footer.tpl
+41 -11
View File
@@ -22,20 +22,50 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
</table>
{if $bulk_actions}
<p>
{foreach $bulk_actions as $key => $params}
<input type="submit" class="btn btn-default" name="submitBulk{$key}{$table}" value="{$params.text}" {if isset($params.confirm)}onclick="return confirm('{$params.confirm}');"{/if} />
{/foreach}
</p>
{/if}
</table>
{if $bulk_actions}
<p>
{foreach $bulk_actions as $key => $params}
<input type="submit" class="btn btn-default" name="submitBulk{$key}{$table}" value="{$params.text}" {if isset($params.confirm)}onclick="return confirm('{$params.confirm}');"{/if} />
{/foreach}
</p>
{/if}
{if !$simple_header}
<div class="table-pagination pull-right">
<span>
{if $page > 1}
<input type="image" src="../img/admin/list-prev2.gif" onclick="getE('submitFilter{$table}').value=1"/>&nbsp;
<input type="image" src="../img/admin/list-prev.gif" onclick="getE('submitFilter{$table}').value={$page - 1}"/>
{/if}
{l s='Page'} <b>{$page}</b> / {$total_pages}
{if $page < $total_pages}
<input type="image" src="../img/admin/list-next.gif" onclick="getE('submitFilter{$table}').value={$page + 1}"/>&nbsp;
<input type="image" src="../img/admin/list-next2.gif" onclick="getE('submitFilter{$table}').value={$total_pages}"/>
{/if}
</span>
<span>
&nbsp;|&nbsp;
<label >{l s='Display'}</label>
<select class="filter fixed-width-S" name="pagination" onchange="submit()">
{* Choose number of results per page *}
{foreach $pagination AS $value}
<option value="{$value|intval}"{if $selected_pagination == $value} selected="selected" {elseif $selected_pagination == NULL && $value == $pagination[1]} selected="selected2"{/if}>{$value|intval}</option>
{/foreach}
</select>
</span>
<span> / {$list_total} {l s='result(s)'}</span>
</div>
{/if}
{if !$simple_header}
<input type="hidden" name="token" value="{$token}" />
</fieldset>
</form>
</fieldset>
</form>
{/if}
{hook h='displayAdminListAfter'}
admin-dev/themes/default/template/helpers/list/list_header.tpl
+92 -147
View File
@@ -24,51 +24,46 @@
*}
{if !$simple_header}
<script type="text/javascript">
$(document).ready(function() {
$('table.{$table} .filter').keypress(function(event){
formSubmit(event, 'submitFilterButton{$table}')
})
});
</script>
{* Display column names and arrows for ordering (ASC, DESC) *}
{if $is_order_position}
<script type="text/javascript" src="../js/jquery/plugins/jquery.tablednd.js"></script>
<script type="text/javascript">
$(document).ready(function() {
$('table.{$table} .filter').keypress(function(event){
formSubmit(event, 'submitFilterButton{$table}')
})
});
var token = '{$token}';
var come_from = '{$table}';
var alternate = {if $order_way == 'DESC'}'1'{else}'0'{/if};
</script>
{* Display column names and arrows for ordering (ASC, DESC) *}
{if $is_order_position}
<script type="text/javascript" src="../js/jquery/plugins/jquery.tablednd.js"></script>
<script type="text/javascript">
var token = '{$token}';
var come_from = '{$table}';
var alternate = {if $order_way == 'DESC'}'1'{else}'0'{/if};
</script>
<script type="text/javascript" src="../js/admin-dnd.js"></script>
{/if}
<script type="text/javascript">
$(function() {
if ($("table.{$table} .datepicker").length > 0)
$("table.{$table} .datepicker").datepicker({
prevText: '',
nextText: '',
dateFormat: 'yy-mm-dd'
});
});
</script>
{/if}{* End if simple_header *}
<script type="text/javascript" src="../js/admin-dnd.js"></script>
{/if}
<script type="text/javascript">
$(function() {
if ($("table.{$table} .datepicker").length > 0)
$("table.{$table} .datepicker").datepicker({
prevText: '',
nextText: '',
dateFormat: 'yy-mm-dd'
});
});
</script>
{/if}
{if $show_toolbar}
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
{/if}
{if !$simple_header}
<div class="leadin">{block name="leadin"}{/block}</div>
<div class="leadin">{block name="leadin"}{/block}</div>
{/if}
{hook h='displayAdminListBefore'}
{if isset($name_controller)}
{capture name=hookName assign=hookName}display{$name_controller|ucfirst}ListBefore{/capture}
{hook h=$hookName}
@@ -77,48 +72,13 @@
{hook h=$hookName}
{/if}
{if !$simple_header}
<form method="post" action="{$action}" class="form-inline">
<fieldset class="col-lg-12">
{block name="override_header"}{/block}
{block name="override_header"}{/block}
<input type="hidden" id="submitFilter{$table}" name="submitFilter{$table}" value="0"/>
{/if}
<input type="hidden" id="submitFilter{$table}" name="submitFilter{$table}" value="0"/>
{if !$simple_header}
<span>
{if $page > 1}
<input type="image" src="../img/admin/list-prev2.gif" onclick="getE('submitFilter{$table}').value=1"/>&nbsp;
<input type="image" src="../img/admin/list-prev.gif" onclick="getE('submitFilter{$table}').value={$page - 1}"/>
{/if}
{l s='Page'} <b>{$page}</b> / {$total_pages}
{if $page < $total_pages}
<input type="image" src="../img/admin/list-next.gif" onclick="getE('submitFilter{$table}').value={$page + 1}"/>&nbsp;
<input type="image" src="../img/admin/list-next2.gif" onclick="getE('submitFilter{$table}').value={$total_pages}"/>
{/if}
</span>
<span>
&nbsp;|&nbsp;
<label >
{l s='Display'}
</label>
<select class="filter fixed-width-S" name="pagination" onchange="submit()">
{* Choose number of results per page *}
{foreach $pagination AS $value}
<option value="{$value|intval}"{if $selected_pagination == $value} selected="selected" {elseif $selected_pagination == NULL && $value == $pagination[1]} selected="selected2"{/if}>{$value|intval}</option>
{/foreach}
</select>
</span>
<span> / {$list_total} {l s='result(s)'}</span>
<span class="pull-right">
<button type="submit" name="submitReset{$table}" class="btn btn-default btn-small">
<i class="icon-eraser"></i> {l s='Reset'}
@@ -127,64 +87,49 @@
<i class="icon-filter"></i> {l s='Filter'}
</button>
</span>
{/if}
<table
class="table table-hover"
name="list_table"
{if $table_id} id={$table_id}{/if}
class="table {if $table_dnd}tableDnD{/if} {$table}"
cellpadding="0" cellspacing="0">
{* <col width="10px" />
{foreach $fields_display AS $key => $params}
<col {if isset($params.width) && $params.width != 'auto'}width="{$params.width}px"{/if}/>
{/foreach}
{if $shop_link_type}
<col width="80px" />
{/if}
{if $has_actions}
<col width="200px" />
{/if} *}
{/if}
<table
class="table table-hover"
name="list_table"
{if $table_id} id={$table_id}{/if}
class="table {if $table_dnd}tableDnD{/if} {$table}"
>
<thead>
<tr class="nodrag nodrop">
<th class="center">
{if $has_bulk_actions}
<input type="checkbox" name="checkme" class="noborder" onclick="checkDelBoxes(this.form, '{$table}Box[]', this.checked)" />
{/if}
{if $has_bulk_actions}
<input type="checkbox" name="checkme" class="noborder" onclick="checkDelBoxes(this.form, '{$table}Box[]', this.checked)" />
{/if}
</th>
{foreach $fields_display AS $key => $params}
<th {if isset($params.align)} class="{$params.align}"{/if}>
{if isset($params.hint)}
<span class="alert alert-info" name="help_box">{$params.hint}<span class="hint-pointer">&nbsp;</span></span>
{/if}
<span class="title_box {if isset($order_by) && ($key == $order_by)} active{/if}">
{$params.title}
<th {if isset($params.align)} class="{$params.align}"{/if}>
{if isset($params.hint)}
<span class="alert alert-info" name="help_box">{$params.hint}<span class="hint-pointer">&nbsp;</span></span>
{/if}
<span class="title_box {if isset($order_by) && ($key == $order_by)} active{/if}">
{$params.title}
{if (!isset($params.orderby) || $params.orderby) && !$simple_header}
<a {if isset($order_by) && ($key == $order_by) && ($order_way == 'DESC')}class="active"{/if} href="{$currentIndex}&{$table}Orderby={$key|urlencode}&{$table}Orderway=desc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
<a {if isset($order_by) && ($key == $order_by) && ($order_way == 'DESC')}class="active"{/if} href="{$currentIndex}&{$table}Orderby={$key|urlencode}&{$table}Orderway=desc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
<i class="icon-caret-down"></i>
</a>
<a {if isset($order_by) && ($key == $order_by) && ($order_way == 'ASC')}class="active"{/if} href="{$currentIndex}&{$table}Orderby={$key|urlencode}&{$table}Orderway=asc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
</a>
<a {if isset($order_by) && ($key == $order_by) && ($order_way == 'ASC')}class="active"{/if} href="{$currentIndex}&{$table}Orderby={$key|urlencode}&{$table}Orderway=asc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
<i class="icon-caret-up"></i>
</a>
</span>
{elseif !$simple_header}
{/if}
</th>
</a>
</span>
{/if}
</th>
{/foreach}
{if $shop_link_type}
<th>
{if $shop_link_type == 'shop'}
{l s='Shop'}
{else}
{l s='Group shop'}
{/if}
<br />&nbsp;
</th>
<th>
{if $shop_link_type == 'shop'}
{l s='Shop'}
{else}
{l s='Group shop'}
{/if}
</th>
{/if}
{if $has_actions}
<th>{l s='Actions'}{if !$simple_header}{/if}</th>
<th>{l s='Actions'}{if !$simple_header}{/if}</th>
{/if}
</tr>
{if !$simple_header}
@@ -197,43 +142,43 @@
{* Filters (input, select, date or bool) *}
{foreach $fields_display AS $key => $params}
<td {if isset($params.align)} class="{$params.align}" {/if}>
{if isset($params.search) && !$params.search}
--
{else}
{if $params.type == 'bool'}
<select class="filter" onchange="$('#submitFilterButton{$table}').focus();$('#submitFilterButton{$table}').click();" name="{$table}Filter_{$key}">
<option value="">--</option>
<option value="1" {if $params.value == 1} selected="selected" {/if}>{l s='Yes'}</option>
<option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option>
<td {if isset($params.align)} class="{$params.align}" {/if}>
{if isset($params.search) && !$params.search}
--
{else}
{if $params.type == 'bool'}
<select class="filter" onchange="$('#submitFilterButton{$table}').focus();$('#submitFilterButton{$table}').click();" name="{$table}Filter_{$key}">
<option value="">--</option>
<option value="1" {if $params.value == 1} selected="selected" {/if}>{l s='Yes'}</option>
<option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option>
</select>
{elseif $params.type == 'date' || $params.type == 'datetime'}
{l s='From'} <input type="text" class="filter datepicker" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($params.value.0)}{$params.value.0}{/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($params.value.1)}{$params.value.1}{/if}"{if isset($params.width)} style="width:70px"{/if}/>
{elseif $params.type == 'select'}
{if isset($params.filter_key)}
<select class="filter" onchange="$('#submitFilterButton{$table}').focus();$('#submitFilterButton{$table}').click();" name="{$table}Filter_{$params.filter_key}" {if isset($params.width)} style="width:{$params.width}px"{/if}>
<option value="" {if $params.value == ''} selected="selected" {/if}>--</option>
{if isset($params.list) && is_array($params.list)}
{foreach $params.list AS $option_value => $option_display}
<option value="{$option_value}" {if $option_display == $params.value || $option_value == $params.value} selected="selected"{/if}>{$option_display}</option>
{/foreach}
{/if}
</select>
{elseif $params.type == 'date' || $params.type == 'datetime'}
{l s='From'} <input type="text" class="filter datepicker" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($params.value.0)}{$params.value.0}{/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($params.value.1)}{$params.value.1}{/if}"{if isset($params.width)} style="width:70px"{/if}/>
{elseif $params.type == 'select'}
{if isset($params.filter_key)}
<select class="filter" onchange="$('#submitFilterButton{$table}').focus();$('#submitFilterButton{$table}').click();" name="{$table}Filter_{$params.filter_key}" {if isset($params.width)} style="width:{$params.width}px"{/if}>
<option value="" {if $params.value == ''} selected="selected" {/if}>--</option>
{if isset($params.list) && is_array($params.list)}
{foreach $params.list AS $option_value => $option_display}
<option value="{$option_value}" {if $option_display == $params.value || $option_value == $params.value} selected="selected"{/if}>{$option_display}</option>
{/foreach}
{/if}
</select>
{/if}
{else}
<input type="text" class="filter" name="{$table}Filter_{if isset($params.filter_key)}{$params.filter_key}{else}{$key}{/if}" value="{$params.value|escape:'htmlall':'UTF-8'}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{/if} />
{/if}
{else}
<input type="text" class="filter" name="{$table}Filter_{if isset($params.filter_key)}{$params.filter_key}{else}{$key}{/if}" value="{$params.value|escape:'htmlall':'UTF-8'}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{/if} />
{/if}
</td>
{/if}
</td>
{/foreach}
{if $shop_link_type}
<td>--</td>
<td>--</td>
{/if}
{if $has_actions}
<td class="center">--</td>
<td class="center">--</td>
{/if}
</tr>
{/if}
</thead>
</tr>
{/if}
</thead>
classes/helper/HelperList.php
+15 -16
View File
@@ -574,24 +574,28 @@ class HelperListCore extends Helper
$this->fields_list[$key] = $params;
}
$this->header_tpl->assign(array_merge($this->tpl_vars, array(
'title' => $this->title,
'show_toolbar' => $this->show_toolbar,
'toolbar_scroll' => $this->toolbar_scroll,
'toolbar_btn' => $this->toolbar_btn,
'table' => $this->table,
'currentIndex' => $this->currentIndex,
'action' => $action,
Context::getContext()->smarty->assign(array(
'page' => $page,
'simple_header' => $this->simple_header,
'total_pages' => $total_pages,
'selected_pagination' => $selected_pagination,
'pagination' => $this->_pagination,
'list_total' => $this->listTotal,
'token' => $this->token,
'table' => $this->table,
'bulk_actions' => $this->bulk_actions
));
$this->header_tpl->assign(array_merge($this->tpl_vars, array(
'title' => $this->title,
'show_toolbar' => $this->show_toolbar,
'toolbar_scroll' => $this->toolbar_scroll,
'toolbar_btn' => $this->toolbar_btn,
'currentIndex' => $this->currentIndex,
'action' => $action,
'is_order_position' => $this->position_identifier && $this->orderBy == 'position',
'order_way' => $this->orderWay,
'order_by' => $this->orderBy,
'token' => $this->token,
'fields_display' => $this->fields_list,
'delete' => in_array('delete', $this->actions),
'identifier' => $this->identifier,
@@ -599,12 +603,11 @@ class HelperListCore extends Helper
'shop_link_type' => $this->shopLinkType,
'has_actions' => !empty($this->actions),
'has_bulk_actions' => !empty($this->bulk_actions),
'bulk_actions' => $this->bulk_actions,
'table_id' => isset($table_id) ? $table_id : null,
'table_dnd' => isset($table_dnd) ? $table_dnd : null,
'name' => isset($name) ? $name : null,
'name_id' => isset($name_id) ? $name_id : null,
'row_hover' => $this->row_hover,
'row_hover' => $this->row_hover
)));
return $this->header_tpl->fetch();
@@ -616,11 +619,7 @@ class HelperListCore extends Helper
public function displayListFooter()
{
$this->footer_tpl->assign(array_merge($this->tpl_vars, array(
'token' => $this->token,
'table' => $this->table,
'current' => $this->currentIndex,
'bulk_actions' => $this->bulk_actions,
'simple_header' => $this->simple_header
'current' => $this->currentIndex
)));
return $this->footer_tpl->fetch();
}
controllers/admin/AdminDeliverySlipController.php
+5 -8
View File
@@ -40,13 +40,11 @@ class AdminDeliverySlipControllerCore extends AdminController
'PS_DELIVERY_PREFIX' => array(
'title' => $this->l('Delivery prefix:'),
'desc' => $this->l('Prefix used for delivery slips'),
'size' => 6,
'type' => 'textLang'
),
'PS_DELIVERY_NUMBER' => array(
'title' => $this->l('Delivery number:'),
'desc' => $this->l('The next delivery slip will begin with this number and then increase with each additional slip.'),
'size' => 6,
'cast' => 'intval',
'type' => 'text'
)
@@ -63,31 +61,30 @@ class AdminDeliverySlipControllerCore extends AdminController
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Print PDF delivery slips'),
'image' => '../img/admin/AdminPdf.gif'
'icon' => 'icon-print'
),
'input' => array(
array(
'type' => 'date',
'label' => $this->l('From:'),
'name' => 'date_from',
'size' => 20,
'maxlength' => 10,
'required' => true,
'desc' => $this->l('Format: 2011-12-31 (inclusive)')
'hint' => $this->l('Format: 2011-12-31 (inclusive)')
),
array(
'type' => 'date',
'label' => $this->l('To:'),
'name' => 'date_to',
'size' => 20,
'maxlength' => 10,
'required' => true,
'desc' => $this->l('Format: 2012-12-31 (inclusive)')
'hint' => $this->l('Format: 2012-12-31 (inclusive)')
)
),
'submit' => array(
'title' => $this->l('Generate PDF file'),
'class' => 'button'
'class' => 'btn btn-primary',
'icon' => 'icon-download-alt'
)
);
controllers/admin/AdminInvoicesController.php
+1 -1
View File
@@ -132,7 +132,7 @@ class AdminInvoicesControllerCore extends AdminController
$this->fields_form = array(
'legend' => array(
'title' => $this->l('By order status'),
'icon' => 'icon-pushpin'
'icon' => 'icon-time'
),
'input' => array(
array(
controllers/admin/AdminOrderMessageController.php
+3 -8
View File
@@ -46,16 +46,13 @@ class AdminOrderMessageControllerCore extends AdminController
$this->fields_list = array(
'id_order_message' => array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 25
'align' => 'center'
),
'name' => array(
'title' => $this->l('Name'),
'width' => 140
'title' => $this->l('Name')
),
'message' => array(
'title' => $this->l('Message'),
'width' => 600,
'maxlength' => 300
)
);
@@ -63,7 +60,7 @@ class AdminOrderMessageControllerCore extends AdminController
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Order messages'),
'image' => '../img/admin/email.gif'
'icon' => 'icon-mail'
),
'input' => array(
array(
@@ -79,8 +76,6 @@ class AdminOrderMessageControllerCore extends AdminController
'lang' => true,
'label' => $this->l('Message:'),
'name' => 'message',
'cols' => 50,
'rows' => 15,
'required' => true
)
),
controllers/admin/AdminOrdersController.php
+3 -12
View File
@@ -64,17 +64,14 @@ class AdminOrdersControllerCore extends AdminController
$this->fields_list = array(
'id_order' => array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 25
'align' => 'center'
),
'reference' => array(
'title' => $this->l('Reference'),
'align' => 'center',
'width' => 65
'align' => 'center'
),
'new' => array(
'title' => $this->l('New'),
'width' => 25,
'align' => 'center',
'type' => 'bool',
'tmpTableFilter' => true,
@@ -93,7 +90,6 @@ class AdminOrdersControllerCore extends AdminController
),
'total_paid_tax_incl' => array(
'title' => $this->l('Total'),
'width' => 70,
'align' => 'right',
'prefix' => '<b>',
'suffix' => '</b>',
@@ -101,13 +97,11 @@ class AdminOrdersControllerCore extends AdminController
'currency' => true
),
'payment' => array(
'title' => $this->l('Payment: '),
'width' => 100
'title' => $this->l('Payment: ')
),
'osname' => array(
'title' => $this->l('Status'),
'color' => 'color',
'width' => 280,
'type' => 'select',
'list' => $statuses_array,
'filter_key' => 'os!id_order_state',
@@ -115,14 +109,12 @@ class AdminOrdersControllerCore extends AdminController
),
'date_add' => array(
'title' => $this->l('Date'),
'width' => 130,
'align' => 'right',
'type' => 'datetime',
'filter_key' => 'a!date_add'
),
'id_pdf' => array(
'title' => $this->l('PDF'),
'width' => 35,
'align' => 'center',
'callback' => 'printPDFIcons',
'orderby' => false,
@@ -2258,4 +2250,3 @@ class AdminOrdersControllerCore extends AdminController
$order_invoice->update();
}
}
controllers/admin/AdminSlipController.php
+6 -10
View File
@@ -35,7 +35,6 @@ class AdminSlipControllerCore extends AdminController
'id_order_slip' => array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 25
),
'id_order' => array(
'title' => $this->l('ID Order'),
@@ -43,13 +42,11 @@ class AdminSlipControllerCore extends AdminController
),
'date_add' => array(
'title' => $this->l('Date issued'),
'width' => 150,
'type' => 'date',
'align' => 'right'
),
'id_pdf' => array(
'title' => $this->l('PDF'),
'width' => 35,
'align' => 'center',
'callback' => 'printPDFIcons',
'orderby' => false,
@@ -83,32 +80,31 @@ class AdminSlipControllerCore extends AdminController
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Print a PDF'),
'image' => '../img/admin/pdf.gif'
'icon' => 'icon-print'
),
'input' => array(
array(
'type' => 'date',
'label' => $this->l('From:'),
'name' => 'date_from',
'size' => 20,
'maxlength' => 10,
'required' => true,
'desc' => $this->l('Format: 2011-12-31 (inclusive)')
'hint' => $this->l('Format: 2011-12-31 (inclusive)')
),
array(
'type' => 'date',
'label' => $this->l('To:'),
'name' => 'date_to',
'size' => 20,
'maxlength' => 10,
'required' => true,
'desc' => $this->l('Format: 2012-12-31 (inclusive)')
'hint' => $this->l('Format: 2012-12-31 (inclusive)')
)
),
'submit' => array(
'title' => $this->l('Generate PDF file'),
'class' => 'button',
'id' => 'submitPrint'
'class' => 'btn btn-primary',
'id' => 'submitPrint',
'icon' => 'icon-download-alt'
)
);
controllers/admin/AdminStatusesController.php
+20 -25
View File
@@ -73,8 +73,7 @@ class AdminStatusesControllerCore extends AdminController
$this->fields_list = array(
'id_order_state' => array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 25
'align' => 'center'
),
'name' => array(
'title' => $this->l('Name'),
@@ -85,7 +84,6 @@ class AdminStatusesControllerCore extends AdminController
'title' => $this->l('Icon'),
'align' => 'center',
'image' => 'os',
'width' => 25,
'orderby' => false,
'search' => false
),
@@ -96,14 +94,12 @@ class AdminStatusesControllerCore extends AdminController
'1' => 'enabled.gif',
'0' => 'disabled.gif'
),
'width' => 190,
'type' => 'bool',
'orderby' => false
),
'delivery' => array(
'title' => $this->l('Delivery'),
'align' => 'center',
'width' => 25,
'icon' => array(
'1' => 'enabled.gif',
'0' => 'disabled.gif'
@@ -115,7 +111,6 @@ class AdminStatusesControllerCore extends AdminController
'invoice' => array(
'title' => $this->l('Invoice'),
'align' => 'center',
'width' => 25,
'icon' => array(
'1' => 'enabled.gif',
'0' => 'disabled.gif'
@@ -124,8 +119,7 @@ class AdminStatusesControllerCore extends AdminController
'orderby' => false
),
'template' => array(
'title' => $this->l('Email template'),
'width' => 120
'title' => $this->l('Email template')
)
);
}
@@ -146,8 +140,7 @@ class AdminStatusesControllerCore extends AdminController
$this->fields_list = array(
'id_order_return_state' => array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 25
'align' => 'center'
),
'name' => array(
'title' => $this->l('Name'),
@@ -245,7 +238,7 @@ class AdminStatusesControllerCore extends AdminController
'tinymce' => true,
'legend' => array(
'title' => $this->l('Order status'),
'image' => '../img/admin/time.gif'
'icon' => 'icon-time'
),
'input' => array(
array(
@@ -253,23 +246,23 @@ class AdminStatusesControllerCore extends AdminController
'label' => $this->l('Status name:'),
'name' => 'name',
'lang' => true,
'size' => 40,
'required' => true,
'hint' => $this->l('Invalid characters: numbers and').' !<>,;?=+()@#"�{}_$%:',
'desc' => $this->l('Order status (e.g. \'Pending\')')
'hint' => array(
$this->l('Order status (e.g. \'Pending\')'),
$this->l('Invalid characters: numbers and').' !<>,;?=+()@#"�{}_$%:'
)
),
array(
'type' => 'file',
'label' => $this->l('Icon:'),
'name' => 'icon',
'desc' => $this->l('Upload an icon from your computer (File type: .gif, suggested size: 16x16)')
'hint' => $this->l('Upload an icon from your computer (File type: .gif, suggested size: 16x16)')
),
array(
'type' => 'color',
'label' => $this->l('Color:'),
'name' => 'color',
'size' => 30,
'desc' => $this->l('Status will be highlighted in this color. (HTML colors only)').' "lightblue", "#CC6600")'
'hint' => $this->l('Status will be highlighted in this color. (HTML colors only)').' "lightblue", "#CC6600")'
),
array(
'type' => 'checkbox',
@@ -358,8 +351,10 @@ class AdminStatusesControllerCore extends AdminController
'id' => 'id',
'name' => 'name'
),
'hint' => $this->l('Only letters, number and hashtags are allowed.'),
'desc' => $this->l('Email template for both .html and .txt')
'hint' => array(
$this->l('Only letters, number and hashtags are allowed.'),
$this->l('Email template for both .html and .txt')
)
)
),
'submit' => array(
@@ -392,7 +387,7 @@ class AdminStatusesControllerCore extends AdminController
'tinymce' => true,
'legend' => array(
'title' => $this->l('Order status'),
'image' => '../img/admin/time.gif'
'icon' => 'icon-time'
),
'input' => array(
array(
@@ -400,17 +395,17 @@ class AdminStatusesControllerCore extends AdminController
'label' => $this->l('Status name:'),
'name' => 'name',
'lang' => true,
'size' => 40,
'required' => true,
'hint' => $this->l('Invalid characters: numbers and').' !<>,;?=+()@#"�{}_$%:',
'desc' => $this->l('Order\'s return status name')
'hint' => array(
$this->l('Order\'s return status name'),
$this->l('Invalid characters: numbers and').' !<>,;?=+()@#"�{}_$%:'
)
),
array(
'type' => 'color',
'label' => $this->l('Color:'),
'name' => 'color',
'size' => 30,
'desc' => $this->l('Status will be highlighted in this color. (HTML colors only)').' "lightblue", "#CC6600")'
'hint' => $this->l('Status will be highlighted in this color. (HTML colors only)').' "lightblue", "#CC6600")'
)
),
'submit' => array(