Fix to avoid stripe live mode beeing disabled when stripeconnect off

Dolibarr · Mar 13, 2018 · b25f3ba · b25f3ba
1 parent 9f07ff0
commit b25f3ba
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
@@ -61,7 +61,7 @@
 $memberstatic = new Adherent($db);
 $acc = new Account($db);
 $stripe=new Stripe($db);
-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')))
 {
 	$service = 'StripeTest';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');

diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php
@@ -55,11 +55,11 @@ function __construct($db)
 	{
 		$this->db = $db;
 	}
-  
+
 
 	/**
 	 * formObjectOptions
-	 * 
+	 *
 	 * @param	array	$parameters		Parameters
 	 * @param	Object	$object			Object
 	 * @param	string	$action			Action
@@ -68,7 +68,7 @@ function formObjectOptions($parameters, &$object, &$action)
 	{
 		global $db,$conf,$user,$langs,$form;
 
-		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')))
 		{
 			$service = 'StripeTest';
 			dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
@@ -85,7 +85,7 @@ function formObjectOptions($parameters, &$object, &$action)
 				$key=$value;
 			}
 		}
-		
+
 
 		if (is_object($object) && $object->element == 'societe')
 		{
@@ -106,7 +106,7 @@ function formObjectOptions($parameters, &$object, &$action)
 				$this->resprints.= $langs->trans("NoStripe");
 			}
 			$this->resprints.= '</td></tr>';
-				
+
 		}
 		elseif (is_object($object) && $object->element == 'member'){
 			$this->resprints.= '<tr><td>';
@@ -125,7 +125,7 @@ function formObjectOptions($parameters, &$object, &$action)
 				$this->resprints.= $langs->trans("NoStripe");
 			}
 			$this->resprints.= '</td></tr>';
-			 
+
 			$this->resprints.= '<tr><td>';
 			$this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
 			$this->resprints.= $langs->trans('SubscriptionStripe');
@@ -167,7 +167,7 @@ function formObjectOptions($parameters, &$object, &$action)
 
 	/**
 	 * addMoreActionsButtons
-	 * 
+	 *
 	 * @param arra	 	$parameters	Parameters
 	 * @param Object	$object		Object
 	 * @param string	$action		action

diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
@@ -295,7 +295,7 @@ public function createPaymentStripe($amount, $currency, $origin, $item, $source,
 				if (isset($charge->id)) {}
 			}
 
-			if (empty($conf->global->STRIPE_LIVE) || empty($conf->global->STRIPECONNECT_LIVE) || GETPOST('forcesandbox','alpha')) $service = 'StripeTest';
+			if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha')) $service = 'StripeTest';
 			else $service = 'StripeLive';
 
 			$return->statut = 'success';

diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
@@ -55,7 +55,7 @@
 $acc = new Account($db);
 $stripe = new Stripe($db);
 
-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')))
 {
 	$service = 'StripeTest';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');