vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix warning

Browse source
This commit is contained in:
Laurent Destailleur 2024-03-19 10:36:56 +01:00
parent 43b6d26dd8
commit 33cf4981ab
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
htdocs/paypal/lib/paypalfunctions.lib.php
View file

@ -74,8 +74,8 @@ if (getDolGlobalString('PAYPAL_API_SANDBOX')) {
}
// Proxy
$PROXY_HOST = $conf->global->MAIN_PROXY_HOST;
$PROXY_PORT = $conf->global->MAIN_PROXY_PORT;
$PROXY_USER = $conf->global->MAIN_PROXY_USER;
$PROXY_PASS = $conf->global->MAIN_PROXY_PASS;
$PROXY_HOST = getDolGlobalString('MAIN_PROXY_HOST');
$PROXY_PORT = getDolGlobalString('MAIN_PROXY_PORT');
$PROXY_USER = getDolGlobalString('MAIN_PROXY_USER');
$PROXY_PASS = getDolGlobalString('MAIN_PROXY_PASS');
$USE_PROXY = !getDolGlobalString('MAIN_PROXY_USE') ? false : true;

6
htdocs/public/payment/paymentok.php
View file

@ -360,10 +360,10 @@ if ($reshook >= 0) {
// If data not provided into callback url, search them into the session env
if (empty($ipaddress)) {
$ipaddress = $_SESSION['ipaddress'];
$ipaddress = $_SESSION['ipaddress'];
}
if (empty($TRANSACTIONID)) {
$TRANSACTIONID = $_SESSION['TRANSACTIONID']; // pi_... or ch_...
$TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' :$_SESSION['TRANSACTIONID']; // pi_... or ch_...
if (empty($TRANSACTIONID) && GETPOST('payment_intent', 'alphanohtml')) {
// For the case we use STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 2
$TRANSACTIONID = GETPOST('payment_intent', 'alphanohtml');
@ -377,7 +377,7 @@ if (empty($currencyCodeType)) {
}
// Seems used onyl by Paypal
if (empty($paymentType)) {
$paymentType = $_SESSION["paymentType"];
$paymentType = $_SESSION["paymentType"];
}
$fulltag = $FULLTAG;