diff --git a/htdocs/telephonie/stats/distributeurs/distributeur.commission.class.php b/htdocs/telephonie/stats/distributeurs/distributeur.commission.class.php index 3a25c645bfa..71c055b7dc1 100644 --- a/htdocs/telephonie/stats/distributeurs/distributeur.commission.class.php +++ b/htdocs/telephonie/stats/distributeurs/distributeur.commission.class.php @@ -41,14 +41,26 @@ class GraphDistributeurCommission extends GraphBar { $num = 0; $this->no_xaxis_title=1; $sql = "DELETE FROM ".MAIN_DB_PREFIX."telephonie_stats"; - $sql .= " WHERE graph='distributeur.commission.mensuel.".$distributeur."';"; + if ($distributeur > 0) { + $sql .= " WHERE graph='distributeur.commission.mensuel.".$distributeur."';"; + } else { + $sql .= " WHERE graph='distributeur.commission.mensuel';"; + } $resql = $this->db->query($sql); - $sql = "SELECT date, montant"; - $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_commission"; - $sql .= " WHERE fk_distributeur = ".$distributeur; - $sql .= " ORDER BY date ASC"; + + if ($distributeur > 0) { + $sql = "SELECT date, montant"; + $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_commission"; + $sql .= " WHERE fk_distributeur = ".$distributeur; + $sql .= " ORDER BY date ASC"; + } else { + $sql = "SELECT legend, sum(valeur)"; + $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_stats"; + $sql .= " WHERE graph like 'distributeur.commission.mensuel.%'"; + $sql .= " GROUP BY legend ORDER BY ord ASC"; + } $resql = $this->db->query($sql); @@ -70,7 +82,11 @@ class GraphDistributeurCommission extends GraphBar { $sqli = "INSERT INTO ".MAIN_DB_PREFIX."telephonie_stats"; $sqli .= " (graph,ord,legend,valeur)"; - $sqli .= " VALUES ('distributeur.commission.mensuel.".$distributeur."'"; + if ($distributeur > 0) { + $sqli .= " VALUES ('distributeur.commission.mensuel.".$distributeur."'"; + } else { + $sqli .= " VALUES ('distributeur.commission.mensuel'"; + } $sqli .= ",'$i','".$row[0]."','".$datas[$i]."');"; $resqli = $this->db->query($sqli); diff --git a/htdocs/telephonie/stats/distributeurs/distributeur.gain.class.php b/htdocs/telephonie/stats/distributeurs/distributeur.gain.class.php index 5df82121868..1916d03bf02 100644 --- a/htdocs/telephonie/stats/distributeurs/distributeur.gain.class.php +++ b/htdocs/telephonie/stats/distributeurs/distributeur.gain.class.php @@ -30,7 +30,8 @@ class GraphDistributeurGain extends GraphBar { $this->file = $file; $this->client = 0; - $this->titre = "Gain mensuel ".strftime("%Y",time()); + $this->year = strftime("%Y",time()); + $this->titre = "Gain mensuel ".$this->year; $this->barcolor = "pink"; $this->showframe = true; @@ -42,18 +43,32 @@ class GraphDistributeurGain extends GraphBar { $year = strftime("%Y",time()); $sql = "DELETE FROM ".MAIN_DB_PREFIX."telephonie_stats"; - $sql .= " WHERE graph='distributeur.gain.mensuel.".$distributeur."';"; - + if ($distributeur > 0) + { + $sql .= " WHERE graph='distributeur.gain.mensuel.".$distributeur."';"; + } + else + { + $sql .= " WHERE graph='distributeur.gain.mensuel'"; + } $resql = $this->db->query($sql); - $sql = "SELECT date_format(f.date,'%Y%m'), sum(f.gain)"; - $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_facture as f"; - $sql .= " , ".MAIN_DB_PREFIX."telephonie_societe_ligne as l"; - $sql .= " , ".MAIN_DB_PREFIX."telephonie_distributeur_commerciaux as dc"; - $sql .= " WHERE l.rowid = f.fk_ligne"; - $sql .= " AND l.fk_commercial_sign = dc.fk_user"; - $sql .= " AND dc.fk_distributeur = ".$distributeur; - $sql .= " GROUP BY date_format(f.date,'%Y%m') ASC"; + + if ($distributeur > 0) { + $sql = "SELECT date_format(f.date,'%Y%m'), sum(f.gain)"; + $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_facture as f"; + $sql .= " , ".MAIN_DB_PREFIX."telephonie_societe_ligne as l"; + $sql .= " , ".MAIN_DB_PREFIX."telephonie_distributeur_commerciaux as dc"; + $sql .= " WHERE l.rowid = f.fk_ligne"; + $sql .= " AND l.fk_commercial_sign = dc.fk_user"; + $sql .= " AND dc.fk_distributeur = ".$distributeur; + $sql .= " GROUP BY date_format(f.date,'%Y%m') ASC"; + } else { + $sql = "SELECT legend, sum(valeur)"; + $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_stats"; + $sql .= " WHERE graph like 'distributeur.gain.mensuel.%'"; + $sql .= " GROUP BY legend ORDER BY ord ASC"; + } $resql = $this->db->query($sql); @@ -76,7 +91,12 @@ class GraphDistributeurGain extends GraphBar { $sqli = "INSERT INTO ".MAIN_DB_PREFIX."telephonie_stats"; $sqli .= " (graph,ord,legend,valeur)"; - $sqli .= " VALUES ('distributeur.gain.mensuel.".$distributeur."'"; + if ($distributeur > 0) { + $sqli .= " VALUES ('distributeur.gain.mensuel.".$distributeur."'"; + } + else { + $sqli .= " VALUES ('distributeur.gain.mensuel'"; + } $sqli .= ",'$i','".$row[0]."','".$datas[$i]."');"; $resqli = $this->db->query($sqli); diff --git a/htdocs/telephonie/stats/distributeurs/distributeur.resultat.class.php b/htdocs/telephonie/stats/distributeurs/distributeur.resultat.class.php index 7991b616158..b67ddd95559 100644 --- a/htdocs/telephonie/stats/distributeurs/distributeur.resultat.class.php +++ b/htdocs/telephonie/stats/distributeurs/distributeur.resultat.class.php @@ -43,13 +43,22 @@ class GraphDistributeurResultat extends GraphBar { $this->no_xaxis_title=1; $sql = "DELETE FROM ".MAIN_DB_PREFIX."telephonie_stats"; - $sql .= " WHERE graph='distributeur.resultat.mensuel.".$distributeur."';"; + if ($distributeur > 0 ){ + $sql .= " WHERE graph='distributeur.resultat.mensuel.".$distributeur."';"; + } else { + $sql .= " WHERE graph='distributeur.resultat.mensuel'"; + } $sql .= " AND legend like '".$this->year."%';"; + $resql = $this->db->query($sql); $sql = "SELECT legend, valeur"; $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_stats"; - $sql .= " WHERE graph = 'distributeur.gain.mensuel.".$distributeur."'"; + if ($distributeur > 0 ){ + $sql .= " WHERE graph = 'distributeur.gain.mensuel.".$distributeur."'"; + } else { + $sql .= " WHERE graph = 'distributeur.gain.mensuel'"; + } $sql .= " ORDER BY ord ASC"; $resql = $this->db->query($sql); @@ -63,7 +72,11 @@ class GraphDistributeurResultat extends GraphBar { $sql = "SELECT legend, valeur"; $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_stats"; - $sql .= " WHERE graph = 'distributeur.commission.mensuel.".$distributeur."'"; + if ($distributeur > 0 ){ + $sql .= " WHERE graph = 'distributeur.commission.mensuel.".$distributeur."'"; + } else { + $sql .= " WHERE graph = 'distributeur.commission.mensuel'"; + } $sql .= " ORDER BY ord ASC"; $resql = $this->db->query($sql); @@ -84,11 +97,20 @@ class GraphDistributeurResultat extends GraphBar { $datas[$i-1] = $gains[$idx] - $comms[$idx]; $labels[$i-1] = $i; - $sqli = "INSERT INTO ".MAIN_DB_PREFIX."telephonie_stats"; - $sqli .= " (graph,ord,legend,valeur)"; - $sqli .= " VALUES ('distributeur.resultat.mensuel.".$distributeur."'"; - $sqli .= ",'$i','".$idx."','".$datas[$i-1]."');"; - $resqli = $this->db->query($sqli); + if ($distributeur > 0 ){ + $sqli = "INSERT INTO ".MAIN_DB_PREFIX."telephonie_stats"; + $sqli .= " (graph,ord,legend,valeur)"; + $sqli .= " VALUES ('distributeur.resultat.mensuel.".$distributeur."'"; + $sqli .= ",'$i','".$idx."','".$datas[$i-1]."');"; + $resqli = $this->db->query($sqli); + } else { + $sqli = "INSERT INTO ".MAIN_DB_PREFIX."telephonie_stats"; + $sqli .= " (graph,ord,legend,valeur)"; + $sqli .= " VALUES ('distributeur.resultat.mensuel'"; + $sqli .= ",'$i','".$idx."','".$datas[$i-1]."');"; + $resqli = $this->db->query($sqli); + } + } if (sizeof($datas))