diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index 367bd79e3..7b308f439 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -5073,14 +5073,13 @@ body.fixed-top { margin: 0 0 0 240px; border-left: 2px solid black; border-right: 2px solid black; - background-color: #f6f5f3; - background-image: url("../img/patterns/bedge_grunge.png"); + background-color: white; -webkit-box-shadow: #b4ac9c 0 0 0 4px; box-shadow: #b4ac9c 0 0 0 4px; } #content fieldset { padding: 20px; margin-bottom: 10px; - border: solid 1px #cac4b9; + border: solid 1px #e0ddd6; background-color: #f6f5f3; -webkit-border-radius: 5px; -moz-border-radius: 5px; diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass index b480de9f8..aca62d911 100755 --- a/admin-dev/themes/default/css/admin-theme.sass +++ b/admin-dev/themes/default/css/admin-theme.sass @@ -43,13 +43,14 @@ body.fixed-top margin: 0 0 0 240px border-left: 2px solid black border-right: 2px solid black - background-color: $bg-content-color - background-image: url('../img/patterns/bedge_grunge.png') + background-color: white + //background-color: $bg-content-color + //background-image: url('../img/patterns/bedge_grunge.png') @include box-shadow(darken($bg-content-color,30%) 0 0 0 4px) fieldset padding: 20px margin-bottom: 10px - border: solid 1px darken($bg-content-color,20%) + border: solid 1px darken($bg-content-color,10%) 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) diff --git a/admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl b/admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl index 49402f3ce..09193a7dd 100644 --- a/admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl +++ b/admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl @@ -62,8 +62,7 @@ {if isset($params.active)} {$tr.$key} {elseif isset($params.activeVisu)} - {if $tr.$key}{l s='Enabled'}{else}{l s='Disabled'}{/if} + {elseif isset($params.position)} {if $order_by == 'position' && $order_way != 'DESC'} diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl index b2f16ade3..b98283fb8 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl @@ -54,438 +54,477 @@ } -
-
-
- - - -
- - {$customer->firstname} {$customer->lastname} - -
- {$customer->email} -

- {l s='ID:'} {$customer->id|string_format:"%06d"}
- {l s='Registration date:'} {$registration_date}
- {l s='Last visit:'} {if $customer_stats['last_visit']}{$last_visit}{else}{l s='Never'}{/if}
- {if $count_better_customers != '-'}{l s='Rank: #'} {$count_better_customers}
{/if} - {if $shop_is_feature_active}{l s='Shop:'} {$name_shop}
{/if} -
- -
-
- - - -
- {l s='Language:'} {if isset($customerLanguage)}{$customerLanguage->name}{else}{l s='undefined'}{/if}
- {l s='Newsletter:'} {if $customer->newsletter}{else}{/if}
- {l s='Opt in:'} {if $customer->optin}{else}{/if}
- {l s='Age:'} {$customer_stats['age']} {if isset($customer->birthday['age'])}({$customer_birthday}){else}{l s='Unknown'}{/if}

- {l s='Last update:'} {$last_update}
- {l s='Status:'} {if $customer->active}{else}{/if} - - {if $customer->isGuest()} -
- {l s='This customer is registered as.'} {l s='Guest'} - {if !$customer_exists} +
+ +
+
+
+ + {l s='Edit'} + +

+ {$customer->firstname} {$customer->lastname} +

+
    +
  • {$customer->email}
    • +
  • {l s='ID:'} {$customer->id|string_format:"%06d"}
    • +
  • {l s='Registration date:'} {$registration_date}
    • +
  • {l s='Last visit:'} {if $customer_stats['last_visit']}{$last_visit}{else}{l s='Never'}{/if}
    • +
  • {if $count_better_customers != '-'}{l s='Rank: #'} {$count_better_customers}{/if}
    • +
  • {if $shop_is_feature_active}{l s='Shop:'} {$name_shop}{/if}
    • +
  • {l s='Language:'} {if isset($customerLanguage)}{$customerLanguage->name}{else}{l s='undefined'}{/if}
    • +
  • {l s='Newsletter:'} {if $customer->newsletter}{else}{/if}
    • +
  • {l s='Opt in:'} {if $customer->optin}{else}{/if}
    • +
  • {l s='Age:'} {$customer_stats['age']} {if isset($customer->birthday['age'])}({$customer_birthday}){else}{l s='Unknown'}{/if}
    • +
  • {l s='Last update:'} {$last_update}
    • +
  • {l s='Status:'} {if $customer->active}{else}{/if}
    • +
+ + {if $customer->isGuest()} +
+ {l s='This customer is registered as.'} {l s='Guest'} + {if !$customer_exists}
-

+

+ +

{l s='This feature generates a random password before sending an email to your customer.'}
- {else} -
{l s='A registered customer account using the defined email address already exists. '} + {else} +
+
+ {l s='A registered customer account using the defined email address already exists. '} + {/if} +
{/if} -
- {/if} - +
-
-
- -
-

- {l s='Add a private note'} -

-

{l s='This note will be displayed to all employees but not to customers.'}

-
-
- - -
-
-
-
- -
-

{l s='Messages'} ({count($messages)})

- {if count($messages)} - - - - - - - {foreach $messages AS $message} - - - - - - {/foreach} -
{l s='Status'}{l s='Message'}{l s='Sent on'}
{$message['status']} - - {$message['message']}... - - {$message['date_add']}
-
 
- {else} - {l s='%1$s %2$s has never contacted you' sprintf=[$customer->firstname, $customer->lastname]} - {/if} -
- -
-
{l s='Vouchers'} ({count($discounts)}) - {if count($discounts)} - - - - - +
+
+

+ {l s='Add a private note'} +

+ +
{l s='This note will be displayed to all employees but not to customers.'}
+ +
+ + + + + + +
+
+ + + + + + + +
+
+

{l s='Messages'} {count($messages)}

+ {if count($messages)} +
{l s='ID'}{l s='Code'}{l s='Name'}
+ - - + + + + {foreach $messages AS $message} + + + + + + {/foreach} +
{l s='Status'}{l s='Actions'}
{l s='Message'}{l s='Sent on'}
{$message['status']} + + {$message['message']}... + + {$message['date_add']}
+ {else} + {l s='%1$s %2$s has never contacted you' sprintf=[$customer->firstname, $customer->lastname]} + {/if} +
+ + + +
+
+

{l s='Vouchers'} {count($discounts)}

+ {if count($discounts)} + + + + + + + + + + + {foreach $discounts AS $key => $discount} - - - - - - - + + + + + + + + {/foreach}
{l s='ID'}{l s='Code'}{l s='Name'}{l s='Status'}{l s='Actions'}
{$discount['id_cart_rule']}{$discount['code']}{$discount['name']}{l s='Status'} - - -
{$discount['id_cart_rule']}{$discount['code']}{$discount['name']} + {l s='Status'} + + + + + + + +
{else} {l s='%1$s %2$s has no discount vouchers' sprintf=[$customer->firstname, $customer->lastname]}. {/if}
-
- - {* display hook specified to this page : AdminCustomers *} -
{hook h="displayAdminCustomers" id_customer=$customer->id}
- -
 
- -
-

{l s='Orders'} ({count($orders)})

- {if $orders AND count($orders)} - {assign var=count_ok value=count($orders_ok)} - {if $count_ok} -
-

- {l s='Valid orders:'} {$count_ok} {l s='for'} {$total_ok} -

- - - - - - - - - - - - - - - - - - - - {foreach $orders_ok AS $key => $order} - - - - - - - - - - {/foreach} -
{l s='ID'}{l s='Date'}{l s='Payment: '}{l s='State'}{l s='Products'}{l s='Total spent'}{l s='Actions'}
{$order['id_order']}{$order['date_add']}{$order['payment']}{$order['order_state']}{$order['nb_products']}{$order['total_paid_real']}
-
- {/if} - {assign var=count_ko value=count($orders_ko)} - {if $count_ko} -
- - - - - - - - - - - - - - - - - - - - {foreach $orders_ko AS $key => $order} - - - - - - - - - - {/foreach} -
{l s='ID'}{l s='Date'}{l s='Payment: '}{l s='State'}{l s='Products'}{l s='Total spent'}{l s='Actions'}
{$order['id_order']}{$order['date_add']}{$order['payment']}{$order['order_state']}{$order['nb_products']}{$order['total_paid_real']}
-

{l s='Invalid orders:'} {$count_ko}

-
- {/if} - {else} - {l s='%1$s %2$s has not placed any orders yet' sprintf=[$customer->firstname, $customer->lastname]} - {/if} -
- -
-
-

{l s='Carts'} ({count($carts)})

+ + + +
+ {* display hook specified to this page : AdminCustomers *} +
{hook h="displayAdminCustomers" id_customer=$customer->id}
+
+ + +
+
+

{l s='Orders'} {count($orders)}

+ {if $orders AND count($orders)} + {assign var=count_ok value=count($orders_ok)} + {if $count_ok} +

+ {l s='Valid orders:'} {$count_ok} {l s='for'} {$total_ok} +

+ + + + + + + + + + + + + + {foreach $orders_ok AS $key => $order} + + + + + + + + + + {/foreach} + +
{l s='ID'}{l s='Date'}{l s='Payment: '}{l s='State'}{l s='Products'}{l s='Total spent'}{l s='Actions'}
{$order['id_order']}{$order['date_add']}{$order['payment']}{$order['order_state']}{$order['nb_products']}{$order['total_paid_real']} + + {l s='View'} + +
+ {/if} + {assign var=count_ko value=count($orders_ko)} + {if $count_ko} + + + + + + + + + + + + + + {foreach $orders_ko AS $key => $order} + + + + + + + + + + {/foreach} + +
{l s='ID'}{l s='Date'}{l s='Payment: '}{l s='State'}{l s='Products'}{l s='Total spent'}{l s='Actions'}
{$order['id_order']}{$order['date_add']}{$order['payment']}{$order['order_state']}{$order['nb_products']}{$order['total_paid_real']} + + {l s='View'} + +
+
{l s='Invalid orders:'} {$count_ko}
+ {/if} + {else} + {l s='%1$s %2$s has not placed any orders yet' sprintf=[$customer->firstname, $customer->lastname]} + {/if} +
+
+ + +
+
+

{l s='Carts'} {count($carts)}

{if $carts AND count($carts)} - - - - - - - - - - - - - - - +
{l s='ID'}{l s='Date'}{l s='Carrier'}{l s='Total'}{l s='Actions'}
+ + + + + + + + + + {foreach $carts AS $key => $cart} - - - - + + + + - + {/foreach} +
{l s='ID'}{l s='Date'}{l s='Carrier'}{l s='Total'}{l s='Actions'}
{$cart['id_cart']}{$cart['date_add']}{$cart['name']}
{$cart['id_cart']}{$cart['date_add']}{$cart['name']} {$cart['total_price']} + + {l s='View'} + +
{else} {l s='No cart is available'}. {/if}
-
+ -
 
- {if $products AND count($products)} -
 
-

{l s='Products:'} ({count($products)})

- - - - - - - - - - - - - - {foreach $products AS $key => $product} - - - - - - - {/foreach} -
{l s='Date'}{l s='Name'}{l s='Quantity'}{l s='Actions'}
{$product['date_add']}{$product['product_name']}{$product['product_quantity']}
- {/if} -
 
-
-

{l s='Addresses'} ({count($addresses)})

- {if count($addresses)} - - - - - - - - - - - - - - - - - - {foreach $addresses AS $key => $address} - - - - - - - - - {/foreach} -
{l s='Company'}{l s='Name'}{l s='Address'}{l s='Country'}{l s='Phone number(s)'}{l s='Actions'}
{if $address['company']}{$address['company']}{else}--{/if}{$address['firstname']} {$address['lastname']}{$address['address1']} {if $address['address2']}{$address['address2']}{/if} {$address['postcode']} {$address['city']}{$address['country']} - {if $address['phone']} - {$address['phone']} - {if $address['phone_mobile']}
{$address['phone_mobile']}{/if} - {else} - {if $address['phone_mobile']}
{$address['phone_mobile']}{else}--{/if} - {/if} - 		- - -
- {else} - {l s='%1$s %2$s has not registered any addresses yet' sprintf=[$customer->firstname, $customer->lastname]} - {/if} -
- -
-
-

- {l s='Groups'} ({count($groups)}) - - - -

- {if $groups AND count($groups)} - - - - - - +
+ {if $products AND count($products)} +
+

{l s='Products:'} {count($products)}

+
+ - - + + + - {foreach $groups AS $key => $group} - - - - + + + {foreach $products AS $key => $product} + + + + + - {/foreach} -
{l s='ID'}{l s='Name'}{l s='Date'}{l s='Name'}{l s='Quantity'} {l s='Actions'}
{$group['id_group']}{$group['name']}
{$product['date_add']}{$product['product_name']}{$product['product_quantity']} + + {l s='View'} + +
- {/if} -
-
- -
 
- - {if count($interested)} -
-

{l s='Products:'} ({count($interested)})

- - - - - - - {foreach $interested as $key => $p} - - - - - - {/foreach} + {/foreach} +
{$p['id']}{$p['name']}
- {/if} + {/if} + -
 
-
- {* Last connections *} - {if count($connections)} -

{l s='Last connections'}

- - - - - - - - - - - - - - - - {foreach $connections as $connection} - - - - - - - - {/foreach} -
{l s='Date'}{l s='Pages viewed'}{l s='Total time'}{l s='Origin'}{l s='IP Address'}
{$connection['date_add']}{$connection['pages']}{$connection['time']}{$connection['http_referer']}{$connection['ipaddress']}
-
 
- {/if} -
-
-
- {if count($referrers)} -

{l s='Referrers'}

- - - - - {if $shop_is_feature_active}{/if} - - {foreach $referrers as $referrer} + +
+
+

{l s='Addresses'} {count($addresses)}

+ {if count($addresses)} +
{l s='Date'}{l s='Name'}{l s='Shop'}
+ - - - {if $shop_is_feature_active}{/if} + + + + + + - {/foreach} + + + {foreach $addresses AS $key => $address} + + + + + + + + + {/foreach} +
{$referrer['date_add']}{$referrer['name']}{$referrer['shop_name']}{l s='Company'}{l s='Name'}{l s='Address'}{l s='Country'}{l s='Phone number(s)'}{l s='Actions'}
{if $address['company']}{$address['company']}{else}--{/if}{$address['firstname']} {$address['lastname']}{$address['address1']} {if $address['address2']}{$address['address2']}{/if} {$address['postcode']} {$address['city']}{$address['country']} + {if $address['phone']} + {$address['phone']} + {if $address['phone_mobile']}
{$address['phone_mobile']}{/if} + {else} + {if $address['phone_mobile']}
{$address['phone_mobile']}{else}--{/if} + {/if} + 		+ + + + + + +
+ {else} + {l s='%1$s %2$s has not registered any addresses yet' sprintf=[$customer->firstname, $customer->lastname]} {/if}
+ + + +
+
+

+ {l s='Groups'} {count($groups)} + + {l s='Edit'} + +

+ {if $groups AND count($groups)} + + + + + + + + + + {foreach $groups AS $key => $group} + + + + + + {/foreach} + +
{l s='ID'}{l s='Name'}{l s='Actions'}
{$group['id_group']}{$group['name']} + + {l s='View'} + +
+ {/if} +
+
+ + +
+ {if count($interested)} +
+

{l s='Products:'} {count($interested)}

+ + + + + + + + + + {foreach $interested as $key => $p} + + + + + + {/foreach} + +
{l s='ID'}{l s='Name'}{l s='Actions'}
{$p['id']}{$p['name']} + + {l s='View'} + +
+
+
+ {/if} +
+ +
+ {if count($connections)} +
+

{l s='Last connections'}

+ + + + + + + + + + + + {foreach $connections as $connection} + + + + + + + + {/foreach} + +
{l s='Date'}{l s='Pages viewed'}{l s='Total time'}{l s='Origin'}{l s='IP Address'}
{$connection['date_add']}{$connection['pages']}{$connection['time']}{$connection['http_referer']}{$connection['ipaddress']}
+
+ {/if} +
+ + +
+
+ {if count($referrers)} +

{l s='Referrers'}

+ + + + + + {if $shop_is_feature_active}{/if} + + + + {foreach $referrers as $referrer} + + + + {if $shop_is_feature_active}{/if} + + {/foreach} + +
{l s='Date'}{l s='Name'}{l s='Shop'}
{$referrer['date_add']}{$referrer['name']}{$referrer['shop_name']}
+ {/if} +
+
+
{/block} -
-
 
\ No newline at end of file diff --git a/admin-dev/themes/default/template/helpers/list/list_action_enable.tpl b/admin-dev/themes/default/template/helpers/list/list_action_enable.tpl index 94c9613b1..c1866f761 100644 --- a/admin-dev/themes/default/template/helpers/list/list_action_enable.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_action_enable.tpl @@ -23,10 +23,10 @@ * International Registered Trademark & Property of PrestaShop SA *} - + {if $enabled} - {l s='Enabled'} + {l s='Yes'} {else} - {l s='Disabled'} + {l s='No'} {/if} diff --git a/admin-dev/themes/default/template/helpers/required_fields.tpl b/admin-dev/themes/default/template/helpers/required_fields.tpl index edfbd6e69..4f543b9da 100644 --- a/admin-dev/themes/default/template/helpers/required_fields.tpl +++ b/admin-dev/themes/default/template/helpers/required_fields.tpl @@ -23,39 +23,42 @@ * International Registered Trademark & Property of PrestaShop SA *} - - {l s='Set required fields for this section'} - + + {l s='Set required fields for this section'} + + \ No newline at end of file diff --git a/admin-dev/themes/default/template/layout.tpl b/admin-dev/themes/default/template/layout.tpl index d5fbf6f24..18f8de196 100644 --- a/admin-dev/themes/default/template/layout.tpl +++ b/admin-dev/themes/default/template/layout.tpl @@ -47,15 +47,16 @@ {/if} {if isset($informations) && count($informations) && $informations}
- - {l s='Click here to see more informations'} - - -

+ +
{/if} {if isset($confirmations) && count($confirmations) && $confirmations}
diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index 16a8e01fd..9e6dc528a 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -268,30 +268,26 @@ class AdminCustomersControllerCore extends AdminController 'type' => 'text', 'label' => $this->l('First name:'), 'name' => 'firstname', - 'size' => 33, 'required' => true, - 'hint' => $this->l('Forbidden characters:').' 0-9!<>,;?=+()@#"�{}_$%:' + 'hint' => $this->l('Forbidden characters:').' 0-9!<>,;?=+()@#"�{}_$%:' ), array( 'type' => 'text', 'label' => $this->l('Last name:'), 'name' => 'lastname', - 'size' => 33, 'required' => true, - 'hint' => $this->l('Invalid characters:').' 0-9!<>,;?=+()@#"�{}_$%:' + 'hint' => $this->l('Invalid characters:').' 0-9!<>,;?=+()@#"�{}_$%:' ), array( 'type' => 'text', 'label' => $this->l('Email address:'), 'name' => 'email', - 'size' => 33, 'required' => true ), array( 'type' => 'password', 'label' => $this->l('Password:'), 'name' => 'passwd', - 'size' => 33, 'required' => ($obj->id ? false : true), 'hint' => ($obj->id ? $this->l('Leave this field blank if there\'s no change') : $this->l('Minimum of five characters (only letters and numbers).').' -_') ), @@ -430,32 +426,27 @@ class AdminCustomersControllerCore extends AdminController $this->fields_form['input'][] = array( 'type' => 'text', 'label' => $this->l('Company:'), - 'name' => 'company', - 'size' => 33 + 'name' => 'company' ); $this->fields_form['input'][] = array( 'type' => 'text', 'label' => $this->l('SIRET:'), - 'name' => 'siret', - 'size' => 14 + 'name' => 'siret' ); $this->fields_form['input'][] = array( 'type' => 'text', 'label' => $this->l('APE:'), - 'name' => 'ape', - 'size' => 5 + 'name' => 'ape' ); $this->fields_form['input'][] = array( 'type' => 'text', 'label' => $this->l('Website:'), - 'name' => 'website', - 'size' => 33 + 'name' => 'website' ); $this->fields_form['input'][] = array( 'type' => 'text', 'label' => $this->l('Outstanding allowed:'), 'name' => 'outstanding_allow_amount', - 'size' => 10, 'hint' => $this->l('Valid characters:').' 0-9', 'suffix' => '¤' ); @@ -463,7 +454,6 @@ class AdminCustomersControllerCore extends AdminController 'type' => 'text', 'label' => $this->l('Maximum number of payment days:'), 'name' => 'max_payment_days', - 'size' => 10, 'hint' => $this->l('Valid characters:').' 0-9' ); $this->fields_form['input'][] = array( @@ -846,19 +836,19 @@ class AdminCustomersControllerCore extends AdminController Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token); } - public static function printNewsIcon($value, $customer) + public function printNewsIcon($value, $customer) { - return ' - '.($value ? '' : ''). + '.($value ? ' '.$this->l('Yes') : ' '.$this->l('No')). ''; } - public static function printOptinIcon($value, $customer) + public function printOptinIcon($value, $customer) { - return ' - '.($value ? '' : ''). + '.($value ? ' '.$this->l('Yes') : ' '.$this->l('No')). ''; } @@ -924,5 +914,3 @@ class AdminCustomersControllerCore extends AdminController } } } - - diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php index 5755453b8..7a5ce0395 100644 --- a/controllers/admin/AdminGroupsController.php +++ b/controllers/admin/AdminGroupsController.php @@ -224,13 +224,13 @@ class AdminGroupsControllerCore extends AdminController 'name' => 'name', 'required' => true, 'lang' => true, - 'hint' => $this->l('Forbidden characters:').' 0-9!<>,;?=+()@#"�{}_$%:' + 'hint' => $this->l('Forbidden characters:').' 0-9!&lt;&gt;,;?=+()@#"�{}_$%:' ), array( 'type' => 'text', 'label' => $this->l('Discount (%):'), 'name' => 'reduction', - 'desc' => $this->l('Automatically apply this value as a discount on all products for members of this customer group.') + 'hint' => $this->l('Automatically apply this value as a discount on all products for members of this customer group.') ), array( 'type' => 'select', @@ -496,13 +496,13 @@ class AdminGroupsControllerCore extends AdminController * @param $tr array Row data * @return string HTML link and icon */ - public static function printShowPricesIcon($id_group, $tr) + public function printShowPricesIcon($id_group, $tr) { $group = new Group($tr['id_group']); if (!Validate::isLoadedObject($group)) return; - return ' - '.($group->show_prices ? '' : ''). + return ' + '.($group->show_prices ? ' '.$this->l('Yes') : ' '.$this->l('No')). ''; }