mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-20 08:21:34 +02:00
Update Average invoice block support multiple currency
This commit is contained in:
parent
087fea1f24
commit
9d6c1d3692
@ -7,8 +7,7 @@ class DashboardController extends \BaseController
|
|||||||
// total_income, billed_clients, invoice_sent and active_clients
|
// total_income, billed_clients, invoice_sent and active_clients
|
||||||
$select = DB::raw('COUNT(DISTINCT CASE WHEN invoices.id IS NOT NULL THEN clients.id ELSE null END) billed_clients,
|
$select = DB::raw('COUNT(DISTINCT CASE WHEN invoices.id IS NOT NULL THEN clients.id ELSE null END) billed_clients,
|
||||||
SUM(CASE WHEN invoices.invoice_status_id >= '.INVOICE_STATUS_SENT.' THEN 1 ELSE 0 END) invoices_sent,
|
SUM(CASE WHEN invoices.invoice_status_id >= '.INVOICE_STATUS_SENT.' THEN 1 ELSE 0 END) invoices_sent,
|
||||||
COUNT(DISTINCT clients.id) active_clients,
|
COUNT(DISTINCT clients.id) active_clients');
|
||||||
AVG(invoices.amount) as invoice_avg');
|
|
||||||
|
|
||||||
$metrics = DB::table('accounts')
|
$metrics = DB::table('accounts')
|
||||||
->select($select)
|
->select($select)
|
||||||
@ -19,11 +18,13 @@ class DashboardController extends \BaseController
|
|||||||
->groupBy('accounts.id')
|
->groupBy('accounts.id')
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
$select = DB::raw('SUM(clients.paid_to_date) as value, clients.currency_id as currency_id');
|
$select = DB::raw('SUM(clients.paid_to_date) as value, AVG(invoices.amount) as invoice_avg,
|
||||||
|
clients.currency_id as currency_id');
|
||||||
|
|
||||||
$totalIncomes = DB::table('accounts')
|
$totalIncomes = DB::table('accounts')
|
||||||
->select($select)
|
->select($select)
|
||||||
->leftJoin('clients', 'accounts.id', '=', 'clients.account_id')
|
->leftJoin('clients', 'accounts.id', '=', 'clients.account_id')
|
||||||
|
->leftJoin('invoices', 'clients.id', '=', 'invoices.client_id')
|
||||||
->where('accounts.id', '=', Auth::user()->account_id)
|
->where('accounts.id', '=', Auth::user()->account_id)
|
||||||
->where('clients.is_deleted', '=', false)
|
->where('clients.is_deleted', '=', false)
|
||||||
->groupBy('accounts.id')
|
->groupBy('accounts.id')
|
||||||
@ -54,7 +55,6 @@ class DashboardController extends \BaseController
|
|||||||
'billedClients' => $metrics ? $metrics->billed_clients : 0,
|
'billedClients' => $metrics ? $metrics->billed_clients : 0,
|
||||||
'invoicesSent' => $metrics ? $metrics->invoices_sent : 0,
|
'invoicesSent' => $metrics ? $metrics->invoices_sent : 0,
|
||||||
'activeClients' => $metrics ? $metrics->active_clients : 0,
|
'activeClients' => $metrics ? $metrics->active_clients : 0,
|
||||||
'invoiceAvg' => Utils::formatMoney(($metrics ? $metrics->invoice_avg : 0), Session::get(SESSION_CURRENCY)),
|
|
||||||
'activities' => $activities,
|
'activities' => $activities,
|
||||||
'pastDue' => $pastDue,
|
'pastDue' => $pastDue,
|
||||||
'upcoming' => $upcoming,
|
'upcoming' => $upcoming,
|
||||||
|
@ -141,7 +141,11 @@
|
|||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<div class="average-invoice">
|
<div class="average-invoice">
|
||||||
<div><b>{{ trans('texts.average_invoice') }}</b></div>
|
<div><b>{{ trans('texts.average_invoice') }}</b></div>
|
||||||
<div class="in-bold in-white" style="font-size:42px">{{ $invoiceAvg }}</div>
|
<div class="in-bold in-white" style="font-size:42px">
|
||||||
|
@foreach ($totalIncomes as $totalIncome)
|
||||||
|
{{ Utils::formatMoney($totalIncome->invoice_avg, $totalIncome->currency_id); }}
|
||||||
|
@endforeach
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user