From 4f344f0c3db183030d2b15aab71677433031b0c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 3 Sep 2006 13:57:19 +0000 Subject: [PATCH] Debuggage et nettoyage du module OSCommerce 1. La base OSCommerce peut etre sur un autre serveur. --- htdocs/boutique/index.php | 75 ++++++++++++++---------------- htdocs/boutique/osc_master.inc.php | 41 ++++++++++++++++ htdocs/boutique/pre.inc.php | 1 - 3 files changed, 75 insertions(+), 42 deletions(-) create mode 100644 htdocs/boutique/osc_master.inc.php diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php index 5f7b5893414..1a50e18e0f9 100644 --- a/htdocs/boutique/index.php +++ b/htdocs/boutique/index.php @@ -31,13 +31,6 @@ require("./pre.inc.php"); $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"),""); @@ -61,14 +54,14 @@ print ''.$langs->trans("Description").''; print ''.$langs->trans("Total").''; $sql = "SELECT sum(t.value) as value, MONTH(o.date_purchased) as mois"; -$sql .= " FROM ".$oscommercedb->database_name.".orders_total as t"; -$sql .= " JOIN ".$oscommercedb->database_name.".orders as o ON o.orders_id = t.orders_id"; +$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 .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(now()) "; $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; $i=0; @@ -76,7 +69,7 @@ if ( $db->query($sql) ) { while ($i < $num) { - $objp = $db->fetch_object(); + $objp = $dbosc->fetch_object(); $var=!$var; print ""; print ''.$objp->mois.''; @@ -87,11 +80,11 @@ if ( $db->query($sql) ) } } - $db->free(); + $dbosc->free(); } else { - dolibarr_print_error($db); + dolibarr_print_error($dbosc); } /* 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 .= " 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; if ($num > 0) { - $objp = $db->fetch_object(); + $objp = $dbosc->fetch_object(); $var=!$var; print ""; print 'CA du mois en cours '; @@ -116,11 +109,11 @@ if ( $db->query($sql) ) $i++; } - $db->free(); + $dbosc->free(); } 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 */ $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"; -if ( $db->query($sql) ) +if ( $dbosc->query($sql) ) { $langs->load("orders"); - $num = $db->num_rows(); + $num = $dbosc->num_rows(); if ($num > 0) { $i = 0; @@ -153,7 +146,7 @@ if ( $db->query($sql) ) while ($i < $num) { - $obj = $db->fetch_object(); + $obj = $dbosc->fetch_object(); print "$obj->orders_id$obj->customers_name".price($obj->value)."$obj->payment_method"; $i++; } @@ -162,20 +155,20 @@ if ( $db->query($sql) ) } else { - dolibarr_print_error($db); + dolibarr_print_error($dbosc); } /* * 5 dernières commandes en attente */ $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"; -if ( $db->query($sql) ) +if ( $dbosc->query($sql) ) { $langs->load("orders"); - $num = $db->num_rows(); + $num = $dbosc->num_rows(); if ($num > 0) { $i = 0; @@ -187,7 +180,7 @@ if ( $db->query($sql) ) while ($i < $num) { - $obj = $db->fetch_object(); + $obj = $dbosc->fetch_object(); print "$obj->orders_id$obj->customers_name".price($obj->value)."$obj->payment_method"; $i++; } @@ -196,20 +189,20 @@ if ( $db->query($sql) ) } else { - dolibarr_print_error($db); + dolibarr_print_error($dbosc); } /* * Commandes à traiter */ $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"; -if ( $db->query($sql) ) +if ( $dbosc->query($sql) ) { $langs->load("orders"); - $num = $db->num_rows(); + $num = $dbosc->num_rows(); if ($num > 0) { $i = 0; @@ -221,7 +214,7 @@ if ( $db->query($sql) ) while ($i < $num) { - $obj = $db->fetch_object(); + $obj = $dbosc->fetch_object(); print "$obj->orders_id$obj->customers_name".price($obj->value)."$obj->payment_method"; $i++; } @@ -230,7 +223,7 @@ if ( $db->query($sql) ) } else { - dolibarr_print_error($db); + dolibarr_print_error($dbosc); } @@ -239,14 +232,14 @@ print ''; * 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 .= " FROM ".$oscommercedb->database_name.".orders_total as t JOIN ".$oscommercedb->database_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 .= " FROM ".OSC_DB_NAME.".orders_total as t JOIN ".OSC_DB_NAME.".orders as o on o.orders_id = t.orders_id "; +$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"; -if ( $db->query($sql) ) +if ( $dbosc->query($sql) ) { $langs->load("orders"); - $num = $db->num_rows(); + $num = $dbosc->num_rows(); if ($num > 0) { $i = 0; @@ -258,7 +251,7 @@ if ( $db->query($sql) ) while ($i < $num) { - $obj = $db->fetch_object(); + $obj = $dbosc->fetch_object(); print "$obj->date_purchased$obj->customers_name$obj->delivery_country".price($obj->value)."$obj->payment_method$obj->orders_id$obj->statut"; $i++; } @@ -267,11 +260,11 @@ if ( $db->query($sql) ) } else { - dolibarr_print_error($db); + dolibarr_print_error($dbosc); } print ''; -$db->close(); +$dbosc->close(); llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/boutique/osc_master.inc.php b/htdocs/boutique/osc_master.inc.php new file mode 100644 index 00000000000..c91936b332c --- /dev/null +++ b/htdocs/boutique/osc_master.inc.php @@ -0,0 +1,41 @@ + + * + * 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; +} + +?> diff --git a/htdocs/boutique/pre.inc.php b/htdocs/boutique/pre.inc.php index 579985b1263..cdaea7a77fd 100644 --- a/htdocs/boutique/pre.inc.php +++ b/htdocs/boutique/pre.inc.php @@ -18,7 +18,6 @@ * * $Id$ * $Source$ - * */ /**