Merge pull request #22508 from twomice/event_66_allow_dupliate_price_field_label

[civicrm-core.git] / CRM / Price / Page / Field.php

diff --git a/CRM/Price/Page/Field.php b/CRM/Price/Page/Field.php
index d59d9a0eaec85a4e1978600d8b89dd48b3ebb2ff..71cec4233d06a549e9d42b16ffd56f0e96e26ad8 100644 (file)
--- a/CRM/Price/Page/Field.php
+++ b/CRM/Price/Page/Field.php
@@ -108,9 +108,7 @@ class CRM_Price_Page_Field extends CRM_Core_Page {
     $priceFieldBAO->find();
 
     // display taxTerm for priceFields
-    $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
     $taxTerm = Civi::settings()->get('tax_term');
-    $invoicing = $invoiceSettings['invoicing'] ?? NULL;
     $getTaxDetails = FALSE;
     $taxRate = CRM_Core_PseudoConstant::getTaxRates();
     CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($financialTypes);
@@ -126,7 +124,7 @@ class CRM_Price_Page_Field extends CRM_Core_Page {
         CRM_Price_BAO_PriceFieldValue::retrieve($params, $optionValues);
         $priceField[$priceFieldBAO->id]['price'] = $optionValues['amount'] ?? NULL;
         $financialTypeId = $optionValues['financial_type_id'];
-        if ($invoicing && isset($taxRate[$financialTypeId])) {
+        if (Civi::settings()->get('invoicing') && isset($taxRate[$financialTypeId])) {
           $priceField[$priceFieldBAO->id]['tax_rate'] = $taxRate[$financialTypeId];
           $getTaxDetails = TRUE;
         }