diff --git a/app/Jobs/Commands/RentalMoons/SendMoonRentalPaymentReminderJob.php b/app/Jobs/Commands/RentalMoons/SendMoonRentalPaymentReminderJob.php
index 133fd0b50..3a01b9170 100644
--- a/app/Jobs/Commands/RentalMoons/SendMoonRentalPaymentReminderJob.php
+++ b/app/Jobs/Commands/RentalMoons/SendMoonRentalPaymentReminderJob.php
@@ -98,7 +98,7 @@ class SendMoonRentalPaymentReminderJob implements ShouldQueue
}
//Put the price for the moons
$body .= "The price for next month's rent is " . number_format($cost, 0, ".", ",") . "
";
- $body .= "Rental Payment is due on the 1st of the month should you continue to want to rent the moons.
";
+ $body .= "Rental Payment is due on the 1st of the month. If the rental payment is not remitted to Spatial Forces by the 3rd of the month, the rental claim shall be forfeited.
";
$body .= "Rental Payment should be transferred to Spatial Forces.
";
$body .= "In the description of the payment please put the following transaction identification: " . $transId . "
";
$body .= "
";
diff --git a/database/migrations/2020_08_04_073706_create_eve_mail_template_table.php b/database/migrations/2020_08_04_073706_create_eve_mail_template_table.php
new file mode 100644
index 000000000..c47b2ff09
--- /dev/null
+++ b/database/migrations/2020_08_04_073706_create_eve_mail_template_table.php
@@ -0,0 +1,35 @@
+bigIncrements('id');
+ $table->string('subject');
+ $table->text('body');
+ $table->timestamps();
+ });
+ }
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('eve_mail_template');
+ }
+}
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index ac3b47d30..5453044d0 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -13,6 +13,7 @@ return array(
'App\\Console\\Commands\\Data\\PurgeCorpMoonLedgers' => $baseDir . '/app/Console/Commands/Data/PurgeCorpMoonLedgers.php',
'App\\Console\\Commands\\Eve\\GetEveRegionsCommand' => $baseDir . '/app/Console/Commands/Eve/GetEveRegionsCommand.php',
'App\\Console\\Commands\\Files\\MoonFormatter' => $baseDir . '/app/Console/Commands/Files/MoonFormatter.php',
+ 'App\\Console\\Commands\\Files\\UpdateItemCompositionFromSDECommand' => $baseDir . '/app/Console/Commands/Files/UpdateItemCompositionFromSDECommand.php',
'App\\Console\\Commands\\Finances\\HoldingFinancesCommand' => $baseDir . '/app/Console/Commands/Finances/HoldingFinances.php',
'App\\Console\\Commands\\Finances\\SovBillsCommand' => $baseDir . '/app/Console/Commands/Finances/SovBills.php',
'App\\Console\\Commands\\Flex\\FlexStructureCommand' => $baseDir . '/app/Console/Commands/Flex/FlexStructureCommand.php',
@@ -22,6 +23,7 @@ return array(
'App\\Console\\Commands\\RentalMoons\\AllianceRentalMoonInvoiceCreationCommand' => $baseDir . '/app/Console/Commands/RentalMoons/AllianceRentalMoonInvoiceCreationCommand.php',
'App\\Console\\Commands\\RentalMoons\\AllianceRentalMoonUpdatePricingCommand' => $baseDir . '/app/Console/Commands/RentalMoons/AllianceRentalMoonUpdatePricingCommand.php',
'App\\Console\\Commands\\Structures\\GetStructuresCommand' => $baseDir . '/app/Console/Commands/Structures/GetStructures.php',
+ 'App\\Console\\Commands\\SupplyChain\\EndSupplyChainContractCommand' => $baseDir . '/app/Console/Commands/SupplyChain/EndSupplyChainContractCommand.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',
'App\\Console\\Kernel' => $baseDir . '/app/Console/Kernel.php',
@@ -30,8 +32,7 @@ return array(
'App\\Http\\Controllers\\Auth\\EsiScopeController' => $baseDir . '/app/Http/Controllers/Auth/EsiScopeController.php',
'App\\Http\\Controllers\\Auth\\LoginController' => $baseDir . '/app/Http/Controllers/Auth/LoginController.php',
'App\\Http\\Controllers\\Blacklist\\BlacklistController' => $baseDir . '/app/Http/Controllers/Blacklist/BlacklistController.php',
- 'App\\Http\\Controllers\\Contracts\\ContractAdminController' => $baseDir . '/app/Http/Controllers/Contracts/ContractAdminController.php',
- 'App\\Http\\Controllers\\Contracts\\ContractController' => $baseDir . '/app/Http/Controllers/Contracts/ContractController.php',
+ 'App\\Http\\Controllers\\Contracts\\SupplyChainController' => $baseDir . '/app/Http/Controllers/Contracts/SupplyChainController.php',
'App\\Http\\Controllers\\Controller' => $baseDir . '/app/Http/Controllers/Controller.php',
'App\\Http\\Controllers\\Dashboard\\AdminController' => $baseDir . '/app/Http/Controllers/Dashboard/AdminController.php',
'App\\Http\\Controllers\\Dashboard\\AdminDashboardController' => $baseDir . '/app/Http/Controllers/Dashboard/AdminDashboardController.php',
@@ -76,6 +77,7 @@ return array(
'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\\Commands\\RentalMoons\\UpdateRentalMoonPullJob' => $baseDir . '/app/Jobs/Commands/RentalMoons/UpdateRentalMoonPullJob.php',
+ 'App\\Jobs\\Commands\\SupplyChain\\EndSupplyChainContractJob' => $baseDir . '/app/Jobs/Commands/SupplyChain/EndSupplyChainContractJob.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',
@@ -106,9 +108,8 @@ return array(
'App\\Library\\Wiki\\WikiHelper' => $baseDir . '/app/Library/Wiki/WikiHelper.php',
'App\\Models\\Admin\\AllowedLogin' => $baseDir . '/app/Models/Admin/AllowedLogin.php',
'App\\Models\\Blacklist\\BlacklistEntity' => $baseDir . '/app/Models/Blacklist/BlacklistEntity.php',
- 'App\\Models\\Contracts\\AcceptedBid' => $baseDir . '/app/Models/Contracts/AcceptedBid.php',
- 'App\\Models\\Contracts\\Bid' => $baseDir . '/app/Models/Contracts/Bid.php',
- 'App\\Models\\Contracts\\Contract' => $baseDir . '/app/Models/Contracts/Contract.php',
+ 'App\\Models\\Contracts\\SupplyChainBid' => $baseDir . '/app/Models/Contracts/SupplyChainBid.php',
+ 'App\\Models\\Contracts\\SupplyChainContract' => $baseDir . '/app/Models/Contracts/SupplyChainContract.php',
'App\\Models\\Corporation\\AllianceCorp' => $baseDir . '/app/Models/Corporation/AllianceCorp.php',
'App\\Models\\Corporation\\HoldingCorpJournal' => $baseDir . '/app/Models/Corporation/HoldingCorpJournal.php',
'App\\Models\\Doku\\DokuGroupNames' => $baseDir . '/app/Models/Doku/DokuGroupNames.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 9d31c3157..9fc7a1ce6 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -482,6 +482,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
'App\\Console\\Commands\\Data\\PurgeCorpMoonLedgers' => __DIR__ . '/../..' . '/app/Console/Commands/Data/PurgeCorpMoonLedgers.php',
'App\\Console\\Commands\\Eve\\GetEveRegionsCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Eve/GetEveRegionsCommand.php',
'App\\Console\\Commands\\Files\\MoonFormatter' => __DIR__ . '/../..' . '/app/Console/Commands/Files/MoonFormatter.php',
+ 'App\\Console\\Commands\\Files\\UpdateItemCompositionFromSDECommand' => __DIR__ . '/../..' . '/app/Console/Commands/Files/UpdateItemCompositionFromSDECommand.php',
'App\\Console\\Commands\\Finances\\HoldingFinancesCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Finances/HoldingFinances.php',
'App\\Console\\Commands\\Finances\\SovBillsCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Finances/SovBills.php',
'App\\Console\\Commands\\Flex\\FlexStructureCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Flex/FlexStructureCommand.php',
@@ -491,6 +492,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
'App\\Console\\Commands\\RentalMoons\\AllianceRentalMoonInvoiceCreationCommand' => __DIR__ . '/../..' . '/app/Console/Commands/RentalMoons/AllianceRentalMoonInvoiceCreationCommand.php',
'App\\Console\\Commands\\RentalMoons\\AllianceRentalMoonUpdatePricingCommand' => __DIR__ . '/../..' . '/app/Console/Commands/RentalMoons/AllianceRentalMoonUpdatePricingCommand.php',
'App\\Console\\Commands\\Structures\\GetStructuresCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Structures/GetStructures.php',
+ 'App\\Console\\Commands\\SupplyChain\\EndSupplyChainContractCommand' => __DIR__ . '/../..' . '/app/Console/Commands/SupplyChain/EndSupplyChainContractCommand.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',
'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php',
@@ -499,8 +501,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
'App\\Http\\Controllers\\Auth\\EsiScopeController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/EsiScopeController.php',
'App\\Http\\Controllers\\Auth\\LoginController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/LoginController.php',
'App\\Http\\Controllers\\Blacklist\\BlacklistController' => __DIR__ . '/../..' . '/app/Http/Controllers/Blacklist/BlacklistController.php',
- 'App\\Http\\Controllers\\Contracts\\ContractAdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/Contracts/ContractAdminController.php',
- 'App\\Http\\Controllers\\Contracts\\ContractController' => __DIR__ . '/../..' . '/app/Http/Controllers/Contracts/ContractController.php',
+ 'App\\Http\\Controllers\\Contracts\\SupplyChainController' => __DIR__ . '/../..' . '/app/Http/Controllers/Contracts/SupplyChainController.php',
'App\\Http\\Controllers\\Controller' => __DIR__ . '/../..' . '/app/Http/Controllers/Controller.php',
'App\\Http\\Controllers\\Dashboard\\AdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/Dashboard/AdminController.php',
'App\\Http\\Controllers\\Dashboard\\AdminDashboardController' => __DIR__ . '/../..' . '/app/Http/Controllers/Dashboard/AdminDashboardController.php',
@@ -545,6 +546,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
'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\\Commands\\RentalMoons\\UpdateRentalMoonPullJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/RentalMoons/UpdateRentalMoonPullJob.php',
+ 'App\\Jobs\\Commands\\SupplyChain\\EndSupplyChainContractJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/SupplyChain/EndSupplyChainContractJob.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',
@@ -575,9 +577,8 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
'App\\Library\\Wiki\\WikiHelper' => __DIR__ . '/../..' . '/app/Library/Wiki/WikiHelper.php',
'App\\Models\\Admin\\AllowedLogin' => __DIR__ . '/../..' . '/app/Models/Admin/AllowedLogin.php',
'App\\Models\\Blacklist\\BlacklistEntity' => __DIR__ . '/../..' . '/app/Models/Blacklist/BlacklistEntity.php',
- 'App\\Models\\Contracts\\AcceptedBid' => __DIR__ . '/../..' . '/app/Models/Contracts/AcceptedBid.php',
- 'App\\Models\\Contracts\\Bid' => __DIR__ . '/../..' . '/app/Models/Contracts/Bid.php',
- 'App\\Models\\Contracts\\Contract' => __DIR__ . '/../..' . '/app/Models/Contracts/Contract.php',
+ 'App\\Models\\Contracts\\SupplyChainBid' => __DIR__ . '/../..' . '/app/Models/Contracts/SupplyChainBid.php',
+ 'App\\Models\\Contracts\\SupplyChainContract' => __DIR__ . '/../..' . '/app/Models/Contracts/SupplyChainContract.php',
'App\\Models\\Corporation\\AllianceCorp' => __DIR__ . '/../..' . '/app/Models/Corporation/AllianceCorp.php',
'App\\Models\\Corporation\\HoldingCorpJournal' => __DIR__ . '/../..' . '/app/Models/Corporation/HoldingCorpJournal.php',
'App\\Models\\Doku\\DokuGroupNames' => __DIR__ . '/../..' . '/app/Models/Doku/DokuGroupNames.php',