Skip to content

Commit

Permalink
Hide the membership type field rather than disabling it
Browse files Browse the repository at this point in the history
Disabling the field removes it from submission causing validation errors
  • Loading branch information
wmortada committed Mar 6, 2020
1 parent 10ac1ea commit 6639478
Showing 1 changed file with 18 additions and 12 deletions.
30 changes: 18 additions & 12 deletions templates/CRM/Member/Form/Membership.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,16 @@
</tr>
<tr class="crm-membership-form-block-membership_type_id">
<td class="label">{$form.membership_type_id.label}</td>
<td><span id='mem_type_id'>{$form.membership_type_id.html}</span>
<td id="mem_type_id-readonly">
<span id="membership_type_id_0-readonly"></span> : <span id="membership_type_id_1-readonly"></span>
<span id="mem-type-override">
<a href="#" class="crm-hover-button action-item override-mem-type" id="show-mem-type">
{ts}Override organization and type{/ts}
</a>
{help id="override_membership_type"}
</span>
</td>
<td id="mem_type_id-editable"><span id='mem_type_id'>{$form.membership_type_id.html}</span>
{if $hasPriceSets}
<span id='totalAmountORPriceSet'> {ts}OR{/ts}</span>
<span id='selectPriceSet'>{$form.price_set_id.html}</span>
Expand All @@ -87,12 +96,6 @@
{/if}
{/if}
{if $member_is_test} {ts}(test){/ts}{/if}
<span id="mem-type-override">
<a href="#" class="crm-hover-button action-item override-mem-type" id="show-mem-type">
{ts}Override organization and type{/ts}
</a>
{help id="override_membership_type"}
</span>
<br />
<span class="description">{ts}Select Membership Organization and then Membership Type.{/ts}{if $hasPriceSets} {ts}Alternatively, you can use a price set.{/ts}{/if}</span>
</td>
Expand Down Expand Up @@ -362,17 +365,20 @@
// give option to override membership type for auto-renew memberships - dev/core#1331
{/literal}
{if $isRecur}
cj('#mem_type_id select').attr("disabled","disabled");
cj('#membership_type_id_0-readonly').text(cj('#membership_type_id_0 option:selected').text());
cj('#membership_type_id_1-readonly').text(cj('#membership_type_id_1 option:selected').text());
cj('#mem_type_id-readonly').show();
cj('#mem_type_id-editable').hide();
{else}
cj('#mem-type-override').hide();
cj('#mem_type_id-readonly').hide();
cj('#mem_type_id-editable').show();
{/if}
{literal}
cj('#show-mem-type').click( function( e ) {
e.preventDefault();
// enable select buttons
cj('#mem_type_id select').removeAttr("disabled");
cj('#mem-type-override').hide();
cj('#mem_type_id-readonly').hide();
cj('#mem_type_id-editable').show();
});
// give option to override end-date for auto-renew memberships
Expand Down

0 comments on commit 6639478

Please sign in to comment.