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

// update order tab

Browse Source
This commit is contained in:
sLorenzini
2013-07-15 17:58:23 +02:00
parent 27571f4d06
commit 66f64c1baa
4 changed files with 493 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl
+8 -12
View File
@@ -64,22 +64,18 @@
{if $input.type == 'checkboxStatuses'} {if $input.type == 'checkboxStatuses'}
{foreach $input.values.query as $value} {foreach $input.values.query as $value}
{assign var=id_checkbox value=$input.name|cat:'_'|cat:intval($value[$input.values.id])} {assign var=id_checkbox value=$input.name|cat:'_'|cat:intval($value[$input.values.id])}
<input type="checkbox" <p class="checkbox">
name="{$input.name}[]" <label for="{$id_checkbox}" class="control-label">
id="{$id_checkbox}" <input type="checkbox" name="{$input.name}[]" id="{$id_checkbox}" value="{$value[$input.values.id]|intval}" {if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} />
value="{$value[$input.values.id]|intval}" <img src="../img/admin/charged_{if $value['invoice']}ok{else}ko{/if}.gif" alt="" />
{if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} /> {$value[$input.values.name]}
<label for="{$id_checkbox}" ({if isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']]}{$statusStats[$value['id_order_state']]}{else}0{/if})
style="float:none;{if !(isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']])}font-weight:normal;{/if}padding:0;text-align:left;width:100%;color:#000"> </label>
<img src="../img/admin/charged_{if $value['invoice']}ok{else}ko{/if}.gif" alt="" /> </p>
{$value[$input.values.name]}
({if isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']]}{$statusStats[$value['id_order_state']]}{else}0{/if})
</label><br />
{/foreach} {/foreach}
{else} {else}
{$smarty.block.parent} {$smarty.block.parent}
{/if} {/if}
{/block} {/block}
{block name="after"}<div style="clear:both">&nbsp;</div>{/block}
admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl
+4 -4
View File
@@ -63,7 +63,7 @@
<ul class="nav"> <ul class="nav">
{if count($tab_modules_list.installed)} {if count($tab_modules_list.installed)}
<li> <li>
<a id="nav_tabs_modules_installed" class="btn btn-default" href="#" onclick=""> <a id="nav_tabs_modules_installed" class="panel-content" href="#" onclick="">
<i class="icon-plus-sign-alt"></i> <i class="icon-plus-sign-alt"></i>
{l s='Installed'} {l s='Installed'}
</a> </a>
@@ -71,7 +71,7 @@
{/if} {/if}
{if count($tab_modules_list.not_installed)} {if count($tab_modules_list.not_installed)}
<li> <li>
<a href="#" id="nav_tabs_modules_not_installed" class="btn btn-default"> <a href="#" id="nav_tabs_modules_not_installed" class="panel-content">
<i class="icon-minus-sign-alt"></i> <i class="icon-minus-sign-alt"></i>
{l s='Not Installed'} {l s='Not Installed'}
</a> </a>
@@ -82,14 +82,14 @@
</div> </div>
<div id="modules_list_container_content"> <div id="modules_list_container_content">
{if count($tab_modules_list.installed)} {if count($tab_modules_list.installed)}
<table id="tab_modules_list_installed"> <table id="tab_modules_list_installed" class="table table-striped table-hover">
{foreach from=$tab_modules_list.installed item=module} {foreach from=$tab_modules_list.installed item=module}
{include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}} {include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}}
{/foreach} {/foreach}
</table> </table>
{/if} {/if}
{if count($tab_modules_list.not_installed)} {if count($tab_modules_list.not_installed)}
<table id="tab_modules_list_not_installed"> <table id="tab_modules_list_not_installed" class="table table-striped table-hover">
{foreach from=$tab_modules_list.not_installed item=module} {foreach from=$tab_modules_list.not_installed item=module}
{include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}} {include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}}
{/foreach} {/foreach}
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+480 -484
View File
File diff suppressed because it is too large Load Diff
controllers/admin/AdminInvoicesController.php
+1
View File
@@ -28,6 +28,7 @@ class AdminInvoicesControllerCore extends AdminController
{ {
public function __construct() public function __construct()
{ {
$this->bootstrap = true;
$this->table = 'invoice'; $this->table = 'invoice';
parent::__construct(); parent::__construct();