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

Merge pull request #218 from sanglt/master

Browse Source 
Multiple currency support in dashboard
This commit is contained in:
Hillel Coren 2015-01-22 15:33:04 +02:00
commit 8d13091e86
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/DashboardController.php
View File

@ -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)
@ -22,15 +21,18 @@ class DashboardController extends \BaseController
->groupBy('accounts.id') ->groupBy('accounts.id')
->first(); ->first();
$select = DB::raw('SUM(clients.paid_to_date) as value'); $select = DB::raw('SUM(clients.paid_to_date) as value, AVG(invoices.amount) as invoice_avg,
clients.currency_id as currency_id');
$totalIncome = 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')
->first(); ->groupBy('clients.currency_id')
->get();
$activities = Activity::where('activities.account_id', '=', Auth::user()->account_id) $activities = Activity::where('activities.account_id', '=', Auth::user()->account_id)
->orderBy('created_at', 'desc')->take(6)->get(); ->orderBy('created_at', 'desc')->take(6)->get();
@ -52,11 +54,10 @@ class DashboardController extends \BaseController
->orderBy('due_date', 'asc')->take(6)->get(); ->orderBy('due_date', 'asc')->take(6)->get();
$data = [ $data = [
'totalIncome' => Utils::formatMoney($totalIncome ? $totalIncome->value : 0, Session::get(SESSION_CURRENCY)), 'totalIncomes' => $totalIncomes,
'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,

11
app/views/dashboard.blade.php
View File

@ -8,7 +8,9 @@
<div class="panel-body"> <div class="panel-body">
<img src="{{ asset('images/totalincome.png') }}" class="in-image"/> <img src="{{ asset('images/totalincome.png') }}" class="in-image"/>
<div class="in-bold"> <div class="in-bold">
{{ $totalIncome }} @foreach ($totalIncomes as $totalIncome)
{{ Utils::formatMoney($totalIncome->value, $totalIncome->currency_id); }}
@endforeach
</div> </div>
<div class="in-thin"> <div class="in-thin">
{{ trans('texts.in_total_revenue') }} {{ trans('texts.in_total_revenue') }}
@ -139,10 +141,15 @@
<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>
</div> </div>
@stop @stop