diff --git a/app/Http/Controllers/Blacklist/BlacklistController.php b/app/Http/Controllers/Blacklist/BlacklistController.php index 03255f507..6267881c4 100644 --- a/app/Http/Controllers/Blacklist/BlacklistController.php +++ b/app/Http/Controllers/Blacklist/BlacklistController.php @@ -115,10 +115,15 @@ class BlacklistController extends Controller 'name' => 'required', ]); - //Delete the blacklist character + //Set the character on the blacklist to removed BlacklistEntity::where([ 'entity_name' => $request->name, - ])->delete(); + ])->update([ + 'validity' => 'Invalid', + 'removed_by_id' => auth()->user()->getId(), + 'removed_by_name' => auth()->user()->getName(), + 'removed_notes' => $request->notes, + ]); //Return the view return redirect('/blacklist/display')->with('success', 'Character removed from the blacklist.'); diff --git a/database/migrations/2020_08_30_122207_modify_black_list_table.php b/database/migrations/2020_08_30_122207_modify_black_list_table.php new file mode 100644 index 000000000..594139b7d --- /dev/null +++ b/database/migrations/2020_08_30_122207_modify_black_list_table.php @@ -0,0 +1,45 @@ +enum('validity', [ + 'Valid', + 'Invalid', + ])->default('Valid'); + $table->string('removed_by_id')->nullable(); + $table->string('removed_by_name')->nullable(); + $table->string('removed_notes')->nullable(); + }); + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('alliance_blacklist', function(Blueprint $table) { + $table->dropColumn([ + 'validity', + 'removed_by_id', + 'removed_by_name', + 'removed_notes', + ]); + }); + } +} diff --git a/resources/views/blacklist/remove.blade.php b/resources/views/blacklist/remove.blade.php index f3db6bd92..949a21a9a 100644 --- a/resources/views/blacklist/remove.blade.php +++ b/resources/views/blacklist/remove.blade.php @@ -6,6 +6,10 @@ {{ Form::label('name', 'Entity Name') }} {{ Form::text('name', '', ['class' => 'form-control', 'placeholder' => 'CCP Antiquarian']) }} +
+ {{ Form::label('notes', 'Notes') }} + {{ Form::textarea('notes', '', ['class' => 'form-control']) }} +
{{ Form::submit('Submit', ['class' => 'btn btn-primary']) }} {!! Form::close() !!} diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 6d483a33c..fd0d05051 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -11,6 +11,7 @@ return array( 'App\\Console\\Commands\\Data\\CleanStaleDataCommand' => $baseDir . '/app/Console/Commands/Data/CleanStaleDataCommand.php', 'App\\Console\\Commands\\Data\\EmptyJumpBridges' => $baseDir . '/app/Console/Commands/Data/EmptyJumpBridges.php', 'App\\Console\\Commands\\Data\\PurgeCorpMoonLedgers' => $baseDir . '/app/Console/Commands/Data/PurgeCorpMoonLedgers.php', + 'App\\Console\\Commands\\Eve\\ItemPricesUpdateCommand' => $baseDir . '/app/Console/Commands/Eve/ItemPricesUpdateCommand.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', @@ -21,6 +22,7 @@ return array( '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\\SystemRental\\SystemRentalCommand' => $baseDir . '/app/Console/Commands/SystemRental/SystemRentalCommand.php', 'App\\Console\\Commands\\Users\\PurgeUsers' => $baseDir . '/app/Console/Commands/Users/PurgeUsers.php', 'App\\Console\\Kernel' => $baseDir . '/app/Console/Kernel.php', 'App\\EveRegion' => $baseDir . '/app/Models/Eve/EveRegion.php', @@ -42,9 +44,9 @@ return array( '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\\Moons\\RentalMoonsAdminController' => $baseDir . '/app/Http/Controllers/Moons/RentalMoonsAdminController.php', - 'App\\Http\\Controllers\\RentalAdminController' => $baseDir . '/app/Http/Controllers/Rental/RentalAdminController.php', 'App\\Http\\Controllers\\SRP\\SRPAdminController' => $baseDir . '/app/Http/Controllers/SRP/SRPAdminController.php', 'App\\Http\\Controllers\\SRP\\SRPController' => $baseDir . '/app/Http/Controllers/SRP/SRPController.php', + 'App\\Http\\Controllers\\SystemRentals\\RentalAdminController' => $baseDir . '/app/Http/Controllers/SystemRentals/RentalAdminController.php', 'App\\Http\\Controllers\\Test\\TestController' => $baseDir . '/app/Http/Controllers/Test/TestController.php', 'App\\Http\\Controllers\\Wiki\\WikiController' => $baseDir . '/app/Http/Controllers/Wiki/WikiController.php', 'App\\Http\\Kernel' => $baseDir . '/app/Http/Kernel.php', @@ -58,6 +60,7 @@ return array( 'App\\Http\\Middleware\\TrimStrings' => $baseDir . '/app/Http/Middleware/TrimStrings.php', 'App\\Http\\Middleware\\TrustProxies' => $baseDir . '/app/Http/Middleware/TrustProxies.php', 'App\\Http\\Middleware\\VerifyCsrfToken' => $baseDir . '/app/Http/Middleware/VerifyCsrfToken.php', + 'App\\Jobs\\Commands\\Eve\\ItemPricesUpdateJob' => $baseDir . '/app/Jobs/Commands/Eve/ItemPricesUpdateJob.php', 'App\\Jobs\\Commands\\FetchRentalMoonLedgerJob' => $baseDir . '/app/Jobs/Commands/Not Used/FetchRentalMoonLedgerJob.php', 'App\\Jobs\\Commands\\FetchRentalMoonObserversJob' => $baseDir . '/app/Jobs/Commands/Not Used/FetchRentalMoonObserversJob.php', 'App\\Jobs\\Commands\\Moons\\FetchMoonLedgerJob' => $baseDir . '/app/Jobs/Commands/Moons/FetchMoonLedgerJob.php', @@ -153,6 +156,7 @@ return array( 'App\\Models\\Stock\\Asset' => $baseDir . '/app/Models/Stock/Asset.php', 'App\\Models\\Structure\\Service' => $baseDir . '/app/Models/Structure/Service.php', 'App\\Models\\Structure\\Structure' => $baseDir . '/app/Models/Structure/Structure.php', + 'App\\Models\\SystemRentals\\RentalSystem' => $baseDir . '/app/Models/SystemRentals/RentalSystem.php', 'App\\Models\\User\\AvailableUserPermission' => $baseDir . '/app/Models/User/AvailableUserPermission.php', 'App\\Models\\User\\AvailableUserRole' => $baseDir . '/app/Models/User/AvailableUserRole.php', 'App\\Models\\User\\User' => $baseDir . '/app/Models/User/User.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index b8dab6f37..a15eefece 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -480,6 +480,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Console\\Commands\\Data\\CleanStaleDataCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Data/CleanStaleDataCommand.php', 'App\\Console\\Commands\\Data\\EmptyJumpBridges' => __DIR__ . '/../..' . '/app/Console/Commands/Data/EmptyJumpBridges.php', 'App\\Console\\Commands\\Data\\PurgeCorpMoonLedgers' => __DIR__ . '/../..' . '/app/Console/Commands/Data/PurgeCorpMoonLedgers.php', + 'App\\Console\\Commands\\Eve\\ItemPricesUpdateCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Eve/ItemPricesUpdateCommand.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', @@ -490,6 +491,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 '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\\SystemRental\\SystemRentalCommand' => __DIR__ . '/../..' . '/app/Console/Commands/SystemRental/SystemRentalCommand.php', 'App\\Console\\Commands\\Users\\PurgeUsers' => __DIR__ . '/../..' . '/app/Console/Commands/Users/PurgeUsers.php', 'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php', 'App\\EveRegion' => __DIR__ . '/../..' . '/app/Models/Eve/EveRegion.php', @@ -511,9 +513,9 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 '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\\Moons\\RentalMoonsAdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/Moons/RentalMoonsAdminController.php', - 'App\\Http\\Controllers\\RentalAdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/Rental/RentalAdminController.php', 'App\\Http\\Controllers\\SRP\\SRPAdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/SRP/SRPAdminController.php', 'App\\Http\\Controllers\\SRP\\SRPController' => __DIR__ . '/../..' . '/app/Http/Controllers/SRP/SRPController.php', + 'App\\Http\\Controllers\\SystemRentals\\RentalAdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/SystemRentals/RentalAdminController.php', 'App\\Http\\Controllers\\Test\\TestController' => __DIR__ . '/../..' . '/app/Http/Controllers/Test/TestController.php', 'App\\Http\\Controllers\\Wiki\\WikiController' => __DIR__ . '/../..' . '/app/Http/Controllers/Wiki/WikiController.php', 'App\\Http\\Kernel' => __DIR__ . '/../..' . '/app/Http/Kernel.php', @@ -527,6 +529,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Http\\Middleware\\TrimStrings' => __DIR__ . '/../..' . '/app/Http/Middleware/TrimStrings.php', 'App\\Http\\Middleware\\TrustProxies' => __DIR__ . '/../..' . '/app/Http/Middleware/TrustProxies.php', 'App\\Http\\Middleware\\VerifyCsrfToken' => __DIR__ . '/../..' . '/app/Http/Middleware/VerifyCsrfToken.php', + 'App\\Jobs\\Commands\\Eve\\ItemPricesUpdateJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/Eve/ItemPricesUpdateJob.php', 'App\\Jobs\\Commands\\FetchRentalMoonLedgerJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/Not Used/FetchRentalMoonLedgerJob.php', 'App\\Jobs\\Commands\\FetchRentalMoonObserversJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/Not Used/FetchRentalMoonObserversJob.php', 'App\\Jobs\\Commands\\Moons\\FetchMoonLedgerJob' => __DIR__ . '/../..' . '/app/Jobs/Commands/Moons/FetchMoonLedgerJob.php', @@ -622,6 +625,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9 'App\\Models\\Stock\\Asset' => __DIR__ . '/../..' . '/app/Models/Stock/Asset.php', 'App\\Models\\Structure\\Service' => __DIR__ . '/../..' . '/app/Models/Structure/Service.php', 'App\\Models\\Structure\\Structure' => __DIR__ . '/../..' . '/app/Models/Structure/Structure.php', + 'App\\Models\\SystemRentals\\RentalSystem' => __DIR__ . '/../..' . '/app/Models/SystemRentals/RentalSystem.php', 'App\\Models\\User\\AvailableUserPermission' => __DIR__ . '/../..' . '/app/Models/User/AvailableUserPermission.php', 'App\\Models\\User\\AvailableUserRole' => __DIR__ . '/../..' . '/app/Models/User/AvailableUserRole.php', 'App\\Models\\User\\User' => __DIR__ . '/../..' . '/app/Models/User/User.php',