cleanup day

This commit is contained in:
2019-02-05 00:34:09 -06:00
parent 3f2d886861
commit 0eb0d7645c
18 changed files with 141 additions and 176 deletions
+2 -2
View File
@@ -77,12 +77,12 @@ class RunCloneSaver extends Command
$mail->recipient_type = 'character';
$mail->save();
SendEveMail::dispatch($mail)->delay(Carbon::now()->addMinutes(2));
SendEveMail::dispatch($mail);
}
private function CloneSaverMail() {
//Setup time frame job has been sent so we don't send too many mails
//Store a new eve mail model for the job to dispatch
$mail = new EveMail;
+4 -4
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,
@@ -6,7 +6,7 @@ use Illuminate\Http\Request;
use App\Library\Finances\JumpBridgeTax;
class JumpBridgeController extends Controller
class FinancesController extends Controller
{
//
}
@@ -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
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;
+4 -3
View File
@@ -15,10 +15,11 @@ use DB;
use GuzzleHttp\Exception\GuzzleException;
use GuzzleHttp\Client;
use App\Models\Config;
use App\Models\Moon\Moon;
use App\Models\Moon\Price;
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;
class MoonCalc {
-36
View File
@@ -1,36 +0,0 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class HelpDeskTicket extends Model
{
//Table Name
protected $table = 'help_desk_tickets';
//Primary Key
public $primaryKey = 'id';
//Timestamps
public $timestamps = true;
/**
* The attributes that are mass assignable
*
* @var array
*/
protected $fillable = [
'ticket_id',
'user_id',
'assigned_id',
'department',
'subject',
'body',
'active',
];
public function response() {
return $this->hasMany('App\Models\HelpDesk\HelpDeskTicketResponse', 'ticket_id');
}
}
@@ -1,28 +0,0 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class HelpDeskTicketResponse extends Model
{
//Table Name
protected $table = 'help_desk_ticket_responses';
//Primary Key
public $primaryKey = 'id';
//Timestamps
public $timestamps = true;
/**
* The attributes that are mass assignable
*
* @var array
*/
protected $fillable = [
'ticket_id',
'assigned_id',
'body',
];
}