Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into d…

…evelop
Dolibarr · Sep 23, 2018 · 29979a8 · 29979a8
2 parents 8aa22f2 + a5b8c9f
commit 29979a8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
@@ -33,7 +33,11 @@
  */
 abstract class CommonDocGenerator
 {
-	var $error='';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
+
 	protected $db;
 
 

diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
@@ -161,25 +161,26 @@
 		print '<tr class="oddeven">';
 
 		// Ref
-    if (!empty($stripeacc)) $connect=$stripeacc.'/';
-
+        if (!empty($stripeacc)) $connect=$stripeacc.'/';
+    
 		// Ref
-    if (preg_match('/po_/i', $txn->source)){
-    $origin="payouts";
-    } elseif (preg_match('/fee_/i', $txn->source)) {
-    $origin="connect/application_fees";
-    } else {
-    $origin="payments";
-    }
+        if (preg_match('/po_/i', $txn->source)){
+            $origin="payouts";
+        } elseif (preg_match('/fee_/i', $txn->source)) {
+            $origin="connect/application_fees";
+        } else {
+            $origin="payments";
+        }
 
 		$url='https://dashboard.stripe.com/'.$connect.'test/'.$origin.'/'.$txn->source;
-			if ($servicestatus)
-			{
-				$url='https://dashboard.stripe.com/'.$connect.$origin.'/'.$txn->source;
-			}
-    if ($txn->type == 'stripe_fee' || $txn->type == 'reserve_transaction') {
-    print "<td>".$txn->type."</td>";
-    } else print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'object_globe')." " . $txn->source . "</a></td>\n";
+		if ($servicestatus) {
+			$url='https://dashboard.stripe.com/'.$connect.$origin.'/'.$txn->source;
+		}
+        if ($txn->type == 'stripe_fee' || $txn->type == 'reserve_transaction') {
+            print "<td>".$txn->type."</td>";
+        } else {
+            print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'object_globe')." " . $txn->source . "</a></td>\n";
+        }
 
 		// Stripe customer
 		//print "<td>".$charge->customer."</td>\n";