lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing the badge on virtual product tab

Browse Source
This commit is contained in:
Laurent Destailleur 2017-12-01 17:48:51 +01:00
parent 9ed679d19a
commit 4969ae2abb
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/lib/product.lib.php
View File

@ -80,6 +80,9 @@ function product_prepare_head($object)
{ {
$head[$h][0] = DOL_URL_ROOT."/product/composition/card.php?id=".$object->id; $head[$h][0] = DOL_URL_ROOT."/product/composition/card.php?id=".$object->id;
$head[$h][1] = $langs->trans('AssociatedProducts'); $head[$h][1] = $langs->trans('AssociatedProducts');
$nbFatherAndChild = $object->hasFatherOrChild();
if ($nbFatherAndChild > 0) $head[$h][1].= ' <span class="badge">'.$nbFatherAndChild.'</span>';
$head[$h][2] = 'subproduct'; $head[$h][2] = 'subproduct';
$h++; $h++;
} }

26
htdocs/product/class/product.class.php
View File

@ -3314,6 +3314,32 @@ class Product extends CommonObject
} }
/**
* Return all parent products for current product (first level only)
*
* @return int Nb of father + child
*/
function hasFatherOrChild()
{
$nb = 0;
$sql = "SELECT COUNT(pa.rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."product_association as pa";
$sql.= " WHERE pa.fk_product_fils = ".$this->id." OR pa.fk_product_pere = ".$this->id;
$resql = $this->db->query($sql);
if ($resql)
{
$obj = $this->db->fetch_object($resql);
if ($obj) $nb = $obj->nb;
}
else
{
return -1;
}
return $nb;
}
/** /**
* Return all parent products for current product (first level only) * Return all parent products for current product (first level only)
* *