From d5c59a0082e35668a2cb6303a557cb74d473822f Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Mon, 5 Aug 2019 15:19:34 +1000 Subject: [PATCH] [REF] Update selfService in updateBilling to use shared function Minor spelling fix Update as per Eileen's comment --- CRM/Contribute/Form/ContributionRecur.php | 2 +- CRM/Contribute/Form/UpdateBilling.php | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/CRM/Contribute/Form/ContributionRecur.php b/CRM/Contribute/Form/ContributionRecur.php index 2ec9a2fbc6..b333159eca 100644 --- a/CRM/Contribute/Form/ContributionRecur.php +++ b/CRM/Contribute/Form/ContributionRecur.php @@ -108,7 +108,7 @@ class CRM_Contribute_Form_ContributionRecur extends CRM_Core_Form { protected $subscriptionDetails = []; /** - * Is the from being accessed by a front end user to update their own recurring. + * Is the form being accessed by a front end user to update their own recurring. * * @var bool */ diff --git a/CRM/Contribute/Form/UpdateBilling.php b/CRM/Contribute/Form/UpdateBilling.php index 2854e77424..9ab033a5bd 100644 --- a/CRM/Contribute/Form/UpdateBilling.php +++ b/CRM/Contribute/Form/UpdateBilling.php @@ -39,8 +39,6 @@ class CRM_Contribute_Form_UpdateBilling extends CRM_Contribute_Form_Contribution protected $_subscriptionDetails = NULL; - protected $_selfService = FALSE; - public $_bltID = NULL; /** @@ -75,12 +73,6 @@ class CRM_Contribute_Form_UpdateBilling extends CRM_Contribute_Form_Contribution if ((!$this->_crid && !$this->_coid && !$this->_mid) || (!$this->_subscriptionDetails)) { CRM_Core_Error::fatal('Required information missing.'); } - if (!CRM_Core_Permission::check('edit contributions')) { - if ($this->_subscriptionDetails->contact_id != $this->getContactID()) { - CRM_Core_Error::statusBounce(ts('You do not have permission to cancel subscription.')); - } - $this->_selfService = TRUE; - } if (!$this->_paymentProcessor['object']->supports('updateSubscriptionBillingInfo')) { CRM_Core_Error::fatal(ts("%1 processor doesn't support updating subscription billing details.", @@ -160,7 +152,7 @@ class CRM_Contribute_Form_UpdateBilling extends CRM_Contribute_Form_Contribution */ public function buildQuickForm() { $type = 'next'; - if ($this->_selfService) { + if ($this->isSelfService()) { $type = 'submit'; } -- 2.25.1