tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #188 from Lykegenes/master

Browse source 
Fixed SQL query on dashboard
This commit is contained in:
Hillel Coren 2014-11-04 11:13:34 +02:00
commit 925f6384e4
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/DashboardController.php
View file

@ -19,7 +19,7 @@ class DashboardController extends \BaseController {
->groupBy('accounts.id')
->first();
$select = DB::raw('SUM(clients.paid_to_date) value');
$select = DB::raw('SUM(clients.paid_to_date) as value');
$totalIncome = DB::table('accounts')
->select($select)
@ -62,4 +62,4 @@ class DashboardController extends \BaseController {
return View::make('dashboard', $data);
}
}
}

2
app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
View file

@ -279,7 +279,7 @@ class ConfideSetupUsersTable extends Migration {
$t->string('last_name')->nullable();
$t->string('email')->nullable();
$t->string('phone')->nullable();
$t->timestamp('last_login');
$t->timestamp('last_login')->nullable();
$t->foreign('client_id')->references('id')->on('clients')->onDelete('cascade');
$t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');;