Fix #222 showing incorrect amount on dashboard

app/controllers/DashboardController.php

@@ -8,7 +8,6 @@ class DashboardController extends \BaseController
         $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,
                         COUNT(DISTINCT clients.id) active_clients');
-
         $metrics = DB::table('accounts')
             ->select($select)
             ->leftJoin('clients', 'accounts.id', '=', 'clients.account_id')
@@ -21,19 +20,30 @@ class DashboardController extends \BaseController
             ->groupBy('accounts.id')
             ->first();
 
-        $select = DB::raw('SUM(clients.paid_to_date) as value, AVG(invoices.amount) as invoice_avg,
+        $select = DB::raw('SUM(clients.paid_to_date) as value, clients.currency_id as currency_id');
-                             clients.currency_id as currency_id');
+        $paidToDate = DB::table('accounts')
-
-        $totalIncomes = DB::table('accounts')
             ->select($select)
             ->leftJoin('clients', 'accounts.id', '=', 'clients.account_id')
-            ->leftJoin('invoices', 'clients.id', '=', 'invoices.client_id')
             ->where('accounts.id', '=', Auth::user()->account_id)
             ->where('clients.is_deleted', '=', false)
             ->groupBy('accounts.id')
             ->groupBy(DB::raw('CASE WHEN clients.currency_id IS NULL THEN CASE WHEN accounts.currency_id IS NULL THEN 1 ELSE accounts.currency_id END ELSE clients.currency_id END'))
             ->get();
 
+        $select = DB::raw('AVG(invoices.amount) as invoice_avg, clients.currency_id as currency_id');
+        $averageInvoice = DB::table('accounts')
+            ->select($select)
+            ->leftJoin('clients', 'accounts.id', '=', 'clients.account_id')
+            ->leftJoin('invoices', 'clients.id', '=', 'invoices.client_id')
+            ->where('accounts.id', '=', Auth::user()->account_id)
+            ->where('clients.is_deleted', '=', false)
+            ->where('invoices.is_deleted', '=', false)
+            ->groupBy('accounts.id')
+            ->groupBy(DB::raw('CASE WHEN clients.currency_id IS NULL THEN CASE WHEN accounts.currency_id IS NULL THEN 1 ELSE accounts.currency_id END ELSE clients.currency_id END'))
+            ->get();
+
+
+
         $activities = Activity::where('activities.account_id', '=', Auth::user()->account_id)
                 ->orderBy('created_at', 'desc')->take(6)->get();
 
@@ -54,7 +64,8 @@ class DashboardController extends \BaseController
                   ->orderBy('due_date', 'asc')->take(6)->get();
 
         $data = [
-      'totalIncomes' => $totalIncomes,
+      'paidToDate' => $paidToDate,
+      'averageInvoice' => $averageInvoice,
       'billedClients' => $metrics ? $metrics->billed_clients : 0,
       'invoicesSent' => $metrics ? $metrics->invoices_sent : 0,
       'activeClients' => $metrics ? $metrics->active_clients : 0,

app/views/dashboard.blade.php

@@ -8,8 +8,8 @@
       <div class="panel-body">
         <img src="{{ asset('images/totalincome.png') }}" class="in-image"/>  
         <div class="in-bold">
-          @foreach ($totalIncomes as $totalIncome)
+          @foreach ($paidToDate as $item)
-            {{ Utils::formatMoney($totalIncome->value, $totalIncome->currency_id); }}<br/>
+            {{ Utils::formatMoney($item->value, $item->currency_id); }}<br/>
           @endforeach
         </div>
         <div class="in-thin">
@@ -142,8 +142,8 @@
     <div class="average-invoice">  
       <div><b>{{ trans('texts.average_invoice') }}</b></div>
       <div class="in-bold in-white" style="font-size:42px">
-        @foreach ($totalIncomes as $totalIncome)
+        @foreach ($averageInvoice as $item)
-          {{ Utils::formatMoney($totalIncome->invoice_avg, $totalIncome->currency_id); }}<br/>
+          {{ Utils::formatMoney($item->invoice_avg, $item->currency_id); }}<br/>
         @endforeach
       </div>
     </div>