Ajout entree nouvelle cotisation dans menu eldy
This commit is contained in:
Laurent Destailleur
parent
62d8003a28
commit
15b0450ad8
@ -64,61 +64,88 @@ if ($_POST["action"] == 'cotisation')
|
|||||||
$reyear=$_POST["reyear"];
|
$reyear=$_POST["reyear"];
|
||||||
$cotisation=$_POST["cotisation"];
|
$cotisation=$_POST["cotisation"];
|
||||||
|
|
||||||
$adh = new Adherent($db);
|
|
||||||
$adh->id = $rowid;
|
|
||||||
$adh->fetch($rowid);
|
|
||||||
if ($cotisation > 0)
|
if ($cotisation > 0)
|
||||||
{
|
{
|
||||||
$db->begin();
|
$db->begin();
|
||||||
|
|
||||||
// rajout du nouveau cotisant dans les listes qui vont bien
|
$adh = new Adherent($db);
|
||||||
|
$adh->id = $rowid;
|
||||||
|
$adh->fetch($rowid);
|
||||||
|
|
||||||
|
// Rajout du nouveau cotisant dans les listes qui vont bien
|
||||||
// if (defined("ADHERENT_MAILMAN_LISTS_COTISANT") && ADHERENT_MAILMAN_LISTS_COTISANT!='' && $adh->datefin == "0000-00-00 00:00:00"){
|
// if (defined("ADHERENT_MAILMAN_LISTS_COTISANT") && ADHERENT_MAILMAN_LISTS_COTISANT!='' && $adh->datefin == "0000-00-00 00:00:00"){
|
||||||
if (defined("ADHERENT_MAILMAN_LISTS_COTISANT") && ADHERENT_MAILMAN_LISTS_COTISANT!='' && $adh->datefin == 0){
|
if (defined("ADHERENT_MAILMAN_LISTS_COTISANT") && ADHERENT_MAILMAN_LISTS_COTISANT!='' && $adh->datefin == 0)
|
||||||
|
{
|
||||||
$adh->add_to_mailman(ADHERENT_MAILMAN_LISTS_COTISANT);
|
$adh->add_to_mailman(ADHERENT_MAILMAN_LISTS_COTISANT);
|
||||||
}
|
}
|
||||||
|
|
||||||
$crowid=$adh->cotisation(mktime(12, 0 , 0, $remonth, $reday, $reyear), $cotisation);
|
$crowid=$adh->cotisation(mktime(12, 0 , 0, $remonth, $reday, $reyear), $cotisation);
|
||||||
|
if ($crowid > 0)
|
||||||
// insertion dans la gestion banquaire si configure pour
|
|
||||||
if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE)
|
|
||||||
{
|
{
|
||||||
$acct=new Account($db,$_POST["accountid"]);
|
// Insertion dans la gestion banquaire si configuré pour
|
||||||
|
if ($conf->global->ADHERENT_BANK_USE)
|
||||||
|
{
|
||||||
|
$acct=new Account($db,$_POST["accountid"]);
|
||||||
|
|
||||||
$dateop=strftime("%Y%m%d",time());
|
$dateop=strftime("%Y%m%d",time());
|
||||||
$amount=$cotisation;
|
$amount=$cotisation;
|
||||||
$insertid=$acct->addline($dateop, $_POST["operation"], $_POST["label"], $amount, $_POST["num_chq"], '', $user);
|
|
||||||
if ($insertid <= 0)
|
$insertid=$acct->addline($dateop, $_POST["operation"], $_POST["label"], $amount, $_POST["num_chq"], '', $user);
|
||||||
{
|
if ($insertid > 0)
|
||||||
$db->rollback();
|
|
||||||
dolibarr_print_error($db,$acct->error);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// met a jour la table cotisation
|
|
||||||
$sql="UPDATE ".MAIN_DB_PREFIX."cotisation SET fk_bank=$insertid WHERE rowid=$crowid ";
|
|
||||||
$result = $db->query($sql);
|
|
||||||
if ($result)
|
|
||||||
{
|
{
|
||||||
$db->commit();
|
$inserturlid=$acct->add_url_line($insertid, $adh->id, DOL_URL_ROOT.'/adherents/fiche.php?rowid=', $adh->getFullname(), 'member');
|
||||||
//Header("Location: fiche.php");
|
if ($inserturlid > 0)
|
||||||
|
{
|
||||||
|
// Met a jour la table cotisation
|
||||||
|
$sql="UPDATE ".MAIN_DB_PREFIX."cotisation SET fk_bank=".$insertid." WHERE rowid=".$crowid;
|
||||||
|
$resql = $db->query($sql);
|
||||||
|
if ($resql)
|
||||||
|
{
|
||||||
|
$db->commit();
|
||||||
|
//Header("Location: fiche.php");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$db->rollback();
|
||||||
|
dolibarr_print_error($db);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$db->rollback();
|
||||||
|
dolibarr_print_error($db,$acct->error);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$db->rollback();
|
$db->rollback();
|
||||||
dolibarr_print_error($db);
|
dolibarr_print_error($db,$acct->error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$db->commit();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$db->commit();
|
$db->rollback();
|
||||||
|
dolibarr_print_error($db);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Envoi mail
|
||||||
if (defined("ADHERENT_MAIL_COTIS") && defined("ADHERENT_MAIL_COTIS_SUBJECT")){
|
if (defined("ADHERENT_MAIL_COTIS") && defined("ADHERENT_MAIL_COTIS_SUBJECT")){
|
||||||
$adh->send_an_email($adh->email,ADHERENT_MAIL_COTIS,ADHERENT_MAIL_COTIS_SUBJECT);
|
$adh->send_an_email($adh->email,ADHERENT_MAIL_COTIS,ADHERENT_MAIL_COTIS_SUBJECT);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$adh = new Adherent($db);
|
||||||
|
$adh->id = $rowid;
|
||||||
|
$adh->fetch($rowid);
|
||||||
|
}
|
||||||
|
$mesg='<div class="error">'.$langs->trans("FieldRequired",$langs->trans("Amount")).'</div>';
|
||||||
|
|
||||||
$action = "edit";
|
$action = "edit";
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -776,7 +803,7 @@ if ($rowid)
|
|||||||
|
|
||||||
print '<tr><td>'.$langs->trans("Amount").'</td><td><input type="text" name="cotisation" size="6"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
|
print '<tr><td>'.$langs->trans("Amount").'</td><td><input type="text" name="cotisation" size="6"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
|
||||||
|
|
||||||
if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE)
|
if ($conf->global->ADHERENT_BANK_USE)
|
||||||
{
|
{
|
||||||
print '<tr><td>'.$langs->trans("PaymentMode").'</td><td>';
|
print '<tr><td>'.$langs->trans("PaymentMode").'</td><td>';
|
||||||
$html->select_types_paiements('','operation');
|
$html->select_types_paiements('','operation');
|
||||||
@ -790,7 +817,9 @@ if ($rowid)
|
|||||||
print '<input name="num_chq" type="text" size="8">';
|
print '<input name="num_chq" type="text" size="8">';
|
||||||
print "</td></tr>\n";
|
print "</td></tr>\n";
|
||||||
|
|
||||||
print '<tr><td>'.$langs->trans("Label").'</td><td><input name="label" type="text" size="50" value="'.$langs->trans("Subscription").' '.stripslashes($adh->prenom).' '.stripslashes($adh->nom).' '.strftime("%Y",$adh->datefin).'" ></td></tr>';
|
print '<tr><td>'.$langs->trans("Label").'</td>';
|
||||||
|
print '<td><input name="label" type="text" size="50" value="'.$langs->trans("Subscription").' ';
|
||||||
|
print strftime("%Y",($adh->datefin?$adh->datefin:time())).'" ></td></tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
print '<tr><td colspan="2" align="center"><input type="submit" value="'.$langs->trans("Save").'"</td></tr>';
|
print '<tr><td colspan="2" align="center"><input type="submit" value="'.$langs->trans("Save").'"</td></tr>';
|
||||||
|
|||||||
@ -56,8 +56,9 @@ $sql .= " WHERE d.fk_adherent_type = t.rowid ";
|
|||||||
if ($_GET["type"]) {
|
if ($_GET["type"]) {
|
||||||
$sql.=" AND t.rowid=".$_GET["type"];
|
$sql.=" AND t.rowid=".$_GET["type"];
|
||||||
}
|
}
|
||||||
if (isset($_GET["statut"])) {
|
if (isset($_GET["statut"]))
|
||||||
$sql.=" AND d.statut = $statut";
|
{
|
||||||
|
$sql.=" AND d.statut in ($statut)"; // Peut valoir un nombre ou liste de nombre séparés par virgules
|
||||||
}
|
}
|
||||||
if ( $_POST["action"] == 'search')
|
if ( $_POST["action"] == 'search')
|
||||||
{
|
{
|
||||||
@ -78,12 +79,13 @@ if ($result)
|
|||||||
|
|
||||||
$titre=$langs->trans("MembersList");
|
$titre=$langs->trans("MembersList");
|
||||||
if (isset($_GET["statut"])) {
|
if (isset($_GET["statut"])) {
|
||||||
if ($statut == -1) { $titre=$langs->trans("MembersListToValid"); }
|
if ($statut == '-1,1') { $titre=$langs->trans("MembersListQualified"); }
|
||||||
if ($statut == 1) { $titre=$langs->trans("MembersListValid"); }
|
if ($statut == '-1') { $titre=$langs->trans("MembersListToValid"); }
|
||||||
if ($statut == 0) { $titre=$langs->trans("MembersListResiliated"); }
|
if ($statut == '1') { $titre=$langs->trans("MembersListValid"); }
|
||||||
|
if ($statut == '0') { $titre=$langs->trans("MembersListResiliated"); }
|
||||||
}
|
}
|
||||||
elseif ($_POST["action"] == 'search') {
|
elseif ($_POST["action"] == 'search') {
|
||||||
$titre="Liste des adhérents répondant aux critères";
|
$titre=$langs->trans("MembersListQualified");
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($_GET["type"]) {
|
if ($_GET["type"]) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user