Merge pull request #4301 from HDInnovations/Bug-4277

Author: HDVinnie

app/Http/Controllers/Staff/DonationController.php

@@ -34,7 +34,9 @@ public function index(Request $request): \Illuminate\Contracts\View\View|\Illumi
     {
         abort_unless($request->user()->group->is_owner, 403);
 
-        $donations = Donation::with('package')->latest()->paginate(25);
+        $donations = Donation::with(['package' => function ($query): void {
+            $query->withTrashed();
+        }])->latest()->paginate(25);
 
         $dailyDonations = Donation::selectRaw('DATE(donations.created_at) as date, SUM(donation_packages.cost) as total')
             ->join('donation_packages', 'donations.package_id', '=', 'donation_packages.id')

app/Models/Donation.php

@@ -96,6 +96,6 @@ public function user(): \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function package(): \Illuminate\Database\Eloquent\Relations\BelongsTo
     {
-        return $this->belongsTo(DonationPackage::class);
+        return $this->belongsTo(DonationPackage::class)->withTrashed();
     }
 }

app/Models/DonationPackage.php

@@ -18,6 +18,7 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * App\Models\DonationPackage.
@@ -39,6 +40,7 @@ class DonationPackage extends Model
 {
     /** @use HasFactory<\Database\Factories\DonationPackagefactory> */
     use HasFactory;
+    use SoftDeletes;
 
     /**
      * The attributes that aren't mass assignable.

database/migrations/2024_11_01_013426_add_soft_deletes_to_donation_packages_table.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class () extends Migration {
+    public function up(): void
+    {
+        Schema::table('donation_packages', function (Blueprint $table): void {
+            $table->softDeletes()->after('updated_at');
+        });
+    }
+};

resources/views/Staff/donation/index.blade.php

@@ -52,13 +52,34 @@
                                 <x-user_tag :user="$donation->user" :anon="false" />
                             </td>
                             <td>{{ $donation->transaction }}</td>
-                            <td>$ {{ $donation->package->cost }}</td>
-                            <td>
+                            <td
+                                class="{{ $donation->package->trashed() ? 'text-danger' : '' }}"
+                                title="{{ $donation->package->trashed() ? 'Package has been deleted' : '' }}"
+                            >
+                                $ {{ $donation->package->cost }}
+                            </td>
+                            <td
+                                class="{{ $donation->package->trashed() ? 'text-danger' : '' }}"
+                                title="{{ $donation->package->trashed() ? 'Package has been deleted' : '' }}"
+                            >
                                 {{ App\Helpers\StringHelper::formatBytes($donation->package->upload_value ?? 0) }}
                             </td>
-                            <td>{{ $donation->package->invite_value ?? 0 }}</td>
-                            <td>{{ $donation->package->bonus_value ?? 0 }}</td>
-                            <td>
+                            <td
+                                class="{{ $donation->package->trashed() ? 'text-danger' : '' }}"
+                                title="{{ $donation->package->trashed() ? 'Package has been deleted' : '' }}"
+                            >
+                                {{ $donation->package->invite_value ?? 0 }}
+                            </td>
+                            <td
+                                class="{{ $donation->package->trashed() ? 'text-danger' : '' }}"
+                                title="{{ $donation->package->trashed() ? 'Package has been deleted' : '' }}"
+                            >
+                                {{ $donation->package->bonus_value ?? 0 }}
+                            </td>
+                            <td
+                                class="{{ $donation->package->trashed() ? 'text-danger' : '' }}"
+                                title="{{ $donation->package->trashed() ? 'Package has been deleted' : '' }}"
+                            >
                                 @if ($donation->package->donor_value === null)
                                     Lifetime
                                 @else