From 0af68248660207daa4472cc4165f28a27b0ff231 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Sun, 14 Mar 2021 22:18:34 +0900 Subject: [PATCH] updated taxes helper functions for the new model --- .../AfterActionReportsController.php | 6 +- .../Controllers/Dashboard/AdminController.php | 335 ------------------ .../Dashboard/AdminDashboardController.php | 330 ++++++++++++++++- app/Library/Helpers/TaxesHelper.php | 36 +- routes/web.php | 26 +- 5 files changed, 350 insertions(+), 383 deletions(-) delete mode 100644 app/Http/Controllers/Dashboard/AdminController.php diff --git a/app/Http/Controllers/AfterActionReports/AfterActionReportsController.php b/app/Http/Controllers/AfterActionReports/AfterActionReportsController.php index c96f6f872..7b8e07208 100644 --- a/app/Http/Controllers/AfterActionReports/AfterActionReportsController.php +++ b/app/Http/Controllers/AfterActionReports/AfterActionReportsController.php @@ -75,10 +75,8 @@ class AfterActionReportsController extends Controller $comments = array(); //Grab all the reports - $reports = AfterActionReports::where('created_at', '>=', Carbon::now()->subDays(30)); + $reports = AfterActionReports::where('created_at', '>=', Carbon::now()->subDays(30))->toArray(); - - - return view('reports.user.displayreports'); + return view('reports.user.displayreports')->with('reports', $reports); } } diff --git a/app/Http/Controllers/Dashboard/AdminController.php b/app/Http/Controllers/Dashboard/AdminController.php deleted file mode 100644 index 4cd0c99f2..000000000 --- a/app/Http/Controllers/Dashboard/AdminController.php +++ /dev/null @@ -1,335 +0,0 @@ -middleware('auth'); - $this->middleware('role:Admin'); - } - - public function displayTestAdminDashboard() { - return view('admin.dashboards.testdashboard'); - } - - 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 2 MONTH) ORDER BY date DESC'); - - return view('admin.dashboards.walletjournal')->with('journal', $journal); - } - - public function displayUsersPaginated() { - //Declare array variables - $user = array(); - $permission = array(); - $userArr = array(); - $permString = null; - - $usersArr = User::orderBy('name', 'asc')->paginate(50); - - foreach($usersArr as $user) { - $user->role = $user->getRole(); - - $permCount = UserPermission::where([ - 'character_id' => $user->character_id, - ])->count(); - - if($permCount > 0) { - $perms = UserPermission::where([ - 'character_id' => $user->character_id, - ])->get('permission')->toArray(); - - foreach($perms as $perm) { - $permString .= $perm['permission'] . ', '; - } - - $user->permission = $permString; - } else { - $user->permission = 'No Permissions'; - } - } - - return view('admin.dashboards.userspaged')->with('usersArr', $usersArr); - } - - public function searchUsers(Request $request) { - //Declare array variables - $user = array(); - $permission = array(); - $userArr = array(); - $permString = null; - - //Validate the input from the form - $this->validate($request, [ - 'parameter' => 'required', - ]); - - $usersArr = User::where('name', 'like', $request->parameter . "%")->paginate(50); - - foreach($usersArr as $user) { - $user->role = $user->getRole(); - - $permCount = UserPermission::where([ - 'character_id' => $user->character_id, - ])->count(); - - if($permCount > 0) { - $perms = UserPermission::where([ - 'character_id' => $user->character_id, - ])->get('permission')->toArray(); - - foreach($perms as $perm) { - $permString .= $perm['permission'] . ', '; - } - - $user->permission = $permString; - } else { - $user->permission = 'No Permissions'; - } - } - - return view('admin.dashboards.users.searched')->with('usersArr', $usersArr); - } - - public function displayAllowedLogins() { - //Declare array variables - $entities = array(); - - /** Entities for allowed logins */ - $legacys = AllowedLogin::where(['login_type' => 'Legacy'])->pluck('entity_name')->toArray(); - $renters = AllowedLogin::where(['login_type' => 'Renter'])->pluck('entity_name')->toArray(); - //Compile a list of entities by their entity_id - foreach($legacys as $legacy) { - $entities[] = $legacy; - } - foreach($renters as $renter) { - $entities[] = $renter; - } - - return view('admin.dashboards.allowed_logins')->with('entities', $entities); - } - - public function displayTaxes() { - //Declare variables needed for displaying items on the page - $months = 3; - $pi = array(); - $industry = array(); - $reprocessing = array(); - $office = array(); - $corpId = 98287666; - $srpActual = array(); - $srpLoss = array(); - - /** Taxes Pane */ - //Declare classes needed for displaying items on the page - $tHelper = new TaxesHelper(); - $srpHelper = new SRPHelper(); - //Get the dates for the tab panes - $dates = $tHelper->GetTimeFrameInMonths($months); - //Get the data for the Taxes Pane - foreach($dates as $date) { - //Get the srp actual pay out for the date range - $srpActual[] = [ - 'date' => $date['start']->toFormattedDateString(), - 'gross' => number_format($srpHelper->GetAllianceSRPActual($date['start'], $date['end']), 2, ".", ","), - ]; - - //Get the srp loss value for the date range - $srpLoss[] = [ - 'date' => $date['start']->toFormattedDateString(), - 'gross' => number_format($srpHelper->GetAllianceSRPLoss($date['start'], $date['end']), 2, ".", ","), - ]; - - //Get the pi taxes for the date range - $pis[] = [ - 'date' => $date['start']->toFormattedDateString(), - 'gross' => number_format($tHelper->GetPIGross($date['start'], $date['end']), 2, ".", ","), - ]; - //Get the industry taxes for the date range - $industrys[] = [ - 'date' => $date['start']->toFormattedDateString(), - 'gross' => number_format($tHelper->GetIndustryGross($date['start'], $date['end']), 2, ".", ","), - ]; - //Get the reprocessing taxes for the date range - $reprocessings[] = [ - 'date' => $date['start']->toFormattedDateString(), - 'gross' => number_format($tHelper->GetReprocessingGross($date['start'], $date['end']), 2, ".", ","), - ]; - //Get the office taxes for the date range - $offices[] = [ - 'date' => $date['start']->toFormattedDateString(), - 'gross' => number_format($tHelper->GetOfficeGross($date['start'], $date['end']), 2, ".", ","), - ]; - //Get the market taxes for the date range - $markets[] = [ - 'date' => $date['start']->toFormattedDateString(), - 'gross' => number_format($tHelper->GetAllianceMarketGross($date['start'], $date['end']), 2, ".", ","), - ]; - //Get the jump gate taxes for the date range - $jumpgates[] = [ - 'date' => $date['start']->toFormattedDateString(), - 'gross' => number_format($tHelper->GetJumpGateGross($date['start'], $date['end']), 2, ".", ","), - ]; - } - - return view('admin.dashboards.taxes')->with('pis', $pis) - ->with('industrys', $industrys) - ->with('offices', $offices) - ->with('markets', $markets) - ->with('jumpgates', $jumpgates) - ->with('reprocessings', $reprocessings) - ->with('srpActual', $srpActual) - ->with('srpLoss', $srpLoss); - } - - public function displayModifyUser(Request $request) { - $permissions = array(); - - $name = $request->user; - - //Get the user information from the name - $user = User::where(['name' => $name])->first(); - - $perms = AvailableUserPermission::all(); - foreach($perms as $p) { - $permissions[$p->permission] = $p->permission; - } - - $roles = AvailableUserRole::all(); - - $role = $user->getRole(); - - //Pass the user information to the page for hidden text entries - return view('admin.user.modify')->with('user', $user) - ->with('permissions', $permissions) - ->with('role', $role) - ->with('roles', $roles); - } - - public function modifyRole(Request $request) { - $this->validate($request, [ - 'user' => 'required', - 'role' => 'required|role!=None', - ]); - - UserRole::where(['character_id' => $user])->update([ - 'role' => $request->role, - ]); - - return redirect('/admin/dashboard/users')->with('success', "User: " . $user . " has been modified to a new role: " . $request->role . "."); - } - - public function addPermission(Request $request) { - //Get the user and permission from the form - $character = $request->user; - $permission = $request->permission; - - //Check to see if the character already has the permission - $check = UserPermission::where(['character_id' => $character, 'permission' => $permission])->get(['permission']); - - if(!isset($check[0]->permission)) { - $perm = new UserPermission; - $perm->character_id = $character; - $perm->permission = $permission; - $perm->save(); - - return redirect('/admin/dashboard/users')->with('success', 'User udpated!'); - } else { - return redirect('/admin/dashboard/users')->with('error', 'User not updated or already has the permission.'); - } - } - - public function removeUser(Request $request) { - //Get the user from the form to delete - $user = $request->user; - - //Get the user data from the table - $data = User::where(['name' => $user])->get(); - - //Delete the user's ESI Scopes - DB::table('EsiScopes')->where(['character_id' => $data[0]->character_id])->delete(); - - //Delete the user's ESI Token - DB::table('EsiTokens')->where(['character_id' => $data[0]->character_id])->delete(); - - //Delete the user's role from the roles table - DB::table('user_roles')->where(['character_id' => $data[0]->character_id])->delete(); - - //Delete the user from the user table - DB::table('users')->where(['character_id' => $data[0]->character_id])->delete(); - - return redirect('/admin/dashboard/users')->with('success', 'User deleted from the site.'); - } - - public function addAllowedLogin(Request $request) { - //Set the parameters to validate the form - $this->validate($request, [ - 'allowedEntityId' => 'required', - 'allowedEntityType' => 'required', - 'allowedEntityName' => 'required', - 'allowedLoginType' => 'required', - ]); - - //Check to see if the entity exists in the database already - $found = AllowedLogin::where([ - 'entity_type' => $request->allowedentityType, - 'entity_name' => $request->allowedEntityName, - ])->count(); - if($found != 0) { - AllowedLogin::where([ - 'entity_type' => $request->allowedEntityType, - 'entity_name' => $request->allowedEntityName, - ])->update([ - 'entity_id' => $request->allowedEntityId, - 'entity_type' => $request->allowedEntityType, - 'entity_name' => $request->allowedEntityName, - 'login_type' => $request->allowedLoginType, - ]); - } else { - $login = new AllowedLogin; - $login->entity_id = $request->allowedEntityId; - $login->entity_name = $request->allowedEntityName; - $login->entity_type = $request->allowedEntityType; - $login->login_type = $request->allowedLoginType; - $login->save(); - } - - return redirect('/admin/dashboard')->with('success', 'Entity added to allowed login list.'); - } - - public function removeAllowedLogin(Request $request) { - //Set the parameters to validate the form - $this->validate($request, [ - 'removeAllowedLogin' => 'required', - ]); - - AllowedLogin::where([ - 'entity_name' => $request->removeAllowedLogin, - ])->delete(); - - return redirect('/admin/dashboard')->with('success', 'Entity removed from allowed login list.'); - } - -} diff --git a/app/Http/Controllers/Dashboard/AdminDashboardController.php b/app/Http/Controllers/Dashboard/AdminDashboardController.php index 84170a539..698c706a3 100644 --- a/app/Http/Controllers/Dashboard/AdminDashboardController.php +++ b/app/Http/Controllers/Dashboard/AdminDashboardController.php @@ -15,7 +15,12 @@ use App\Library\Helpers\LookupHelper; use App\Library\Helpers\SRPHelper; //Models - +use App\Models\User\User; +use App\Models\User\UserRole; +use App\Models\User\UserPermission; +use App\Models\User\AvailableUserPermission; +use App\Models\User\AvailableUserRole; +use App\Models\Admin\AllowedLogin; class AdminDashboardController extends Controller { @@ -27,7 +32,7 @@ class AdminDashboardController extends Controller public function __construct() { $this->middleware('auth'); - $this->middleware('role:User'); + $this->middleware('role:Admin'); } /** @@ -43,4 +48,325 @@ class AdminDashboardController extends Controller return view('admin.dashboards.dashboard'); } + + /** + * Display users in a paginated format + */ + public function displayUsersPaginated() { + //Declare array variables + $user = array(); + $permission = array(); + $userArr = array(); + $permString = null; + + $usersArr = User::orderBy('name', 'asc')->paginate(50); + + foreach($usersArr as $user) { + $user->role = $user->getRole(); + + $permCount = UserPermission::where([ + 'character_id' => $user->character_id, + ])->count(); + + if($permCount > 0) { + $perms = UserPermission::where([ + 'character_id' => $user->character_id, + ])->get('permission')->toArray(); + + foreach($perms as $perm) { + $permString .= $perm['permission'] . ', '; + } + + $user->permission = $permString; + } else { + $user->permission = 'No Permissions'; + } + } + + return view('admin.dashboards.userspaged')->with('usersArr', $usersArr); + } + + /** + * Search users for a specific user + */ + public function searchUsers(Request $request) { + //Declare array variables + $user = array(); + $permission = array(); + $userArr = array(); + $permString = null; + + //Validate the input from the form + $this->validate($request, [ + 'parameter' => 'required', + ]); + + $usersArr = User::where('name', 'like', $request->parameter . "%")->paginate(50); + + foreach($usersArr as $user) { + $user->role = $user->getRole(); + + $permCount = UserPermission::where([ + 'character_id' => $user->character_id, + ])->count(); + + if($permCount > 0) { + $perms = UserPermission::where([ + 'character_id' => $user->character_id, + ])->get('permission')->toArray(); + + foreach($perms as $perm) { + $permString .= $perm['permission'] . ', '; + } + + $user->permission = $permString; + } else { + $user->permission = 'No Permissions'; + } + } + + return view('admin.dashboards.users.searched')->with('usersArr', $usersArr); + } + + /** + * Display the allowed logins + */ + public function displayAllowedLogins() { + //Declare array variables + $entities = array(); + + /** Entities for allowed logins */ + $legacys = AllowedLogin::where(['login_type' => 'Legacy'])->pluck('entity_name')->toArray(); + $renters = AllowedLogin::where(['login_type' => 'Renter'])->pluck('entity_name')->toArray(); + //Compile a list of entities by their entity_id + foreach($legacys as $legacy) { + $entities[] = $legacy; + } + foreach($renters as $renter) { + $entities[] = $renter; + } + + return view('admin.dashboards.allowed_logins')->with('entities', $entities); + } + + /** + * Display the taxes for the alliance + * + */ + public function displayTaxes() { + //Declare variables needed for displaying items on the page + $months = 3; + $pi = array(); + $industry = array(); + $reprocessing = array(); + $office = array(); + $corpId = 98287666; + $srpActual = array(); + $srpLoss = array(); + + /** Taxes Pane */ + //Declare classes needed for displaying items on the page + $tHelper = new TaxesHelper(); + $srpHelper = new SRPHelper(); + //Get the dates for the tab panes + $dates = $tHelper->GetTimeFrameInMonths($months); + + //Get the data for the Taxes Pane + foreach($dates as $date) { + //Get the srp actual pay out for the date range + $srpActual[] = [ + 'date' => $date['start']->toFormattedDateString(), + 'gross' => number_format($srpHelper->GetAllianceSRPActual($date['start'], $date['end']), 2, ".", ","), + ]; + + //Get the srp loss value for the date range + $srpLoss[] = [ + 'date' => $date['start']->toFormattedDateString(), + 'gross' => number_format($srpHelper->GetAllianceSRPLoss($date['start'], $date['end']), 2, ".", ","), + ]; + + //Get the pi taxes for the date range + $pis[] = [ + 'date' => $date['start']->toFormattedDateString(), + 'gross' => number_format($tHelper->GetPIGross($date['start'], $date['end']), 2, ".", ","), + ]; + //Get the industry taxes for the date range + $industrys[] = [ + 'date' => $date['start']->toFormattedDateString(), + 'gross' => number_format($tHelper->GetIndustryGross($date['start'], $date['end']), 2, ".", ","), + ]; + //Get the reprocessing taxes for the date range + $reprocessings[] = [ + 'date' => $date['start']->toFormattedDateString(), + 'gross' => number_format($tHelper->GetReprocessingGross($date['start'], $date['end']), 2, ".", ","), + ]; + //Get the office taxes for the date range + $offices[] = [ + 'date' => $date['start']->toFormattedDateString(), + 'gross' => number_format($tHelper->GetOfficeGross($date['start'], $date['end']), 2, ".", ","), + ]; + //Get the market taxes for the date range + $markets[] = [ + 'date' => $date['start']->toFormattedDateString(), + 'gross' => number_format($tHelper->GetAllianceMarketGross($date['start'], $date['end']), 2, ".", ","), + ]; + //Get the jump gate taxes for the date range + $jumpgates[] = [ + 'date' => $date['start']->toFormattedDateString(), + 'gross' => number_format($tHelper->GetJumpGateGross($date['start'], $date['end']), 2, ".", ","), + ]; + } + + return view('admin.dashboards.taxes')->with('pis', $pis) + ->with('industrys', $industrys) + ->with('offices', $offices) + ->with('markets', $markets) + ->with('jumpgates', $jumpgates) + ->with('reprocessings', $reprocessings) + ->with('srpActual', $srpActual) + ->with('srpLoss', $srpLoss); + } + + /** + * Display the modify user form + */ + public function displayModifyUser(Request $request) { + $permissions = array(); + + $name = $request->user; + + //Get the user information from the name + $user = User::where(['name' => $name])->first(); + + $perms = AvailableUserPermission::all(); + foreach($perms as $p) { + $permissions[$p->permission] = $p->permission; + } + + $roles = AvailableUserRole::all(); + + $role = $user->getRole(); + + //Pass the user information to the page for hidden text entries + return view('admin.user.modify')->with('user', $user) + ->with('permissions', $permissions) + ->with('role', $role) + ->with('roles', $roles); + } + + /** + * Modify a user's role + */ + public function modifyRole(Request $request) { + $this->validate($request, [ + 'user' => 'required', + 'role' => 'required|role!=None', + ]); + + UserRole::where(['character_id' => $user])->update([ + 'role' => $request->role, + ]); + + return redirect('/admin/dashboard/users')->with('success', "User: " . $user . " has been modified to a new role: " . $request->role . "."); + } + + public function addPermission(Request $request) { + //Get the user and permission from the form + $character = $request->user; + $permission = $request->permission; + + //Check to see if the character already has the permission + $check = UserPermission::where(['character_id' => $character, 'permission' => $permission])->get(['permission']); + + if(!isset($check[0]->permission)) { + $perm = new UserPermission; + $perm->character_id = $character; + $perm->permission = $permission; + $perm->save(); + + return redirect('/admin/dashboard/users')->with('success', 'User udpated!'); + } else { + return redirect('/admin/dashboard/users')->with('error', 'User not updated or already has the permission.'); + } + } + + /** + * Delete a user to reset their permissions + */ + public function removeUser(Request $request) { + //Get the user from the form to delete + $user = $request->user; + + //Get the user data from the table + $data = User::where(['name' => $user])->get(); + + //Delete the user's ESI Scopes + DB::table('EsiScopes')->where(['character_id' => $data[0]->character_id])->delete(); + + //Delete the user's ESI Token + DB::table('EsiTokens')->where(['character_id' => $data[0]->character_id])->delete(); + + //Delete the user's role from the roles table + DB::table('user_roles')->where(['character_id' => $data[0]->character_id])->delete(); + + //Delete the user from the user table + DB::table('users')->where(['character_id' => $data[0]->character_id])->delete(); + + return redirect('/admin/dashboard/users')->with('success', 'User deleted from the site.'); + } + + /** + * Add an entity to the allowed login table + */ + public function addAllowedLogin(Request $request) { + //Set the parameters to validate the form + $this->validate($request, [ + 'allowedEntityId' => 'required', + 'allowedEntityType' => 'required', + 'allowedEntityName' => 'required', + 'allowedLoginType' => 'required', + ]); + + //Check to see if the entity exists in the database already + $found = AllowedLogin::where([ + 'entity_type' => $request->allowedentityType, + 'entity_name' => $request->allowedEntityName, + ])->count(); + if($found != 0) { + AllowedLogin::where([ + 'entity_type' => $request->allowedEntityType, + 'entity_name' => $request->allowedEntityName, + ])->update([ + 'entity_id' => $request->allowedEntityId, + 'entity_type' => $request->allowedEntityType, + 'entity_name' => $request->allowedEntityName, + 'login_type' => $request->allowedLoginType, + ]); + } else { + $login = new AllowedLogin; + $login->entity_id = $request->allowedEntityId; + $login->entity_name = $request->allowedEntityName; + $login->entity_type = $request->allowedEntityType; + $login->login_type = $request->allowedLoginType; + $login->save(); + } + + return redirect('/admin/dashboard')->with('success', 'Entity added to allowed login list.'); + } + + /** + * Remove an entity from the allowed login table + */ + public function removeAllowedLogin(Request $request) { + //Set the parameters to validate the form + $this->validate($request, [ + 'removeAllowedLogin' => 'required', + ]); + + AllowedLogin::where([ + 'entity_name' => $request->removeAllowedLogin, + ])->delete(); + + return redirect('/admin/dashboard')->with('success', 'Entity removed from allowed login list.'); + } } diff --git a/app/Library/Helpers/TaxesHelper.php b/app/Library/Helpers/TaxesHelper.php index 9fa599df2..8a97de6f6 100644 --- a/app/Library/Helpers/TaxesHelper.php +++ b/app/Library/Helpers/TaxesHelper.php @@ -9,15 +9,7 @@ use Carbon\Carbon; use App\Models\User\User; use App\Models\User\UserRole; use App\Models\User\UserPermission; - -use App\Models\Finances\ReprocessingTaxJournal; -use App\Models\Finances\StructureIndustryTaxJournal; -use App\Models\Finances\PlanetProductionTaxJournal; -use App\Models\Finances\OfficeFeesJournal; -use App\Models\Finances\JumpBridgeJournal; -use App\Models\Finances\PISaleJournal; -use App\Models\Finances\AllianceMarketJournal; -use App\Models\SRP\SRPShip; +use App\Models\Finances\AllianceWalletJournal; class TaxesHelper { @@ -36,7 +28,7 @@ class TaxesHelper { public function GetAllianceMarketGross($start, $end) { $revenue = 0.00; - $revenue = AllianceMarketJournal::where([ + $revenue = AllianceWalletJournal::where([ 'second_party_id' => '98287666', 'ref_type' => 'brokers_fee', ])->whereBetween('date', [$start, $end]) @@ -48,7 +40,7 @@ class TaxesHelper { public function GetJumpGateGross($start, $end) { $revenue = 0.00; - $revenue = JumpBridgeJournal::where([ + $revenue = AllianceWalletJournal::where([ 'ref_type' => 'structure_gate_jump', 'second_party_id' => '98287666', ])->whereBetween('date', [$start, $end]) @@ -60,7 +52,7 @@ class TaxesHelper { public function GetIndustryGross($start, $end) { $revenue = 0.00; - $revenue = StructureIndustryTaxJournal::where([ + $revenue = AllianceWalletJournal::where([ 'ref_type' => 'industry_job_tax', 'second_party_id' => '98287666', ])->whereBetween('date', [$start, $end]) @@ -72,7 +64,7 @@ class TaxesHelper { public function GetReprocessingGross($start, $end) { $revenue = 0.00; - $revenue = ReprocessingTaxJournal::where([ + $revenue = AllianceWalletJournal::where([ 'ref_type' => 'reprocessing_tax', 'second_party_id' => '98287666', ])->whereBetween('date', [$start, $end]) @@ -86,14 +78,14 @@ class TaxesHelper { $revenueExport = 0.00; //Get the import revenue from the database - $revenueImport = PlanetProductionTaxJournal::where([ + $revenueImport = AllianceWalletJournal::where([ 'ref_type' => 'planetary_import_tax', 'second_party_id' => '98287666', ])->whereBetween('date', [$start, $end]) ->sum('amount'); //Get the export revenue from the database - $revenueExport = PlanetProductionTaxJournal::where([ + $revenueExport = AllianceWalletJournal::where([ 'ref_type' => 'planetary_export_tax', 'second_party_id' => '98287666', ])->whereBetween('date', [$start, $end]) @@ -109,7 +101,7 @@ class TaxesHelper { public function GetOfficeGross($start, $end) { $revenue = 0.00; - $revenue = OfficeFeesJournal::where([ + $revenue = AllianceWalletJournal::where([ 'ref_type' => 'office_rental_fee', 'second_party_id' => '98287666', ])->whereBetween('date', [$start, $end]) @@ -118,18 +110,6 @@ class TaxesHelper { return $revenue; } - public function GetPiSalesGross($start, $end) { - $revenue = 0.00; - - $grosses = PISaleJournal::whereBetween('date', [$start, $end])->get()->toArray(); - - foreach($grosses as $gross) { - $revenue += ($gross['quantity'] * $gross['unit_price']); - } - - return $revenue; - } - /** * Returns a set of dates from now until the amount of months has passed * diff --git a/routes/web.php b/routes/web.php index 5b761f2ad..70e7fd302 100644 --- a/routes/web.php +++ b/routes/web.php @@ -30,20 +30,18 @@ Route::group(['middleware' => ['auth']], function(){ /** * Admin Controller display pages */ - Route::get('/admin/dashboard/users', 'Dashboard\AdminController@displayUsersPaginated'); - Route::post('/admin/dashboard/users', 'Dashboard\AdminController@searchUsers'); - Route::get('/admin/dashboard/taxes', 'Dashboard\AdminController@displayTaxes'); - Route::get('/admin/dashboard/logins', 'Dashboard\AdminController@displayAllowedLogins'); - Route::post('/admin/add/role', 'Dashboard\AdminController@addRole'); - Route::post('/admin/remove/role', 'Dashboard\AdminController@removeRole'); - Route::post('/admin/add/permission', 'Dashboard\AdminController@addPermission'); - Route::post('/admin/modify/role', 'Dashboard\AdminController@modifyRole'); - Route::post('/admin/remove/user', 'Dashboard\AdminController@removeUser'); - Route::post('/admin/modify/user/display', 'Dashboard\AdminController@displayModifyUser'); - Route::post('/admin/add/allowedlogin', 'Dashboard\AdminController@addAllowedLogin'); - Route::post('/admin/rmoeve/allowedlogin', 'Dashboard\AdminController@removeAllowedLogin'); - Route::get('/admin/dashboard/journal', 'Dashboard\AdminController@showJournalEntries'); - Route::get('/admin/dashboard/test', 'Dashboard\AdminController@displayTestAdminDashboard'); + Route::get('/admin/dashboard/users', 'Dashboard\AdminDasbharodController@displayUsersPaginated'); + Route::post('/admin/dashboard/users', 'Dashboard\AdminDashboardController@searchUsers'); + Route::get('/admin/dashboard/taxes', 'Dashboard\AdminDashboardController@displayTaxes'); + Route::get('/admin/dashboard/logins', 'Dashboard\AdminDashboardController@displayAllowedLogins'); + Route::post('/admin/add/role', 'Dashboard\AdminDashboardController@addRole'); + Route::post('/admin/remove/role', 'Dashboard\AdminDashboardController@removeRole'); + Route::post('/admin/add/permission', 'Dashboard\AdminDashboardController@addPermission'); + Route::post('/admin/modify/role', 'Dashboard\AdminDashboardController@modifyRole'); + Route::post('/admin/remove/user', 'Dashboard\AdminDashboardController@removeUser'); + Route::post('/admin/modify/user/display', 'Dashboard\AdminDashboardController@displayModifyUser'); + Route::post('/admin/add/allowedlogin', 'Dashboard\AdminDashboardController@addAllowedLogin'); + Route::post('/admin/rmoeve/allowedlogin', 'Dashboard\AdminDashboardController@removeAllowedLogin'); Route::get('/admin/dashboard', 'Dashboard\AdminDashboardController@displayAdminDashboard'); /**