diff --git a/app/Models/Campaign.php b/app/Models/Campaign.php index b9eae79..596ac5f 100644 --- a/app/Models/Campaign.php +++ b/app/Models/Campaign.php @@ -4,11 +4,21 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\SoftDeletes; use Malico\LaravelNanoid\HasNanoids; class Campaign extends Model { - use HasFactory, HasNanoids; + use HasFactory, HasNanoids, SoftDeletes; + + protected $fillable = [ + 'id', + 'Title', + 'Description', + 'meta', + 'user_id', + 'address_id', + ]; protected $casts = [ 'meta' => 'array', diff --git a/app/Models/Donation.php b/app/Models/Donation.php index 49e8dec..947099a 100644 --- a/app/Models/Donation.php +++ b/app/Models/Donation.php @@ -10,13 +10,23 @@ class Donation extends Model { use HasFactory, HasNanoids; + protected $fillable = [ + 'id', + 'campaign_id', + 'user_id', + 'Quantity', + 'Description', + 'Confirmed_at', + 'Status', + ]; + protected $casts = [ 'Confirmed_at' => 'datetime', ]; public function campaign() { - return $this->belongsTo(Campaign::class); + return $this->belongsTo(Campaign::class, 'campaign_id')->withTrashed(); } public function user() diff --git a/database/migrations/2024_09_15_134551_create_campaigns_table.php b/database/migrations/2024_09_15_134551_create_campaigns_table.php index 1261a21..ea71aee 100644 --- a/database/migrations/2024_09_15_134551_create_campaigns_table.php +++ b/database/migrations/2024_09_15_134551_create_campaigns_table.php @@ -22,6 +22,7 @@ public function up(): void $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); $table->foreign('address_id')->references('id')->on('addresses')->onDelete('cascade'); + $table->softDeletes(); }); } diff --git a/database/migrations/2024_09_16_130616_create_donations_table.php b/database/migrations/2024_09_16_130616_create_donations_table.php index 3a32204..9f93699 100644 --- a/database/migrations/2024_09_16_130616_create_donations_table.php +++ b/database/migrations/2024_09_16_130616_create_donations_table.php @@ -21,7 +21,7 @@ public function up(): void $table->string('Status')->default('pending'); $table->timestamps(); - $table->foreign('campaign_id')->references('id')->on('campaigns')->onDelete('cascade'); + $table->foreign('campaign_id')->references('id')->on('campaigns')->onDelete('restrict'); $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); }); } diff --git a/package-lock.json b/package-lock.json index 8a6678b..141ddd2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "html", + "name": "doe.it", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/resources/views/donations/historic.blade.php b/resources/views/donations/historic.blade.php index f1c9130..c5ee94c 100644 --- a/resources/views/donations/historic.blade.php +++ b/resources/views/donations/historic.blade.php @@ -26,8 +26,11 @@
-