From 468cfd8810de5a2f8c3e496683b6bc887873b71f Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Sun, 26 Apr 2020 05:44:15 -0500 Subject: [PATCH] changed a model around --- app/Console/Commands/Moons/MoonMailer.php | 4 ++-- app/Http/Controllers/Moons/MoonLedgerController.php | 2 +- app/Http/Controllers/Moons/MoonsAdminController.php | 8 ++++---- app/Http/Controllers/Moons/MoonsController.php | 2 +- app/Library/Moons/MoonCalc.php | 2 +- app/Models/Moon/RentalMoon.php | 2 +- database/seeds/MoonUpdateSeeder.php | 8 ++++---- database/seeds/OrePricesSeeder.php | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/Console/Commands/Moons/MoonMailer.php b/app/Console/Commands/Moons/MoonMailer.php index e965f3fe4..5f44c92de 100644 --- a/app/Console/Commands/Moons/MoonMailer.php +++ b/app/Console/Commands/Moons/MoonMailer.php @@ -15,7 +15,7 @@ use App\Library\Esi\Esi; use Seat\Eseye\Exceptions\RequestFailedException; //Models -use App\Models\Moon\Moon; +use App\Models\Moon\RentalMoon; use App\Models\MoonRent\MoonRental; use App\Models\Jobs\JobSendEveMail; use App\Models\Mail\SentMail; @@ -174,7 +174,7 @@ class MoonMailerCommand extends Command $today->hour = 0; foreach($rentals as $rental) { - $moon = Moon::where([ + $moon = RentalMoon::where([ 'System' => $rental->System, 'Planet' => $rental->Planet, 'Moon' => $rental->Moon, diff --git a/app/Http/Controllers/Moons/MoonLedgerController.php b/app/Http/Controllers/Moons/MoonLedgerController.php index f1fb16827..03317f944 100644 --- a/app/Http/Controllers/Moons/MoonLedgerController.php +++ b/app/Http/Controllers/Moons/MoonLedgerController.php @@ -19,7 +19,7 @@ use App\Models\Esi\EsiToken; use App\Models\Esi\EsiScope; use App\Models\Lookups\ItemLookup; use App\Models\MoonRent\MoonRental; -use App\Models\Moon\Moon; +use App\Models\Moon\RentalMoon; class MoonLedgerController extends Controller { diff --git a/app/Http/Controllers/Moons/MoonsAdminController.php b/app/Http/Controllers/Moons/MoonsAdminController.php index d34ca6d8c..f9814c8fc 100644 --- a/app/Http/Controllers/Moons/MoonsAdminController.php +++ b/app/Http/Controllers/Moons/MoonsAdminController.php @@ -11,7 +11,7 @@ use Carbon\Carbon; //Models use App\Models\Moon\Config; use App\Models\Moon\ItemComposition; -use App\Models\Moon\Moon; +use App\Models\Moon\RentalMoon; use App\Models\Moon\OrePrice; use App\Models\Moon\Price; use App\Models\MoonRent\MoonRental; @@ -157,7 +157,7 @@ class MoonsAdminController extends Controller //Setup calls to the MoonCalc class $moonCalc = new MoonCalc(); //Get all of the moons from the database - $moons = Moon::orderBy('System', 'asc')->get(); + $moons = RentalMoon::orderBy('System', 'asc')->get(); //Declare the html variable and set it to null $table = array(); //Set carbon dates as needed @@ -304,7 +304,7 @@ class MoonsAdminController extends Controller $spmn = array(); //Get the moons and put in order by System, Planet, then Moon number - $moons = Moon::orderBy('System', 'ASC') + $moons = RentalMoon::orderBy('System', 'ASC') ->orderBy('Planet', 'ASC') ->orderBy('Moon', 'ASC') ->get(); @@ -402,7 +402,7 @@ class MoonsAdminController extends Controller } //Calculate the price of the moon for when it's updated - $moon = Moon::where([ + $moon = RentalMoon::where([ 'System' => $system, 'Planet' => $planet, 'Moon' => $mn, diff --git a/app/Http/Controllers/Moons/MoonsController.php b/app/Http/Controllers/Moons/MoonsController.php index 73c3437e1..1d7d8a669 100644 --- a/app/Http/Controllers/Moons/MoonsController.php +++ b/app/Http/Controllers/Moons/MoonsController.php @@ -12,7 +12,7 @@ use Carbon\Carbon; //Models use App\Models\Moon\Config; use App\Models\Moon\ItemComposition; -use App\Models\Moon\Moon; +use App\Models\Moon\RentalMoon; use App\Models\Moon\OrePrice; use App\Models\Moon\Price; use App\Models\MoonRent\MoonRental; diff --git a/app/Library/Moons/MoonCalc.php b/app/Library/Moons/MoonCalc.php index c07e50943..ac3e03de4 100644 --- a/app/Library/Moons/MoonCalc.php +++ b/app/Library/Moons/MoonCalc.php @@ -16,7 +16,7 @@ use GuzzleHttp\Client; //Models use App\Models\Moon\Config; use App\Models\Moon\ItemComposition; -use App\Models\Moon\Moon; +use App\Models\Moon\RentalMoon; use App\Models\Moon\OrePrice; use App\Models\Moon\MineralPrice; diff --git a/app/Models/Moon/RentalMoon.php b/app/Models/Moon/RentalMoon.php index c08ba3948..c2872ecc5 100644 --- a/app/Models/Moon/RentalMoon.php +++ b/app/Models/Moon/RentalMoon.php @@ -4,7 +4,7 @@ namespace App\Models\Moon; use Illuminate\Database\Eloquent\Model; -class Moon extends Model +class RentalMoon extends Model { // Table Name protected $table = 'RentalMoons'; diff --git a/database/seeds/MoonUpdateSeeder.php b/database/seeds/MoonUpdateSeeder.php index e341ad8b7..bffeb3620 100644 --- a/database/seeds/MoonUpdateSeeder.php +++ b/database/seeds/MoonUpdateSeeder.php @@ -7,7 +7,7 @@ use Illuminate\Http\File; //Models use App\Models\Moon\AllianceMoon; -use App\Models\Moon\Moon; +use App\Models\Moon\RentalMoon; class MoonUpdateSeeder extends Seeder { @@ -138,7 +138,7 @@ class MoonUpdateSeeder extends Seeder foreach($lines as $line) { //If the moon is a rare moon, then either update it or add it. if($this->IsRMoon($line[3], $line[5], $line[7], $line[9])) { - $count = Moon::where([ + $count = RentalMoon::where([ 'System' => $line[0], 'Planet' => $line[1], 'Moon' => $line[2], @@ -147,7 +147,7 @@ class MoonUpdateSeeder extends Seeder if($count == 0) { $region = $this->FindRegion($line[0]); - Moon::insert([ + RentalMoon::insert([ 'Region' => $region, 'System' => $line[0], 'Planet' => $line[1], @@ -168,7 +168,7 @@ class MoonUpdateSeeder extends Seeder $thirdQuantity = round($line[8] * 100); $fourthQuantity = round($line[10] * 100); - Moon::where([ + RentalMoon::where([ 'System' => $line[0], 'Planet' => $line[1], 'Moon' => $line[2], diff --git a/database/seeds/OrePricesSeeder.php b/database/seeds/OrePricesSeeder.php index b4cf365fd..d1b95dd7c 100644 --- a/database/seeds/OrePricesSeeder.php +++ b/database/seeds/OrePricesSeeder.php @@ -6,7 +6,7 @@ use GuzzleHttp\Client; use Carbon\Carbon; use App\Models\Moon\Config; -use App\Models\Moon\Moon; +use App\Models\Moon\RentalMoon; use App\Models\Moon\ItemComposition; use App\Models\Moon\OrePrice; use App\Models\Moon\MineralPrice;