antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

continuing

Browse Source
This commit is contained in:
Marion Muszynski 2016-10-18 17:02:58 +02:00
parent 85650ffaba
commit 1d4435a4ef
2 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
adm/tabs/AdminCustomerThreads.php
View File

@ -325,7 +325,7 @@ class AdminCustomerThreads extends AdminTab
ORDER BY o.date_add DESC');
$output .= '
<div class="panel-head '.(!empty($message['employee_name'])?'bg-rose':'').'">
<div class="panel-head '.(!empty($message['employee_name'])?'bg-rose':'bg-purple').'">
<div class="panel-head-left">
<div class="user-info">
'.(!empty($message['employee_name'])
@ -372,7 +372,7 @@ class AdminCustomerThreads extends AdminTab
<form action="'.Tools::htmlentitiesutf8($_SERVER['REQUEST_URI']).'" method="post">
<b>'.$this->l('Subject:').'</b>
<input type="hidden" name="id_customer_message" value="'.$message['id_customer_message'].'" />
<select name="id_contact" onchange="this.form.submit();">';
<select name="id_contact" class="'.(!empty($message['employee_name'])?'bg-rose':'').'" onchange="this.form.submit();">';
foreach ($contacts as $contact)
$output .= '<option value="'.(int)$contact['id_contact'].'" '.($contact['id_contact'] == $message['id_contact'] ? 'selected="selected"' : '').'>'.Tools::htmlentitiesutf8($contact['name']).'</option>';
$output .= '</select>
@ -415,7 +415,7 @@ class AdminCustomerThreads extends AdminTab
if (!$email)
{
if (empty($message['employee_name'])) {
$orderMessages = OrderMessage::getOrderMessages((int)($cookie->id_lang));
$orderMessages = OrderMessage::getOrderMessages((int)($message['id_lang']));
$output .= '
<p class="btn-answer" style="text-align:right">
<button class="button" onclick="$(\'#reply_to_'.(int)($message['id_customer_message']).'\').show(500); $(this).hide();">
@ -729,7 +729,7 @@ class AdminCustomerThreads extends AdminTab
$products = $customer->getBoughtProducts();
$orders = Order::getCustomerOrders($customer->id);
echo '<div style="float:left;width:600px">';
echo '<div style="float:left;width:700px">';
if ($orders AND sizeof($orders))
{
$totalOK = 0;
@ -745,7 +745,8 @@ class AdminCustomerThreads extends AdminTab
{
echo '<div style="float:left;margin-right:20px;">
<h2>'.$this->l('Orders').'</h2>
<table cellspacing="0" cellpadding="0" class="table float">
<h3 style="font-weight:700;margin-top:10px">'.$this->l('Validated Orders:').' '.$countOK.' '.$this->l('for').' '.Tools::displayPrice($totalOK, new Currency(Configuration::get('PS_CURRENCY_DEFAULT'))).'</h3>
<table cellspacing="0" cellpadding="0" class="table float customerThread-table">
<tr>
<th class="center">'.$this->l('ID').'</th>
<th class="center">'.$this->l('Date').'</th>
@ -767,7 +768,6 @@ class AdminCustomerThreads extends AdminTab
<td align="center"><a href="?tab=AdminOrders&id_order='.$order['id_order'].'&vieworder&token='.$tokenOrders.'"><img src="../img/admin/details.gif" /></a></td>
</tr>';
echo '</table>
<h3 style="color:green;font-weight:700;margin-top:10px">'.$this->l('Validated Orders:').' '.$countOK.' '.$this->l('for').' '.Tools::displayPrice($totalOK, new Currency(Configuration::get('PS_CURRENCY_DEFAULT'))).'</h3>
</div>';
}
}
@ -775,7 +775,7 @@ class AdminCustomerThreads extends AdminTab
{
echo '<div style="float:left;margin-right:20px">
<h2>'.$this->l('Products').'</h2>
<table cellspacing="0" cellpadding="0" class="table">
<table cellspacing="0" cellpadding="0" class="table customerThread-table">
<tr>
<th class="center">'.$this->l('Date').'</th>
<th class="center">'.$this->l('ID').'</th>

31
css/admin.css
View File

@ -3380,6 +3380,9 @@ span.anticon{
.panel-head.bg-rose{
background: rgba(226,110,162,0.2);
}
.panel-head.bg-purple{
background: rgba(121,109,199,0.2);
}
.panel-head .panel-head-left,
.panel-head .panel-head-left p,
.panel-head .panel-head-left div{
@ -3484,7 +3487,35 @@ span.anticon{
border: 1px solid #796dc7;
background-color: rgba(121,109,199,0.2);
}
.panel-message select.bg-rose {
border: 1px solid #e36ea2;
background: rgba(226,110,162,0.2);
}
.panel-answer textarea{
width: 670px;
height: 120px;
}
.table.customerThread-table {
width: 700px;
border: 1px solid #565485;
background: #fff;
padding: 20px;
-moz-box-shadow: 2px 2px 5px #cccccc;
-webkit-box-shadow: 2px 2px 5px #CCC;
-ms-box-shadow: 2px 2px 5px #cccccc;
-o-box-shadow: 2px 2px 5px #cccccc;
box-shadow: 2px 2px 5px #CCC;
border-collapse: collapse;
border-spacing: 0;
margin-bottom: 20px;
}
.table.customerThread-table tr th {
background: rgba(86,84,133,0.9);
color: #fff;
font-weight: 300;
}
.table.customerThread-table tr td {
border-bottom: 1px solid #DEDEDE;
color: #000;
padding: 0 4px 0 6px;
}