From 4eb6051465fcfd07b8a7f06a2c733920b207b46f Mon Sep 17 00:00:00 2001 From: larssandergreen Date: Thu, 25 May 2023 18:41:43 -0600 Subject: [PATCH] Remove unneeded description on edit event and contribution pages --- .../Form/ContributionPage/Amount.php | 2 +- CRM/Event/Form/ManageEvent/Fee.php | 8 +- CRM/Member/Form/MembershipBlock.php | 7 +- .../CRM/Admin/Form/ScheduleReminders.tpl | 8 +- .../Form/ContributionPage/Amount.tpl | 2 +- .../Form/ContributionPage/Settings.tpl | 3 +- .../CRM/Event/Form/ManageEvent/EventInfo.tpl | 2 +- templates/CRM/Event/Form/ManageEvent/Fee.hlp | 22 ++++ templates/CRM/Event/Form/ManageEvent/Fee.tpl | 87 +++++---------- .../Event/Form/ManageEvent/Registration.hlp | 21 ++++ .../Event/Form/ManageEvent/Registration.tpl | 103 +++++------------- 11 files changed, 117 insertions(+), 148 deletions(-) diff --git a/CRM/Contribute/Form/ContributionPage/Amount.php b/CRM/Contribute/Form/ContributionPage/Amount.php index 75754d1804..be00fb12b9 100644 --- a/CRM/Contribute/Form/ContributionPage/Amount.php +++ b/CRM/Contribute/Form/ContributionPage/Amount.php @@ -149,7 +149,7 @@ class CRM_Contribute_Form_ContributionPage_Amount extends CRM_Contribute_Form_Co 'entity' => 'PriceSet', 'option_url' => 'civicrm/admin/price', 'options' => $price, - 'label' => 'Price Set', + 'label' => ts('Price Set'), 'onchange' => "showHideAmountBlock( this.value, 'price_set_id' );", ]); diff --git a/CRM/Event/Form/ManageEvent/Fee.php b/CRM/Event/Form/ManageEvent/Fee.php index ec9c2a8b50..61a902f474 100644 --- a/CRM/Event/Form/ManageEvent/Fee.php +++ b/CRM/Event/Form/ManageEvent/Fee.php @@ -255,7 +255,7 @@ class CRM_Event_Form_ManageEvent_Fee extends CRM_Event_Form_ManageEvent { $this->addSelect('financial_type_id', ['context' => 'search', 'options' => $financialTypes]); } // add pay later options - $this->addElement('checkbox', 'is_pay_later', ts('Enable Pay Later option?'), NULL, + $this->addElement('checkbox', 'is_pay_later', ts('Pay later option'), NULL, ['onclick' => "return showHideByValue('is_pay_later','','payLaterOptions','block','radio',false);"] ); $this->addElement('textarea', 'pay_later_text', ts('Pay Later Label'), @@ -274,9 +274,11 @@ class CRM_Event_Form_ManageEvent_Fee extends CRM_Event_Form_ManageEvent { else { $this->assign('price', TRUE); } - $this->addField('price_set_id', [ - 'entity' => 'PriceField', + $this->addSelect('price_set_id', [ + 'entity' => 'PriceSet', + 'option_url' => 'civicrm/admin/price', 'options' => $price, + 'label' => ts('Price Set'), 'onchange' => "return showHideByValue('price_set_id', '', 'map-field', 'block', 'select', false);", ]); diff --git a/CRM/Member/Form/MembershipBlock.php b/CRM/Member/Form/MembershipBlock.php index 60ed1248bb..179c437a6c 100644 --- a/CRM/Member/Form/MembershipBlock.php +++ b/CRM/Member/Form/MembershipBlock.php @@ -170,10 +170,11 @@ class CRM_Member_Form_MembershipBlock extends CRM_Contribute_Form_ContributionPa else { $this->assign('price', TRUE); } - //$this->add('select', 'member_price_set_id', ts('Membership Price Set'), (['' => ts('- none -')] + $price)); - $this->addField('member_price_set_id', [ - 'entity' => 'PriceField', + $this->addSelect('member_price_set_id', [ + 'entity' => 'PriceSet', + 'option_url' => 'civicrm/admin/price', + 'label' => ts('Membership Price Set'), 'name' => 'price_set_id', 'options' => $price, ]); diff --git a/templates/CRM/Admin/Form/ScheduleReminders.tpl b/templates/CRM/Admin/Form/ScheduleReminders.tpl index a03931fe44..592762f006 100644 --- a/templates/CRM/Admin/Form/ScheduleReminders.tpl +++ b/templates/CRM/Admin/Form/ScheduleReminders.tpl @@ -42,7 +42,7 @@ {$form.record_activity.html} {$form.is_repeat.label} - {$form.is_repeat.html}  {ts}Enable repetition.{/ts} + {$form.is_repeat.html} @@ -81,7 +81,7 @@ - + @@ -105,8 +105,8 @@ {/if} - - + +
{$form.recipient_manual_id.label}{$form.recipient_manual_id.html}{edit}
{ts}You can manually send out the reminders to these recipients.{/ts}
{/edit}		{$form.recipient_manual_id.html}
{$form.is_active.html} {$form.is_active.label}{$form.is_active.label}{$form.is_active.html}
diff --git a/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl b/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl index 55b1b29137..9a79d13d4c 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl @@ -35,7 +35,7 @@ {/if} {$form.is_pay_later.label} - {$form.is_pay_later.html}
+ {$form.is_pay_later.html} {ts}Check this box if you want to give users the option to submit payment offline (e.g. mail in a check, call in a credit card, etc.).{/ts}   diff --git a/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl b/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl index ed2d4f78d5..2a7bfe5589 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl @@ -80,7 +80,8 @@ {$form.end_date.html} -  {$form.honor_block_is_active.html}{$form.honor_block_is_active.label} {help id="id-honoree_section"} + {$form.honor_block_is_active.label} {help id="id-honoree_section"} + {$form.honor_block_is_active.html} diff --git a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl index 9dd215fe20..e4fb87c1b6 100644 --- a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl +++ b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl @@ -89,7 +89,7 @@ {if !empty($form.waitlist_text)} - + {/if} diff --git a/templates/CRM/Event/Form/ManageEvent/Fee.hlp b/templates/CRM/Event/Form/ManageEvent/Fee.hlp index 74d40fe5ed..0c43e04fc0 100644 --- a/templates/CRM/Event/Form/ManageEvent/Fee.hlp +++ b/templates/CRM/Event/Form/ManageEvent/Fee.hlp @@ -7,6 +7,14 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} +{htxt id="id-payment_processor-title"} + {ts}Payment Processor{/ts} +{/htxt} +{htxt id="id-payment_processor-text"} + {ts}If this is a paid event and you want users to be able to register and pay online, select a payment processor to use.{/ts} +{ts}NOTE: Alternatively, you can enable the Pay Later feature below without setting up a payment processor. All users will then be asked to submit payment offline (e.g. mail in a check, call in a credit card, etc.).{/ts} {docURL page="user/contributions/payment-processors"} +{/htxt} + {htxt id="id-pay-later-text-title"} {ts}Pay Later Label{/ts} {/htxt} @@ -14,9 +22,23 @@ {ts}Text displayed next to the checkbox for the 'pay later' option on the contribution form. You may include HTML formatting tags.{/ts} {/htxt} +{htxt id="id-is_billing_required-title"} + {ts}Billing address required{/ts} +{/htxt} +{htxt id="id-is_billing_required"} +{ts}Check this box to require users who select the pay later option to provide billing name and address.{/ts} +{/htxt} + {htxt id="id-is-discount-title"} {ts}Discounts by Signup Date?{/ts} {/htxt} {htxt id="id-is-discount"} + {ts}This financial type will be assigned to payments made by participants when they register online. If using a price set below note that the contribution record will have this financial type, however line items will be processed using the actual financial type selected for the price set item.{/ts} +{/htxt} + +{htxt id="id-financial_type_id-title"} + {ts}Financial Type{/ts} +{/htxt} +{htxt id="id-financial_type_id"} {ts}Check this box if you want to offer discounted fees based on registration date (e.g. 'early-registration discounts').{/ts} {/htxt} diff --git a/templates/CRM/Event/Form/ManageEvent/Fee.tpl b/templates/CRM/Event/Form/ManageEvent/Fee.tpl index d85976626c..4f851530f0 100644 --- a/templates/CRM/Event/Form/ManageEvent/Fee.tpl +++ b/templates/CRM/Event/Form/ManageEvent/Fee.tpl @@ -42,49 +42,42 @@ {if $paymentProcessor}
{$form.waitlist_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='waitlist_text' id=$eventID}{/if}
{help id="id-help-waitlist_text"}		{$form.waitlist_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='waitlist_text' id=$eventID} {/if}{help id="id-help-waitlist_text"} {$form.waitlist_text.html}
- + - - -
{$form.payment_processor.label}{$form.payment_processor.label} {help id="id-payment_processor-text"} {$form.payment_processor.html}
  - {ts}If this is a paid event and you want users to be able to register and pay online, select a payment processor to use.{/ts} - {ts}NOTE: Alternatively, you can enable the Pay Later feature below without setting up a payment processor. All users will then be asked to submit payment offline (e.g. mail in a check, call in a credit card, etc.).{/ts} {docURL page="user/contributions/payment-processors"} -
{/if} - - + -
{$form.is_pay_later.html}{$form.is_pay_later.label}
+ 		{$form.is_pay_later.label}{$form.is_pay_later.html} {ts}Check this box if you want to give users the option to submit payment offline (e.g. mail in a check, call in a credit card, etc.).{/ts}
- - - - - - - - - - - - - - - - + +
{$form.pay_later_text.label} * {help id="id-pay-later-text"}{if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='pay_later_text' id=$id}{/if}{$form.pay_later_text.html|crmAddClass:big} -
{$form.pay_later_receipt.label} * {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='pay_later_receipt' id=$id}{/if}{$form.pay_later_receipt.html|crmAddClass:big} -
 {ts}Instructions added to Confirmation and Thank-you pages when the user selects the 'pay later' option (e.g. 'Mail your check to ... within 3 business days.').{/ts} -
{$form.is_billing_required.html} - {$form.is_billing_required.label}
- {ts}Check this box to require users who select the pay later option to provide billing name and address.{/ts} - 		  + + + + + + + + + + + + + +
{$form.pay_later_text.label} + * {help id="id-pay-later-text"}{if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='pay_later_text' id=$id}{/if} + {$form.pay_later_text.html|crmAddClass:big} +
{$form.pay_later_receipt.label} * {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='pay_later_receipt' id=$id}{/if} + {$form.pay_later_receipt.html|crmAddClass:big} +
{$form.is_billing_required.label} {help id="id-is_billing_required"}{$form.is_billing_required.html}
+
@@ -95,36 +88,17 @@ {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='fee_label' id=$id}{/if}{$form.fee_label.html} - -   - {ts}This label is displayed with the list of event fees. When using a Price Set, this label is the title for the section containing the price fields.{/ts} - - - {$form.financial_type_id.label} * + {$form.financial_type_id.label} * {help id="id-financial_type_id"} {$form.financial_type_id.html} - -   - {ts}This financial type will be assigned to payments made by participants when they register online. If using a price set below note that the contribution record will have this financial type, however line items will be processed using the actual financial type selected for the price set item.{/ts} - - - - - - - +
{$form.price_set_id.label}{if $price eq false} -
{ts 1=$adminPriceSets}No Price Set has been configured / enabled for your site. Price sets allow you to meet the complex demands of your event registration structure.(e.g. "Pay $15 more for lunch."). Click here if you want to configure price sets for your site.{/ts}
- {else} - {$form.price_set_id.html} -
 {ts 1=$adminPriceSets}Select a pre-configured Price Set to offer multiple individually priced options for event registrants. Otherwise, select "-none-" and enter one or more fee levels in the table below. Create or edit Price Sets here.{/ts} - {/if} - {$form.price_set_id.html} +
{ts}Select a Price Set to offer multiple individually priced options for event registrants. Otherwise, leave this empty and enter fixed fee levels below.{/ts}
@@ -148,8 +122,8 @@
- - + +
{$form.is_discount.html} {help id="id-is-discount"}{$form.is_discount.label}{$form.is_discount.label}{$form.is_discount.html} {help id="id-is-discount"}
@@ -182,7 +156,6 @@ {if $discountSection}
{ts}Discounted Fees{/ts} - {ts}Use the table below to enter descriptive labels and amounts for up to ten discounted event fees for each discount set. Don't forget to click 'Save' when you are finished.{/ts} diff --git a/templates/CRM/Event/Form/ManageEvent/Registration.hlp b/templates/CRM/Event/Form/ManageEvent/Registration.hlp index 642abaaf0f..3224f47a74 100644 --- a/templates/CRM/Event/Form/ManageEvent/Registration.hlp +++ b/templates/CRM/Event/Form/ManageEvent/Registration.hlp @@ -94,3 +94,24 @@ {htxt id="id-selfcancelxfer_time"} {ts}Number of hours prior to event start date to allow self-service cancellation or transfer. Enter a negative number of hours to allow cancellation after the event starts. Enter 0 (or leave empty) to allow cancellation or transfer up until the event has started.{/ts} {/htxt} + +{htxt id="id-is_email_confirm-title"} + {ts}Send Confirmation Email?{/ts} +{/htxt} +{htxt id="id-is_email_confirm"} + {ts}Do you want a registration confirmation email sent automatically to the user? This email includes event date(s), location and contact information. For paid events, this email is also a receipt for their payment.{/ts} +{/htxt} + +{htxt id="id-cc_confirm-title"} + {ts}CC Confirmation To{/ts} +{/htxt} +{htxt id="id-cc_confirm"} + {ts}You can notify event organizers of each online registration by specifying one or more email addresses to receive a carbon copy (cc). Multiple email addresses should be separated by a comma (e.g. jane@example.org, paula@example.org).{/ts} +{/htxt} + +{htxt id="id-bcc_confirm-title"} + {ts}BCC Confirmation To{/ts} +{/htxt} +{htxt id="id-bcc_confirm"} + {ts}You may specify one or more email addresses to receive a blind carbon copy (bcc) of the confirmation email. Multiple email addresses should be separated by a comma (e.g. jane@example.org, paula@example.org).{/ts} +{/htxt} diff --git a/templates/CRM/Event/Form/ManageEvent/Registration.tpl b/templates/CRM/Event/Form/ManageEvent/Registration.tpl index 946aaa4ebf..e18847aec7 100644 --- a/templates/CRM/Event/Form/ManageEvent/Registration.tpl +++ b/templates/CRM/Event/Form/ManageEvent/Registration.tpl @@ -8,19 +8,14 @@ +--------------------------------------------------------------------+ *} {if $addProfileBottomAdd OR $addProfileBottom} - - {else} @@ -38,9 +33,7 @@
{ts}Fee Label{/ts}{if $addProfileBottomAdd }{$form.additional_custom_post_id_multiple[$profileBottomNumAdd].label} + + {if $addProfileBottomAdd }{$form.additional_custom_post_id_multiple[$profileBottomNumAdd].label} {else}{$form.custom_post_id_multiple[$profileBottomNum].label}{/if}{if $addProfileBottomAdd }{$form.additional_custom_post_id_multiple[$profileBottomNumAdd].html}{else}{$form.custom_post_id_multiple[$profileBottomNum].html}{/if} + + {if $addProfileBottomAdd}{$form.additional_custom_post_id_multiple[$profileBottomNumAdd].html} + {else}{$form.custom_post_id_multiple[$profileBottomNum].html}{/if} {ts}remove profile{/ts}   {ts}add another profile (bottom of page){/ts} - {if $addProfileBottomAdd } -
{ts}Change this if you want to use a different profile for additional participants.{/ts}
- {else} -
{ts}Include additional fields on this registration form by selecting and configuring a CiviCRM Profile to be included at the bottom of the page.{/ts}
- {/if}
- +
{$form.is_online_registration.label}{$form.is_online_registration.html} - {ts}Online registration enabled?{/ts} - {$form.is_online_registration.html}
@@ -115,31 +108,22 @@ {$form.intro_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='intro_text' id=$eventID}{/if} - {$form.intro_text.html} -
{ts}Introductory message / instructions for online event registration page (may include HTML formatting tags).{/ts}
- + {$form.intro_text.html} {$form.footer_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='footer_text' id=$eventID}{/if} - {$form.footer_text.html} -
{ts}Optional footer text for registration screen.{/ts}
- + {$form.footer_text.html} - - + + @@ -174,17 +158,12 @@ @@ -237,24 +216,17 @@ - + - + - +
{$form.custom_pre_id.label}{$form.custom_pre_id.html} -
{ts}Include additional fields on this registration form by selecting and configuring a CiviCRM Profile to be included at the top of the page (immediately after the introductory message).{/ts}{help id="event-profile"}
- 		{$form.custom_pre_id.label} {help id="event-profile"}{$form.custom_pre_id.html}
{$form.custom_post_id.label} {$form.custom_post_id.html} -
{ts}Include additional fields on this registration form by selecting and configuring a CiviCRM Profile to be included at the bottom of the page.{/ts}
{ts}add another profile (bottom of page){/ts}
{$form.additional_custom_pre_id.label} {$form.additional_custom_pre_id.html} -
{ts}Change this if you want to use a different profile for additional participants.{/ts}
-
+
{$form.additional_custom_post_id.label} {$form.additional_custom_post_id.html} -
{ts}Change this if you want to use a different profile for additional participants.{/ts} -
{ts}add another profile (bottom of page){/ts}
{$form.confirm_title.label} * {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='confirm_title' id=$eventID}{/if} {$form.confirm_title.html}
- {ts}Page title for screen where user reviews and confirms their registration information.{/ts} - 		{$form.confirm_title.html}
{$form.confirm_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='confirm_text' id=$eventID}{/if}{$form.confirm_text.html} -
{ts}Optional instructions / message for Confirmation screen.{/ts}
- 		{$form.confirm_text.html}
{$form.confirm_footer_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='confirm_footer_text' id=$eventID}{/if}{$form.confirm_footer_text.html} -
{ts}Optional page footer text for Confirmation screen.{/ts}
- 		{$form.confirm_footer_text.html}
@@ -268,25 +240,16 @@ {$form.thankyou_title.label} * {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='thankyou_title' id=$eventID}{/if} - {$form.thankyou_title.html} -
{ts}Page title for registration Thank-you screen.{/ts}
- + {$form.thankyou_title.html} - {$form.thankyou_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='thankyou_text' id=$eventID}{/if} - {$form.thankyou_text.html} -
{ts}Optional message for Thank-you screen (may include HTML formatting).{/ts}
- + {$form.thankyou_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='thankyou_text' id=$eventID}{/if} + {$form.thankyou_text.html} {$form.thankyou_footer_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='thankyou_footer_text' id=$eventID}{/if} - {$form.thankyou_footer_text.html} -
{ts}Optional footer text for Thank-you screen (often used to include links to other pages/activities on your site).{/ts}
- + {$form.thankyou_footer_text.html}
@@ -297,11 +260,8 @@
- - + +
{$form.is_email_confirm.label}{$form.is_email_confirm.html}
- {ts}Do you want a registration confirmation email sent automatically to the user? This email includes event date(s), location and contact information. For paid events, this email is also a receipt for their payment.{/ts} - 		{$form.is_email_confirm.label} {help id="id-is_email_confirm"}{$form.is_email_confirm.html}
@@ -318,30 +278,19 @@ {$form.confirm_from_name.label} * {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='confirm_from_name' id=$eventID}{/if} - {$form.confirm_from_name.html}
- {ts}FROM name for email.{/ts} - + {$form.confirm_from_name.html} {$form.confirm_from_email.label} * - {$form.confirm_from_email.html}
- {ts}FROM email address (this must be a valid email account with your SMTP email service provider).{/ts} - + {$form.confirm_from_email.html} - {$form.cc_confirm.label} - {$form.cc_confirm.html}
- {ts}You can notify event organizers of each online registration by specifying one or more email addresses to receive a carbon copy (cc). Multiple email addresses should be separated by a comma (e.g. jane@example.org, paula@example.org).{/ts} - + {$form.cc_confirm.label} {help id="id-cc_confirm"} + {$form.cc_confirm.html} - {$form.bcc_confirm.label} - {$form.bcc_confirm.html}
- {ts}You may specify one or more email addresses to receive a blind carbon copy (bcc) of the confirmation email. Multiple email addresses should be separated by a comma (e.g. jane@example.org, paula@example.org).{/ts} - + {$form.bcc_confirm.label} {help id="id-bcc_confirm"} + {$form.bcc_confirm.html}
-- 2.25.1