Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into new_branch_21_09…
Browse files Browse the repository at this point in the history
…_2018
  • Loading branch information
grandoc committed Sep 21, 2018
2 parents 9fab0a1 + fab57e1 commit 1690ed8
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions htdocs/stripe/transaction.php
Expand Up @@ -159,10 +159,10 @@
$societestatic->societe_id = $obj->fk_soc;

print '<tr class="oddeven">';

// Ref
if (!empty($stripeacc)) $connect=$stripeacc.'/';

// Ref
if (preg_match('/po_/i', $txn->source)){
$origin="payouts";
Expand All @@ -178,8 +178,8 @@
$url='https://dashboard.stripe.com/'.$connect.$origin.'/'.$txn->source;
}
if ($txn->type == 'stripe_fee' || $txn->type == 'reserve_transaction') {
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";
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";

// Stripe customer
//print "<td>".$charge->customer."</td>\n";
Expand Down Expand Up @@ -216,11 +216,11 @@
// Status
print "<td align='right'>";
if ($txn->status=='available')
{print img_picto($langs->trans("".$txn->status.""),'statut4');}
{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 img_picto($langs->trans("".$txn->status.""),'statut8');}
print '</td>';
print "</tr>\n";
}
Expand Down

0 comments on commit 1690ed8

Please sign in to comment.