Skip to content

Commit

Permalink
Minor cleanup to comments / messages
Browse files Browse the repository at this point in the history
  • Loading branch information
mattwire committed Aug 23, 2019
1 parent 79f7016 commit 0ee2d04
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CRM/Contribute/BAO/Contribution.php
Original file line number Diff line number Diff line change
Expand Up @@ -1016,6 +1016,7 @@ protected static function getRelatedMemberships($contributionID) {
* @return array
*/
protected static function cancel($processContributionObject, $memberships, $contributionId, $membershipStatuses, $updateResult, $participant, $oldStatus, $pledgePayment, $pledgeID, $pledgePaymentIDs, $contributionStatusId) {
// @fixme https://lab.civicrm.org/dev/core/issues/927 Cancelling membership etc is not desirable for all use-cases and we should be able to disable it
$processContribution = FALSE;
$participantStatuses = CRM_Event_PseudoConstant::participantStatus();
if (is_array($memberships)) {
Expand Down
1 change: 1 addition & 0 deletions CRM/Contribute/BAO/ContributionRecur.php
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ public static function cancelRecurContribution($params) {
$recur->cancel_date = date('YmdHis');
$recur->save();

// @fixme https://lab.civicrm.org/dev/core/issues/927 Cancelling membership etc is not desirable for all use-cases and we should be able to disable it
$dao = CRM_Contribute_BAO_ContributionRecur::getSubscriptionDetails($recurId);
if ($dao && $dao->recur_id) {
$details = CRM_Utils_Array::value('details', $activityParams);
Expand Down
2 changes: 1 addition & 1 deletion CRM/Core/Payment/BaseIPN.php
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ public function cancelled(&$objects, &$transaction, $input = []) {
*/
public function unhandled(&$objects, &$transaction) {
$transaction->rollback();
CRM_Core_Error::debug_log_message("returning since contribution status: is not handled");
Civi::log()->debug("Returning since contribution status is not handled");
echo "Failure: contribution status is not handled<p>";
return FALSE;
}
Expand Down

0 comments on commit 0ee2d04

Please sign in to comment.