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

// Groups review

Browse Source
This commit is contained in:
Damien Metzger
2013-11-05 16:30:34 +01:00
parent 0bd6b940d2
commit 161c701ecf
3 changed files with 59 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
+6 -7
View File
@@ -27,11 +27,11 @@
{block name="label"}
{if $input['type'] == 'modules'}
<div style="{if !$form_id}display:none{/if}">
<div {if !$form_id}class="hide"{/if}>
<label class="control-label col-lg-3">{l s='Authorized modules:'}</label>
</div>
{elseif $input['type'] == 'group_discount_category'}
<div style="{if !$form_id}display:none{/if}">
<div {if !$form_id}class="hide"{/if}>
{$smarty.block.parent}
</div>
{else}
@@ -39,10 +39,9 @@
{/if}
{/block}
{block name="field"}
{if $input['type'] == 'group_discount_category'}
<div style="{if !$form_id}display:none{/if}">
<div {if !$form_id}class="hide"{/if}>
<script type="text/javascript">
$(document).ready(function() {
$("#group_discount_category").fancybox({
@@ -143,7 +142,7 @@
</tr>
{/foreach}
</table>
</div>
<div style="display:none" id="group_discount_category_fancybox">
<div class="panel form-horizontal">
<div class="col-lg-12">
@@ -168,7 +167,7 @@
</div>
</div>
{elseif $input['type'] == 'modules'}
<div style="{if !$form_id}display:none{/if}">
<div {if !$form_id}class="hide"{/if}>
<script type="text/javascript">
$(document).ready(function() {
$('#authorized-modules').find('[value="0"]').click(function() {
@@ -217,4 +216,4 @@
{else}
{$smarty.block.parent}
{/if}
{/block}
{/block}
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
+52 -48
View File
@@ -26,58 +26,62 @@
{extends file="helpers/view/view.tpl"}
{block name="override_tpl"}
<div class="col-lg-6">
<div class="panel">
<h3><i class="icon-group"></i> {l s='Group information'}</h3>
<h2><i class="icon-group"></i> {$group->name[$language->id]}</h2>
<div class="form-horizontal">
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Discount:'}</label>
<div class="col-lg-3"><p class="form-control-static">{l s='%d%%' sprintf=$group->reduction}</p></div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Price display method:'}</label>
<div class="col-lg-3"><p class="form-control-static">{if $group->price_display_method}
{l s='Tax excluded'}
{else}
{l s='Tax included'}
{/if}</p></div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Show prices:'}</label>
<div class="col-lg-3"><p class="form-control-static">{if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if}</p></div>
<div class="row">
<div class="col-lg-6">
<div class="panel">
<h3><i class="icon-group"></i> {l s='Group information'}</h3>
<h2><i class="icon-group"></i> {$group->name[$language->id]}</h2>
<div class="form-horizontal">
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Discount:'}</label>
<div class="col-lg-3"><p class="form-control-static">{l s='%d%%' sprintf=$group->reduction}</p></div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Price display method:'}</label>
<div class="col-lg-3"><p class="form-control-static">{if $group->price_display_method}
{l s='Tax excluded'}
{else}
{l s='Tax included'}
{/if}</p></div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Show prices:'}</label>
<div class="col-lg-3"><p class="form-control-static">{if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if}</p></div>
</div>
</div>
</div>
</div>
</div>
<div class="col-lg-6">
<div class="panel">
<h3><i class="icon-dollar"></i> {l s='Current category discount'}</h3>
{if !$categorieReductions}
<div class="alert alert-warning">{l s='None'}</div>
{else}
<table class="table">
<thead>
<tr>
<th><span class="title_box">{l s='Category'}</span></th>
<th><span class="title_box">{l s='Discount'}</span></th>
</tr>
</thead>
<tbody>
{foreach $categorieReductions key=key item=category }
<tr class="alt_row">
<td>{$category.path}</td>
<td>{l s='%d%%' sprintf=$category.reduction}</td>
</tr>
{/foreach}
<tbody>
</table>
{/if}
<div class="col-lg-6">
<div class="panel">
<h3><i class="icon-dollar"></i> {l s='Current category discount'}</h3>
{if !$categorieReductions}
<div class="alert alert-warning">{l s='None'}</div>
{else}
<table class="table">
<thead>
<tr>
<th><span class="title_box">{l s='Category'}</span></th>
<th><span class="title_box">{l s='Discount'}</span></th>
</tr>
</thead>
<tbody>
{foreach $categorieReductions key=key item=category }
<tr class="alt_row">
<td>{$category.path}</td>
<td>{l s='%d%%' sprintf=$category.reduction}</td>
</tr>
{/foreach}
<tbody>
</table>
{/if}
</div>
</div>
</div>
<div class="col-lg-12">
<h2>{l s='Members of this customer group'}</h2>
<p>{l s='Limited to the first 100 customers.'} {l s='Please use filters to narrow your search.'}</p>
{$customerList}
<div class="row">
<div class="col-lg-12">
<h2>{l s='Members of this customer group'}</h2>
<p>{l s='Limited to the first 100 customers.'} {l s='Please use filters to narrow your search.'}</p>
{$customerList}
</div>
</div>
{/block}
controllers/admin/AdminGroupsController.php
+1 -1
View File
@@ -310,7 +310,7 @@ class AdminGroupsControllerCore extends AdminController
),
array(
'type' => 'modules',
'label' => array('auth_modules' => $this->l('Authorized modules:'), 'unauth_modules' => $this->l('Unauthorized modules:')),
'label' => $this->l('Modules Authorization'),
'name' => 'auth_modules',
'values' => $this->formatModuleListAuth($group->id)
)