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

Merge branch 'ticket-10444' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-07-12 17:36:04 +02:00
commit a8136e01e3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/privatesales_logistique/classes/MakeStats.php
View File

@ -300,16 +300,16 @@ class MakeStats {
$res2 = Db::getInstance()->ExecuteS($req2); $res2 = Db::getInstance()->ExecuteS($req2);
foreach ($res2 as $k => $value) { foreach ($res2 as $k => $value) {
if((int)$value['product_attribute_id']!=0 if(isset($value['product_attribute_id'])
&& $key = array_search($value['product_attribute_id'], array_column($res, 'product_attribute_id')) && $key = array_search($value['product_attribute_id'], array_column($res, 'product_attribute_id'))
&& $key && $key
&& $key['product_id'] == $value['product_id'] && $res[$key]['product_id'] == $value['product_id']
) { ) {
unset($res2[$k]); unset($res2[$k]);
} elseif ((int)$value['product_attribute_id']==0 } elseif (!isset($value['product_attribute_id'])
&& $key = array_search($value['product_id'], array_column($res, 'product_id')) && $key = array_search($value['product_id'], array_column($res, 'product_id'))
&& $key && $key
&& (int)$key['product_attribute_id'] == 0 && (int)$res[$key]['product_attribute_id'] == 0
){ ){
unset($res2[$k]); unset($res2[$k]);
} }