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

Debuggage et nettoyage du module OSCommerce 1.

Browse Source 
La base OSCommerce peut etre sur un autre serveur.
This commit is contained in:
Laurent Destailleur 2006-09-03 13:57:19 +00:00
parent 2e1e3f2d23
commit 4f344f0c3d
3 changed files with 75 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
htdocs/boutique/index.php
View File

@ -31,13 +31,6 @@ require("./pre.inc.php");
$langs->load("boutique"); $langs->load("boutique");
$oscommercedb=new DoliDB($conf->global->OSC_DB_TYPE,$conf->global->OSC_DB_HOST,$conf->global->OSC_DB_USER,$conf->global->OSC_DB_PASS,$conf->global->OSC_DB_NAME);
if (! $oscommercedb->connected)
{
dolibarr_print_error($oscommercedb,"Failed to connect to OSCommerce with ".$conf->global->OSC_DB_TYPE.",".$conf->global->OSC_DB_HOST.",".$conf->global->OSC_DB_USER.",".$conf->global->OSC_DB_PASS.",".$conf->global->OSC_DB_NAME);
exit;
}
llxHeader("",$langs->trans("OSCommerceShop"),""); llxHeader("",$langs->trans("OSCommerceShop"),"");
@ -61,14 +54,14 @@ print '<tr class="liste_titre"><td>'.$langs->trans("Description").'</td>';
print '<td align="right">'.$langs->trans("Total").'</td></tr>'; print '<td align="right">'.$langs->trans("Total").'</td></tr>';
$sql = "SELECT sum(t.value) as value, MONTH(o.date_purchased) as mois"; $sql = "SELECT sum(t.value) as value, MONTH(o.date_purchased) as mois";
$sql .= " FROM ".$oscommercedb->database_name.".orders_total as t"; $sql .= " FROM ".OSC_DB_NAME.".orders_total as t";
$sql .= " JOIN ".$oscommercedb->database_name.".orders as o ON o.orders_id = t.orders_id"; $sql .= " JOIN ".OSC_DB_NAME.".orders as o ON o.orders_id = t.orders_id";
$sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(now()) "; $sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(now()) ";
$sql .= " GROUP BY mois ORDER BY mois"; $sql .= " GROUP BY mois ORDER BY mois";
if ( $db->query($sql) ) if ( $dbosc->query($sql) )
{ {
$num = $db->num_rows(); $num = $dbosc->num_rows();
$var=True; $var=True;
$i=0; $i=0;
@ -76,7 +69,7 @@ if ( $db->query($sql) )
{ {
while ($i < $num) while ($i < $num)
{ {
$objp = $db->fetch_object(); $objp = $dbosc->fetch_object();
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td align="left">'.$objp->mois.'</td>'; print '<td align="left">'.$objp->mois.'</td>';
@ -87,11 +80,11 @@ if ( $db->query($sql) )
} }
} }
$db->free(); $dbosc->free();
} }
else else
{ {
dolibarr_print_error($db); dolibarr_print_error($dbosc);
} }
/* mensuel /* mensuel
@ -101,14 +94,14 @@ $sql .= " FROM ".OSC_DB_NAME.".orders_total as t";
$sql .= " JOIN ".OSC_DB_NAME.".orders as o ON o.orders_id = t.orders_id"; $sql .= " JOIN ".OSC_DB_NAME.".orders as o ON o.orders_id = t.orders_id";
$sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(now()) AND MONTH(o.date_purchased) = MONTH(now())"; $sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(now()) AND MONTH(o.date_purchased) = MONTH(now())";
if ( $db->query($sql) ) if ( $dbosc->query($sql) )
{ {
$num = $db->num_rows(); $num = $dbosc->num_rows();
$var=True; $var=True;
if ($num > 0) if ($num > 0)
{ {
$objp = $db->fetch_object(); $objp = $dbosc->fetch_object();
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td>CA du mois en cours </td>'; print '<td>CA du mois en cours </td>';
@ -116,11 +109,11 @@ if ( $db->query($sql) )
$i++; $i++;
} }
$db->free(); $dbosc->free();
} }
else else
{ {
dolibarr_print_error($db); dolibarr_print_error($dbosc);
} }
*/ */
@ -135,13 +128,13 @@ from orders_total as t
join orders as o on o.orders_id = t.orders_id where t.class = 'ot_subtotal' order by o.date_purchased desc join orders as o on o.orders_id = t.orders_id where t.class = 'ot_subtotal' order by o.date_purchased desc
*/ */
$sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; $sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method";
$sql .= " FROM ".$oscommercedb->database_name.".orders_total as t JOIN ".$oscommercedb->database_name.".orders as o on o.orders_id = t.orders_id "; $sql .= " FROM ".OSC_DB_NAME.".orders_total as t JOIN ".OSC_DB_NAME.".orders as o on o.orders_id = t.orders_id ";
$sql .= " WHERE t.class = 'ot_subtotal' ORDER BY o.date_purchased desc"; $sql .= " WHERE t.class = 'ot_subtotal' ORDER BY o.date_purchased desc";
if ( $db->query($sql) ) if ( $dbosc->query($sql) )
{ {
$langs->load("orders"); $langs->load("orders");
$num = $db->num_rows(); $num = $dbosc->num_rows();
if ($num > 0) if ($num > 0)
{ {
$i = 0; $i = 0;
@ -153,7 +146,7 @@ if ( $db->query($sql) )
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object(); $obj = $dbosc->fetch_object();
print "<tr><td>$obj->orders_id</td><td>$obj->customers_name</td><td>".price($obj->value)."</td><td>$obj->payment_method</td></tr>"; print "<tr><td>$obj->orders_id</td><td>$obj->customers_name</td><td>".price($obj->value)."</td><td>$obj->payment_method</td></tr>";
$i++; $i++;
} }
@ -162,20 +155,20 @@ if ( $db->query($sql) )
} }
else else
{ {
dolibarr_print_error($db); dolibarr_print_error($dbosc);
} }
/* /*
* 5 dernières commandes en attente * 5 dernières commandes en attente
*/ */
$sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; $sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method";
$sql .= " FROM ".$oscommercedb->database_name.".orders_total as t JOIN ".$oscommercedb->database_name.".orders as o on o.orders_id = t.orders_id "; $sql .= " FROM ".OSC_DB_NAME.".orders_total as t JOIN ".OSC_DB_NAME.".orders as o on o.orders_id = t.orders_id ";
$sql .= " WHERE t.class = 'ot_subtotal' and o.orders_status = 5 order by o.date_purchased desc"; $sql .= " WHERE t.class = 'ot_subtotal' and o.orders_status = 5 order by o.date_purchased desc";
if ( $db->query($sql) ) if ( $dbosc->query($sql) )
{ {
$langs->load("orders"); $langs->load("orders");
$num = $db->num_rows(); $num = $dbosc->num_rows();
if ($num > 0) if ($num > 0)
{ {
$i = 0; $i = 0;
@ -187,7 +180,7 @@ if ( $db->query($sql) )
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object(); $obj = $dbosc->fetch_object();
print "<tr><td>$obj->orders_id</td><td>$obj->customers_name</td><td>".price($obj->value)."</td><td>$obj->payment_method</td></tr>"; print "<tr><td>$obj->orders_id</td><td>$obj->customers_name</td><td>".price($obj->value)."</td><td>$obj->payment_method</td></tr>";
$i++; $i++;
} }
@ -196,20 +189,20 @@ if ( $db->query($sql) )
} }
else else
{ {
dolibarr_print_error($db); dolibarr_print_error($dbosc);
} }
/* /*
* Commandes à traiter * Commandes à traiter
*/ */
$sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; $sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method";
$sql .= " FROM ".$oscommercedb->database_name.".orders_total as t JOIN ".$oscommercedb->database_name.".orders as o on o.orders_id = t.orders_id "; $sql .= " FROM ".OSC_DB_NAME.".orders_total as t JOIN ".OSC_DB_NAME.".orders as o on o.orders_id = t.orders_id ";
$sql .= " WHERE t.class = 'ot_subtotal' and o.orders_status = 2 order by o.date_purchased desc"; $sql .= " WHERE t.class = 'ot_subtotal' and o.orders_status = 2 order by o.date_purchased desc";
if ( $db->query($sql) ) if ( $dbosc->query($sql) )
{ {
$langs->load("orders"); $langs->load("orders");
$num = $db->num_rows(); $num = $dbosc->num_rows();
if ($num > 0) if ($num > 0)
{ {
$i = 0; $i = 0;
@ -221,7 +214,7 @@ if ( $db->query($sql) )
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object(); $obj = $dbosc->fetch_object();
print "<tr><td>$obj->orders_id</td><td>$obj->customers_name</td><td>".price($obj->value)."</td><td>$obj->payment_method</td></tr>"; print "<tr><td>$obj->orders_id</td><td>$obj->customers_name</td><td>".price($obj->value)."</td><td>$obj->payment_method</td></tr>";
$i++; $i++;
} }
@ -230,7 +223,7 @@ if ( $db->query($sql) )
} }
else else
{ {
dolibarr_print_error($db); dolibarr_print_error($dbosc);
} }
@ -239,14 +232,14 @@ print '</td></tr><tr>';
* Derniers clients qui ont commandé * Derniers clients qui ont commandé
*/ */
$sql = "SELECT o.orders_id, o.customers_name, o.delivery_country, o.date_purchased, t.value, s.orders_status_name as statut"; $sql = "SELECT o.orders_id, o.customers_name, o.delivery_country, o.date_purchased, t.value, s.orders_status_name as statut";
$sql .= " FROM ".$oscommercedb->database_name.".orders_total as t JOIN ".$oscommercedb->database_name.".orders as o on o.orders_id = t.orders_id "; $sql .= " FROM ".OSC_DB_NAME.".orders_total as t JOIN ".OSC_DB_NAME.".orders as o on o.orders_id = t.orders_id ";
$sql .= " JOIN ".$oscommercedb->database_name.".orders_status as s on o.orders_status = s.orders_status_id and s.language_id = 1"; $sql .= " JOIN ".OSC_DB_NAME.".orders_status as s on o.orders_status = s.orders_status_id and s.language_id = 1";
$sql .= " WHERE t.class = 'ot_subtotal' order by o.date_purchased desc"; $sql .= " WHERE t.class = 'ot_subtotal' order by o.date_purchased desc";
if ( $db->query($sql) ) if ( $dbosc->query($sql) )
{ {
$langs->load("orders"); $langs->load("orders");
$num = $db->num_rows(); $num = $dbosc->num_rows();
if ($num > 0) if ($num > 0)
{ {
$i = 0; $i = 0;
@ -258,7 +251,7 @@ if ( $db->query($sql) )
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object(); $obj = $dbosc->fetch_object();
print "<tr><td>$obj->date_purchased</td><td>$obj->customers_name</td><td>$obj->delivery_country</td><td>".price($obj->value)."</td><td>$obj->payment_method</td><td>$obj->orders_id</td><td>$obj->statut</td></tr>"; print "<tr><td>$obj->date_purchased</td><td>$obj->customers_name</td><td>$obj->delivery_country</td><td>".price($obj->value)."</td><td>$obj->payment_method</td><td>$obj->orders_id</td><td>$obj->statut</td></tr>";
$i++; $i++;
} }
@ -267,11 +260,11 @@ if ( $db->query($sql) )
} }
else else
{ {
dolibarr_print_error($db); dolibarr_print_error($dbosc);
} }
print '</tr></table>'; print '</tr></table>';
$db->close(); $dbosc->close();
llxFooter('$Date$ - $Revision$'); llxFooter('$Date$ - $Revision$');
?> ?>

41
htdocs/boutique/osc_master.inc.php Normal file
View File

@ -0,0 +1,41 @@
<?PHP
/* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
* $Source$
*/
/**
\file htdocs/boutique/master.inc.php
\brief Fichier de preparation de l'environnement Dolibarr pour OSCommerce
\version $Revision$
*/
require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.php");
/*
* Creation objet $dbosc
*/
$dbosc = new DoliDb($conf->db->type,$conf->global->OSC_DB_HOST,$conf->global->OSC_DB_USER,$conf->global->OSC_DB_PASS,$conf->global->OSC_DB_NAME);
if (! $dbosc->connected)
{
dolibarr_print_error($dbosc,"host=".$conf->global->OSC_DB_HOST.", user=".$conf->global->OSC_DB_USER.", databasename=".$conf->global->OSC_DB_NAME.", ".$db->error);
exit;
}
?>

1
htdocs/boutique/pre.inc.php
View File

@ -18,7 +18,6 @@
* *
* $Id$ * $Id$
* $Source$ * $Source$
*
*/ */
/** /**