diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index a9f0d9aed0b..6154a8a7c3a 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -1307,19 +1307,21 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
$balance = \Stripe\Balance::retrieve(array("stripe_account" => $stripesupplieracc));
print '
'."\n";
print '';
- print '| '.$langs->trans('Status').' | ';
- print ''.$langs->trans('Amount').' | ';
print ''.$langs->trans('Currency').' | ';
+ print ''.$langs->trans('Available').' | ';
+ print ''.$langs->trans('Pending').' | ';
+ print ''.$langs->trans('Total').' | ';
print '
';
+ $currencybalance = array();
if (is_array($balance->available) && count($balance->available))
{
foreach ($balance->available as $cpt)
{
$arrayzerounitcurrency=array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
- if (! in_array($cpt->currency, $arrayzerounitcurrency)) $amount = $cpt->amount / 100;
- else $amount = $cpt->amount;
- print '| '.$langs->trans("Available").' | '.price($amount, 0, '', 1, - 1, - 1, strtoupper($cpt->currency)).' | '.$langs->trans("Currency".strtoupper($cpt->currency)).' |
';
+ if (! in_array($cpt->currency, $arrayzerounitcurrency)) $currencybalance[$cpt->currency]->available=$cpt->amount / 100;
+ else $currencybalance[$cpt->currency]->available=$cpt->amount;
+ $currencybalance[$cpt->currency]->currency=$cpt->currency;
}
}
@@ -1328,11 +1330,19 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
foreach ($balance->pending as $cpt)
{
$arrayzerounitcurrency=array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
- if (! in_array($cpt->currency, $arrayzerounitcurrency)) $amount = $cpt->amount / 100;
- else $amount = $cpt->amount;
- print '| '.$langs->trans("Pending").' | '.price($amount, 0, '', 1, - 1, - 1, strtoupper($cpt->currency)).' | '.$langs->trans("Currency".strtoupper($cpt->currency)).' |
';
+ if (! in_array($cpt->currency, $arrayzerounitcurrency)) $currencybalance[$cpt->currency]->pending=$currencybalance[$cpt->currency]->available+$cpt->amount / 100;
+ else $currencybalance[$cpt->currency]->pending=$currencybalance[$cpt->currency]->available+$cpt->amount;
}
}
+
+ if (is_array($currencybalance))
+ {
+ foreach ($currencybalance as $cpt)
+ {
+ print '| '.$langs->trans("Currency".strtoupper($cpt->currency)).' | '.price($cpt->available, 0, '', 1, - 1, - 1, strtoupper($cpt->currency)).' | '.price($cpt->pending, 0, '', 1, - 1, - 1, strtoupper($cpt->currency)).' | '.price($cpt->available+$cpt->pending, 0, '', 1, - 1, - 1, strtoupper($cpt->currency)).' |
';
+ }
+ }
+
print '
';
print '