Fix: A ton of bug on oscommerce interface by webservice

htdocs/langs/en_US/admin.lang

@@ -339,7 +339,7 @@ Module700Desc=Donations' management
 Module800Name=OSCommerce by direct database access
 Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access
 Module900Name=OSCommerce by WS
-Module900Desc=Interface to show an OSCommerce shop via Web services.\nThis module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server.
+Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1400Name=Accounting

htdocs/langs/fr_FR/admin.lang

@@ -339,7 +339,7 @@ Module700Desc = Gestion des dons
 Module800Name = OSCommerce direct
 Module800Desc = Interface de visualisation d'une boutique OSCommerce ou OSCSS par accès direct en base.
 Module900Name = OSCommerce by WS
-Module900Desc = Interface de visualisation d'une boutique OSCommerce par accès via des Web services.\nCe module requiert d'installer les fichiers de /oscommerce_ws/ws_server sur OSCommerce. Voir fichier README dans /oscommerce_ws/ws_server.
+Module900Desc = Interface de visualisation d'une boutique OSCommerce par accès via des Web services. Ce module requiert d'installer les fichiers de /oscommerce_ws/ws_server sur OSCommerce. Voir fichier README dans /oscommerce_ws/ws_server.
 Module1200Name = Mantis
 Module1200Desc = Interface avec le bug tracking Mantis
 Module1400Name = Comptabilité

htdocs/oscommerce_ws/clients/index.php

@@ -44,6 +44,10 @@ $parameters = array("custid"=>"0");
 
 // Set the WebService URL
 $client = new nusoap_client(OSCWS_DIR."ws_customers.php");
+if ($client)
+{
+	$client->soap_defencoding='UTF-8';
+}
 
 $result = $client->call("get_Client",$parameters );
 
@@ -101,7 +105,7 @@ elseif (!($err = $client->getError()) )
 	}
 }
 else {
-	dol_print_error('',"Erreur service web ".$err); 
+	print $client->getHTTPBody($client->response);
 }
 
 print "</TABLE>";

htdocs/oscommerce_ws/clients/osc_customer.class.php

@@ -99,6 +99,10 @@ class Osc_customer
 
 		// Set the WebService URL
 		$client = new nusoap_client(OSCWS_DIR."/ws_customers.php");
+	    if ($client)
+		{
+			$client->soap_defencoding='UTF-8';
+		}
 
 		// Call the WebSeclient->fault)rvice and store its result in $obj
 		$obj = $client->call("get_Client",$parameters );

htdocs/oscommerce_ws/commandes/index.php

@@ -45,6 +45,10 @@ $parameters = array("orderid"=>"0");
 
 // Set the WebService URL
 $client = new nusoap_client(OSCWS_DIR."ws_orders.php");
+if ($client)
+{
+	$client->soap_defencoding='UTF-8';
+}
 
 $result = $client->call("get_Order",$parameters );
 
@@ -102,7 +106,7 @@ elseif (!($err = $client->getError()) )
 	}
 }
 else {
-	dol_print_error('',"Erreur service web ".$err); 
+	print $client->getHTTPBody($client->response);
 }
 
 print "</TABLE>";

htdocs/oscommerce_ws/commandes/osc_order.class.php

@@ -98,6 +98,10 @@ class Osc_order
 
 		// Set the WebService URL
 		$client = new nusoap_client(OSCWS_DIR."/ws_orders.php");
+	    if ($client)
+		{
+			$client->soap_defencoding='UTF-8';
+		}
 
 		// Call the WebSeclient->fault)rvice and store its result in $obj
 		$obj = $client->call("get_Order",$parameters );

htdocs/oscommerce_ws/includes/configure.php

@@ -28,7 +28,8 @@
  */
 
 // URL To reach web services
-define(OSCWS_DIR,'http://myoscserver/ws_server/');
+//define(OSCWS_DIR,'http://myoscserver/ws_server/');
+define(OSCWS_DIR,'http://127.0.0.1/oscommerce_ws/ws_server/');
 
 // URL To reach OSCommerce
 define(OSC_URL, 'http://myoscserver/'); // url du site OSC

htdocs/oscommerce_ws/index.php

@@ -18,11 +18,11 @@
  */
 
 /**
-        \file       htdocs/oscommerce_ws/index.php
+ \file       htdocs/oscommerce_ws/index.php
-        \ingroup    oscommerce2
+ \ingroup    oscommerce2
-		\brief      Page accueil zone boutique
+ \brief      Page accueil zone boutique
-		\version    $Id$
+ \version    $Id$
-*/
+ */
 
 require("./pre.inc.php");
 
@@ -56,11 +56,17 @@ require_once("./includes/configure.php");
 $parameters = array();
 
 // Set the WebService URL
+//print OSCWS_DIR."ws_orders.php"; exit;
 $client = new nusoap_client(OSCWS_DIR."ws_orders.php");
+if ($client)
+{
+	$client->soap_defencoding='UTF-8';
+}
+
 
 /*
-/* Chiffre d'affaire 
+ /* Chiffre d'affaire
-*/
+ */
 
 print_titre($langs->trans('SalesTurnover'));
 
@@ -69,36 +75,39 @@ print '<tr class="liste_titre"><td>'.$langs->trans("Year").'</td>';
 print '<td>'.$langs->trans("Month").'</td>';
 print '<td align="right">'.$langs->trans("Total").'</td></tr>';
 
+
+//$client->setDebugLevel(9);
+
 // Call the WebService and store its result in $result.
 $result = $client->call("get_CAmensuel",$parameters );
 if ($client->fault) {
-  dol_print_error('',"Erreur de connexion ");
+	dol_print_error('',"Erreur de connexion ");
-  print_r($client->faultstring);
+	print_r($client->faultstring);
 }
 elseif (!($err = $client->getError()) )
 {
 	$num=0;
-  	if ($result) $num = sizeof($result);
+	if ($result) $num = sizeof($result);
 	$var=True;
-  	$i=0;
+	$i=0;
 
 	if ($num > 0) {
-	   while ($i < $num)
+		while ($i < $num)
 		{
-      	$var=!$var;
+			$var=!$var;
-      	print "<tr $bc[$var]>";
+			print "<tr $bc[$var]>";
-      	print '<td align="left">'.$result[$i][an].'</td>';
+			print '<td align="left">'.$result[$i][an].'</td>';
-		print '<td align="left">'.$result[$i][mois].'</td>';
+			print '<td align="left">'.$result[$i][mois].'</td>';
-      	print '<td align="right">'.convert_price($result[$i][value]).'</td>';
+			print '<td align="right">'.convert_price($result[$i][value]).'</td>';
 
-      	print "</tr>\n";
+			print "</tr>\n";
-      	$i++;
+			$i++;
-    	}
+		}
 	}
 }
 else
 {
-  dol_print_error('',"Erreur du service web ".$err);
+	print $client->getHTTPBody($client->response);
 }
 
 
@@ -121,34 +130,34 @@ $parameters = array("limit"=>OSC_MAXNBCOM);
 $result = $client->call("get_orders",$parameters );
 
 if ($client->fault) {
-  dol_print_error('',"Erreur de connexion ");
+	dol_print_error('',"Erreur de connexion ");
 }
 elseif (!($err = $client->getError()) ) {
 	$num=0;
-  	if ($result) $num = sizeof($result);
+	if ($result) $num = sizeof($result);
 	$var=True;
-  	$i=0;
+	$i=0;
 
-    if ($num > 0) {
+	if ($num > 0) {
 
- 	  $num = min($num,OSC_MAXNBCOM);
+		$num = min($num,OSC_MAXNBCOM);
-      while ($i < $num) {
+		while ($i < $num) {
-      	$var=!$var;
+			$var=!$var;
-      	print "<tr $bc[$var]>";
+			print "<tr $bc[$var]>";
- 	    print '<td>'.$result[$i][orders_id].'</td><td>'.$result[$i][customers_name].'</td><td>'.convert_price($result[$i][value]).'</td><td>'.$result[$i][payment_method].'</td></tr>';
+			print '<td>'.$result[$i][orders_id].'</td><td>'.$result[$i][customers_name].'</td><td>'.convert_price($result[$i][value]).'</td><td>'.$result[$i][payment_method].'</td></tr>';
-	  	$i++;
+			$i++;
-	  }
+		}
-    }
+	}
 }
 else {
-  dol_print_error('',"Erreur du service web ".$err);
+	print $client->getHTTPBody($client->response);
 }
 
 print "</table><br>";
 
 /*
  * 5 derni<EFBFBD>res commandes en attente
-*/
+ */
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -158,28 +167,28 @@ $parameters = array("limit"=>OSC_MAXNBCOM, "status"=>OSC_ORDWAIT);
 $result = $client->call("get_orders",$parameters );
 
 if ($client->fault) {
-  dol_print_error('',"Erreur webservice ".$client->faultstring);
+	dol_print_error('',"Erreur webservice ".$client->faultstring);
 }
 elseif (!($err = $client->getError()) ) {
-  $var=True;
+	$var=True;
-  $i=0;
+	$i=0;
-  $num=0;
+	$num=0;
-  if ($result) $num = sizeof($result);
+	if ($result) $num = sizeof($result);
-  $langs->load("orders");
+	$langs->load("orders");
 
-  if ($num > 0) {
+	if ($num > 0) {
- 	  $num = min($num,OSC_MAXNBCOM);
+		$num = min($num,OSC_MAXNBCOM);
 
-      while ($i < $num) {
+		while ($i < $num) {
-		  $var=!$var;
+			$var=!$var;
-		  print "<tr $bc[$var]>";
+			print "<tr $bc[$var]>";
-		  print '<td>'.$result[$i][orders_id].'</td><td>'.$result[$i][customers_name].'</td><td>'.convert_price($result[$i][value]).'</td><td>'.$result[$i][payment_method].'</td></tr>';
+			print '<td>'.$result[$i][orders_id].'</td><td>'.$result[$i][customers_name].'</td><td>'.convert_price($result[$i][value]).'</td><td>'.$result[$i][payment_method].'</td></tr>';
-		  $i++;
+			$i++;
 		}
-  }
+	}
 }
 else {
-  dol_print_error('',"Erreur du service web ".$err);
+	print $client->getHTTPBody($client->response);
 }
 
 print "</table><br>";
@@ -195,36 +204,36 @@ $parameters = array("limit"=>OSC_MAXNBCOM, "status"=>OSC_ORDPROCESS);
 $result = $client->call("get_orders",$parameters );
 
 if ($client->fault) {
-  dol_print_error('',"Erreur webservice ".$client->faultstring);
+	dol_print_error('',"Erreur webservice ".$client->faultstring);
 }
 elseif (!($err = $client->getError()) ) {
-  $var=True;
+	$var=True;
-  $i=0;
+	$i=0;
-  $num=0;
+	$num=0;
-  if ($result) $num = sizeof($result);
+	if ($result) $num = sizeof($result);
-  $langs->load("orders");
+	$langs->load("orders");
 
-  if ($num > 0)	{
+	if ($num > 0)	{
- 	  $num = min($num,OSC_MAXNBCOM);
+		$num = min($num,OSC_MAXNBCOM);
 
-      while ($i < $num)	{
+		while ($i < $num)	{
-		print "<tr $bc[$var]>";
+			print "<tr $bc[$var]>";
-		print '<td>'.$result[$i][orders_id].'</td><td>'.$result[$i][customers_name].'</td><td>'.convert_price($result[$i][value]).'</td><td>'.$result[$i][payment_method].'</td></tr>';
+			print '<td>'.$result[$i][orders_id].'</td><td>'.$result[$i][customers_name].'</td><td>'.convert_price($result[$i][value]).'</td><td>'.$result[$i][payment_method].'</td></tr>';
-	  	$i++;
+			$i++;
-		$var=!$var;
+			$var=!$var;
 		}
-    }
+	}
 }
 else {
-  dol_print_error('',"Erreur du service web ".$err);
+	print $client->getHTTPBody($client->response);
 }
 
 print "</table><br>";
 print '</td></tr><tr>';
 
 /*
-* Derniers clients qui ont command<EFBFBD>
+ * Derniers clients qui ont command<EFBFBD>
-*/
+ */
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -234,29 +243,29 @@ $parameters = array("limit"=>OSC_MAXNBCOM);
 $result = $client->call("get_lastOrderClients",$parameters );
 
 if ($client->fault) {
-  dol_print_error('',"Erreur webservice ".$client->faultstring);
+	dol_print_error('',"Erreur webservice ".$client->faultstring);
 }
 elseif (!($err = $client->getError()) ) {
-  $var=True;
+	$var=True;
-  $i=0;
+	$i=0;
-  $num=0;
+	$num=0;
-  if ($result) $num = sizeof($result);
+	if ($result) $num = sizeof($result);
-  $langs->load("orders");
+	$langs->load("orders");
 
-  if ($num > 0)	{
+	if ($num > 0)	{
- 	  $num = min($num,OSC_MAXNBCOM);
+		$num = min($num,OSC_MAXNBCOM);
 
-      while ($i < $num)	{
+		while ($i < $num)	{
-		print "<tr $bc[$var]>";
+			print "<tr $bc[$var]>";
-	  	print "<td>".$result[$i][date_purchased]."</td><td>".$result[$i][customers_name]."</td><td>".$result[$i][delivery_country]."</td><td>".convert_price($result[$i][value])."</td><td>".$result[$i][payment_method]."</td><td>".$result[$i][orders_id]."</td><td>".$result[$i][statut]."</td></tr>";
+			print "<td>".$result[$i][date_purchased]."</td><td>".$result[$i][customers_name]."</td><td>".$result[$i][delivery_country]."</td><td>".convert_price($result[$i][value])."</td><td>".$result[$i][payment_method]."</td><td>".$result[$i][orders_id]."</td><td>".$result[$i][statut]."</td></tr>";
-	  	$i++;
+			$i++;
-		$var=!$var;
+			$var=!$var;
 		}
-	  print "</table><br>";
+		print "</table><br>";
-    }
+	}
 }
 else {
-  dol_print_error('',"Erreur du service web ".$err);
+	print $client->getHTTPBody($client->response);
 }
 
 

htdocs/oscommerce_ws/produits/OSCvente.php

@@ -104,6 +104,10 @@ if ($_GET["action"] == 'vendre' )
 
 		// Set the WebService URL
 		$client = new nusoap_client(OSCWS_DIR."ws_articles.php");
+		if ($client)
+		{
+			$client->soap_defencoding='UTF-8';
+		}
 
 		// Call the WebService and store its result in $result.
 		$result = $client->call("create_article",$parameters );

htdocs/oscommerce_ws/produits/categories.php

@@ -292,6 +292,10 @@ $parameters = array("catid"=>$catid);
 
 // Set the WebService URL
 $client = new nusoap_client(OSCWS_DIR."ws_articles.php");
+if ($client)
+{
+	$client->soap_defencoding='UTF-8';
+}
 
 $result = $client->call("get_categorylist",$parameters );
 

htdocs/oscommerce_ws/produits/index.php

@@ -43,6 +43,10 @@ $parameters = array();
 
 // Set the WebService URL
 $client = new nusoap_client(OSCWS_DIR."ws_articles.php");
+if ($client)
+{
+	$client->soap_defencoding='UTF-8';
+}
 
 $result = $client->call("get_listearticles",$parameters );
 if ($client->fault) {
@@ -96,7 +100,7 @@ elseif (!($err = $client->getError()) )
 	}
 }
 else {
-	dol_print_error('',"Erreur service web ".$client->faultstring);
+	print $client->getHTTPBody($client->response);
 }
 
 print "</TABLE>";

htdocs/oscommerce_ws/produits/osc_product.class.php

@@ -95,6 +95,10 @@ class Osc_product
 
 		// Set the WebService URL
 		$client = new nusoap_client(OSCWS_DIR."/ws_articles.php");
+	    if ($client)
+		{
+			$client->soap_defencoding='UTF-8';
+		}
 
 		// Call the WebSeclient->fault)rvice and store its result in $obj
 		$obj = $client->call("get_article",$parameters );

htdocs/oscommerce_ws/ws_server/ws_articles.php

@@ -29,10 +29,9 @@ require_once('./lib/nusoap.php');
 
 // Create the soap Object
 $s = new soap_server;
-/* $ns='oscommerce';
+$ns='oscommerce';
- $s->configureWSDL('WebServicesOSCommerceForDolibarr',$ns);
+$s->configureWSDL('WebServicesOSCommerceForDolibarrProducts',$ns);
- $s->wsdl->schemaTargetNamespace=$ns;
+$s->wsdl->schemaTargetNamespace=$ns;
- */
 
 // Register a method available for clients
 $s->register('get_article');

htdocs/oscommerce_ws/ws_server/ws_customers.php

@@ -28,31 +28,30 @@ require_once('./includes/configure.php');
 
 // Create the soap Object
 $s = new soap_server;
-/* $ns='oscommerce';
+$ns='oscommerce';
-$s->configureWSDL('WebServicesOSCommerceForDolibarr',$ns);
+$s->configureWSDL('WebServicesOSCommerceForDolibarrCustomers',$ns);
 $s->wsdl->schemaTargetNamespace=$ns;
-*/
 
 // Register the methods available for clients
 $s->register('get_Client');
 
-// méthodes
+// m<EFBFBD>thodes
 function get_Client($custid='') {
 
-//on se connecte
+	//on se connecte
 	if (!($connexion = mysql_connect(DB_SERVER, DB_SERVER_USERNAME, DB_SERVER_PASSWORD)))   return new soap_fault("Server", "MySQL 1", "connexion impossible");
 	if (!($db = mysql_select_db(DB_DATABASE, $connexion)))  return new soap_fault("Server", "MySQL 2", mysql_error());
 
-//la requête
+	//la requ<71>te
 	$sql = "SELECT c.customers_id, a.entry_company, a.entry_firstname, a.entry_lastname, a.entry_street_address, a.entry_postcode, a.entry_city, c.customers_telephone, c.customers_fax, c.customers_email_address, a.entry_country_id, b.countries_iso_code_2, b.countries_name ";
 	$sql .= " from customers c JOIN address_book a ON a.customers_id = c.customers_id JOIN countries b ON b.countries_id = a.entry_country_id JOIN orders o ON o.customers_id = c.customers_id ";
-if ($custid > 0)	$sql .= "WHERE c.customers_id = ".$custid;
+	if ($custid > 0)	$sql .= "WHERE c.customers_id = ".$custid;
 	$sql .= " GROUP BY c.customers_id ORDER BY c.customers_id";
 
 	if (!($resquer = mysql_query($sql,$connexion)))  return new soap_fault("Server", "MySQL 3 ".$sql, mysql_error());
 
-//	$result[$i] = $numrows." lignes trouvées ".$sql;
+	//	$result[$i] = $numrows." lignes trouv<75>es ".$sql;
-		switch ($numrows = mysql_numrows($resquer)) {
+	switch ($numrows = mysql_numrows($resquer)) {
 		case 0 :
 			return new soap_fault("Server", "MySQL 4", "client inexistant ".$sql);
 			break;
@@ -63,10 +62,10 @@ if ($custid > 0)	$sql .= "WHERE c.customers_id = ".$custid;
 				$i++;
 			}
 			break;
-		}		
+	}
 	mysql_close($connexion);
- /* Sends the results to the client */
+	/* Sends the results to the client */
-return $result;
+	return $result;
 }
 
 // Return the results.

htdocs/oscommerce_ws/ws_server/ws_index.html

@@ -7,10 +7,10 @@ This page show list of public webservices, now available on
 your server OSCommerce.<br>
 <br>
 
-* ws_articles<br>
+* <a href="ws_articles.php">ws_articles</a><br>
-* ws_customers<br>
+* <a href="ws_customers.php">ws_customers</a><br>
-* ws_orders<br>
+* <a href="ws_orders.php">ws_orders</a><br>
-* ws_test<br>
+* <a href="ws_test.php">ws_test</a><br>
 
 <br>
 Those pages will be called by Dolibarr using its own SOAP web service client.<br>

htdocs/oscommerce_ws/ws_server/ws_orders.php

@@ -19,6 +19,7 @@
  * $Id$
  */
 set_magic_quotes_runtime(0);
+//if (function_exists('xdebug_disable')) xdebug_disable();
 
 // Soap Server.
 require_once('./lib/nusoap.php');
@@ -27,6 +28,9 @@ require_once('./includes/configure.php');
 
 // Create the soap Object
 $s = new soap_server;
+$ns='oscommerce';
+$s->configureWSDL('WebServicesOSCommerceForDolibarOrders',$ns);
+$s->wsdl->schemaTargetNamespace=$ns;
 
 // Register the methods available for clients
 $s->register('get_CAmensuel');
@@ -35,7 +39,7 @@ $s->register('get_lastOrderClients');
 $s->register('get_Order');
 
 /*----------------------------------------------
-* renvoie un tableau avec le CA mensuel réalisé
+* renvoie un tableau avec le CA mensuel realise
 -----------------------------------------------*/
 function get_CAmensuel() {
 
@@ -43,7 +47,7 @@ function get_CAmensuel() {
 	if (!($connexion = mysql_connect(DB_SERVER, DB_SERVER_USERNAME, DB_SERVER_PASSWORD)))   return new soap_fault("Server", "MySQL 1", "connexion impossible");
 	if (!($db = mysql_select_db(DB_DATABASE, $connexion)))  return new soap_fault("Server", "MySQL 2", mysql_error());
 
-//la requête
+//la requ<EFBFBD>te
 	$sql = "SELECT sum(t.value) as value, MONTH(o.date_purchased) as mois, YEAR(o.date_purchased) as an";
 	$sql .= " FROM orders_total as t";
 	$sql .= " JOIN orders as o ON o.orders_id = t.orders_id";
@@ -157,7 +161,7 @@ $sql .= " FROM orders as o ";
 $sql .= " JOIN orders_total as t on o.orders_id = t.orders_id and t.class = 'ot_subtotal' ";
 $sql .= " JOIN orders_total as p on o.orders_id = p.orders_id and (p.class = 'ot_shipping' OR p.class = 'ot_fixed_payment_chg') ";
 $sql .= " JOIN orders_status as s on o.orders_status = s.orders_status_id and s.language_id = 1";
-$sql .= " WHERE o.orders_status < 5 "; // élimine les commandes annulées, remboursées
+$sql .= " WHERE o.orders_status < 5 "; // <EFBFBD>limine les commandes annul<75>es, rembours<72>es
 if ($orderid > 0) $sql .=  " AND o.orders_id = ".$orderid;
 $sql .= " GROUP BY p.orders_id ";
 $sql .= " ORDER BY o.date_purchased desc";

htdocs/oscommerce_ws/ws_server/ws_test.php

@@ -7,9 +7,8 @@ require_once('./lib/nusoap.php');
 // Create the soap Object
 $s = new soap_server;
 $ns='oscommerce';
-
+$s->configureWSDL('WebServicesOSCommerceForDolibarrTest',$ns);
-#$s->configureWSDL('WebServicesOSCommerceForDolibarr',$ns);
+$s->wsdl->schemaTargetNamespace=$ns;
-#$s->wsdl->schemaTargetNamespace=$ns;
 
 // Register a method available for clients
 $s->register('hello');