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

not giving the invoiceref anymore in the url from newpayment to paymentok, since it was already in ref= anyway

Browse Source
This commit is contained in:
Dorian Vabre 2021-04-27 10:08:32 +02:00
parent 99589fd693
commit d034446205
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/public/payment/newpayment.php
View File

@ -376,9 +376,6 @@ if ($action == 'dopayment') {
dol_syslog("SCRIPT_URI: ".(empty($_SERVER["SCRIPT_URI"]) ? '' : $_SERVER["SCRIPT_URI"]), LOG_DEBUG); // If defined script uri must match domain of PAYPAL_API_OK and PAYPAL_API_KO dol_syslog("SCRIPT_URI: ".(empty($_SERVER["SCRIPT_URI"]) ? '' : $_SERVER["SCRIPT_URI"]), LOG_DEBUG); // If defined script uri must match domain of PAYPAL_API_OK and PAYPAL_API_KO
// A redirect is added if API call successfull // A redirect is added if API call successfull
if ($source == 'conferencesubscription') {
$PAYPAL_API_OK .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
}
$mesg = print_paypal_redirect($PAYPAL_API_PRICE, $PAYPAL_API_DEVISE, $PAYPAL_PAYMENT_TYPE, $PAYPAL_API_OK, $PAYPAL_API_KO, $FULLTAG); $mesg = print_paypal_redirect($PAYPAL_API_PRICE, $PAYPAL_API_DEVISE, $PAYPAL_PAYMENT_TYPE, $PAYPAL_API_OK, $PAYPAL_API_KO, $FULLTAG);
// If we are here, it means the Paypal redirect was not done, so we show error message // If we are here, it means the Paypal redirect was not done, so we show error message
@ -397,10 +394,6 @@ if ($action == 'dopayment') {
$urlok = preg_replace('/securekey=[^&]+/', '', $urlok); $urlok = preg_replace('/securekey=[^&]+/', '', $urlok);
$urlko = preg_replace('/securekey=[^&]+/', '', $urlko); $urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
if ($source == 'conferencesubscription') {
$urlok .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
}
$mesg = ''; $mesg = '';
if (empty($PRICE) || !is_numeric($PRICE)) { if (empty($PRICE) || !is_numeric($PRICE)) {
$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")); $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount"));
@ -755,9 +748,6 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
header("Location: ".$urlko); header("Location: ".$urlko);
exit; exit;
} else { } else {
if ($source == 'conferencesubscription') {
$urlok .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
}
header("Location: ".$urlok); header("Location: ".$urlok);
exit; exit;
} }

1
htdocs/public/payment/paymentok.php
View File

@ -104,7 +104,6 @@ if (empty($FULLTAG)) {
} }
$source = GETPOST('s', 'alpha') ? GETPOST('s', 'alpha') : GETPOST('source', 'alpha'); $source = GETPOST('s', 'alpha') ? GETPOST('s', 'alpha') : GETPOST('source', 'alpha');
$ref = GETPOST('ref'); $ref = GETPOST('ref');
$invoiceref = GETPOST('invoice');
$suffix = GETPOST("suffix", 'aZ09'); $suffix = GETPOST("suffix", 'aZ09');
$membertypeid = GETPOST("membertypeid", 'int'); $membertypeid = GETPOST("membertypeid", 'int');