From dc108c062042bc07d88af1f9ba36b1e86e952750 Mon Sep 17 00:00:00 2001 From: larssandergreen Date: Wed, 24 May 2023 22:17:02 -0600 Subject: [PATCH] Remove unneeded text on Membership --- templates/CRM/Member/Form/Membership.tpl | 4 +-- templates/CRM/Member/Form/MembershipBlock.hlp | 7 ++++ templates/CRM/Member/Form/MembershipBlock.tpl | 30 ++++++---------- .../CRM/Member/Form/MembershipCommon.tpl | 10 ++---- .../CRM/Member/Form/MembershipRenewal.tpl | 35 ++++++++----------- 5 files changed, 36 insertions(+), 50 deletions(-) diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl index 7f8203b0a0..a5a39ff270 100644 --- a/templates/CRM/Member/Form/Membership.tpl +++ b/templates/CRM/Member/Form/Membership.tpl @@ -177,7 +177,7 @@ {$form.send_receipt.label} - {$form.send_receipt.html}
+ {$form.send_receipt.html} {ts 1=$emailExists}Automatically email a membership confirmation and receipt to %1? OR if the payment is from a different contact, this email will only go to them.{/ts} {ts}For auto-renewing memberships the emails are sent when each payment is received{/ts} @@ -188,7 +188,7 @@ {$form.send_receipt.label} - {$form.send_receipt.html}
+ {$form.send_receipt.html} {ts}Automatically email a membership confirmation and receipt to {/ts}? {ts}OR if the payment is from a different contact, this email will only go to them.{/ts} {ts}For auto-renewing memberships the emails are sent when each payment is received{/ts} diff --git a/templates/CRM/Member/Form/MembershipBlock.hlp b/templates/CRM/Member/Form/MembershipBlock.hlp index 7204954af9..26b507c563 100644 --- a/templates/CRM/Member/Form/MembershipBlock.hlp +++ b/templates/CRM/Member/Form/MembershipBlock.hlp @@ -7,6 +7,13 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} +{htxt id="id-member_price_set_id-title"} + {ts}Membership Price Set{/ts} +{/htxt} +{htxt id="id-member_price_set_id"} +{ts}Price sets allow you to configure more complex membership signup and renewal options, including allowing constituents to sign up for multiple memberships at the same time.{/ts} +{/htxt} + {htxt id="id-is-required-title"} {ts}Require Membership Signup{/ts} diff --git a/templates/CRM/Member/Form/MembershipBlock.tpl b/templates/CRM/Member/Form/MembershipBlock.tpl index 0e2e9f031e..0974ef3d23 100644 --- a/templates/CRM/Member/Form/MembershipBlock.tpl +++ b/templates/CRM/Member/Form/MembershipBlock.tpl @@ -42,27 +42,18 @@ {$form.renewal_text.html} - {$form.member_price_set_id.label} - - {if $price eq false} - {capture assign=adminPriceSetsURL}{crmURL p="civicrm/admin/price" q="reset=1"}{/capture} -
{ts 1=$adminPriceSetsURL}No Membership Price Sets have been configured / enabled for your site. Price sets allow you to configure more complex membership signup and renewal options, including allowing constituents to sign up for multiple memberships at the same time. Click here if you want to configure price sets for your site.{/ts}
- {else} - {$form.member_price_set_id.html} - {/if} - + {$form.member_price_set_id.label} {help id="id-member_price_set_id"} + {$form.member_price_set_id.html}
+ {if $isQuick} +
{ts}Click here if you want to configure the Membership Types below as part of a Price Set, with the added flexibility and complexity that entails.{/ts}
+ {/if} + - {if $isQuick} - - -
{ts}Click here if you want to configure the Membership Types below as part of a Price Set, with the added flexibility and complexity that entails.{/ts}
- - {/if} - + {$form.membership_type_label.label} {$form.membership_type_label.html} - - + + {$form.membership_type.label} {assign var="count" value="1"} @@ -98,8 +89,7 @@ {$form.is_required.html} {$form.is_required.label} {help id="id-is-required"} - {$form.is_separate_payment.html} {$form.is_separate_payment.label} {help id="id-separate-pay"}
- {ts}Check this box if you are including both Membership Signup/Renewal AND a Contribution Amount section, AND you want the membership fee to be charged separately from any additional contribution amount.{/ts} + {$form.is_separate_payment.html} {$form.is_separate_payment.label} {help id="id-separate-pay"} {$form.display_min_fee.html} {$form.display_min_fee.label} {help id="id-display-fee"} diff --git a/templates/CRM/Member/Form/MembershipCommon.tpl b/templates/CRM/Member/Form/MembershipCommon.tpl index ae2e4eb1d0..e38588928c 100644 --- a/templates/CRM/Member/Form/MembershipCommon.tpl +++ b/templates/CRM/Member/Form/MembershipCommon.tpl @@ -23,8 +23,7 @@ {$form.total_amount.label} - {$form.total_amount.html}
- {ts}Membership payment amount. A contribution record will be created for this amount.{/ts}
+ {$form.total_amount.html} {$form.receive_date.label} @@ -32,9 +31,7 @@ {$form.financial_type_id.label} - {$form.financial_type_id.html}
- {ts}Select the appropriate financial type for this payment.{/ts} - + {$form.financial_type_id.html} {$form.payment_instrument_id.label}* @@ -70,8 +67,7 @@ {/if} {$form.financial_type_id.label} - {$form.financial_type_id.html}
- {ts}Select the appropriate financial type for this payment.{/ts} + {$form.financial_type_id.html} {$form.total_amount.label} diff --git a/templates/CRM/Member/Form/MembershipRenewal.tpl b/templates/CRM/Member/Form/MembershipRenewal.tpl index a8e00e02b4..d2a1419357 100644 --- a/templates/CRM/Member/Form/MembershipRenewal.tpl +++ b/templates/CRM/Member/Form/MembershipRenewal.tpl @@ -68,8 +68,7 @@ {ts}Membership Status{/ts} -  {$membershipStatus}
- {ts}Status of this membership.{/ts} +  {$membershipStatus} {ts}Membership Expiration Date{/ts} @@ -77,29 +76,21 @@ {$form.renewal_date.label} - {$form.renewal_date.html} - - - - {ts}Renewal extends Membership Expiration Date by one membership period{/ts} -   {ts}change{/ts} + {$form.renewal_date.html} +
+ {ts}Renewal extends Membership Expiration 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 Expiration Date by this many membership periods. Make sure the appropriate corresponding fee is entered below.{/ts} - + {$form.num_terms.html|crmAddClass:two} {ts}membership periods{/ts} {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.record_contribution.html} @@ -112,7 +103,7 @@ - @@ -122,9 +113,11 @@ - +
{$form.send_receipt.label}{$form.send_receipt.html}
+ 		{$form.send_receipt.html} {ts 1=$emailExists}Automatically email a membership confirmation and receipt to %1?{/ts}
{$form.receipt_text.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.html|crmAddClass:huge}		{$form.receipt_text.html|crmAddClass:huge}
+ + {ts}Enter a message you want included at the beginning of the emailed receipt.{/ts} + +
{/if} -- 2.25.1