From 87284bb93dcb3c961b8f6f4a5dfbeb7f677eccb1 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Thu, 29 Jul 2021 21:41:55 +1200 Subject: [PATCH] dev/core#2719 [REF] Remove legacy reference to contribution_invoice_settings --- CRM/Price/BAO/PriceField.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CRM/Price/BAO/PriceField.php b/CRM/Price/BAO/PriceField.php index cc52463cc4..244a32fbe4 100644 --- a/CRM/Price/BAO/PriceField.php +++ b/CRM/Price/BAO/PriceField.php @@ -281,7 +281,7 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField { $label = (!empty($qf->_membershipBlock) && $field->name == 'contribution_amount') ? ts('Additional Contribution') : $field->label; } - if ($field->name == 'contribution_amount') { + if ($field->name === 'contribution_amount') { $qf->_contributionAmount = 1; } @@ -297,10 +297,9 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField { //use value field. $valueFieldName = 'amount'; $separator = '|'; - $invoiceSettings = Civi::settings()->get('contribution_invoice_settings'); $taxTerm = Civi::settings()->get('tax_term'); - $displayOpt = $invoiceSettings['tax_display_settings'] ?? NULL; - $invoicing = $invoiceSettings['invoicing'] ?? NULL; + $displayOpt = Civi::settings()->get('tax_display_settings'); + $invoicing = Civi::settings()->get('invoicing'); switch ($field->html_type) { case 'Text': $optionKey = key($customOption); -- 2.25.1