diff --git a/app/Console/Commands/RentalMoons/AllianceRentalMoonInvoiceCreationCommand.php b/app/Console/Commands/RentalMoons/AllianceRentalMoonInvoiceCreationCommand.php new file mode 100644 index 000000000..2d57b6100 --- /dev/null +++ b/app/Console/Commands/RentalMoons/AllianceRentalMoonInvoiceCreationCommand.php @@ -0,0 +1,63 @@ +SetStartStatus(); + + //Send the job for the invoice creation command + SendMoonRentalPaymentReminderJob::dispatch()->delay(Carbon::now()->addSeconds(10)); + + //Update the paid state for the moons + UpdateMoonRentalPaidState::dispatch()->delay(Carbon::now()->addSeconds(600)); + + //Set the task as stopped + $task->SetStopStatus(); + } +} diff --git a/app/Console/Commands/RentalMoons/AllianceRentalMoonUpdatePricingCommand.php b/app/Console/Commands/RentalMoons/AllianceRentalMoonUpdatePricingCommand.php new file mode 100644 index 000000000..959970bae --- /dev/null +++ b/app/Console/Commands/RentalMoons/AllianceRentalMoonUpdatePricingCommand.php @@ -0,0 +1,56 @@ +SetStartStatus(); + + UpdateMoonRentalPrice::dispatch(); + + $task->SetStopStatus(); + } +} diff --git a/app/Console/Commands/RentalMoons/AllianceRentalMoonsCommand.php b/app/Console/Commands/RentalMoons/AllianceRentalMoonsCommand.php deleted file mode 100644 index 6940efd51..000000000 --- a/app/Console/Commands/RentalMoons/AllianceRentalMoonsCommand.php +++ /dev/null @@ -1,42 +0,0 @@ -timestamps(); } - //Transfer the existing data into the table - //Drop the older tables Schema::dropIfExists('moon_rents'); Schema::dropIfExists('RentalMoons'); diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 9100fc2b2..8521239e0 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -12,6 +12,6 @@ class DatabaseSeeder extends Seeder */ public function run() { - $this->call(SolarSystemSeeder::class); + //$this->call(SolarSystemSeeder::class); } } diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index fad7d4c73..1971fbeed 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -6,6 +6,7 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( + 'AllianceRentalMoonSeed' => $baseDir . '/database/seeds/AllianceRentalMoonSeed.php', 'App\\Console\\Commands\\Assets\\GetAssetsCommand' => $baseDir . '/app/Console/Commands/Assets/GetAssets.php', 'App\\Console\\Commands\\Corps\\GetCorpsCommand' => $baseDir . '/app/Console/Commands/Corps/GetCorps.php', 'App\\Console\\Commands\\Data\\CleanStaleDataCommand' => $baseDir . '/app/Console/Commands/Data/CleanStaleDataCommand.php', @@ -17,12 +18,10 @@ return array( 'App\\Console\\Commands\\Finances\\SovBillsCommand' => $baseDir . '/app/Console/Commands/Finances/SovBills.php', 'App\\Console\\Commands\\Flex\\FlexStructureCommand' => $baseDir . '/app/Console/Commands/Flex/FlexStructureCommand.php', 'App\\Console\\Commands\\GetMarketDataCommand' => $baseDir . '/app/Console/Commands/Market/GetMarketDataCommand.php', - 'App\\Console\\Commands\\Moons\\MoonMailerCommand' => $baseDir . '/app/Console/Commands/Moons/MoonMailer.php', 'App\\Console\\Commands\\Moons\\MoonsUpdateCommand' => $baseDir . '/app/Console/Commands/Moons/MoonsUpdateCommand.php', - 'App\\Console\\Commands\\Moons\\RentalMoonCommand' => $baseDir . '/app/Console/Commands/Moons/RentalMoonCommand.php', - 'App\\Console\\Commands\\Moons\\UpdateMoonPriceCommand' => $baseDir . '/app/Console/Commands/Moons/UpdateMoonPricing.php', 'App\\Console\\Commands\\PublicContractsCommand' => $baseDir . '/app/Console/Commands/PublicContracts/PublicContractsCommand.php', 'App\\Console\\Commands\\PurgeMarketDataCommand' => $baseDir . '/app/Console/Commands/Market/PurgeMarketDataCommand.php', + 'App\\Console\\Commands\\RentalMoons\\AllianceRentalMoonInvoiceCreationCommand' => $baseDir . '/app/Console/Commands/RentalMoons/AllianceRentalMoonInvoiceCreationCommand.php', 'App\\Console\\Commands\\Structures\\GetStructuresCommand' => $baseDir . '/app/Console/Commands/Structures/GetStructures.php', 'App\\Console\\Commands\\Users\\PurgeUsers' => $baseDir . '/app/Console/Commands/Users/PurgeUsers.php', 'App\\Console\\Commands\\Wormholes\\PurgeWormholes' => $baseDir . '/app/Console/Commands/Wormholes/PurgeWormholes.php', @@ -70,13 +69,13 @@ return array( 'App\\Jobs\\Commands\\Market\\GetMarketRegionOrderJob' => $baseDir . '/app/Jobs/Commands/Market/GetMarketRegionOrderJob.php', 'App\\Jobs\\Commands\\Moons\\FetchMoonLedgerJob' => $baseDir . '/app/Jobs/Commands/Moons/FetchMoonLedgerJob.php', 'App\\Jobs\\Commands\\Moons\\FetchMoonObserverJob' => $baseDir . '/app/Jobs/Commands/Moons/FetchMoonObserverJob.php', - 'App\\Jobs\\Commands\\Moons\\MoonRentalInvoiceCreate' => $baseDir . '/app/Jobs/Commands/Moons/MoonRentalInvoiceCreate.php', - 'App\\Jobs\\Commands\\Moons\\MoonRentalInvoiceVerify' => $baseDir . '/app/Jobs/Commands/Moons/MoonRentalInvoiceVerify.php', 'App\\Jobs\\Commands\\Moons\\PurgeMoonLedgerJob' => $baseDir . '/app/Jobs/Commands/Moons/PurgeMoonLedgerJob.php', 'App\\Jobs\\Commands\\PublicContracts\\GetPublicContractItemsJob' => $baseDir . '/app/Jobs/Commands/PublicContracts/GetPublicContractItemsJob.php', 'App\\Jobs\\Commands\\PublicContracts\\GetPublicContractsJob' => $baseDir . '/app/Jobs/Commands/PublicContracts/GetPublicContractsJob.php', 'App\\Jobs\\Commands\\PublicContracts\\PurgePublicContracts' => $baseDir . '/app/Jobs/Commands/PublicContracts/PurgePublicContracts.php', - 'App\\Jobs\\MoonRentalUpdate' => $baseDir . '/app/Jobs/Commands/Moons/MoonRentalUpdate.php', + 'App\\Jobs\\Commands\\RentalMoons\\SendMoonRentalPaymentReminderJob' => $baseDir . '/app/Jobs/Commands/RentalMoons/SendMoonRentalPaymentReminderJob.php', + 'App\\Jobs\\Commands\\RentalMoons\\UpdateMoonRentalPaidState' => $baseDir . '/app/Jobs/Commands/RentalMoons/UpdateMoonRentalPaidState.php', + 'App\\Jobs\\Commands\\RentalMoons\\UpdateMoonRentalPrice' => $baseDir . '/app/Jobs/Commands/RentalMoons/UpdateMoonRentalPrice.php', 'App\\Jobs\\ProcessAssetsJob' => $baseDir . '/app/Jobs/ProcessAssetsJob.php', 'App\\Jobs\\ProcessSendEveMailJob' => $baseDir . '/app/Jobs/ProcessSendEveMailJob.php', 'App\\Jobs\\ProcessStructureJob' => $baseDir . '/app/Jobs/ProcessStructureJob.php', @@ -142,6 +141,7 @@ return array( 'App\\Models\\MoonRent\\MoonRental' => $baseDir . '/app/Models/MoonRentals/MoonRental.php', 'App\\Models\\MoonRent\\MoonRentalInvoice' => $baseDir . '/app/Models/MoonRentals/MoonRentalInvoice.php', 'App\\Models\\MoonRent\\MoonRentalPayment' => $baseDir . '/app/Models/MoonRentals/MoonRentalPayment.php', + 'App\\Models\\MoonRentals\\AllianceRentalMoon' => $baseDir . '/app/Models/MoonRentals/AllianceRentalMoon.php', 'App\\Models\\Moon\\AllianceMoon' => $baseDir . '/app/Models/Moon/AllianceMoon.php', 'App\\Models\\Moon\\AllianceMoonRequest' => $baseDir . '/app/Models/Moon/AllianceMoonRequest.php', 'App\\Models\\Moon\\Config' => $baseDir . '/app/Models/Moon/Config.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index ee70a5395..73087e3a5 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -475,6 +475,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 ); public static $classMap = array ( + 'AllianceRentalMoonSeed' => __DIR__ . '/../..' . '/database/seeds/AllianceRentalMoonSeed.php', 'App\\Console\\Commands\\Assets\\GetAssetsCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Assets/GetAssets.php', 'App\\Console\\Commands\\Corps\\GetCorpsCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Corps/GetCorps.php', 'App\\Console\\Commands\\Data\\CleanStaleDataCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Data/CleanStaleDataCommand.php', @@ -486,12 +487,10 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Console\\Commands\\Finances\\SovBillsCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Finances/SovBills.php', 'App\\Console\\Commands\\Flex\\FlexStructureCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Flex/FlexStructureCommand.php', 'App\\Console\\Commands\\GetMarketDataCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Market/GetMarketDataCommand.php', - 'App\\Console\\Commands\\Moons\\MoonMailerCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Moons/MoonMailer.php', 'App\\Console\\Commands\\Moons\\MoonsUpdateCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Moons/MoonsUpdateCommand.php', - 'App\\Console\\Commands\\Moons\\RentalMoonCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Moons/RentalMoonCommand.php', - 'App\\Console\\Commands\\Moons\\UpdateMoonPriceCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Moons/UpdateMoonPricing.php', 'App\\Console\\Commands\\PublicContractsCommand' => __DIR__ . '/../..' . '/app/Console/Commands/PublicContracts/PublicContractsCommand.php', 'App\\Console\\Commands\\PurgeMarketDataCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Market/PurgeMarketDataCommand.php', + 'App\\Console\\Commands\\RentalMoons\\AllianceRentalMoonInvoiceCreationCommand' => __DIR__ . '/../..' . '/app/Console/Commands/RentalMoons/AllianceRentalMoonInvoiceCreationCommand.php', 'App\\Console\\Commands\\Structures\\GetStructuresCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Structures/GetStructures.php', 'App\\Console\\Commands\\Users\\PurgeUsers' => __DIR__ . '/../..' . '/app/Console/Commands/Users/PurgeUsers.php', 'App\\Console\\Commands\\Wormholes\\PurgeWormholes' => __DIR__ . '/../..' . '/app/Console/Commands/Wormholes/PurgeWormholes.php', @@ -539,13 +538,13 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Jobs\\Commands\\Market\\GetMarketRegionOrderJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/Market/GetMarketRegionOrderJob.php', 'App\\Jobs\\Commands\\Moons\\FetchMoonLedgerJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/Moons/FetchMoonLedgerJob.php', 'App\\Jobs\\Commands\\Moons\\FetchMoonObserverJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/Moons/FetchMoonObserverJob.php', - 'App\\Jobs\\Commands\\Moons\\MoonRentalInvoiceCreate' => __DIR__ . '/../..' . '/app/Jobs/Commands/Moons/MoonRentalInvoiceCreate.php', - 'App\\Jobs\\Commands\\Moons\\MoonRentalInvoiceVerify' => __DIR__ . '/../..' . '/app/Jobs/Commands/Moons/MoonRentalInvoiceVerify.php', 'App\\Jobs\\Commands\\Moons\\PurgeMoonLedgerJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/Moons/PurgeMoonLedgerJob.php', 'App\\Jobs\\Commands\\PublicContracts\\GetPublicContractItemsJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/PublicContracts/GetPublicContractItemsJob.php', 'App\\Jobs\\Commands\\PublicContracts\\GetPublicContractsJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/PublicContracts/GetPublicContractsJob.php', 'App\\Jobs\\Commands\\PublicContracts\\PurgePublicContracts' => __DIR__ . '/../..' . '/app/Jobs/Commands/PublicContracts/PurgePublicContracts.php', - 'App\\Jobs\\MoonRentalUpdate' => __DIR__ . '/../..' . '/app/Jobs/Commands/Moons/MoonRentalUpdate.php', + 'App\\Jobs\\Commands\\RentalMoons\\SendMoonRentalPaymentReminderJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/RentalMoons/SendMoonRentalPaymentReminderJob.php', + 'App\\Jobs\\Commands\\RentalMoons\\UpdateMoonRentalPaidState' => __DIR__ . '/../..' . '/app/Jobs/Commands/RentalMoons/UpdateMoonRentalPaidState.php', + 'App\\Jobs\\Commands\\RentalMoons\\UpdateMoonRentalPrice' => __DIR__ . '/../..' . '/app/Jobs/Commands/RentalMoons/UpdateMoonRentalPrice.php', 'App\\Jobs\\ProcessAssetsJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessAssetsJob.php', 'App\\Jobs\\ProcessSendEveMailJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessSendEveMailJob.php', 'App\\Jobs\\ProcessStructureJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessStructureJob.php', @@ -611,6 +610,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Models\\MoonRent\\MoonRental' => __DIR__ . '/../..' . '/app/Models/MoonRentals/MoonRental.php', 'App\\Models\\MoonRent\\MoonRentalInvoice' => __DIR__ . '/../..' . '/app/Models/MoonRentals/MoonRentalInvoice.php', 'App\\Models\\MoonRent\\MoonRentalPayment' => __DIR__ . '/../..' . '/app/Models/MoonRentals/MoonRentalPayment.php', + 'App\\Models\\MoonRentals\\AllianceRentalMoon' => __DIR__ . '/../..' . '/app/Models/MoonRentals/AllianceRentalMoon.php', 'App\\Models\\Moon\\AllianceMoon' => __DIR__ . '/../..' . '/app/Models/Moon/AllianceMoon.php', 'App\\Models\\Moon\\AllianceMoonRequest' => __DIR__ . '/../..' . '/app/Models/Moon/AllianceMoonRequest.php', 'App\\Models\\Moon\\Config' => __DIR__ . '/../..' . '/app/Models/Moon/Config.php',