From 62e185a92e6d9e7c0b3cf5385a267140d848f32e Mon Sep 17 00:00:00 2001
From: "Matthew Wire (MJW Consulting)" <mjw@mjwconsult.co.uk>
Date: Mon, 7 Jan 2019 17:55:53 +0000
Subject: [PATCH] Convert Membership/Membership Renewal forms to standard
 customData template

---
 templates/CRM/Member/Form/Membership.tpl        |  4 ++--
 templates/CRM/Member/Form/MembershipRenewal.tpl | 10 +---------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl
index 09de10b797..c8d2cd5439 100644
--- a/templates/CRM/Member/Form/Membership.tpl
+++ b/templates/CRM/Member/Form/Membership.tpl
@@ -614,7 +614,7 @@
         var fname = '#priceset';
         if ( !priceSetId ) {
         cj('#membership_type_id_1').val(0);
-        CRM.buildCustomData(customDataType, null );
+        CRM.buildCustomData(customDataType, null);
 
         // hide price set fields.
         cj( fname ).hide( );
@@ -797,7 +797,7 @@
         subTypeNames = null;
       }
 
-      CRM.buildCustomData( customDataType, subTypeNames );
+      CRM.buildCustomData(customDataType, subTypeNames);
     }
 
   function enableAmountSection( setContributionType ) {
diff --git a/templates/CRM/Member/Form/MembershipRenewal.tpl b/templates/CRM/Member/Form/MembershipRenewal.tpl
index 7bc1994cab..81013ec444 100644
--- a/templates/CRM/Member/Form/MembershipRenewal.tpl
+++ b/templates/CRM/Member/Form/MembershipRenewal.tpl
@@ -136,9 +136,7 @@
       </table>
     {/if}
 
-    <div id="customData"></div>
-    {*include custom data js file*}
-    {include file="CRM/common/customData.tpl"}
+    {include file="CRM/common/customDataBlock.tpl"}
 
     <div>{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 
@@ -189,12 +187,6 @@
     CRM.$(function($) {
       $('#membershipOrgType').hide();
       $('#changeNumTerms').hide();
-      {/literal}
-      CRM.buildCustomData('{$customDataType}');
-      {if $customDataSubType}
-      CRM.buildCustomData('{$customDataType}', {$customDataSubType});
-      {/if}
-      {literal}
     });
 
     function checkPayment() {
-- 
2.25.1