From 3cb75688d61995fbe4d00767a054f336cbfac3a2 Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Fri, 14 Aug 2020 15:27:14 +0100
Subject: [PATCH] Fix recurring fields on backend contribution forms

---
 .../Form/AdditionalInfo/Payment.tpl           | 35 +++++++++++--------
 .../CRM/Contribute/Form/Contribution.tpl      | 12 ++-----
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/templates/CRM/Contribute/Form/AdditionalInfo/Payment.tpl b/templates/CRM/Contribute/Form/AdditionalInfo/Payment.tpl
index 0a3921c8cf..f8e4d088a0 100644
--- a/templates/CRM/Contribute/Form/AdditionalInfo/Payment.tpl
+++ b/templates/CRM/Contribute/Form/AdditionalInfo/Payment.tpl
@@ -12,21 +12,23 @@
 {literal}
   <script type="text/javascript" >
 
-    function enablePeriod() {
-      var frUnit = cj('#frequency_unit');
-      var frInerval = cj('#frequency_interval');
+    function toggleRecur() {
+      var isRecur = cj('input[id="is_recur"]:checked');
+      var frequencyUnit = cj('#frequency_unit');
+      var frequencyInterval = cj('#frequency_interval');
       var installments = cj('#installments');
-      isDisabled = false;
-
-      if (cj('input:radio[name="is_recur"]:checked').val() == 0)  {
-        isDisabled = true;
-        frInerval.val('');
+      if (isRecur.val() > 0) {
+        frequencyUnit.prop('disabled', false).addClass('required');
+        frequencyInterval.prop('disabled', false).addClass('required');
+        installments.prop('disabled', false);
+      }
+      else {
+        frequencyInterval.val('');
         installments.val('');
+        frequencyUnit.prop('disabled', true).removeClass('required');
+        frequencyInterval.prop('disabled', true).removeClass('required');
+        installments.prop('disabled', true);
       }
-
-      frUnit.prop('disabled', isDisabled);
-      frInerval.prop('disabled', isDisabled);
-      installments.prop('disabled', isDisabled);
     }
 
     function buildRecurBlock(processorId) {
@@ -44,14 +46,17 @@
           cj('input:radio[name="is_recur"]')[0].checked = true;
         }
       }
-
-      enablePeriod();
+      toggleRecur();
       eval('cj("#recurringPaymentBlock").' + funName + "()");
     }
 
     CRM.$(function($) {
       buildRecurBlock(null);
-      enablePeriod();
+      toggleRecur();
+
+      cj('input[id="is_recur"]').on('change', function() {
+        toggleRecur();
+      });
     });
 
   </script>
diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index 5dff905447..d138524d16 100644
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -33,7 +33,6 @@
   {/if}
 
   <div class="crm-block crm-form-block crm-contribution-form-block">
-
     {if !$email and $action neq 8 and $context neq 'standalone'}
       <div class="messages status no-popup">
         {icon icon="fa-info-circle"}{/icon}{ts}You will not be able to send an automatic email receipt for this contribution because there is no email address recorded for this contact. If you want a receipt to be sent when this contribution is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the contribution.{/ts}
@@ -102,7 +101,7 @@
           </tr>
 
           {if $buildRecurBlock && !$payNow}
-            <tr id='recurringPaymentBlock' class='hiddenElement'>
+            <tr id='recurringPaymentBlock'>
               <td></td>
               <td>
                 <strong>{$form.is_recur.html} {ts}every{/ts}
@@ -343,6 +342,7 @@
             loadPanes(cj(this).attr('id'));
           });
         });
+
         // load panes function calls for snippet based on id of crm-accordion-header
         function loadPanes(id) {
           var url = "{/literal}{crmURL p='civicrm/contact/view/contribution' q="snippet=4&id=`$entityID`&formType=" h=0}{literal}" + id;
@@ -398,9 +398,7 @@
         {* Additional Detail / Honoree Information / Premium Information *}
         {foreach from=$allPanes key=paneName item=paneValue}
           <div class="crm-accordion-wrapper crm-ajax-accordion crm-{$paneValue.id}-accordion {if $paneValue.open neq 'true'}collapsed{/if}">
-            <div class="crm-accordion-header" id="{$paneValue.id}">
-              {$paneName}
-            </div><!-- /.crm-accordion-header -->
+            <div class="crm-accordion-header" id="{$paneValue.id}">{$paneName}</div>
             <div class="crm-accordion-body">
               <div class="{$paneValue.id}"></div>
             </div><!-- /.crm-accordion-body -->
@@ -469,17 +467,13 @@
       });
     </script>
   {/if} {* not delete mode if*}
-
 {/if} {* closing of main custom data if *}
 
 {literal}
 <script type="text/javascript">
-
   {/literal}
-
   // load form during form rule.
   {if $buildPriceSet}{literal}buildAmount();{/literal}{/if}
-
   {literal}
 
   // CRM-16451: set financial type of 'Price Set' in back office contribution
-- 
2.25.1