wip

impress-org · Apr 30, 2024 · c4e4fd0 · c4e4fd0
1 parent 3441bf7
commit c4e4fd0
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 11 deletions.
diff --git a/src/DonationForms/DataTransferObjects/DonationFormGoalData.php b/src/DonationForms/DataTransferObjects/DonationFormGoalData.php
@@ -4,6 +4,7 @@
 
 use Give\DonationForms\Properties\FormSettings;
 use Give\DonationForms\Repositories\DonationFormRepository;
+use Give\DonationForms\ValueObjects\GoalProgressType;
 use Give\DonationForms\ValueObjects\GoalType;
 use Give\Framework\Support\Contracts\Arrayable;
 
@@ -32,6 +33,18 @@ class DonationFormGoalData implements Arrayable
      * @var int
      */
     public $targetAmount;
+    /**
+     * @var GoalProgressType
+     */
+    public $goalProgressType;
+    /**
+     * @var string|null
+     */
+    public $goalStartDate;
+    /**
+     * @var string|null
+     */
+    public $goalEndDate;
 
     /**
      * @since 3.0.0
@@ -43,6 +56,9 @@ public function __construct(int $formId, FormSettings $formSettings)
         $this->isEnabled = $formSettings->enableDonationGoal ?? false;
         $this->goalType = $formSettings->goalType ?? GoalType::AMOUNT();
         $this->targetAmount = $this->formSettings->goalAmount ?? 0;
+        $this->goalProgressType = $this->formSettings->goalProgressType ?? GoalProgressType::ALL_TIME();
+        $this->goalStartDate = $this->formSettings->goalStartDate ?? null;
+        $this->goalEndDate = $this->formSettings->goalEndDate ?? null;
     }
 
     /**
@@ -68,7 +84,9 @@ public function getCurrentAmount()
                 return $donationFormRepository->getTotalNumberOfDonorsFromSubscriptions($this->formId);
             case GoalType::AMOUNT():
             default:
-                return $donationFormRepository->getTotalRevenue($this->formId);
+                return $this->goalProgressType->isAllTime()
+                    ? $donationFormRepository->getTotalRevenue($this->formId)
+                    : $donationFormRepository->getTotalRevenueForDateRange($this->formId,$this->goalStartDate, $this->goalEndDate);
         endswitch;
     }
 

diff --git a/src/DonationForms/Repositories/DonationFormRepository.php b/src/DonationForms/Repositories/DonationFormRepository.php
@@ -394,10 +394,16 @@ public function getTotalNumberOfDonorsFromSubscriptions(int $formId): int
      */
     public function getTotalNumberOfDonations(int $formId): int
     {
-        return DB::table('posts')
-            ->leftJoin('give_donationmeta', 'ID', 'donation_id')
-            ->where('meta_key', DonationMetaKeys::FORM_ID)
-            ->where('meta_value', $formId)
+        return (new DonationQuery)
+            ->form($formId)
+            ->count();
+    }
+
+    public function getTotalNumberOfDonationsForDateRange(int $formId, string $startDate, string $endDate): int
+    {
+        return (new DonationQuery)
+            ->form($formId)
+            ->between($startDate, $endDate)
             ->count();
     }
 
@@ -422,6 +428,17 @@ public function getTotalRevenue(int $formId): int
             ->sumIntendedAmount();
     }
 
+    /**
+     * @unreleased
+     */
+    public function getTotalRevenueForDateRange(int $formId, string $startDate, string $endDate): int
+    {
+        return (int) (new DonationQuery)
+            ->form($formId)
+            ->between($startDate, $endDate)
+            ->sumIntendedAmount();
+    }
+
     /**
      * @since 3.0.0
      * @return int|float

diff --git a/src/DonationForms/ViewModels/DonationFormViewModel.php b/src/DonationForms/ViewModels/DonationFormViewModel.php
@@ -6,6 +6,7 @@
 use Give\DonationForms\Actions\GenerateDonateRouteUrl;
 use Give\DonationForms\Actions\GenerateDonationFormValidationRouteUrl;
 use Give\DonationForms\DataTransferObjects\DonationFormGoalData;
+use Give\DonationForms\DonationQuery;
 use Give\DonationForms\Properties\FormSettings;
 use Give\DonationForms\Repositories\DonationFormRepository;
 use Give\DonationForms\ValueObjects\GoalType;
@@ -181,14 +182,18 @@ private function formStatsData(): array
     {
         $goalType = $this->goalType();
 
-        $totalRevenue = $this->getTotalRevenue($goalType);
-        $totalCountValue = $this->getTotalCountValue($goalType);
-        $totalCountLabel = $this->getCountLabel($goalType);
+        $donationQuery = (new DonationQuery)->form($this->donationFormId);
+
+        if($this->formSettings->goalProgressType->isCustom()) {
+            $donationQuery->between($this->formSettings->goalStartDate, $this->formSettings->goalEndDate);
+        }
 
         return [
-            'totalRevenue' => $totalRevenue,
-            'totalCountValue' => $totalCountValue,
-            'totalCountLabel' => $totalCountLabel,
+            'totalRevenue' => $donationQuery->sumIntendedAmount(),
+            'totalCountValue' => $goalType->isDonations() || $goalType->isAmount()
+                ? $donationQuery->count()
+                : $this->getTotalCountValue($goalType),
+            'totalCountLabel' => $this->getCountLabel($goalType),
         ];
     }