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

Doxygen

Browse Source
This commit is contained in:
Laurent Destailleur 2012-01-05 12:13:42 +01:00
parent eb507e0677
commit e340aa3622
14 changed files with 68 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,9 +46,9 @@ class Adherent extends CommonObject
var $ref;
var $civilite_id;
var $firstname;
var $prenom; // TODO deprecated
var $prenom; // deprecated
var $lastname;
var $nom; // TODO deprecated
var $nom; // deprecated
var $login;
var $pass;
var $societe;
@ -62,16 +62,16 @@ class Adherent extends CommonObject
var $state_id; // Id of department
var $state_code; // Code of department
var $state; // Label of department
var $fk_departement; // TODO deprecated
var $departement_code; // TODO deprecated
var $departement; // TODO deprecated
var $fk_departement; // deprecated
var $departement_code; // deprecated
var $departement; // deprecated
var $country_id;
var $country_code;
var $country;
var $pays_id; // TODO deprecated
var $pays_code; // TODO deprecated
var $pays; // TODO deprecated
var $pays_id; // deprecated
var $pays_code; // deprecated
var $pays; // deprecated
var $email;
var $phone;
@ -193,13 +193,13 @@ class Adherent extends CommonObject
$infos='';
if ($this->civilite_id) $infos.= $langs->transnoentities("UserTitle").": ".$this->getCivilityLabel(1)."\n";
$infos.= $langs->transnoentities("Lastname").": ".$this->nom."\n";
$infos.= $langs->transnoentities("Firstname").": ".$this->prenom."\n";
$infos.= $langs->transnoentities("Lastname").": ".$this->lastname."\n";
$infos.= $langs->transnoentities("Firstname").": ".$this->firstname."\n";
$infos.= $langs->transnoentities("Company").": ".$this->societe."\n";
$infos.= $langs->transnoentities("Address").": ".$this->adresse."\n";
$infos.= $langs->transnoentities("Zip").": ".$this->cp."\n";
$infos.= $langs->transnoentities("Town").": ".$this->ville."\n";
$infos.= $langs->transnoentities("Country").": ".$this->pays."\n";
$infos.= $langs->transnoentities("Address").": ".$this->address."\n";
$infos.= $langs->transnoentities("Zip").": ".$this->zip."\n";
$infos.= $langs->transnoentities("Town").": ".$this->town."\n";
$infos.= $langs->transnoentities("Country").": ".$this->country."\n";
$infos.= $langs->transnoentities("EMail").": ".$this->email."\n";
$infos.= $langs->transnoentities("Login").": ".$this->login."\n";
$infos.= $langs->transnoentities("Password").": ".$this->pass."\n";
@ -212,13 +212,13 @@ class Adherent extends CommonObject
'%DOL_MAIN_URL_ROOT%'=>DOL_MAIN_URL_ROOT,
'%INFOS%'=>$msgishtml?dol_htmlentitiesbr($infos):$infos,
'%CIVILITE%'=>$this->getCivilityLabel($msgishtml?0:1),
'%PRENOM%'=>$msgishtml?dol_htmlentitiesbr($this->prenom):$this->prenom,
'%NOM%'=>$msgishtml?dol_htmlentitiesbr($this->nom):$this->nom,
'%PRENOM%'=>$msgishtml?dol_htmlentitiesbr($this->firstname):$this->firstname,
'%NOM%'=>$msgishtml?dol_htmlentitiesbr($this->lastname):$this->lastname,
'%SOCIETE%'=>$msgishtml?dol_htmlentitiesbr($this->societe):$this->societe,
'%ADRESSE%'=>$msgishtml?dol_htmlentitiesbr($this->adresse):$this->adresse,
'%CP%'=>$msgishtml?dol_htmlentitiesbr($this->cp):$this->cp,
'%VILLE%'=>$msgishtml?dol_htmlentitiesbr($this->ville):$this->ville,
'%PAYS%'=>$msgishtml?dol_htmlentitiesbr($this->pays):$this->pays,
'%ADRESSE%'=>$msgishtml?dol_htmlentitiesbr($this->address):$this->address,
'%CP%'=>$msgishtml?dol_htmlentitiesbr($this->zip):$this->zip,
'%VILLE%'=>$msgishtml?dol_htmlentitiesbr($this->town):$this->town,
'%PAYS%'=>$msgishtml?dol_htmlentitiesbr($this->country):$this->country,
'%EMAIL%'=>$msgishtml?dol_htmlentitiesbr($this->email):$this->email,
'%NAISS%'=>$msgishtml?dol_htmlentitiesbr($birthday):$birthday,
'%PHOTO%'=>$msgishtml?dol_htmlentitiesbr($this->photo):$this->photo,

22
htdocs/adherents/fiche.php
View File

@ -1430,18 +1430,22 @@ if ($rowid && $action != 'edit')
}
}
// Envoi fiche par mail
if ($object->statut >= 1)
// Send card by email
if ($user->rights->adherent->creer)
{
if ($user->rights->adherent->creer)
{
if ($object->statut >= 1)
{
if ($object->email) print "<a class=\"butAction\" href=\"fiche.php?rowid=$object->id&action=sendinfo\">".$langs->trans("SendCardByMail")."</a>\n";
else print "<a class=\"butActionRefused\" href=\"#\" title=\"".dol_escape_htmltag($langs->trans("NoEMail"))."\">".$langs->trans("SendCardByMail")."</a>\n";
}
else
{
print "<font class=\"butActionRefused\" href=\"#\" title=\"".dol_escape_htmltag($langs->trans("NotEnoughPermissions"))."\">".$langs->trans("SendCardByMail")."</font>";
}
}
else
{
print "<font class=\"butActionRefused\" href=\"#\" title=\"".dol_escape_htmltag($langs->trans("ValidateBefore"))."\">".$langs->trans("SendCardByMail")."</font>";
}
}
else
{
print "<font class=\"butActionRefused\" href=\"#\" title=\"".dol_escape_htmltag($langs->trans("NotEnoughPermissions"))."\">".$langs->trans("SendCardByMail")."</font>";
}
// Resilier

2
htdocs/boutique/client/index.php
View File

@ -52,7 +52,7 @@ print_barre_liste("Liste des clients", $page, "index.php");
$sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, c.customers_email_address, c.customers_newsletter";
$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."customers as c";
$sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit($limit ,$offset);
$sql .= $dbosc->plimit($limit,$offset);
$resql=$dbosc->query($sql);
if ($resql)

2
htdocs/boutique/commande/index.php
View File

@ -50,7 +50,7 @@ print_barre_liste("Liste des commandes", $page, "commande.php");
$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t";
$sql .= " WHERE o.orders_id = t.orders_id AND t.class = 'ot_total'";
$sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit($limit ,$offset);
$sql .= $dbosc->plimit($limit,$offset);
$resql=$dbosc->query($sql);
if ($resql)

3
htdocs/boutique/critiques/bestproduct.php
View File

@ -53,9 +53,8 @@ $sql = "SELECT sum(r.reviews_rating)/count(r.reviews_rating) as rat, r.products_
$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."reviews as r,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p ";
$sql .= " WHERE r.products_id = p.products_id";
$sql .= " GROUP BY r.products_id, p.products_model, p.products_quantity, p.products_status";
$sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit($limit ,$offset);
$sql .= $dbosc->plimit($limit,$offset);
print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
print "<TR class=\"liste_titre\"><td>".$langs->trans("Ref");

34
htdocs/boutique/critiques/class/critique.class.php
View File

@ -26,22 +26,31 @@
* \class Critique
* \brief Classe permettant la gestion des critiques OSCommerce
*/
class Critique {
var $db ;
class Critique
{
var $db;
var $id ;
var $id;
var $nom;
function Critique($DB, $id=0) {
$this->db = $DB;
$this->id = $id ;
}
/*
*
*
/**
* Constructor
*
* @param DoliDB $db Database handler
*/
function fetch ($id) {
function Critique($db)
{
$this->db = $DB;
}
/**
* Load instance
*
* @param int $id Id to load
* @return int <0 if KO, >0 if OK
*/
function fetch ($id)
{
global $conf;
$sql = "SELECT r.reviews_id, r.reviews_rating, d.reviews_text, p.products_name";
@ -67,8 +76,7 @@ class Critique {
}
else
{
print $this->db->error();
print "<p>$sql";
print $this->db->lasterror();
}
return $result;

2
htdocs/boutique/critiques/index.php
View File

@ -51,7 +51,7 @@ $sql = "SELECT r.reviews_id, r.reviews_rating, d.reviews_text, p.products_name F
$sql .= " WHERE r.reviews_id = d.reviews_id AND r.products_id=p.products_id";
$sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID. " AND d.languages_id=".$conf->global->OSC_LANGUAGE_ID;
$sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit($limit ,$offset);
$sql .= $dbosc->plimit($limit,$offset);
print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
print '<TR class="liste_titre">';

2
htdocs/boutique/notification/index.php
View File

@ -53,7 +53,7 @@ $sql .= ",".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."c
$sql .= " WHERE n.customers_id = c.customers_id AND p.products_id=n.products_id";
$sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID;
$sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit($limit ,$offset);
$sql .= $dbosc->plimit($limit,$offset);
$resql=$dbosc->query($sql);
if ($resql)

2
htdocs/boutique/notification/produits.php
View File

@ -53,7 +53,7 @@ $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREF
$sql .= " WHERE p.products_id=n.products_id";
$sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID;
$sql .= " GROUP BY p.products_name, p.products_id";
$sql .= $dbosc->plimit($limit ,$offset);
$sql .= $dbosc->plimit($limit,$offset);
$resql=$dbosc->query($sql);
if ($resql)

2
htdocs/boutique/produits/index.php
View File

@ -49,7 +49,7 @@ print_barre_liste("Liste des clients", $page, "index.php");
$sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, c.customers_email_address, c.customers_newsletter";
$sql .= " FROM ".DB_NAME_OSC.".customers as c";
$sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit($limit ,$offset);
$sql .= $dbosc->plimit($limit,$offset);
$resql=$dbosc->query($sql);
if ($resql)

8
htdocs/boutique/produits/osc-liste.php
View File

@ -58,17 +58,17 @@ if ($reqstock=='epuise')
}
//$sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $dbosc->plimit($limit ,$offset);
$sql .= $dbosc->plimit($limit,$offset);
print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
print '<TR class="liste_titre">';
print '<tr class="liste_titre">';
print "<td>id</td>";
print "<td>Ref</td>";
print "<td>Titre</td>";
print "<td>Groupe</td>";
print '<td align="center">Stock</td>';
print '<TD align="center">Status</TD>';
print "</TR>\n";
print '<td align="center">Status</td>';
print '</tr>'."\n";
$resql=$dbosc->query($sql);
if ($resql)

2
htdocs/boutique/promotion/index.php
View File

@ -61,7 +61,7 @@ $sql.= " expires_date as fin";
$sql.= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."specials as s,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as pd,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p";
$sql.= " WHERE s.products_id = pd.products_id AND pd.products_id = p.products_id AND pd.language_id = ".$conf->global->OSC_LANGUAGE_ID;
$sql.= " ORDER BY $sortfield $sortorder ";
$sql.= $dbosc->plimit($limit ,$offset);
$sql.= $dbosc->plimit($limit,$offset);
$resql=$dbosc->query($sql);
if ($resql)

2
htdocs/langs/en_US/members.lang
View File

@ -179,7 +179,7 @@ MembersStatisticsDesc=Choose statistics you want to read...
MenuMembersStats=Statistics
LastMemberDate=Last member date
Nature=Nature
Public=Information are public (no=private)
Public=Information are public
Exports=Exports
NewMemberbyWeb=New member added. Awaiting approval
NewMemberForm=New member form

2
htdocs/langs/fr_FR/members.lang
View File

@ -183,7 +183,7 @@ MembersStatisticsDesc=Choisissez les statistiques que vous désirez consulter...
MenuMembersStats=Statistiques
LastMemberDate=Date dernier adhérent
Nature=Nature
Public=Informations publiques (no=privées)
Public=Informations publiques
Exports=Exports
NewMemberbyWeb=Nouvel Adherent ajoute. En attente de validation
NewMemberForm=Nouvel Adherent form