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

better display/link of informations

Browse Source
This commit is contained in:
ptibogxiv 2018-09-12 11:28:43 +02:00 committed by GitHub
parent 26a8b5ba4d
commit 30c393d2da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
htdocs/stripe/charge.php
View File

@ -96,7 +96,7 @@ if (!$rowid)
print '<TR class="liste_titre">'; print '<TR class="liste_titre">';
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("Customer",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder); print_liste_field_titre("Customer",$_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);
@ -120,20 +120,20 @@ if (!$rowid)
foreach ($list->data as $charge) foreach ($list->data as $charge)
{ {
// The metadata FULLTAG is defined by the online payment page // The metadata FULLTAG is defined by the online payment page
$FULLTAG=$charge->metadata->FULLTAG; $FULLTAG=$charge->description;
// Save into $tmparray all metadata // Save into $tmparray all metadata
$tmparray = dolExplodeIntoArray($FULLTAG,'.','='); $tmparray = dolExplodeIntoArray($FULLTAG,'.','=');
// Load origin object according to metadata // Load origin object according to metadata
if (! empty($tmparray['CUS'])) if (! empty($tmparray['CUS']) && $charge->metadata->dol_thirdparty_id)
{ {
$societestatic->fetch($tmparray['CUS']); $societestatic->fetch($charge->metadata->dol_thirdparty_id);
} }
else else
{ {
$societestatic->id = 0; $societestatic->id = 0;
} }
if (! empty($tmparray['MEM'])) if (! empty($tmparray['MEM']) && $charge->metadata->dol_thirdparty_id)
{ {
$memberstatic->fetch($tmparray['MEM']); $memberstatic->fetch($tmparray['MEM']);
} }
@ -144,32 +144,40 @@ if (!$rowid)
print '<TR class="oddeven">'; print '<TR class="oddeven">';
// Ref // Ref
print "<TD><A href='".DOL_URL_ROOT."/stripe/charge.php?rowid=".$charge->id."'>".$charge->id."</A></TD>\n"; $url='https://dashboard.stripe.com/test/payments/'.$charge->id;
if ($servicestatus)
{
$url='https://dashboard.stripe.com/payments/'.$charge->id;
}
print "<TD><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'object_globe')." ".$charge->id."</a></TD>\n";
// Stripe customer // Stripe customer
print "<TD>".$charge->customer."</TD>\n"; //print "<TD>".$charge->customer."</TD>\n";
// Link // Link
print "<TD>"; print "<TD>";
if ($societestatic->id > 0) if ($societestatic->id > 0)
{ {
print $societestatic->getNomUrl(1); print $societestatic->getNomUrl(1);
} }
if ($memberstatic->id > 0) elseif ($memberstatic->id > 0)
{ {
print $memberstatic->getNomUrl(1); print $memberstatic->getNomUrl(1);
} } else print $charge->customer;
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->idsource); $object->fetch($charge->metadata->dol_id);
print "<A href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->idsource."'>".img_picto('', 'object_order')." ".$object->ref."</A>"; if ($object->id > 0) {
} elseif ($charge->metadata->source=="invoice"){ print "<A href='".DOL_URL_ROOT."/commande/card.php?id=".$object->id."'>".img_picto('', 'object_order')." ".$object->ref."</A>";
} else print $FULLTAG;
} elseif ($charge->metadata->dol_type=="invoice"){
$object = new Facture($db); $object = new Facture($db);
$object->fetch($charge->metadata->idsource); $object->fetch($charge->metadata->dol_id);
print "<A href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->idsource."'>".img_picto('', 'object_invoice')." ".$object->ref."</A>"; if ($object->id > 0) {
} print "<A href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</A>";
} else print $FULLTAG;
} else print $FULLTAG;
print "</TD>\n"; print "</TD>\n";
// Date payment // Date payment
print '<TD align="center">'.dol_print_date($charge->created,'%d/%m/%Y %H:%M')."</TD>\n"; print '<TD align="center">'.dol_print_date($charge->created,'%d/%m/%Y %H:%M')."</TD>\n";