From 59691709235b866473e6d702566f2bbf66472459 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 6 Oct 2021 19:08:51 +1300
Subject: [PATCH] Fix regression from enotice fixes

---
 CRM/Contribute/Form/Contribution.php           | 8 +++++---
 templates/CRM/Contribute/Form/Contribution.tpl | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php
index ba9b781b33..581251f49a 100644
--- a/CRM/Contribute/Form/Contribution.php
+++ b/CRM/Contribute/Form/Contribution.php
@@ -243,10 +243,10 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
 
     // Get the contribution id if update
     $this->_id = CRM_Utils_Request::retrieve('id', 'Positive');
+    $this->assign('isUsePaymentBlock', !empty($this->_id));
     if (!empty($this->_id)) {
       $this->assignPaymentInfoBlock();
       $this->assign('contribID', $this->_id);
-      $this->assign('isUsePaymentBlock', TRUE);
     }
 
     $this->_context = CRM_Utils_Request::retrieve('context', 'Alphanumeric', $this);
@@ -510,8 +510,10 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
     // build price set form.
     $buildPriceSet = FALSE;
     $invoicing = CRM_Invoicing_Utils::isInvoicingEnabled();
-    $this->assign('invoicing', $invoicing);
-
+    $this->assign('invoicing', CRM_Invoicing_Utils::isInvoicingEnabled());
+    // This is a probably-deprecated approach to partial payments - assign here
+    // & if true it will be overwritten.
+    $this->assign('payNow', FALSE);
     $buildRecurBlock = FALSE;
 
     // display tax amount on edit contribution page
diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index 2d1724fc20..ccf25e943b 100644
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -84,7 +84,7 @@
               {if !empty($freezeFinancialType)}
                 {help id="id-total_amount"}
               {/if}
-              {if !empty($payNow)}
+              {if !$payNow}
                 {if $hasPriceSets}
                   <span id='totalAmountORPriceSet'> {ts}OR{/ts}</span>
                   <span id='selectPriceSet'>{$form.price_set_id.html}</span>
@@ -100,7 +100,7 @@
             </td>
           </tr>
 
-          {if $buildRecurBlock && !empty($payNow)}
+          {if $buildRecurBlock && !$payNow}
             <tr id='recurringPaymentBlock'>
               <td></td>
               <td>
@@ -148,7 +148,7 @@
               {if $contribution_status_id eq 2}{if $is_pay_later }: {ts}Pay Later{/ts} {else}: {ts}Incomplete Transaction{/ts}{/if}{/if}
             </td>
             <td>
-              {if !empty($isUsePaymentBlock) && $contactId && $contribID && $contributionMode EQ null && $contribution_status_id eq 2}
+              {if !$isUsePaymentBlock && $contactId && $contribID && $contributionMode EQ null && $contribution_status_id eq 2}
                 {capture assign=payNowLink}{crmURL p='civicrm/contact/view/contribution' q="reset=1&action=update&id=`$contribID`&cid=`$contactId`&context=`$context`&mode=live"}{/capture}
                 <a class="open-inline action-item crm-hover-button" href="{$payNowLink}"><i class="crm-i fa-credit-card" aria-hidden="true"></i> {ts}Pay with Credit Card{/ts}</a>
               {/if}
-- 
2.25.1