[REF] Retrieve the token if it is avaliable from the Payment Token ta…

…ble if no processor_id is set Update the updateBilling and updateSubscription forms as well
civicrm · Jun 2, 2020 · 02f3e80 · 02f3e80
1 parent 3e401df
commit 02f3e80
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/CRM/Contribute/BAO/ContributionRecur.php b/CRM/Contribute/BAO/ContributionRecur.php
@@ -330,6 +330,7 @@ public static function getSubscriptionDetails($entityID, $entity = 'recur') {
 SELECT rec.id                   as recur_id,
        rec.processor_id         as subscription_id,
        rec.frequency_interval,
+       rec.payment_token_id as token_id,
        rec.installments,
        rec.frequency_unit,
        rec.amount,

diff --git a/CRM/Contribute/Form/CancelSubscription.php b/CRM/Contribute/Form/CancelSubscription.php
@@ -218,7 +218,7 @@ public function postProcess() {
         $propertyBag->setIsNotifyProcessorOnCancelRecur(!empty($params['send_cancel_request']));
       }
       $propertyBag->setContributionRecurID($this->getSubscriptionDetails()->recur_id);
-      $propertyBag->setRecurProcessorID($this->getSubscriptionDetails()->subscription_id);
+      $propertyBag->setRecurProcessorID($this->getSubscriptionID());
       $message = $this->_paymentProcessorObj->doCancelRecurring($propertyBag)['message'];
     }
     catch (\Civi\Payment\Exception\PaymentProcessorException $e) {

diff --git a/CRM/Contribute/Form/ContributionRecur.php b/CRM/Contribute/Form/ContributionRecur.php
@@ -195,6 +195,17 @@ protected function getSubscriptionContactID() {
     return $sub->contact_id ?? FALSE;
   }
 
+  protected function getSubscriptionID() {
+    $sub = $this->getSubscriptionDetails();
+    if (empty($sub->subscription_id) && !empty($sub->token_id)) {
+      $tokenDetails = civicrm_api3('PaymentToken', 'get', ['id' => $sub->token_id]);
+      if (!empty($tokenDetails['values'])) {
+        return $tokenDetails['values'][$tokenDetails['id']]['token'];
+      }
+    }
+    return $sub->subscription_id;
+  }
+
   /**
    * Is this being used by a front end user to update their own recurring.
    *

diff --git a/CRM/Contribute/Form/UpdateBilling.php b/CRM/Contribute/Form/UpdateBilling.php
@@ -202,7 +202,7 @@ public function postProcess() {
     $processorParams['country'] = CRM_Core_PseudoConstant::country($params["billing_country_id-{$this->_bltID}"], FALSE);
     $processorParams['month'] = $processorParams['credit_card_exp_date']['M'];
     $processorParams['year'] = $processorParams['credit_card_exp_date']['Y'];
-    $processorParams['subscriptionId'] = $this->_subscriptionDetails->subscription_id;
+    $processorParams['subscriptionId'] = $this->getSubscriptionID();
     $processorParams['amount'] = $this->_subscriptionDetails->amount;
     $updateSubscription = $this->_paymentProcessor['object']->updateSubscriptionBillingInfo($message, $processorParams);
     if (is_a($updateSubscription, 'CRM_Core_Error')) {

diff --git a/CRM/Contribute/Form/UpdateSubscription.php b/CRM/Contribute/Form/UpdateSubscription.php
@@ -206,7 +206,7 @@ public function postProcess() {
     $params['id'] = $this->_subscriptionDetails->recur_id;
     $message = '';
 
-    $params['subscriptionId'] = $this->_subscriptionDetails->subscription_id;
+    $params['subscriptionId'] = $this->getSubscriptionID();
     $updateSubscription = TRUE;
     if ($this->_paymentProcessorObj->supports('changeSubscriptionAmount')) {
       try {