From 12bf78b7d6b8782ce5d2015f39d7d5f0ead11f33 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 17 May 2011 19:15:38 +0000
Subject: [PATCH] Works on paypal module

---
 htdocs/paypal/ajaxtransaction.php | 42 ++++++++++++++++++++++++++++++-
 htdocs/paypal/transaction.php     |  2 ++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/htdocs/paypal/ajaxtransaction.php b/htdocs/paypal/ajaxtransaction.php
index 8af30f69ca2..53a68d34559 100644
--- a/htdocs/paypal/ajaxtransaction.php
+++ b/htdocs/paypal/ajaxtransaction.php
@@ -32,6 +32,7 @@ if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
 require('../main.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php');
 require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypalfunctions.lib.php");
 
@@ -57,7 +58,7 @@ top_httphead();
 
 dol_syslog(join(',',$_GET));
 
-if (isset($_GET['action']) && ! empty($_GET['action']) && ( (isset($_GET['element']) && ! empty($_GET['element'])) || (isset($_GET['transaction_id']) && ! empty($_GET['transaction_id'])) ) )
+if (isset($_GET['action']) && ! empty($_GET['action']) && isset($_GET['transaction_id']) && ! empty($_GET['transaction_id']) )
 {
 	if ($_GET['action'] == 'create')
 	{
@@ -128,6 +129,45 @@ if (isset($_GET['action']) && ! empty($_GET['action']) && ( (isset($_GET['elemen
 				echo $langs->trans($soc->error);
 			}
 		}
+		
+		if ($soc->id > 0 && isset($_GET['element']) && ! empty($_GET['element']))
+		{
+			// Parse element/subelement (ex: project_task)
+	        $element = $subelement = $_GET['element'];
+	        if (preg_match('/^([^_]+)_([^_]+)/i',$_GET['element'],$regs))
+	        {
+	            $element = $regs[1];
+	            $subelement = $regs[2];
+	        }
+	        // For compatibility
+            if ($element == 'order') { $element = $subelement = 'commande'; }
+
+            dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
+
+            $classname = ucfirst($subelement);
+            $object = new $classname($db);
+            
+            $object->socid=$soc->id;
+            $object->fetch_thirdparty();
+            
+            $db->begin();
+            
+            $object->date_commande	= dol_now();
+            $object->ref_ext		= $_SESSION[$_GET['transaction_id']]['SHIPTOCITY'];
+            $object->contactid		= $contact->id;
+            
+            $i=0;
+			while (isset($_SESSION[$_GET['transaction_id']]["L_NAME".$i]))
+			{
+				$product = new Product($db);
+				$product->fetch('',$_SESSION[$_GET['transaction_id']]["L_NUMBER".$i]);
+				
+				//$_SESSION[$_GET['transaction_id']]["L_QTY".$i];
+				echo 'ref='.$product->ref.' label='.$product->libelle.'<br>';
+				
+				$i++;
+			}
+		}
 
 		echo 'socid='.$soc->id;
 		
diff --git a/htdocs/paypal/transaction.php b/htdocs/paypal/transaction.php
index e9dcd695955..33f1cdc437e 100644
--- a/htdocs/paypal/transaction.php
+++ b/htdocs/paypal/transaction.php
@@ -174,6 +174,8 @@ dol_htmloutput_errors('',$errors);
 
 print_fiche_titre(' - '.$langs->trans('PaypalTransaction'), '', 'paypal_logo@paypal');
 
+print '<br />';
+
 // Search parameters
 print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';