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

Merge pull request #9495 from ptibogxiv/patch-60

Browse Source 
Fix currency display charge.php
This commit is contained in:
Laurent Destailleur 2018-09-15 17:05:44 +02:00 committed by GitHub
commit ef2970a331
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
htdocs/stripe/charge.php
View File

@ -62,14 +62,16 @@ llxHeader('', $langs->trans("StripeChargeList"));
if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha'))) if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha')))
{ {
$service = 'StripeTest'; $service = 'StripeTest';
$servicestatus = '0';
dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning'); dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
} }
else else
{ {
$service = 'StripeLive'; $service = 'StripeLive';
$servicestatus = '1';
} }
$stripeaccount = $stripe->getStripeAccount($service); $stripeacc = $stripe->getStripeAccount($service);
/*if (empty($stripeaccount)) /*if (empty($stripeaccount))
{ {
print $langs->trans('ErrorStripeAccountNotDefined'); print $langs->trans('ErrorStripeAccountNotDefined');
@ -87,7 +89,7 @@ if (!$rowid)
print '<INPUT type="hidden" name="page" value="'.$page.'">'; print '<INPUT type="hidden" name="page" value="'.$page.'">';
$title=$langs->trans("StripeChargeList"); $title=$langs->trans("StripeChargeList");
$title.=($stripeaccount?' (Stripe connection with Stripe OAuth Connect account '.$stripeaccount.')':' (Stripe connection with keys from Stripe module setup)'); $title.=($stripeacc?' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')':' (Stripe connection with keys from Stripe module setup)');
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
@ -107,9 +109,9 @@ if (!$rowid)
print "</TR>\n"; print "</TR>\n";
if ($stripeaccount) if ($stripeacc)
{ {
$list=\Stripe\Charge::all(array("limit" => $limit), array("stripe_account" => $stripeaccount)); $list=\Stripe\Charge::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
} }
else else
{ {
@ -147,15 +149,28 @@ if (!$rowid)
} }
print '<TR class="oddeven">'; print '<TR class="oddeven">';
if (! empty($conf->stripe->enabled) && !empty($stripeacc)) $connect=$stripeacc.'/';
// Ref // Ref
$url='https://dashboard.stripe.com/test/payments/'.$charge->id; $url='https://dashboard.stripe.com/'.$connect.'test/payments/'.$charge->id;
if ($servicestatus) if ($servicestatus)
{ {
$url='https://dashboard.stripe.com/payments/'.$charge->id; $url='https://dashboard.stripe.com/'.$connect.'payments/'.$charge->id;
} }
print "<TD><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'object_globe')." ".$charge->id."</a></TD>\n"; 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>";
if (! empty($conf->stripe->enabled) && !empty($stripeacc)) $connect=$stripeacc.'/';
$url='https://dashboard.stripe.com/'.$connect.'test/customers/'.$charge->customer;
if ($servicestatus)
{
$url='https://dashboard.stripe.com/'.$connect.'customers/'.$charge->customer;
}
print ' <a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe'), 'object_globe').' '.$charge->customer.'</a>';
print "</TD>\n";
// Link // Link
print "<TD>"; print "<TD>";
if ($societestatic->id > 0) if ($societestatic->id > 0)
@ -198,7 +213,7 @@ if (!$rowid)
} }
print '</TD>'; print '</TD>';
// Amount // Amount
print "<TD align=\"right\">".price(($charge->amount-$charge->amount_refunded)/100)."</TD>"; print "<TD align=\"right\">".price(($charge->amount-$charge->amount_refunded)/100, 0, '', 1, - 1, - 1, strtoupper($charge->currency))."</TD>";
// Status // Status
print '<TD align="right">'; print '<TD align="right">';
if ($charge->refunded=='1'){ if ($charge->refunded=='1'){