Fix setting of recur ID for changeSubscriptionAmount

CRM/Core/Payment/MJWTrait.php

@@ -503,7 +503,15 @@ trait CRM_Core_Payment_MJWTrait {
      * ];
      */
     $propertyBag = PropertyBag::cast($params);
-    $propertyBag->setContributionRecurID($params['contributionRecurID'] ?? $params['id']);
+    if (!$propertyBag->has('contributionRecurID')) {
+      if (!empty($params['id'])) {
+        $propertyBag->setContributionRecurID($params['id']);
+      }
+      else {
+        throw new PaymentProcessorException('You MUST pass contributionRecurID (or id) to changeSubscriptionAmount$params');
+      }
+    }
+
     $propertyBag->setIsRecur(TRUE);
 
     $existingRecur = ContributionRecur::get(FALSE)
@@ -512,6 +520,9 @@ trait CRM_Core_Payment_MJWTrait {
       ->execute()
       ->first();
 
+    if (!$propertyBag->has('recurProcessorID')) {
+      $propertyBag->setRecurProcessorID($existingRecur['processor_id']);
+    }
     $propertyBag->setRecurInstallments($existingRecur['installments'] ?? 0);
     $propertyBag->setRecurFrequencyInterval($existingRecur['frequency_interval']);
     $propertyBag->setRecurFrequencyUnit($existingRecur['frequency_unit']);