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

Merge branch 'ticket-AideContact-SAV' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-10-25 12:20:33 +02:00
commit 880198366f
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
adm/tabs/AdminCustomerThreads.php
View File

@ -282,7 +282,9 @@ class AdminCustomerThreads extends AdminTab
foreach ($params as $key => $val)
echo '<tr '.(++$count % 2 == 0 ? 'class="alt_row"' : '').'><td>'.$key.'</td><td>'.$val.'</td></tr>';
echo ' </table>
</div><p class="clear">&nbsp;</p>';
</div><p class="clear">&nbsp;</p>
<p style="text-align:right;"><span class="anticon anticon-coin-euro"></span> '.$this->l('> 10€').'</p>
<p style="text-align:right;"><span class="anticon anticon-coin-euro"></span><span class="anticon anticon-coin-euro"></span> '.$this->l('> 100€').'</p>';
$this->displayListHeaderBis($token);
}
@ -511,7 +513,10 @@ class AdminCustomerThreads extends AdminTab
echo ' onclick="document.location = \''.$currentIndex.'&'.$this->identifier.'='.$id.($this->view? '&view' : '&update').$this->table.'&token='.($token!=NULL ? $token : $this->token).'\'">'.(isset($params['prefix']) ? $params['prefix'] : '');
else
echo '>';
if ($key == 'id_product' AND isset($tr[$key]) AND isset($tr['id_order'])) {
if ($key == 'id_product'
AND isset($tr[$key])
AND $tr[$key] !=0
AND isset($tr['id_order'])) {
$order = new Order((int)$tr['id_order']);
$cart = new Cart((int)$order->id_cart);
$products = Db::getInstance()->executeS('
@ -533,7 +538,7 @@ class AdminCustomerThreads extends AdminTab
}
}
}
echo ($supTo10>0?'<p class="bg-green-light text-green-light"><span class="anticon anticon-coin-euro"></span>'.($supTo100>0?'<span class="anticon anticon-coin-euro"></span>':'').'</p>':'<p>--</p>');
echo ($supTo10>0?'<p class="bg-green-light text-green-light"><span class="anticon anticon-coin-euro"></span>'.($supTo100>0?'<span class="anticon anticon-coin-euro"></span>':'').'</p>':'<p class="bg-rose-light text-rose-light"><span class="anticon anticon-close"></span</p>');
} elseif ($key == 'id_order' AND isset($tr[$key])) {
$order = new Order((int)$tr[$key]);
$cart = new Cart((int)$order->id_cart);

6
css/admin.css
View File

@ -3640,6 +3640,9 @@ form.form-forward-message .button:focus{
#form_customer_thread p.text-green-light{
color: #55b239;
}
#form_customer_thread p.text-rose-light{
color: #e36ea2;
}
#form_customer_thread table table tr td p {
margin: 0;
padding: 5px 0;
@ -3648,6 +3651,9 @@ form.form-forward-message .button:focus{
#form_customer_thread table table tr td p.bg-green-light{
background: #C0E3B5;
}
#form_customer_thread table table tr td p.bg-rose-light{
background: rgba(226,110,162,0.2);
}
.tab_customer_thread .button {
background-color: rgba(86,84,133,0.7);
border: 1px solid #565485;