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

Merge branch 'ticket-14162-DecliInSAV'

Browse Source
This commit is contained in:
Marion Muszynski 2017-09-12 11:27:29 +02:00
commit 8f754edcc6
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
adm/tabs/AdminCustomerThreads.php
View File

@ -762,11 +762,10 @@ class AdminCustomerThreads extends AdminTab
}
if(!empty($message['id_product']) && empty($message['employee_name'])){
$products = Db::getInstance()->ExecuteS('
SELECT spc.*, pl.`name`
FROM `'._DB_PREFIX_.'support_product_customerthread` spc
LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.`id_product` = spc.`id_product`)
WHERE spc.`id_customer_thread` = '.(int)$message['id_customer_thread'].'
AND pl.`id_lang` = 2'
SELECT spc.*, od.`product_name` as name, od.`product_quantity`
FROM `ps_support_product_customerthread` spc
LEFT JOIN `ps_order_detail` od ON (od.`product_id` = spc.`id_product` AND od.`id_order` = '.(int)$message['id_order'].')
WHERE spc.`id_customer_thread` = '.(int)$message['id_customer_thread']
);
$output .= '
<li>
@ -785,7 +784,8 @@ class AdminCustomerThreads extends AdminTab
}
$output .= '
<div class="product-box">
<a target="_blank" href="index.php?tab=AdminCatalog&id_product='.(int)($product['id_product']).'&updateproduct&token='.Tools::getAdminToken('AdminCatalog'.(int)(Tab::getIdFromClassName('AdminCatalog')).(int)($cookie->id_employee)).'" title="'.$this->l('View product').'">
<span class="quantity">'.(int)($product['product_quantity']).'</span>
<a target="_blank" href="index.php?tab=AdminCatalog&id_product='.(int)($product['id_product']).'&updateproduct&token='.Tools::getAdminToken('AdminCatalog'.(int)(Tab::getIdFromClassName('AdminCatalog')).(int)($cookie->id_employee)).'" title="'.$product['name'].'">
<img width="62" src="'.(isset($img_path)?_THEME_PROD_DIR_.$img_path.'-small.jpg':'').'"/>
<p><b>#'.(int)($product['id_product']).'</b><br />'.mb_strimwidth($product['name'], 0, 55, "...").'</p>
</a>

14
css/admin.css
View File

@ -3313,7 +3313,7 @@ span.anticon{
font-size: 12px;
height: 27px;
padding: 5px;
width: 268px;
width: 275px;
}
.styled-select.big-select select{
width: 420px;
@ -3636,6 +3636,7 @@ form.form-forward-message .button:focus{
line-height: 16px;
}
.panel-message .product-box{
position: relative;
float:left;
width:100px;
margin-right:10px;
@ -3649,6 +3650,17 @@ form.form-forward-message .button:focus{
-o-box-shadow: 1px 1px 2px 2px #cccccc;
box-shadow: 1px 1px 2px 2px #ccc;
}
.panel-message .product-box span.quantity{
position: absolute;
top: 5px;
right: 2px;
line-height: 11px;
padding: 1px 3px;
border-radius: 50%;
border: 1px solid #000000;
background: #000;
color: #fff;
}
.panel-message form label {
width: auto;
font-size: 14px;