From fe4d1285dcf9fbbfa91f14ddce903be9dd6f251f Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 16 Jul 2021 10:20:57 +1200
Subject: [PATCH] [REF] Remove some legacy references to
 contribution_invoice_settings

These subkeys are now settings in their own right & can be accessed directly. The Settings code handles
inconsistencies so we don't need to
---
 CRM/Admin/Form/Preferences/Display.php       |  3 +--
 CRM/Contribute/Form/Contribution.php         |  4 +---
 CRM/Contribute/Form/Contribution/Confirm.php |  4 +---
 CRM/Event/Form/Participant.php               |  4 +---
 CRM/Financial/BAO/FinancialType.php          | 12 +-----------
 CRM/Invoicing/Utils.php                      |  6 +-----
 6 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/CRM/Admin/Form/Preferences/Display.php b/CRM/Admin/Form/Preferences/Display.php
index 0716cdebd233..5b135e13b477 100644
--- a/CRM/Admin/Form/Preferences/Display.php
+++ b/CRM/Admin/Form/Preferences/Display.php
@@ -47,8 +47,7 @@ class CRM_Admin_Form_Preferences_Display extends CRM_Admin_Form_Preferences {
   public function buildQuickForm() {
 
     //changes for freezing the invoices/credit notes checkbox if invoicing is uncheck
-    $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
-    $this->assign('invoicing', CRM_Invoicing_Utils::isInvoicingEnabled());
+    $this->assign('invoicing', Civi::settings()->get('invoicing'));
 
     $this->addElement(
       'xbutton',
diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php
index 43133c429a9c..a33f30873943 100644
--- a/CRM/Contribute/Form/Contribution.php
+++ b/CRM/Contribute/Form/Contribution.php
@@ -1668,9 +1668,7 @@ protected function submit($submittedValues, $action, $pledgePaymentID) {
    * @param array $lineItem
    */
   protected function invoicingPostProcessHook($submittedValues, $action, $lineItem) {
-
-    $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
-    if (empty($invoiceSettings['invoicing'])) {
+    if (!Civi::settings()->get('invoicing')) {
       return;
     }
     $taxRate = [];
diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index 8d771e402674..cfe4d791c318 100644
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -1105,9 +1105,7 @@ public static function processFormContribution(
 
       $contribution = CRM_Contribute_BAO_Contribution::add($contributionParams);
 
-      $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
-      $invoicing = $invoiceSettings['invoicing'] ?? NULL;
-      if ($invoicing) {
+      if (Civi::settings()->get('invoicing')) {
         $dataArray = [];
         // @todo - interrogate the line items passed in on the params array.
         // No reason to assume line items will be set on the form.
diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php
index 18fa581f869e..b4f395b99b81 100644
--- a/CRM/Event/Form/Participant.php
+++ b/CRM/Event/Form/Participant.php
@@ -1477,8 +1477,6 @@ public function submit($params) {
         if ($this->_isPaidEvent) {
           // fix amount for each of participants ( for bulk mode )
           $eventAmount = [];
-          $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
-          $invoicing = $invoiceSettings['invoicing'] ?? NULL;
           $totalTaxAmount = 0;
 
           //add dataArray in the receipts in ADD and UPDATE condition
@@ -1489,7 +1487,7 @@ public function submit($params) {
           elseif ($this->_action & CRM_Core_Action::UPDATE) {
             $line = $this->_values['line_items'];
           }
-          if ($invoicing) {
+          if (Civi::settings()->get('invoicing')) {
             foreach ($line as $key => $value) {
               if (isset($value['tax_amount'])) {
                 $totalTaxAmount += $value['tax_amount'];
diff --git a/CRM/Financial/BAO/FinancialType.php b/CRM/Financial/BAO/FinancialType.php
index 86d3528066f0..0444ba96032c 100644
--- a/CRM/Financial/BAO/FinancialType.php
+++ b/CRM/Financial/BAO/FinancialType.php
@@ -476,17 +476,7 @@ public static function checkPermissionToEditFinancialType($financialTypeID) {
    * @return bool
    */
   public static function isACLFinancialTypeStatus() {
-    if (!isset(\Civi::$statics[__CLASS__]['is_acl_enabled'])) {
-      \Civi::$statics[__CLASS__]['is_acl_enabled'] = FALSE;
-      $realSetting = \Civi::$statics[__CLASS__]['is_acl_enabled'] = Civi::settings()->get('acl_financial_type');
-      if (!$realSetting) {
-        $contributeSettings = Civi::settings()->get('contribution_invoice_settings');
-        if (!empty($contributeSettings['acl_financial_type'])) {
-          \Civi::$statics[__CLASS__]['is_acl_enabled'] = TRUE;
-        }
-      }
-    }
-    return \Civi::$statics[__CLASS__]['is_acl_enabled'];
+    return Civi::settings()->get('acl_financial_type');
   }
 
 }
diff --git a/CRM/Invoicing/Utils.php b/CRM/Invoicing/Utils.php
index 24fe4078e755..4a6e48ee5409 100644
--- a/CRM/Invoicing/Utils.php
+++ b/CRM/Invoicing/Utils.php
@@ -55,11 +55,7 @@ public static function onToggle($oldValue, $newValue, $metadata) {
    * 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');
   }
 
   /**