CRM-20889: Toggle check_number field on backoffice form as payment form fields

[civicrm-core.git] / templates / CRM / Member / Form / MembershipCommon.tpl

diff --git a/templates/CRM/Member/Form/MembershipCommon.tpl b/templates/CRM/Member/Form/MembershipCommon.tpl
index caf862471bc08106d10e0bb04cba8393ecfc2417..fcad577e7fdd2e6846122fcc74a72c42042e94fc 100644 (file)
--- a/templates/CRM/Member/Form/MembershipCommon.tpl
+++ b/templates/CRM/Member/Form/MembershipCommon.tpl
@@ -40,10 +40,6 @@
           <td class="label">{$form.payment_instrument_id.label}<span class='marker'>*</span></td>
           <td>{$form.payment_instrument_id.html} {help id="payment_instrument_id" file="CRM/Contribute/Page/Tab.hlp"}</td>
         </tr>
-        <tr id="checkNumber" class="crm-{$formClass}-form-block-check_number">
-          <td class="label">{$form.check_number.label}</td>
-          <td>{$form.check_number.html|crmAddClass:six}</td>
-        </tr>
 
         {if $action neq 2 }
           <tr class="crm-{$formClass}-form-block-trxn_id">
@@ -55,6 +51,12 @@
           <td class="label">{$form.contribution_status_id.label}</td>
           <td>{$form.contribution_status_id.html}</td>
         </tr>
+
+        <tr class="crm-membership-form-block-billing">
+          <td colspan="2">
+            {include file='CRM/Core/BillingBlockWrapper.tpl'}
+          </td>
+        </tr>
       </table>
     </fieldset></td></tr>
   {/if}
@@ -106,8 +108,3 @@
     <td>{$form.payment_processor_id.html}</td>
   </tr>
 {/if}
-<tr class="crm-membership-form-block-billing">
-  <td colspan="2">
-    {include file='CRM/Core/BillingBlockWrapper.tpl'}
-  </td>
-</tr>