Bugs fixed

- .hide class would get overridden by custom.css
- Stock editing for existing shop stock would not update correctly due to missing keys in the form
- Removed a unique key constraint in an earlier table that was occasionally causing migration issues
- Made character and character image deletion more thorough to avoid problems with deleting apparently-unused features and currencies
- Was not able to grant character-held only currencies to characters

Miscellaneous
- Added a script to clear any character features and currencies on deleted characters, as well as delete their images

app/Console/Commands/ClearDeletedCharacterAttachments.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+use DB;
+
+use App\Models\Character\Character;
+use App\Models\Character\CharacterCurrency;
+use App\Models\Character\CharacterFeature;
+use App\Models\Character\CharacterImage;
+
+class ClearDeletedCharacterAttachments extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'clear-deleted-character-attachments';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Clears any currently remaining character attachments (features and currency) so that they can be deleted.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        // Get deleted character IDs
+        $deletedCharacterIds = DB::table('characters')->whereNotNull('deleted_at')->pluck('id');
+
+        // Delete their held currencies
+        CharacterCurrency::whereIn('character_id', $deletedCharacterIds)->delete();
+
+        // Delete their character images
+        CharacterImage::whereIn('character_id', $deletedCharacterIds)->delete();
+
+        // Get all deleted character images
+        $deletedImageIds = DB::table('character_images')->whereNotNull('deleted_at')->pluck('id');
+
+        // Delete their features
+        CharacterFeature::whereIn('character_image_id', $deletedImageIds)->delete();
+    }
+}

app/Services/CharacterManager.php

@@ -17,6 +17,7 @@
 use App\Models\User\User;
 use App\Models\User\UserItem;
 use App\Models\Character\Character;
+use App\Models\Character\CharacterCurrency;
 use App\Models\Character\CharacterCategory;
 use App\Models\Character\CharacterFeature;
 use App\Models\Character\CharacterImage;
@@ -643,6 +644,8 @@ public function deleteImage($image, $user)
         try {
             if($image->character->character_image_id == $image->id) throw new \Exception("Cannot delete a character's active image.");
 
+            $image->features()->delete();
+
             $image->delete();
 
             // Delete the image files
@@ -1025,11 +1028,25 @@ public function deleteCharacter($character, $user)
             if($character->user_id) {
                 $character->user->settings->{$character->is_myo_slot ? 'myo_slot_count' : 'character_count'}--;
                 $character->user->settings->save();
-            }
+        }
 
             // Delete associated bookmarks
             CharacterBookmark::where('character_id', $character->id)->delete();
 
+            // Delete associated features and images
+            // Images use soft deletes
+            foreach($character->images as $image) {
+                $image->features()->delete();
+                $image->delete();
+            }
+
+            // Delete associated currencies
+            CharacterCurrency::where('character_id', $character->id)->delete();
+
+            // Delete associated design updates
+            // Design updates use soft deletes
+            CharacterDesignUpdate::where('character_id', $character->id)->delete();
+
             // Delete character
             // This is a soft delete, so the character still kind of exists
             $character->delete();

app/Services/CurrencyManager.php

@@ -95,7 +95,7 @@ public function grantCharacterCurrencies($data, $character, $staff)
             // Process currency
             $currency = Currency::find($data['currency_id']);
             if(!$currency) throw new \Exception("Invalid currency selected.");
-            if(!$currency->is_user_owned) throw new \Exception("This currency cannot be held by characters.");
+            if(!$currency->is_character_owned) throw new \Exception("This currency cannot be held by characters.");
             if($data['quantity'] < 0) {
                 $this->debitCurrency($character, $staff, 'Staff Removal', $data['data'], $currency, -$data['quantity']);
                 Notifications::create('CHARACTER_CURRENCY_REMOVAL', $character->user, [

database/migrations/2019_04_13_094613_add_owned_currencies.php

@@ -20,7 +20,7 @@ public function up()
             $table->integer('currency_id')->unsigned();
             $table->integer('quantity')->unsigned()->default(0);
 
-            $table->unique(['user_id', 'currency_id']);
+            //$table->unique(['user_id', 'currency_id']);
             $table->primary(['user_id', 'currency_id']);
 
             $table->foreign('user_id')->references('id')->on('users');
@@ -32,7 +32,7 @@ public function up()
             $table->integer('currency_id')->unsigned();
             $table->integer('quantity')->unsigned()->default(0);
 
-            $table->unique(['character_id', 'currency_id']);
+            //$table->unique(['character_id', 'currency_id']);
             $table->primary(['character_id', 'currency_id']);
 
             $table->foreign('character_id')->references('id')->on('characters');

database/migrations/2020_04_25_114747_drop_log_foreign_keys.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DropLogForeignKeys extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // This will drop the currency log foreign keys, so that currencies can be deleted without issue
+        // even if a log exists for it
+        Schema::table('currencies_log', function(Blueprint $table) {
+            $table->dropForeign('banks_log_currency_id_foreign');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // This is not actually a very accurate opposite of the above,
+        // as the old index was created when the table was called banks,
+        // and this will generate a different index name
+        Schema::table('currencies_log', function(Blueprint $table) {
+            $table->foreign('currency_id')->references('id')->on('currencies');
+        });
+    }
+}

public/css/lorekeeper.css

@@ -58,7 +58,7 @@ body {
 **************************************************************************************************/
 
 .hide {
-    display: none;
+    display: none !important;
 }
 
 /**************************************************************************************************

resources/views/admin/shops/_stock.blade.php

@@ -2,50 +2,50 @@
     <div class="card-body">
         <div class="text-right mb-3"><a href="#" class="remove-stock-button btn btn-danger">Remove</a></div>
         <div class="form-group">
-            {!! Form::label('item_id[]', 'Item') !!}
-            {!! Form::select('item_id[]', $items, $stock ? $stock->item_id : null, ['class' => 'form-control stock-field', 'data-name' => 'item_id']) !!}
+            {!! Form::label('item_id['.$key.']', 'Item') !!}
+            {!! Form::select('item_id['.$key.']', $items, $stock ? $stock->item_id : null, ['class' => 'form-control stock-field', 'data-name' => 'item_id']) !!}
         </div>
         <div class="form-group">
-            {!! Form::label('cost[]', 'Cost') !!}
+            {!! Form::label('cost['.$key.']', 'Cost') !!}
             <div class="row">
                 <div class="col-4">
-                    {!! Form::text('cost[]', $stock ? $stock->cost : null, ['class' => 'form-control stock-field', 'data-name' => 'cost']) !!}
+                    {!! Form::text('cost['.$key.']', $stock ? $stock->cost : null, ['class' => 'form-control stock-field', 'data-name' => 'cost']) !!}
                 </div>
                 <div class="col-8">
-                    {!! Form::select('currency_id[]', $currencies, $stock ? $stock->currency_id : null, ['class' => 'form-control stock-field', 'data-name' => 'currency_id']) !!}
+                    {!! Form::select('currency_id['.$key.']', $currencies, $stock ? $stock->currency_id : null, ['class' => 'form-control stock-field', 'data-name' => 'currency_id']) !!}
                 </div>
             </div>
         </div>
 
         <div class="row">
             <div class="col-md-6">
                 <div class="form-group">
-                    {!! Form::checkbox('use_user_bank[]', 1, $stock ? $stock->use_user_bank : 1, ['class' => 'form-check-input stock-toggle stock-field', 'data-name' => 'use_user_bank']) !!}
-                    {!! Form::label('use_user_bank[]', 'Use User Bank', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will allow users to purchase the item using the currency in their accounts, provided that users can own that currency.') !!}
+                    {!! Form::checkbox('use_user_bank['.$key.']', 1, $stock ? $stock->use_user_bank : 1, ['class' => 'form-check-input stock-toggle stock-field', 'data-name' => 'use_user_bank']) !!}
+                    {!! Form::label('use_user_bank['.$key.']', 'Use User Bank', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will allow users to purchase the item using the currency in their accounts, provided that users can own that currency.') !!}
                 </div>
             </div>
             <div class="col-md-6">
                 <div class="form-group mb-0">
-                    {!! Form::checkbox('use_character_bank[]', 1, $stock ? $stock->use_character_bank : 1, ['class' => 'form-check-input stock-toggle stock-field', 'data-name' => 'use_character_bank']) !!}
-                    {!! Form::label('use_character_bank[]', 'Use Character Bank', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will allow users to purchase the item using the currency belonging to characters they own, provided that characters can own that currency.') !!}
+                    {!! Form::checkbox('use_character_bank['.$key.']', 1, $stock ? $stock->use_character_bank : 1, ['class' => 'form-check-input stock-toggle stock-field', 'data-name' => 'use_character_bank']) !!}
+                    {!! Form::label('use_character_bank['.$key.']', 'Use Character Bank', ['class' => 'form-check-label ml-3']) !!} {!! add_help('This will allow users to purchase the item using the currency belonging to characters they own, provided that characters can own that currency.') !!}
                 </div>
             </div>
         </div>
         <div class="form-group">
-            {!! Form::checkbox('is_limited_stock[]', 1, $stock ? $stock->is_limited_stock : false, ['class' => 'form-check-input stock-limited stock-toggle stock-field', 'data-name' => 'is_limited_stock']) !!}
-            {!! Form::label('is_limited_stock[]', 'Set Limited Stock', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If turned on, will limit the amount purchaseable to the quantity set below.') !!}
+            {!! Form::checkbox('is_limited_stock['.$key.']', 1, $stock ? $stock->is_limited_stock : false, ['class' => 'form-check-input stock-limited stock-toggle stock-field', 'data-name' => 'is_limited_stock']) !!}
+            {!! Form::label('is_limited_stock['.$key.']', 'Set Limited Stock', ['class' => 'form-check-label ml-3']) !!} {!! add_help('If turned on, will limit the amount purchaseable to the quantity set below.') !!}
         </div>
         <div class="card mb-3 stock-limited-quantity {{ $stock && $stock->is_limited_stock ? '' : 'hide' }}">
             <div class="card-body">
                 <div>
-                    {!! Form::label('quantity[]', 'Quantity') !!} {!! add_help('If left blank, will be set to 0 (sold out).') !!}
-                    {!! Form::text('quantity[]', $stock ? $stock->quantity : 0, ['class' => 'form-control stock-field', 'data-name' => 'quantity']) !!}
+                    {!! Form::label('quantity['.$key.']', 'Quantity') !!} {!! add_help('If left blank, will be set to 0 (sold out).') !!}
+                    {!! Form::text('quantity['.$key.']', $stock ? $stock->quantity : 0, ['class' => 'form-control stock-field', 'data-name' => 'quantity']) !!}
                 </div>
             </div>
         </div>
         <div>
-            {!! Form::label('purchase_limit[]', 'User Purchase Limit') !!} {!! add_help('This is the maximum amount of this item a user can purchase from this shop. Set to 0 to allow infinite purchases.') !!}
-            {!! Form::text('purchase_limit[]', $stock ? $stock->purchase_limit : 0, ['class' => 'form-control stock-field', 'data-name' => 'purchase_limit']) !!}
+            {!! Form::label('purchase_limit['.$key.']', 'User Purchase Limit') !!} {!! add_help('This is the maximum amount of this item a user can purchase from this shop. Set to 0 to allow infinite purchases.') !!}
+            {!! Form::text('purchase_limit['.$key.']', $stock ? $stock->purchase_limit : 0, ['class' => 'form-control stock-field', 'data-name' => 'purchase_limit']) !!}
         </div>
     </div>
 </div>

resources/views/admin/shops/create_edit_shop.blade.php

@@ -56,16 +56,16 @@
             <a href="#" class="add-stock-button btn btn-outline-primary">Add Stock</a>
         </div>
         <div id="shopStock">
-            @foreach($shop->stock as $stock)
-                @include('admin.shops._stock', ['stock' => $stock])
+            @foreach($shop->stock as $key=>$stock)
+                @include('admin.shops._stock', ['stock' => $stock, 'key' => $key])
             @endforeach
         </div>
         <div class="text-right">
             {!! Form::submit('Edit', ['class' => 'btn btn-primary']) !!}
         </div>
     {!! Form::close() !!}
     <div class="" id="shopStockData">
-        @include('admin.shops._stock', ['stock' => null])
+        @include('admin.shops._stock', ['stock' => null, 'key' => 0])
     </div>
 @endif