diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index b0c889c38..ad50e541c 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -7598,12 +7598,12 @@ html, body { color: contrasted(#e6e8e3); } /* line 46, admin-theme.sass */ #content h3:not(.modal-title) .badge, #content .panel-heading:not(.modal-title) .badge, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .badge, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header:not(.modal-title) .badge, #content h3:not(.modal-title) #header_notifs_icon_wrapper .notifs_badge, #header_notifs_icon_wrapper #content h3:not(.modal-title) .notifs_badge, #content .panel-heading:not(.modal-title) #header_notifs_icon_wrapper .notifs_badge, #header_notifs_icon_wrapper #content .panel-heading:not(.modal-title) .notifs_badge, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .notifs_badge, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header:not(.modal-title) .notifs_badge, #content .panel-heading .badge, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .badge, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header .badge, #content .panel-heading #header_notifs_icon_wrapper .notifs_badge, #header_notifs_icon_wrapper #content .panel-heading .notifs_badge, #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .notifs_badge, #header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header .notifs_badge { - background-color: white; - -webkit-border-radius: none; - -moz-border-radius: none; - -ms-border-radius: none; - -o-border-radius: none; - border-radius: none; + background-color: #1ba6e5; + -webkit-border-radius: 0; + -moz-border-radius: 0; + -ms-border-radius: 0; + -o-border-radius: 0; + border-radius: 0; height: 29px; line-height: 25px; font-size: 1.3em; @@ -7634,10 +7634,6 @@ html, body { #content .panel-danger .panel-heading, #content .panel-danger #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header, #header_notifs_icon_wrapper .notifs_panel #content .panel-danger .notifs_panel_header { background-color: #8bc954 !important; } /* line 74, admin-theme.sass */ -#content .panel-heading-big { - font-size: 2em; - text-align: center; } -/* line 77, admin-theme.sass */ #content form .alert, #content form #carrier_wizard .wizard_error, #carrier_wizard #content form .wizard_error { clear: both; } @media (max-width: 768px) { @@ -7646,7 +7642,7 @@ html, body { margin-left: 0; width: 100%; } } -/* line 84, admin-theme.sass */ +/* line 81, admin-theme.sass */ #nobootstrap { float: left; } @@ -8817,21 +8813,28 @@ textarea { .page-head h2.page-title { padding: 0 0 0 20px; } } /* line 21, admin-theme/_admin-toolbar.sass */ +.page-head h2.page-title a { + border-bottom: dotted 1px white; } +/* line 23, admin-theme/_admin-toolbar.sass */ +.page-head h2.page-title a:hover { + color: black; + border-color: black; } +/* line 26, admin-theme/_admin-toolbar.sass */ .page-head a { color: white; - font-style: underline; } -/* line 24, admin-theme/_admin-toolbar.sass */ + text-decoration: none; } +/* line 30, admin-theme/_admin-toolbar.sass */ .page-head .btn-toolbar { margin: 0; padding: 3px 0 0 0; } -/* line 27, admin-theme/_admin-toolbar.sass */ +/* line 33, admin-theme/_admin-toolbar.sass */ .page-head .btn-toolbar .nav-tabs { margin: 0; } -/* line 29, admin-theme/_admin-toolbar.sass */ +/* line 35, admin-theme/_admin-toolbar.sass */ .page-head .btn-toolbar .nav-tabs > li > a { color: #333333; } -/* line 32, admin-theme/_admin-toolbar.sass */ +/* line 38, admin-theme/_admin-toolbar.sass */ .toolbar_btn { position: relative; padding: 2px 5px !important; @@ -8841,13 +8844,13 @@ textarea { color: white; text-align: center; text-shadow: none; } -/* line 41, admin-theme/_admin-toolbar.sass */ +/* line 47, admin-theme/_admin-toolbar.sass */ .toolbar_btn:hover { color: #8fc04d; border-color: white; background-color: white !important; } -/* line 46, admin-theme/_admin-toolbar.sass */ +/* line 52, admin-theme/_admin-toolbar.sass */ [class^="process-icon-"], [class*=" process-icon-"] { height: 25px; min-width: 32px; diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass index 1a8cfdf33..b9c057ae9 100755 --- a/admin-dev/themes/default/css/admin-theme.sass +++ b/admin-dev/themes/default/css/admin-theme.sass @@ -44,8 +44,8 @@ html, body i, a color: contrasted($bg-panel-heading-color) .badge - background-color: lighten($bg-panel-heading-color,20%) - @include border-radius(none) + background-color: $brand-primary + +border-radius(0) height: 29px line-height: 25px font-size: 1.3em @@ -71,9 +71,6 @@ html, body line-height: 30px .panel-danger .panel-heading background-color: $badge-notif-color!important - .panel-heading-big - font-size: 2em - text-align: center form .alert clear: both diff --git a/admin-dev/themes/default/css/admin-theme/_admin-toolbar.sass b/admin-dev/themes/default/css/admin-theme/_admin-toolbar.sass index e57862b7e..fb2e152eb 100644 --- a/admin-dev/themes/default/css/admin-theme/_admin-toolbar.sass +++ b/admin-dev/themes/default/css/admin-theme/_admin-toolbar.sass @@ -18,9 +18,15 @@ text-transform: uppercase @media (max-width: $screen-tablet) padding: 0 0 0 20px + a + border-bottom: dotted 1px white + &:hover + color: black + border-color: black a color: white - font-style: underline + text-decoration: none + .btn-toolbar margin: 0 padding: 3px 0 0 0 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 8efd56ba6..6a7793938 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 @@ -55,100 +55,247 @@ } -
+
+
+ {*left*} +
+
+
+ + {$customer->firstname} + {$customer->lastname} +
+
    +
  • + {l s='Gender:'} + +
    • +
  • + {l s='Email:'} + {$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} +
    • +
-{*left*} -
-
-
- {$customer->firstname} {$customer->lastname} -
-
    -
  • {l s='Gender:'}
    • -
  • {l s='Email:'} {$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} {l s='Yes'}{else} {l s='No'}{/if}
    • -
  • {l s='Opt in:'} {if $customer->optin} {l s='Yes'}{else} {l s='No'}{/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} {l s='Yes'}{else} {l s='No'}{/if}
    • -
+
    +
  • + {l s='Language:'} + + {if isset($customerLanguage)} + {$customerLanguage->name} + {else} + {l s='undefined'} + {/if} + +
    • +
  • + {l s='Newsletter:'} {if $customer->newsletter} + + {l s='Yes'} + + {else} + + {l s='No'} + + {/if} +
    • +
  • + {l s='Opt in:'} + {if $customer->optin} + + + {l s='Yes'} + + {else} + + + {l s='No'} + + {/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} + + + {l s='Yes'} + + {else} + + + {l s='No'} + + {/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. '} + {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. '} + {/if} +
{/if} + + {l s='Edit'} +
- {/if} - - {l s='Edit'} - -
-
-
- {l s='Orders'} {count($orders)} -
- {if $orders AND count($orders)} +
+
+ {l s='Orders'} {count($orders)} +
+ {if $orders AND count($orders)} - {assign var=count_ok value=count($orders_ok)} - {assign var=count_ko value=count($orders_ko)} + {assign var=count_ok value=count($orders_ok)} + {assign var=count_ko value=count($orders_ko)} -
-
-
- - {l s='Valid orders:'} {$count_ok} {l s='for'} {$total_ok} -
-
- - {l s='Invalid orders:'} {$count_ko} +
+
+
+ + {l s='Valid orders:'} {$count_ok} {l s='for'} {$total_ok} +
+
+ + {l s='Invalid orders:'} {$count_ko} +
+ + {if $count_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']}{dateFormat date=$order['date_add'] full=0}{$order['payment']}{$order['order_state']}{$order['nb_products']}{$order['total_paid_real']} + + {l s='View'} + +
+ {/if} + + {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']}{dateFormat date=$order['date_add'] full=0}{$order['payment']}{$order['order_state']}{$order['nb_products']}{$order['total_paid_real']} + + {l s='View'} + +
+ {/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 $count_ok} + {if $carts AND count($carts)} - + - - - - + + - {foreach $orders_ok AS $key => $order} - - + {foreach $carts AS $key => $cart} + + - - - - + + @@ -156,69 +303,224 @@ {/foreach}
{l s='ID'}{l s='ID'} {l s='Date'}{l s='Payment: '}{l s='State'}{l s='Products'}{l s='Total spent'}{l s='Carrier'}{l s='Total'} {l s='Actions'}
{$order['id_order']}
{$cart['id_cart']} {dateFormat date=$order['date_add'] full=0}{$order['payment']}{$order['order_state']}{$order['nb_products']}{$order['total_paid_real']}{$cart['name']}{$cart['total_price']} - + {l s='View'}
+ {else} + {l s='No cart is available'}. {/if} - - {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']}{dateFormat date=$order['date_add'] full=0}{$order['payment']}{$order['order_state']}{$order['nb_products']}{$order['total_paid_real']} - - {l s='View'} - -
- {/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)} + + {if $products AND count($products)} +
+
+ {l s='Products:'} {count($products)} +
- - - - + + + - {foreach $carts AS $key => $cart} - - + {foreach $products AS $key => $product} + - - + + + + {/foreach} + +
{l s='ID'}{l s='Date'}{l s='Carrier'}{l s='Total'}{l s='Date'}{l s='Name'}{l s='Quantity'} {l s='Actions'}
{$cart['id_cart']}
{dateFormat date=$order['date_add'] full=0}{$cart['name']}{$cart['total_price']}{$product['product_name']}{$product['product_quantity']} - + + {l s='View'} + +
+
+ {/if} +
+ + {*right*} +
+ +
+
+ {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)} + + + + + + + + + + + + {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'} + + + + + + + +
+ {else} + {l s='%1$s %2$s has no discount vouchers' sprintf=[$customer->firstname, $customer->lastname]}. + {/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'}
{dateFormat date=$order['date_add'] full=0}{$connection['pages']}{$connection['time']}{$connection['http_referer']}{$connection['ipaddress']}
+
+ {/if} + +
+
+ {l s='Groups'} {count($groups)} +
+ {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} + + {l s='Edit'} + +
+
+
+ +
+
+ {*todo add next elements*} + {if count($interested)} +
+
+ {l s='Products:'} {count($interested)} +
+ + + + + + + + + + {foreach $interested as $key => $p} + + + + @@ -226,319 +528,97 @@ {/foreach}
{l s='ID'}{l s='Name'}{l s='Actions'}
{$p['id']}{$p['name']} + {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'}
{dateFormat date=$order['date_add'] full=0}{$product['product_name']}{$product['product_quantity']} - - {l s='View'} - -
-
- {/if} - -
- -{*right*} -
- -
-
- {l s='Add a private note'} -
-
{l s='This note will be displayed to all employees but not to customers.'}
-
-
-
- -
+
+ {if count($referrers)} +
+
+ {l s='Referrers'}
-
-
- -
-
- - -
- -
-
- {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)} - - + - - - - - - {foreach $discounts AS $key => $discount} - - - - - - - - - {/foreach} -
{l s='ID'}{l s='Code'}{l s='Date'} {l s='Name'}{l s='Status'}{l s='Actions'}
{$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} -
- - - - {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'}
{dateFormat date=$order['date_add'] full=0}{$connection['pages']}{$connection['time']}{$connection['http_referer']}{$connection['ipaddress']}
-
- {/if} - -
-
- {l s='Groups'} {count($groups)} -
- {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} - - {l s='Edit'} - -
-
- - -{*todo add next elements*} - {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($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'}
{dateFormat date=$order['date_add'] full=0}{$referrer['name']}{$referrer['shop_name']}
-
- {/if} - - {* display hook specified to this page : AdminCustomers *} - {hook h="displayAdminCustomers" id_customer=$customer->id} - -
-
-
- {l s='Addresses'} {count($addresses)} -
- {if count($addresses)} - - - - - - - - - + {if $shop_is_feature_active}{/if} - {foreach $addresses AS $key => $address} + {foreach $referrers as $referrer} - - - - - - + + + {if $shop_is_feature_active}{/if} {/foreach}
{l s='Company'}{l s='Name'}{l s='Address'}{l s='Country'}{l s='Phone number(s)'}{l s='Actions'}{l s='Shop'}
{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} - 		-
- - {l s='Edit'} - - - -
- 		{dateFormat date=$order['date_add'] full=0}{$referrer['name']}{$referrer['shop_name']}
- {else} - {l s='%1$s %2$s has not registered any addresses yet' sprintf=[$customer->firstname, $customer->lastname]} +
{/if}
+ +
+ {* display hook specified to this page : AdminCustomers *} + {hook h="displayAdminCustomers" id_customer=$customer->id} +
+
+
+ {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} + 		+
+ + {l s='Edit'} + + + +
+
+ {else} + {l s='%1$s %2$s has not registered any addresses yet' sprintf=[$customer->firstname, $customer->lastname]} + {/if} +
+
+
{/block} \ No newline at end of file