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

// tweaks list + customers

Browse Source
This commit is contained in:
Kevin Granger
2013-11-22 18:56:52 +01:00
parent f7ad627b4d
commit 0572fc09e8
9 changed files with 166 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+2 -1
View File
@@ -2914,7 +2914,7 @@ body { min-height: 100%; height: 100%; font: 400 12px/1.42857 "Open Sans", Helve
#content.bootstrap .panel, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel, #header_notifs_icon_wrapper #content.bootstrap .notifs_panel, #content.bootstrap #dash_version { padding: 20px; margin-bottom: 20px; border: solid 1px #dfdfdf; background-color: white; -webkit-border-radius: 5px; -moz-border-radius: 5px; -ms-border-radius: 5px; -o-border-radius: 5px; border-radius: 5px; -webkit-box-shadow: rgba(0, 0, 0, 0.1) 0 2px 0, white 0 0 0 3px inset; box-shadow: rgba(0, 0, 0, 0.1) 0 2px 0, white 0 0 0 3px inset; }
#content.bootstrap h3:not(.modal-title), #content.bootstrap .panel-heading:not(.modal-title), #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title), #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title), #content.bootstrap .panel-heading, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header { border: none; padding: 0 5px; margin: -16px -16px 15px -16px; color: contrasted(#e6e8e3); font-size: 1.2em; line-height: 30px; font-weight: 300; text-transform: uppercase; background-color: white; border-bottom: solid 1px #cccccc; }
#content.bootstrap h3:not(.modal-title) i, #content.bootstrap .panel-heading:not(.modal-title) i, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) i, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title) i, #content.bootstrap h3:not(.modal-title) a, #content.bootstrap .panel-heading:not(.modal-title) a, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) a, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title) a, #content.bootstrap .panel-heading i, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header i, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header i, #content.bootstrap .panel-heading a, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header a, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header a { color: contrasted(#e6e8e3); }
#content.bootstrap h3:not(.modal-title) .badge, #content.bootstrap .panel-heading:not(.modal-title) .badge, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .badge, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title) .badge, #content.bootstrap h3:not(.modal-title) #header_notifs_icon_wrapper .notifs_badge, #header_notifs_icon_wrapper #content.bootstrap h3:not(.modal-title) .notifs_badge, #content.bootstrap .panel-heading:not(.modal-title) #header_notifs_icon_wrapper .notifs_badge, #header_notifs_icon_wrapper #content.bootstrap .panel-heading:not(.modal-title) .notifs_badge, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .notifs_badge, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title) .notifs_badge, #content.bootstrap .panel-heading .badge, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .badge, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .badge, #content.bootstrap .panel-heading #header_notifs_icon_wrapper .notifs_badge, #header_notifs_icon_wrapper #content.bootstrap .panel-heading .notifs_badge, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .notifs_badge, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .notifs_badge { 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; margin-right: 7px; font-weight: 300; float: left; margin-left: -5px; }
#content.bootstrap h3:not(.modal-title) .badge, #content.bootstrap .panel-heading:not(.modal-title) .badge, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .badge, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title) .badge, #content.bootstrap h3:not(.modal-title) #header_notifs_icon_wrapper .notifs_badge, #header_notifs_icon_wrapper #content.bootstrap h3:not(.modal-title) .notifs_badge, #content.bootstrap .panel-heading:not(.modal-title) #header_notifs_icon_wrapper .notifs_badge, #header_notifs_icon_wrapper #content.bootstrap .panel-heading:not(.modal-title) .notifs_badge, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .notifs_badge, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title) .notifs_badge, #content.bootstrap .panel-heading .badge, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .badge, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .badge, #content.bootstrap .panel-heading #header_notifs_icon_wrapper .notifs_badge, #header_notifs_icon_wrapper #content.bootstrap .panel-heading .notifs_badge, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .notifs_badge, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .notifs_badge { background: white; border: solid 2px #bbe5f7; -webkit-border-radius: 20px; -moz-border-radius: 20px; -ms-border-radius: 20px; -o-border-radius: 20px; border-radius: 20px; color: #1ba6e5; line-height: 1.2em; font-size: 1em; padding: 0 10px; font-weight: 700; margin-left: 10px; }
#content.bootstrap h3:not(.modal-title) .panel-heading-action, #content.bootstrap .panel-heading:not(.modal-title) .panel-heading-action, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title) .panel-heading-action, #content.bootstrap .panel-heading .panel-heading-action, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .panel-heading-action { margin-right: -5px; }
#content.bootstrap h3:not(.modal-title) .panel-heading-action a.list-toolbar-btn, #content.bootstrap .panel-heading:not(.modal-title) .panel-heading-action a.list-toolbar-btn, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .panel-heading-action a.list-toolbar-btn, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title) .panel-heading-action a.list-toolbar-btn, #content.bootstrap .panel-heading .panel-heading-action a.list-toolbar-btn, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-heading-action a.list-toolbar-btn, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .panel-heading-action a.list-toolbar-btn { float: left; height: 30px; width: 30px; color: #1ba6e5; border-left: solid 1px #cccccc; }
#content.bootstrap h3:not(.modal-title) .panel-heading-action a.list-toolbar-btn:hover, #content.bootstrap .panel-heading:not(.modal-title) .panel-heading-action a.list-toolbar-btn:hover, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header:not(.modal-title) .panel-heading-action a.list-toolbar-btn:hover, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header:not(.modal-title) .panel-heading-action a.list-toolbar-btn:hover, #content.bootstrap .panel-heading .panel-heading-action a.list-toolbar-btn:hover, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-heading-action a.list-toolbar-btn:hover, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .panel-heading-action a.list-toolbar-btn:hover { text-decoration: none; color: black; }
@@ -3211,6 +3211,7 @@ a.link-social:hover { text-decoration: none; }
.bootstrap .btn.btn-primary { background-color: #1ba6e5; color: white; border-color: #1585b8; }
.bootstrap .btn.btn-default[disabled] { border-color: #999999; color: #999999; background-color: #f2f2f2; -webkit-box-shadow: #cccccc 0 -2px 0 inset; box-shadow: #cccccc 0 -2px 0 inset; }
.bootstrap .dropdown-menu { text-align: left; }
.bootstrap .dropdown-menu > li a { padding: 5px 10px; }
.bootstrap .btn-group-action { width: 160px; float: right; }
.bootstrap .btn-group-action .btn-group { float: right; }
.bootstrap .btn-group-action a { text-decoration: none; }
admin-dev/themes/default/css/backward-admin-bootstrap-reset.css
-1
View File
@@ -1 +0,0 @@
#content.nobootstrap { background-color: white; width: 1200px; padding: 80px 40px; }
admin-dev/themes/default/css/modules.css
-84
View File
@@ -1,84 +0,0 @@
.path_bar {display:none;}
#notifs_icon_wrapper {float: left;position: relative;margin:15px 10px 0; width:90px;}
.notifs { float: left;position: relative;cursor: pointer;margin:0; padding:5px; width: 18px;height: 16px;}
#orders_notif {background: url('../img/notif_order.png') no-repeat center top;}
#customers_notif {background: url('../img/notif_customer.png') no-repeat center top;}
#messages_notif {background: url('../img/notif_message.png') no-repeat center top;}
#orders_notif.open_notifs,
#customers_notif.open_notifs,
#messages_notif.open_notifs { background-color: #FFFFFF;border: 1px solid #000000; position: relative; display: block; background-position:center bottom; }
/*toolbarBox*/
.toolbarBox { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
.toolbarBox .pageTitle { margin-left:10px; line-height:48px}
.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: bold; line-height: 48px; margin: 0; padding: 0}
.toolbarBox ul.cc_button {float:right;margin:0;padding:0}
.toolbarBox ul.cc_button li {color: #666666; float: left; height: 48px; list-style: none outside none; padding: 1px 1px 3px 4px; text-align: center}
.toolbarBox a.toolbar_btn { border-width: 1px;font-size:11px;cursor: pointer; display: block; float: left; padding: 1px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff}
.toolbarBox a.toolbar_btn:hover {}
.toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px}
.toolbarBox .process-icon-delete { background-image: url('../img/process-icon-delete.png')}
.toolbarBox .process-icon-duplicate { background-image: url('../img/process-icon-duplicate.png')}
.toolbarBox .process-icon-preview { background-image: url('../img/process-icon-preview.png')}
.toolbarBox .process-icon-stats { background-image: url('../img/process-icon-stats.png')}
.toolbarBox .process-icon-cancel { background-image: url('../img/process-icon-cancel.png')}
.toolbarBox .process-icon-new, .toolbarBox .process-icon-newAttributes{ background-image: url('../img/process-icon-new.png')}
.toolbarBox .process-icon-save, .toolbarBox .process-icon-save-settings { background-image: url('../img/process-icon-save.png')}
.toolbarBox .process-icon-save-and-stay { background-image: url('../img/process-icon-save-and-stay.png')}
.toolbarBox .process-icon-edit { background-image: url('../img/process-icon-edit.png')}
.toolbarBox .process-icon-back { background-image: url('../img/process-icon-back.png')}
.toolbarBox .process-icon-refresh-index { background-image: url('../img/process-icon-refresh-index.png')}
.toolbarBox .process-icon-refresh-cache { background-image: url('../img/process-icon-refresh-cache.png')}
.toolbarBox .process-icon-save-calendar { background-image: url('../img/process-icon-save-calendar.png')}
.toolbarBox .process-icon-new-module { background-image: url('../img/process-icon-new-module.png')}
.toolbarBox .process-icon-new-module-addon { background-image: url('../img/process-icon-new-module-addon.png')}
div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:11}
/*FILTER MODULE*/
.filter-module { background-color:#ebedf4; border:1px solid #c2c4d9; padding:10px; display:block; min-height:35px;}
.filter-module #filternameForm {float:left; margin-right:30px;}
.filter-module label {width:auto;}
.filter-module .select-filter { float:left;}
.filter-module .button-filter { float:right;}
/*SIDEBAR*/
.sidebar { position:relative; float:left; width:220px; display:inline;}
.sidebar h3 { background-color:#ebedf4; font-weight:bold; display:block; padding:5px;}
.sidebar .subHeadline { font-weight:bold; float:right; margin-top:-28px; margin-right:5px;}
.sidebar ul.categorieList {}
.sidebar ul.categorieList li { border-top:1px solid #ccc; position:relative; line-height:20px;}
.sidebar ul.categorieList li:first-child { border-top:none;}
.sidebar ul.categorieList li a {color:#3a6ea7;}
.sidebar ul.categorieList li div.categorieWidth { text-indent:5px; overflow:hidden;}
.sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;}
/*MODULECONTAINER*/
#moduleContainer { margin-left:220px; padding:13px 0 0 20px;}
#moduleContainer .table tr th { height:40px;}
#moduleContainer .table tr td { font-size:12px; vertical-align:top; padding: 5px 7px 0; border-top:1px solid #ccc; border-bottom:none;}
#moduleContainer .table tr:first-child {border-top:1px solid #ccc}
#moduleContainer .table tr:hover { background-color:#FFF1B5;}
#moduleContainer .moduleDesc { font-size:12px; position:relative; margin-bottom:10px;}
#moduleContainer .moduleDesc h3 { color:#3A6EA7; margin:0;}
#moduleContainer .moduleDesc .metadata { float:left; display:block; margin:5px 0;}
#moduleContainer .moduleDesc .metadata dl { float:left; margin:0; padding-right:10px;}
#moduleContainer .moduleDesc .metadata dl dt, .moduleDesc .metadata dl dd { float:left; margin:0; padding:0;}
#moduleContainer .moduleDesc .metadata dl dd { padding-right:10px;}
#moduleContainer .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;}
#moduleContainer .moduleDesc p.desc { color:#666; font-size:12px; display:block; clear:both;}
#moduleContainer .setup {background-color:#6db300; font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;}
#moduleContainer .setup.non-install { border: solid 1px #ec7000; background-color: #ffedb1; color: #ec7000}
#moduleContainer .setup.must-have { background-color: #ec7000;}
#moduleContainer .setup.off{ background-color:#ccc;}
#moduleContainer .row-actions-module span { padding-right:5px;}
#moduleContainer .row-actions-module span a { font-size:12px;}
#moduleContainer .button.uninstalled,
#moduleContainer .button.installed { float:right; display: inline-block; margin-top:15px; font-size:12px;}
#moduleContainer .button.updated { margin-top:15px; display: inline-block; font-size:12px;}
#list-action-button{width:175px}
#list-action-button li{margin-left:10px;display: inline;float: left;}
#moduleContainer .moduleName {font-size:12px; color:#3A6EA7;font-weight:bold;}
#moduleContainer .moduleFavDesc { font-family:Georgia; font-style:italic; color:#666;}
admin-dev/themes/default/scss/admin-theme/_admin-content.sass
+9 -9
View File
@@ -48,15 +48,15 @@ body
i, a
color: contrasted($bg-panel-heading-color)
.badge
background-color: $brand-primary
+border-radius(0)
height: 29px
line-height: 25px
font-size: 1.3em
margin-right: 7px
font-weight: 300
float: left
margin-left: -5px
background: white
border: solid 2px lighten($brand-primary,35%)
+border-radius(20px)
color: $brand-primary
line-height: 1.2em
font-size: 1em
padding: 0 10px
font-weight: 700
margin-left: 10px
.panel-heading-action
@extend .pull-right
margin-right: -5px
admin-dev/themes/default/scss/admin-theme/_admin-forms.sass
+2
View File
@@ -67,6 +67,8 @@ textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[ty
@include box-shadow(lighten($gray-light,20%) 0 -2px 0 inset)
.dropdown-menu
text-align: left
> li a
padding: 5px 10px
.btn-group-action
width: 160px
float: right
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
+148 -154
View File
@@ -58,25 +58,26 @@
<div class="row">
{*left*}
<div class="col-lg-6">
<div class="panel">
<div class="panel-heading text-center">
<div class="panel clearfix">
<div class="panel-heading">
<i class="icon-user"></i>
{$customer->firstname}
{$customer->lastname}
[{$customer->id|string_format:"%06d"}]
-
<a href="mailto:{$customer->email}"><i class="icon-envelope"></i>
{$customer->email}
</a>
<a class="btn btn-default pull-right" href="{$current}&updatecustomer&id_customer={$customer->id}&token={$token}">
<i class="icon-edit"></i>
{l s='Edit'}
</a>
</div>
<ul class="list-unstyled col-lg-6">
<li>
{l s='Title:'}
<span>{$gender->name}</span>
</li>
<li>
{l s='Email:'}
<a href="mailto:{$customer->email}">{$customer->email}</a>
</li>
<li>
{l s='ID:'}
<span>{$customer->id|string_format:"%06d"}</span>
</li>
<li>
{l s='Registration date:'}
<span>{$registration_date}</span>
@@ -96,7 +97,6 @@
{/if}
</li>
</ul>
<ul class="list-unstyled col-lg-6">
<li>
{l s='Language:'}
@@ -109,27 +109,28 @@
</span>
</li>
<li>
{l s='Newsletter:'} {if $customer->newsletter}
{if $customer->newsletter}
<span class="label label-success">
<i class="icon-check-sign"></i> {l s='Registered'}
<i class="icon-check-sign"></i>
{l s='Newsletter'}
</span>
{else}
<span class="label label-warning">
<i class="icon-ban-circle"></i> {l s='Unregistered'}
<i class="icon-ban-circle"></i>
{l s='Newsletter'}
</span>
{/if}
</li>
<li>
{l s='Opt in:'}
{if $customer->optin}
<span class="label label-success">
<i class="icon-check-sign"></i>
{l s='Registered'}
{l s='Opt in'}
</span>
{else}
<span class="label label-warning">
<i class="icon-ban-circle"></i>
{l s='Unregistered'}
{l s='Opt in'}
</span>
{/if}
</li>
@@ -160,9 +161,7 @@
{/if}
</li>
</ul>
{if $customer->isGuest()}
<div>
{l s='This customer is registered as.'} <b>{l s='Guest'}</b>
{if !$customer_exists}
<form method="post" action="index.php?tab=AdminCustomers&id_customer={$customer->id}&token={getAdminToken tab='AdminCustomers'}">
@@ -173,34 +172,31 @@
{l s='This feature generates a random password before sending an email to your customer.'}
</form>
{else}
</div>
<div>
{l s='A registered customer account using the defined email address already exists. '}
<p class="text-muted text-center">
{l s='A registered customer account using the defined email address already exists. '}
</p>
{/if}
</div>
{/if}
<a class="btn btn-default" href="{$current}&updatecustomer&id_customer={$customer->id}&token={$token}">
<i class="icon-edit"></i> {l s='Edit'}
</a>
</div>
<div class="panel">
<div class="panel-heading">
<i class="icon-file"></i> {l s='Orders'} <span class="badge">{count($orders)}</span>
</div>
{if $orders AND count($orders)}
{assign var=count_ok value=count($orders_ok)}
{assign var=count_ko value=count($orders_ko)}
<div class="panel">
<div class="row">
<div class="col-lg-6">
<i class="icon-ok-circle icon-big"></i>
{l s='Valid orders:'} <span class="label label-success">{$count_ok}</span> {l s='for'} {$total_ok}
{l s='Valid orders:'}
<span class="label label-success">{$count_ok}</span>
{l s='for'} {$total_ok}
</div>
<div class="col-lg-6">
<i class="icon-exclamation-sign icon-big"></i>
{l s='Invalid orders:'} <span class="label label-danger">{$count_ko}</span>
{l s='Invalid orders:'}
<span class="label label-danger">{$count_ko}</span>
</div>
</div>
</div>
@@ -209,13 +205,13 @@
<table class="table">
<thead>
<tr>
<th class="center">{l s='ID'}</th>
<th>{l s='Date'}</th>
<th>{l s='Payment: '}</th>
<th>{l s='State'}</th>
<th>{l s='Products'}</th>
<th>{l s='Total spent'}</th>
<th class="text-right">{l s='Actions'}</th>
<th class="center"><span class="title_box ">{l s='ID'}</span></th>
<th><span class="title_box">{l s='Date'}</span></th>
<th><span class="title_box">{l s='Payment'}</span></th>
<th><span class="title_box">{l s='State'}</span></th>
<th><span class="title_box">{l s='Products'}</span></th>
<th><span class="title_box ">{l s='Total spent'}</span></th>
<th></th>
</tr>
</thead>
<tbody>
@@ -229,7 +225,7 @@
<td align="right">{$order['total_paid_real']}</td>
<td class="text-right">
<a class="btn btn-default" href="?tab=AdminOrders&id_order={$order['id_order']}&vieworder&token={getAdminToken tab='AdminOrders'}">
<i class='icon-eye-open'></i> {l s='View'}
<i class='icon-search'></i> {l s='View'}
</a>
</td>
</tr>
@@ -242,36 +238,32 @@
<table class="table">
<thead>
<tr>
<th>{l s='ID'}</th>
<th>{l s='Date'}</th>
<th>{l s='Payment: '}</th>
<th>{l s='State'}</th>
<th>{l s='Products'}</th>
<th>{l s='Total spent'}</th>
<th class="text-right">{l s='Actions'}</th>
<th><span class="title_box ">{l s='ID'}</span></th>
<th><span class="title_box ">{l s='Date'}</span></th>
<th><span class="title_box ">{l s='Payment'}</span></th>
<th><span class="title_box ">{l s='State'}</span></th>
<th><span class="title_box ">{l s='Products'}</span></th>
<th><span class="title_box ">{l s='Total spent'}</span></th>
</tr>
</thead>
<tbody>
{foreach $orders_ko AS $key => $order}
<tr onclick="document.location = '?tab=AdminOrders&id_order={$order['id_order']}&vieworder&token={getAdminToken tab='AdminOrders'}'">
<td>{$order['id_order']}</td>
<td>{dateFormat date=$order['date_add'] full=0}</td>
<td><a href="?tab=AdminOrders&id_order={$order['id_order']}&vieworder&token={getAdminToken tab='AdminOrders'}">{dateFormat date=$order['date_add'] full=0}</a></td>
<td>{$order['payment']}</td>
<td>{$order['order_state']}</td>
<td align="right">{$order['nb_products']}</td>
<td align="right">{$order['total_paid_real']}</td>
<td class="text-right">
<a class="btn btn-default" href="?tab=AdminOrders&id_order={$order['id_order']}&vieworder&token={getAdminToken tab='AdminOrders'}">
<i class='icon-eye-open'></i> {l s='View'}
</a>
</td>
<td>{$order['nb_products']}</td>
<td>{$order['total_paid_real']}</td>
</tr>
{/foreach}
</tbody>
</table>
{/if}
{else}
<p class="text-muted text-center">
{l s='%1$s %2$s has not placed any orders yet' sprintf=[$customer->firstname, $customer->lastname]}
</p>
{/if}
</div>
@@ -283,90 +275,110 @@
<table class="table">
<thead>
<tr>
<th>{l s='ID'}</th>
<th>{l s='Date'}</th>
<th>{l s='Carrier'}</th>
<th>{l s='Total'}</th>
<th class="text-right">{l s='Actions'}</th>
<th><span class="title_box ">{l s='ID'}</span></th>
<th><span class="title_box ">{l s='Date'}</a></span></th>
<th><span class="title_box ">{l s='Carrier'}</span></th>
<th><span class="title_box ">{l s='Total'}</span></th>
</tr>
</thead>
<tbody>
{foreach $carts AS $key => $cart}
<tr onclick="document.location = '?tab=AdminCarts&id_cart={$cart['id_cart']}&viewcart&token={getAdminToken tab='AdminCarts'}'">
<td>{$cart['id_cart']}</td>
<td>{dateFormat date=$cart['date_upd'] full=0}</td>
<td>{$cart['name']}</td>
<td align="right">{$cart['total_price']}</td>
<td class="text-right">
<a class="btn btn-default" href="index.php?tab=AdminCarts&id_cart={$cart['id_cart']}&viewcart&token={getAdminToken tab='AdminCarts'}">
<i class='icon-eye-open'></i> {l s='View'}
<td>
<a href="index.php?tab=AdminCarts&id_cart={$cart['id_cart']}&viewcart&token={getAdminToken tab='AdminCarts'}">
{dateFormat date=$cart['date_upd'] full=0}
</a>
</td>
<td>{$cart['name']}</td>
<td>{$cart['total_price']}</td>
</tr>
{/foreach}
</tbody>
</table>
{else}
{l s='No cart is available'}.
<p class="text-muted text-center">
{l s='No cart is available'}
</p>
{/if}
</div>
{if $products AND count($products)}
<div class="panel">
<div class="panel-heading">
<i class="icon-archive"></i> {l s='Products:'} <span class="badge">{count($products)}</span>
<i class="icon-archive"></i> {l s='Purchased products'} <span class="badge">{count($products)}</span>
</div>
<table class="table">
<thead>
<tr>
<th class="center">{l s='Date'}</th>
<th class="center">{l s='Name'}</th>
<th class="center">{l s='Quantity'}</th>
<th class="text-right">{l s='Actions'}</th>
<th><span class="title_box">{l s='Date'}</span></th>
<th><span class="title_box">{l s='Name'}</span></th>
<th><span class="title_box">{l s='Quantity'}</span></th>
</tr>
</thead>
<tbody>
{foreach $products AS $key => $product}
<tr onclick="document.location = '?tab=AdminOrders&id_order={$product['id_order']}&vieworder&token={getAdminToken tab='AdminOrders'}'">
<td>{dateFormat date=$order['date_add'] full=0}</td>
<td>{$product['product_name']}</td>
<td align="right">{$product['product_quantity']}</td>
<td class="text-right">
<td>
<a class="btn btn-default" href="?tab=AdminOrders&id_order={$product['id_order']}&vieworder&token={getAdminToken tab='AdminOrders'}">
<i class='icon-eye-open'></i> {l s='View'}
{$product['product_name']}
</a>
</td>
<td>{$product['product_quantity']}</td>
</tr>
{/foreach}
</tbody>
</table>
</div>
{/if}
{if count($interested)}
<div class="panel">
<div class="panel-heading">
<i class="icon-archive"></i> {l s='Purchased products'} <span class="badge">{count($interested)}</span>
</div>
<table class="table">
<thead>
<tr>
<th><span class="title_box ">{l s='ID'}</span></th>
<th><span class="title_box ">{l s='Name'}</span></th>
</tr>
</thead>
<tbody>
{foreach $interested as $key => $p}
<tr onclick="document.location = '{$p['url']}'">
<td>{$p['id']}</td>
<td><a href="{$p['url']}">{$p['name']}</a></td>
</tr>
{/foreach}
</tbody>
</table>
</div>
{/if}
</div>
{*right*}
<div class="col-lg-6">
<div class="panel">
<div class="panel-heading">
<i class="icon-eye-close"></i> {l s='Add a private note'}
</div>
<div class="alert alert-info">{l s='This note will be displayed to all employees but not to customers.'}</div>
<form id="customer_note" class="form-horizontal" action="ajax.php" method="post" onsubmit="saveCustomerNote();return false;" >
<div class="row">
<div class="form-group">
<div class="col-lg-12">
<textarea name="note" id="noteContent" onkeyup="$(this).val().length > 0 ? $('#submitCustomerNote').removeAttr('disabled') : $('#submitCustomerNote').attr('disabled', 'disabled')">{$customer_note}</textarea>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<button type="submit" id="submitCustomerNote" class="btn btn-default pull-right" disabled="disabled" /><i class="icon-save"></i> {l s='Save'}</button>
<button type="submit" id="submitCustomerNote" class="btn btn-default pull-right" disabled="disabled" />
<i class="icon-save"></i>
{l s='Save'}
</button>
</div>
</div>
<span id="note_feedback"></span>
</form>
</div>
<div class="panel">
<div class="panel-heading">
<i class="icon-envelope"></i> {l s='Messages'} <span class="badge">{count($messages)}</span>
@@ -374,9 +386,9 @@
{if count($messages)}
<table class="table">
<thead>
<th>{l s='Status'}</th>
<th>{l s='Message'}</th>
<th>{l s='Sent on'}</th>
<th><span class="title_box">{l s='Status'}</span></th>
<th><span class="title_box">{l s='Message'}</span></th>
<th><span class="title_box">{l s='Sent on'}</span></th>
</thead>
{foreach $messages AS $message}
<tr>
@@ -391,10 +403,11 @@
{/foreach}
</table>
{else}
<p class="text-muted text-center">
{l s='%1$s %2$s has never contacted you' sprintf=[$customer->firstname, $customer->lastname]}
</p>
{/if}
</div>
<div class="panel">
<div class="panel-heading">
<i class="icon-ticket"></i> {l s='Vouchers'} <span class="badge">{count($discounts)}</span>
@@ -403,28 +416,31 @@
<table class="table">
<thead>
<tr>
<th>{l s='ID'}</th>
<th>{l s='Code'}</th>
<th>{l s='Name'}</th>
<th>{l s='Status'}</th>
<th class="text-right">{l s='Actions'}</th>
<th><span class="title_box ">{l s='ID'}</span></th>
<th><span class="title_box ">{l s='Code'}</span></th>
<th><span class="title_box ">{l s='Name'}</span></th>
<th><span class="title_box ">{l s='Status'}</span></th>
<tr/>
</thead>
<tbody>
{foreach $discounts AS $key => $discount}
<tr>
<td align="center">{$discount['id_cart_rule']}</td>
<td>{$discount['id_cart_rule']}</td>
<td>{$discount['code']}</td>
<td>{$discount['name']}</td>
<td align="center">
<img src="../img/admin/{if $discount['active']}enabled.gif{else}disabled.gif{/if}" alt="{l s='Status'}" title="{l s='Status'}" />
<td>
{if $discount['active']}
<i class="icon-ok"></i>
{else}
<i class="icon-remove"></i>
{/if}
</td>
<td class="text-right">
<td>
<a href="?tab=AdminCartRules&id_cart_rule={$discount['id_cart_rule']}&addcart_rule&token={getAdminToken tab='AdminCartRules'}">
<img src="../img/admin/edit.gif" />
<i class="icon-pencil"></i>
</a>
<a href="?tab=AdminCartRules&id_cart_rule={$discount['id_cart_rule']}&deletecart_rule&token={getAdminToken tab='AdminCartRules'}">
<img src="../img/admin/delete.gif" />
<i class="icon-remove"></i>
</a>
</td>
</tr>
@@ -432,7 +448,9 @@
{/foreach}
</table>
{else}
{l s='%1$s %2$s has no discount vouchers' sprintf=[$customer->firstname, $customer->lastname]}.
<p class="text-muted text-center">
{l s='%1$s %2$s has no discount vouchers' sprintf=[$customer->firstname, $customer->lastname]}
</p>
{/if}
</div>
@@ -444,11 +462,11 @@
<table class="table">
<thead>
<tr>
<th>{l s='Date'}</th>
<th>{l s='Pages viewed'}</th>
<th>{l s='Total time'}</th>
<th>{l s='Origin'}</th>
<th>{l s='IP Address'}</th>
<th><span class="title_box">{l s='Date'}</span></th>
<th><span class="title_box">{l s='Pages viewed'}</span></th>
<th><span class="title_box">{l s='Total time'}</span></th>
<th><span class="title_box">{l s='Origin'}</span></th>
<th><span class="title_box">{l s='IP Address'}</span></th>
</tr>
</thead>
<tbody>
@@ -468,25 +486,28 @@
<div class="panel">
<div class="panel-heading">
<i class="icon-group"></i> {l s='Groups'} <span class="badge">{count($groups)}</span>
<i class="icon-group"></i>
{l s='Groups'}
<span class="badge">{count($groups)}</span>
<a class="btn btn-default pull-right" href="{$current}&updatecustomer&id_customer={$customer->id}&token={$token}">
<i class="icon-edit"></i> {l s='Edit'}
</a>
</div>
{if $groups AND count($groups)}
<table class="table">
<thead>
<tr>
<th>{l s='ID'}</th>
<th>{l s='Name'}</th>
<th class="text-right">{l s='Actions'}</th>
<th><span class="title_box ">{l s='ID'}</span></th>
<th><span class="title_box ">{l s='Name'}</span></th>
</tr>
</thead>
<tbody>
{foreach $groups AS $key => $group}
<tr onclick="document.location = '?tab=AdminGroups&id_group={$group['id_group']}&viewgroup&token={getAdminToken tab='AdminGroups'}'">
<td>{$group['id_group']}</td>
<td>{$group['name']}</td>
<td class="text-right">
<a class="btn btn-default" href="?tab=AdminGroups&id_group={$group['id_group']}&viewgroup&token={getAdminToken tab='AdminGroups'}">
<i class='icon-eye-open'></i> {l s='View'}
<td>
<a href="?tab=AdminGroups&id_group={$group['id_group']}&viewgroup&token={getAdminToken tab='AdminGroups'}">
{$group['name']}
</a>
</td>
</tr>
@@ -494,45 +515,13 @@
</tbody>
</table>
{/if}
<a class="btn btn-default" href="{$current}&updatecustomer&id_customer={$customer->id}&token={$token}">
<i class="icon-edit"></i> {l s='Edit'}
</a>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-6">
{*todo add next elements*}
{if count($interested)}
<div class="panel">
<div class="panel-heading">
<i class="icon-archive"></i> {l s='Products:'} <span class="badge">{count($interested)}</span>
</div>
<table class="table">
<thead>
<tr>
<th>{l s='ID'}</th>
<th>{l s='Name'}</th>
<th class="text-right">{l s='Actions'}</th>
</tr>
</thead>
<tbody>
{foreach $interested as $key => $p}
<tr onclick="document.location = '{$p['url']}'">
<td>{$p['id']}</td>
<td>{$p['name']}</td>
<td class="text-right">
<a class="btn btn-default" href="{$p['url']}">
<i class='icon-eye-open'></i> {l s='View'}
</a>
</td>
</tr>
{/foreach}
</tbody>
</table>
</div>
{/if}
</div>
<div class="col-lg-6">
{if count($referrers)}
@@ -543,8 +532,8 @@
<table class="table">
<thead>
<tr>
<th>{l s='Date'}</th>
<th>{l s='Name'}</th>
<th><span class="title_box ">{l s='Date'}</span></th>
<th><span class="title_box ">{l s='Name'}</span></th>
{if $shop_is_feature_active}<th>{l s='Shop'}</th>{/if}
</tr>
</thead>
@@ -575,12 +564,12 @@
<table class="table">
<thead>
<tr>
<th>{l s='Company'}</th>
<th>{l s='Name'}</th>
<th>{l s='Address'}</th>
<th>{l s='Country'}</th>
<th>{l s='Phone number(s)'}</th>
<th class="text-right">{l s='Actions'}</th>
<th><span class="title_box ">{l s='Company'}</span></th>
<th><span class="title_box ">{l s='Name'}</span></th>
<th><span class="title_box ">{l s='Address'}</span></th>
<th><span class="title_box ">{l s='Country'}</span></th>
<th><span class="title_box ">{l s='Phone number(s)'}</span></th>
<th></th>
</tr>
</thead>
<tbody>
@@ -607,9 +596,12 @@
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a href="?tab=AdminAddresses&id_address={$address['id_address']}&deleteaddress&token={getAdminToken tab='AdminAddresses'}">
<i class="icon-trash"></i> {l s='Delete'}
</a></li>
<li>
<a href="?tab=AdminAddresses&id_address={$address['id_address']}&deleteaddress&token={getAdminToken tab='AdminAddresses'}">
<i class="icon-trash"></i>
{l s='Delete'}
</a>
</li>
</ul>
</div>
</td>
@@ -618,7 +610,9 @@
</tbody>
</table>
{else}
{l s='%1$s %2$s has not registered any addresses yet' sprintf=[$customer->firstname, $customer->lastname]}
<p class="text-muted text-center">
{l s='%1$s %2$s has not registered any addresses yet' sprintf=[$customer->firstname, $customer->lastname]}
</p>
{/if}
</div>
</div>
admin-dev/themes/default/template/footer.tpl
+3 -1
View File
@@ -29,7 +29,9 @@
{hook h="displayBackOfficeFooter"}
<div id="footer" class="bootstrap">
<div class="col-sm-5 hidden-xs">
<a href="http://www.prestashop.com/" target="_blank">PrestaShop&trade; {$ps_version}</a> - <span>{l s='Load time: '} {number_format(microtime(true) - $timer_start, 3, '.', '')}s</span>
<a href="http://www.prestashop.com/" target="_blank">PrestaShop&trade; {$ps_version}</a>
-
<span id="footer-load-time"><i class="icon-time"></i> {l s='Load time: '} {number_format(microtime(true) - $timer_start, 3, '.', '')}s</span>
</div>
<div class="col-sm-2 hidden-xs social-networks">
<a class="link-social link-twitter" href="https://twitter.com/PrestaShop" target="_blank" title="Twitter">
admin-dev/themes/default/template/helpers/list/list_content.tpl
+1 -1
View File
@@ -179,6 +179,6 @@
</tr>
{/foreach}
{else}
<tr><td class="center" colspan="{count($fields_display) + 2}"><i class="icon-warning-sign"></i> {l s='No records found'}</td></tr>
<tr><td class="center text-muted" colspan="{count($fields_display) + 2}"><i class="icon-warning-sign"></i> {l s='No records found'}</td></tr>
{/if}
</tbody>
admin-dev/themes/default/template/helpers/list/list_header.tpl
+1
View File
@@ -83,6 +83,7 @@
<div class="panel-heading">
{if isset($icon)}<i class="{$icon}"></i> {/if}{if is_array($title)}{$title|end}{else}{$title}{/if}
{if isset($toolbar_btn) && count($toolbar_btn) >0}
<span class="badge">{$list_total}</span>
<span class="panel-heading-action">
{foreach from=$toolbar_btn item=btn key=k}
{if $k != 'modules-list' && $k != 'back'}