Modif gestion des services

This commit is contained in:
Rodolphe Quiedeville 2005-05-04 14:43:09 +00:00
parent 134461ffdd
commit 964b15c727
2 changed files with 38 additions and 13 deletions

View File

@ -35,12 +35,12 @@ if ($_POST["action"] == 'addservice')
} }
} }
if ($_POST["action"] == 'rmservice') if ($_GET["action"] == 'rmservice')
{ {
$contrat = new TelephonieContrat($db); $contrat = new TelephonieContrat($db);
$contrat->id= $_GET["id"]; $contrat->id= $_GET["id"];
if ( $contrat->remove_service($user, $_POST["service_id"]) == 0) if ( $contrat->remove_service($user, $_GET["service_id"]) == 0)
{ {
Header("Location: services.php?id=".$contrat->id); Header("Location: services.php?id=".$contrat->id);
} }
@ -189,7 +189,7 @@ if ($cancel == $langs->trans("Cancel"))
print '<table class="border" width="100%" cellspacing="0" cellpadding="4">'; print '<table class="border" width="100%" cellspacing="0" cellpadding="4">';
$sql = "SELECT s.libelle, s.statut, s.rowid as serid, s.montant"; $sql = "SELECT s.libelle, s.statut, cs.rowid as serid, s.montant, cs.montant as montant_fac";
$sql .= ", cs.rowid"; $sql .= ", cs.rowid";
$sql .= " FROM ".MAIN_DB_PREFIX."telephonie_contrat_service as cs"; $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_contrat_service as cs";
$sql .= " , ".MAIN_DB_PREFIX."telephonie_service as s"; $sql .= " , ".MAIN_DB_PREFIX."telephonie_service as s";
@ -208,8 +208,9 @@ if ($cancel == $langs->trans("Cancel"))
$ligne = new LigneTel($db); $ligne = new LigneTel($db);
print '<tr class="liste_titre"><td>Service</td>'; print '<tr class="liste_titre"><td>Service</td>';
print '</td><td align="right">Montant</td><td>&nbsp;</td>'; print '<td align="right">Montant Facturé</td>';
print "</tr>\n"; print '<td align="right">Montant du service</td>';
print "<td>&nbsp;</td></tr>\n";
while ($i < $numlignes) while ($i < $numlignes)
{ {
@ -223,6 +224,7 @@ if ($cancel == $langs->trans("Cancel"))
print '<a href="'.DOL_URL_ROOT.'/telephonie/service/fiche.php?id='.$obj->serid.'">'.$obj->libelle."</a></td>\n"; print '<a href="'.DOL_URL_ROOT.'/telephonie/service/fiche.php?id='.$obj->serid.'">'.$obj->libelle."</a></td>\n";
print '<td align="right">'.price($obj->montant_fac)." euros HT</td>\n";
print '<td align="right">'.price($obj->montant)." euros HT</td>\n"; print '<td align="right">'.price($obj->montant)." euros HT</td>\n";
print '<td align="center"><a href="services.php?id='.$contrat->id.'&amp;action=rmservice&amp;service_id='.$obj->serid.'">'; print '<td align="center"><a href="services.php?id='.$contrat->id.'&amp;action=rmservice&amp;service_id='.$obj->serid.'">';

View File

@ -274,13 +274,36 @@ class TelephonieContrat {
*/ */
function add_service($user, $sid) function add_service($user, $sid)
{ {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."telephonie_contrat_service"; $result = 0;
$sql .= " (fk_contrat, fk_service, fk_user_creat, date_creat) ";
$sql .= " VALUES ($this->id, $sid, $user->id, now() )"; $sql = "SELECT montant FROM ".MAIN_DB_PREFIX."telephonie_service";
$sql .= " WHERE rowid=".$sid;
if ($this->db->query($sql) )
$resql = $this->db->query( $sql);
if ($resql)
{ {
return 0 ; $row = $this->db->fetch_row($resql);
$montant = $row[0];
}
else
{
$result = -1;
}
if ($result == 0)
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."telephonie_contrat_service";
$sql .= " (fk_contrat, fk_service, fk_user_creat, date_creat, montant) ";
$sql .= " VALUES ($this->id, $sid, $user->id, now(),".$montant.")";
$resql = $this->db->query( $sql);
if ($resql)
{
return 0 ;
}
} }
} }
/* /*
@ -290,8 +313,8 @@ class TelephonieContrat {
function remove_service($user, $sid) function remove_service($user, $sid)
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."telephonie_contrat_service"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."telephonie_contrat_service";
$sql .= " (fk_contrat, fk_service, fk_user_creat, date_creat) "; $sql .= " WHERE fk_contrat = ".$this->id;
$sql .= " VALUES ($this->id, $sid, $user->id, now() )"; $sql .= " AND rowid = ".$sid;
if ($this->db->query($sql) ) if ($this->db->query($sql) )
{ {