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

Merge remote-tracking branch 'upstream/develop' into new_branch_21_09_2018

Browse Source
This commit is contained in:
Philippe GRAND 2018-09-21 15:06:53 +02:00
commit 1690ed86a7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/stripe/transaction.php
View File

@ -159,10 +159,10 @@ if (! $rowid) {
$societestatic->societe_id = $obj->fk_soc; $societestatic->societe_id = $obj->fk_soc;
print '<tr class="oddeven">'; print '<tr class="oddeven">';
// Ref // Ref
if (!empty($stripeacc)) $connect=$stripeacc.'/'; if (!empty($stripeacc)) $connect=$stripeacc.'/';
// Ref // Ref
if (preg_match('/po_/i', $txn->source)){ if (preg_match('/po_/i', $txn->source)){
$origin="payouts"; $origin="payouts";
@ -178,8 +178,8 @@ if (! $rowid) {
$url='https://dashboard.stripe.com/'.$connect.$origin.'/'.$txn->source; $url='https://dashboard.stripe.com/'.$connect.$origin.'/'.$txn->source;
} }
if ($txn->type == 'stripe_fee' || $txn->type == 'reserve_transaction') { if ($txn->type == 'stripe_fee' || $txn->type == 'reserve_transaction') {
print "<td>".$txn->type."</td>"; print "<td>".$txn->type."</td>";
} else print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'object_globe')." " . $txn->source . "</a></td>\n"; } else print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'object_globe')." " . $txn->source . "</a></td>\n";
// Stripe customer // Stripe customer
//print "<td>".$charge->customer."</td>\n"; //print "<td>".$charge->customer."</td>\n";
@ -216,11 +216,11 @@ if (! $rowid) {
// Status // Status
print "<td align='right'>"; print "<td align='right'>";
if ($txn->status=='available') if ($txn->status=='available')
{print img_picto($langs->trans("".$txn->status.""),'statut4');} {print img_picto($langs->trans("".$txn->status.""),'statut4');}
elseif ($txn->status=='pending') elseif ($txn->status=='pending')
{print img_picto($langs->trans("".$txn->status.""),'statut7');} {print img_picto($langs->trans("".$txn->status.""),'statut7');}
elseif ($txn->status=='failed') elseif ($txn->status=='failed')
{print img_picto($langs->trans("".$txn->status.""),'statut8');} {print img_picto($langs->trans("".$txn->status.""),'statut8');}
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
} }