lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Works on paypal module

Browse Source
This commit is contained in:
Regis Houssin 2011-05-22 08:35:48 +00:00
parent 4f1c3f774c
commit 0dc4f7db10
3 changed files with 81 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/langs/en_US/paypal.lang
View File

@ -18,18 +18,23 @@ PAYPAL_CSS_URL=Optionnal Url of CSS style sheet on payment page
ThisIsTransactionId=This is id of transaction: <b>%s</b> ThisIsTransactionId=This is id of transaction: <b>%s</b>
PaypalTransactionDesc=This options allows you to import Paypal payments in Dolibarr as orders, invoices, etc ... PaypalTransactionDesc=This options allows you to import Paypal payments in Dolibarr as orders, invoices, etc ...
PaypalEnableThisTool=Enable this functionnality PaypalEnableThisTool=Enable this functionnality
Unverified=Unverified
Unconfirmed=Unconfirmed
GrossAmount=Gross amount
FeeAmount=Fee amount
NetAmount=Net amount
CustomerDetails=Customer details
# Paypal transaction fields # Paypal transaction fields
PAYERID= PAYERID=Payer ID
PAYERSTATUS= PAYERSTATUS=Payer status
ADDRESSSTATUS= ADDRESSSTATUS=Address status
TRANSACTIONID= TRANSACTIONID=Transaction ID
TRANSACTIONTYPE= TRANSACTIONTYPE=Transaction type
PAYMENTTYPE= PAYMENTTYPE=Payment type
AMT= PAYMENTSTATUS=Payment status
FEEAMT= SHIPAMOUNT=Ship amount
TAXAMT=
PAYMENTSTATUS=
PENDINGREASON= PENDINGREASON=
REASONCODE= REASONCODE=
SHIPPINGMETHOD= SHIPPINGMETHOD=

25
htdocs/langs/fr_FR/paypal.lang
View File

@ -18,18 +18,23 @@ PAYPAL_CSS_URL=Url optionnelle de la feuille de style CSS de la page de paiement
ThisIsTransactionId=Voici l'identifiant de la transaction: <b>%s</b> ThisIsTransactionId=Voici l'identifiant de la transaction: <b>%s</b>
PaypalTransactionDesc=Ces options permettent d'importer des paiements Paypal dans Dolibarr en tant que commandes, factures, etc... PaypalTransactionDesc=Ces options permettent d'importer des paiements Paypal dans Dolibarr en tant que commandes, factures, etc...
PaypalEnableThisTool=Activer ces fonctionnalités PaypalEnableThisTool=Activer ces fonctionnalités
Unverified=Non vérifié
Unconfirmed=Non confirmée
GrossAmount=Montant brut
FeeAmount=Frais Paypal
NetAmount=Montant net
CustomerDetails=Détail du client
# Paypal transaction fields # Paypal transaction fields
PAYERID= PAYERID=ID du payeur
PAYERSTATUS= PAYERSTATUS=Statut du payeur
ADDRESSSTATUS= ADDRESSSTATUS=Statut de l'adresse
TRANSACTIONID= TRANSACTIONID=ID de transaction
TRANSACTIONTYPE= TRANSACTIONTYPE=Type de transaction
PAYMENTTYPE= PAYMENTTYPE=Type de paiement
AMT= PAYMENTSTATUS=Statut du paiement
FEEAMT= SHIPAMOUNT=Frais de port
TAXAMT=
PAYMENTSTATUS=
PENDINGREASON= PENDINGREASON=
REASONCODE= REASONCODE=
SHIPPINGMETHOD= SHIPPINGMETHOD=

34
htdocs/paypal/ajaxtransaction.php
View File

@ -169,7 +169,6 @@ if (isset($_GET['action']) && ! empty($_GET['action']) && isset($_GET['transacti
while (isset($_SESSION[$_GET['transaction_id']]["L_NAME".$i])) while (isset($_SESSION[$_GET['transaction_id']]["L_NAME".$i]))
{ {
$product = new Product($db); $product = new Product($db);
$ret = $product->fetch('',$_SESSION[$_GET['transaction_id']]["L_NUMBER".$i]); $ret = $product->fetch('',$_SESSION[$_GET['transaction_id']]["L_NUMBER".$i]);
if ($ret > 0) if ($ret > 0)
@ -231,17 +230,17 @@ if (isset($_GET['action']) && ! empty($_GET['action']) && isset($_GET['transacti
// Return element id // Return element id
echo $object->getNomUrl(0,0,1); echo $object->getNomUrl(0,0,1);
/*
/*
foreach ($_SESSION[$_GET['transaction_id']] as $key => $value) foreach ($_SESSION[$_GET['transaction_id']] as $key => $value)
{ {
echo $key.': '.$value.'<br />'; echo $key.': '.$value.'<br />';
} }
*/ */
} }
else if ($_GET['action'] == 'showdetails') else if ($_GET['action'] == 'showdetails')
{ {
$langs->load('paypal');
// For paypal request optimization // For paypal request optimization
if (! isset($_SESSION[$_GET['transaction_id']]) ) $_SESSION[$_GET['transaction_id']] = GetTransactionDetails($_GET['transaction_id']); if (! isset($_SESSION[$_GET['transaction_id']]) ) $_SESSION[$_GET['transaction_id']] = GetTransactionDetails($_GET['transaction_id']);
@ -253,19 +252,28 @@ if (isset($_GET['action']) && ! empty($_GET['action']) && isset($_GET['transacti
echo '</tr>'; echo '</tr>';
$var=!$var; $var=!$var;
echo '<tr '.$bc[$var].'><td>'.$langs->trans('LastName').': </td><td>'.$_SESSION[$_GET['transaction_id']]['LASTNAME'].'</td></tr>'; echo '<tr '.$bc[$var].'><td>'.$langs->trans('LastName').'</td><td>'.$_SESSION[$_GET['transaction_id']]['LASTNAME'].'</td></tr>';
$var=!$var; $var=!$var;
echo '<tr '.$bc[$var].'><td>'.$langs->trans('FirstName').': </td><td>'.$_SESSION[$_GET['transaction_id']]['FIRSTNAME'].'</td></tr>'; echo '<tr '.$bc[$var].'><td>'.$langs->trans('FirstName').'</td><td>'.$_SESSION[$_GET['transaction_id']]['FIRSTNAME'].'</td></tr>';
$var=!$var; $var=!$var;
echo '<tr '.$bc[$var].'><td>'.$langs->trans('Address').': </td><td>'.$_SESSION[$_GET['transaction_id']]['SHIPTOSTREET'].'</td></tr>'; echo '<tr '.$bc[$var].'><td>'.$langs->trans('Address').'</td><td>'.$_SESSION[$_GET['transaction_id']]['SHIPTOSTREET'].'</td></tr>';
$var=!$var; $var=!$var;
echo '<tr '.$bc[$var].'><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').': </td><td>'.$_SESSION[$_GET['transaction_id']]['SHIPTOZIP'].' '.$_SESSION[$_GET['transaction_id']]['SHIPTOCITY'].'</td></tr>'; echo '<tr '.$bc[$var].'><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td>'.$_SESSION[$_GET['transaction_id']]['SHIPTOZIP'].' '.$_SESSION[$_GET['transaction_id']]['SHIPTOCITY'].'</td></tr>';
$var=!$var; $var=!$var;
echo '<tr '.$bc[$var].'><td>'.$langs->trans('Country').': </td><td>'.$_SESSION[$_GET['transaction_id']]['SHIPTOCOUNTRYNAME'].'</td></tr>'; echo '<tr '.$bc[$var].'><td>'.$langs->trans('Country').'</td><td>'.$_SESSION[$_GET['transaction_id']]['SHIPTOCOUNTRYNAME'].'</td></tr>';
$var=!$var; $var=!$var;
echo '<tr '.$bc[$var].'><td>'.$langs->trans('Email').': </td><td>'.$_SESSION[$_GET['transaction_id']]['EMAIL'].'</td>'; echo '<tr '.$bc[$var].'><td>'.$langs->trans('Email').'</td><td>'.$_SESSION[$_GET['transaction_id']]['EMAIL'].'</td>';
$var=!$var; $var=!$var;
echo '<tr '.$bc[$var].'><td>'.$langs->trans('Date').': </td><td>'.dol_print_date(dol_stringtotime($_SESSION[$_GET['transaction_id']]['ORDERTIME']),'dayhour').'</td>'; echo '<tr '.$bc[$var].'><td>'.$langs->trans('Date').'</td><td>'.dol_print_date(dol_stringtotime($_SESSION[$_GET['transaction_id']]['ORDERTIME']),'dayhour').'</td>';
$var=!$var;
echo '<tr '.$bc[$var].'><td>'.$langs->trans('PAYERSTATUS').'</td><td>'.$langs->trans(ucfirst($_SESSION[$_GET['transaction_id']]['PAYERSTATUS'])).'</td>';
$var=!$var;
echo '<tr '.$bc[$var].'><td>'.$langs->trans('ADDRESSSTATUS').'</td><td>'.$langs->trans(ucfirst($_SESSION[$_GET['transaction_id']]['ADDRESSSTATUS'])).'</td>';
$shipamount=($_SESSION[$_GET['transaction_id']]['SHIPPINGAMT']?$_SESSION[$_GET['transaction_id']]['SHIPPINGAMT']:$_SESSION[$_GET['transaction_id']]['SHIPAMOUNT']);
$var=!$var;
echo '<tr '.$bc[$var].'><td>'.$langs->trans('SHIPAMOUNT').'</td><td>'.price($shipamount).' '.$_SESSION[$_GET['transaction_id']]['CURRENCYCODE'].'</td>';
echo '</table>'; echo '</table>';
@ -293,9 +301,11 @@ if (isset($_GET['action']) && ! empty($_GET['action']) && isset($_GET['transacti
} }
echo '</table>'; echo '</table>';
/* /*
echo '<br />'; echo '<br />';
foreach ($_SESSION[$_GET['transaction_id']] as $key => $value) foreach ($_SESSION[$_GET['transaction_id']] as $key => $value)
{ {
echo $key.': '.$value.'<br />'; echo $key.': '.$value.'<br />';