Works on enhancement of paypal module
This commit is contained in:
Regis Houssin
parent
0571531f34
commit
b6be7472c3
@ -50,6 +50,16 @@ else
|
|||||||
$API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
|
$API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Clean parameters
|
||||||
|
$PAYPAL_API_USER="";
|
||||||
|
if ($conf->global->PAYPAL_API_USER) $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
|
||||||
|
$PAYPAL_API_PASSWORD="";
|
||||||
|
if ($conf->global->PAYPAL_API_PASSWORD) $PAYPAL_API_PASSWORD=$conf->global->PAYPAL_API_PASSWORD;
|
||||||
|
$PAYPAL_API_SIGNATURE="";
|
||||||
|
if ($conf->global->PAYPAL_API_SIGNATURE) $PAYPAL_API_SIGNATURE=$conf->global->PAYPAL_API_SIGNATURE;
|
||||||
|
$PAYPAL_API_SANDBOX="";
|
||||||
|
if ($conf->global->PAYPAL_API_SANDBOX) $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
|
||||||
|
|
||||||
// Proxy
|
// Proxy
|
||||||
$PROXY_HOST = $conf->global->MAIN_PROXY_HOST;
|
$PROXY_HOST = $conf->global->MAIN_PROXY_HOST;
|
||||||
$PROXY_PORT = $conf->global->MAIN_PROXY_PORT;
|
$PROXY_PORT = $conf->global->MAIN_PROXY_PORT;
|
||||||
|
|||||||
213
htdocs/paypal/transaction.php
Normal file
213
htdocs/paypal/transaction.php
Normal file
@ -0,0 +1,213 @@
|
|||||||
|
<?php
|
||||||
|
/* Copyright (C) 2011 Regis Houssin <regis@dolibarr.fr>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \file htdocs/paypal/transaction.php
|
||||||
|
* \ingroup paypal
|
||||||
|
* \brief Page to list transactions in paypal account
|
||||||
|
* \version $Id$
|
||||||
|
*/
|
||||||
|
|
||||||
|
require("../main.inc.php");
|
||||||
|
require_once(DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php');
|
||||||
|
require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypalfunctions.lib.php");
|
||||||
|
|
||||||
|
$langs->load("paypal");
|
||||||
|
|
||||||
|
$action = GETPOST('action');
|
||||||
|
|
||||||
|
// Security check
|
||||||
|
//$result=restrictedArea($user,'paypal');
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Actions
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* View
|
||||||
|
*/
|
||||||
|
|
||||||
|
$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($endDateStr) && ! empty($endDateStr)) {
|
||||||
|
$end_time = dol_stringtotime($endDateStr);
|
||||||
|
$iso_end = dol_print_date($end_time,'dayhourrfc');
|
||||||
|
$nvpStr.="&ENDDATE=$iso_end";
|
||||||
|
}
|
||||||
|
|
||||||
|
if(isset($transactionID) && ! empty($transactionID)) {
|
||||||
|
$nvpStr=$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();
|
||||||
|
|
||||||
|
?>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
$(function() {
|
||||||
|
var dates = $( "#startDateStr, #endDateStr" ).datepicker({
|
||||||
|
defaultDate: "+1w",
|
||||||
|
changeMonth: true,
|
||||||
|
numberOfMonths: 3,
|
||||||
|
monthNames: tradMonths,
|
||||||
|
monthNamesShort: tradMonthsMin,
|
||||||
|
dayNames: tradDays,
|
||||||
|
dayNamesMin: tradDaysMin,
|
||||||
|
dateFormat: 'dd/mm/yy',
|
||||||
|
onSelect: function( selectedDate ) {
|
||||||
|
var option = this.id == "startDateStr" ? "minDate" : "maxDate",
|
||||||
|
instance = $( this ).data( "datepicker" ),
|
||||||
|
date = $.datepicker.parseDate(
|
||||||
|
instance.settings.dateFormat ||
|
||||||
|
$.datepicker._defaults.dateFormat,
|
||||||
|
selectedDate, instance.settings );
|
||||||
|
dates.not( this ).datepicker( "option", option, date );
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<?php
|
||||||
|
|
||||||
|
print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
|
||||||
|
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||||
|
|
||||||
|
print '<table>';
|
||||||
|
|
||||||
|
print '<tr>';
|
||||||
|
print '<td>'.$langs->trans('DateStart').': </td>';
|
||||||
|
print '<td><input type="text" id="startDateStr" name="startDateStr" maxlength="20" size="10" value="'.$start_date_str.'" /></td>';
|
||||||
|
print '</tr>';
|
||||||
|
|
||||||
|
print '<tr>';
|
||||||
|
print '<td>'.$langs->trans('DateEnd').': </td>';
|
||||||
|
print '<td><input type="text" id="endDateStr" name="endDateStr" maxlength="20" size="10" value="'.$end_date_str.'" /></td>';
|
||||||
|
print '</tr>';
|
||||||
|
|
||||||
|
print '<tr>';
|
||||||
|
print '<td>'.$langs->trans('TransactionID').': </td>';
|
||||||
|
print '<td><input type="text" name="transactionID" /></td>';
|
||||||
|
print '</tr>';
|
||||||
|
|
||||||
|
print '<tr>';
|
||||||
|
print '<td><input type="submit" value="'.$langs->trans('Send').'" /></td>';
|
||||||
|
print '</tr>';
|
||||||
|
|
||||||
|
print '</table>';
|
||||||
|
print '</form>';
|
||||||
|
|
||||||
|
|
||||||
|
if (! empty($nvpStr))
|
||||||
|
{
|
||||||
|
$resArray=hash_call("TransactionSearch",$nvpStr);
|
||||||
|
|
||||||
|
//var_dump($resArray);
|
||||||
|
|
||||||
|
$reqArray=$_SESSION['nvpReqArray'];
|
||||||
|
|
||||||
|
/*
|
||||||
|
$ack = strtoupper($resArray["ACK"]);
|
||||||
|
if($ack!="SUCCESS" && $ack!="SUCCESSWITHWARNING")
|
||||||
|
{
|
||||||
|
$_SESSION['reshash']=$resArray;
|
||||||
|
$location = "APIError.php";
|
||||||
|
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.'&viewstatut='.$viewstatut,'width="25%"',$sortfield,$sortorder);
|
||||||
|
print_liste_field_titre($langs->trans('Date'),$_SERVER['PHP_SELF'],'','',''.$socid.'&viewstatut='.$viewstatut,'align="center"',$sortfield,$sortorder);
|
||||||
|
print_liste_field_titre($langs->trans('Status'),$_SERVER['PHP_SELF'],'','',''.$socid.'&viewstatut='.$viewstatut,'align="center"',$sortfield,$sortorder);
|
||||||
|
print_liste_field_titre($langs->trans('ThirdPartyName'),$_SERVER['PHP_SELF'],'','','&socid='.$socid.'&viewstatut='.$viewstatut, 'align="right"',$sortfield,$sortorder);
|
||||||
|
print_liste_field_titre($langs->trans('GrossAmount'),$_SERVER['PHP_SELF'],'','','&socid='.$socid.'&viewstatut='.$viewstatut, 'align="right"',$sortfield,$sortorder);
|
||||||
|
print_liste_field_titre($langs->trans('FeeAmount'),$_SERVER['PHP_SELF'],'','','&socid='.$socid.'&viewstatut='.$viewstatut, 'align="right"',$sortfield,$sortorder);
|
||||||
|
print_liste_field_titre($langs->trans('NetAmount'),$_SERVER['PHP_SELF'],'','','&socid='.$socid.'&viewstatut='.$viewstatut, 'align="right"',$sortfield,$sortorder);
|
||||||
|
print '</tr>';
|
||||||
|
|
||||||
|
if(! isset($resArray["L_TRANSACTIONID0"]))
|
||||||
|
{
|
||||||
|
print '<tr>';
|
||||||
|
print '<td colspan="6">'.$langs->trans("NoTransactionSelected").'</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++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
print '</table>';
|
||||||
|
}
|
||||||
|
|
||||||
|
llxFooter('$Date$ - $Revision$');
|
||||||
|
|
||||||
|
?>
|
||||||
@ -120,14 +120,6 @@ $urlok=preg_replace('/&$/','',$urlok); // Remove last &
|
|||||||
$urlko=preg_replace('/&$/','',$urlko); // Remove last &
|
$urlko=preg_replace('/&$/','',$urlko); // Remove last &
|
||||||
|
|
||||||
// Clean parameters
|
// Clean parameters
|
||||||
$PAYPAL_API_USER="";
|
|
||||||
if ($conf->global->PAYPAL_API_USER) $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
|
|
||||||
$PAYPAL_API_PASSWORD="";
|
|
||||||
if ($conf->global->PAYPAL_API_PASSWORD) $PAYPAL_API_PASSWORD=$conf->global->PAYPAL_API_PASSWORD;
|
|
||||||
$PAYPAL_API_SIGNATURE="";
|
|
||||||
if ($conf->global->PAYPAL_API_SIGNATURE) $PAYPAL_API_SIGNATURE=$conf->global->PAYPAL_API_SIGNATURE;
|
|
||||||
$PAYPAL_API_SANDBOX="";
|
|
||||||
if ($conf->global->PAYPAL_API_SANDBOX) $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
|
|
||||||
$PAYPAL_API_OK="";
|
$PAYPAL_API_OK="";
|
||||||
if ($urlok) $PAYPAL_API_OK=$urlok;
|
if ($urlok) $PAYPAL_API_OK=$urlok;
|
||||||
$PAYPAL_API_KO="";
|
$PAYPAL_API_KO="";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user