Merge pull request #22956 from eileenmcnaughton/notice4

[civicrm-core.git] / CRM / Invoicing / Utils.php

diff --git a/CRM/Invoicing/Utils.php b/CRM/Invoicing/Utils.php
index dbcc4befacd850f6a2731d5949d8baf853b09cf2..4a6e48ee54095451d4e59e701f975d6a138d2df7 100644 (file)
--- a/CRM/Invoicing/Utils.php
+++ b/CRM/Invoicing/Utils.php
@@ -55,11 +55,7 @@ class CRM_Invoicing_Utils {
    * We check both here. But will deprecate the latter in time.
    */
   public static function isInvoicingEnabled() {
-    if (Civi::settings()->get('invoicing')) {
-      return TRUE;
-    }
-    $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
-    return $invoiceSettings['invoicing'] ?? NULL;
+    return Civi::settings()->get('invoicing');
   }
 
   /**
@@ -69,8 +65,7 @@ class CRM_Invoicing_Utils {
    * is unsupported. Here we have a wrapper function to make later cleanup easier.
    */
   public static function getTaxTerm() {
-    $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
-    return $invoiceSettings['tax_term'] ?? NULL;
+    return Civi::settings()->get('tax_term');
   }
 
 }