From 2ed0a72db552c35e80a423f317fefe261761f82b Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Thu, 13 Sep 2018 11:10:58 +0200
Subject: [PATCH] Fix currency display in transaction.php

---
 htdocs/stripe/transaction.php | 47 +++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 415ed32a62a..f9784cfbb65 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -99,7 +99,7 @@ if (! $rowid) {
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
 	//print_liste_field_titre("StripeCustomerId",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
 	//print_liste_field_titre("CustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
-	print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+	//print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
 	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", 'align="left"', $sortfield, $sortorder);
 	print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
@@ -118,14 +118,14 @@ if (! $rowid) {
 		$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit));
 	}
 
-	foreach ($txn->data as $txn)
+	foreach ($txn->data as $txn) 
 	{
 		//$charge = $txn;
 		//var_dump($txn);
-
+		
 		// The metadata FULLTAG is defined by the online payment page
 		/*$FULLTAG=$charge->metadata->FULLTAG;
-
+		
 		// Save into $tmparray all metadata
 		$tmparray = dolExplodeIntoArray($FULLTAG,'.','=');
 		// Load origin object according to metadata
@@ -145,7 +145,7 @@ if (! $rowid) {
 		{
 			$memberstatic->id = 0;
 		}*/
-
+		
 		$societestatic->fetch($charge->metadata->idcustomer);
 		$societestatic->id = $charge->metadata->idcustomer;
 		$societestatic->lastname = $obj->lastname;
@@ -156,7 +156,7 @@ if (! $rowid) {
 		$societestatic->societe_id = $obj->fk_soc;
 
 		print '<TR class="oddeven">';
-
+		
 		// Ref
 		print "<TD><A href='" . DOL_URL_ROOT . "/stripe/transaction.php?rowid=" . $txn->source . "'>" . $txn->source . "</A></TD>\n";
 		// Stripe customer
@@ -173,28 +173,32 @@ if (! $rowid) {
 		}
 		print "</TD>\n";*/
 		// Origine
-		print "<TD>";
-		print $FULLTAG;
-		if ($charge->metadata->source=="order"){
-			$object = new Commande($db);
-			$object->fetch($charge->metadata->idsource);
-			print "<A href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->idsource."'>".img_picto('', 'object_order')." ".$object->ref."</A>";
-		} elseif ($charge->metadata->source=="invoice"){
-			$object = new Facture($db);
-			$object->fetch($charge->metadata->idsource);
-			print "<A href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->idsource."'>".img_picto('', 'object_invoice')." ".$object->ref."</A>";
-		}
-		print "</TD>\n";
+		//print "<TD>";
+		////if ($charge->metadata->dol_type=="order"){
+		//	$object = new Commande($db);
+		//	$object->fetch($charge->metadata->dol_id);
+		//	print "<A href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->dol_id."'>".img_picto('', 'object_order')." ".$object->ref."</A>";
+		//} elseif ($charge->metadata->dol_type=="invoice"){
+		//	$object = new Facture($db);
+		//	$object->fetch($charge->metadata->dol_id);
+		//	print "<A href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</A>";
+		//}
+		//print "</TD>\n";
 		// Date payment
 		print '<TD align="center">' . dol_print_date($txn->created, '%d/%m/%Y %H:%M') . "</TD>\n";
 		// Type
 		print '<TD>' . $txn->type . '</TD>';
 		// Amount
-		print "<TD align=\"right\">" . price(($txn->amount) / 100) . "</TD>";
-		print "<TD align=\"right\">" . price(($txn->fee) / 100) . "</TD>";
+		print "<TD align=\"right\">" . price(($txn->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . "</TD>";
+		print "<TD align=\"right\">" . price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . "</TD>";
 		// Status
 		print "<TD align='right'>";
-		print $txn->status;
+if ($txn->status=='available')
+ {print img_picto($langs->trans("".$txn->status.""),'statut4');} 
+elseif ($txn->status=='pending')
+ {print img_picto($langs->trans("".$txn->status.""),'statut7');}
+elseif ($txn->status=='failed')
+ {print img_picto($langs->trans("".$txn->status.""),'statut8');}        
 		print '</TD>';
 		print "</TR>\n";
 	}
@@ -203,6 +207,5 @@ if (! $rowid) {
 	print '</FORM>';
 } else {}
 
-// End of page
 llxFooter();
 $db->close();