diff --git a/app/Http/Controllers/Blacklist/BlacklistController.php b/app/Http/Controllers/Blacklist/BlacklistController.php index 6267881c4..e41ffe22c 100644 --- a/app/Http/Controllers/Blacklist/BlacklistController.php +++ b/app/Http/Controllers/Blacklist/BlacklistController.php @@ -146,9 +146,9 @@ class BlacklistController extends Controller ]); $blacklist = DB::table('alliance_blacklist')->where('entity_name', 'like', $request->parameter . "%") - ->orWhere('entity_type', 'like', $request->parameter . "%") - ->orWhere('alts', 'like', $request->parameter . "%") - ->orWhere('reason', 'like', $request->parameter . "%") + ->orWhere('entity_type', 'like', "%" . $request->parameter . "%") + ->orWhere('alts', 'like', "%" . $request->parameter . "%") + ->orWhere('reason', 'like', "%" . $request->parameter . "%") ->orderBy('entity_name', 'asc') ->paginate(50); diff --git a/app/Http/Controllers/Dashboard/AdminDashboardController.php b/app/Http/Controllers/Dashboard/AdminDashboardController.php index 9d2bcc4ae..5adb4a37f 100644 --- a/app/Http/Controllers/Dashboard/AdminDashboardController.php +++ b/app/Http/Controllers/Dashboard/AdminDashboardController.php @@ -42,9 +42,15 @@ class AdminDashboardController extends Controller } //Declare variables we will need + $tHelper = new TaxesHelper(); + $srpHelper = new SRPHelper(); $days = 30; + $months = 1; $lava = new Lavacharts; + //Get the dates for the information being requested + $dates = $tHelper->GetTimeFrameInMonths($months); + //Get the data for the sov expenses for a graph //Setup the charts diff --git a/resources/views/moons/user/requestrental.blade.php b/resources/views/moons/user/requestrental.blade.php index 485e13527..d41b059d2 100644 --- a/resources/views/moons/user/requestrental.blade.php +++ b/resources/views/moons/user/requestrental.blade.php @@ -6,7 +6,7 @@