drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup day

Browse Source
This commit is contained in:
drkthunder02
2019-02-05 00:34:09 -06:00
parent 3f2d886861
commit 0eb0d7645c
18 changed files with 141 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,10 +41,10 @@ class DashboardController extends Controller
* @return \Illuminate\Http\Response
*/
public function profile() {
$scopes = DB::table('EsiScopes')->where('character_id', Auth()->user()->character_id)->get();
$permissions = DB::table('user_permissions')->where('charcter_id', Auth()->user()->character_id)->get();
$roles = DB::table('user_roles')->where('character_id', Auth()->user()->character_id)->get();
$scopes = EsiScope::where('character_id', Auth()->user()->character_id)->get();
$permissions = UserPermission::where('character_id', Auth()->user()->characer_id)->get();
$roles = UserRole::where('character_id', Auth()->user()->character_id)->get();
$data = [
'scopes' => $scopes,
'permissions' => $permissions,

2
app/Http/Controllers/JumpBridgeController.php → app/Http/Controllers/FinancesController.php
View File

@@ -6,7 +6,7 @@ use Illuminate\Http\Request;
use App\Library\Finances\JumpBridgeTax;
class JumpBridgeController extends Controller
class FinancesController extends Controller
{
//
}

8
app/Http/Controllers/MoonsAdminController.php
View File

@@ -8,7 +8,11 @@ use Auth;
use DB;
use Carbon\Carbon;
use App\Models\Moon\Config;
use App\Models\Moon\ItemComposition;
use App\Models\Moon\Moon;
use App\Models\Moon\OrePrice;
use App\Models\Moon\Price;
use App\Models\Finances\PlayerDonationJournal;
use App\Library\Moons\MoonCalc;
@@ -25,8 +29,8 @@ class MoonsAdminController extends Controller
$dateInit = Carbon::now();
$date = $dateInit->subDays(30);
$journal = DB::select('SELECT amount,reason,description,date FROM `PlayerDonationJournals` WHERE corporation_id=98287666 AND date >= DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 1 MONTH) ORDER BY date DESC');
$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.moonjournal')->with('journal', $journal);
}

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

@@ -6,7 +6,11 @@ use Auth;
use DB;
use Illuminate\Http\Request;
use App\Models\Moon\Config;
use App\Models\Moon\ItemComposition;
use App\Models\Moon\Moon;
use App\Models\Moon\OrePrice;
use App\Models\Moon\Price;
use App\Library\Moons\MoonCalc;