From 547be599046d413a1e371defda0135e63066923e Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Sat, 8 Jan 2022 17:15:48 +1300
Subject: [PATCH] Cleanup around taxTerm assignment

Use less lins & more grepability to assign the tax term
---
 CRM/Price/Page/Option.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/CRM/Price/Page/Option.php b/CRM/Price/Page/Option.php
index b3b2f7464a..3a999008f5 100644
--- a/CRM/Price/Page/Option.php
+++ b/CRM/Price/Page/Option.php
@@ -25,6 +25,8 @@
  */
 class CRM_Price_Page_Option extends CRM_Core_Page {
 
+  use CRM_Financial_Form_SalesTaxTrait;
+
   public $useLivePageJS = TRUE;
 
   /**
@@ -102,7 +104,7 @@ class CRM_Price_Page_Option extends CRM_Core_Page {
    *
    * @return void
    */
-  public function browse() {
+  public function browse(): void {
     $priceOptions = civicrm_api3('PriceFieldValue', 'get', [
       'price_field_id' => $this->_fid,
          // Explicitly do not check permissions so we are not
@@ -124,12 +126,8 @@ class CRM_Price_Page_Option extends CRM_Core_Page {
       $isEvent = TRUE;
     }
 
-    $config = CRM_Core_Config::singleton();
     $taxRate = CRM_Core_PseudoConstant::getTaxRates();
-    // display taxTerm for priceFields
-    $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
-    $taxTerm = Civi::settings()->get('tax_term');
-    $invoicing = $invoiceSettings['invoicing'] ?? NULL;
+
     $getTaxDetails = FALSE;
     foreach ($customOption as $id => $values) {
       $action = array_sum(array_keys(self::actionLinks()));
@@ -137,7 +135,7 @@ class CRM_Price_Page_Option extends CRM_Core_Page {
       if (isset($taxRate[$values['financial_type_id']])) {
         // Cast to float so trailing zero decimals are removed
         $customOption[$id]['tax_rate'] = (float) $taxRate[$values['financial_type_id']];
-        if ($invoicing && isset($customOption[$id]['tax_rate'])) {
+        if (Civi::settings()->get('invoicing') && isset($customOption[$id]['tax_rate'])) {
           $getTaxDetails = TRUE;
         }
         $taxAmount = CRM_Contribute_BAO_Contribution_Utils::calculateTaxAmount($customOption[$id]['amount'], $customOption[$id]['tax_rate']);
@@ -179,11 +177,11 @@ class CRM_Price_Page_Option extends CRM_Core_Page {
       'id', $returnURL, $filter
     );
 
-    $this->assign('taxTerm', $taxTerm);
     $this->assign('getTaxDetails', $getTaxDetails);
     $this->assign('customOption', $customOption);
     $this->assign('sid', $this->_sid);
     $this->assign('isEvent', $isEvent);
+    $this->assignSalesTaxTermToTemplate();
   }
 
   /**
@@ -228,8 +226,8 @@ class CRM_Price_Page_Option extends CRM_Core_Page {
       $this->assign('usedPriceSetTitle', CRM_Price_BAO_PriceFieldValue::getOptionLabel($oid));
       $this->assign('usedBy', $usedBy);
       $comps = [
-        "Event" => "civicrm_event",
-        "Contribution" => "civicrm_contribution_page",
+        'Event' => 'civicrm_event',
+        'Contribution' => 'civicrm_contribution_page',
       ];
       $priceSetContexts = [];
       foreach ($comps as $name => $table) {
-- 
2.25.1