diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang index 7bbe8a910571dcb64d9e8b247f20fe580107249d..4bad6039b1f87e75a04d60293dab30790f2c1b08 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 <a href="http://www.paypal.com" target="_blank">PayPal</a> 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 7fb58cb342db7f117b3cd5b266f04303224355e2..509ed3f2780e0e3f9fe7cce61f3195a0a384cfbf 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 <a href="http://www.paypal.com" target="_blank">Paypal</a> 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 7e92364db3ac277f3e7e9287a69b9718db82e80e..1be4862f5f400b03d00929643a00271ca95127f5 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 '<table style="noboardernopading" width="100%">'; - echo '<tr><td>'.$langs->trans('LastName').': </td><td>'.$object['LASTNAME'].'</td></tr>'; - echo '<tr><td>'.$langs->trans('FirstName').': </td><td>'.$object['FIRSTNAME'].'</td></tr>'; - echo '<tr><td>'.$langs->trans('Address').': </td><td>'.$object['SHIPTOSTREET'].'</td></tr>'; - echo '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').': </td><td>'.$object['SHIPTOZIP'].' '.$object['SHIPTOCITY'].'</td></tr>'; - echo '<tr><td>'.$langs->trans('Country').': </td><td>'.$object['SHIPTOCOUNTRYNAME'].'</td></tr>'; - echo '<tr><td>'.$langs->trans('Email').': </td><td>'.$object['EMAIL'].'</td>'; + echo '<tr class="liste_titre">'; + echo '<td colspan="2">'.$langs->trans('CustomerDetails').'</td>'; + echo '</tr>'; + + $var=!$var; + echo '<tr '.$bc[$var].'><td>'.$langs->trans('LastName').': </td><td>'.$object['LASTNAME'].'</td></tr>'; + $var=!$var; + echo '<tr '.$bc[$var].'><td>'.$langs->trans('FirstName').': </td><td>'.$object['FIRSTNAME'].'</td></tr>'; + $var=!$var; + echo '<tr '.$bc[$var].'><td>'.$langs->trans('Address').': </td><td>'.$object['SHIPTOSTREET'].'</td></tr>'; + $var=!$var; + echo '<tr '.$bc[$var].'><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').': </td><td>'.$object['SHIPTOZIP'].' '.$object['SHIPTOCITY'].'</td></tr>'; + $var=!$var; + echo '<tr '.$bc[$var].'><td>'.$langs->trans('Country').': </td><td>'.$object['SHIPTOCOUNTRYNAME'].'</td></tr>'; + $var=!$var; + echo '<tr '.$bc[$var].'><td>'.$langs->trans('Email').': </td><td>'.$object['EMAIL'].'</td>'; + $var=!$var; + echo '<tr '.$bc[$var].'><td>'.$langs->trans('Date').': </td><td>'.dol_print_date(dol_stringtotime($object['ORDERTIME']),'dayhour').'</td>'; + echo '</table>'; $i=0; + echo '<table style="noboardernopading" width="100%">'; + + echo '<tr class="liste_titre">'; + echo '<td>'.$langs->trans('Ref').'</td>'; + echo '<td>'.$langs->trans('Label').'</td>'; + echo '<td>'.$langs->trans('Qty').'</td>'; + echo '</tr>'; + while (isset($object["L_NAME".$i])) { - echo $langs->trans('Ref').': '.$object["L_NUMBER".$i].'<br />'; - echo $langs->trans('Label').': '.$object["L_NAME".$i].'<br />'; + $var=!$var; + + echo '<tr '.$bc[$var].'>'; + echo '<td>'.$object["L_NUMBER".$i].'</td>'; + echo '<td>'.$object["L_NAME".$i].'</td>'; + echo '<td>'.$object["L_QTY".$i].'</td>'; + echo '</tr>'; $i++; } + echo '</table>'; +/* echo '<br />'; foreach ($object as $key => $value) { echo $key.': '.$value.'<br />'; } +*/ } } diff --git a/htdocs/paypal/transaction.php b/htdocs/paypal/transaction.php index 7ee39a54a5bd8cca8c11670d65bc5060f0364b72..0fae39fa04bb2761d294d03fe2b2f1abbe1fae3c 100644 --- a/htdocs/paypal/transaction.php +++ b/htdocs/paypal/transaction.php @@ -135,7 +135,7 @@ llxHeader(); }); </script> -<div id="paypal-details" title="<?php echo $langs->trans('TransactionDetails'); ?>" style="display: none;"> +<div id="paypal-details" title="<?php echo $langs->trans('PaypalTransactionDetails'); ?>" style="display: none;"> <div id="paypal_detail_content"></div> </div>