From bdb15e5bba2c0a9940708bfbaa5953cfff015573 Mon Sep 17 00:00:00 2001 From: Dave Greenberg Date: Mon, 13 May 2013 12:02:52 -0700 Subject: [PATCH] CRM-12563 Removed extraneous else and tag. Fixed indenting throughout tpl file. ---------------------------------------- * CRM-12563: Mismatched tags in MembershipRenewal.tpl http://issues.civicrm.org/jira/browse/CRM-12563 --- .../CRM/Member/Form/MembershipRenewal.tpl | 650 +++++++++--------- 1 file changed, 332 insertions(+), 318 deletions(-) diff --git a/templates/CRM/Member/Form/MembershipRenewal.tpl b/templates/CRM/Member/Form/MembershipRenewal.tpl index 614d2be105..ba2af7a3c9 100644 --- a/templates/CRM/Member/Form/MembershipRenewal.tpl +++ b/templates/CRM/Member/Form/MembershipRenewal.tpl @@ -27,370 +27,384 @@ {if $cdType } {include file="CRM/Custom/Form/CustomData.tpl"} {else} -{if $membershipMode == 'test' } + {if $membershipMode == 'test' } {assign var=registerMode value="TEST"} -{elseif $membershipMode == 'live'} + {elseif $membershipMode == 'live'} {assign var=registerMode value="LIVE"} -{/if} -{if !$email} -
-
-

{ts}You will not be able to send an automatic email receipt for this Renew Membership because there is no email address recorded for this contact. If you want a receipt to be sent when this Membership is recorded, click Cancel and then click Edit from the Summary tab to add an email address before Renewal the Membership.{/ts}

-
-{/if} -{if $membershipMode} -
- {ts 1=$displayName 2=$registerMode}Use this form to Renew Membership Record on behalf of %1. A %2 transaction will be submitted using the selected payment processor.{/ts} -
-{/if} -{if $action eq 32768} -{if $cancelAutoRenew} -
-
-

{ts 1=$cancelAutoRenew}This membership is set to renew automatically {if $renewalDate}on {$renewalDate|crmDate}{/if}. You will need to cancel the auto-renew option if you want to modify the Membership Type, End Date or Membership Status. Click here if you want to cancel the automatic renewal option.{/ts}

+ {/if} + {if !$email} +
+
+

{ts}You will not be able to send an automatic email receipt for this Renew Membership because there is no email address recorded for this contact. If you want a receipt to be sent when this Membership is recorded, click Cancel and then click Edit from the Summary tab to add an email address before Renewal the Membership.{/ts}

-{/if} -

{ts}Renew Membership{/ts}

-{/if} -
+ {/if} + {if $membershipMode} +
+ {ts 1=$displayName 2=$registerMode}Use this form to Renew Membership Record on behalf of %1. + A %2 transaction will be submitted + using the selected payment processor.{/ts} +
+ {/if} + {if $action eq 32768} + {if $cancelAutoRenew} +
+
+

{ts 1=$cancelAutoRenew}This membership is set to renew automatically {if $renewalDate}on {$renewalDate|crmDate}{/if}. You will need to cancel the auto-renew option if you want to modify the Membership Type, End Date or Membership Status. + Click here + if you want to cancel the automatic renewal option.{/ts}

+
+ {/if} +

{ts}Renew Membership{/ts}

+ {/if} +
- {ts}Renewing will add the normal membership period to the End Date of the previous period for members whose status is Current or Grace. For Expired memberships, renewing will create a membership period commencing from the 'Date Renewal Entered'. This date can be adjusted including being set to the day after the previous End Date - if continuous membership is required.{/ts} + {ts}Renewing will add the normal membership period to the End Date of the previous period for members whose status is Current or Grace. For Expired memberships, renewing will create a membership period commencing from the 'Date Renewal Entered'. This date can be adjusted including being set to the day after the previous End Date - if continuous membership is required.{/ts}
{include file="CRM/common/formButtons.tpl" location="top"}
- - - + + + + + + + + + + + + + + + + + + + + + + + + + {if $membershipMode} + + + - - - + + - - - + - - - - - - - - - - - - - {if $membershipMode} - - - - - {/if} - {if $accessContribution and ! $membershipMode} - - - + + - - - - - {else} - - - - - {/if} + {/if}
{$form.payment_processor_id.label}{$form.payment_processor_id.html}
{$form.payment_processor_id.label}{$form.payment_processor_id.html}
{ts}Membership Organization and Type{/ts}{$orgName}  -  {$memType} + {if $member_is_test} {ts}(test){/ts}{/if} +   {ts}change membership type{/ts} +
{$form.membership_type_id.label}{$form.membership_type_id.html} + {if $member_is_test} {ts}(test){/ts}{/if}
+ {ts}Select Membership Organization and then Membership Type.{/ts} +
{ts}Membership Status{/ts} {$membershipStatus}
+ {ts}Status of this membership.{/ts}
{ts}Membership End Date{/ts} {$endDate}
{$form.renewal_date.label}{include file="CRM/common/jcalendar.tpl" elementName=renewal_date}
{$form.financial_type_id.label}{$form.financial_type_id.html}
+ {ts}Select the appropriate financial type for this payment.{/ts}
{ts}Membership Organization and Type{/ts}{$orgName}  -  {$memType} - {if $member_is_test} {ts}(test){/ts}{/if} -   {ts}change membership type{/ts} + {/if} + {if $accessContribution and ! $membershipMode} +
{$form.record_contribution.label}{$form.record_contribution.html}
+ {ts}Check this box to enter payment information. You will also be able to generate a customized receipt.{/ts}
{$form.membership_type_id.label}{$form.membership_type_id.html} - {if $member_is_test} {ts}(test){/ts}{/if}
- {ts}Select Membership Organization and then Membership Type.{/ts} +
+
+ {ts}Renewal Payment and Receipt{/ts} + + + + + + + + + {if $context neq 'standalone'} + + + + + + + + + {/if} + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {ts}Renewal extends membership end date by one membership period{/ts} +   {ts}change{/ts} +
{$form.num_terms.label}{$form.num_terms.html|crmAddClass:two} {ts}membership periods{/ts}
+ {ts}Extend the membership end date by this many membership periods. Make sure the appropriate corresponding fee is entered below.{/ts} +
{$form.contribution_contact.label}{$form.contribution_contact.html}  {help id="id-contribution_contact"}
  + + + + + + + {include file="CRM/Contact/Form/NewContact.tpl"} + +
{$form.honor_type_id.label}{$form.honor_type_id.html}
+
{$form.financial_type_id.label}{$form.financial_type_id.html}
+ {ts}Select the appropriate financial type for this payment.{/ts} +
{$form.total_amount.label}{$form.total_amount.html}
+ {ts}Membership payment amount. A contribution record will be created for this amount.{/ts} +
{$form.receive_date.label}{include file="CRM/common/jcalendar.tpl" elementName=receive_date}
{$form.payment_instrument_id.label}{$form.payment_instrument_id.html}
{$form.check_number.label}{$form.check_number.html|crmAddClass:six}
{$form.trxn_id.label}{$form.trxn_id.html}
{$form.contribution_status_id.label}{$form.contribution_status_id.html}
+
{ts}Membership Status{/ts} {$membershipStatus}
- {ts}Status of this membership.{/ts}
{ts}Membership End Date{/ts} {$endDate}
{$form.renewal_date.label}{include file="CRM/common/jcalendar.tpl" elementName=renewal_date}
{$form.financial_type_id.label}{$form.financial_type_id.html}
- {ts}Select the appropriate financial type for this payment.{/ts}
{$form.record_contribution.label}{$form.record_contribution.html}
- {ts}Check this box to enter payment information. You will also be able to generate a customized receipt.{/ts} + {else} +
{$form.total_amount.label}{$form.total_amount.html}
+ {ts}Membership payment amount. A contribution record will be created for this amount.{/ts}
-
{ts}Renewal Payment and Receipt{/ts} - - - - - - - - - {if $context neq 'standalone'} - - - - - - - - - {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {ts}Renewal extends membership end date by one membership period{/ts} -   {ts}change{/ts} -
{$form.num_terms.label}{$form.num_terms.html|crmAddClass:two} {ts}membership periods{/ts}
- {ts}Extend the membership end date by this many membership periods. Make sure the appropriate corresponding fee is entered below.{/ts}
{$form.contribution_contact.label}{$form.contribution_contact.html}  {help id="id-contribution_contact"}
  - - - - - - - {include file="CRM/Contact/Form/NewContact.tpl"} - -
{$form.honor_type_id.label}{$form.honor_type_id.html}
-
{$form.financial_type_id.label}{$form.financial_type_id.html}
- {ts}Select the appropriate financial type for this payment.{/ts}
{$form.total_amount.label}{$form.total_amount.html}
- {ts}Membership payment amount. A contribution record will be created for this amount.{/ts}
{$form.receive_date.label}{include file="CRM/common/jcalendar.tpl" elementName=receive_date}
{$form.payment_instrument_id.label}{$form.payment_instrument_id.html}
{$form.check_number.label}{$form.check_number.html|crmAddClass:six}
{$form.trxn_id.label}{$form.trxn_id.html}
{$form.contribution_status_id.label}{$form.contribution_status_id.html}
-
-
{$form.total_amount.label}{$form.total_amount.html}
- {ts}Membership payment amount. A contribution record will be created for this amount.{/ts}
{if $membershipMode} - {if $context neq 'standalone'} - - - - - - - - - -
{$form.contribution_contact.label}{$form.contribution_contact.html}  {help id="id-contribution_contact"}
  - - - - - - - {include file="CRM/Contact/Form/NewContact.tpl"} - -
{$form.honor_type_id.label}{$form.honor_type_id.html}
-
- {/if} -
- {include file='CRM/Core/BillingBlock.tpl'} - {else} + {if $context neq 'standalone'} + + + + + + + + +
{$form.contribution_contact.label}{$form.contribution_contact.html}  {help id="id-contribution_contact"}
  + + + + + + + {include file="CRM/Contact/Form/NewContact.tpl"} + +
{$form.honor_type_id.label}{$form.honor_type_id.html}
+
- {/if} - {if $email and $outBound_option != 2} - - + {/if} +
+ {include file='CRM/Core/BillingBlock.tpl'} + {/if} + {if $email and $outBound_option != 2} +
+ - - - - - - - - - - -
{$form.send_receipt.label}{$form.send_receipt.html}
- {ts 1=$email}Automatically email a membership confirmation and receipt to %1?{/ts} -
{$form.from_email_address.label}{$form.from_email_address.html}
{$form.receipt_text_renewal.label}{ts}Enter a message you want included at the beginning of the emailed receipt. EXAMPLE: 'Thanks for supporting our organization with your membership.'{/ts}
- {$form.receipt_text_renewal.html|crmAddClass:huge}
- {/if} + {$form.send_receipt.html}
+ {ts 1=$email}Automatically email a membership confirmation and receipt to %1?{/ts} + + + + {$form.from_email_address.label} + {$form.from_email_address.html} + + + {$form.receipt_text_renewal.label} + {ts}Enter a message you want included at the beginning of the emailed receipt. EXAMPLE: 'Thanks for supporting our organization with your membership.'{/ts}
+ {$form.receipt_text_renewal.html|crmAddClass:huge} + + + {/if} -
- {*include custom data js file*} - {include file="CRM/common/customData.tpl"} +
+ {*include custom data js file*} + {include file="CRM/common/customData.tpl"} -
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
-
- -{if $accessContribution and ! $membershipMode} +
+ + {if $accessContribution and ! $membershipMode} {include file="CRM/common/showHideByFieldValue.tpl" - trigger_field_id ="record_contribution" - trigger_value ="" - target_element_id ="recordContribution" - target_element_type ="table-row" - field_type ="radio" - invert = 0 + trigger_field_id ="record_contribution" + trigger_value ="" + target_element_id ="recordContribution" + target_element_type ="table-row" + field_type ="radio" + invert = 0 } -{/if} + {/if} -{if $email and $outBound_option != 2} + {if $email and $outBound_option != 2} {include file="CRM/common/showHideByFieldValue.tpl" - trigger_field_id ="send_receipt" - trigger_value ="" - target_element_id ="notice" - target_element_type ="table-row" - field_type ="radio" - invert = 0 + trigger_field_id ="send_receipt" + trigger_value ="" + target_element_id ="notice" + target_element_type ="table-row" + field_type ="radio" + invert = 0 } {include file="CRM/common/showHideByFieldValue.tpl" - trigger_field_id ="send_receipt" - trigger_value ="" - target_element_id ="fromEmail" - target_element_type ="table-row" - field_type ="radio" - invert = 0 + trigger_field_id ="send_receipt" + trigger_value ="" + target_element_id ="fromEmail" + target_element_type ="table-row" + field_type ="radio" + invert = 0 } -{/if} + {/if} -{if !$membershipMode} + {if !$membershipMode} {include file="CRM/common/showHideByFieldValue.tpl" - trigger_field_id ="payment_instrument_id" - trigger_value = '4' - target_element_id ="checkNumber" - target_element_type ="table-row" - field_type ="select" - invert = 0 + trigger_field_id ="payment_instrument_id" + trigger_value = '4' + target_element_id ="checkNumber" + target_element_type ="table-row" + field_type ="select" + invert = 0 } {include file="CRM/common/showHideByFieldValue.tpl" - trigger_field_id ="send_receipt" - trigger_value ="" - target_element_id ="fromEmail" - target_element_type ="table-row" - field_type ="radio" - invert = 0 + trigger_field_id ="send_receipt" + trigger_value ="" + target_element_id ="fromEmail" + target_element_type ="table-row" + field_type ="radio" + invert = 0 } -{/if} + {/if} {literal} - + function setDifferentContactBlock() { + //get the + if (cj('#contribution_contact').attr('checked')) { + cj('#record-different-contact').show(); + } + else { + cj('#record-different-contact').hide(); + } + } + {/literal} {/if}{* closing of custom data if *} -- 2.25.1