diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang index 7bbe8a91057..4bad6039b1f 100644 --- a/htdocs/langs/en_US/paypal.lang +++ b/htdocs/langs/en_US/paypal.lang @@ -3,6 +3,7 @@ CHARSET=UTF-8 PaypalAccount=Paypal account PaypalTransaction=Transactions +PaypalTransactionDetails=Details of the transaction PaypalSetup=PayPal module setup PaypalDesc=This module offer pages to allow payment on PayPal by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) PaypalOrCBDoPayment=Pay with credit card or Paypal diff --git a/htdocs/langs/fr_FR/paypal.lang b/htdocs/langs/fr_FR/paypal.lang index 7fb58cb342d..509ed3f2780 100644 --- a/htdocs/langs/fr_FR/paypal.lang +++ b/htdocs/langs/fr_FR/paypal.lang @@ -3,6 +3,7 @@ CHARSET=UTF-8 PaypalAccount=Compte Paypal PaypalTransaction=Transactions +PaypalTransactionDetails=Detail de la transaction PaypalSetup=Configuration module PayPal PaypalDesc=Ce module permet d'offrir une page de paiement via le prestataire Paypal pour réaliser un paiement quelconque ou un paiement par rapport à un objet Dolibarr (factures, commande...) PaypalOrCBDoPayment=Poursuivre le paiement par carte ou par Paypal diff --git a/htdocs/paypal/ajaxtransaction.php b/htdocs/paypal/ajaxtransaction.php index 7e92364db3a..1be4862f5f4 100644 --- a/htdocs/paypal/ajaxtransaction.php +++ b/htdocs/paypal/ajaxtransaction.php @@ -64,33 +64,64 @@ if (isset($_GET['action']) && ! empty($_GET['action']) && ( (isset($_GET['nvpStr $soc = new Societe($db); $ret = $soc->fetchObjectFromImportKey($soc->table_element,$object['PAYERID']); - echo $ret; + //echo $ret; + + $var=true; echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; + + $var=!$var; + echo ''; + $var=!$var; + echo ''; + $var=!$var; + echo ''; + $var=!$var; + echo ''; + $var=!$var; + echo ''; + $var=!$var; + echo ''; + $var=!$var; + echo ''; + echo '
'.$langs->trans('LastName').': '.$object['LASTNAME'].'
'.$langs->trans('FirstName').': '.$object['FIRSTNAME'].'
'.$langs->trans('Address').': '.$object['SHIPTOSTREET'].'
'.$langs->trans('Zip').' / '.$langs->trans('Town').': '.$object['SHIPTOZIP'].' '.$object['SHIPTOCITY'].'
'.$langs->trans('Country').': '.$object['SHIPTOCOUNTRYNAME'].'
'.$langs->trans('Email').': '.$object['EMAIL'].'
'.$langs->trans('CustomerDetails').'
'.$langs->trans('LastName').': '.$object['LASTNAME'].'
'.$langs->trans('FirstName').': '.$object['FIRSTNAME'].'
'.$langs->trans('Address').': '.$object['SHIPTOSTREET'].'
'.$langs->trans('Zip').' / '.$langs->trans('Town').': '.$object['SHIPTOZIP'].' '.$object['SHIPTOCITY'].'
'.$langs->trans('Country').': '.$object['SHIPTOCOUNTRYNAME'].'
'.$langs->trans('Email').': '.$object['EMAIL'].'
'.$langs->trans('Date').': '.dol_print_date(dol_stringtotime($object['ORDERTIME']),'dayhour').'
'; $i=0; + echo ''; + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + while (isset($object["L_NAME".$i])) { - echo $langs->trans('Ref').': '.$object["L_NUMBER".$i].'
'; - echo $langs->trans('Label').': '.$object["L_NAME".$i].'
'; + $var=!$var; + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; $i++; } + echo '
'.$langs->trans('Ref').''.$langs->trans('Label').''.$langs->trans('Qty').'
'.$object["L_NUMBER".$i].''.$object["L_NAME".$i].''.$object["L_QTY".$i].'
'; +/* echo '
'; foreach ($object as $key => $value) { echo $key.': '.$value.'
'; } +*/ } } diff --git a/htdocs/paypal/transaction.php b/htdocs/paypal/transaction.php index 7ee39a54a5b..0fae39fa04b 100644 --- a/htdocs/paypal/transaction.php +++ b/htdocs/paypal/transaction.php @@ -135,7 +135,7 @@ llxHeader(); }); -