X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=CRM%2FContribute%2FBAO%2FContribution.php;h=d50b3285bf14531a6f3add0fabc9c8a7ccb97e55;hb=ad37ac8ed3992e075cddfef34d562f4dc8c22247;hp=d6e68f17e211e402238e4b7cd2faaff18c84ca6f;hpb=5495710842acf6635053a9ec6269d11de54efb03;p=civicrm-core.git diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index d6e68f17e2..d50b3285bf 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -943,7 +943,10 @@ LEFT JOIN civicrm_line_item i ON ( i.contribution_id = c.id AND i.entity_table * payments is important for forensic and outreach reasons. * * @param int $contributionID + * @param int $contactID * @param string $message + * + * @throws \CiviCRM_API3_Exception */ public static function failPayment($contributionID, $contactID, $message) { civicrm_api3('activity', 'create', array( @@ -1246,7 +1249,7 @@ WHERE civicrm_contribution.contact_id = civicrm_contact.id AND b.is_test = 0 AND b.receive_date >= $startDate AND b.receive_date < $endDate - $additionalWhere + $additionalWhere GROUP BY currency "; $dao = CRM_Core_DAO::executeQuery($query, CRM_Core_DAO::$_nullArray); @@ -1947,9 +1950,9 @@ LEFT JOIN civicrm_contribution contribution ON ( componentPayment.contribution_ $contactContributionsSQL = " SELECT contribution.id AS id FROM civicrm_contribution contribution - LEFT JOIN civicrm_line_item i ON i.contribution_id = contribution.id AND i.entity_table = 'civicrm_contribution' $liWhere - WHERE contribution.is_test = 0 AND contribution.contact_id = {$contactId} - $additionalWhere + LEFT JOIN civicrm_line_item i ON i.contribution_id = contribution.id AND i.entity_table = 'civicrm_contribution' $liWhere + WHERE contribution.is_test = 0 AND contribution.contact_id = {$contactId} + $additionalWhere AND i.id IS NULL"; $contactSoftCreditContributionsSQL = "