Allow completing a contribution that has Failed status via updateContributionCompleted()

CRM/Core/Payment/MJWIPNTrait.php

@@ -293,9 +293,23 @@ trait CRM_Core_Payment_MJWIPNTrait {
         $paymentParams[$paymentKey] = $params[$contributionKey];
       }
     }
+
+    // CiviCRM does not (currently) allow changing contribution_status=Failed to anything else.
+    // But we need to go from Failed to Completed if payment succeeds following a failure.
+    // So we check for Failed status and update to Pending so it will transition to Completed.
+    $failedContributionStatus = (int) CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Failed');
+    if ((int) $this->contribution['contribution_status_id'] === $failedContributionStatus) {
+      $sql = "UPDATE civicrm_contribution SET contribution_status_id=%1 WHERE id=%2";
+      $queryParams = [
+        1 => [CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Pending'), 'Positive'],
+        2 => [$params['contribution_id'], 'Positive'],
+      ];
+      CRM_Core_DAO::executeQuery($sql, $queryParams);
+    }
     $paymentParams['is_send_contribution_notification'] = $this->getSendEmailReceipt();
     $paymentParams['skipCleanMoney'] = TRUE;
-    $payment = civicrm_api3('Mjwpayment', 'create_payment', $paymentParams);
+    $paymentParams['payment_processor_id'] = $this->_paymentProcessor->getID();
+    civicrm_api3('Mjwpayment', 'create_payment', $paymentParams);
   }
 
   /**