Update EwayRecurring Payment Class for 5.64 and also run civix upgrade

ChrisChinchilla · Sep 10, 2023 · 6ceedba · 6ceedba
1 parent 93d55e7
commit 6ceedba
Show file tree

Hide file tree

Showing 10 changed files with 253 additions and 744 deletions.
diff --git a/CRM/Core/Payment/Ewayrecurring.php b/CRM/Core/Payment/Ewayrecurring.php
@@ -147,10 +147,16 @@ public function doDirectPayment(&$params) {
         $params['payment_status_id'] = 1;
         // If there's only one installment, then the recurring contribution is now complete
         if (isset($params['installments']) && $params['installments'] == 1) {
-          $status = CRM_Core_OptionGroup::getValue('contribution_status', 'Completed', 'name');
+          $status = CRM_Core_PseudoConstant::getKey(
+            'CRM_Contribute_DAO_ContributionRecur',
+            'contribution_status_id',
+            'Completed');
         }
         else {
-          $status = CRM_Core_OptionGroup::getValue('contribution_status', 'In Progress', 'name');
+          $status = CRM_Core_PseudoConstant::getKey(
+            'CRM_Contribute_DAO_ContributionRecur',
+            'contribution_status_id',
+            'In Progress');
         }
         $recurringContributionID = isset($params['contributionRecurID'])
           ? $params['contributionRecurID']

diff --git a/CRM/Ewayrecurring/Upgrader.php b/CRM/Ewayrecurring/Upgrader.php
@@ -3,7 +3,7 @@
 /**
  * Collection of upgrade steps
  */
-class CRM_Ewayrecurring_Upgrader extends CRM_Ewayrecurring_Upgrader_Base {
+class CRM_Ewayrecurring_Upgrader extends CRM_Extension_Upgrader_Base {
 
   // By convention, functions that look like "function upgrade_NNNN()" are
   /* upgrade tasks. They are executed in order (like Drupal's hook_update_N).