From a250198d6a83575c6441f848523dd02edbbf9e12 Mon Sep 17 00:00:00 2001
From: Alan Dixon <alan.g.dixon@gmail.com>
Date: Thu, 18 Mar 2021 14:03:43 +0000
Subject: [PATCH] ACHEFT only disables the billing info update, not the general
 schedule editing or amount

---
 CRM/Core/Payment/iATSService.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/CRM/Core/Payment/iATSService.php b/CRM/Core/Payment/iATSService.php
index cc5b764c..cb3aec47 100644
--- a/CRM/Core/Payment/iATSService.php
+++ b/CRM/Core/Payment/iATSService.php
@@ -120,10 +120,7 @@ public function isSupported($method) {
    * @return bool
    */
   protected function allowSelfService($action) {
-    if ('CRM_Core_Payment_iATSServiceACHEFT' == CRM_Utils_System::getClassName($this)) {
-      return FALSE;
-    }
-    elseif (!CRM_Core_Permission::check('access CiviContribute')) {
+    if (!CRM_Core_Permission::check('access CiviContribute')) {
       // disable self-service 'action' if the admin has not allowed it
       if (FALSE == $this->getSettings('enable_'.$action)) {
 	return FALSE;
@@ -149,6 +146,10 @@ public function supportsFutureRecurStartDate() {
    */
 
   public function supportsUpdateSubscriptionBillingInfo() {
+    // the CiviCRM internal form for updating billing info for ACHEFT is inadequate
+    if ('CRM_Core_Payment_iATSServiceACHEFT' == CRM_Utils_System::getClassName($this)) {
+      return FALSE;
+    }
     return $this->allowSelfService('update_subscription_billing_info');
   }