Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed dashboard fomatting when using multiple currencies

Browse Source
This commit is contained in:
Hillel Coren 2016-02-03 22:33:29 +02:00
parent 25b8c54355
commit 1f105b456f
1 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
resources/views/dashboard.blade.php
View File

@ -7,18 +7,21 @@
<div class="col-md-4"> <div class="col-md-4">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<img src="{{ asset('images/totalinvoices.png') }}" class="in-image"/> <img src="{{ asset('images/totalinvoices.png') }}"
<div class="in-thin"> class="in-image" style="float:left"/>
{{ trans('texts.total_revenue') }} <div style="overflow:hidden">
</div> <div class="in-thin">
<div class="in-bold"> {{ trans('texts.total_revenue') }}
@if (count($paidToDate)) </div>
@foreach ($paidToDate as $item) <div class="in-bold">
{{ Utils::formatMoney($item->value, $item->currency_id) }}<br/> @if (count($paidToDate))
@endforeach @foreach ($paidToDate as $item)
@else {{ Utils::formatMoney($item->value, $item->currency_id) }}<br/>
{{ Utils::formatMoney(0) }} @endforeach
@endif @else
{{ Utils::formatMoney(0) }}
@endif
</div>
</div> </div>
</div> </div>
</div> </div>
@ -26,18 +29,21 @@
<div class="col-md-4"> <div class="col-md-4">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<img src="{{ asset('images/clients.png') }}" class="in-image"/> <img src="{{ asset('images/clients.png') }}"
<div class="in-thin"> class="in-image" style="float:left"/>
{{ trans('texts.average_invoice') }} <div style="overflow:hidden">
</div> <div class="in-thin">
<div class="in-bold"> {{ trans('texts.average_invoice') }}
@if (count($averageInvoice)) </div>
@foreach ($averageInvoice as $item) <div class="in-bold">
{{ Utils::formatMoney($item->invoice_avg, $item->currency_id) }}<br/> @if (count($averageInvoice))
@endforeach @foreach ($averageInvoice as $item)
@else {{ Utils::formatMoney($item->invoice_avg, $item->currency_id) }}<br/>
{{ Utils::formatMoney(0) }} @endforeach
@endif @else
{{ Utils::formatMoney(0) }}
@endif
</div>
</div> </div>
</div> </div>
</div> </div>
@ -45,18 +51,21 @@
<div class="col-md-4"> <div class="col-md-4">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<img src="{{ asset('images/totalincome.png') }}" class="in-image"/> <img src="{{ asset('images/totalincome.png') }}"
<div class="in-thin"> class="in-image" style="float:left"/>
{{ trans('texts.outstanding') }} <div style="overflow:hidden">
</div> <div class="in-thin">
<div class="in-bold"> {{ trans('texts.outstanding') }}
@if (count($balances)) </div>
@foreach ($balances as $item) <div class="in-bold">
{{ Utils::formatMoney($item->value, $item->currency_id) }}<br/> @if (count($balances))
@endforeach @foreach ($balances as $item)
@else {{ Utils::formatMoney($item->value, $item->currency_id) }}<br/>
{{ Utils::formatMoney(0) }} @endforeach
@endif @else
{{ Utils::formatMoney(0) }}
@endif
</div>
</div> </div>
</div> </div>
</div> </div>