Merge pull request #19284 from eileenmcnaughton/mem_r

[REF] Remove some variables not relevant to backoffice member form
civicrm · Jan 7, 2021 · 6b90f7f · 6b90f7f
2 parents 065ae51 + 0c6fa57
commit 6b90f7f
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
@@ -1299,9 +1299,7 @@ public function submit() {
             '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,
             'financial_type_id' => $params['financial_type_id'],
           ]
@@ -1317,7 +1315,6 @@ public function submit() {
 
         $paymentParams['contactID'] = $this->_contactID;
         $paymentParams['contributionID'] = $contribution->id;
-        $paymentParams['contributionPageID'] = $contribution->contribution_page_id;
         $paymentParams['contributionRecurID'] = $contribution->contribution_recur_id;
         $params['contribution_id'] = $paymentParams['contributionID'];
         $params['contribution_recur_id'] = $paymentParams['contributionRecurID'];
@@ -1843,10 +1840,8 @@ protected function getSelectedMembershipLabels(): string {
    *   - line_item
    *   - is_test
    *   - campaign_id
-   *   - contribution_page_id
    *   - source
    *   - payment_type_id
-   *   - thankyou_date (not all forms will set this)
    *
    * @return \CRM_Contribute_DAO_Contribution
    *
@@ -1889,15 +1884,9 @@ protected function processContribution(
       $contributionParams = array_merge([
         '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,
-        //configure cancel reason, cancel date and thankyou date
-        //from 'contribution' type profile if included
-        'cancel_reason' => $params['cancel_reason'] ?? 0,
-        'cancel_date' => isset($params['cancel_date']) ? CRM_Utils_Date::format($params['cancel_date']) : NULL,
-        'thankyou_date' => isset($params['thankyou_date']) ? CRM_Utils_Date::format($params['thankyou_date']) : NULL,
         //setting to make available to hook - although seems wrong to set on form for BAO hook availability
         'skipLineItem' => $params['skipLineItem'] ?? 0,
       ], $contributionParams);