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

Merge pull request #9496 from ptibogxiv/patch-61

Browse Source 
Fix currency display in transaction.php
This commit is contained in:
Laurent Destailleur 2018-09-15 17:07:27 +02:00 committed by GitHub
commit 1749c07ffe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/stripe/transaction.php
View File

@ -99,7 +99,7 @@ if (! $rowid) {
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder); print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
//print_liste_field_titre("StripeCustomerId",$_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("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("DatePayment", $_SERVER["PHP_SELF"], "", "", "", 'align="center"', $sortfield, $sortorder);
print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", 'align="left"', $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); print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
@ -173,28 +173,32 @@ if (! $rowid) {
} }
print "</TD>\n";*/ print "</TD>\n";*/
// Origine // Origine
print "<TD>"; //print "<TD>";
print $FULLTAG; ////if ($charge->metadata->dol_type=="order"){
if ($charge->metadata->source=="order"){ // $object = new Commande($db);
$object = new Commande($db); // $object->fetch($charge->metadata->dol_id);
$object->fetch($charge->metadata->idsource); // print "<A href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->dol_id."'>".img_picto('', 'object_order')." ".$object->ref."</A>";
print "<A href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->idsource."'>".img_picto('', 'object_order')." ".$object->ref."</A>"; //} elseif ($charge->metadata->dol_type=="invoice"){
} elseif ($charge->metadata->source=="invoice"){ // $object = new Facture($db);
$object = new Facture($db); // $object->fetch($charge->metadata->dol_id);
$object->fetch($charge->metadata->idsource); // print "<A href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</A>";
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>\n";
// Date payment // Date payment
print '<TD align="center">' . dol_print_date($txn->created, '%d/%m/%Y %H:%M') . "</TD>\n"; print '<TD align="center">' . dol_print_date($txn->created, '%d/%m/%Y %H:%M') . "</TD>\n";
// Type // Type
print '<TD>' . $txn->type . '</TD>'; print '<TD>' . $txn->type . '</TD>';
// Amount // Amount
print "<TD align=\"right\">" . price(($txn->amount) / 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) . "</TD>"; print "<TD align=\"right\">" . price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . "</TD>";
// Status // Status
print "<TD align='right'>"; 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 '</TD>';
print "</TR>\n"; print "</TR>\n";
} }