Merge pull request #16744 from civicrm/5.24

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

diff --git a/CRM/Invoicing/Utils.php b/CRM/Invoicing/Utils.php
index 6f0bc50cf263d6d3defa53db3e7b78e1edf4875f..dbcc4befacd850f6a2731d5949d8baf853b09cf2 100644 (file)
--- a/CRM/Invoicing/Utils.php
+++ b/CRM/Invoicing/Utils.php
@@ -59,25 +59,7 @@ class CRM_Invoicing_Utils {
       return TRUE;
     }
     $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
-    return CRM_Utils_Array::value('invoicing', $invoiceSettings);
-  }
-
-  /**
-   * Function to call to determine default invoice page.
-   *
-   * Historically the invoicing was declared as a setting but actually
-   * set within contribution_invoice_settings (which stores multiple settings
-   * as an array in a non-standard way).
-   *
-   * We check both here. But will deprecate the latter in time.
-   */
-  public static function getDefaultPaymentPage() {
-    $value = Civi::settings()->get('default_invoice_page');
-    if (is_numeric($value)) {
-      return $value;
-    }
-    $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
-    return CRM_Utils_Array::value('default_invoice_page', $invoiceSettings);
+    return $invoiceSettings['invoicing'] ?? NULL;
   }
 
   /**
@@ -88,7 +70,7 @@ class CRM_Invoicing_Utils {
    */
   public static function getTaxTerm() {
     $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
-    return CRM_Utils_Array::value('tax_term', $invoiceSettings);
+    return $invoiceSettings['tax_term'] ?? NULL;
   }
 
 }