diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl index 6e9056c54..d0006b8bb 100755 --- a/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl @@ -26,40 +26,55 @@ {extends file="helpers/view/view.tpl"} {block name="override_tpl"} - +
- + {/if}

+ +
+ +

{if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if}

+
+ -

{l s='Members of this customer group'}

-

{l s='Limited to the 100th first customers.'} {l s='Please use filters to narrow your search.'}

- {$customerList} + +
+
+

{l s='Current category discount'}

+ {if !$categorieReductions} +
{l s='None'}
+ {else} + + + + + + + + + {foreach $categorieReductions key=key item=category } + + + + + {/foreach} + +
{l s='Category'}{l s='Discount'}
{$category.path}{l s='%d%%' sprintf=$category.reduction}
+ {/if} +
+
+{$customerList} {/block} \ No newline at end of file diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php index 362e44d7a..d6494ca27 100644 --- a/controllers/admin/AdminGroupsController.php +++ b/controllers/admin/AdminGroupsController.php @@ -191,15 +191,15 @@ class AdminGroupsControllerCore extends AdminController $genders[$gender->id] = $gender->name; } $customer_fields_display = (array( - 'id_customer' => array('title' => $this->l('ID'), 'align' => 'center'), - 'id_gender' => array('title' => $this->l('Titles'), 'align' => 'center','icon' => $genders_icon, 'list' => $genders), - 'firstname' => array('title' => $this->l('Name'), 'align' => 'center'), - 'lastname' => array('title' => $this->l('Name'), 'align' => 'center'), + 'id_customer' => array('title' => $this->l('ID'), 'align' => 'center', 'class' => 'fixed-width-xs'), + 'id_gender' => array('title' => $this->l('Titles'), 'align' => 'center','icon' => $genders_icon, 'list' => $genders, 'class' => 'fixed-width-sm'), + 'firstname' => array('title' => $this->l('First name'), 'align' => 'center'), + 'lastname' => array('title' => $this->l('Last name'), 'align' => 'center'), 'email' => array('title' => $this->l('Email address'), 'align' => 'center'), 'birthday' => array('title' => $this->l('Birth date'), 'align' => 'right', 'type' => 'date'), 'date_add' => array('title' => $this->l('Register date'), 'align' => 'right', 'type' => 'date'), - 'orders' => array('title' => $this->l('Orders'), 'align' => 'center'), - 'active' => array('title' => $this->l('Enabled'),'align' => 'center', 'active' => 'status','type' => 'bool') + 'orders' => array('title' => $this->l('Orders'), 'align' => 'center', 'class' => 'fixed-width-xs'), + 'active' => array('title' => $this->l('Enabled'),'align' => 'center', 'active' => 'status','type' => 'bool', 'class' => 'fixed-width-xs') )); $customer_list = $group->getCustomers(false, 0, 100, true); @@ -212,7 +212,7 @@ class AdminGroupsControllerCore extends AdminController $helper->identifier = 'id_customer'; $helper->actions = array('edit', 'view'); $helper->show_toolbar = false; - + $helper->title = $this->l('Members of this customer group (Limited to the 100th first customers. Please use filters to narrow your search.)'); return $helper->generateList($customer_list, $customer_fields_display); }