From a7494d96061f3f306181e084e4d2dc9f93edccc9 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Sat, 5 Feb 2022 14:32:17 +1300
Subject: [PATCH] Notice fixes

These primarily affect 'grumpy-mode'
---
 CRM/Contribute/BAO/ContributionRecur.php        | 13 +++++++++----
 CRM/Contribute/BAO/Query.php                    |  6 ++++++
 CRM/Core/BAO/Query.php                          |  4 ++--
 templates/CRM/Contribute/Form/Search/Common.tpl |  8 ++++----
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/CRM/Contribute/BAO/ContributionRecur.php b/CRM/Contribute/BAO/ContributionRecur.php
index 980782b6a0..3a9c504d50 100644
--- a/CRM/Contribute/BAO/ContributionRecur.php
+++ b/CRM/Contribute/BAO/ContributionRecur.php
@@ -830,12 +830,17 @@ INNER JOIN civicrm_contribution       con ON ( con.id = mp.contribution_id )
   }
 
   /**
-   * @param CRM_Core_Form $form
+   * Recurring contribution fields.
+   *
+   * @param CRM_Contribute_Form_Search $form
+   *
+   * @throws \CRM_Core_Exception
    */
-  public static function recurringContribution(&$form) {
-    // Recurring contribution fields
+  public static function recurringContribution($form): void {
+    // This assignment may be overwritten.
+    $form->assign('contribution_recur_pane_open', FALSE);
     foreach (self::getRecurringFields() as $key) {
-      if ($key == 'contribution_recur_payment_made' && !empty($form->_formValues) &&
+      if ($key === 'contribution_recur_payment_made' && !empty($form->_formValues) &&
         !CRM_Utils_System::isNull(CRM_Utils_Array::value($key, $form->_formValues))
       ) {
         $form->assign('contribution_recur_pane_open', TRUE);
diff --git a/CRM/Contribute/BAO/Query.php b/CRM/Contribute/BAO/Query.php
index 5a762d3f44..8f3ebd68e7 100644
--- a/CRM/Contribute/BAO/Query.php
+++ b/CRM/Contribute/BAO/Query.php
@@ -1008,6 +1008,9 @@ class CRM_Contribute_BAO_Query extends CRM_Core_BAO_Query {
         ]
       );
     }
+    else {
+      $form->addOptionalQuickFormElement('contribution_product_id');
+    }
 
     self::addCustomFormFields($form, ['Contribution']);
 
@@ -1027,6 +1030,9 @@ class CRM_Contribute_BAO_Query extends CRM_Core_BAO_Query {
         FALSE, ['class' => 'crm-select2']
       );
     }
+    else {
+      $form->addOptionalQuickFormElement('contribution_batch_id');
+    }
 
     $form->assign('validCiviContribute', TRUE);
     $form->setDefaults(['contribution_test' => 0]);
diff --git a/CRM/Core/BAO/Query.php b/CRM/Core/BAO/Query.php
index 173273bc5b..8438206243 100644
--- a/CRM/Core/BAO/Query.php
+++ b/CRM/Core/BAO/Query.php
@@ -23,8 +23,6 @@ class CRM_Core_BAO_Query {
   public static function addCustomFormFields(&$form, $extends) {
     $groupDetails = CRM_Core_BAO_CustomGroup::getGroupDetail(NULL, TRUE, $extends);
     if ($groupDetails) {
-      $tplName = lcfirst($extends[0]) . 'GroupTree';
-      $form->assign($tplName, $groupDetails);
       foreach ($groupDetails as $group) {
         foreach ($group['fields'] as $field) {
           $fieldId = $field['id'];
@@ -38,6 +36,8 @@ class CRM_Core_BAO_Query {
         }
       }
     }
+    $tplName = lcfirst($extends[0]) . 'GroupTree';
+    $form->assign($tplName, $groupDetails);
   }
 
   /**
diff --git a/templates/CRM/Contribute/Form/Search/Common.tpl b/templates/CRM/Contribute/Form/Search/Common.tpl
index c585ac38de..adbd113037 100644
--- a/templates/CRM/Contribute/Form/Search/Common.tpl
+++ b/templates/CRM/Contribute/Form/Search/Common.tpl
@@ -25,7 +25,7 @@
     <label>{ts}Currency{/ts}</label> <br />
     {$form.contribution_currency_type.html|crmAddClass:twenty}
   </td>
-  {if !empty($form.contribution_batch_id.html)}
+  {if $form.contribution_batch_id.html}
     <td>
       {$form.contribution_batch_id.label}<br />
       {$form.contribution_batch_id.html}
@@ -58,7 +58,7 @@
 </tr>
 <tr>
   <td>
-    {if !empty($form.contribution_or_softcredits)}
+    {if $form.contribution_or_softcredits}
       {$form.contribution_or_softcredits.label} <br />
       {$form.contribution_or_softcredits.html}<br />
       <div class="float-left" id="contribution_soft_credit_type_wrapper">
@@ -138,7 +138,7 @@
     {$form.contribution_source.html|crmAddClass:twenty}
   </td>
   <td>
-    {if !empty($form.contribution_product_id)}
+    {if $form.contribution_product_id}
       {$form.contribution_product_id.label} <br />
       {$form.contribution_product_id.html|crmAddClass:twenty}
     {/if}
@@ -182,7 +182,7 @@ campaignTrClass='' campaignTdClass=''}
   </td>
 </tr>
 
-{if !empty($contributionGroupTree)}
+{if $contributionGroupTree}
 <tr>
   <td colspan="2">
   {include file="CRM/Custom/Form/Search.tpl" groupTree=$contributionGroupTree showHideLinks=false}</td>
-- 
2.25.1