From 23f9d014660207c0e6b91b6c2b2b1abcdd20db1c Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Fri, 10 Nov 2023 15:09:27 +1300 Subject: [PATCH] Simplify if --- CRM/Contribute/Form/Contribution/Confirm.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php index 5c87b87c32..359551652a 100644 --- a/CRM/Contribute/Form/Contribution/Confirm.php +++ b/CRM/Contribute/Form/Contribution/Confirm.php @@ -1449,19 +1449,16 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr if (!empty($membershipParams['auto_renew'])) { $isRecurForFirstTransaction = FALSE; } + $membershipParams['total_amount'] = $totalAmount; + $membershipParams['skipLineItem'] = 0; + CRM_Price_BAO_LineItem::getLineItemArray($membershipParams); } - - if (!$isProcessSeparateMembershipTransaction) { + else { // Skip line items in the contribution processing transaction. // We will create them with the membership for proper linking. $membershipParams['skipLineItem'] = 1; } - else { - $membershipParams['total_amount'] = $totalAmount; - $membershipParams['skipLineItem'] = 0; - CRM_Price_BAO_LineItem::getLineItemArray($membershipParams); - } $paymentResult = $this->processConfirm( $membershipParams, $contactID, -- 2.25.1