Skip to content
Snippets Groups Projects
Commit 302ab8b7 authored by Regis Houssin's avatar Regis Houssin
Browse files

Fix: uniformize code

parent 0f45a3c3
No related branches found
No related tags found
No related merge requests found
...@@ -1961,7 +1961,7 @@ class Product extends CommonObject ...@@ -1961,7 +1961,7 @@ class Product extends CommonObject
* \brief Return all parent products * \brief Return all parent products
* \return array prod * \return array prod
*/ */
function get_pere() function getParent()
{ {
$sql = "SELECT p.label as label,p.rowid,pa.fk_product_pere as id"; $sql = "SELECT p.label as label,p.rowid,pa.fk_product_pere as id";
...@@ -1991,13 +1991,13 @@ class Product extends CommonObject ...@@ -1991,13 +1991,13 @@ class Product extends CommonObject
* \brief Return childs * \brief Return childs
* \return array prod * \return array prod
*/ */
function get_fils_arbo ($id_pere) function getChildsArbo($fk_parent)
{ {
$sql = "SELECT p.rowid, p.label as label, pa.qty as qty, pa.fk_product_fils as id"; $sql = "SELECT p.rowid, p.label as label, pa.qty as qty, pa.fk_product_fils as id";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p"; $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
$sql.= ", ".MAIN_DB_PREFIX."product_association as pa"; $sql.= ", ".MAIN_DB_PREFIX."product_association as pa";
$sql.= " WHERE p.rowid = pa.fk_product_fils"; $sql.= " WHERE p.rowid = pa.fk_product_fils";
$sql.= " AND pa.fk_product_pere = ".$id_pere; $sql.= " AND pa.fk_product_pere = ".$fk_parent;
$res = $this->db->query($sql); $res = $this->db->query($sql);
if ($res) if ($res)
...@@ -2006,7 +2006,7 @@ class Product extends CommonObject ...@@ -2006,7 +2006,7 @@ class Product extends CommonObject
while ($rec = $this->db->fetch_array($res)) while ($rec = $this->db->fetch_array($res))
{ {
$prods[addslashes($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty']); $prods[addslashes($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty']);
foreach($this -> get_fils_arbo($rec['id']) as $kf=>$vf) foreach($this -> getChildsArbo($rec['id']) as $kf=>$vf)
$prods[addslashes($rec['label'])][$kf] = $vf; $prods[addslashes($rec['label'])][$kf] = $vf;
} }
return $prods; return $prods;
...@@ -2025,18 +2025,18 @@ class Product extends CommonObject ...@@ -2025,18 +2025,18 @@ class Product extends CommonObject
*/ */
function get_sousproduits_arbo() function get_sousproduits_arbo()
{ {
$peres = $this -> get_pere(); $parent = $this->getParent();
foreach($peres as $k=>$v) foreach($parent as $key => $value)
{ {
foreach($this -> get_fils_arbo($v[0]) as $kf=>$vf) foreach($this->getChildsArbo($value[0]) as $keyChild => $valueChild)
{ {
$peres[$k][$kf] = $vf; $parent[$key][$keyChild] = $valueChild;
} }
} }
// concatenation // concatenation
foreach($peres as $k=>$v) foreach($parent as $key => $value)
{ {
$this -> sousprods[$k]=$v; $this->sousprods[$key] = $value;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment