From 0bb0e9d037f42678cc3be4b2426775eeea3c6bd5 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Sun, 7 Jul 2019 20:12:15 -0500 Subject: [PATCH] logistics contracts --- .../Logistics/LogisticsInsuranceDeposit.php | 10 +++++++ .../Logistics/LogisticsInsurancePayout.php | 10 +++++++ ...9_07_06_070809_create_logistics_tables.php | 26 +++++++++++++++++++ vendor/composer/ClassLoader.php | 2 +- vendor/composer/autoload_classmap.php | 14 ++++++---- vendor/composer/autoload_static.php | 14 ++++++---- 6 files changed, 65 insertions(+), 11 deletions(-) create mode 100644 app/Models/Logistics/LogisticsInsuranceDeposit.php create mode 100644 app/Models/Logistics/LogisticsInsurancePayout.php diff --git a/app/Models/Logistics/LogisticsInsuranceDeposit.php b/app/Models/Logistics/LogisticsInsuranceDeposit.php new file mode 100644 index 000000000..3189e2a5b --- /dev/null +++ b/app/Models/Logistics/LogisticsInsuranceDeposit.php @@ -0,0 +1,10 @@ + 1000.00, 'max_size' => 330000.00, ]); + + if(!Schema::hasTable('logistics_insurance_deposits')) { + Schema::create('logistics_insurance_deposits', function(Blueprint $table) { + $table->increments('id'); + $table->string('character_id'); + $table->string('character_name'); + $table->string('corporation_id'); + $table->string('corporation_name'); + $table->decimal('amount', 20, 2); + }); + } + + if(!Schema::hasTable('logistics_insurance_payouts')) { + Schema::create('logistics_insurance_payouts', function(Blueprint $table) { + $table->increments('id'); + $table->string('character_id'); + $table->string('character_name')->nullalbe(); + $table->string('corporation_id'); + $table->string('corporation_name')->nullable(); + $table->string('authorized_by_id'); + $table->string('authorized_by_name')->nullalbe(); + $table->decimal('amount', 20, 2)->nullalbe(); + }); + } } /** @@ -286,5 +310,7 @@ class CreateLogisticsTables extends Migration Schema::dropIfExists('solar_systems'); Schema::dropIfExists('solar_system_distances'); Schema::dropIfExists('logistics_routes'); + Schema::dropIfExists('logistics_insurance_deposits'); + Schema::dropIfExists('logistics_insurance_payouts'); } } diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index fce8549f0..95f7e0978 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -279,7 +279,7 @@ class ClassLoader */ public function setApcuPrefix($apcuPrefix) { - $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null; + $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null; } /** diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 55e5d025a..1ac99ce29 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -8,8 +8,8 @@ $baseDir = dirname($vendorDir); return array( 'App\\Console\\Commands\\CleanStaleDataCommand' => $baseDir . '/app/Console/Commands/Data/CleanStaleDataCommand.php', 'App\\Console\\Commands\\GetAssetsCommand' => $baseDir . '/app/Console/Commands/Assets/GetAssets.php', - 'App\\Console\\Commands\\GetContracts' => $baseDir . '/app/Console/Commands/Logistics/GetContracts.php', 'App\\Console\\Commands\\GetCorpsCommand' => $baseDir . '/app/Console/Commands/Corps/GetCorps.php', + 'App\\Console\\Commands\\GetEveContracts' => $baseDir . '/app/Console/Commands/Logistics/GetEveContracts.php', 'App\\Console\\Commands\\GetStructuresCommand' => $baseDir . '/app/Console/Commands/Structures/GetStructures.php', 'App\\Console\\Commands\\HoldingFinancesCommand' => $baseDir . '/app/Console/Commands/Finances/HoldingFinances.php', 'App\\Console\\Commands\\MoonMailerCommand' => $baseDir . '/app/Console/Commands/Moons/MoonMailer.php', @@ -25,6 +25,7 @@ return array( '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\\DashboardController' => $baseDir . '/app/Http/Controllers/Dashboard/DashboardController.php', + 'App\\Http\\Controllers\\Logistics\\LogisticsController' => $baseDir . '/app/Http/Controllers/Logistics/LogisticsController.php', 'App\\Http\\Controllers\\Moons\\MoonsAdminController' => $baseDir . '/app/Http/Controllers/Moons/MoonsAdminController.php', 'App\\Http\\Controllers\\Moons\\MoonsController' => $baseDir . '/app/Http/Controllers/Moons/MoonsController.php', 'App\\Http\\Controllers\\SRP\\SRPAdminController' => $baseDir . '/app/Http/Controllers/SRP/SRPAdminController.php', @@ -43,12 +44,13 @@ return array( 'App\\Http\\Middleware\\TrustProxies' => $baseDir . '/app/Http/Middleware/TrustProxies.php', 'App\\Http\\Middleware\\VerifyCsrfToken' => $baseDir . '/app/Http/Middleware/VerifyCsrfToken.php', 'App\\Jobs\\ProcessAssetsJob' => $baseDir . '/app/Jobs/ProcessAssetsJob.php', - 'App\\Jobs\\ProcessContractsJob' => $baseDir . '/app/Jobs/ProcessContractsJob.php', + 'App\\Jobs\\ProcessEveContractsJob' => $baseDir . '/app/Jobs/ProcessEveContractsJob.php', 'App\\Jobs\\ProcessStructureJob' => $baseDir . '/app/Jobs/ProcessStructureJob.php', 'App\\Jobs\\ProcessWalletJournalJob' => $baseDir . '/app/Jobs/ProcessWalletJournalJob.php', 'App\\Jobs\\ProcessWalletTransactionJob' => $baseDir . '/app/Jobs/ProcessWallettransactionJob.php', 'App\\Jobs\\SendEveMailJob' => $baseDir . '/app/Jobs/SendEveMailJob.php', 'App\\Library\\Assets\\AssetHelper' => $baseDir . '/app/Library/Assets/AssetHelper.php', + 'App\\Library\\Contracts\\EveContractsHelper' => $baseDir . '/app/Library/Contracts/EveContractsHelper.php', 'App\\Library\\Esi\\Esi' => $baseDir . '/app/Library/Esi/Esi.php', 'App\\Library\\Esi\\Mail' => $baseDir . '/app/Library/Esi/Mail.php', 'App\\Library\\Finances\\Helper\\FinanceHelper' => $baseDir . '/app/Library/Finances/Helper/FinanceHelper.php', @@ -60,19 +62,18 @@ return array( 'App\\Library\\Finances\\PlayerDonation' => $baseDir . '/app/Library/Finances/PlayerDonation.php', 'App\\Library\\Finances\\ReprocessingTax' => $baseDir . '/app/Library/Finances/ReprocessingTax.php', 'App\\Library\\Finances\\StructureIndustryTax' => $baseDir . '/app/Library/Finances/StructureIndustryTax.php', - 'App\\Library\\Logistics\\ContractsHelper' => $baseDir . '/app/Library/Logistics/ContractsHelper.php', 'App\\Library\\Lookups\\LookupHelper' => $baseDir . '/app/Library/Lookups/LookupHelper.php', 'App\\Library\\Moons\\MoonCalc' => $baseDir . '/app/Library/Moons/MoonCalc.php', 'App\\Library\\SRP\\SRPHelper' => $baseDir . '/app/Library/SRP/SRPHelper.php', 'App\\Library\\Structures\\StructureHelper' => $baseDir . '/app/Library/Structures/StructureHelper.php', 'App\\Library\\Taxes\\TaxesHelper' => $baseDir . '/app/Library/Taxes/TaxesHelper.php', - 'App\\LogisticsContract' => $baseDir . '/app/Models/Logistics/LogisticsContract.php', 'App\\Models\\Admin\\AllowedLogin' => $baseDir . '/app/Models/Admin/AllowedLogin.php', 'App\\Models\\Character\\CharacterClone' => $baseDir . '/app/Models/Charcter/CharacterClone.php', 'App\\Models\\Config' => $baseDir . '/app/Models/Moon/Config.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\\EveContract' => $baseDir . '/app/Models/Contracts/EveContract.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', @@ -89,14 +90,16 @@ return array( 'App\\Models\\Finances\\ReprocessingTaxJournal' => $baseDir . '/app/Models/Finances/ReprocessingTaxJournal.php', 'App\\Models\\Finances\\StructureIndustryTaxJournal' => $baseDir . '/app/Models/Finances/StructureIndustryTaxJournal.php', 'App\\Models\\Jobs\\JobProcessAsset' => $baseDir . '/app/Models/Jobs/JobProcessAsset.php', - 'App\\Models\\Jobs\\JobProcessContracts' => $baseDir . '/app/Models/Jobs/JobProcessContracts.php', + 'App\\Models\\Jobs\\JobProcessContracts' => $baseDir . '/app/Models/Jobs/JobProcessEveContracts.php', 'App\\Models\\Jobs\\JobProcessStructure' => $baseDir . '/app/Models/Jobs/JobProcessStructure.php', 'App\\Models\\Jobs\\JobProcessWalletJournal' => $baseDir . '/app/Models/Jobs/JobProcessWalletJournal.php', 'App\\Models\\Jobs\\JobProcessWalletTransaction' => $baseDir . '/app/Models/Jobs/JobProcessWalletTransaction.php', 'App\\Models\\Jobs\\JobSendEveMail' => $baseDir . '/app/Models/Jobs/JobSendEveMail.php', 'App\\Models\\Jobs\\JobStatus' => $baseDir . '/app/Models/Jobs/JobStatus.php', + 'App\\Models\\Logistics\\LogisticContract' => $baseDir . '/app/Models/Logistics/LogisticContract.php', 'App\\Models\\Lookups\\CharacterToCorporation' => $baseDir . '/app/Models/Lookups/CharacterToCorporation.php', 'App\\Models\\Lookups\\CorporationToAlliance' => $baseDir . '/app/Models/Lookups/CorporationToAlliance.php', + 'App\\Models\\Lookups\\SolarSystem' => $baseDir . '/app/Models/Lookups/SolarSystem.php', 'App\\Models\\Lookups\\UserToCorporation' => $baseDir . '/app/Models/Lookups/UserToCorporation.php', 'App\\Models\\Mail\\EveMail' => $baseDir . '/app/Models/Mail/EveMail.php', 'App\\Models\\Mail\\SentMail' => $baseDir . '/app/Models/Mail/SentMail.php', @@ -126,6 +129,7 @@ return array( 'App\\Providers\\EventServiceProvider' => $baseDir . '/app/Providers/EventServiceProvider.php', 'App\\Providers\\HorizonServiceProvider' => $baseDir . '/app/Providers/HorizonServiceProvider.php', 'App\\Providers\\RouteServiceProvider' => $baseDir . '/app/Providers/RouteServiceProvider.php', + 'App\\SolarSystemDistance' => $baseDir . '/app/Models/Logistics/SolarSystemDistance.php', 'App\\Traits\\EveOAuth' => $baseDir . '/app/Traits/EveOAuth.php', 'AvailableUserPermissions' => $baseDir . '/database/seeds/AvailableUserPermissions.php', 'BeyondCode\\DumpServer\\DumpServerCommand' => $vendorDir . '/beyondcode/laravel-dump-server/src/DumpServerCommand.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index dcea118b6..9375127d4 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -461,8 +461,8 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 public static $classMap = array ( 'App\\Console\\Commands\\CleanStaleDataCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Data/CleanStaleDataCommand.php', 'App\\Console\\Commands\\GetAssetsCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Assets/GetAssets.php', - 'App\\Console\\Commands\\GetContracts' => __DIR__ . '/../..' . '/app/Console/Commands/Logistics/GetContracts.php', 'App\\Console\\Commands\\GetCorpsCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Corps/GetCorps.php', + 'App\\Console\\Commands\\GetEveContracts' => __DIR__ . '/../..' . '/app/Console/Commands/Logistics/GetEveContracts.php', 'App\\Console\\Commands\\GetStructuresCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Structures/GetStructures.php', 'App\\Console\\Commands\\HoldingFinancesCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Finances/HoldingFinances.php', 'App\\Console\\Commands\\MoonMailerCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Moons/MoonMailer.php', @@ -478,6 +478,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 '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\\DashboardController' => __DIR__ . '/../..' . '/app/Http/Controllers/Dashboard/DashboardController.php', + 'App\\Http\\Controllers\\Logistics\\LogisticsController' => __DIR__ . '/../..' . '/app/Http/Controllers/Logistics/LogisticsController.php', 'App\\Http\\Controllers\\Moons\\MoonsAdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/Moons/MoonsAdminController.php', 'App\\Http\\Controllers\\Moons\\MoonsController' => __DIR__ . '/../..' . '/app/Http/Controllers/Moons/MoonsController.php', 'App\\Http\\Controllers\\SRP\\SRPAdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/SRP/SRPAdminController.php', @@ -496,12 +497,13 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Http\\Middleware\\TrustProxies' => __DIR__ . '/../..' . '/app/Http/Middleware/TrustProxies.php', 'App\\Http\\Middleware\\VerifyCsrfToken' => __DIR__ . '/../..' . '/app/Http/Middleware/VerifyCsrfToken.php', 'App\\Jobs\\ProcessAssetsJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessAssetsJob.php', - 'App\\Jobs\\ProcessContractsJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessContractsJob.php', + 'App\\Jobs\\ProcessEveContractsJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessEveContractsJob.php', 'App\\Jobs\\ProcessStructureJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessStructureJob.php', 'App\\Jobs\\ProcessWalletJournalJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessWalletJournalJob.php', 'App\\Jobs\\ProcessWalletTransactionJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessWallettransactionJob.php', 'App\\Jobs\\SendEveMailJob' => __DIR__ . '/../..' . '/app/Jobs/SendEveMailJob.php', 'App\\Library\\Assets\\AssetHelper' => __DIR__ . '/../..' . '/app/Library/Assets/AssetHelper.php', + 'App\\Library\\Contracts\\EveContractsHelper' => __DIR__ . '/../..' . '/app/Library/Contracts/EveContractsHelper.php', 'App\\Library\\Esi\\Esi' => __DIR__ . '/../..' . '/app/Library/Esi/Esi.php', 'App\\Library\\Esi\\Mail' => __DIR__ . '/../..' . '/app/Library/Esi/Mail.php', 'App\\Library\\Finances\\Helper\\FinanceHelper' => __DIR__ . '/../..' . '/app/Library/Finances/Helper/FinanceHelper.php', @@ -513,19 +515,18 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Library\\Finances\\PlayerDonation' => __DIR__ . '/../..' . '/app/Library/Finances/PlayerDonation.php', 'App\\Library\\Finances\\ReprocessingTax' => __DIR__ . '/../..' . '/app/Library/Finances/ReprocessingTax.php', 'App\\Library\\Finances\\StructureIndustryTax' => __DIR__ . '/../..' . '/app/Library/Finances/StructureIndustryTax.php', - 'App\\Library\\Logistics\\ContractsHelper' => __DIR__ . '/../..' . '/app/Library/Logistics/ContractsHelper.php', 'App\\Library\\Lookups\\LookupHelper' => __DIR__ . '/../..' . '/app/Library/Lookups/LookupHelper.php', 'App\\Library\\Moons\\MoonCalc' => __DIR__ . '/../..' . '/app/Library/Moons/MoonCalc.php', 'App\\Library\\SRP\\SRPHelper' => __DIR__ . '/../..' . '/app/Library/SRP/SRPHelper.php', 'App\\Library\\Structures\\StructureHelper' => __DIR__ . '/../..' . '/app/Library/Structures/StructureHelper.php', 'App\\Library\\Taxes\\TaxesHelper' => __DIR__ . '/../..' . '/app/Library/Taxes/TaxesHelper.php', - 'App\\LogisticsContract' => __DIR__ . '/../..' . '/app/Models/Logistics/LogisticsContract.php', 'App\\Models\\Admin\\AllowedLogin' => __DIR__ . '/../..' . '/app/Models/Admin/AllowedLogin.php', 'App\\Models\\Character\\CharacterClone' => __DIR__ . '/../..' . '/app/Models/Charcter/CharacterClone.php', 'App\\Models\\Config' => __DIR__ . '/../..' . '/app/Models/Moon/Config.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\\EveContract' => __DIR__ . '/../..' . '/app/Models/Contracts/EveContract.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', @@ -542,14 +543,16 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Models\\Finances\\ReprocessingTaxJournal' => __DIR__ . '/../..' . '/app/Models/Finances/ReprocessingTaxJournal.php', 'App\\Models\\Finances\\StructureIndustryTaxJournal' => __DIR__ . '/../..' . '/app/Models/Finances/StructureIndustryTaxJournal.php', 'App\\Models\\Jobs\\JobProcessAsset' => __DIR__ . '/../..' . '/app/Models/Jobs/JobProcessAsset.php', - 'App\\Models\\Jobs\\JobProcessContracts' => __DIR__ . '/../..' . '/app/Models/Jobs/JobProcessContracts.php', + 'App\\Models\\Jobs\\JobProcessContracts' => __DIR__ . '/../..' . '/app/Models/Jobs/JobProcessEveContracts.php', 'App\\Models\\Jobs\\JobProcessStructure' => __DIR__ . '/../..' . '/app/Models/Jobs/JobProcessStructure.php', 'App\\Models\\Jobs\\JobProcessWalletJournal' => __DIR__ . '/../..' . '/app/Models/Jobs/JobProcessWalletJournal.php', 'App\\Models\\Jobs\\JobProcessWalletTransaction' => __DIR__ . '/../..' . '/app/Models/Jobs/JobProcessWalletTransaction.php', 'App\\Models\\Jobs\\JobSendEveMail' => __DIR__ . '/../..' . '/app/Models/Jobs/JobSendEveMail.php', 'App\\Models\\Jobs\\JobStatus' => __DIR__ . '/../..' . '/app/Models/Jobs/JobStatus.php', + 'App\\Models\\Logistics\\LogisticContract' => __DIR__ . '/../..' . '/app/Models/Logistics/LogisticContract.php', 'App\\Models\\Lookups\\CharacterToCorporation' => __DIR__ . '/../..' . '/app/Models/Lookups/CharacterToCorporation.php', 'App\\Models\\Lookups\\CorporationToAlliance' => __DIR__ . '/../..' . '/app/Models/Lookups/CorporationToAlliance.php', + 'App\\Models\\Lookups\\SolarSystem' => __DIR__ . '/../..' . '/app/Models/Lookups/SolarSystem.php', 'App\\Models\\Lookups\\UserToCorporation' => __DIR__ . '/../..' . '/app/Models/Lookups/UserToCorporation.php', 'App\\Models\\Mail\\EveMail' => __DIR__ . '/../..' . '/app/Models/Mail/EveMail.php', 'App\\Models\\Mail\\SentMail' => __DIR__ . '/../..' . '/app/Models/Mail/SentMail.php', @@ -579,6 +582,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Providers\\EventServiceProvider' => __DIR__ . '/../..' . '/app/Providers/EventServiceProvider.php', 'App\\Providers\\HorizonServiceProvider' => __DIR__ . '/../..' . '/app/Providers/HorizonServiceProvider.php', 'App\\Providers\\RouteServiceProvider' => __DIR__ . '/../..' . '/app/Providers/RouteServiceProvider.php', + 'App\\SolarSystemDistance' => __DIR__ . '/../..' . '/app/Models/Logistics/SolarSystemDistance.php', 'App\\Traits\\EveOAuth' => __DIR__ . '/../..' . '/app/Traits/EveOAuth.php', 'AvailableUserPermissions' => __DIR__ . '/../..' . '/database/seeds/AvailableUserPermissions.php', 'BeyondCode\\DumpServer\\DumpServerCommand' => __DIR__ . '/..' . '/beyondcode/laravel-dump-server/src/DumpServerCommand.php',