From 28d434534e7e0b1a7ecee40b6e8c9dff96a643a6 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sun, 14 Mar 2021 15:23:13 +1300
Subject: [PATCH] [REF] Minor parameter cleanup

Removes 2 params that are set in order to be passed into
legacyProcessRecurringContribution - however that function does not use them
---
 CRM/Member/Form/Membership.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index 68cc82b751..1d80c7360f 100644
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -1263,7 +1263,7 @@ DESC limit 1");
         //create new soft-credit record, CRM-13981
         if ($softParams) {
           $softParams['contribution_id'] = $contribution->id;
-          $softParams['currency'] = $contribution->currency;
+          $softParams['currency'] = $this->getCurrency();
           $softParams['amount'] = $contribution->total_amount;
           CRM_Contribute_BAO_ContributionSoft::add($softParams);
         }
@@ -1819,10 +1819,6 @@ DESC limit 1");
     $contributionParams
   ) {
     $contactID = $contributionParams['contact_id'];
-
-    // add these values for the recurringContrib function ,CRM-10188
-    $params['financial_type_id'] = $this->getFinancialTypeID();
-    $params['is_recur'] = TRUE;
     $recurringContributionID = $this->legacyProcessRecurringContribution($params, $contactID);
 
     if ($recurringContributionID) {
@@ -1841,19 +1837,19 @@ DESC limit 1");
    * @param int $contactID
    *
    * @return int
+   * @throws \CiviCRM_API3_Exception
    */
   protected function legacyProcessRecurringContribution(array $params, $contactID): int {
 
     $recurParams = ['contact_id' => $contactID];
-    $recurParams['amount'] = $params['amount'] ?? NULL;
+    $recurParams['amount'] = $this->order->getTotalAmount();
     $recurParams['auto_renew'] = $params['auto_renew'] ?? NULL;
     $recurParams['frequency_unit'] = $params['frequency_unit'] ?? NULL;
     $recurParams['frequency_interval'] = $params['frequency_interval'] ?? NULL;
     $recurParams['installments'] = $params['installments'] ?? NULL;
     $recurParams['financial_type_id'] = $this->getFinancialTypeID();
-    $recurParams['currency'] = $params['currency'] ?? NULL;
+    $recurParams['currency'] = $this->getCurrency();
     $recurParams['payment_instrument_id'] = $this->getPaymentInstrumentID();
-
     $recurParams['is_test'] = $this->isTest();
 
     $recurParams['start_date'] = $recurParams['create_date'] = $recurParams['modified_date'] = CRM_Utils_Time::date('YmdHis');
@@ -1878,7 +1874,7 @@ DESC limit 1");
    *
    * @return bool
    */
-  protected function isTest(): int {
+  protected function isTest(): bool {
     return ($this->_mode === 'test') ? TRUE : FALSE;
   }
 
-- 
2.25.1