Skip to content
Snippets Groups Projects
Commit d3c2d950 authored by Regis Houssin's avatar Regis Houssin
Browse files

Fix: optimize code

parent b6be7472
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
htdocs/paypal/transaction.php
+ 71
− 68
View file @ d3c2d950
......@@ -29,11 +29,20 @@ require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypalfunctions.lib.php");
$langs->load("paypal");
$action = GETPOST('action');
// Security check
//$result=restrictedArea($user,'paypal');
$action = GETPOST('action');
$page = GETPOST("page",'int');
$startDateStr=GETPOST('startDateStr');
$endDateStr=GETPOST('endDateStr');
$transactionID=urlencode(GETPOST('transactionID'));
if ($page == -1) { $page = 0; }
$offset = $conf->liste_limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
/*
* Actions
......@@ -47,38 +56,32 @@ $action = GETPOST('action');
$nvpStr='';
$startDateStr=GETPOST('startDateStr');
$endDateStr=GETPOST('endDateStr');
$transactionID=urlencode(GETPOST('transactionID'));
if(isset($endDateStr) && ! empty($startDateStr)) {
$start_time = dol_stringtotime($startDateStr);
$iso_start = dol_print_date($start_time,'dayhourrfc');
$nvpStr="&STARTDATE=$iso_start";
if(isset($startDateStr) && ! empty($startDateStr)) {
$start_date_str = $startDateStr;
$start_time = dol_stringtotime($start_date_str);
} else {
$start_time = dol_now()-86400;
$start_date_str = dol_print_date($start_time,'day');
}
$iso_start = dol_print_date($start_time,'dayhourrfc');
$nvpStr.="&STARTDATE=$iso_start";
if(isset($endDateStr) && ! empty($endDateStr)) {
$end_time = dol_stringtotime($endDateStr);
$iso_end = dol_print_date($end_time,'dayhourrfc');
$nvpStr.="&ENDDATE=$iso_end";
$end_date_str = $endDateStr;
$end_time = dol_stringtotime($end_date_str);
} else {
$end_time = dol_now();
$end_date_str = dol_print_date($end_time,'day');
}
$iso_end = dol_print_date($end_time,'dayhourrfc');
$nvpStr.="&ENDDATE=$iso_end";
if(isset($transactionID) && ! empty($transactionID)) {
$nvpStr=$nvpStr."&TRANSACTIONID=$transactionID";
$nvpStr.="&TRANSACTIONID=$transactionID";
}
if (isset($startDateStr) && ! empty($startDateStr)) {
$start_date_str = $startDateStr;
} else {
$yesterdayDate = dol_now()-86400;
$start_date_str = dol_print_date($yesterdayDate,'day');
}
if (isset($endDateStr) && ! empty($startDateStr)) {
$end_date_str = $endDateStr;
} else {
$currentDate = dol_now();
$end_date_str = dol_print_date($currentDate,'day');
}
llxHeader();
......@@ -110,6 +113,8 @@ llxHeader();
<?php
print_barre_liste($langs->trans('PaypalTransaction'), $page, $_SERVER['PHP_SELF']);
print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
......@@ -138,6 +143,7 @@ print '</table>';
print '</form>';
// Call Paypal API
if (! empty($nvpStr))
{
$resArray=hash_call("TransactionSearch",$nvpStr);
......@@ -155,58 +161,55 @@ if (! empty($nvpStr))
header("Location: $location");
}
*/
}
print_barre_liste($title, $_GET['page'], $_SERVER['PHP_SELF'],'',$sortfield,$sortorder,'',$num);
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans('ID'),$_SERVER['PHP_SELF'],'','',''.$socid.'&amp;viewstatut='.$viewstatut,'width="25%"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('Date'),$_SERVER['PHP_SELF'],'','',''.$socid.'&amp;viewstatut='.$viewstatut,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('Status'),$_SERVER['PHP_SELF'],'','',''.$socid.'&amp;viewstatut='.$viewstatut,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('ThirdPartyName'),$_SERVER['PHP_SELF'],'','','&amp;socid='.$socid.'&amp;viewstatut='.$viewstatut, 'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('GrossAmount'),$_SERVER['PHP_SELF'],'','','&amp;socid='.$socid.'&amp;viewstatut='.$viewstatut, 'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('FeeAmount'),$_SERVER['PHP_SELF'],'','','&amp;socid='.$socid.'&amp;viewstatut='.$viewstatut, 'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('NetAmount'),$_SERVER['PHP_SELF'],'','','&amp;socid='.$socid.'&amp;viewstatut='.$viewstatut, 'align="right"',$sortfield,$sortorder);
print '</tr>';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans('ID'),$_SERVER['PHP_SELF'],'','',''.$socid.'&amp;viewstatut='.$viewstatut,'width="25%"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('Date'),$_SERVER['PHP_SELF'],'','',''.$socid.'&amp;viewstatut='.$viewstatut,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('Status'),$_SERVER['PHP_SELF'],'','',''.$socid.'&amp;viewstatut='.$viewstatut,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('ThirdPartyName'),$_SERVER['PHP_SELF'],'','','&amp;socid='.$socid.'&amp;viewstatut='.$viewstatut, 'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('GrossAmount'),$_SERVER['PHP_SELF'],'','','&amp;socid='.$socid.'&amp;viewstatut='.$viewstatut, 'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('FeeAmount'),$_SERVER['PHP_SELF'],'','','&amp;socid='.$socid.'&amp;viewstatut='.$viewstatut, 'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('NetAmount'),$_SERVER['PHP_SELF'],'','','&amp;socid='.$socid.'&amp;viewstatut='.$viewstatut, 'align="right"',$sortfield,$sortorder);
if(! isset($resArray["L_TRANSACTIONID0"]))
{
print '<tr>';
print '<td colspan="6">'.$langs->trans("NoTransactionSelected").'</td>';
print '</tr>';
}
else
{
$i=0;
if(! isset($resArray["L_TRANSACTIONID0"]))
while (isset($resArray["L_TRANSACTIONID".$i]))
{
$transactionID = $resArray["L_TRANSACTIONID".$i];
$timeStamp = dol_stringtotime($resArray["L_TIMESTAMP".$i]);
$payerName = $resArray["L_NAME".$i];
$amount = $resArray["L_AMT".$i];
$feeamount = $resArray["L_FEEAMT".$i];
$netamount = $resArray["L_NETAMT".$i];
$currency = $resArray["L_CURRENCYCODE".$i];
$status = $resArray["L_STATUS".$i];
print '<tr>';
print '<td colspan="6">'.$langs->trans("NoTransactionSelected").'</td>';
print '<td><a id="transactiondetailslink'.$i.'" href="details.php?transactionID='.$transactionID.'">'.$transactionID.'</a></td>';
print '<td align="center">'.dol_print_date($timeStamp,'dayhour').'</td>';
print '<td align="center">'.$status.'</td>';
print '<td align="right">'.$payerName.'</td>';
print '<td align="right">'.$amount.' '.$currency.'</td>';
print '<td align="right">'.$feeamount.' '.$currency.'</td>';
print '<td align="right">'.$netamount.' '.$currency.'</td>';
print '</tr>';
}
else
{
$i=0;
while (isset($resArray["L_TRANSACTIONID".$i]))
{
$transactionID = $resArray["L_TRANSACTIONID".$i];
$timeStamp = dol_stringtotime($resArray["L_TIMESTAMP".$i]);
$payerName = $resArray["L_NAME".$i];
$amount = $resArray["L_AMT".$i];
$feeamount = $resArray["L_FEEAMT".$i];
$netamount = $resArray["L_NETAMT".$i];
$currency = $resArray["L_CURRENCYCODE".$i];
$status = $resArray["L_STATUS".$i];
print '<tr>';
print '<td><a id="transactiondetailslink'.$i.'" href="details.php?transactionID='.$transactionID.'">'.$transactionID.'</a></td>';
print '<td align="center">'.dol_print_date($timeStamp,'dayhour').'</td>';
print '<td align="center">'.$status.'</td>';
print '<td align="right">'.$payerName.'</td>';
print '<td align="right">'.$amount.' '.$currency.'</td>';
print '<td align="right">'.$feeamount.' '.$currency.'</td>';
print '<td align="right">'.$netamount.' '.$currency.'</td>';
print '</tr>';
$i++;
}
$i++;
}
print '</table>';
}
print '</table>';
llxFooter('$Date$ - $Revision$');
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment