[Pn-commerce-cvs] pn-commerce pnpmpaypalapi.php,1.32,1.33

[Ruediger H. <hae...@us...>]

Update of /cvsroot/pn-commerce/pn-commerce
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24260

Modified Files:
	pnpmpaypalapi.php 
Log Message:
Fix: put meaningful value into item_name (ordernumber).
Enhancement: add language support for paypal.


Index: pnpmpaypalapi.php
===================================================================
RCS file: /cvsroot/pn-commerce/pn-commerce/pnpmpaypalapi.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** pnpmpaypalapi.php	12 Sep 2004 15:17:32 -0000	1.32
--- pnpmpaypalapi.php	7 Sep 2005 19:12:04 -0000	1.33
***************
*** 103,106 ****
--- 103,107 ----
  		$CatalogConfig=pnModAPIFunc( 'pncommerce','admin','getConfigCatalog');
  		$CurrencyCode=pnModGetVar('pncommerce', 'PayPalCurrencyCode');
+ 		$LanguageCode=substr(pnUserGetLang(), 0, 2);
  		
  		$ImageURL = pnModGetVar('pncommerce', 'PayPalImageURL');
***************
*** 120,124 ****
  //echo "<pre>";print_r($order);echo "</pre>";
          						 	 
! 		$sitename = ereg_replace(" ","_",$Company);
  		$nukeurl = pnGetBaseURL();
      
--- 121,125 ----
  //echo "<pre>";print_r($order);echo "</pre>";
          						 	 
! 		$ItemName = _PNC_ORDER.' '.$args['ON'];
  		$nukeurl = pnGetBaseURL();
      
***************
*** 135,140 ****
--- 136,143 ----
      $smarty->assign( 'ImageURL', $ImageURL );
      $smarty->assign( 'CurrencyCode', $CurrencyCode );
+     $smarty->assign( 'LanguageCode', $LanguageCode);
      $smarty->assign( 'MethodForwardOKURL', pnModURL( 'pncommerce', 'user', 'MethodForward', $successargs ) );
      $smarty->assign( 'MethodForwardCancelURL', pnModURL( 'pncommerce', 'user', 'MethodForward', $cancelargs ) );
+     $smarty->assign( 'ItemName', $ItemName);
      $smarty->assign( 'ON', $args['ON'] );
      return $smarty->fetch( "pncommerce_pmpaypal_processpayment.html" );
***************
*** 168,171 ****
--- 171,175 ----
  		$CatalogConfig=pnModAPIFunc( 'pncommerce','admin','getConfigCatalog');
  		$CurrencyCode=pnModGetVar('pncommerce', 'PayPalCurrencyCode');
+ 		$LanguageCode=substr(pnUserGetLang(), 0, 2);
  		
  		$ImageURL = pnModGetVar('pncommerce', 'PayPalImageURL');
***************
*** 174,178 ****
  						 array('ON' => $args['ON'],
  						 	 'KID' => $args['KID']));
!   	    $URL="https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=$PayPalEmail&currency_code=$CurrencyCode&item_name=order_$Company&item_number=".$args['ON']."&image_url=$ImageURL&no_shipping=1&no_note=1&undefined_quantity=0&amount=".$order['CartData']['Total']."&shipping=0.00&shipping2=0.00";
  
      $smarty = new pnRender();
--- 178,184 ----
  						 array('ON' => $args['ON'],
  						 	 'KID' => $args['KID']));
! 		$ItemName = _PNC_ORDER.'%20'.$args['ON'];
! 
!   	    $URL="https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=$PayPalEmail&currency_code=$CurrencyCode&lc=$LanguageCode&item_name=$ItemName&item_number=".$args['ON']."&image_url=$ImageURL&no_shipping=1&no_note=1&undefined_quantity=0&amount=".$order['CartData']['Total']."&shipping=0.00&shipping2=0.00";
  
      $smarty = new pnRender();
***************
*** 313,317 ****
  								'fields' => array('OrderTotal','OrderStatus'),
  								'required' => array('OrderNumber', $ON)));
! 		$sitename = ereg_replace(" ","_",$Company);
  		$nukeurl = pnGetBaseURL();
  		if($status<10)
--- 319,323 ----
  								'fields' => array('OrderTotal','OrderStatus'),
  								'required' => array('OrderNumber', $ON)));
! 		$ItemName = _PNC_ORDER.'_'.$args['ON'];
  		$nukeurl = pnGetBaseURL();
  		if($status<10)
***************
*** 321,325 ****
  			<input type='hidden' name='cmd' value='_xclick'>
  			<input type='hidden' name='business' value='$PayPalEmail'>
! 			<input type='hidden' name='item_name' value='$sitename'>
  			<input type='hidden' name='item_number' value='order_$ON'>
  			<input type='hidden' name='amount' value='0.00'>
--- 327,331 ----
  			<input type='hidden' name='cmd' value='_xclick'>
  			<input type='hidden' name='business' value='$PayPalEmail'>
! 			<input type='hidden' name='item_name' value='$ItemName'>
  			<input type='hidden' name='item_number' value='order_$ON'>
  			<input type='hidden' name='amount' value='0.00'>