Merge pull request #6753 from ChurchCRM/fix-pledge-editor-select2

ChurchCRM · Dec 13, 2023 · 8fe891f · 8fe891f
2 parents 717c16c + 0f16d5d
commit 8fe891f
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/PledgeEditor.php b/src/PledgeEditor.php
@@ -406,7 +406,8 @@
             $rsFam = RunQuery($sSQL);
             $numRows = mysqli_num_rows($rsFam);
             if ($numRows) {
-                $iFamily = $rsFam['fam_ID'];
+                $aRow = mysqli_fetch_array($rsDeposit);
+                $iFamily = $aRow['fam_ID'];
             }
         }
     } else {
@@ -731,7 +732,7 @@
           data: "",
           processResults: function (data, params) {
             var results = [];
-            var families = JSON.parse(data).Families
+            var families = data?.Families ?? [];
             $.each(families, function(key, object) {
               results.push({
                 id: object.Id,
@@ -765,9 +766,7 @@ function EvalCheckNumberGroup()
   {
     if ($("#Method option:selected").val()==="CHECK") {
       $("#checkNumberGroup").show();
-    }
-    else
-    {
+    } else {
       $("#checkNumberGroup").hide();
       $("#CheckNo").val('');
     }
@@ -776,8 +775,7 @@ function CalculateTotal() {
     var Total = 0;
       $(".FundAmount").each(function(object){
         var FundAmount = Number($(this).val());
-        if (FundAmount >0 )
-        {
+        if (FundAmount > 0) {
           Total += FundAmount;
         }
       });