From 07cc21a113187c85887bdfe9844be9d370697067 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 3 Aug 2019 20:35:53 +0200
Subject: [PATCH 1/3] Fix display payment intent in stripe's charge list

---
 htdocs/stripe/charge.php | 47 +++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index e8823119e30..80c633b0254 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -121,6 +121,31 @@ if (!$rowid)
 	//print $list;
 	foreach ($list->data as $charge)
 	{
+	  if ($charge->refunded=='1'){
+	    	$status = img_picto($langs->trans("refunded"), 'statut6');
+	  } elseif ($charge->paid=='1'){
+        $status = img_picto($langs->trans("".$charge->status.""), 'statut4');
+	  } else {
+	    	$label="Message: ".$charge->failure_message."<br>";
+	    	$label.="Réseau: ".$charge->outcome->network_status."<br>";
+	    	$label.="Statut: ".$langs->trans("".$charge->outcome->seller_message."");
+	    	$status = $form->textwithpicto(img_picto($langs->trans("".$charge->status.""), 'statut8'), $label, 1);
+	  } 
+    
+      if ($charge->payment_method_details->type=='card')
+		{
+		    $type = $langs->trans("card");
+		}
+		elseif ($charge->source->type=='card'){
+		    $type = $langs->trans("card");
+		} elseif ($charge->payment_method_details->type=='three_d_secure'){
+		    $type = $langs->trans("card3DS");
+		}
+  
+    if (! empty($charge->payment_intent)) {
+    $charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent);
+    }
+
 		// The metadata FULLTAG is defined by the online payment page
 		$FULLTAG=$charge->metadata->FULLTAG;
 
@@ -205,31 +230,13 @@ if (!$rowid)
 	    print '<td class="center">'.dol_print_date($charge->created, '%d/%m/%Y %H:%M')."</td>\n";
 	    // Type
 	    print '<td>';
-		if ($charge->source->object=='card')
-		{
-		    print $langs->trans("card");
-		}
-		elseif ($charge->source->type=='card'){
-		    print $langs->trans("card");
-		} elseif ($charge->source->type=='three_d_secure'){
-		    print $langs->trans("card3DS");
-		}
+		print $type;
 	    print '</td>';
 	    // Amount
 	    print '<td class="right">'.price(($charge->amount-$charge->amount_refunded)/100, 0, '', 1, - 1, - 1, strtoupper($charge->currency))."</td>";
 	    // Status
 	    print '<td class="right">';
-	    if ($charge->refunded=='1'){
-	    	print img_picto($langs->trans("refunded"), 'statut6');
-	    } elseif ($charge->paid=='1'){
-
-        print img_picto($langs->trans("".$charge->status.""), 'statut4');
-	    } else {
-	    	$label="Message: ".$charge->failure_message."<br>";
-	    	$label.="Réseau: ".$charge->outcome->network_status."<br>";
-	    	$label.="Statut: ".$langs->trans("".$charge->outcome->seller_message."");
-	    	print $form->textwithpicto(img_picto($langs->trans("".$charge->status.""), 'statut8'), $label, 1);
-	    }
+	    print $status;
 	    print "</td>\n";
 
 	    print "</tr>\n";

From 4633af3f5d84f175dd528d8c452138631172971d Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 3 Aug 2019 21:19:47 +0200
Subject: [PATCH 2/3] Update charge.php

---
 htdocs/stripe/charge.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 80c633b0254..a524a62f6a3 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -130,16 +130,15 @@ if (!$rowid)
 	    	$label.="Réseau: ".$charge->outcome->network_status."<br>";
 	    	$label.="Statut: ".$langs->trans("".$charge->outcome->seller_message."");
 	    	$status = $form->textwithpicto(img_picto($langs->trans("".$charge->status.""), 'statut8'), $label, 1);
-	  } 
+	  }
     
       if ($charge->payment_method_details->type=='card')
 		{
 		    $type = $langs->trans("card");
-		}
-		elseif ($charge->source->type=='card'){
-		    $type = $langs->trans("card");
+		} elseif ($charge->source->type=='card'){
+			$type = $langs->trans("card");
 		} elseif ($charge->payment_method_details->type=='three_d_secure'){
-		    $type = $langs->trans("card3DS");
+			$type = $langs->trans("card3DS");
 		}
   
     if (! empty($charge->payment_intent)) {

From 05ac4eec52c8fe5c585dbc8171ee891e45742e9e Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 6 Aug 2019 00:16:18 +0200
Subject: [PATCH 3/3] Update charge.php

---
 htdocs/stripe/charge.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index a524a62f6a3..9d4bf71c040 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -133,13 +133,13 @@ if (!$rowid)
 	  }
     
       if ($charge->payment_method_details->type=='card')
-		{
+	  {
 		    $type = $langs->trans("card");
-		} elseif ($charge->source->type=='card'){
+	  } elseif ($charge->source->type=='card'){
 			$type = $langs->trans("card");
-		} elseif ($charge->payment_method_details->type=='three_d_secure'){
+	  } elseif ($charge->payment_method_details->type=='three_d_secure'){
 			$type = $langs->trans("card3DS");
-		}
+	  }
   
     if (! empty($charge->payment_intent)) {
     $charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent);