fix project resources

code4romania · Dec 12, 2023 · 5ab0a86 · 5ab0a86
1 parent 04cf11a
commit 5ab0a86
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app/Http/Resources/Project/ShowProjectResource.php b/app/Http/Resources/Project/ShowProjectResource.php
@@ -61,7 +61,7 @@ public function toArray(Request $request): array
             'donations' => [
                 'target' => money_format($this->target_budget),
                 'total' => money_format($this->total_donations),
-                'count' => $this->donations_count,
+                'count' => $this->approved_donations_count,
                 'percentage' => $this->percentage,
             ],
             'championship' => [

diff --git a/app/Models/Project.php b/app/Models/Project.php
@@ -8,6 +8,7 @@
 use App\Concerns\HasSlug;
 use App\Concerns\HasVolunteers;
 use App\Concerns\LogsActivityForApproval;
+use App\Enums\EuPlatescStatus;
 use App\Enums\ProjectStatus;
 use App\Traits\HasProjectStatus;
 use Embed\Embed;
@@ -80,6 +81,7 @@ class Project extends Model implements HasMedia
 
     protected $withCount = [
         'donations',
+        'approvedDonations',
     ];
 
     public function registerMediaCollections(): void
@@ -124,6 +126,11 @@ public function donations(): HasMany
         return $this->hasMany(Donation::class);
     }
 
+    public function approvedDonations(): HasMany
+    {
+        return $this->donations()->where('status', EuPlatescStatus::CHARGED);
+    }
+
     public function stages(): BelongsToMany
     {
         return $this->belongsToMany(ChampionshipStage::class);
@@ -149,7 +156,7 @@ public function categories(): BelongsToMany
 
     public function getTotalDonationsAttribute(): int
     {
-        return (int) $this->donations->sum('amount');
+        return (int) $this->approvedDonations->sum('amount');
     }
 
     public function getCoverImageAttribute(): string