Convert Membership/Membership Renewal forms to standard customData template

diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl
index 09de10b7976d92f9731cad416e00a3de6d7c48f2..c8d2cd54394d9a66226380d0b065ac255c06d539 100644 (file)
--- 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 7bc1994cabafbd7f26720de9839afd2b2ab7f599..81013ec4445ca993f30985af8d4cd1d511563953 100644 (file)
--- 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() {