From 1909126f9f5c1c257a4140d5168937d47941d0fe Mon Sep 17 00:00:00 2001 From: yashodha Date: Fri, 2 May 2014 06:54:14 +0530 Subject: [PATCH] option to configure confirm screen --- CRM/Event/Form/ManageEvent/Fee.php | 2 +- CRM/Event/Form/ManageEvent/Registration.php | 7 +- .../Registration/AdditionalParticipant.php | 7 +- CRM/Event/Form/Registration/Confirm.php | 30 +- CRM/Event/Form/Registration/Register.php | 19 +- CRM/Event/StateMachine/Registration.php | 6 +- .../Incremental/sql/4.5.alpha1.mysql.tpl | 11 + .../Event/Form/ManageEvent/Registration.tpl | 569 ++++++++++-------- xml/schema/Event/Event.xml | 11 + 9 files changed, 394 insertions(+), 268 deletions(-) diff --git a/CRM/Event/Form/ManageEvent/Fee.php b/CRM/Event/Form/ManageEvent/Fee.php index 56d40187b2..4747b04569 100644 --- a/CRM/Event/Form/ManageEvent/Fee.php +++ b/CRM/Event/Form/ManageEvent/Fee.php @@ -789,7 +789,7 @@ class CRM_Event_Form_ManageEvent_Fee extends CRM_Event_Form_ManageEvent { $params['id'] = $this->_id; // skip update of financial type in price set $params['skipFinancialType'] = TRUE; - + $params['is_confirm_enabled'] = $params['is_monetary']; CRM_Event_BAO_Event::add($params); // Update tab "disabled" css class diff --git a/CRM/Event/Form/ManageEvent/Registration.php b/CRM/Event/Form/ManageEvent/Registration.php index dc7df5b962..02e2b7b337 100644 --- a/CRM/Event/Form/ManageEvent/Registration.php +++ b/CRM/Event/Form/ManageEvent/Registration.php @@ -379,6 +379,10 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent */ function buildConfirmationBlock(&$form) { $attributes = CRM_Core_DAO::getAttribute('CRM_Event_DAO_Event'); + + // CRM-11182 - Optional confirmation page for free events + $form->addYesNo('is_confirm_enabled', ts('Use a confirmation screen?'), NULL, NULL, array('onclick' => "return showHideByValue('is_confirm_enabled','','confirm_screen_settings','block','radio',false);")); + $form->add('text', 'confirm_title', ts('Title'), $attributes['confirm_title']); $form->addWysiwyg('confirm_text', ts('Introductory Text'), $attributes['confirm_text']); // FIXME: This hack forces height of editor to 175px. Need to modify QF classes for editors to allow passing @@ -695,8 +699,9 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent $params['id'] = $this->_id; - //format params + // format params $params['is_online_registration'] = CRM_Utils_Array::value('is_online_registration', $params, FALSE); + $params['is_confirm_enabled'] = CRM_Utils_Array::value('is_confirm_enabled', $params, FALSE); // CRM-11182 $params['is_multiple_registrations'] = CRM_Utils_Array::value('is_multiple_registrations', $params, FALSE); $params['allow_same_participant_emails'] = CRM_Utils_Array::value('allow_same_participant_emails', $params, FALSE); $params['requires_approval'] = CRM_Utils_Array::value('requires_approval', $params, FALSE); diff --git a/CRM/Event/Form/Registration/AdditionalParticipant.php b/CRM/Event/Form/Registration/AdditionalParticipant.php index f05ca0371c..1e7e9f8633 100644 --- a/CRM/Event/Form/Registration/AdditionalParticipant.php +++ b/CRM/Event/Form/Registration/AdditionalParticipant.php @@ -712,8 +712,11 @@ class CRM_Event_Form_Registration_AdditionalParticipant extends CRM_Event_Form_R CRM_Core_Session::setStatus($statusMsg, ts('Registration Saved'), 'success'); } - //to check whether call processRegistration() - if (!$this->_values['event']['is_monetary'] && !empty($this->_params[0]['additional_participants']) && $this->isLastParticipant() + // Check whether to process the registration now, calling processRegistration() + if ( + !$this->_values['event']['is_confirm_enabled'] // CRM-11182 - Optional confirmation screen + && CRM_Utils_Array::value('additional_participants', $this->_params[0]) + && $this->isLastParticipant() ) { CRM_Event_Form_Registration_Register::processRegistration($this->_params, NULL); } diff --git a/CRM/Event/Form/Registration/Confirm.php b/CRM/Event/Form/Registration/Confirm.php index 6edd554ce0..10bb2773c9 100644 --- a/CRM/Event/Form/Registration/Confirm.php +++ b/CRM/Event/Form/Registration/Confirm.php @@ -225,7 +225,10 @@ class CRM_Event_Form_Registration_Confirm extends CRM_Event_Form_Registration { */ public function buildQuickForm() { $this->assignToTemplate(); - if ($this->_params[0]['amount'] || $this->_params[0]['amount'] == 0) { + + if ($this->_values['event']['is_monetary'] && + ($this->_params[0]['amount'] || $this->_params[0]['amount'] == 0) + ) { $this->_amount = array(); foreach ($this->_params as $k => $v) { @@ -410,7 +413,9 @@ class CRM_Event_Form_Registration_Confirm extends CRM_Event_Form_Registration { $cancelledIds = $this->_additionalParticipantIds; $params = $this->_params; - $this->set('finalAmount', $this->_amount); + if ($this->_values['event']['is_monetary']) { + $this->set('finalAmount', $this->_amount); + } $participantCount = array(); //unset the skip participant from params. @@ -607,14 +612,17 @@ class CRM_Event_Form_Registration_Confirm extends CRM_Event_Form_Registration { $value['currencyID'] = $primaryCurrencyID; } - if (!$pending && !empty($value['is_primary']) && - !$this->_allowWaitlist && !$this->_requireApproval - ) { - // transactionID & receive date required while building email template - $this->assign('trxn_id', $value['trxn_id']); - $this->assign('receive_date', CRM_Utils_Date::mysqlToIso($value['receive_date'])); - $this->set('receiveDate', CRM_Utils_Date::mysqlToIso($value['receive_date'])); - $this->set('trxnId', CRM_Utils_Array::value('trxn_id', $value)); + // CRM-11182 - Confirmation page might not be monetary + if ($this->_values['event']['is_monetary']) { + if (!$pending && !empty($value['is_primary']) && + !$this->_allowWaitlist && !$this->_requireApproval + ) { + // transactionID & receive date required while building email template + $this->assign('trxn_id', $value['trxn_id']); + $this->assign('receive_date', CRM_Utils_Date::mysqlToIso($value['receive_date'])); + $this->set('receiveDate', CRM_Utils_Date::mysqlToIso($value['receive_date'])); + $this->set('trxnId', CRM_Utils_Array::value('trxn_id', $value)); + } } $value['fee_amount'] = CRM_Utils_Array::value('amount', $value); @@ -778,7 +786,7 @@ class CRM_Event_Form_Registration_Confirm extends CRM_Event_Form_Registration { $this->assign('isPrimary', 0); $this->assign('customProfile', NULL); //Additional Participant should get only it's payment information - if ($this->_amount) { + if (!empty($this->_amount)) { $amount = array(); $params = $this->get('params'); $amount[$participantNum]['label'] = preg_replace('//', '', $params[$participantNum]['amount_level']); diff --git a/CRM/Event/Form/Registration/Register.php b/CRM/Event/Form/Registration/Register.php index ff605d2f5a..3cc97a84ae 100644 --- a/CRM/Event/Form/Registration/Register.php +++ b/CRM/Event/Form/Registration/Register.php @@ -508,10 +508,22 @@ class CRM_Event_Form_Registration_Register extends CRM_Event_Form_Registration { if (empty($this->_values['event']['is_monetary'])) { $js = array('onclick' => "return submitOnce(this,'" . $this->_name . "','" . ts('Processing') . "');"); } + + // CRM-11182 - Optional confirmation screen + // Change button label depending on whether the next action is confirm or register + if ( + !$this->_values['event']['is_multiple_registrations'] + && !$this->_values['event']['is_confirm_enabled'] + ) { + $buttonLabel = ts('Register >>'); + } else { + $buttonLabel = ts('Continue >>'); + } + $this->addButtons(array( array( 'type' => 'upload', - 'name' => ts('Continue >>'), + 'name' => $buttonLabel, 'spacing' => '         ', 'isDefault' => TRUE, 'js' => $js, @@ -1161,7 +1173,10 @@ class CRM_Event_Form_Registration_Register extends CRM_Event_Form_Registration { $this->_params[] = $params; $this->set('params', $this->_params); - if (empty($params['additional_participants'])) { + if ( + empty($params['additional_participants']) + && !$this->_values['event']['is_confirm_enabled'] // CRM-11182 - Optional confirmation screen + ) { self::processRegistration($this->_params); } } diff --git a/CRM/Event/StateMachine/Registration.php b/CRM/Event/StateMachine/Registration.php index e7210d8150..5a946b2020 100644 --- a/CRM/Event/StateMachine/Registration.php +++ b/CRM/Event/StateMachine/Registration.php @@ -51,6 +51,7 @@ class CRM_Event_StateMachine_Registration extends CRM_Core_StateMachine { parent::__construct($controller, $action); $id = CRM_Utils_Request::retrieve('id', 'Positive', $controller, TRUE); $is_monetary = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Event', $id, 'is_monetary'); + $is_confirm_enabled = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Event', $id, 'is_confirm_enabled'); $pages = array('CRM_Event_Form_Registration_Register' => NULL); @@ -88,8 +89,9 @@ class CRM_Event_StateMachine_Registration extends CRM_Core_StateMachine { ); $pages = array_merge($pages, $additionalPages); - - if (!$is_monetary) { + + // CRM-11182 - Optional confirmation screen + if (!$is_confirm_enabled) { unset($pages['CRM_Event_Form_Registration_Confirm']); } diff --git a/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl index a2b62b126e..cbe6623559 100644 --- a/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl @@ -368,3 +368,14 @@ DELETE FROM civicrm_option_group WHERE id = @option_group_id_case_type; ALTER TABLE civicrm_survey DROP title; ALTER TABLE civicrm_survey DROP instructions; {/if} + +-- CRM-11182 -- Make event confirmation page optional + ALTER TABLE civicrm_event + ADD COLUMN is_confirm_enabled tinyint(4) DEFAULT '1'; + + UPDATE civicrm_event + SET is_confirm_enabled = 1 + WHERE is_monetary = 1; + + UPDATE civicrm_event + SET is_confirm_enabled = 0 diff --git a/templates/CRM/Event/Form/ManageEvent/Registration.tpl b/templates/CRM/Event/Form/ManageEvent/Registration.tpl index 190f74bc35..bd9dea58a4 100644 --- a/templates/CRM/Event/Form/ManageEvent/Registration.tpl +++ b/templates/CRM/Event/Form/ManageEvent/Registration.tpl @@ -24,273 +24,334 @@ +--------------------------------------------------------------------+ *} {if $addProfileBottomAdd OR $addProfileBottom} - - {if $addProfileBottomAdd }{$form.additional_custom_post_id_multiple[$profileBottomNumAdd].label} - {else}{$form.custom_post_id[$profileBottomNum].label}{/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 profile{/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 configuring and selecting a CiviCRM Profile to be included at the bottom of the page.{/ts} - {/if} -
- - + {if $addProfileBottomAdd }{$form.additional_custom_post_id_multiple[$profileBottomNumAdd].label} + {else}{$form.custom_post_id[$profileBottomNum].label}{/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 profile{/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 configuring and selecting a CiviCRM Profile to be included at the bottom of the page.{/ts} + {/if} +
+ {else} {assign var=eventID value=$id} -
-{ts}If you want to provide an Online Registration page for this event, check the first box below and then complete the fields on this form.{/ts} -{help id="id-event-reg"} -
+
+ {ts}If you want to provide an Online Registration page for this event, check the first box below and then complete the fields on this form.{/ts} + {help id="id-event-reg"} +
{include file="CRM/common/formButtons.tpl" location="top"}
-
- - - - - -
{$form.is_online_registration.label}{$form.is_online_registration.html} - {ts}Online registration enabled?{/ts} -
-
-
-
- +
+
+ + + + +
{$form.is_online_registration.label}{$form.is_online_registration.html} + {ts}Online registration enabled?{/ts} +
+
+
+
+ - - - - - {if !$isTemplate} - - - - - - - - - {/if} - - - - - - - - - - {if $form.requires_approval} - - - {/if} - - - {if $form.approval_req_text} - - - {/if} - - - - - + + + + + {if !$isTemplate} + + + + + + + + + {/if} + + + + + + + + + + {if $form.requires_approval} + + + {/if} + + + {if $form.approval_req_text} + + + {/if} + + + + + +
{$form.registration_link_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='registration_link_text' id=$eventID}{/if}{$form.registration_link_text.html} {help id="id-link_text"}
{$form.registration_start_date.label}{include file="CRM/common/jcalendar.tpl" elementName=registration_start_date}
{$form.registration_end_date.label}{include file="CRM/common/jcalendar.tpl" elementName=registration_end_date}
{$form.is_multiple_registrations.label}{$form.is_multiple_registrations.html} {help id="id-allow_multiple"}
{$form.allow_same_participant_emails.label}{$form.allow_same_participant_emails.html} {help id="id-allow_same_email"}
{$form.requires_approval.label}{$form.requires_approval.html} {help id="id-requires_approval"}
{$form.approval_req_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='approval_req_text' id=$eventID}{/if}{$form.approval_req_text.html}
{$form.expiration_time.label}{$form.expiration_time.html|crmAddClass:four} {help id="id-expiration_time"}
{$form.registration_link_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='registration_link_text' id=$eventID}{/if}{$form.registration_link_text.html} {help id="id-link_text"}
{$form.registration_start_date.label}{include file="CRM/common/jcalendar.tpl" elementName=registration_start_date}
{$form.registration_end_date.label}{include file="CRM/common/jcalendar.tpl" elementName=registration_end_date}
{$form.is_multiple_registrations.label}{$form.is_multiple_registrations.html} {help id="id-allow_multiple"}
{$form.allow_same_participant_emails.label}{$form.allow_same_participant_emails.html} {help id="id-allow_same_email"}
{$form.requires_approval.label}{$form.requires_approval.html} {help id="id-requires_approval"}
{$form.approval_req_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='approval_req_text' id=$eventID}{/if}{$form.approval_req_text.html}
{$form.expiration_time.label}{$form.expiration_time.html|crmAddClass:four} {help id="id-expiration_time"}
+
+ +{*Registration Block*} +
+ {ts}Registration Screen{/ts} +
+ + + + + + + + +
{$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.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}
+
-
- {*Registration Block*} -
- {ts}Registration Screen{/ts} -
- - - - - - - - - -
{$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.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}
- - - - - - - - {/foreach} - {/if} +{*Confirmation Block*} +
+ {ts}Confirmation Screen{/ts} +
{$form.custom_pre_id.label}{$form.custom_pre_id.html}
- {ts}Include additional fields on this registration form by configuring and selecting a CiviCRM Profile to be included at the top of the page (immediately after the introductory message).{/ts}{help id="event-profile"}
+ + + + + + + + + + + {if $profilePostMultiple} + {foreach from=$profilePostMultiple item=profilePostId key=profilePostNum name=profilePostIdName} + + + + + {/foreach} + {/if} +
{$form.custom_pre_id.label}{$form.custom_pre_id.html}
+ {ts}Include additional fields on this registration form by configuring and selecting a CiviCRM Profile to be included at the top of the page (immediately after the introductory message).{/ts}{help id="event-profile"}
+
{$form.custom_post_id.label}{$form.custom_post_id.html} +   {ts}add profile{/ts} +
+ {ts}Include additional fields on this registration form by configuring and selecting a CiviCRM Profile to be included at the bottom of the page.{/ts} +
{$form.custom_post_id_multiple.$profilePostNum.label}{$form.custom_post_id_multiple.$profilePostNum.html} +  {ts}remove profile{/ts} + {if $smarty.foreach.profilePostIdName.last} +    + {ts}add profile{/ts} + {/if} +
+ + + + - - - + + + + {if $profilePostMultipleAdd} + {foreach from=$profilePostMultipleAdd item=profilePostIdA key=profilePostNumA name=profilePostIdAName} + + + - + + {/foreach} + {/if} +
{$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.custom_post_id.label}{$form.custom_post_id.html} -   {ts}add profile{/ts} -
- {ts}Include additional fields on this registration form by configuring and selecting a CiviCRM Profile to be included at the bottom of the page.{/ts} +
{$form.additional_custom_post_id.label}{$form.additional_custom_post_id.html} +  {ts}add profile{/ts} +
+ {ts}Change this if you want to use a different profile for additional participants.{/ts} +
+
{$form.additional_custom_post_id_multiple.$profilePostNumA.label}{$form.additional_custom_post_id_multiple.$profilePostNumA.html} +  {ts}remove profile{/ts} + {if $smarty.foreach.profilePostIdAName.last} +    + {ts}add profile{/ts} + {/if} +
+ + - {if $profilePostMultiple} - {foreach from=$profilePostMultiple item=profilePostId key=profilePostNum name=profilePostIdName} -
{$form.custom_post_id_multiple.$profilePostNum.label}{$form.custom_post_id_multiple.$profilePostNum.html} -  {ts}remove profile{/ts} - {if $smarty.foreach.profilePostIdName.last} -   {ts}add profile{/ts} - {/if} -
-
+ + + +
{$form.is_confirm_enabled.label}{$form.is_confirm_enabled.html} +
{ts}Optionally hide the confirmation screen for free events.{/ts}
+
- - - - - - - - - - {if $profilePostMultipleAdd} - {foreach from=$profilePostMultipleAdd item=profilePostIdA key=profilePostNumA name=profilePostIdAName} - - - - - {/foreach} - {/if} -
{$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}add profile{/ts} -
- {ts}Change this if you want to use a different profile for additional participants.{/ts} -
-
{$form.additional_custom_post_id_multiple.$profilePostNumA.label}{$form.additional_custom_post_id_multiple.$profilePostNumA.html} -  {ts}remove profile{/ts} - {if $smarty.foreach.profilePostIdAName.last} -   {ts}add profile{/ts} - {/if} -
-
-
-
- {*Confirmation Block*} -
- {ts}Confirmation Screen{/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_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_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_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_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_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}
+
+
+
- {*ThankYou Block*} -
- {ts}Thank-you Screen{/ts} - - - - - - - - - - - - - -
{$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_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_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}
-
-
+{*ThankYou Block*} +
+ {ts}Thank-you Screen{/ts} + + + + + + + + + + + + + +
{$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_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_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}
+
+
- {* Confirmation Email Block *} -
- {ts}Confirmation Email{/ts} -
- - - - - -
{$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.confirm_email_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='confirm_email_text' id=$eventID}{/if}{$form.confirm_email_text.html}
- {ts}Additional message or instructions to include in confirmation email.{/ts} -
{$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_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.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.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} -
-
-
-
-
{*end of div registration_blocks*} +{* Confirmation Email Block *} +
+ {ts}Confirmation Email{/ts} +
+ + + + + +
{$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.confirm_email_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='confirm_email_text' id=$eventID}{/if}{$form.confirm_email_text.html}
+ {ts}Additional message or instructions to include in confirmation email.{/ts} +
{$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_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.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.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} +
-
- {include file="CRM/common/formButtons.tpl" location="bottom"} -
- -{include file="CRM/common/showHide.tpl"} +
+
+
{*end of div registration_blocks*} + +
+ {include file="CRM/common/formButtons.tpl" location="bottom"} +
+ {include file="CRM/common/showHide.tpl"} {include file="CRM/common/showHideByFieldValue.tpl" trigger_field_id ="is_online_registration" trigger_value ="" @@ -299,6 +360,16 @@ target_element_type ="block" field_type ="radio" invert = 0 } + +{include file="CRM/common/showHideByFieldValue.tpl" +trigger_field_id ="is_confirm_enabled" +trigger_value ="" +target_element_id ="confirm_screen_settings" +target_element_type ="block" +field_type ="radio" +invert = 0 +} + {include file="CRM/common/showHideByFieldValue.tpl" trigger_field_id ="is_email_confirm" trigger_value ="" diff --git a/xml/schema/Event/Event.xml b/xml/schema/Event/Event.xml index e0144d0a2b..fc7efaa9c2 100644 --- a/xml/schema/Event/Event.xml +++ b/xml/schema/Event/Event.xml @@ -776,6 +776,17 @@ CheckBox + + is_confirm_enabled + Is the booking confirmation screen enabled? + boolean + 1 + If false, the event booking confirmation screen gets skipped + 4.5 + + CheckBox + + parent_event_id int unsigned -- 2.25.1