diff --git a/booking.emails_admin.inc b/booking.emails_admin.inc index 955525d..2de6eac 100644 --- a/booking.emails_admin.inc +++ b/booking.emails_admin.inc @@ -3,6 +3,50 @@ function booking_emails_admin() { global $event; $form = array(); + //some initial workflow email definitions + $default_email_text = "Dear [booking:fname],\n" . + "Congratulations, you are officially booked into [booking:eventname]. " . + "Your registration reference number is [booking:booking-id].\n" . + "Please don't hesitate to contact us if you have any queries by replying to this email. " . + "We look forward to seeing you (God Willing) at [booking:eventname]!\n" . + "Love in Jesus,\n[booking:eventname] Registrations Team\n" . + "________________________________________________________\n" . + "The following information shows the details you entered when you registered. " . + "If any of this information is incorrect, please reply to this email with the corrections as soon as possible.\n" . + "________________________________________________________"; + $booking_email_regn_complete_text = "Dear [booking:fname],\n" . + "Thank-you for completing your payment for [booking:eventname].\n" . + "Please don't hesitate to contact us if you have any queries by replying to this email. " . + "We look forward to seeing you (God Willing) at [booking:eventname]!\n" . + "Love in Jesus,\n[booking:eventname] Registrations Team\n" . + "________________________________________________________\n" . + "The following information shows the details you entered when you registered. " . + "If any of this information is incorrect, please reply to this email with the corrections as soon as possible.\n" . + "________________________________________________________"; + $booking_email_waitinglist_text = "Dear [booking:fname],\n" . + "Thank-you for registering to attend [booking:eventname]. Unfortunately the venue for this event is full, and you have been placed on the waiting list to attend.\n" . + "We will contact you if a position becomes available for you. Please don't hesitate to contact us if you have any queries by replying to this email.\n" . + "Love in Jesus,\n[booking:eventname] Registrations Team\n" . + "________________________________________________________\n" . + "The following information shows the details you entered when you registered. " . + "If any of this information is incorrect, please reply to this email with the corrections as soon as possible.\n" . + "________________________________________________________"; + $booking_email_paymentoutstanding_text = "Dear [booking:fname],\n" . + "Thank-you for registering to attend [booking:eventname]. Our records indicate that you currently have $[booking:payment-required] outstanding to finalise your registration.\n" . + "Please visit [booking:balance-payment-link] in order to make your final payment.\n" . + "Love in Jesus,\n[booking:eventname] Registrations Team\n" . + "________________________________________________________\n"; + $booking_email_waitinglistpromotion = "Dear [booking:fname],\n" . + "We have some great news for you. A place at [booking:eventname] for you has just become available. " . + "If you wish to secure your place at [booking:eventname], please visit [booking:balance-payment-link] to make your final payment. " . + "Our records indicate that you currently have $[booking:paypal-total-amount] outstanding (including Paypal transaction fees).\n" . + "Once we have received your payment, you will be sent an automatic confirmation email thanking you for paying your outstanding fees. " . + "If you are paying via Paypal's eCheque feature, please be aware that payments take 3-5 working days to clear, " . + "and you will not receive the confirmation email until that has occurred.\n" . + "Please don't hesitate to contact us if you have any queries by replying to this email. We look forward to seeing you, God Willing, at [booking:eventname]\n" . + "Love in Jesus,\n[booking:eventname] Registrations Team."; + $booking_email_notcoming_demotion = ""; + $booking_email_paymentoutstanding_married_text = ""; //include the token definitions $form['tokens'] = array( diff --git a/booking.module b/booking.module index 827c8a2..0a97bec 100644 --- a/booking.module +++ b/booking.module @@ -48,6 +48,7 @@ module_load_include('inc', 'booking', 'booking.helper'); module_load_include('inc', 'booking', 'booking.paypal'); // Load the include for email functions module_load_include('inc', 'booking', 'booking.emails'); +module_load_include('inc', 'booking', 'booking.emails_admin'); // Load the include for bulk data import module_load_include('inc', 'booking', 'booking.import_data'); // Load the include for variety session configuration diff --git a/booking.tokens.inc b/booking.tokens.inc index dd647c6..f866f60 100644 --- a/booking.tokens.inc +++ b/booking.tokens.inc @@ -46,50 +46,7 @@ function booking_tokens_admin() { "Even though our registrations have reached maximum capacity, you can still register to join the waiting list.

\n
\n"; $booking_waitingpage_pre_nowaitlist_text = "

There's no one on the waiting list yet. If you haven't already done so, go ahead and register.

\n
\n"; $booking_waitingpage_post_text = "

\n"; - - $default_email_text = "Dear [booking:fname],\n" . - "Congratulations, you are officially booked into [booking:eventname]. " . - "Your registration reference number is [booking:booking-id].\n" . - "Please don't hesitate to contact us if you have any queries by replying to this email. " . - "We look forward to seeing you (God Willing) at [booking:eventname]!\n" . - "Love in Jesus,\n[booking:eventname] Registrations Team\n" . - "________________________________________________________\n" . - "The following information shows the details you entered when you registered. " . - "If any of this information is incorrect, please reply to this email with the corrections as soon as possible.\n" . - "________________________________________________________"; - $booking_email_regn_complete_text = "Dear [booking:fname],\n" . - "Thank-you for completing your payment for [booking:eventname].\n" . - "Please don't hesitate to contact us if you have any queries by replying to this email. " . - "We look forward to seeing you (God Willing) at [booking:eventname]!\n" . - "Love in Jesus,\n[booking:eventname] Registrations Team\n" . - "________________________________________________________\n" . - "The following information shows the details you entered when you registered. " . - "If any of this information is incorrect, please reply to this email with the corrections as soon as possible.\n" . - "________________________________________________________"; - $booking_email_waitinglist_text = "Dear [booking:fname],\n" . - "Thank-you for registering to attend [booking:eventname]. Unfortunately the venue for this event is full, and you have been placed on the waiting list to attend.\n" . - "We will contact you if a position becomes available for you. Please don't hesitate to contact us if you have any queries by replying to this email.\n" . - "Love in Jesus,\n[booking:eventname] Registrations Team\n" . - "________________________________________________________\n" . - "The following information shows the details you entered when you registered. " . - "If any of this information is incorrect, please reply to this email with the corrections as soon as possible.\n" . - "________________________________________________________"; - $booking_email_paymentoutstanding_text = "Dear [booking:fname],\n" . - "Thank-you for registering to attend [booking:eventname]. Our records indicate that you currently have $[booking:payment-required] outstanding to finalise your registration.\n" . - "Please visit [booking:balance-payment-link] in order to make your final payment.\n" . - "Love in Jesus,\n[booking:eventname] Registrations Team\n" . - "________________________________________________________\n"; - $booking_email_waitinglistpromotion = "Dear [booking:fname],\n" . - "We have some great news for you. A place at [booking:eventname] for you has just become available. " . - "If you wish to secure your place at [booking:eventname], please visit [booking:balance-payment-link] to make your final payment. " . - "Our records indicate that you currently have $[booking:paypal-total-amount] outstanding (including Paypal transaction fees).\n" . - "Once we have received your payment, you will be sent an automatic confirmation email thanking you for paying your outstanding fees. " . - "If you are paying via Paypal's eCheque feature, please be aware that payments take 3-5 working days to clear, " . - "and you will not receive the confirmation email until that has occurred.\n" . - "Please don't hesitate to contact us if you have any queries by replying to this email. We look forward to seeing you, God Willing, at [booking:eventname]\n" . - "Love in Jesus,\n[booking:eventname] Registrations Team."; - $booking_email_notcoming_demotion = ""; - $booking_email_paymentoutstanding_married_text = ""; + $booking_confirmation_text = "

Thanks for filling out the registration form.

\n" . "

To complete your booking, please make a payment of $[booking:payment-required] into the following bank account
\n" . " Account Name: blah
\n BSB: blah
\n Account Number: blah

\n" . @@ -192,17 +149,7 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text '#description' => t(''), '#default_value' => variable_get('booking_regn_confirm_married_text', $booking_regn_confirm_married_text), ); - //$booking_regn_completed_page_default = variable_get('booking_regn_completed_page'); - //$booking_regn_completed_page = isset($booking_regn_completed_page_default['value']) ? $booking_regn_completed_page_default['value'] : ''; - $form['confirmation']['booking_regn_completed_page'] = array( - '#title' => t('Text to use for landing page on return from paypal website'), - '#type' => 'textarea', - '#description' => t(''), - //'#default_value' => $booking_regn_completed_page, - '#default_value' => isset(variable_get('booking_regn_completed_page')['value']) ? variable_get('booking_regn_completed_page')['value'] : $defaults, - '#type' => 'text_format', - '#format' => 'full_html', - ); + /*Text for the balance payment page*/ $form['balance'] = array( '#type' => 'fieldset', @@ -310,6 +257,23 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text '#collapsible' => TRUE, '#collapsed' => TRUE, ); + $form['travel']['booking_travelform_page'] = array( + '#title' => t('Text to use at the start of the travel form for a non-married person.'), + '#type' => 'textarea', + '#description' => t(''), + '#default_value' => isset(variable_get('booking_travelform_page')['value']) ? variable_get('booking_travelform_page')['value'] : $defaults, + '#type' => 'text_format', + '#format' => 'full_html', + ); + $form['travel']['booking_travelform_married_page'] = array( + '#title' => t('Text to use at the start of the travel form for a married couple. Only applies if combined pricing is enabled.'), + '#type' => 'textarea', + '#description' => t(''), + '#default_value' => isset(variable_get('booking_travelform_married_page')['value']) ? variable_get('booking_travelform_married_page')['value'] : $defaults, + '#type' => 'text_format', + '#format' => 'full_html', + ); + /* $form['travel']['booking_travelform_page'] = array( '#title' => t('Text to use at the start of the travel form for a non-married person.'), '#type' => 'textarea', @@ -321,6 +285,15 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text '#type' => 'textarea', '#description' => t(''), '#default_value' => variable_get('booking_travelform_married_page', ''), + ); + */ + $form['confirmation']['booking_travelform_page_post_text'] = array( + '#title' => t('Text to use at the end of the travel form'), + '#type' => 'textarea', + '#description' => t(''), + '#default_value' => isset(variable_get('booking_travelform_page_post_text')['value']) ? variable_get('booking_travelform_page_post_text')['value'] : $defaults, + '#type' => 'text_format', + '#format' => 'full_html', ); $form['travel']['booking_travelform_completed_page'] = array( '#title' => t('Text to use on the travel form if the form has already been submitted.'), @@ -328,6 +301,26 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text '#description' => t(''), '#default_value' => variable_get('booking_travelform_completed_page', ''), ); + + /*People reporting pages*/ + $form['otherpages'] = array( + '#type' => 'fieldset', + '#title' => 'Miscellaneous pages', + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + + //$booking_regn_completed_page_default = variable_get('booking_regn_completed_page'); + //$booking_regn_completed_page = isset($booking_regn_completed_page_default['value']) ? $booking_regn_completed_page_default['value'] : ''; + $form['otherpages']['booking_regn_completed_page'] = array( + '#title' => t('Text to use for landing page on return from paypal website'), + '#type' => 'textarea', + '#description' => t(''), + //'#default_value' => $booking_regn_completed_page, + '#default_value' => isset(variable_get('booking_regn_completed_page')['value']) ? variable_get('booking_regn_completed_page')['value'] : $defaults, + '#type' => 'text_format', + '#format' => 'full_html', + ); //see http://drupal.org/node/820816#comment-3100356 //and http://drupal.org/node/823362