From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Thu, 7 Jan 2021 10:39:14 +0000 (+0000)
Subject: Merge pull request #19284 from eileenmcnaughton/mem_r
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6b90f7f69b75196f002e53d12771fafb38f1696c;p=civicrm-core.git

Merge pull request #19284 from eileenmcnaughton/mem_r

[REF] Remove some variables not relevant to backoffice member form
---

6b90f7f69b75196f002e53d12771fafb38f1696c
diff --cc CRM/Member/Form/Membership.php
index 212c3a5b1e,d0fb9af42a..4988331a0e
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@@ -1299,12 -1303,10 +1299,10 @@@ DESC limit 1")
              'line_item' => $lineItem,
              'is_test' => $isTest,
              'campaign_id' => $paymentParams['campaign_id'] ?? NULL,
-             'contribution_page_id' => $formValues['contribution_page_id'] ?? NULL,
              'source' => CRM_Utils_Array::value('source', $paymentParams, CRM_Utils_Array::value('description', $paymentParams)),
-             'thankyou_date' => $paymentParams['thankyou_date'] ?? NULL,
              'payment_instrument_id' => $paymentInstrumentID,
 -          ],
 -          $financialType
 +            'financial_type_id' => $params['financial_type_id'],
 +          ]
          );
  
          //create new soft-credit record, CRM-13981
@@@ -1843,11 -1845,11 +1840,9 @@@
     *   - line_item
     *   - is_test
     *   - campaign_id
-    *   - contribution_page_id
     *   - source
     *   - payment_type_id
-    *   - thankyou_date (not all forms will set this)
     *
 -   * @param CRM_Financial_DAO_FinancialType $financialType
 -   *
     * @return \CRM_Contribute_DAO_Contribution
     *
     * @throws \CRM_Core_Exception
@@@ -1887,9 -1891,9 +1882,8 @@@
  
      if (isset($params['amount'])) {
        $contributionParams = array_merge([
 -        'financial_type_id' => $financialType->id,
          'receive_date' => !empty($params['receive_date']) ? CRM_Utils_Date::processDate($params['receive_date']) : date('YmdHis'),
          'tax_amount' => $params['tax_amount'] ?? NULL,
-         'amount_level' => $params['amount_level'] ?? NULL,
          'invoice_id' => $params['invoiceID'],
          'currency' => $params['currencyID'],
          'is_pay_later' => $params['is_pay_later'] ?? 0,