From 26a8b5ba4d25e8f7c4504a4535db4f85de8dd308 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Tue, 11 Sep 2018 12:30:24 +0200 Subject: [PATCH 1/4] Update status display in charge list --- htdocs/stripe/charge.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php index 1464c9c2e6b..a97f989a37d 100644 --- a/htdocs/stripe/charge.php +++ b/htdocs/stripe/charge.php @@ -190,14 +190,16 @@ if (!$rowid) // Status print ''; if ($charge->refunded=='1'){ - print $langs->trans("refunded"); + print img_picto($langs->trans("refunded"),'statut6'); } elseif ($charge->paid=='1'){ - print $langs->trans("".$charge->status.""); + + print img_picto($langs->trans("".$charge->status.""),'statut4'); + } else { $label="Message: ".$charge->failure_message."
"; $label.="Réseau: ".$charge->outcome->network_status."
"; $label.="Statut: ".$langs->trans("".$charge->outcome->seller_message.""); - print $form->textwithpicto($langs->trans("".$charge->status.""),$label,1); + print $form->textwithpicto(img_picto($langs->trans("".$charge->status.""),'statut8'),$label,1); } print "\n"; From 30c393d2da3b6147963d9b3b2a9a1be4423e7a1b Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Wed, 12 Sep 2018 11:28:43 +0200 Subject: [PATCH 2/4] better display/link of informations --- htdocs/stripe/charge.php | 42 ++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php index a97f989a37d..b82d8d65a78 100644 --- a/htdocs/stripe/charge.php +++ b/htdocs/stripe/charge.php @@ -96,7 +96,7 @@ if (!$rowid) print ''; 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("Origin",$_SERVER["PHP_SELF"],"","","","",$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) { // The metadata FULLTAG is defined by the online payment page - $FULLTAG=$charge->metadata->FULLTAG; + $FULLTAG=$charge->description; // Save into $tmparray all metadata $tmparray = dolExplodeIntoArray($FULLTAG,'.','='); // 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 { $societestatic->id = 0; } - if (! empty($tmparray['MEM'])) + if (! empty($tmparray['MEM']) && $charge->metadata->dol_thirdparty_id) { $memberstatic->fetch($tmparray['MEM']); } @@ -144,32 +144,40 @@ if (!$rowid) print ''; // Ref - print "".$charge->id."\n"; + $url='https://dashboard.stripe.com/test/payments/'.$charge->id; + if ($servicestatus) + { + $url='https://dashboard.stripe.com/payments/'.$charge->id; + } + print "".img_picto($langs->trans('ShowInStripe'), 'object_globe')." ".$charge->id."\n"; // Stripe customer - print "".$charge->customer."\n"; + //print "".$charge->customer."\n"; // Link print ""; if ($societestatic->id > 0) { print $societestatic->getNomUrl(1); } - if ($memberstatic->id > 0) + elseif ($memberstatic->id > 0) { print $memberstatic->getNomUrl(1); - } + } else print $charge->customer; print "\n"; // Origine print ""; - print $FULLTAG; - if ($charge->metadata->source=="order"){ + if ($charge->metadata->dol_type=="order"){ $object = new Commande($db); - $object->fetch($charge->metadata->idsource); - print "".img_picto('', 'object_order')." ".$object->ref.""; - } elseif ($charge->metadata->source=="invoice"){ + $object->fetch($charge->metadata->dol_id); + if ($object->id > 0) { + print "".img_picto('', 'object_order')." ".$object->ref.""; + } else print $FULLTAG; + } elseif ($charge->metadata->dol_type=="invoice"){ $object = new Facture($db); - $object->fetch($charge->metadata->idsource); - print "".img_picto('', 'object_invoice')." ".$object->ref.""; - } + $object->fetch($charge->metadata->dol_id); + if ($object->id > 0) { + print "".img_picto('', 'object_invoice')." ".$object->ref.""; + } else print $FULLTAG; + } else print $FULLTAG; print "\n"; // Date payment print ''.dol_print_date($charge->created,'%d/%m/%Y %H:%M')."\n"; From 9efa3816c3171518e1907a6db791cb6319630440 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 12 Sep 2018 18:47:00 +0200 Subject: [PATCH 3/4] Update charge.php --- htdocs/stripe/charge.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php index b82d8d65a78..d50259c0d9f 100644 --- a/htdocs/stripe/charge.php +++ b/htdocs/stripe/charge.php @@ -120,12 +120,16 @@ if (!$rowid) foreach ($list->data as $charge) { // The metadata FULLTAG is defined by the online payment page - $FULLTAG=$charge->description; + $FULLTAG=$charge->metadata->FULLTAG; // Save into $tmparray all metadata $tmparray = dolExplodeIntoArray($FULLTAG,'.','='); // Load origin object according to metadata - if (! empty($tmparray['CUS']) && $charge->metadata->dol_thirdparty_id) + if (! empty($tmparray['CUS']) && $tmparray['CUS'] > 0) + { + $societestatic->fetch($tmparray['CUS']); + } + elseif (! empty($charge->metadata->dol_thirdparty_id) && $charge->metadata->dol_thirdparty_id > 0) { $societestatic->fetch($charge->metadata->dol_thirdparty_id); } @@ -133,7 +137,7 @@ if (!$rowid) { $societestatic->id = 0; } - if (! empty($tmparray['MEM']) && $charge->metadata->dol_thirdparty_id) + if (! empty($tmparray['MEM']) && $tmparray['MEM'] > 0) { $memberstatic->fetch($tmparray['MEM']); } @@ -142,9 +146,9 @@ if (!$rowid) $memberstatic->id = 0; } - print ''; - // Ref - $url='https://dashboard.stripe.com/test/payments/'.$charge->id; + print ''; + // Ref + $url='https://dashboard.stripe.com/test/payments/'.$charge->id; if ($servicestatus) { $url='https://dashboard.stripe.com/payments/'.$charge->id; From 71e4378bd2788da0ec635fd5283f42e4bdeee76c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 12 Sep 2018 18:51:03 +0200 Subject: [PATCH 4/4] Update charge.php Charges can be done on different stripe account, even if doli thirdparty is same (if thirdparty has changed it stripe account). So keeping it in list seems usefull. --- htdocs/stripe/charge.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php index d50259c0d9f..2bcb31f225f 100644 --- a/htdocs/stripe/charge.php +++ b/htdocs/stripe/charge.php @@ -96,7 +96,7 @@ if (!$rowid) print ''; 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("Origin",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder); print_liste_field_titre("DatePayment",$_SERVER["PHP_SELF"],"","","",'align="center"',$sortfield,$sortorder); @@ -155,7 +155,7 @@ if (!$rowid) } print "".img_picto($langs->trans('ShowInStripe'), 'object_globe')." ".$charge->id."\n"; // Stripe customer - //print "".$charge->customer."\n"; + print "".$charge->customer."\n"; // Link print ""; if ($societestatic->id > 0) @@ -165,7 +165,7 @@ if (!$rowid) elseif ($memberstatic->id > 0) { print $memberstatic->getNomUrl(1); - } else print $charge->customer; + } print "\n"; // Origine print "";