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

Fix regression with live box

Browse Source
This commit is contained in:
Laurent Destailleur 2018-03-12 21:29:03 +01:00
parent 717a1daf28
commit 7b864aeaec
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -542,7 +542,7 @@ if (! empty($conf->paypal->enabled) && (! empty($conf->global->PAYPAL_API_SANDBO
{ {
dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Paypal'),'','warning'); dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Paypal'),'','warning');
} }
if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || empty($conf->global->STRIPECONNECT_LIVE) || GETPOST('forcesandbox','alpha'))) if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha')))
{ {
dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning'); dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
} }

10
htdocs/stripe/config.php
View File

@ -33,15 +33,6 @@ global $conf;
//use \includes\stripe as stripe; //use \includes\stripe as stripe;
$stripe = array(); $stripe = array();
if ((empty($conf->global->STRIPECONNECT_LIVE) && ! (empty($conf->stripeconnect->enabled))) || GETPOST('forcesandbox','alpha'))
{
$stripe = array(
"secret_key" => $conf->global->STRIPE_TEST_SECRET_KEY,
"publishable_key" => $conf->global->STRIPE_TEST_PUBLISHABLE_KEY
);
}
else
{
if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha')) if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha'))
{ {
$stripe = array( $stripe = array(
@ -56,7 +47,6 @@ else
"publishable_key" => $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY "publishable_key" => $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY
); );
} }
}
require_once DOL_DOCUMENT_ROOT."/includes/stripe/lib/Stripe.php"; require_once DOL_DOCUMENT_ROOT."/includes/stripe/lib/Stripe.php";
require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';