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

Fix: Avoid class name conflict

Browse Source
This commit is contained in:
Laurent Destailleur 2010-04-27 08:22:48 +00:00
parent 630d932d5b
commit e3c1db3d77
4 changed files with 92 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/boutique/client/class/client.class.php → htdocs/boutique/client/class/boutiqueclient.class.php
View File

@ -20,7 +20,7 @@
*/ */
/** /**
* \file htdocs/boutique/client/client.class.php * \file htdocs/boutique/client/class/boutiqueclient.class.php
* \brief Classe permettant de gerer des clients de la boutique online * \brief Classe permettant de gerer des clients de la boutique online
* \author Rodolphe Quiedeville * \author Rodolphe Quiedeville
* \version $Revision$ * \version $Revision$
@ -30,7 +30,6 @@
* \class BoutiqueClient * \class BoutiqueClient
* \brief Classe permettant de gerer des clients de la boutique online * \brief Classe permettant de gerer des clients de la boutique online
*/ */
class BoutiqueClient class BoutiqueClient
{ {
var $db ; var $db ;

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

@ -28,7 +28,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
include_once(DOL_DOCUMENT_ROOT.'/boutique/client/client.class.php'); include_once(DOL_DOCUMENT_ROOT.'/boutique/client/class/boutiqueclient.class.php');
/* /*

18
htdocs/boutique/commande/class/commande.class.php → htdocs/boutique/commande/class/boutiquecommande.class.php
View File

@ -18,27 +18,29 @@
*/ */
/** /**
\file htdocs/boutique/commande/commande.class.php * \file htdocs/boutique/commande/class/boutiquecommande.class.php
\ingroup osc * \ingroup osc
\brief Fichier de la classe des commandes OSC * \brief Fichier de la classe des commandes de la boutique online
\version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/core/address.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/address.class.php");
include_once(DOL_DOCUMENT_ROOT.'/boutique/commande/class/boutiquecommande.class.php');
/** /**
\class Commande * \class BoutiqueCommande
\brief Classe permettant la gestion des commandes OSC * \brief Classe permettant la gestion des commandes OSC
*/ */
class Commande class BoutiqueCommande
{ {
var $db ; var $db ;
var $id ; var $id ;
var $nom; var $nom;
function Commande($DB, $id=0) { function BoutiqueCommande($DB, $id=0)
{
$this->db = $DB; $this->db = $DB;
$this->id = $id ; $this->id = $id ;

156
htdocs/boutique/commande/fiche.php
View File

@ -22,57 +22,61 @@
*/ */
/** /**
\file htdocs/boutique/commande/fiche.php \file htdocs/boutique/commande/fiche.php
\ingroup boutique \ingroup boutique
\brief Page fiche commande OSCommerce \brief Page fiche commande OSCommerce
\version $Revision$ \version $Revision$
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
include_once(DOL_DOCUMENT_ROOT.'/boutique/commande/class/boutiquecommande.class.php');
$langs->load("products"); $langs->load("products");
/*
* View
*/
llxHeader(); llxHeader();
if ($_GET['id']) if ($_GET['id'])
{ {
$commande = new Commande($db); $commande = new BoutiqueCommande($db);
$result = $commande->fetch($_GET['id']); $result = $commande->fetch($_GET['id']);
if ( $result ) if ( $result )
{
print '<div class="titre">Fiche Commande : '.$commande->id.'</div><br>';
print '<table border="1" width="100%" cellspacing="0" cellpadding="4">';
print '<tr><td width="20%">Date</td><td width="80%" colspan="2">'.$commande->date.'</td></tr>';
print '<td width="20%">Client</td><td width="80%" colspan="2"><a href="'.DOL_URL_ROOT.'/boutique/client/fiche.php?id='.$commande->client_id.'">'.$commande->client_name.'</a></td></tr>';
print '<td width="20%">Paiement</td><td width="80%" colspan="2">'.$commande->payment_method.'</td></tr>';
print "<tr><td>Adresses</td><td>Livraison</td><td>Facturation</td></tr>";
print "<td>&nbsp;</td><td>".$commande->delivery_adr->name."<br>".$commande->delivery_adr->street."<br>".$commande->delivery_adr->cp."<br>".$commande->delivery_adr->city."<br>".$commande->delivery_adr->country."</td>";
print "<td>".$commande->billing_adr->name."<br>".$commande->billing_adr->street."<br>".$commande->billing_adr->cp."<br>".$commande->billing_adr->city."<br>".$commande->billing_adr->country."</td>";
print "</tr>";
print "</table>";
print "<br>";
/*
* Produits
*
*/
$sql = "SELECT orders_id, products_id, products_model, products_name, products_price, final_price, products_quantity";
$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_products";
$sql .= " WHERE orders_id = " . $_GET['id'];
//$commande->id;
// echo $sql;
if ( $dbosc->query($sql) )
{ {
print '<div class="titre">'.$langs->trans("OrderCard").': '.$commande->id.'</div><br>';
print '<table border="1" width="100%" cellspacing="0" cellpadding="4">';
print '<tr><td width="20%">Date</td><td width="80%" colspan="2">'.$commande->date.'</td></tr>';
print '<td width="20%">Client</td><td width="80%" colspan="2"><a href="'.DOL_URL_ROOT.'/boutique/client/fiche.php?id='.$commande->client_id.'">'.$commande->client_name.'</a></td></tr>';
print '<td width="20%">Paiement</td><td width="80%" colspan="2">'.$commande->payment_method.'</td></tr>';
print "<tr><td>Adresses</td><td>Livraison</td><td>Facturation</td></tr>";
print "<td>&nbsp;</td><td>".$commande->delivery_adr->name."<br>".$commande->delivery_adr->street."<br>".$commande->delivery_adr->cp."<br>".$commande->delivery_adr->city."<br>".$commande->delivery_adr->country."</td>";
print "<td>".$commande->billing_adr->name."<br>".$commande->billing_adr->street."<br>".$commande->billing_adr->cp."<br>".$commande->billing_adr->city."<br>".$commande->billing_adr->country."</td>";
print "</tr>";
print "</table>";
print "<br>";
/*
* Produits
*
*/
$sql = "SELECT orders_id, products_id, products_model, products_name, products_price, final_price, products_quantity";
$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_products";
$sql .= " WHERE orders_id = " . $_GET['id'];
//$commande->id;
// echo $sql;
if ( $dbosc->query($sql) )
{
$num = $dbosc->num_rows(); $num = $dbosc->num_rows();
$i = 0; $i = 0;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
@ -81,54 +85,54 @@ if ($_GET['id'])
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;
while ($i < $num) while ($i < $num)
{ {
$objp = $dbosc->fetch_object(); $objp = $dbosc->fetch_object();
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td align="left" width="40%">'; print '<td align="left" width="40%">';
print '<a href="fiche.php?id='.$objp->products_id.'"><img src="/theme/'.$conf->theme.'/img/filenew.png" border="0" width="16" height="16" alt="Fiche livre"></a>'; print '<a href="fiche.php?id='.$objp->products_id.'"><img src="/theme/'.$conf->theme.'/img/filenew.png" border="0" width="16" height="16" alt="Fiche livre"></a>';
print '<a href="fiche.php?id='.$objp->products_id.'">'.$objp->products_name.'</a>'; print '<a href="fiche.php?id='.$objp->products_id.'">'.$objp->products_name.'</a>';
print "</td>"; print "</td>";
print '<td align="center"><a href="fiche.php?id='.$objp->rowid."\">$objp->products_quantity</a></TD>\n"; print '<td align="center"><a href="fiche.php?id='.$objp->rowid."\">$objp->products_quantity</a></TD>\n";
print "<td align=\"right\"><a href=\"fiche.php?id=$objp->rowid\">".price($objp->products_price)."</a></TD>\n"; print "<td align=\"right\"><a href=\"fiche.php?id=$objp->rowid\">".price($objp->products_price)."</a></TD>\n";
print "<td align=\"right\"><a href=\"fiche.php?id=$objp->rowid\">".price($objp->final_price)."</a></TD>\n"; print "<td align=\"right\"><a href=\"fiche.php?id=$objp->rowid\">".price($objp->final_price)."</a></TD>\n";
print "</tr>\n"; print "</tr>\n";
$i++; $i++;
} }
print "</table>"; print "</table>";
$dbosc->free(); $dbosc->free();
} }
else else
{ {
print $dbosc->error(); print $dbosc->error();
}
/*
*
*
*/
print "<br>";
print '<table border="1" width="100%" cellspacing="0" cellpadding="4">';
print "<tr>";
print '<td width="20%">Frais d\'expeditions</td><td width="80%">'.price($commande->total_ot_shipping).' EUR</td></tr>';
print '<td width="20%">'.$langs->trans("Lastname").'</td><td width="80%">'.price($commande->total_ot_total).' EUR</td></tr>';
print "</table>";
}
else
{
print "Fetch failed";
} }
/*
*
*
*/
print "<br>";
print '<table border="1" width="100%" cellspacing="0" cellpadding="4">';
print "<tr>";
print '<td width="20%">Frais d\'expeditions</td><td width="80%">'.price($commande->total_ot_shipping).' EUR</td></tr>';
print '<td width="20%">'.$langs->trans("Lastname").'</td><td width="80%">'.price($commande->total_ot_total).' EUR</td></tr>';
print "</table>";
}
else
{
print "Fetch failed";
}
} }
else else
{ {
print "Error"; print "Error";
} }