Merged in PG-354-check-noneligible-contributions (pull request civicr…

…m#27) PG-354: Check if submitted contribution has \'No\' as selected option
mukeshcompucorp · Jan 13, 2017 · 1a0604b · 1a0604b
2 parents b7f13cd + 77404e6
commit 1a0604b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.../all/civicrm_extensions/uk.co.compucorp.civicrm.giftaid/CRM/Civigiftaid/Utils/GiftAid.php b/.../all/civicrm_extensions/uk.co.compucorp.civicrm.giftaid/CRM/Civigiftaid/Utils/GiftAid.php
@@ -447,7 +447,8 @@ static function isContributionSubmitted($contributionID) {
 
       $dao = CRM_Core_DAO::executeQuery( $sql, $sqlParams );
 
-      if(!count($dao->fetchAll())) {
+      $count = count($dao->fetchAll());
+      if(!$count || $dao->eligible_for_gift_aid == 0) {
         return FALSE;
       }
       return TRUE;