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

Look: Mise au look de la fiche adherent

Browse Source 
Norm: Utilisation de la fonction form_confirm plutot que le code en dur
Fix: Corrections diverses
Look: Les liens editer, rsilier et supprimer utilisent les icones.
Fix: La nature de l'adhrent (moral ou physique) est affich correctement.
Norm: La liste des modes de paiement pour la saisie d'une cotisation vient de la table des type de paiement plutot que cod en dur.
This commit is contained in:
Laurent Destailleur 2004-07-16 23:35:53 +00:00
parent 44076df5df
commit 4ceeca130f
4 changed files with 574 additions and 760 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/adherents/adherent.class.php
View File

@ -1,6 +1,7 @@
<?PHP <?PHP
/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org> * Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -125,7 +126,6 @@ class Adherent
} }
} }
/* /*
*
* *
* *
*/ */
@ -137,6 +137,19 @@ class Adherent
print "<li>" . $this->errorstr[$i]; print "<li>" . $this->errorstr[$i];
} }
} }
/*!
\brief fonction qui renvoi la nature physique ou morale d'un adherent
*/
Function getmorphylib($morphy='')
{
if (! $morphy) { $morphy=$this->morphy; }
if ($morphy == 'phy') { return "Physique"; }
if ($morphy == 'mor') { return "Morale"; }
return $morphy;
}
/* /*
* *
* *

66
htdocs/adherents/edit.php
View File

@ -1,6 +1,8 @@
<?PHP <?PHP
/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Jean-Louis Bergamo <jlb@j1b.org> * Copyright (C) 2002 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
@ -33,33 +35,33 @@ $adho = new AdherentOptions($db);
if ($action == 'update') if ($action == 'update')
{ {
if ($HTTP_POST_VARS["bouton"] == "Enregistrer") if ($_POST["bouton"] == "Enregistrer")
{ {
$adh = new Adherent($db); $adh = new Adherent($db);
$adh->id = $HTTP_POST_VARS["rowid"]; $adh->id = $_POST["rowid"];
$adh->prenom = $prenom; $adh->prenom = $prenom;
$adh->nom = $nom; $adh->nom = $nom;
$adh->societe = $societe; $adh->societe = $societe;
$adh->adresse = $adresse; $adh->adresse = $adresse;
$adh->amount = $amount; $adh->amount = $amount;
$adh->cp = $cp; $adh->cp = $cp;
$adh->ville = $HTTP_POST_VARS["ville"]; $adh->ville = $_POST["ville"];
$adh->email = $HTTP_POST_VARS["email"]; $adh->email = $_POST["email"];
$adh->login = $HTTP_POST_VARS["login"]; $adh->login = $_POST["login"];
$adh->pass = $HTTP_POST_VARS["pass"]; $adh->pass = $_POST["pass"];
$adh->naiss = $HTTP_POST_VARS["naiss"]; $adh->naiss = $_POST["naiss"];
$adh->photo = $HTTP_POST_VARS["photo"]; $adh->photo = $_POST["photo"];
$adh->date = mktime(12, 0 , 0, $remonth, $reday, $reyear); $adh->date = mktime(12, 0 , 0, $remonth, $reday, $reyear);
$adh->note = $HTTP_POST_VARS["note"]; $adh->note = $_POST["note"];
$adh->pays = $HTTP_POST_VARS["pays"]; $adh->pays = $_POST["pays"];
$adh->typeid = $HTTP_POST_VARS["type"]; $adh->typeid = $_POST["type"];
$adh->commentaire = $HTTP_POST_VARS["comment"]; $adh->commentaire = $_POST["comment"];
$adh->morphy = $HTTP_POST_VARS["morphy"]; $adh->morphy = $_POST["morphy"];
// recuperation du statut et public // recuperation du statut et public
$adh->statut = $HTTP_POST_VARS["statut"]; $adh->statut = $_POST["statut"];
$adh->public = $HTTP_POST_VARS["public"]; $adh->public = $_POST["public"];
foreach($_POST as $key => $value){ foreach($_POST as $key => $value){
if (ereg("^options_",$key)){ if (ereg("^options_",$key)){
@ -115,38 +117,6 @@ if ($rowid)
print_titre("Edition de la fiche adhérent"); print_titre("Edition de la fiche adhérent");
print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
print "<tr><td>Type</td><td class=\"valeur\">$adh->type</td>";
print '<td valign="top" width="50%">Commentaires</td></tr>';
print '<tr><td>Personne</td><td class="valeur">'.$adh->morphy.'&nbsp;</td>';
print '<td rowspan="15" valign="top" width="50%">';
print nl2br($adh->commentaire).'&nbsp;</td></tr>';
print '<tr><td width="15%">Prénom</td><td class="valeur" width="35%">'.$adh->prenom.'&nbsp;</td></tr>';
print '<tr><td>Nom</td><td class="valeur">'.$adh->nom.'&nbsp;</td></tr>';
print '<tr><td>Société</td><td class="valeur">'.$adh->societe.'&nbsp;</td></tr>';
print '<tr><td>Adresse</td><td class="valeur">'.nl2br($adh->adresse).'&nbsp;</td></tr>';
print '<tr><td>CP Ville</td><td class="valeur">'.$adh->cp.' '.$adh->ville.'&nbsp;</td></tr>';
print '<tr><td>Pays</td><td class="valeur">'.$adh->pays.'&nbsp;</td></tr>';
print '<tr><td>Email</td><td class="valeur">'.$adh->email.'&nbsp;</td></tr>';
print '<tr><td>Login</td><td class="valeur">'.$adh->login.'&nbsp;</td></tr>';
// print '<tr><td>Password</td><td class="valeur">'.$adh->pass.'&nbsp;</td></tr>';
print '<tr><td>Date de naissance<BR>Format AAAA-MM-JJ</td><td class="valeur">'.$adh->naiss.'&nbsp;</td></tr>';
print '<tr><td>URL Photo</td><td class="valeur">'.$adh->photo.'&nbsp;</td></tr>';
// $adho->fetch_optionals();
foreach($adho->attribute_label as $key=>$value){
print "<tr><td>$value</td><td>".$adh->array_options["options_$key"]."&nbsp;</td></tr>\n";
}
print "</table>\n";
print "<hr>";
print "<form action=\"$PHP_SELF\" method=\"post\">"; print "<form action=\"$PHP_SELF\" method=\"post\">";
print '<table cellspacing="0" border="1" width="100%" cellpadding="3">'; print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';

397
htdocs/adherents/fiche.php
View File

@ -22,18 +22,20 @@
* *
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
require(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); require(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php");
require(DOL_DOCUMENT_ROOT."/adherents/adherent_options.class.php"); require(DOL_DOCUMENT_ROOT."/adherents/adherent_options.class.php");
//require(DOL_DOCUMENT_ROOT."/adherents/cotisation.class.php");
//require(DOL_DOCUMENT_ROOT."/paiement.class.php");
require(DOL_DOCUMENT_ROOT."/adherents/XML-RPC.functions.php"); require(DOL_DOCUMENT_ROOT."/adherents/XML-RPC.functions.php");
require(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); require(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php");
$adho = new AdherentOptions($db); $adho = new AdherentOptions($db);
$errmsg=''; $errmsg='';
if (isset($action) && $action=='sendinfo') $action=isset($_GET["action"])?$_GET["action"]:$_POST["action"];
if ($_POST["action"] == 'sendinfo')
{ {
$adh = new Adherent($db); $adh = new Adherent($db);
$adh->id = $rowid; $adh->id = $rowid;
@ -47,7 +49,6 @@ if ($_POST["action"] == 'cotisation')
$adh = new Adherent($db); $adh = new Adherent($db);
$adh->id = $rowid; $adh->id = $rowid;
$adh->fetch($rowid); $adh->fetch($rowid);
if ($cotisation >= 0) if ($cotisation >= 0)
{ {
// rajout du nouveau cotisant dans les listes qui vont bien // rajout du nouveau cotisant dans les listes qui vont bien
@ -95,13 +96,13 @@ if ($_POST["action"] == 'add')
$type=$_POST["type"]; $type=$_POST["type"];
if(!isset($type) || $type==''){ if(!isset($type) || $type==''){
$error+=1; $error+=1;
$errmsg .="Le type d'adhérent n'est pas renseigné. Vous devez configurer les types d'adhérents avant de pouvoir les ajouter.<BR>\n"; $errmsg .="Le type d'adhérent n'est pas renseigné. Vous devez configurer les types d'adhérents avant de pouvoir les ajouter.<br>\n";
} }
$login=$_POST["login"]; $login=$_POST["login"];
// test si le login existe deja // test si le login existe deja
if(!isset($login) || $login==''){ if(!isset($login) || $login==''){
$error+=1; $error+=1;
$errmsg .="Login vide. Veuillez en positionner un<BR>\n"; $errmsg .="Login vide. Veuillez en positionner un<br>\n";
} }
$sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='$login';"; $sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='$login';";
$result = $db->query($sql); $result = $db->query($sql);
@ -110,11 +111,11 @@ if ($_POST["action"] == 'add')
} }
if (!isset($nom) || !isset($prenom) || $prenom=='' || $nom==''){ if (!isset($nom) || !isset($prenom) || $prenom=='' || $nom==''){
$error+=1; $error+=1;
$errmsg .="Nom et Prenom obligatoires<BR>\n"; $errmsg .="Nom et Prenom obligatoires<br>\n";
} }
if (!isset($email) || $email == '' || !ereg('@',$email)){ if (!isset($email) || $email == '' || !ereg('@',$email)){
$error+=1; $error+=1;
$errmsg .="Adresse Email invalide<BR>\n"; $errmsg .="Adresse Email invalide<br>\n";
} }
if ($num !=0){ if ($num !=0){
$error+=1; $error+=1;
@ -122,20 +123,20 @@ if ($_POST["action"] == 'add')
} }
if (!isset($pass) || $pass == '' ){ if (!isset($pass) || $pass == '' ){
$error+=1; $error+=1;
$errmsg .="Password invalide<BR>\n"; $errmsg .="Password invalide<br>\n";
} }
if (isset($naiss) && $naiss !=''){ if (isset($naiss) && $naiss !=''){
if (!preg_match("/^\d\d\d\d-\d\d-\d\d$/",$naiss)){ if (!preg_match("/^\d\d\d\d-\d\d-\d\d$/",$naiss)){
$error+=1; $error+=1;
$errmsg .="Date de naissance invalide (Format AAAA-MM-JJ)<BR>\n"; $errmsg .="Date de naissance invalide (Format AAAA-MM-JJ)<br>\n";
} }
} }
if (isset($public)){ if (isset($public)){
$public=1; $public=1;
}else{ }else{
$public=0; $public=0;
} }
if (!$error){ if (!$error){
// email a peu pres correct et le login n'existe pas // email a peu pres correct et le login n'existe pas
$adh = new Adherent($db); $adh = new Adherent($db);
$adh->statut = -1; $adh->statut = -1;
@ -196,7 +197,7 @@ if ($_POST["action"] == 'add')
} }
Header("Location: liste.php"); Header("Location: liste.php");
} }
} }
} }
if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == yes) if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == yes)
@ -393,8 +394,7 @@ if ($action == 'create') {
print "</td></tr>\n"; print "</td></tr>\n";
} }
print '<tr><td>Cotisation</td><td><input type="text" name="cotisation" size="6"> euros</td></tr>'; print '<tr><td>Cotisation</td><td><input type="text" name="cotisation" size="6"> euros</td></tr>';
if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0 && if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0 && defined("ADHERENT_BANK_USE_AUTO") && ADHERENT_BANK_USE_AUTO !=0){
defined("ADHERENT_BANK_USE_AUTO") && ADHERENT_BANK_USE_AUTO !=0){
print '<tr><td>Libelle</td><td><input name="label" type="text" size=20 value="Cotisation " ></td></tr>'; print '<tr><td>Libelle</td><td><input name="label" type="text" size=20 value="Cotisation " ></td></tr>';
} }
print '<tr><td colspan="2" align="center"><input type="submit" value="Enregistrer"></td></tr>'; print '<tr><td colspan="2" align="center"><input type="submit" value="Enregistrer"></td></tr>';
@ -410,194 +410,86 @@ if ($action == 'create') {
/* ************************************************************************** */ /* ************************************************************************** */
if ($rowid > 0) if ($rowid > 0)
{ {
$adh = new Adherent($db); $adh = new Adherent($db);
$adh->id = $rowid; $adh->id = $rowid;
$adh->fetch($rowid); $adh->fetch($rowid);
$adh->fetch_optionals($rowid); $adh->fetch_optionals($rowid);
//$myattr=$adh->fetch_name_optionals();
$adht = new AdherentType($db); $adht = new AdherentType($db);
$adht->fetch($adh->typeid); $adht->fetch($adh->typeid);
print_titre("Edition de la fiche adhérent"); $html = new Form($db);
/*
* Affichage onglets
*/
$h = 0;
$head[$h][0] = DOL_URL_ROOT.'/adherents/fiche.php?rowid='.$rowid;
$head[$h][1] = "Fiche adhérent";
$hselected=$h;
$h++;
dolibarr_fiche_head($head, $hselected, $societe->nom);
/* /*
* Confirmation de la suppression de l'adhérent * Confirmation de la suppression de l'adhérent
*
*/ */
if ($action == 'delete') if ($action == 'delete')
{ {
$html->form_confirm("$PHP_SELF?rowid=$rowid","Supprimer un adhérent","Etes-vous sûr de vouloir supprimer cet adhérent (La suppression d'un adhérent entraine la suppression de toutes ses cotisations !)","confirm_delete");
print '<form method="post" action="'.$PHP_SELF.'?rowid='.$rowid.'">';
print '<input type="hidden" name="action" value="confirm_delete">';
print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
print '<tr><td colspan="3">Supprimer un adhérent</td></tr>';
print "<tr><td colspan=\"3\">La suppression d'un adhérent entraine la suppression de toutes ses cotisations !!!</td></tr>\n";
print '<tr><td class="warning">Etes-vous sur de vouloir supprimer cet adhérent ?</td><td class="warning">';
$htmls = new Form($db);
$htmls->selectyesno("confirm","no");
print "</td>\n";
print '<td class="warning" align="center"><input type="submit" value="Confirmer"</td></tr>';
print '</table>';
print "</form>\n";
} }
/* /*
* Confirmation de la validation * Confirmation de la validation
*
*/ */
if ($action == 'valid') if ($action == 'valid')
{ {
$html->form_confirm("$PHP_SELF?rowid=$rowid","Valider un adhérent","Etes-vous sûr de vouloir valider cet adhérent ?","confirm_valid");
print '<form method="post" action="'.$PHP_SELF.'?rowid='.$rowid.'">';
print '<input type="hidden" name="action" value="confirm_valid">';
print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
print '<tr><td colspan="3">Valider un adhérent</td></tr>';
print '<tr><td class="valid">Etes-vous sur de vouloir valider cet adhérent ?</td><td class="valid">';
$htmls = new Form($db);
$htmls->selectyesno("confirm","no");
print "</td>\n";
print '<td class="valid" align="center"><input type="submit" value="Confirmer"</td></tr>';
print '</table>';
print "</form>\n";
} }
/* /*
* Confirmation de la Résiliation * Confirmation de la Résiliation
*
*/ */
if ($action == 'resign') if ($action == 'resign')
{ {
$html->form_confirm("$PHP_SELF?rowid=$rowid","Résilier une adhésion","Etes-vous sûr de vouloir résilier cet adhérent ?","confirm_resign");
print '<form method="post" action="'.$PHP_SELF.'?rowid='.$rowid.'">';
print '<input type="hidden" name="action" value="confirm_resign">';
print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
print '<tr><td colspan="3">Résilier une adhésion</td></tr>';
print '<tr><td class="warning">Etes-vous sur de vouloir résilier cette adhésion ?</td><td class="warning">';
$htmls = new Form($db);
$htmls->selectyesno("confirm","no");
print "</td>\n";
print '<td class="warning" align="center"><input type="submit" value="Confirmer"</td></tr>';
print '</table>';
print "</form>\n";
} }
/* /*
* Confirmation de l'ajout dans glasnost * Confirmation de l'ajout dans glasnost
*
*/ */
if ($action == 'add_glasnost') if ($action == 'add_glasnost')
{ {
$html->form_confirm("$PHP_SELF?rowid=$rowid","Ajouter dans glasnost","Etes-vous sur de vouloir ajouter cet adhérent dans glasnost ? (serveur : ".ADHERENT_GLASNOST_SERVEUR.")","confirm_add_glasnost");
print '<form method="post" action="'.$PHP_SELF.'?rowid='.$rowid.'">';
print '<input type="hidden" name="action" value="confirm_add_glasnost">';
print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
print '<tr><td colspan="3">Valider un adhérent</td></tr>';
print '<tr><td class="valid">Etes-vous sur de vouloir ajouter cet adhérent dans glasnost ? (serveur : '.ADHERENT_GLASNOST_SERVEUR.')</td><td class="valid">';
$htmls = new Form($db);
$htmls->selectyesno("confirm","no");
print "</td>\n";
print '<td class="valid" align="center"><input type="submit" value="Confirmer"</td></tr>';
print '</table>';
print "</form>\n";
} }
/* /*
* Confirmation de la suppression dans glasnost * Confirmation de la suppression dans glasnost
*
*/ */
if ($action == 'del_glasnost') if ($action == 'del_glasnost')
{ {
$html->form_confirm("$PHP_SELF?rowid=$rowid","Supprimer dans glasnost","Etes-vous sur de vouloir effacer cet adhérent dans glasnost ? (serveur : ".ADHERENT_GLASNOST_SERVEUR.")","confirm_del_glasnost");
print '<form method="post" action="'.$PHP_SELF.'?rowid='.$rowid.'">';
print '<input type="hidden" name="action" value="confirm_del_glasnost">';
print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
print '<tr><td colspan="3">Valider un adhérent</td></tr>';
print '<tr><td class="warning">Etes-vous sur de vouloir effacer cet adhérent de glasnost ? (serveur : '.ADHERENT_GLASNOST_SERVEUR.')</td><td class="warning">';
$htmls = new Form($db);
$htmls->selectyesno("confirm","no");
print "</td>\n";
print '<td class="warning" align="center"><input type="submit" value="Confirmer"</td></tr>';
print '</table>';
print "</form>\n";
} }
/* /*
* Confirmation de l'ajout dans spip * Confirmation de l'ajout dans spip
*
*/ */
if ($action == 'add_spip') if ($action == 'add_spip')
{ {
$html->form_confirm("$PHP_SELF?rowid=$rowid","Ajouter dans spip","Etes-vous sur de vouloir ajouter cet adhérent dans spip ? (serveur : ".ADHERENT_SPIP_SERVEUR.")","confirm_add_spip");
print '<form method="post" action="'.$PHP_SELF.'?rowid='.$rowid.'">';
print '<input type="hidden" name="action" value="confirm_add_spip">';
print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
print '<tr><td colspan="3">Valider un adhérent</td></tr>';
print '<tr><td class="valid">Etes-vous sur de vouloir ajouter cet adhérent dans spip ? (serveur : '.ADHERENT_SPIP_SERVEUR.')</td><td class="valid">';
$htmls = new Form($db);
$htmls->selectyesno("confirm","no");
print "</td>\n";
print '<td class="valid" align="center"><input type="submit" value="Confirmer"</td></tr>';
print '</table>';
print "</form>\n";
} }
/* /*
* Confirmation de la suppression dans spip * Confirmation de la suppression dans spip
*
*/ */
if ($action == 'del_spip') if ($action == 'del_spip')
{ {
$html->form_confirm("$PHP_SELF?rowid=$rowid","Supprimer dans spip","Etes-vous sur de vouloir effacer cet adhérent dans spip ? (serveur : ".ADHERENT_SPIP_SERVEUR.")","confirm_del_spip");
print '<form method="post" action="'.$PHP_SELF.'?rowid='.$rowid.'">'; $html->form_confirm("$PHP_SELF?rowid=$rowid","Ajouter dans glasnost","Etes-vous sur de vouloir ajouter cet adhérent dans glasnost ? (serveur : ".ADHERENT_GLASNOST_SERVEUR.")","confirm_del_spip");
print '<input type="hidden" name="action" value="confirm_del_spip">';
print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
print '<tr><td colspan="3">Valider un adhérent</td></tr>';
print '<tr><td class="warning">Etes-vous sur de vouloir effacer cet adhérent de glasnost ? (serveur : '.ADHERENT_SPIP_SERVEUR.')</td><td class="warning">';
$htmls = new Form($db);
$htmls->selectyesno("confirm","no");
print "</td>\n";
print '<td class="warning" align="center"><input type="submit" value="Confirmer"</td></tr>';
print '</table>';
print "</form>\n";
} }
print "<form action=\"$PHP_SELF\" method=\"post\">\n"; print "<form action=\"$PHP_SELF\" method=\"post\">\n";
print '<table cellspacing="0" border="1" width="100%" cellpadding="3">'; print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
@ -606,12 +498,10 @@ if ($rowid > 0)
print "<tr><td>Type</td><td class=\"valeur\">$adh->type</td>\n"; print "<tr><td>Type</td><td class=\"valeur\">$adh->type</td>\n";
print '<td rowspan="13" valign="top" width="50%">'; print '<td rowspan="'.(13+count($adh->array_options)).'" valign="top" width="50%">';
print nl2br($adh->commentaire).'&nbsp;</td></tr>'; print nl2br($adh->commentaire).'&nbsp;</td></tr>';
print '<tr><td>Personne</td><td class="valeur">'.$adh->morphy.'&nbsp;</td></tr>'; print '<tr><td>Personne</td><td class="valeur">'.$adh->getmorphylib().'&nbsp;</td></tr>';
print '<tr><td width="15%">Prénom</td><td class="valeur" width="35%">'.$adh->prenom.'&nbsp;</td></tr>'; print '<tr><td width="15%">Prénom</td><td class="valeur" width="35%">'.$adh->prenom.'&nbsp;</td></tr>';
@ -631,208 +521,152 @@ if ($rowid > 0)
print 'Yes'; print 'Yes';
}else{ }else{
print "No"; print "No";
} }
print '&nbsp;</td></tr>'; print '&nbsp;</td></tr>';
// print "</table>\n"; foreach($adho->attribute_label as $key=>$value){
// print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
// print '<tr><td colspan="2">Champs optionnels</td></tr>';
foreach($adho->attribute_label as $key=>$value){
print "<tr><td>$value</td><td>".$adh->array_options["options_$key"]."&nbsp;</td></tr>\n"; print "<tr><td>$value</td><td>".$adh->array_options["options_$key"]."&nbsp;</td></tr>\n";
} }
print "</table>\n";
if ($user->admin) print "</table>\n";
{
print "<p><TABLE border=\"1\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\"><tr class=\"barreBouton\">\n"; print "</div>\n";
/* /*
* Case 1 * Barre d'actions
*
*/ */
print '<div class="tabsAction">';
print '<td align="center" width="25%" class="bouton">[<a href="edit.php?rowid='.$adh->id.'">Editer</a>]</td>'; if ($user->admin)
{
/* print "<a class=\"tabAction\" href=\"edit.php?rowid=$rowid\">Editer</a>";
* Case 2
*/
if ($adh->statut < 1) if ($adh->statut < 1)
{ {
print "<td align=\"center\" width=\"25%\" class=\"bouton\">[<a href=\"$PHP_SELF?rowid=$rowid&action=valid\">Valider l'adhésion</a>]</td>\n"; print "<a class=\"tabAction\" href=\"$PHP_SELF?rowid=$rowid&action=valid\">Valider l'adhésion</a>\n";
} }
else
{
print "<td align=\"center\" width=\"25%\" class=\"bouton\">-</td>\n";
}
/*
* Case 3
*/
if ($adh->statut == 1) if ($adh->statut == 1)
{ {
print "<td align=\"center\" width=\"25%\" class=\"bouton\">[<a href=\"$PHP_SELF?rowid=$rowid&action=resign\">Résilier l'adhésion</a>]</td>\n"; print "<a class=\"tabAction\" href=\"$PHP_SELF?rowid=$rowid&action=resign\">Résilier l'adhésion</a>\n";
}
else
{
print "<td align=\"center\" width=\"25%\" class=\"bouton\">-</td>\n";
} }
/* print "<a class=\"tabAction\" href=\"$PHP_SELF?rowid=$adh->id&action=delete\">Supprimer</a>\n";
* Case 4
*/
print "<td align=\"center\" width=\"25%\" class=\"bouton\">[<a href=\"$PHP_SELF?rowid=$adh->id&action=delete\">Supprimer</a>]</td>\n";
print "</tr><tr class=\"barreBouton\">\n";
/* /*
* bouton : "Envoie des informations" * bouton : "Envoie des informations"
*/ */
print "<td align=\"center\" width=\"25%\" class=\"bouton\" colspan=\"4\">[<a href=\"$PHP_SELF?rowid=$adh->id&action=sendinfo\">Envoyer sa fiche a l'adhérent</a>]</td>\n"; print "<a class=\"tabAction\" href=\"$PHP_SELF?rowid=$adh->id&action=sendinfo\">Envoyer sa fiche a l'adhérent</a>\n";
print "</tr><tr class=\"barreBouton\">\n";
if ($adht->vote == 'yes' && defined("ADHERENT_USE_GLASNOST") && ADHERENT_USE_GLASNOST ==1){ if ($adht->vote == 'yes' && defined("ADHERENT_USE_GLASNOST") && ADHERENT_USE_GLASNOST ==1){
define("XMLRPC_DEBUG", 1); define("XMLRPC_DEBUG", 1);
/*
* Case 1 & 2
*/
/* retrait car bug inexplicable pour l'instant
if ($adh->is_in_glasnost() == 1){ if ($adh->is_in_glasnost() == 1){
print "<td align=\"center\" width=\"25%\" class=\"bouton\">-</td>\n"; print "<a class=\"tabAction\" href=\"$PHP_SELF?rowid=$adh->id&action=del_glasnost\">Suppression dans Glasnost</a>\n";
print "<td align=\"center\" width=\"25%\" class=\"bouton\">[<a href=\"$PHP_SELF?rowid=$adh->id&action=del_glasnost\">Suppression dans Glasnost</a>]</td>\n";
}else{
print "<td align=\"center\" width=\"25%\" class=\"bouton\">[<a href=\"$PHP_SELF?rowid=$adh->id&action=add_glasnost\">Ajout dans Glasnost</a>]</td>\n";
print "<td align=\"center\" width=\"25%\" class=\"bouton\">-</td>\n";
} }
*/ print "<a class=\"tabAction\" href=\"$PHP_SELF?rowid=$adh->id&action=add_glasnost\">Ajout dans Glasnost</a>\n";
print "<td align=\"center\" width=\"25%\" class=\"bouton\">[<a href=\"$PHP_SELF?rowid=$adh->id&action=add_glasnost\">Ajout dans Glasnost</a>]</td>\n"; print "<a class=\"tabAction\" href=\"$PHP_SELF?rowid=$adh->id&action=del_glasnost\">Suppression dans Glasnost</a>\n";
print "<td align=\"center\" width=\"25%\" class=\"bouton\">[<a href=\"$PHP_SELF?rowid=$adh->id&action=del_glasnost\">Suppression dans Glasnost</a>]</td>\n";
}else{
/*
* Case 1
*/
print "<td align=\"center\" width=\"25%\" class=\"bouton\">-</td>\n";
/*
* Case 2
*/
print "<td align=\"center\" width=\"25%\" class=\"bouton\">-</td>\n";
} }
if (defined("ADHERENT_USE_SPIP") && ADHERENT_USE_SPIP ==1){ if (defined("ADHERENT_USE_SPIP") && ADHERENT_USE_SPIP ==1){
/*
* Case 3 & 4
*/
if ($adh->is_in_spip() == 1){ if ($adh->is_in_spip() == 1){
print "<td align=\"center\" width=\"20%\" class=\"bouton\">-</td>\n"; print "<a class=\"tabAction\" href=\"$PHP_SELF?rowid=$adh->id&action=del_spip\">Suppression dans Spip</a>\n";
print "<td align=\"center\" width=\"20%\" class=\"bouton\">[<a href=\"$PHP_SELF?rowid=$adh->id&action=del_spip\">Suppression dans Spip</a>]</td>\n";
}else{ }else{
print "<td align=\"center\" width=\"20%\" class=\"bouton\">[<a href=\"$PHP_SELF?rowid=$adh->id&action=add_spip\">Ajout dans Spip</a>]</td>\n"; print "<a class=\"tabAction\" href=\"$PHP_SELF?rowid=$adh->id&action=add_spip\">Ajout dans Spip</a>\n";
print "<td align=\"center\" width=\"20%\" class=\"bouton\">-</td>\n";
} }
}else{ }
/* }
* Case 3
*/
print "<td align=\"center\" width=\"25%\" class=\"bouton\">-</td>\n";
/* print '</div>';
* Case 4 print "<br>\n";
*/
print "<td align=\"center\" width=\"25%\" class=\"bouton\">-</td>\n";
}
print "</tr></table></form><p>\n";
}
/*
* Cotisations /*
* * Bandeau des cotisations
* *
*/ */
print '<table cellspacing="0" border="1" width="100%" cellpadding="3">'; print '<table cellspacing="0" class="border" width="100%" cellpadding="3">';
print '<tr>'; print '<tr>';
if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0 && if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0 &&
defined("ADHERENT_BANK_USE_AUTO") && ADHERENT_BANK_USE_AUTO !=0){ defined("ADHERENT_BANK_USE_AUTO") && ADHERENT_BANK_USE_AUTO !=0){
print '<td rowspan="8" valign="top">'; print '<td rowspan="8" valign="top">';
}else{ }else{
print '<td rowspan="6" valign="top">'; print '<td rowspan="6" valign="top">';
} }
/* /*
* *
* Liste des cotisations * Liste des cotisations
* *
*/ */
$sql = "SELECT d.rowid, d.prenom, d.nom, d.societe, c.cotisation, ".$db->pdate("c.dateadh")." as dateadh"; $sql = "SELECT d.rowid, d.prenom, d.nom, d.societe, c.cotisation, ".$db->pdate("c.dateadh")." as dateadh";
$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."cotisation as c"; $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."cotisation as c";
$sql .= " WHERE d.rowid = c.fk_adherent AND d.rowid=$rowid"; $sql .= " WHERE d.rowid = c.fk_adherent AND d.rowid=$rowid";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $i = 0;
print "<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"4\">\n"; print "<table class=\"noborder\" width=\"100%\" cellspacing=\"0\" cellpadding=\"3\">\n";
print '<TR class="liste_titre">'; print '<tr class="liste_titre">';
print "<td>Cotisations</td>\n"; print "<td>Date cotisations</td>\n";
print "<td>Date</td>\n";
print "<td align=\"right\">Montant</TD>\n"; print "<td align=\"right\">Montant</TD>\n";
print "</TR>\n"; print "</tr>\n";
$var=True; $var=True;
while ($i < $num) while ($i < $num)
{ {
$objp = $db->fetch_object( $i); $objp = $db->fetch_object( $i);
$var=!$var; $var=!$var;
print "<TR $bc[$var]><td>&nbsp;</td>"; print "<tr $bc[$var]>";
print "<TD>".strftime("%d %B %Y",$objp->dateadh)."</td>\n"; print "<td>".dolibarr_print_date($objp->dateadh)."</td>\n";
print '<TD align="right">'.price($objp->cotisation).'</TD>'; print '<td align="right">'.price($objp->cotisation).'</td>';
print "</tr>"; print "</tr>";
$i++; $i++;
} }
print "</table>"; print "</table>";
} }
else else
{ {
print $sql; print $sql;
print $db->error(); print $db->error();
} }
print '</td>'; print '</td>';
/* /*
* Ajout d'une nouvelle cotis * Ajout d'une nouvelle cotis
* *
*
*/ */
if ($user->admin) if ($user->admin)
{ {
print '<form method="post" action="'.$PHP_SELF.'?rowid='.$rowid.'&action=edit">'; print '<form method="post" action="fiche.php">';
print '<input type="hidden" name="action" value="cotisation">'; print '<input type="hidden" name="action" value="cotisation">';
print '<input type="hidden" name="rowid" value="'.$rowid.'">';
print '<td width="15%">Fin adhésion</td>'; print '<td width="15%">Fin adhésion</td>';
if ($adh->datefin < time()) if ($adh->datefin < time())
{ {
print '<td width="35%" class="delete">'; print '<td width="35%">';
print dolibarr_print_date($adh->datefin)." ".img_warning();
} }
else else
{ {
print '<td width="35%" class="valeur">'; print '<td width="35%">';
print dolibarr_print_date($adh->datefin);
} }
print strftime("%d %B %Y",$adh->datefin).'&nbsp;</td>'; print '</td>';
print '</tr>'; print '</tr>';
print '<tr><td colspan="2">Nouvelle adhésion</td></tr>'; print '<tr><td colspan="2">Nouvelle adhésion</td></tr>';
@ -847,19 +681,10 @@ if ($rowid > 0)
print_date_select(); print_date_select();
} }
print "</td></tr>"; print "</td></tr>";
print "<tr><td>Mode de paiement</td><td>\n"; print "<tr><td>Mode de paiement</td><td>\n";
print_type_paiement_select($db,'operation');
print '<select name="operation">';
print '<option value="CHQ" SELECTED>Chèque';
print '<option value="CB">Carte Bleue';
print '<option value="DEP">Espece';
print '<option value="TIP">TIP';
print '<option value="PRE">PRE';
print '<option value="VIR">Virement';
print '</select>';
// $paiement = new Paiement($db);
//$paiement->select("modepaiement","crédit");
print "</td></tr>\n"; print "</td></tr>\n";
if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0 && if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0 &&
@ -875,10 +700,10 @@ if ($rowid > 0)
} }
print '<tr><td colspan="2" align="center"><input type="submit" value="Enregistrer"</td></tr>'; print '<tr><td colspan="2" align="center"><input type="submit" value="Enregistrer"</td></tr>';
print "</form>\n"; print "</form>\n";
} }
print '</table>'; print '</table>';
} }

24
htdocs/adherents/liste.php
View File

@ -23,6 +23,8 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require("./adherent.class.php");
llxHeader(); llxHeader();
@ -104,24 +106,27 @@ if ($result)
$var=True; $var=True;
while ($i < $num) while ($i < $num)
{ {
$objp = $db->fetch_object( $i); $objp = $db->fetch_object($i);
$adh=new Adherent($db);
$var=!$var; $var=!$var;
print "<TR $bc[$var]>"; print "<tr $bc[$var]>";
if ($objp->societe != ''){ if ($objp->societe != ''){
print "<TD><a href=\"fiche.php?rowid=$objp->rowid&action=edit\">".stripslashes($objp->prenom)." ".stripslashes($objp->nom)." / ".stripslashes($objp->societe)."</a></TD>\n"; print "<td><a href=\"fiche.php?rowid=$objp->rowid&action=edit\">".stripslashes($objp->prenom)." ".stripslashes($objp->nom)." / ".stripslashes($objp->societe)."</a></td>\n";
}else{ }else{
print "<TD><a href=\"fiche.php?rowid=$objp->rowid&action=edit\">".stripslashes($objp->prenom)." ".stripslashes($objp->nom)."</a></TD>\n"; print "<td><a href=\"fiche.php?rowid=$objp->rowid&action=edit\">".stripslashes($objp->prenom)." ".stripslashes($objp->nom)."</a></td>\n";
} }
print "<TD>"; print "<td>";
if ($objp->cotisation == 'yes') if ($objp->cotisation == 'yes')
{ {
if ($objp->datefin < time()) if ($objp->datefin < time())
{ {
print "<b><a href=\"fiche.php?rowid=$objp->rowid&action=edit\">".strftime("%d %B %Y",$objp->datefin)."</a> - Cotisation non recue</b></td>\n"; print dolibarr_print_date($objp->datefin)." - Cotisation non recue ".img_warning()."</td>\n";
} }
else else
{ {
print "<a href=\"fiche.php?rowid=$objp->rowid&action=edit\">".strftime("%d %B %Y",$objp->datefin)."</a></td>\n"; print dolibarr_print_date($objp->datefin)."</td>\n";
} }
} }
else else
@ -131,7 +136,7 @@ if ($result)
print "<td>$objp->email</td>\n"; print "<td>$objp->email</td>\n";
print "<td>$objp->type</td>\n"; print "<td>$objp->type</td>\n";
print "<td>$objp->morphy</td>\n"; print "<td>".$adh->getmorphylib($objp->morphy)."</td>\n";
print "<td>"; print "<td>";
if ($objp->statut == -1) if ($objp->statut == -1)
@ -148,7 +153,8 @@ if ($result)
} }
print "</td>"; print "</td>";
print "<td><a href=\"edit.php?rowid=$objp->rowid\">".img_edit()."</a> &nbsp; <a href=\"fiche.php?rowid=$objp->rowid&action=resign\">Resilier</a> &nbsp; <a href=\"fiche.php?rowid=$objp->rowid&action=delete\">".img_delete()."</a></td>\n"; print "<td><a href=\"fiche.php?rowid=$objp->rowid&action=edit\">".img_edit()."</a> &nbsp; ";
print "<a href=\"fiche.php?rowid=$objp->rowid&action=resign\">".img_disable("Résilier")."</a> &nbsp; <a href=\"fiche.php?rowid=$objp->rowid&action=delete\">".img_delete()."</a></td>\n";
print "</tr>"; print "</tr>";
$i++; $i++;
} }