Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
This commit is contained in:
Christophe Latour
commit
0e379dafc9
@ -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>
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -1368,7 +1368,7 @@ class AdminBulkUpdate extends AdminTab {
|
||||
ORDER BY i.`position`
|
||||
') as $img) {
|
||||
$link_image = str_split($img['id_image']);
|
||||
$images[] = 'http://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg';
|
||||
$images[] = 'https://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg';
|
||||
}
|
||||
|
||||
$customs = Db::getInstance()->getRow('
|
||||
@ -1392,7 +1392,7 @@ class AdminBulkUpdate extends AdminTab {
|
||||
ORDER BY i.`position`
|
||||
') as $img) {
|
||||
$link_image = str_split($img['id_image']);
|
||||
$c_images[] = 'http://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg';
|
||||
$c_images[] = 'https://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg';
|
||||
// $c_images[] = 'http://static.bebeboutik.com/'.(int) $p->id.'-'.$img['id_image'].'.jpg';
|
||||
}
|
||||
|
||||
@ -1674,7 +1674,7 @@ class AdminBulkUpdate extends AdminTab {
|
||||
ORDER BY i.`position`
|
||||
') as $img) {
|
||||
$link_image = str_split($img['id_image']);
|
||||
$images[] = 'http://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg';
|
||||
$images[] = 'https://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg';
|
||||
}
|
||||
|
||||
if(count($combinations) > 0) {
|
||||
@ -1692,7 +1692,7 @@ class AdminBulkUpdate extends AdminTab {
|
||||
ORDER BY i.`position`
|
||||
') as $img) {
|
||||
$link_image = str_split($img['id_image']);
|
||||
$c_images[] = 'http://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg';
|
||||
$c_images[] = 'https://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg';
|
||||
// $c_images[] = 'http://static.bebeboutik.com/'.(int) $p->id.'-'.$img['id_image'].'.jpg';
|
||||
}
|
||||
|
||||
|
||||
@ -903,7 +903,7 @@ class AdminPrivateSalesLogistique extends AdminTab {
|
||||
ORDER BY i.`position`
|
||||
') as $img) {
|
||||
$link_image = str_split($img['id_image']);
|
||||
$images[] = 'http://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg';
|
||||
$images[] = 'https://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg';
|
||||
}
|
||||
|
||||
if(count($combinations) > 0) {
|
||||
@ -920,7 +920,7 @@ class AdminPrivateSalesLogistique extends AdminTab {
|
||||
AND a.`id_product_attribute` = '.(int) $k.'
|
||||
') as $img) {
|
||||
$link_image = str_split($img['id_image']);
|
||||
$c_images[] = 'http://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg';
|
||||
$c_images[] = 'https://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg';
|
||||
// $c_images[] = 'http://static.bebeboutik.com/'.(int) $p->id.'-'.$img['id_image'].'.jpg';
|
||||
}
|
||||
|
||||
@ -1210,7 +1210,7 @@ class AdminPrivateSalesLogistique extends AdminTab {
|
||||
AND i.`id_product` = '.(int) $p->id.'
|
||||
') as $img) {
|
||||
$link_image = str_split($img['id_image']);
|
||||
$images[] = 'http://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg';
|
||||
$images[] = 'https://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg';
|
||||
}
|
||||
|
||||
$customs = Db::getInstance()->getRow('
|
||||
@ -1234,7 +1234,7 @@ class AdminPrivateSalesLogistique extends AdminTab {
|
||||
ORDER BY i.`position`
|
||||
') as $img) {
|
||||
$link_image = str_split($img['id_image']);
|
||||
$c_images[] = 'http://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg';
|
||||
$c_images[] = 'https://static.bebeboutik.com/img/p/'.implode('/', $link_image) .'/'. $img['id_image'].'.jpg';
|
||||
}
|
||||
|
||||
$quantity_sold = (int) Db::getInstance()->getValue('
|
||||
|
||||
Loading…
Reference in New Issue
Block a user