Return 0 if total amount is 0 instead of NULL.

civicrm · Dec 20, 2019 · 5ce8232 · 5ce8232
1 parent a43ea4b
commit 5ce8232
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/CRM/Core/BAO/FinancialTrxn.php b/CRM/Core/BAO/FinancialTrxn.php
@@ -479,12 +479,14 @@ public static function getPartialPaymentWithType($entityId, $entityName = 'parti
   }
 
   /**
+   * Get the total sum of all payments (and optionally refunds) for a contribution record
+   *
    * @param int $contributionID
    * @param bool $includeRefund
    *
-   * @return string
+   * @return float
    */
-  public static function getTotalPayments($contributionID, $includeRefund = FALSE) {
+  public static function getTotalPayments($contributionID, $includeRefund = FALSE): float {
     $statusIDs = [CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed')];
 
     if ($includeRefund) {
@@ -495,10 +497,14 @@ public static function getTotalPayments($contributionID, $includeRefund = FALSE)
       INNER JOIN civicrm_entity_financial_trxn eft ON (eft.financial_trxn_id = ft.id AND eft.entity_table = 'civicrm_contribution')
       WHERE eft.entity_id = %1 AND ft.is_payment = 1 AND ft.status_id IN (%2) ";
 
-    return CRM_Core_DAO::singleValueQuery($sql, [
+    $totalAmount = CRM_Core_DAO::singleValueQuery($sql, [
       1 => [$contributionID, 'Integer'],
       2 => [implode(',', $statusIDs), 'CommaSeparatedIntegers'],
     ]);
+    if (!$totalAmount) {
+      $totalAmount = 0;
+    }
+    return $totalAmount;
   }
 
   /**