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

Minor Fixes and Cleanup

Browse Source
This commit is contained in:
Jeramy Simpson 2015-03-27 11:09:13 +10:00
parent 8ed675ebe1
commit d787b566e0
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/AppController.php
View File

@ -38,9 +38,9 @@ class AppController extends BaseController
public function doSetup() public function doSetup()
{ {
// if (Utils::isNinja() || Utils::isDatabaseSetup()) { if (Utils::isNinja() || Utils::isDatabaseSetup()) {
// return Redirect::to('/'); return Redirect::to('/');
// } }
$valid = false; $valid = false;
$test = Input::get('test'); $test = Input::get('test');

3
app/Http/Controllers/DashboardController.php
View File

@ -10,9 +10,6 @@ class DashboardController extends BaseController
{ {
public function index() public function index()
{ {
// For Debuging : Need to remove when it is not longer needed.
// Auth::login(\App\Models\User::first());
// dd(Auth::user());
// 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,

4
app/Http/Controllers/UserController.php
View File

@ -3,9 +3,11 @@
use Auth; use Auth;
use Confide; use Confide;
use Config; use Config;
use Event;
use Input; use Input;
use View; use View;
use Redirect; use Redirect;
use Session;
use App\Http\Requests; use App\Http\Requests;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
@ -257,6 +259,8 @@ class UserController extends BaseController
*/ */
public function login() public function login()
{ {
// Auth::login(\App\Models\User::first()); // Debug purposes only
// Show Login | If not already logged in // Show Login | If not already logged in
if (!Confide::user()) { if (!Confide::user()) {
return View::make(Config::get('confide.login_form')); return View::make(Config::get('confide.login_form'));

2
app/Http/Middleware/Authenticate.php
View File

@ -40,7 +40,7 @@ class Authenticate {
} }
else else
{ {
return redirect()->guest('auth/login'); return redirect()->guest('/login');
} }
} }

2
app/Http/routes.php
View File

@ -70,7 +70,7 @@ if (\App\Libraries\Utils::isNinja()) {
Route::get('/demo', 'AccountController@demo'); Route::get('/demo', 'AccountController@demo');
} }
Route::group(array('before' => 'auth'), function() { Route::group(array('middleware' => 'auth'), function() {
Route::get('dashboard', 'DashboardController@index'); Route::get('dashboard', 'DashboardController@index');
Route::get('view_archive/{entity_type}/{visible}', 'AccountController@setTrashVisible'); Route::get('view_archive/{entity_type}/{visible}', 'AccountController@setTrashVisible');
Route::get('hide_message', 'HomeController@hideMessage'); Route::get('hide_message', 'HomeController@hideMessage');