diff --git a/app/Http/Controllers/Dashboard/AdminController.php b/app/Http/Controllers/Dashboard/AdminController.php index 4b5fa8dd3..74d757f33 100644 --- a/app/Http/Controllers/Dashboard/AdminController.php +++ b/app/Http/Controllers/Dashboard/AdminController.php @@ -23,6 +23,15 @@ class AdminController extends Controller $this->middleware('role:Admin'); } + public function showJournalEntries() { + $dateInit = Carbon::now(); + $date = $dateInit->subDays(30); + + $journal = DB::select('SELECT amount,reason,description,date FROM `player_donation_journal` WHERE corporation_id=98287666 AND date >= DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 1 MONTH) ORDER BY date DESC'); + + return view('admin.dashboards.walletjournal')->with('journal', $journal); + } + public function displayUsersPaginated() { //Declare array variables $user = array(); diff --git a/app/Http/Controllers/Moons/MoonsAdminController.php b/app/Http/Controllers/Moons/MoonsAdminController.php index 008e84495..23b1dab18 100644 --- a/app/Http/Controllers/Moons/MoonsAdminController.php +++ b/app/Http/Controllers/Moons/MoonsAdminController.php @@ -362,15 +362,4 @@ class MoonsAdminController extends Controller //Redirect to the update moon page return redirect('/moons/admin/updatemoon')->with('success', 'Moon Updated'); } - - public function showJournalEntries() { - $this->middleware('role:Admin'); - - $dateInit = Carbon::now(); - $date = $dateInit->subDays(30); - - $journal = DB::select('SELECT amount,reason,description,date FROM `player_donation_journal` WHERE corporation_id=98287666 AND date >= DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 1 MONTH) ORDER BY date DESC'); - - return view('moons.admin.moonjournal')->with('journal', $journal); - } } diff --git a/resources/views/moons/admin/moonjournal.blade.php b/resources/views/admin/dashboards/walletjournal.blade.php similarity index 100% rename from resources/views/moons/admin/moonjournal.blade.php rename to resources/views/admin/dashboards/walletjournal.blade.php diff --git a/routes/web.php b/routes/web.php index 377b5a316..a2d18fe6b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -35,6 +35,7 @@ Route::group(['middleware' => ['auth']], function(){ Route::post('/admin/modify/user', 'Dashboard\AdminController@modifyUser'); Route::post('/admin/add/allowedlogin', 'Dashboard\AdminController@addAllowedLogin'); Route::post('/admin/rmoeve/allowedlogin', 'Dashboard\AdminController@removeAllowedLogin'); + Route::get('/admin/dashboard/journal', 'Dashboard\AdminController@showJournalEntries'); /** * AJAX Test pages @@ -119,7 +120,6 @@ Route::group(['middleware' => ['auth']], function(){ Route::get('/moons/admin/display', 'Moons\MoonsAdminController@displayMoonsAdmin'); Route::get('/moons/admin/updatemoon', 'Moons\MoonsAdminController@updateMoon'); Route::post('/moons/admin/updatemoon', 'Moons\MoonsAdminController@storeUpdateMoon'); - Route::get('/moons/admin/journal', 'Moons\MoonsAdminController@showJournalEntries'); Route::post('/moons/admin/display', 'Moons\MoonsAdminController@storeMoonRemoval'); /**