From 12829b5d722f78fd6963c5936fbefd9d35ef603f Mon Sep 17 00:00:00 2001 From: eileenmcnaugton Date: Wed, 5 Aug 2015 10:15:57 +1200 Subject: [PATCH] CRM-16523 test fix --- CRM/Contribute/BAO/Contribution.php | 1 + CRM/Core/Payment/PayPalProIPN.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index 04c72bc5e3..ae495441a6 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -4044,6 +4044,7 @@ WHERE con.id = {$contributionId} 'payment_instrument_id', 'is_test', 'campaign_id', + 'receive_date', ); $contributionParams = array_merge(array( diff --git a/CRM/Core/Payment/PayPalProIPN.php b/CRM/Core/Payment/PayPalProIPN.php index cd1c2a6cf5..0cd114e3b0 100644 --- a/CRM/Core/Payment/PayPalProIPN.php +++ b/CRM/Core/Payment/PayPalProIPN.php @@ -520,7 +520,7 @@ INNER JOIN civicrm_membership_payment mp ON m.id = mp.membership_id AND mp.contr $input['fee_amount'] = self::retrieve('mc_fee', 'Money', 'POST', FALSE); $input['net_amount'] = self::retrieve('settle_amount', 'Money', 'POST', FALSE); $input['trxn_id'] = self::retrieve('txn_id', 'String', 'POST', FALSE); - $input['payment_date'] = self::retrieve('payment_date', 'String', 'POST', FALSE); + $input['payment_date'] = $input['receive_date'] = self::retrieve('payment_date', 'String', 'POST', FALSE); } /** -- 2.25.1