From da03cc427f8ed08759ff72e823ed40fa65a8ae94 Mon Sep 17 00:00:00 2001 From: yashodha Date: Tue, 23 May 2017 16:01:53 +0530 Subject: [PATCH] CRM-20184_Missing_{contact.email_greeting}_in_Workflow_Templates [&displayname in subject] --- CRM/Admin/Form/ScheduleReminders.php | 3 +- CRM/Campaign/Form/Task/Interview.php | 23 +- CRM/Contribute/Form/Contribution.php | 1 + CRM/Contribute/Form/Task/PDFLetterCommon.php | 14 +- CRM/Core/BAO/CustomOption.php | 2 +- CRM/Core/OptionGroup.php | 4 +- CRM/Custom/Form/Option.php | 2 + CRM/Custom/Page/AJAX.php | 1 + CRM/Logging/Schema.php | 12 +- CRM/Report/Form/Contribute/Detail.php | 2 +- CRM/Report/Form/Member/Detail.php | 5 + .../civicrm_msg_template.tpl | 16 + .../contribution_invoice_receipt_subject.tpl | 12 + .../contribution_offline_receipt_html.tpl | 319 ++++++++++ .../contribution_offline_receipt_subject.tpl | 1 + .../contribution_offline_receipt_text.tpl | 120 ++++ .../contribution_online_receipt_html.tpl | 473 +++++++++++++++ .../contribution_online_receipt_subject.tpl | 1 + .../contribution_online_receipt_text.tpl | 211 +++++++ .../contribution_recurring_billing_html.tpl | 65 ++ ...contribution_recurring_billing_subject.tpl | 1 + .../contribution_recurring_billing_text.tpl | 23 + .../contribution_recurring_cancelled_html.tpl | 33 ++ ...ntribution_recurring_cancelled_subject.tpl | 1 + .../contribution_recurring_cancelled_text.tpl | 3 + .../contribution_recurring_edit_html.tpl | 36 ++ .../contribution_recurring_edit_subject.tpl | 1 + .../contribution_recurring_edit_text.tpl | 8 + .../contribution_recurring_notify_html.tpl | 129 ++++ .../contribution_recurring_notify_subject.tpl | 1 + .../contribution_recurring_notify_text.tpl | 54 ++ .../event_registration_receipt_html.tpl | 175 ++++++ .../event_registration_receipt_text.tpl | 80 +++ .../membership_autorenew_billing_html.tpl | 66 +++ .../membership_autorenew_billing_subject.tpl | 1 + .../membership_autorenew_billing_text.tpl | 23 + .../membership_autorenew_cancelled_html.tpl | 70 +++ ...membership_autorenew_cancelled_subject.tpl | 1 + .../membership_autorenew_cancelled_text.tpl | 14 + .../membership_offline_receipt_html.tpl | 297 ++++++++++ .../membership_offline_receipt_subject.tpl | 6 + .../membership_offline_receipt_text.tpl | 115 ++++ .../membership_online_receipt_html.tpl | 556 ++++++++++++++++++ .../membership_online_receipt_subject.tpl | 1 + .../membership_online_receipt_text.tpl | 243 ++++++++ .../participant_cancelled_html.tpl | 129 ++++ .../participant_cancelled_subject.tpl | 1 + .../participant_cancelled_text.tpl | 47 ++ .../participant_confirm_html.tpl | 184 ++++++ .../participant_confirm_text.tpl | 81 +++ .../participant_expired_html.tpl | 132 +++++ .../participant_expired_text.tpl | 51 ++ .../participant_transferred_html.tpl | 129 ++++ .../participant_transferred_subject.tpl | 1 + .../participant_transferred_text.tpl | 45 ++ .../payment_or_refund_notification_html.tpl | 253 ++++++++ ...payment_or_refund_notification_subject.tpl | 2 + .../petition_confirmation_needed_subject.tpl | 1 + .../petition_sign_subject.tpl | 1 + .../pledge_acknowledge_subject.tpl | 1 + .../pledge_reminder_subject.tpl | 1 + CRM/Upgrade/Incremental/php/FiveOne.php | 87 +++ .../Incremental/sql/5.0.beta1.mysql.tpl | 4 + .../Incremental/sql/5.1.alpha1.mysql.tpl | 1 + js/Common.js | 3 +- sql/civicrm_generated.mysql | 2 +- templates/CRM/Activity/Selector/Selector.tpl | 4 +- templates/CRM/Batch/Form/Entry.tpl | 8 +- .../CRM/Contact/Form/Edit/TagsAndGroups.tpl | 2 +- .../Form/ContributionPage/Settings.tpl | 3 +- templates/CRM/Contribute/Form/Selector.tpl | 6 +- templates/CRM/Custom/Form/Option.tpl | 3 + templates/CRM/Custom/Page/Option.tpl | 2 + templates/CRM/Pledge/Form/Selector.tpl | 4 +- .../Form/Task/PDFLetterCommonTest.php | 74 +++ tests/phpunit/CRM/Logging/SchemaTest.php | 11 + tests/phpunit/CRM/Utils/versionCheckTest.php | 109 ++-- .../contribution_invoice_receipt_subject.tpl | 1 + .../contribution_offline_receipt_html.tpl | 2 +- .../contribution_offline_receipt_subject.tpl | 2 +- .../contribution_offline_receipt_text.tpl | 2 + .../contribution_online_receipt_html.tpl | 2 +- .../contribution_online_receipt_subject.tpl | 2 +- .../contribution_online_receipt_text.tpl | 4 +- .../contribution_recurring_billing_html.tpl | 4 +- ...contribution_recurring_billing_subject.tpl | 2 +- .../contribution_recurring_billing_text.tpl | 4 +- .../contribution_recurring_cancelled_html.tpl | 2 +- ...ntribution_recurring_cancelled_subject.tpl | 2 +- .../contribution_recurring_cancelled_text.tpl | 2 +- .../contribution_recurring_edit_html.tpl | 2 +- .../contribution_recurring_edit_subject.tpl | 2 +- .../contribution_recurring_edit_text.tpl | 4 +- .../contribution_recurring_notify_html.tpl | 2 +- .../contribution_recurring_notify_subject.tpl | 2 +- .../contribution_recurring_notify_text.tpl | 2 +- .../event_offline_receipt_subject.tpl | 2 +- .../event_online_receipt_subject.tpl | 2 +- .../event_registration_receipt_html.tpl | 2 +- .../event_registration_receipt_text.tpl | 2 +- .../membership_autorenew_billing_html.tpl | 2 +- .../membership_autorenew_billing_subject.tpl | 2 +- .../membership_autorenew_billing_text.tpl | 4 +- .../membership_autorenew_cancelled_html.tpl | 2 +- ...membership_autorenew_cancelled_subject.tpl | 2 +- .../membership_autorenew_cancelled_text.tpl | 2 + .../membership_offline_receipt_html.tpl | 1 + .../membership_offline_receipt_subject.tpl | 1 + .../membership_offline_receipt_text.tpl | 2 + .../membership_online_receipt_html.tpl | 2 +- .../membership_online_receipt_subject.tpl | 2 +- .../membership_online_receipt_text.tpl | 2 + .../participant_cancelled_html.tpl | 2 +- .../participant_cancelled_subject.tpl | 2 +- .../participant_cancelled_text.tpl | 2 +- .../participant_confirm_html.tpl | 2 +- .../participant_confirm_subject.tpl | 2 +- .../participant_confirm_text.tpl | 2 +- .../participant_expired_html.tpl | 2 +- .../participant_expired_subject.tpl | 2 +- .../participant_expired_text.tpl | 2 +- .../participant_transferred_html.tpl | 2 +- .../participant_transferred_subject.tpl | 2 +- .../participant_transferred_text.tpl | 2 +- .../payment_or_refund_notification_html.tpl | 2 +- ...payment_or_refund_notification_subject.tpl | 3 +- .../payment_or_refund_notification_text.tpl | 2 +- .../petition_confirmation_needed_html.tpl | 2 + .../petition_confirmation_needed_subject.tpl | 2 +- .../petition_confirmation_needed_text.tpl | 2 + .../message_templates/petition_sign_html.tpl | 2 + .../petition_sign_subject.tpl | 2 +- .../message_templates/petition_sign_text.tpl | 2 + .../pledge_acknowledge_html.tpl | 2 +- .../pledge_acknowledge_subject.tpl | 2 +- .../pledge_acknowledge_text.tpl | 2 +- .../pledge_reminder_html.tpl | 2 +- .../pledge_reminder_subject.tpl | 2 +- .../pledge_reminder_text.tpl | 2 +- xml/version.xml | 2 +- 140 files changed, 4593 insertions(+), 148 deletions(-) create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/civicrm_msg_template.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_invoice_receipt_subject.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_offline_receipt_html.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_offline_receipt_subject.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_offline_receipt_text.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_online_receipt_html.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_online_receipt_subject.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_online_receipt_text.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_billing_html.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_billing_subject.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_billing_text.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_cancelled_html.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_cancelled_subject.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_cancelled_text.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_edit_html.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_edit_subject.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_edit_text.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_notify_html.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_notify_subject.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_notify_text.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/event_registration_receipt_html.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/event_registration_receipt_text.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_billing_html.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_billing_subject.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_billing_text.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_cancelled_html.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_cancelled_subject.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_cancelled_text.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_offline_receipt_html.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_offline_receipt_subject.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_offline_receipt_text.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_online_receipt_html.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_online_receipt_subject.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_online_receipt_text.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_cancelled_html.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_cancelled_subject.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_cancelled_text.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_confirm_html.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_confirm_text.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_expired_html.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_expired_text.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_transferred_html.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_transferred_subject.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_transferred_text.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/payment_or_refund_notification_html.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/payment_or_refund_notification_subject.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/petition_confirmation_needed_subject.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/petition_sign_subject.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/pledge_acknowledge_subject.tpl create mode 100644 CRM/Upgrade/5.0.beta1.msg_template/message_templates/pledge_reminder_subject.tpl create mode 100644 CRM/Upgrade/Incremental/php/FiveOne.php create mode 100644 CRM/Upgrade/Incremental/sql/5.1.alpha1.mysql.tpl diff --git a/CRM/Admin/Form/ScheduleReminders.php b/CRM/Admin/Form/ScheduleReminders.php index 6e56a4dfc0c1..beec68bb85be 100644 --- a/CRM/Admin/Form/ScheduleReminders.php +++ b/CRM/Admin/Form/ScheduleReminders.php @@ -168,11 +168,10 @@ public function buildQuickForm() { $this->add('number', 'start_action_offset', ts('When'), array('class' => 'six', 'min' => 0)); $this->addRule('start_action_offset', ts('Value should be a positive number'), 'positiveInteger'); - $isActive = ts('Send email'); + $isActive = ts('Scheduled Reminder Active'); $recordActivity = ts('Record activity for automated email'); if ($providersCount) { $this->assign('sms', $providersCount); - $isActive = ts('Send email or SMS'); $recordActivity = ts('Record activity for automated email or SMS'); $options = CRM_Core_OptionGroup::values('msg_mode'); $this->add('select', 'mode', ts('Send as'), $options); diff --git a/CRM/Campaign/Form/Task/Interview.php b/CRM/Campaign/Form/Task/Interview.php index 191e39b81058..046da10cdd1d 100644 --- a/CRM/Campaign/Form/Task/Interview.php +++ b/CRM/Campaign/Form/Task/Interview.php @@ -100,10 +100,11 @@ public function preProcess() { $orderClause = FALSE; $buttonName = $this->controller->getButtonName(); + $walkListActivityId = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'WalkList'); if ($buttonName == '_qf_Interview_submit_orderBy' && !empty($_POST['order_bys'])) { $orderByParams = CRM_Utils_Array::value('order_bys', $_POST); } - elseif (CRM_Core_OptionGroup::getValue('activity_type', 'WalkList') == $this->_surveyDetails['activity_type_id']) { + elseif ($walkListActivityId == $this->_surveyDetails['activity_type_id']) { $orderByParams = array( 1 => array( @@ -170,8 +171,7 @@ public function preProcess() { $this->_contactIds, $this->_interviewerId ); - $activityStatus = CRM_Core_PseudoConstant::activityStatus('name'); - $scheduledStatusId = array_search('Scheduled', $activityStatus); + $scheduledStatusId = CRM_Core_PseudoConstant::getKey('CRM_Activity_DAO_Activity', 'activity_status_id', 'Scheduled'); $activityIds = array(); foreach ($this->_contactIds as $key => $voterId) { @@ -248,9 +248,9 @@ public function preProcess() { } //set the title. - $activityTypes = CRM_Core_PseudoConstant::activityType(FALSE, TRUE, FALSE, 'label', TRUE); $this->_surveyTypeId = CRM_Utils_Array::value('activity_type_id', $this->_surveyValues); - CRM_Utils_System::setTitle(ts('Record %1 Responses', array(1 => $activityTypes[$this->_surveyTypeId]))); + $surveyTypeLabel = CRM_Core_PseudoConstant::getLabel('CRM_Activity_BAO_Activity', 'activity_type_id', $this->_surveyTypeId); + CRM_Utils_System::setTitle(ts('Record %1 Responses', array(1 => $surveyTypeLabel))); } public function validateIds() { @@ -387,7 +387,7 @@ public function setDefaultValues() { foreach ($this->_surveyFields as $name => $field) { $acceptable_types = CRM_Contact_BAO_ContactType::basicTypes(); $acceptable_types[] = 'Contact'; - if (in_array($field['field_type'], $acceptable_types)) { + if (isset($field['field_type']) && (in_array($field['field_type'], $acceptable_types))) { $contactFields[$name] = $field; } } @@ -397,7 +397,8 @@ public function setDefaultValues() { } } - if (CRM_Core_OptionGroup::getValue('activity_type', 'WalkList') == $this->_surveyDetails['activity_type_id']) { + $walkListActivityId = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'WalkList'); + if ($walkListActivityId == $this->_surveyDetails['activity_type_id']) { $defaults['order_bys'] = array( 1 => array( @@ -480,7 +481,7 @@ public static function registerInterview($params) { static $statusId; if (!$statusId) { - $statusId = array_search('Completed', CRM_Core_PseudoConstant::activityStatus('name')); + $statusId = CRM_Core_PseudoConstant::getKey('CRM_Activity_DAO_Activity', 'activity_status_id', 'Completed'); } //format custom fields. @@ -580,11 +581,7 @@ public function getVoterIds() { $this->_contactIds = $this->get('contactIds'); if (!is_array($this->_contactIds)) { //get the survey activities. - $activityStatus = CRM_Core_PseudoConstant::activityStatus('name'); - $statusIds = array(); - if ($statusId = array_search('Scheduled', $activityStatus)) { - $statusIds[] = $statusId; - } + $statusIds[] = CRM_Core_PseudoConstant::getKey('CRM_Activity_DAO_Activity', 'activity_status_id', 'Scheduled'); $surveyActivities = CRM_Campaign_BAO_Survey::getSurveyVoterInfo($this->_surveyId, $this->_interviewerId, $statusIds diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php index 8bc4c44c0741..07daaa7368df 100644 --- a/CRM/Contribute/Form/Contribution.php +++ b/CRM/Contribute/Form/Contribution.php @@ -239,6 +239,7 @@ public function preProcess() { if (!empty($this->_id)) { $this->assignPaymentInfoBlock(); $this->assign('contribID', $this->_id); + $this->assign('isUsePaymentBlock', TRUE); } $this->_context = CRM_Utils_Request::retrieve('context', 'String', $this); diff --git a/CRM/Contribute/Form/Task/PDFLetterCommon.php b/CRM/Contribute/Form/Task/PDFLetterCommon.php index 98cba059eda9..f5fdb968c9a6 100644 --- a/CRM/Contribute/Form/Task/PDFLetterCommon.php +++ b/CRM/Contribute/Form/Task/PDFLetterCommon.php @@ -188,17 +188,17 @@ public static function isValidHTMLWithTableSeparator($tokens, $html) { * Check that the token only appears in a table cell. The '' separator cannot otherwise work * Calculate the number of times it appears IN the cell & the number of times it appears - should be the same! * - * @param $token - * @param $entity - * @param $textToSearch + * @param string $token + * @param string $entity + * @param string $textToSearch * * @return bool */ public static function isHtmlTokenInTableCell($token, $entity, $textToSearch) { - $tokenToMatch = $entity . '.' . $token; - $dontCare = array(); - $within = preg_match_all("||si'; + $within = preg_match_all($pattern, $textToSearch); + $total = preg_match_all("|{" . $tokenToMatch . "}|", $textToSearch); return ($within == $total); } diff --git a/CRM/Core/BAO/CustomOption.php b/CRM/Core/BAO/CustomOption.php index 6b7f0f8d7564..6cee5cf2eb2c 100644 --- a/CRM/Core/BAO/CustomOption.php +++ b/CRM/Core/BAO/CustomOption.php @@ -159,7 +159,7 @@ static public function getOptionListSelector(&$params) { $options[$dao->id]['is_default'] = ''; } } - + $options[$dao->id]['description'] = $dao->description; $options[$dao->id]['class'] = $dao->id . ',' . $class; $options[$dao->id]['is_active'] = empty($dao->is_active) ? ts('No') : ts('Yes'); $options[$dao->id]['links'] = CRM_Core_Action::formLink($links, diff --git a/CRM/Core/OptionGroup.php b/CRM/Core/OptionGroup.php index a6fdb677f807..c9a95591b820 100644 --- a/CRM/Core/OptionGroup.php +++ b/CRM/Core/OptionGroup.php @@ -342,7 +342,7 @@ public static function lookupValues(&$params, $names, $flip = FALSE) { * @return null */ public static function getLabel($groupName, $value, $onlyActiveValue = TRUE) { - Civi::log()->warning('Deprecated function, use CRM_Core_PseudoConstant::getLabel', array('civi.tag' => 'deprecated')); + Civi::log()->warning('Deprecated function CRM_Core_OptionGroup::getLabel, use CRM_Core_PseudoConstant::getLabel', array('civi.tag' => 'deprecated')); if (empty($groupName) || empty($value) ) { @@ -396,7 +396,7 @@ public static function getValue( return NULL; } - Civi::log()->warning('Deprecated function, use CRM_Core_PseudoConstant::getKey', array('civi.tag' => 'deprecated')); + Civi::log()->warning('Deprecated function CRM_Core_OptionGroup::getValue, use CRM_Core_PseudoConstant::getKey', array('civi.tag' => 'deprecated')); $query = " SELECT v.label as label ,v.{$valueField} as value diff --git a/CRM/Custom/Form/Option.php b/CRM/Custom/Form/Option.php index 7426b98b3130..7d81cb606938 100644 --- a/CRM/Custom/Form/Option.php +++ b/CRM/Custom/Form/Option.php @@ -181,6 +181,7 @@ public function buildQuickForm() { $this->add('text', 'value', ts('Option Value'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_OptionValue', 'value'), TRUE); + $this->add('textarea', 'description', ts('Description'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_OptionValue', 'description')); // weight $this->add('text', 'weight', ts('Order'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_OptionValue', 'weight'), TRUE); $this->addRule('weight', ts('is a numeric field'), 'numeric'); @@ -406,6 +407,7 @@ public function postProcess() { $customOption->label = $params['label']; $customOption->name = CRM_Utils_String::titleToVar($params['label']); $customOption->weight = $params['weight']; + $customOption->description = $params['description']; $customOption->value = $params['value']; $customOption->is_active = CRM_Utils_Array::value('is_active', $params, FALSE); diff --git a/CRM/Custom/Page/AJAX.php b/CRM/Custom/Page/AJAX.php index fba5e2b10821..653971cde599 100644 --- a/CRM/Custom/Page/AJAX.php +++ b/CRM/Custom/Page/AJAX.php @@ -57,6 +57,7 @@ public static function getOptionList() { $selectorElements = array( 'label', 'value', + 'description', 'is_default', 'is_active', 'links', diff --git a/CRM/Logging/Schema.php b/CRM/Logging/Schema.php index de3f13bcccea..3ecdfc01d80c 100644 --- a/CRM/Logging/Schema.php +++ b/CRM/Logging/Schema.php @@ -703,12 +703,20 @@ private function createLogTableFor($table) { // - prepend the name with log_ // - drop AUTO_INCREMENT columns // - drop non-column rows of the query (keys, constraints, etc.) - // - set the ENGINE to the specified engine (default is archive) + // - set the ENGINE to the specified engine (default is archive or if archive is disabled or nor installed INNODB) // - add log-specific columns (at the end of the table) + $mysqlEngines = []; + $engines = CRM_Core_DAO::executeQuery("SHOW ENGINES"); + while ($engines->fetch()) { + if ($engines->Support == 'YES' || $engines->Support == 'DEFAULT') { + $mysqlEngines[] = $engines->Engine; + } + } + $logEngine = in_array('ARCHIVE', $mysqlEngines) ? 'ARCHIVE' : 'INNODB'; $query = preg_replace("/^CREATE TABLE `$table`/i", "CREATE TABLE `{$this->db}`.log_$table", $query); $query = preg_replace("/ AUTO_INCREMENT/i", '', $query); $query = preg_replace("/^ [^`].*$/m", '', $query); - $engine = strtoupper(CRM_Utils_Array::value('engine', $this->logTableSpec[$table], 'ARCHIVE')); + $engine = strtoupper(CRM_Utils_Array::value('engine', $this->logTableSpec[$table], $logEngine)); $engine .= " " . CRM_Utils_Array::value('engine_config', $this->logTableSpec[$table]); $query = preg_replace("/^\) ENGINE=[^ ]+ /im", ') ENGINE=' . $engine . ' ', $query); diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php index e87e0310679a..84b1ce6b3e02 100644 --- a/CRM/Report/Form/Contribute/Detail.php +++ b/CRM/Report/Form/Contribute/Detail.php @@ -73,7 +73,7 @@ public function __construct() { 'fields_defaults' => array('sort_name'), 'fields_excluded' => array('id'), 'fields_required' => array('id'), - 'filters_defaults' => array('is_deleted' => FALSE), + 'filters_defaults' => array('is_deleted' => 0), 'no_field_disambiguation' => TRUE, )), array( 'civicrm_email' => array( diff --git a/CRM/Report/Form/Member/Detail.php b/CRM/Report/Form/Member/Detail.php index 344af45dda37..d882af61ca30 100644 --- a/CRM/Report/Form/Member/Detail.php +++ b/CRM/Report/Form/Member/Detail.php @@ -81,6 +81,11 @@ public function __construct() { 'title' => ts('Contact Name'), 'operator' => 'like', ), + 'is_deleted' => array( + 'title' => ts('Is Deleted'), + 'default' => 0, + 'type' => CRM_Utils_Type::T_BOOLEAN, + ), 'id' => array('no_display' => TRUE), ), 'order_bys' => array( diff --git a/CRM/Upgrade/5.0.beta1.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/5.0.beta1.msg_template/civicrm_msg_template.tpl new file mode 100644 index 000000000000..82348a290e27 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/civicrm_msg_template.tpl @@ -0,0 +1,16 @@ +{php} + $dir = SMARTY_DIR . '/../../CRM/Upgrade/5.0.beta1.msg_template/message_templates'; + $templates = array(); + foreach (preg_grep('/\.tpl$/', scandir($dir)) as $filename) { + $parts = explode('_', basename($filename, '.tpl')); + $templates[] = array('type' => array_pop($parts), 'name' => implode('_', $parts), 'filename' => "$dir/$filename"); + } + $this->assign('templates', $templates); +{/php} + +{foreach from=$templates item=tpl} + {fetch assign=content file=$tpl.filename} + SELECT @workflow_id := MAX(id) FROM civicrm_option_value WHERE name = '{$tpl.name}'; + SELECT @content := msg_{$tpl.type} FROM civicrm_msg_template WHERE workflow_id = @workflow_id AND is_reserved = 1 LIMIT 1; + UPDATE civicrm_msg_template SET msg_{$tpl.type} = '{$content|escape:"quotes"}' WHERE workflow_id = @workflow_id AND (is_reserved = 1 OR (is_default = 1 AND msg_{$tpl.type} = @content)); +{/foreach} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_invoice_receipt_subject.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_invoice_receipt_subject.tpl new file mode 100644 index 000000000000..80d07865574d --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_invoice_receipt_subject.tpl @@ -0,0 +1,12 @@ +{if $title} + {if $component} + {if $component == 'event'} + {ts 1=$title}Event Registration Invoice: %1{/ts} + {else} + {ts 1=$title}Contribution Invoice: %1{/ts} + {/if} + {/if} +{else} + {ts}Invoice{/ts} +{/if} +- {contact.display_name} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_offline_receipt_html.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_offline_receipt_html.tpl new file mode 100644 index 000000000000..a4cbeee05ed5 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_offline_receipt_html.tpl @@ -0,0 +1,319 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} + +
+ + + + + + + + + + + + + + + +
+

{contact.email_greeting},

+ {if $formValues.receipt_text} +

{$formValues.receipt_text|htmlize}

+ {else} +

{ts}Thank you for your support.{/ts}

+ {/if} + +

{ts}Please print this receipt for your records.{/ts}

+ +
+ + + + + + + + + + {if $lineItem and !$is_quick_config} + {foreach from=$lineItem item=value key=priceset} + + + + {/foreach} + {/if} + {if $getTaxDetails && $dataArray} + + + + + + {foreach from=$dataArray item=value key=priceset} + + {if $priceset || $priceset == 0 || $value != ''} + + + {else} + + + {/if} + + {/foreach} + {/if} + + {if isset($totalTaxAmount) && $totalTaxAmount !== 'null'} + + + + + {/if} + + + + + + + {if $receive_date} + + + + + {/if} + + {if $receipt_date} + + + + + {/if} + + {if $formValues.paidBy and !$formValues.hidden_CreditCard} + + + + + {if $formValues.check_number} + + + + + {/if} + {/if} + + {if $formValues.trxn_id} + + + + + {/if} + + {if $ccContribution} + + + + + + + + + + + + + {/if} + + {if $softCreditTypes and $softCredits} + {foreach from=$softCreditTypes item=softCreditType key=n} + + + + {foreach from=$softCredits.$n item=value key=label} + + + + + {/foreach} + {/foreach} + {/if} + + {if $customGroup} + {foreach from=$customGroup item=value key=customName} + + + + {foreach from=$value item=v key=n} + + + + + {/foreach} + {/foreach} + {/if} + + {if $formValues.product_name} + + + + + + + {if $formValues.product_option} + + + + + {/if} + {if $formValues.product_sku} + + + + + {/if} + {if $fulfilled_date} + + + + + {/if} + {/if} + +
+ {ts}Contribution Information{/ts} +
+ {ts}Financial Type{/ts} + + {$formValues.contributionType_name} +
+ {* FIXME: style this table so that it looks like the text version (justification, etc.) *} + + + + + {if $getTaxDetails} + + + + {/if} + + + {foreach from=$value item=line} + + + + + {if $getTaxDetails} + + {if $line.tax_rate != "" || $line.tax_amount != ""} + + + {else} + + + {/if} + {/if} + + + {/foreach} +
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/ts}{ts}Subtotal{/ts}{ts}Tax Rate{/ts}{ts}Tax Amount{/ts}{ts}Total{/ts}
+ {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} + 		+ {$line.qty} + + {$line.unit_price|crmMoney:$currency} + + {$line.unit_price*$line.qty|crmMoney:$currency} + + {$line.tax_rate|string_format:"%.2f"}% + + {$line.tax_amount|crmMoney:$currency} + + {$line.line_total+$line.tax_amount|crmMoney:$currency} +
+
+ {ts} Amount before Tax : {/ts} + + {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency} +
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}No{/ts} {$taxTerm} {$value|crmMoney:$currency}
+ {ts}Total Tax Amount{/ts} + + {$totalTaxAmount|crmMoney:$currency} +
+ {ts}Total Amount{/ts} + + {$formValues.total_amount|crmMoney:$currency} +
+ {ts}Date Received{/ts} + + {$receive_date|truncate:10:''|crmDate} +
+ {ts}Receipt Date{/ts} + + {$receipt_date|truncate:10:''|crmDate} +
+ {ts}Paid By{/ts} + + {$formValues.paidBy} +
+ {ts}Check Number{/ts} + + {$formValues.check_number} +
+ {ts}Transaction ID{/ts} + + {$formValues.trxn_id} +
+ {ts}Billing Name and Address{/ts} +
+ {$billingName}
+ {$address|nl2br} +
+ {ts}Credit Card Information{/ts} +
+ {$credit_card_type}
+ {$credit_card_number}
+ {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} +
+ {$softCreditType} +
+ {$label} + + {$value} +
+ {$customName} +
+ {$n} + + {$v} +
+ {ts}Premium Information{/ts} +
+ {$formValues.product_name} +
+ {ts}Option{/ts} + + {$formValues.product_option} +
+ {ts}SKU{/ts} + + {$formValues.product_sku} +
+ {ts}Sent{/ts} + + {$fulfilled_date|truncate:10:''|crmDate} +
+
+
+ + + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_offline_receipt_subject.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_offline_receipt_subject.tpl new file mode 100644 index 000000000000..2a19c6e6c3b2 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_offline_receipt_subject.tpl @@ -0,0 +1 @@ +{ts}Contribution Receipt{/ts} - {contact.display_name} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_offline_receipt_text.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_offline_receipt_text.tpl new file mode 100644 index 000000000000..5bfac13c7357 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_offline_receipt_text.tpl @@ -0,0 +1,120 @@ +{contact.email_greeting}, + +{if $formValues.receipt_text} +{$formValues.receipt_text} +{else}{ts}Thank you for your support.{/ts}{/if} + +{ts}Please print this receipt for your records.{/ts} + + +=========================================================== +{ts}Contribution Information{/ts} + +=========================================================== +{ts}Financial Type{/ts}: {$formValues.contributionType_name} +{if $lineItem} +{foreach from=$lineItem item=value key=priceset} +--------------------------------------------------------- +{capture assign=ts_item}{ts}Item{/ts}{/capture} +{capture assign=ts_qty}{ts}Qty{/ts}{/capture} +{capture assign=ts_each}{ts}Each{/ts}{/capture} +{if $getTaxDetails} +{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture} +{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture} +{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture} +{/if} +{capture assign=ts_total}{ts}Total{/ts}{/capture} +{$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {if $getTaxDetails} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate} {$ts_taxAmount|string_format:"%10s"} {/if} {$ts_total|string_format:"%10s"} +---------------------------------------------------------- +{foreach from=$value item=line} +{capture assign=ts_item}{if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:"..."|string_format:"%-30s"} {$line.qty|string_format:"%5s"} {$line.unit_price|crmMoney:$currency|string_format:"%10s"} {if $getTaxDetails}{$line.unit_price*$line.qty|crmMoney:$currency|string_format:"%10s"} {if $line.tax_rate != "" || $line.tax_amount != ""} {$line.tax_rate|string_format:"%.2f"} % {$line.tax_amount|crmMoney:$currency|string_format:"%10s"} {else} {/if} {/if} {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:"%10s"} +{/foreach} +{/foreach} +{/if} + +{if $getTaxDetails && $dataArray} +{ts}Amount before Tax{/ts} : {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency} + +{foreach from=$dataArray item=value key=priceset} +{if $priceset || $priceset == 0 || $value != ''} +{$taxTerm} {$priceset|string_format:"%.2f"}% : {$value|crmMoney:$currency} +{else} +{ts}No{/ts} {$taxTerm} : {$value|crmMoney:$currency} +{/if} +{/foreach} +{/if} + +{if isset($totalTaxAmount) && $totalTaxAmount !== 'null'} +{ts}Total Tax Amount{/ts} : {$totalTaxAmount|crmMoney:$currency} +{/if} +{ts}Total Amount{/ts} : {$formValues.total_amount|crmMoney:$currency} +{if $receive_date} +{ts}Date Received{/ts}: {$receive_date|truncate:10:''|crmDate} +{/if} +{if $receipt_date} +{ts}Receipt Date{/ts}: {$receipt_date|truncate:10:''|crmDate} +{/if} +{if $formValues.paidBy and !$formValues.hidden_CreditCard} +{ts}Paid By{/ts}: {$formValues.paidBy} +{if $formValues.check_number} +{ts}Check Number{/ts}: {$formValues.check_number} +{/if} +{/if} +{if $formValues.trxn_id} +{ts}Transaction ID{/ts}: {$formValues.trxn_id} +{/if} + +{if $ccContribution} +=========================================================== +{ts}Billing Name and Address{/ts} + +=========================================================== +{$billingName} +{$address} + +=========================================================== +{ts}Credit Card Information{/ts} + +=========================================================== +{$credit_card_type} +{$credit_card_number} +{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} +{/if} +{if $customGroup} +{foreach from=$customGroup item=value key=customName} +=========================================================== +{$customName} +=========================================================== +{foreach from=$value item=v key=n} +{$n}: {$v} +{/foreach} +{/foreach} +{/if} + +{if $softCreditTypes and $softCredits} +{foreach from=$softCreditTypes item=softCreditType key=n} +=========================================================== +{$softCreditType} +=========================================================== +{foreach from=$softCredits.$n item=value key=label} +{$label}: {$value} +{/foreach} +{/foreach} +{/if} + +{if $formValues.product_name} +=========================================================== +{ts}Premium Information{/ts} + +=========================================================== +{$formValues.product_name} +{if $formValues.product_option} +{ts}Option{/ts}: {$formValues.product_option} +{/if} +{if $formValues.product_sku} +{ts}SKU{/ts}: {$formValues.product_sku} +{/if} +{if $fulfilled_date} +{ts}Sent{/ts}: {$fulfilled_date|crmDate} +{/if} +{/if} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_online_receipt_html.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_online_receipt_html.tpl new file mode 100644 index 000000000000..61dc72d657b4 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_online_receipt_html.tpl @@ -0,0 +1,473 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} + +
+ + + + + + + + + + + +
+

{contact.email_greeting},

+ {if $receipt_text} +

{$receipt_text|htmlize}

+ {/if} + + {if $is_pay_later} +

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} + {else} +

{ts}Please print this confirmation for your records.{/ts}

+ {/if} + +
+ + + {if $amount} + + + + + + + {if $lineItem and $priceSetID and !$is_quick_config} + + {foreach from=$lineItem item=value key=priceset} + + + + {/foreach} + {if $dataArray} + + + + + + {foreach from=$dataArray item=value key=priceset} + + {if $priceset || $priceset == 0} + + + {else} + + + {/if} + + {/foreach} + + {/if} + {if $totalTaxAmount} + + + + + {/if} + + + + + + {else} + + {if $totalTaxAmount} + + + + + {/if} + + + + + + {/if} + + {/if} + + + {if $receive_date} + + + + + {/if} + + {if $is_monetary and $trxn_id} + + + + + {/if} + + {if $is_recur} + {if $contributeMode eq 'notify' or $contributeMode eq 'directIPN'} + + + {if $updateSubscriptionBillingUrl} + + + + {/if} + + + + + {/if} + {/if} + + {if $honor_block_is_active} + + + + {foreach from=$honoreeProfile item=value key=label} + + + + + {/foreach} + {elseif $softCreditTypes and $softCredits} + {foreach from=$softCreditTypes item=softCreditType key=n} + + + + {foreach from=$softCredits.$n item=value key=label} + + + + + {/foreach} + {/foreach} + {/if} + + {if $pcpBlock} + + + + + + + + {if $pcp_roll_nickname} + + + + + {/if} + {if $pcp_personal_note} + + + + + {/if} + {/if} + + {if $onBehalfProfile} + + + + {foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName} + + + + + {/foreach} + {/if} + + {if $isShare} + + + + {/if} + + {if ! ($contributeMode eq 'notify' OR $contributeMode eq 'directIPN') and $is_monetary} + {if $is_pay_later && !$isBillingAddressRequiredForPayLater} + + + + + + + {elseif $amount GT 0} + + + + + + + {/if} + {/if} + + {if $contributeMode eq 'direct' AND !$is_pay_later AND $amount GT 0} + + + + + + + {/if} + + {if $selectPremium} + + + + + + + {if $option} + + + + + {/if} + {if $sku} + + + + + {/if} + {if $start_date} + + + + + {/if} + {if $end_date} + + + + + {/if} + {if $contact_email OR $contact_phone} + + + + {/if} + {if $is_deductible AND $price} + + + + {/if} + {/if} + + {if $customPre} + + + + {foreach from=$customPre item=customValue key=customName} + {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields} + + + + + {/if} + {/foreach} + {/if} + + {if $customPost} + + + + {foreach from=$customPost item=customValue key=customName} + {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields} + + + + + {/if} + {/foreach} + {/if} + +
+ {ts}Contribution Information{/ts} +
+ {* FIXME: style this table so that it looks like the text version (justification, etc.) *} + + + + + {if $dataArray} + + + + {/if} + + + {foreach from=$value item=line} + + + + + {if $getTaxDetails} + + {if $line.tax_rate != "" || $line.tax_amount != ""} + + + {else} + + + {/if} + {/if} + + + {/foreach} +
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/ts}{ts}Subtotal{/ts}{ts}Tax Rate{/ts}{ts}Tax Amount{/ts}{ts}Total{/ts}
+ {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} + 		+ {$line.qty} + + {$line.unit_price|crmMoney:$currency} + + {$line.unit_price*$line.qty|crmMoney:$currency} + + {$line.tax_rate|string_format:"%.2f"}% + + {$line.tax_amount|crmMoney:$currency} + + {$line.line_total+$line.tax_amount|crmMoney:$currency} +
+
+ {ts} Amount before Tax : {/ts} + + {$amount-$totalTaxAmount|crmMoney:$currency} +
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}No{/ts} {$taxTerm} {$value|crmMoney:$currency}
+ {ts}Total Tax{/ts} + + {$totalTaxAmount|crmMoney:$currency} +
+ {ts}Total Amount{/ts} + + {$amount|crmMoney:$currency} +
+ {ts}Total Tax Amount{/ts} + + {$totalTaxAmount|crmMoney:$currency} +
+ {ts}Amount{/ts} + + {$amount|crmMoney:$currency} {if $amount_level} - {$amount_level}{/if} +
+ {ts}Date{/ts} + + {$receive_date|crmDate} +
+ {ts}Transaction #{/ts} + + {$trxn_id} +
+ {ts 1=$cancelSubscriptionUrl}This is a recurring contribution. You can cancel future contributions by visiting this web page.{/ts} +
+ {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by visiting this web page.{/ts} +
+ {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments for this recurring contribution by visiting this web page.{/ts} +
+ {$soft_credit_type} +
+ {$label} + + {$value} +
+ {$softCreditType} +
+ {$label} + + {$value} +
+ {ts}Personal Campaign Page{/ts} +
+ {ts}Display In Honor Roll{/ts} + + {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if} +
+ {ts}Nickname{/ts} + + {$pcp_roll_nickname} +
+ {ts}Personal Note{/ts} + + {$pcp_personal_note} +
+ {$onBehalfProfile_grouptitle} +
+ {$onBehalfName} + + {$onBehalfValue} +
+ {capture assign=contributionUrl}{crmURL p='civicrm/contribute/transact' q="reset=1&id=`$contributionPageId`" a=true fe=1 h=1}{/capture} + {include file="CRM/common/SocialNetwork.tpl" emailMode=true url=$contributionUrl title=$title pageURL=$contributionUrl} +
+ {ts}Registered Email{/ts} +
+ {$email} +
+ {ts}Billing Name and Address{/ts} +
+ {$billingName}
+ {$address|nl2br}
+ {$email} +
+ {ts}Credit Card Information{/ts} +
+ {$credit_card_type}
+ {$credit_card_number}
+ {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
+
+ {ts}Premium Information{/ts} +
+ {$product_name} +
+ {ts}Option{/ts} + + {$option} +
+ {ts}SKU{/ts} + + {$sku} +
+ {ts}Start Date{/ts} + + {$start_date|crmDate} +
+ {ts}End Date{/ts} + + {$end_date|crmDate} +
+

{ts}For information about this premium, contact:{/ts}

+ {if $contact_email} +

{$contact_email}

+ {/if} + {if $contact_phone} +

{$contact_phone}

+ {/if} +
+

{ts 1=$price|crmMoney:$currency}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}

+
+ {$customPre_grouptitle} +
+ {$customName} + + {$customValue} +
+ {$customPost_grouptitle} +
+ {$customName} + + {$customValue} +
+
+ + + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_online_receipt_subject.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_online_receipt_subject.tpl new file mode 100644 index 000000000000..052dce5bd748 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_online_receipt_subject.tpl @@ -0,0 +1 @@ +{if $is_pay_later}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} - {contact.display_name} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_online_receipt_text.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_online_receipt_text.tpl new file mode 100644 index 000000000000..2820950ed170 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_online_receipt_text.tpl @@ -0,0 +1,211 @@ +{contact.email_greeting}, + +{if $receipt_text} +{$receipt_text} +{/if} +{if $is_pay_later} + +=========================================================== +{$pay_later_receipt} +=========================================================== +{else} + +{ts}Please print this receipt for your records.{/ts} +{/if} + +{if $amount} +=========================================================== +{ts}Contribution Information{/ts} + +=========================================================== +{if $lineItem and $priceSetID and !$is_quick_config} +{foreach from=$lineItem item=value key=priceset} +--------------------------------------------------------- +{capture assign=ts_item}{ts}Item{/ts}{/capture} +{capture assign=ts_qty}{ts}Qty{/ts}{/capture} +{capture assign=ts_each}{ts}Each{/ts}{/capture} +{if $dataArray} +{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture} +{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture} +{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture} +{/if} +{capture assign=ts_total}{ts}Total{/ts}{/capture} +{$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {if $dataArray} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate} {$ts_taxAmount|string_format:"%10s"} {/if} {$ts_total|string_format:"%10s"} +---------------------------------------------------------- +{foreach from=$value item=line} +{capture assign=ts_item}{if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:"..."|string_format:"%-30s"} {$line.qty|string_format:"%5s"} {$line.unit_price|crmMoney:$currency|string_format:"%10s"} {if $dataArray}{$line.unit_price*$line.qty|crmMoney:$currency|string_format:"%10s"} {if $line.tax_rate != "" || $line.tax_amount != ""} {$line.tax_rate|string_format:"%.2f"} % {$line.tax_amount|crmMoney:$currency|string_format:"%10s"} {else} {/if} {/if} {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:"%10s"} +{/foreach} +{/foreach} + +{if $dataArray} +{ts}Amount before Tax{/ts}: {$amount-$totalTaxAmount|crmMoney:$currency} + +{foreach from=$dataArray item=value key=priceset} +{if $priceset || $priceset == 0} +{$taxTerm} {$priceset|string_format:"%.2f"}%: {$value|crmMoney:$currency} +{else} +{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency} +{/if} +{/foreach} +{/if} + +{if $totalTaxAmount} +{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency} +{/if} + +{ts}Total Amount{/ts}: {$amount|crmMoney:$currency} +{else} +{ts}Amount{/ts}: {$amount|crmMoney:$currency} {if $amount_level } - {$amount_level} {/if} +{/if} +{/if} +{if $receive_date} + +{ts}Date{/ts}: {$receive_date|crmDate} +{/if} +{if $is_monetary and $trxn_id} +{ts}Transaction #{/ts}: {$trxn_id} +{/if} + +{if $is_recur and ($contributeMode eq 'notify' or $contributeMode eq 'directIPN')} +{ts}This is a recurring contribution. You can cancel future contributions at:{/ts} + +{$cancelSubscriptionUrl} + +{if $updateSubscriptionBillingUrl} +{ts}You can update billing details for this recurring contribution at:{/ts} + +{$updateSubscriptionBillingUrl} + +{/if} +{ts}You can update recurring contribution amount or change the number of installments for this recurring contribution at:{/ts} + +{$updateSubscriptionUrl} + +{/if} + +{if $honor_block_is_active} +=========================================================== +{$soft_credit_type} +=========================================================== +{foreach from=$honoreeProfile item=value key=label} +{$label}: {$value} +{/foreach} +{elseif $softCreditTypes and $softCredits} +{foreach from=$softCreditTypes item=softCreditType key=n} +=========================================================== +{$softCreditType} +=========================================================== +{foreach from=$softCredits.$n item=value key=label} +{$label}: {$value} +{/foreach} +{/foreach} +{/if} +{if $pcpBlock} +=========================================================== +{ts}Personal Campaign Page{/ts} + +=========================================================== +{ts}Display In Honor Roll{/ts}: {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if} + +{if $pcp_roll_nickname}{ts}Nickname{/ts}: {$pcp_roll_nickname}{/if} + +{if $pcp_personal_note}{ts}Personal Note{/ts}: {$pcp_personal_note}{/if} + +{/if} +{if $onBehalfProfile} +=========================================================== +{ts}On Behalf Of{/ts} + +=========================================================== +{foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName} +{$onBehalfName}: {$onBehalfValue} +{/foreach} +{/if} + +{if !( $contributeMode eq 'notify' OR $contributeMode eq 'directIPN' ) and $is_monetary} +{if $is_pay_later && !$isBillingAddressRequiredForPayLater} +=========================================================== +{ts}Registered Email{/ts} + +=========================================================== +{$email} +{elseif $amount GT 0} +=========================================================== +{ts}Billing Name and Address{/ts} + +=========================================================== +{$billingName} +{$address} + +{$email} +{/if} {* End ! is_pay_later condition. *} +{/if} +{if $contributeMode eq 'direct' AND !$is_pay_later AND $amount GT 0} + +=========================================================== +{ts}Credit Card Information{/ts} + +=========================================================== +{$credit_card_type} +{$credit_card_number} +{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} +{/if} + +{if $selectPremium } +=========================================================== +{ts}Premium Information{/ts} + +=========================================================== +{$product_name} +{if $option} +{ts}Option{/ts}: {$option} +{/if} +{if $sku} +{ts}SKU{/ts}: {$sku} +{/if} +{if $start_date} +{ts}Start Date{/ts}: {$start_date|crmDate} +{/if} +{if $end_date} +{ts}End Date{/ts}: {$end_date|crmDate} +{/if} +{if $contact_email OR $contact_phone} + +{ts}For information about this premium, contact:{/ts} + +{if $contact_email} + {$contact_email} +{/if} +{if $contact_phone} + {$contact_phone} +{/if} +{/if} +{if $is_deductible AND $price} + +{ts 1=$price|crmMoney:$currency}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}{/if} +{/if} + +{if $customPre} +=========================================================== +{$customPre_grouptitle} + +=========================================================== +{foreach from=$customPre item=customValue key=customName} +{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} + {$customName}: {$customValue} +{/if} +{/foreach} +{/if} + + +{if $customPost} +=========================================================== +{$customPost_grouptitle} + +=========================================================== +{foreach from=$customPost item=customValue key=customName} +{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} + {$customName}: {$customValue} +{/if} +{/foreach} +{/if} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_billing_html.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_billing_html.tpl new file mode 100644 index 000000000000..c7b962f4857e --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_billing_html.tpl @@ -0,0 +1,65 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} + +
+ + + + + + + + + + + + +
+

{contact.email_greeting},

+

{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Billing details for your recurring contribution of %1, every %2 %3 have been updated.{/ts}

+
+ + + + + + + + + + + + + + + + + +
+ {ts}Billing Name and Address{/ts} +
+ {$billingName}
+ {$address|nl2br}
+ {$email} +
+ {ts}Credit Card Information{/ts} +
+ {$credit_card_type}
+ {$credit_card_number}
+ {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
+
+ {ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts} +
+
+ + + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_billing_subject.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_billing_subject.tpl new file mode 100644 index 000000000000..0a2a03b06449 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_billing_subject.tpl @@ -0,0 +1 @@ +{ts}Recurring Contribution Billing Updates{/ts} - {contact.display_name} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_billing_text.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_billing_text.tpl new file mode 100644 index 000000000000..d4732cc615b8 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_billing_text.tpl @@ -0,0 +1,23 @@ +{contact.email_greeting}, + +{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Billing details for your recurring contribution of %1, every %2 %3 have been updated.{/ts} + +=========================================================== +{ts}Billing Name and Address{/ts} + +=========================================================== +{$billingName} +{$address} + +{$email} + +=========================================================== +{ts}Credit Card Information{/ts} + +=========================================================== +{$credit_card_type} +{$credit_card_number} +{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} + + +{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_cancelled_html.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_cancelled_html.tpl new file mode 100644 index 000000000000..99bd2f84150e --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_cancelled_html.tpl @@ -0,0 +1,33 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} + +
+ + + + + + + + + + + + +
+

{contact.email_greeting},

+

{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Your recurring contribution of %1, every %2 %3 has been cancelled as requested.{/ts}

+
+
+ + + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_cancelled_subject.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_cancelled_subject.tpl new file mode 100644 index 000000000000..2b5a4d805fba --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_cancelled_subject.tpl @@ -0,0 +1 @@ +{ts}Recurring Contribution Cancellation Notification{/ts} - {contact.display_name} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_cancelled_text.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_cancelled_text.tpl new file mode 100644 index 000000000000..40c2986c7023 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_cancelled_text.tpl @@ -0,0 +1,3 @@ +{contact.email_greeting}, + +{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Your recurring contribution of %1, every %2 %3 has been cancelled as requested.{/ts} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_edit_html.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_edit_html.tpl new file mode 100644 index 000000000000..894157b0b5b5 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_edit_html.tpl @@ -0,0 +1,36 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} + +
+ + + + + + + + + + + + +
+

{contact.email_greeting},

+

{ts}Your recurring contribution has been updated as requested:{/ts} +

{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Recurring contribution is for %1, every %2 %3(s){/ts}{if $installments}{ts 1=$installments} for %1 installments{/ts}{/if}.

+ +

{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts}

+
+
+ + + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_edit_subject.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_edit_subject.tpl new file mode 100644 index 000000000000..304649521623 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_edit_subject.tpl @@ -0,0 +1 @@ +{ts}Recurring Contribution Update Notification{/ts} - {contact.display_name} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_edit_text.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_edit_text.tpl new file mode 100644 index 000000000000..74b7f51bdce2 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_edit_text.tpl @@ -0,0 +1,8 @@ +{contact.email_greeting}, + +{ts}Your recurring contribution has been updated as requested:{/ts} + +{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Recurring contribution is for %1, every %2 %3(s){/ts} +{if $installments}{ts 1=$installments} for %1 installments.{/ts}{/if} + +{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_notify_html.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_notify_html.tpl new file mode 100644 index 000000000000..2582e7cbba33 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_notify_html.tpl @@ -0,0 +1,129 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} + +
+ + + + + + + + + + + + + + + + + {if $recur_txnType eq 'START'} + {if $auto_renew_membership} + + + + + + + {if $updateSubscriptionBillingUrl} + + + + {/if} + {else} + + + + + + + {if $updateSubscriptionBillingUrl} + + + + {/if} + + + + {/if} + + {elseif $recur_txnType eq 'END'} + + {if $auto_renew_membership} + + + + {else} + + + + + + + + {/if} + {/if} + +
+

{contact.email_greeting},

+
 
+

{ts}Thanks for your auto renew membership sign-up.{/ts}

+

{ts 1=$recur_frequency_interval 2=$recur_frequency_unit}This membership will be automatically renewed every %1 %2(s). {/ts}

+
+ {ts 1=$cancelSubscriptionUrl}This membership will be renewed automatically. You can cancel the auto-renewal option by visiting this web page.{/ts} +
+ {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by visiting this web page.{/ts} +
+

{ts}Thanks for your recurring contribution sign-up.{/ts}

+

{ts 1=$recur_frequency_interval 2=$recur_frequency_unit}This recurring contribution will be automatically processed every %1 %2(s){/ts}{if $recur_installments }{ts 1=$recur_installments} for a total of %1 installment(s){/ts}{/if}.

+

{ts}Start Date{/ts}: {$recur_start_date|crmDate}

+
+ {ts 1=$cancelSubscriptionUrl} You can cancel the recurring contribution option by visiting this web page.{/ts} +
+ {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by visiting this web page.{/ts} +
+ {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments details for this recurring contribution by visiting this web page.{/ts} +
+

{ts}Your auto renew membership sign-up has ended and your membership will not be automatically renewed.{/ts}

+
+

{ts}Your recurring contribution term has ended.{/ts}

+

{ts 1=$recur_installments}You have successfully completed %1 recurring contributions. Thank you for your support.{/ts}

+
+ + + + + + + + + + + + +
+ {ts 1=$recur_installments}Interval of Subscription for %1 installment(s){/ts} +
+ {ts}Start Date{/ts} + + {$recur_start_date|crmDate} +
+ {ts}End Date{/ts} + + {$recur_end_date|crmDate} +
+
+
+ + + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_notify_subject.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_notify_subject.tpl new file mode 100644 index 000000000000..c9a9d927ad0e --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_notify_subject.tpl @@ -0,0 +1 @@ +{ts}Recurring Contribution Notification{/ts} - {contact.display_name} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_notify_text.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_notify_text.tpl new file mode 100644 index 000000000000..cf54ba592dd9 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_recurring_notify_text.tpl @@ -0,0 +1,54 @@ +{contact.email_greeting}, + +{if $recur_txnType eq 'START'} +{if $auto_renew_membership} +{ts}Thanks for your auto renew membership sign-up.{/ts} + + +{ts 1=$recur_frequency_interval 2=$recur_frequency_unit}This membership will be automatically renewed every %1 %2(s).{/ts} + +{ts 1=$cancelSubscriptionUrl}This membership will be renewed automatically. You can cancel the auto-renewal option by visiting this web page.{/ts} + +{if $updateSubscriptionBillingUrl} +{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by visiting this web page.{/ts} + +{/if} +{else} +{ts}Thanks for your recurring contribution sign-up.{/ts} + + +{ts 1=$recur_frequency_interval 2=$recur_frequency_unit 3=$recur_installments}This recurring contribution will be automatically processed every %1 %2(s){/ts}{if $recur_installments } {ts 1=$recur_installments} for a total of %1 installment(s){/ts}{/if}. + +{ts}Start Date{/ts}: {$recur_start_date|crmDate} + +{ts 1=$cancelSubscriptionUrl}You can cancel the recurring contribution option by visiting this web page.{/ts} + +{if $updateSubscriptionBillingUrl} +{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by visiting this web page.{/ts} + +{/if} +{ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments for this recurring contribution by visiting this web page.{/ts} +{/if} + +{elseif $recur_txnType eq 'END'} +{if $auto_renew_membership} +{ts}Your auto renew membership sign-up has ended and your membership will not be automatically renewed.{/ts} + + +{else} +{ts}Your recurring contribution term has ended.{/ts} + + +{ts 1=$recur_installments}You have successfully completed %1 recurring contributions. Thank you for your support.{/ts} + + +================================================== +{ts 1=$recur_installments}Interval of Subscription for %1 installment(s){/ts} + +================================================== +{ts}Start Date{/ts}: {$recur_start_date|crmDate} + +{ts}End Date{/ts}: {$recur_end_date|crmDate} + +{/if} +{/if} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/event_registration_receipt_html.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/event_registration_receipt_html.tpl new file mode 100644 index 000000000000..121d07efa2a8 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/event_registration_receipt_html.tpl @@ -0,0 +1,175 @@ + + + + + + + + {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} + {capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} + {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} + +

{contact.email_greeting},

+ {if $is_pay_later} +

+ This is being sent to you as an acknowledgement that you have registered one or more members for the following workshop, event or purchase. Please note, however, that the status of your payment is pending, and the registration for this event will not be completed until your payment is received. +

+ {else} +

+ This is being sent to you as a {if $is_refund}confirmation of refund{else}receipt of payment made{/if} for the following workshop, event registration or purchase. +

+ {/if} + + {if $is_pay_later} +

{$pay_later_receipt}

+ {/if} + +

Your order number is #{$transaction_id}. Please print this confirmation for your records.{if $line_items && !$is_refund} Information about the workshops will be sent separately to each participant.{/if} + Here's a summary of your transaction placed on {$transaction_date|date_format:"%D %I:%M %p %Z"}:

+ + +{if $billing_name} + + + + + + + +
+ {ts}Billing Name and Address{/ts} +
+ {$billing_name}
+ {$billing_street_address}
+ {$billing_city}, {$billing_state} {$billing_postal_code}
+
+ {$email} +
+{/if} +{if $credit_card_type} +

 

+ + + + + + + +
+ {ts}Credit Card Information{/ts} +
+ {$credit_card_type}
+ {$credit_card_number}
+ {ts}Expires{/ts}: {$credit_card_exp_date.M}/{$credit_card_exp_date.Y} +
+{/if} +{if $source} +

 

+ {$source} +{/if} +

 

+ + + +{if $line_items} + + +{/if} + + + + + + {foreach from=$line_items item=line_item} + + + + + + + {/foreach} + + + {if $discounts} + + + + + + + {foreach from=$discounts key=myId item=i} + + + + + + + {/foreach} + {/if} + +{if $line_items} + + +{/if} + + + + +
+ Event + + Participants + + Price + + Total +
+ {$line_item.event->title} ({$line_item.event->start_date|date_format:"%D"})
+ {if $line_item.event->is_show_location} + {$line_item.location.address.1.display|nl2br} + {/if}{*End of isShowLocation condition*}

+ {$line_item.event->start_date|date_format:"%D %I:%M %p"} - {$line_item.event->end_date|date_format:"%I:%M %p"} + 		+ {$line_item.num_participants} + {if $line_item.num_participants > 0} +
+ {foreach from=$line_item.participants item=participant} + {$participant.display_name}
+ {/foreach} +
+ {/if} + {if $line_item.num_waiting_participants > 0} + Waitlisted:
+
+ {foreach from=$line_item.waiting_participants item=participant} + {$participant.display_name}
+ {/foreach} +
+ {/if} + 		+ {$line_item.cost|crmMoney:$currency|string_format:"%10s"} + +  {$line_item.amount|crmMoney:$currency|string_format:"%10s"} +
+ + + Subtotal: + +  {$sub_total|crmMoney:$currency|string_format:"%10s"} +
+ {$i.title} + + + + -{$i.amount} +
+ + + Total: + +  {$total|crmMoney:$currency|string_format:"%10s"} +
+ + If you have questions about the status of your registration or purchase please feel free to contact us. + + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/event_registration_receipt_text.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/event_registration_receipt_text.tpl new file mode 100644 index 000000000000..2a8d3f054581 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/event_registration_receipt_text.tpl @@ -0,0 +1,80 @@ +{contact.email_greeting}, +{if $is_pay_later} + This is being sent to you as an acknowledgement that you have registered one or more members for the following workshop, event or purchase. Please note, however, that the status of your payment is pending, and the registration for this event will not be completed until your payment is received. +{else} + This is being sent to you as a {if $is_refund}confirmation of refund{else}receipt of payment made{/if} for the following workshop, event registration or purchase. +{/if} + +{if $is_pay_later} + {$pay_later_receipt} +{/if} + + Your order number is #{$transaction_id}. Please print this confirmation for your records.{if $line_items && !$is_refund} Information about the workshops will be sent separately to each participant.{/if} + Here's a summary of your transaction placed on {$transaction_date|date_format:"%D %I:%M %p %Z"}: + +{if $billing_name} +=========================================================== +{ts}Billing Name and Address{/ts} + +=========================================================== +{$billing_name} + +{$billing_street_address} + +{$billing_city}, {$billing_state} {$billing_postal_code} + +{$email} +{/if} + +{if $source} +{$source} +{/if} + + +{foreach from=$line_items item=line_item} +{$line_item.event->title} ({$line_item.event->start_date|date_format:"%D"}) +{if $line_item.event->is_show_location} + {$line_item.location.address.1.display|strip_tags:false} +{/if}{*End of isShowLocation condition*} +{$line_item.event->start_date|date_format:"%D %I:%M %p"} - {$line_item.event->end_date|date_format:"%I:%M %p"} + + Quantity: {$line_item.num_participants} + +{if $line_item.num_participants > 0} + {foreach from=$line_item.participants item=participant} + {$participant.display_name} + {/foreach} +{/if} +{if $line_item.num_waiting_participants > 0} + Waitlisted: + {foreach from=$line_item.waiting_participants item=participant} + {$participant.display_name} + {/foreach} +{/if} +Cost: {$line_item.cost|crmMoney:$currency|string_format:"%10s"} +Total For This Event: {$line_item.amount|crmMoney:$currency|string_format:"%10s"} + +{/foreach} + +{if $discounts} +Subtotal: {$sub_total|crmMoney:$currency|string_format:"%10s"} +-------------------------------------- +Discounts +{foreach from=$discounts key=myId item=i} + {$i.title}: -{$i.amount|crmMoney:$currency|string_format:"%10s"} +{/foreach} +{/if} +====================================== +Total: {$total|crmMoney:$currency|string_format:"%10s"} + +{if $credit_card_type} +=========================================================== +{ts}Payment Information{/ts} + +=========================================================== +{$credit_card_type} +{$credit_card_number} +{ts}Expires{/ts}: {$credit_card_exp_date.M}/{$credit_card_exp_date.Y} +{/if} + + If you have questions about the status of your registration or purchase please feel free to contact us. diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_billing_html.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_billing_html.tpl new file mode 100644 index 000000000000..2a126e61ea5b --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_billing_html.tpl @@ -0,0 +1,66 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} + +
+ + + + + + + + + + + + +
+

{contact.email_greeting},

+

{ts 1=$membershipType}Billing details for your automatically renewed %1 membership have been updated.{/ts}

+
+ + + + + + + + + + + + + + + + + + +
+ {ts}Billing Name and Address{/ts} +
+ {$billingName}
+ {$address|nl2br}
+ {$email} +
+ {ts}Credit Card Information{/ts} +
+ {$credit_card_type}
+ {$credit_card_number}
+ {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
+
+ {ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts} +
+
+ + + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_billing_subject.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_billing_subject.tpl new file mode 100644 index 000000000000..3579f9033090 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_billing_subject.tpl @@ -0,0 +1 @@ +{ts}Membership Autorenewal Billing Updates{/ts} - {contact.display_name} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_billing_text.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_billing_text.tpl new file mode 100644 index 000000000000..1100caf19107 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_billing_text.tpl @@ -0,0 +1,23 @@ +{contact.email_greeting}, + +{ts 1=$membershipType}Billing details for your automatically renewed %1 membership have been updated.{/ts} + +=========================================================== +{ts}Billing Name and Address{/ts} + +=========================================================== +{$billingName} +{$address} + +{$email} + +=========================================================== +{ts}Credit Card Information{/ts} + +=========================================================== +{$credit_card_type} +{$credit_card_number} +{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} + + +{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_cancelled_html.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_cancelled_html.tpl new file mode 100644 index 000000000000..b9709cfe60aa --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_cancelled_html.tpl @@ -0,0 +1,70 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} + +
+ + + + + + + + + + + +
+

{contact.email_greeting},

+

{ts 1=$membershipType}The automatic renewal of your %1 membership has been cancelled as requested. This does not affect the status of your membership - you will receive a separate notification when your membership is up for renewal.{/ts}

+ +
+ + + + + + + + + + {if $mem_start_date} + + + + + {/if} + {if $mem_end_date} + + + + + {/if} + +
+ {ts}Membership Information{/ts} +
+ {ts}Membership Status{/ts} + + {$membership_status} +
+ {ts}Membership Start Date{/ts} + + {$mem_start_date|crmDate} +
+ {ts}Membership End Date{/ts} + + {$mem_end_date|crmDate} +
+
+ + + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_cancelled_subject.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_cancelled_subject.tpl new file mode 100644 index 000000000000..69c2ab8a3c1e --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_cancelled_subject.tpl @@ -0,0 +1 @@ +{ts}Autorenew Membership Cancellation Notification{/ts} - {contact.display_name} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_cancelled_text.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_cancelled_text.tpl new file mode 100644 index 000000000000..635767841175 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_autorenew_cancelled_text.tpl @@ -0,0 +1,14 @@ +{contact.email_greeting}, + +{ts 1=$membershipType}The automatic renewal of your %1 membership has been cancelled as requested. This does not affect the status of your membership - you will receive a separate notification when your membership is up for renewal.{/ts} + +=========================================================== +{ts}Membership Information{/ts} + +=========================================================== +{ts}Membership Status{/ts}: {$membership_status} +{if $mem_start_date}{ts}Membership Start Date{/ts}: {$mem_start_date|crmDate} +{/if} +{if $mem_end_date}{ts}Membership End Date{/ts}: {$mem_end_date|crmDate} +{/if} + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_offline_receipt_html.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_offline_receipt_html.tpl new file mode 100644 index 000000000000..4f7ed9eea917 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_offline_receipt_html.tpl @@ -0,0 +1,297 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} + +
+ + + + + + + + + + + + + + + + {if $isPrimary} + + + + {/if} + + {if $customValues} + + + + {/if} + +
+

{contact.email_greeting},

+ {if $formValues.receipt_text_signup} +

{$formValues.receipt_text_signup|htmlize}

+ {elseif $formValues.receipt_text_renewal} +

{$formValues.receipt_text_renewal|htmlize}

+ {else} +

{ts}Thank you for your support.{/ts}

+ {/if} + {if ! $cancelled} +

{ts}Please print this receipt for your records.{/ts}

+ {/if} +
+ + {if !$lineItem} + + + + + + + + {/if} + {if ! $cancelled} + {if !$lineItem} + + + + + + + + + {/if} + {if $formValues.total_amount OR $formValues.total_amount eq 0 } + + + + {if $formValues.contributionType_name} + + + + + {/if} + + {if $lineItem} + {foreach from=$lineItem item=value key=priceset} + + + + {/foreach} + {if $dataArray} + + + + + {foreach from=$dataArray item=value key=priceset} + + {if $priceset} + + + {elseif $priceset == 0} + + + {/if} + + {/foreach} + {/if} + {/if} + {if isset($totalTaxAmount)} + + + + + {/if} + + + + + {if $receive_date} + + + + + {/if} + {if $formValues.paidBy} + + + + + {if $formValues.check_number} + + + + + {/if} + {/if} + {/if} + {/if} +
+ {ts}Membership Information{/ts} +
+ {ts}Membership Type{/ts} + + {$membership_name} +
+ {ts}Membership Start Date{/ts} + + {$mem_start_date} +
+ {ts}Membership End Date{/ts} + + {$mem_end_date} +
+ {ts}Membership Fee{/ts} +
+ {ts}Financial Type{/ts} + + {$formValues.contributionType_name} +
+ {* FIXME: style this table so that it looks like the text version (justification, etc.) *} + + + + {if $dataArray} + + + + + {/if} + + + + {foreach from=$value item=line} + + + + {if $dataArray} + + {if $line.tax_rate != "" || $line.tax_amount != ""} + + + {else} + + + {/if} + + {/if} + + + + {/foreach} +
{ts}Item{/ts}{ts}Fee{/ts}{ts}SubTotal{/ts}{ts}Tax Rate{/ts}{ts}Tax Amount{/ts}{ts}Total{/ts}{ts}Membership Start Date{/ts}{ts}Membership End Date{/ts}
+ {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} + 		+ {$line.line_total|crmMoney} + + {$line.unit_price*$line.qty|crmMoney} + + {$line.tax_rate|string_format:"%.2f"}% + + {$line.tax_amount|crmMoney} + + {$line.line_total+$line.tax_amount|crmMoney} + + {$line.start_date} + + {$line.end_date} +
+
+ {ts}Amount Before Tax:{/ts} + + {$formValues.total_amount-$totalTaxAmount|crmMoney} +
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}No{/ts} {$taxTerm} {$value|crmMoney:$currency}
+ {ts}Total Tax Amount{/ts} + + {$totalTaxAmount|crmMoney:$currency} +
+ {ts}Amount{/ts} + + {$formValues.total_amount|crmMoney} +
+ {ts}Date Received{/ts} + + {$receive_date|truncate:10:''|crmDate} +
+ {ts}Paid By{/ts} + + {$formValues.paidBy} +
+ {ts}Check Number{/ts} + + {$formValues.check_number} +
+
+ + + {if $contributeMode ne 'notify' and !$isAmountzero and !$is_pay_later } + + + + + + + {/if} + + {if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later} + + + + + + + + + + + {/if} + +
+ {ts}Billing Name and Address{/ts} +
+ {$billingName}
+ {$address} +
+ {ts}Credit Card Information{/ts} +
+ {$credit_card_type}
+ {$credit_card_number} +
+ {ts}Expires{/ts} + + {$credit_card_exp_date|truncate:7:''|crmDate} +
+
+ + + + + {foreach from=$customValues item=value key=customName} + + + + + {/foreach} +
+ {ts}Membership Options{/ts} +
+ {$customName} + + {$value} +
+
+
+ + + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_offline_receipt_subject.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_offline_receipt_subject.tpl new file mode 100644 index 000000000000..22f1b0b6a0af --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_offline_receipt_subject.tpl @@ -0,0 +1,6 @@ +{if $receiptType EQ 'membership signup'} +{ts}Membership Confirmation and Receipt{/ts} +{elseif $receiptType EQ 'membership renewal'} +{ts}Membership Renewal Confirmation and Receipt{/ts} +{/if} +{contact.display_name} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_offline_receipt_text.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_offline_receipt_text.tpl new file mode 100644 index 000000000000..057bb14b0440 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_offline_receipt_text.tpl @@ -0,0 +1,115 @@ +{contact.email_greeting}, + +{if $formValues.receipt_text_signup} +{$formValues.receipt_text_signup} +{elseif $formValues.receipt_text_renewal} +{$formValues.receipt_text_renewal} +{else}{ts}Thank you for your support.{/ts}{/if} + +{if ! $cancelled}{ts}Please print this receipt for your records.{/ts} + + +{/if} +{if !$lineItem} +=========================================================== +{ts}Membership Information{/ts} + +=========================================================== +{ts}Membership Type{/ts}: {$membership_name} +{/if} +{if ! $cancelled} +{if !$lineItem} +{ts}Membership Start Date{/ts}: {$mem_start_date} +{ts}Membership End Date{/ts}: {$mem_end_date} +{/if} + +{if $formValues.total_amount OR $formValues.total_amount eq 0 } +=========================================================== +{ts}Membership Fee{/ts} + +=========================================================== +{if $formValues.contributionType_name} +{ts}Financial Type{/ts}: {$formValues.contributionType_name} +{/if} +{if $lineItem} +{foreach from=$lineItem item=value key=priceset} +{capture assign=ts_item}{ts}Item{/ts}{/capture} +{capture assign=ts_total}{ts}Fee{/ts}{/capture} +{if $dataArray} +{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture} +{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture} +{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture} +{capture assign=ts_total}{ts}Total{/ts}{/capture} +{/if} +{capture assign=ts_start_date}{ts}Membership Start Date{/ts}{/capture} +{capture assign=ts_end_date}{ts}Membership End Date{/ts}{/capture} +{$ts_item|string_format:"%-30s"} {$ts_total|string_format:"%10s"} {if $dataArray} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {$ts_total|string_format:"%10s"} {/if} {$ts_start_date|string_format:"%20s"} {$ts_end_date|string_format:"%20s"} +-------------------------------------------------------------------------------------------------- + +{foreach from=$value item=line} +{capture assign=ts_item}{if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:"..."|string_format:"%-30s"} {$line.line_total|crmMoney|string_format:"%10s"} {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:"%10s"} {if $line.tax_rate != "" || $line.tax_amount != ""} {$line.tax_rate|string_format:"%.2f"} % {$line.tax_amount|crmMoney:$currency|string_format:"%10s"} {else} {/if} {$line.line_total+$line.tax_amount|crmMoney|string_format:"%10s"} {/if} {$line.start_date|string_format:"%20s"} {$line.end_date|string_format:"%20s"} +{/foreach} +{/foreach} + +{if $dataArray} +{ts}Amount before Tax{/ts}: {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency} + +{foreach from=$dataArray item=value key=priceset} +{if $priceset} +{$taxTerm} {$priceset|string_format:"%.2f"} %: {$value|crmMoney:$currency} +{elseif $priceset == 0} +{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency} +{/if} +{/foreach} +{/if} +-------------------------------------------------------------------------------------------------- +{/if} + +{if isset($totalTaxAmount)} +{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency} +{/if} + +{ts}Amount{/ts}: {$formValues.total_amount|crmMoney} +{if $receive_date} +{ts}Date Received{/ts}: {$receive_date|truncate:10:''|crmDate} +{/if} +{if $formValues.paidBy} +{ts}Paid By{/ts}: {$formValues.paidBy} +{if $formValues.check_number} +{ts}Check Number{/ts}: {$formValues.check_number} +{/if} +{/if} +{/if} +{/if} + +{if $isPrimary } +{if $contributeMode ne 'notify' and !$isAmountzero and !$is_pay_later } + +=========================================================== +{ts}Billing Name and Address{/ts} + +=========================================================== +{$billingName} +{$address} +{/if} + +{if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later} +=========================================================== +{ts}Credit Card Information{/ts} + +=========================================================== +{$credit_card_type} +{$credit_card_number} +{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} +{/if} +{/if} + +{if $customValues} +=========================================================== +{ts}Membership Options{/ts} + +=========================================================== +{foreach from=$customValues item=value key=customName} + {$customName} : {$value} +{/foreach} +{/if} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_online_receipt_html.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_online_receipt_html.tpl new file mode 100644 index 000000000000..a1e20138885d --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_online_receipt_html.tpl @@ -0,0 +1,556 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} + +
+ + + + + + + + + + + +
+

{contact.email_greeting},

+ {if $receipt_text} +

{$receipt_text|htmlize}

+ {/if} + + {if $is_pay_later} +

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} + {else} +

{ts}Please print this confirmation for your records.{/ts}

+ {/if} + +
+ + + {if $membership_assign && !$useForMember} + + + + + + + + {if $mem_start_date} + + + + + {/if} + {if $mem_end_date} + + + + + {/if} + {/if} + + + {if $amount} + + + + + {if !$useForMember and $membership_amount and $is_quick_config} + + + + + + {if $amount && !$is_separate_payment } + + + + + + + + + {/if} + + {elseif !$useForMember && $lineItem and $priceSetID and !$is_quick_config} + + {foreach from=$lineItem item=value key=priceset} + + + + {/foreach} + + + + + + {else} + {if $useForMember && $lineItem and !$is_quick_config} + {foreach from=$lineItem item=value key=priceset} + + + + {/foreach} + {if $dataArray} + + + + + {foreach from=$dataArray item=value key=priceset} + + {if $priceset || $priceset == 0} + + + {else} + + + {/if} + + {/foreach} + {/if} + {/if} + {if $totalTaxAmount} + + + + + {/if} + + + + + + {/if} + + + {elseif $membership_amount} + + + + + + + + + + + + {/if} + + {if $receive_date} + + + + + {/if} + + {if $is_monetary and $trxn_id} + + + + + {/if} + + {if $membership_trx_id} + + + + + {/if} + {if $is_recur} + {if $contributeMode eq 'notify' or $contributeMode eq 'directIPN'} + + + + {if $updateSubscriptionBillingUrl} + + + + {/if} + {/if} + {/if} + + {if $honor_block_is_active} + + + + {foreach from=$honoreeProfile item=value key=label} + + + + + {/foreach} + {/if} + + {if $pcpBlock} + + + + + + + + {if $pcp_roll_nickname} + + + + + {/if} + {if $pcp_personal_note} + + + + + {/if} + {/if} + + {if $onBehalfProfile} + + + + {foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName} + + + + + {/foreach} + {/if} + + {if ! ($contributeMode eq 'notify' OR $contributeMode eq 'directIPN') and $is_monetary} + {if $is_pay_later} + + + + + + + {elseif $amount GT 0 OR $membership_amount GT 0} + + + + + + + {/if} + {/if} + + {if $contributeMode eq 'direct' AND !$is_pay_later AND ($amount GT 0 OR $membership_amount GT 0)} + + + + + + + {/if} + + {if $selectPremium} + + + + + + + {if $option} + + + + + {/if} + {if $sku} + + + + + {/if} + {if $start_date} + + + + + {/if} + {if $end_date} + + + + + {/if} + {if $contact_email OR $contact_phone} + + + + {/if} + {if $is_deductible AND $price} + + + + {/if} + {/if} + + {if $customPre} + + + + {foreach from=$customPre item=customValue key=customName} + {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields} + + + + + {/if} + {/foreach} + {/if} + + {if $customPost} + + + + {foreach from=$customPost item=customValue key=customName} + {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields} + + + + + {/if} + {/foreach} + {/if} + +
+ {ts}Membership Information{/ts} +
+ {ts}Membership Type{/ts} + + {$membership_name} +
+ {ts}Membership Start Date{/ts} + + {$mem_start_date|crmDate} +
+ {ts}Membership End Date{/ts} + + {$mem_end_date|crmDate} +
+ {ts}Membership Fee{/ts} +
+ {ts 1=$membership_name}%1 Membership{/ts} + + {$membership_amount|crmMoney} +
+ {ts}Contribution Amount{/ts} + + {$amount|crmMoney} +
+ {ts}Total{/ts} + + {$amount+$membership_amount|crmMoney} +
+ {* FIXME: style this table so that it looks like the text version (justification, etc.) *} + + + + + + + {foreach from=$value item=line} + + + + + + + {/foreach} +
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/ts}{ts}Total{/ts}
+ {$line.description|truncate:30:"..."} + + {$line.qty} + + {$line.unit_price|crmMoney} + + {$line.line_total|crmMoney} +
+
+ {ts}Total Amount{/ts} + + {$amount|crmMoney} +
+ {* FIXME: style this table so that it looks like the text version (justification, etc.) *} + + + + {if $dataArray} + + + + + {/if} + + + + {foreach from=$value item=line} + + + + {if $dataArray} + + {if $line.tax_rate != "" || $line.tax_amount != ""} + + + {else} + + + {/if} + + {/if} + + + + {/foreach} +
{ts}Item{/ts}{ts}Fee{/ts}{ts}SubTotal{/ts}{ts}Tax Rate{/ts}{ts}Tax Amount{/ts}{ts}Total{/ts}{ts}Membership Start Date{/ts}{ts}Membership End Date{/ts}
+ {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} + 		+ {$line.line_total|crmMoney} + + {$line.unit_price*$line.qty|crmMoney} + + {$line.tax_rate|string_format:"%.2f"}% + + {$line.tax_amount|crmMoney} + + {$line.line_total+$line.tax_amount|crmMoney} + + {$line.start_date} + + {$line.end_date} +
+
+ {ts}Amount Before Tax:{/ts} + + {$amount-$totalTaxAmount|crmMoney} +
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}NO{/ts} {$taxTerm} {$value|crmMoney:$currency}
+ {ts}Total Tax Amount{/ts} + + {$totalTaxAmount|crmMoney:$currency} +
+ {ts}Amount{/ts} + + {$amount|crmMoney} {if $amount_level} - {$amount_level}{/if} +
+ {ts}Membership Fee{/ts} +
+ {ts 1=$membership_name}%1 Membership{/ts} + + {$membership_amount|crmMoney} +
+ {ts}Date{/ts} + + {$receive_date|crmDate} +
+ {ts}Transaction #{/ts} + + {$trxn_id} +
+ {ts}Membership Transaction #{/ts} + + {$membership_trx_id} +
+ {ts 1=$cancelSubscriptionUrl}This membership will be renewed automatically. You can cancel the auto-renewal option by visiting this web page.{/ts} +
+ {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by visiting this web page.{/ts} +
+ {$soft_credit_type} +
+ {$label} + + {$value} +
+ {ts}Personal Campaign Page{/ts} +
+ {ts}Display In Honor Roll{/ts} + + {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if} +
+ {ts}Nickname{/ts} + + {$pcp_roll_nickname} +
+ {ts}Personal Note{/ts} + + {$pcp_personal_note} +
+ {$onBehalfProfile_grouptitle} +
+ {$onBehalfName} + + {$onBehalfValue} +
+ {ts}Registered Email{/ts} +
+ {$email} +
+ {ts}Billing Name and Address{/ts} +
+ {$billingName}
+ {$address|nl2br}
+ {$email} +
+ {ts}Credit Card Information{/ts} +
+ {$credit_card_type}
+ {$credit_card_number}
+ {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
+
+ {ts}Premium Information{/ts} +
+ {$product_name} +
+ {ts}Option{/ts} + + {$option} +
+ {ts}SKU{/ts} + + {$sku} +
+ {ts}Start Date{/ts} + + {$start_date|crmDate} +
+ {ts}End Date{/ts} + + {$end_date|crmDate} +
+

{ts}For information about this premium, contact:{/ts}

+ {if $contact_email} +

{$contact_email}

+ {/if} + {if $contact_phone} +

{$contact_phone}

+ {/if} +
+

{ts 1=$price|crmMoney}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}

+
+ {$customPre_grouptitle} +
+ {$customName} + + {$customValue} +
+ {$customPost_grouptitle} +
+ {$customName} + + {$customValue} +
+
+ + + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_online_receipt_subject.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_online_receipt_subject.tpl new file mode 100644 index 000000000000..052dce5bd748 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_online_receipt_subject.tpl @@ -0,0 +1 @@ +{if $is_pay_later}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} - {contact.display_name} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_online_receipt_text.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_online_receipt_text.tpl new file mode 100644 index 000000000000..5d8420876c2b --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/membership_online_receipt_text.tpl @@ -0,0 +1,243 @@ +{contact.email_greeting}, + +{if $receipt_text} +{$receipt_text} +{/if} +{if $is_pay_later} + +=========================================================== +{$pay_later_receipt} +=========================================================== +{else} + +{ts}Please print this receipt for your records.{/ts} +{/if} + +{if $membership_assign && !$useForMember} +=========================================================== +{ts}Membership Information{/ts} + +=========================================================== +{ts}Membership Type{/ts}: {$membership_name} +{if $mem_start_date}{ts}Membership Start Date{/ts}: {$mem_start_date|crmDate} +{/if} +{if $mem_end_date}{ts}Membership End Date{/ts}: {$mem_end_date|crmDate} +{/if} + +{/if} +{if $amount} +=========================================================== +{ts}Membership Fee{/ts} + +=========================================================== +{if !$useForMember && $membership_amount && $is_quick_config} +{ts 1=$membership_name}%1 Membership{/ts}: {$membership_amount|crmMoney} +{if $amount && !$is_separate_payment } +{ts}Contribution Amount{/ts}: {$amount|crmMoney} +------------------------------------------- +{ts}Total{/ts}: {$amount+$membership_amount|crmMoney} +{/if} +{elseif !$useForMember && $lineItem and $priceSetID & !$is_quick_config} +{foreach from=$lineItem item=value key=priceset} +--------------------------------------------------------- +{capture assign=ts_item}{ts}Item{/ts}{/capture} +{capture assign=ts_qty}{ts}Qty{/ts}{/capture} +{capture assign=ts_each}{ts}Each{/ts}{/capture} +{capture assign=ts_total}{ts}Total{/ts}{/capture} +{$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {$ts_total|string_format:"%10s"} +---------------------------------------------------------- +{foreach from=$value item=line} +{$line.description|truncate:30:"..."|string_format:"%-30s"} {$line.qty|string_format:"%5s"} {$line.unit_price|crmMoney|string_format:"%10s"} {$line.line_total|crmMoney|string_format:"%10s"} +{/foreach} +{/foreach} + +{ts}Total Amount{/ts}: {$amount|crmMoney} +{else} +{if $useForMember && $lineItem && !$is_quick_config} +{foreach from=$lineItem item=value key=priceset} +{capture assign=ts_item}{ts}Item{/ts}{/capture} +{capture assign=ts_total}{ts}Fee{/ts}{/capture} +{if $dataArray} +{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture} +{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture} +{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture} +{capture assign=ts_total}{ts}Total{/ts}{/capture} +{/if} +{capture assign=ts_start_date}{ts}Membership Start Date{/ts}{/capture} +{capture assign=ts_end_date}{ts}Membership End Date{/ts}{/capture} +{$ts_item|string_format:"%-30s"} {$ts_total|string_format:"%10s"} {if $dataArray} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {$ts_total|string_format:"%10s"} {/if} {$ts_start_date|string_format:"%20s"} {$ts_end_date|string_format:"%20s"} +-------------------------------------------------------------------------------------------------- + +{foreach from=$value item=line} +{capture assign=ts_item}{if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:"..."|string_format:"%-30s"} {$line.line_total|crmMoney|string_format:"%10s"} {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:"%10s"} {if $line.tax_rate != "" || $line.tax_amount != ""} {$line.tax_rate|string_format:"%.2f"} % {$line.tax_amount|crmMoney:$currency|string_format:"%10s"} {else} {/if} {$line.line_total+$line.tax_amount|crmMoney|string_format:"%10s"} {/if} {$line.start_date|string_format:"%20s"} {$line.end_date|string_format:"%20s"} +{/foreach} +{/foreach} + +{if $dataArray} +{ts}Amount before Tax{/ts}: {$amount-$totalTaxAmount|crmMoney:$currency} + +{foreach from=$dataArray item=value key=priceset} +{if $priceset || $priceset == 0} +{$taxTerm} {$priceset|string_format:"%.2f"}%: {$value|crmMoney:$currency} +{else} +{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency} +{/if} +{/foreach} +{/if} +-------------------------------------------------------------------------------------------------- +{/if} + +{if $totalTaxAmount} +{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency} +{/if} + +{ts}Amount{/ts}: {$amount|crmMoney} {if $amount_level } - {$amount_level} {/if} +{/if} +{elseif $membership_amount} +=========================================================== +{ts}Membership Fee{/ts} + +=========================================================== +{ts 1=$membership_name}%1 Membership{/ts}: {$membership_amount|crmMoney} +{/if} + +{if $receive_date} + +{ts}Date{/ts}: {$receive_date|crmDate} +{/if} +{if $is_monetary and $trxn_id} +{ts}Transaction #{/ts}: {$trxn_id} + +{/if} +{if $membership_trx_id} +{ts}Membership Transaction #{/ts}: {$membership_trx_id} + +{/if} +{if $is_recur} +{if $contributeMode eq 'notify' or $contributeMode eq 'directIPN'} +{ts 1=$cancelSubscriptionUrl}This membership will be renewed automatically. You can cancel the auto-renewal option by visiting this web page: %1.{/ts} +{if $updateSubscriptionBillingUrl} + +{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by visiting this web page.{/ts} +{/if} +{/if} +{/if} + +{if $honor_block_is_active } +=========================================================== +{$soft_credit_type} +=========================================================== +{foreach from=$honoreeProfile item=value key=label} +{$label}: {$value} +{/foreach} + +{/if} +{if $pcpBlock} +=========================================================== +{ts}Personal Campaign Page{/ts} + +=========================================================== +{ts}Display In Honor Roll{/ts}: {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if} + +{if $pcp_roll_nickname}{ts}Nickname{/ts}: {$pcp_roll_nickname}{/if} + +{if $pcp_personal_note}{ts}Personal Note{/ts}: {$pcp_personal_note}{/if} + +{/if} +{if $onBehalfProfile} +=========================================================== +{ts}On Behalf Of{/ts} + +=========================================================== +{foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName} +{$onBehalfName}: {$onBehalfValue} +{/foreach} +{/if} + +{if !( $contributeMode eq 'notify' OR $contributeMode eq 'directIPN' ) and $is_monetary} +{if $is_pay_later} +=========================================================== +{ts}Registered Email{/ts} + +=========================================================== +{$email} +{elseif $amount GT 0 OR $membership_amount GT 0 } +=========================================================== +{ts}Billing Name and Address{/ts} + +=========================================================== +{$billingName} +{$address} + +{$email} +{/if} {* End ! is_pay_later condition. *} +{/if} +{if $contributeMode eq 'direct' AND !$is_pay_later AND ( $amount GT 0 OR $membership_amount GT 0 ) } + +=========================================================== +{ts}Credit Card Information{/ts} + +=========================================================== +{$credit_card_type} +{$credit_card_number} +{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} +{/if} + +{if $selectPremium } +=========================================================== +{ts}Premium Information{/ts} + +=========================================================== +{$product_name} +{if $option} +{ts}Option{/ts}: {$option} +{/if} +{if $sku} +{ts}SKU{/ts}: {$sku} +{/if} +{if $start_date} +{ts}Start Date{/ts}: {$start_date|crmDate} +{/if} +{if $end_date} +{ts}End Date{/ts}: {$end_date|crmDate} +{/if} +{if $contact_email OR $contact_phone} + +{ts}For information about this premium, contact:{/ts} + +{if $contact_email} + {$contact_email} +{/if} +{if $contact_phone} + {$contact_phone} +{/if} +{/if} +{if $is_deductible AND $price} + +{ts 1=$price|crmMoney}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}{/if} +{/if} + +{if $customPre} +=========================================================== +{$customPre_grouptitle} + +=========================================================== +{foreach from=$customPre item=customValue key=customName} +{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} + {$customName}: {$customValue} +{/if} +{/foreach} +{/if} + + +{if $customPost} +=========================================================== +{$customPost_grouptitle} + +=========================================================== +{foreach from=$customPost item=customValue key=customName} +{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} + {$customName}: {$customValue} +{/if} +{/foreach} +{/if} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_cancelled_html.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_cancelled_html.tpl new file mode 100644 index 000000000000..f6bc1b12172b --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_cancelled_html.tpl @@ -0,0 +1,129 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} + +
+ + + + + + + + + + + + + + + + + + + +
+

{contact.email_greeting},

+

{ts}Your Event Registration has been cancelled.{/ts}

+
+ + + + + + + + + + + + + {if $isShowLocation} + + + + {/if} + + {if $event.location.phone.1.phone || $event.location.email.1.email} + + + + {foreach from=$event.location.phone item=phone} + {if $phone.phone} + + + + + {/if} + {/foreach} + {foreach from=$event.location.email item=eventEmail} + {if $eventEmail.email} + + + + + {/if} + {/foreach} + {/if} + + {if $contact.email} + + + + + + + {/if} + + {if $register_date} + + + + + {/if} + +
+ {ts}Event Information and Location{/ts} +
+ {$event.event_title}
+ {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if} +
+ {ts}Participant Role{/ts}: + + {$participant.role} +
+ {$event.location.address.1.display|nl2br} +
+ {ts}Event Contacts:{/ts} +
+ {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if} + + {$phone.phone} +
+ {ts}Email{/ts} + + {$eventEmail.email} +
+ {ts}Registered Email{/ts} +
+ {$contact.email} +
+ {ts}Registration Date{/ts} + + {$participant.register_date|crmDate} +
+
+

{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}

+
+
+ + + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_cancelled_subject.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_cancelled_subject.tpl new file mode 100644 index 000000000000..e39740983922 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_cancelled_subject.tpl @@ -0,0 +1 @@ +{ts 1=$event.event_title}Event Registration Cancelled for %1{/ts} - {contact.display_name} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_cancelled_text.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_cancelled_text.tpl new file mode 100644 index 000000000000..566fdfd7372f --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_cancelled_text.tpl @@ -0,0 +1,47 @@ +{contact.email_greeting}, + +{ts}Your Event Registration has been cancelled.{/ts} + + +=========================================================== +{ts}Event Information and Location{/ts} + +=========================================================== +{$event.event_title} +{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if} + +{ts}Participant Role{/ts}: {$participant.role} + +{if $isShowLocation} +{$event.location.address.1.display|strip_tags:false} +{/if}{*End of isShowLocation condition*} + +{if $event.location.phone.1.phone || $event.location.email.1.email} + +{ts}Event Contacts:{/ts} +{foreach from=$event.location.phone item=phone} +{if $phone.phone} + +{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} +{/foreach} +{foreach from=$event.location.email item=eventEmail} +{if $eventEmail.email} + +{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach} +{/if} + +{if $contact.email} + +=========================================================== +{ts}Registered Email{/ts} + +=========================================================== +{$contact.email} +{/if} + +{if $register_date} +{ts}Registration Date{/ts}: {$participant.register_date|crmDate} +{/if} + +{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts} + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_confirm_html.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_confirm_html.tpl new file mode 100644 index 000000000000..af4fa8b53550 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_confirm_html.tpl @@ -0,0 +1,184 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} + +
+ + + + + + + + + + + + {if !$isAdditional and $participant.id} + + + + + + + {/if} + {if $event.allow_selfcancelxfer } + This event allows for self-cancel or transfer + {capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participantID`&{contact.checksum}" h=0 a=1 fe=1}{/capture} + {ts}Self service cancel transfer{/ts} + {/if} + + + + + {if $event.allow_selfcancelxfer } + + + + {/if} + + + + +
+

{contact.email_greeting},

+
+ {ts}Confirm Your Registration{/ts} +
+ {capture assign=confirmUrl}{crmURL p='civicrm/event/confirm' q="reset=1&participantId=`$participant.id`&cs=`$checksumValue`" a=true h=0 fe=1}{/capture} + Go to a web page where you can confirm your registration online +
+ + + + + + + + {if $conference_sessions} + + + + + + + {/if} + + + + + + {if $isShowLocation} + + + + {/if} + + {if $event.location.phone.1.phone || $event.location.email.1.email} + + + + {foreach from=$event.location.phone item=phone} + {if $phone.phone} + + + + + {/if} + {/foreach} + {foreach from=$event.location.email item=eventEmail} + {if $eventEmail.email} + + + + + {/if} + {/foreach} + {/if} + + {if $event.is_public} + + + + {/if} + + {if $contact.email} + + + + + + + {/if} + + {if $register_date} + + + + + {/if} + +
+ {ts}Event Information and Location{/ts} +
+ {$event.event_title}
+ {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if} +
+ {ts}Your schedule:{/ts} +
+ {assign var='group_by_day' value='NA'} + {foreach from=$conference_sessions item=session} + {if $session.start_date|date_format:"%Y/%m/%d" != $group_by_day|date_format:"%Y/%m/%d"} + {assign var='group_by_day' value=$session.start_date} + {$group_by_day|date_format:"%m/%d/%Y"}
+ {/if} + {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}
+ {if $session.location}    {$session.location}
{/if} + {/foreach} +
+ {ts}Participant Role{/ts}: + + {$participant.role} +
+ {$event.location.address.1.display|nl2br} +
+ {ts}Event Contacts:{/ts} +
+ {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if} + + {$phone.phone} +
+ {ts}Email{/ts} + + {$eventEmail.email} +
+ {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} + {ts}Download iCalendar File{/ts} +
+ {ts}Registered Email{/ts} +
+ {$contact.email} +
+ {ts}Registration Date{/ts} + + {$participant.register_date|crmDate} +
+
+ {ts 1=$event.selfcancelxfer_time}You may transfer your registration to another participant or cancel your registration up to %1 hours before the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}
+ {capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participant.id`&{contact.checksum}" h=0 a=1 fe=1}{/capture} + {ts}Click here to transfer or cancel your registration.{/ts} +
+

{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}

+
+
+ + + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_confirm_text.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_confirm_text.tpl new file mode 100644 index 000000000000..3dc53a1999e0 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_confirm_text.tpl @@ -0,0 +1,81 @@ +{contact.email_greeting}, +{if !$isAdditional and $participant.id} + +=========================================================== +{ts}Confirm Your Registration{/ts} + +=========================================================== +{capture assign=confirmUrl}{crmURL p='civicrm/event/confirm' q="reset=1&participantId=`$participant.id`&cs=`$checksumValue`" a=true h=0 fe=1}{/capture} +Click this link to go to a web page where you can confirm your registration online: +{$confirmUrl} +{/if} +{if $event.allow_selfcancelxfer } +{ts 1=$event.selfcancelxfer_time}You may transfer your registration to another participant or cancel your registration up to %1 hours before the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if} + {capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participant.id`&{contact.checksum}" h=0 a=1 fe=1}{/capture} +{ts}Transfer or cancel your registration:{/ts} {$selfService} +{/if} +=========================================================== +{ts}Event Information and Location{/ts} + +=========================================================== +{$event.event_title} +{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if} +{if $conference_sessions} + + +{ts}Your schedule:{/ts} +{assign var='group_by_day' value='NA'} +{foreach from=$conference_sessions item=session} +{if $session.start_date|date_format:"%Y/%m/%d" != $group_by_day|date_format:"%Y/%m/%d"} +{assign var='group_by_day' value=$session.start_date} + +{$group_by_day|date_format:"%m/%d/%Y"} + + +{/if} +{$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title} +{if $session.location} {$session.location}{/if} +{/foreach} +{/if} + + +{ts}Participant Role{/ts}: {$participant.role} + +{if $isShowLocation} +{$event.location.address.1.display|strip_tags:false} +{/if}{*End of isShowLocation condition*} + +{if $event.location.phone.1.phone || $event.location.email.1.email} + +{ts}Event Contacts:{/ts} +{foreach from=$event.location.phone item=phone} +{if $phone.phone} + +{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} +{/foreach} +{foreach from=$event.location.email item=eventEmail} +{if $eventEmail.email} + +{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach} +{/if} + +{if $event.is_public} +{capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} +{ts}Download iCalendar File:{/ts} {$icalFeed} +{/if} + +{if $contact.email} + +=========================================================== +{ts}Registered Email{/ts} + +=========================================================== +{$contact.email} +{/if} + +{if $register_date} +{ts}Registration Date{/ts}: {$participant.register_date|crmDate} +{/if} + +{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts} + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_expired_html.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_expired_html.tpl new file mode 100644 index 000000000000..7af4dea95cb5 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_expired_html.tpl @@ -0,0 +1,132 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} + +
+ + + + + + + + + + + + + + + + + + + +
+

{contact.email_greeting},

+

{ts 1=$event.event_title}Your pending event registration for %1 has expired +because you did not confirm your registration.{/ts}

+

{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions +or want to inquire about reinstating your registration for this event.{/ts}

+
+ + + + + + + + + + + + + {if $isShowLocation} + + + + {/if} + + {if $event.location.phone.1.phone || $event.location.email.1.email} + + + + {foreach from=$event.location.phone item=phone} + {if $phone.phone} + + + + + {/if} + {/foreach} + {foreach from=$event.location.email item=eventEmail} + {if $eventEmail.email} + + + + + {/if} + {/foreach} + {/if} + + {if $contact.email} + + + + + + + {/if} + + {if $register_date} + + + + + {/if} + +
+ {ts}Event Information and Location{/ts} +
+ {$event.event_title}
+ {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if} +
+ {ts}Participant Role{/ts}: + + {$participant.role} +
+ {$event.location.address.1.display|nl2br} +
+ {ts}Event Contacts:{/ts} +
+ {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if} + + {$phone.phone} +
+ {ts}Email{/ts} + + {$eventEmail.email} +
+ {ts}Registered Email{/ts} +
+ {$contact.email} +
+ {ts}Registration Date{/ts} + + {$participant.register_date|crmDate} +
+
+

{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}

+
+
+ + + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_expired_text.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_expired_text.tpl new file mode 100644 index 000000000000..bc8e673f982a --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_expired_text.tpl @@ -0,0 +1,51 @@ +{contact.email_greeting}, + +{ts 1=$event.event_title}Your pending event registration for %1 has expired +because you did not confirm your registration.{/ts} + + +{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions +or want to inquire about reinstating your registration for this event.{/ts} + +=========================================================== +{ts}Event Information and Location{/ts} + +=========================================================== +{$event.event_title} +{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if} + +{ts}Participant Role{/ts}: {$participant.role} + +{if $isShowLocation} +{$event.location.address.1.display|strip_tags:false} +{/if}{*End of isShowLocation condition*} + +{if $event.location.phone.1.phone || $event.location.email.1.email} + +{ts}Event Contacts:{/ts} +{foreach from=$event.location.phone item=phone} +{if $phone.phone} + +{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} +{/foreach} +{foreach from=$event.location.email item=eventEmail} +{if $eventEmail.email} + +{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach} +{/if} + +{if $contact.email} + +=========================================================== +{ts}Registered Email{/ts} + +=========================================================== +{$contact.email} +{/if} + +{if $register_date} +{ts}Registration Date{/ts}: {$participant.register_date|crmDate} +{/if} + +{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts} + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_transferred_html.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_transferred_html.tpl new file mode 100644 index 000000000000..ff1a1596084d --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_transferred_html.tpl @@ -0,0 +1,129 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} + +
+ + + + + + + + + + + + + + + + + + + +
+

{contact.email_greeting},

+

{ts 1=$to_participant}Your Event Registration has been Transferred to %1.{/ts}

+
+ + + + + + + + + + + + + {if $isShowLocation} + + + + {/if} + + {if $event.location.phone.1.phone || $event.location.email.1.email} + + + + {foreach from=$event.location.phone item=phone} + {if $phone.phone} + + + + + {/if} + {/foreach} + {foreach from=$event.location.email item=eventEmail} + {if $eventEmail.email} + + + + + {/if} + {/foreach} + {/if} + + {if $contact.email} + + + + + + + {/if} + + {if $register_date} + + + + + {/if} + +
+ {ts}Event Information and Location{/ts} +
+ {$event.event_title}
+ {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if} +
+ {ts}Participant Role{/ts}: + + {$participant.role} +
+ {$event.location.address.1.display|nl2br} +
+ {ts}Event Contacts:{/ts} +
+ {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if} + + {$phone.phone} +
+ {ts}Email{/ts} + + {$eventEmail.email} +
+ {ts}Registered Email{/ts} +
+ {$contact.email} +
+ {ts}Registration Date{/ts} + + {$participant.register_date|crmDate} +
+
+

{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}

+
+
+ + + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_transferred_subject.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_transferred_subject.tpl new file mode 100644 index 000000000000..2e2bf244d575 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_transferred_subject.tpl @@ -0,0 +1 @@ +{ts 1=$event.event_title}Event Registration Transferred for %1{/ts} - {contact.display_name} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_transferred_text.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_transferred_text.tpl new file mode 100644 index 000000000000..eaaec828dc74 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/participant_transferred_text.tpl @@ -0,0 +1,45 @@ +{contact.email_greeting}, + +{ts 1=$to_participant}Your Event Registration has been transferred to %1.{/ts} + +=========================================================== +{ts}Event Information and Location{/ts} + +=========================================================== +{$event.event_title} +{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if} + +{ts}Participant Role{/ts}: {$participant.role} + +{if $isShowLocation} +{$event.location.address.1.display|strip_tags:false} +{/if}{*End of isShowLocation condition*} + +{if $event.location.phone.1.phone || $event.location.email.1.email} + +{ts}Event Contacts:{/ts} +{foreach from=$event.location.phone item=phone} +{if $phone.phone} + +{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} +{/foreach} +{foreach from=$event.location.email item=eventEmail} +{if $eventEmail.email} + +{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach} +{/if} + +{if $contact.email} + +=========================================================== +{ts}Registered Email{/ts} + +=========================================================== +{$contact.email} +{/if} + +{if $register_date} +{ts}Registration Date{/ts}: {$participant.register_date|crmDate} +{/if} + +{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/payment_or_refund_notification_html.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/payment_or_refund_notification_html.tpl new file mode 100644 index 000000000000..d32860804575 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/payment_or_refund_notification_html.tpl @@ -0,0 +1,253 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=emptyBlockStyle }style="padding: 10px; border-bottom: 1px solid #999;background-color: #f7f7f7;"{/capture} +{capture assign=emptyBlockValueStyle }style="padding: 10px; border-bottom: 1px solid #999;"{/capture} + +
+ + + + + + + + + + + + + + + + + + +
+ {if $isRefund} +

{contact.email_greeting},

+

{ts}A refund has been issued based on changes in your registration selections.{/ts}

+ {else} +

{ts}A payment has been received.{/ts}

+ {/if} +

{ts}Please print this confirmation for your records.{/ts}

+
+ + {if $isRefund} + + + + + + + + + + + + + + + {else} + + + + + + + + + + + + + + {* This will be zero after final payment. *} + + + + {if $paymentsComplete} + + + + {/if} + {/if} + {if $receive_date} + + + + + {/if} + {if $trxn_id} + + + + + {/if} + {if $paidBy} + + + + + {/if} + {if $checkNumber} + + + + + {/if} +
{ts}Refund Details{/ts}
+ {ts}Total Amount{/ts} + + {$totalAmount|crmMoney} +
+ {ts}You Paid{/ts} + + {$totalPaid|crmMoney} +
+ {ts}Refund Amount{/ts} + + {$refundAmount|crmMoney} + +
{ts}Payment Details{/ts}
+ {ts}Total Amount{/ts} + + {$totalAmount|crmMoney} +
+ {ts}This Payment Amount{/ts} + + {$paymentAmount|crmMoney} +
+ {ts}Balance Owed{/ts} + + {$amountOwed|crmMoney} +
+ {ts}Thank you for completing payment.{/ts} +
+ {ts}Transaction Date{/ts} + + {$receive_date|crmDate} +
+ {ts}Transaction #{/ts} + + {$trxn_id} +
+ {ts}Paid By{/ts} + + {$paidBy} +
+ {ts}Check Number{/ts} + + {$checkNumber} +
+
+ + {if $contributeMode eq 'direct' and !$isAmountzero} + + + + + + + {/if} + {if $contributeMode eq'direct' and !$isAmountzero} + + + + + + + {/if} + {if $component eq 'event'} + + + + + + + + {if $event.participant_role} + + + + + {/if} + + {if $isShowLocation} + + + + {/if} + + {if $location.phone.1.phone || $location.email.1.email} + + + + {foreach from=$location.phone item=phone} + {if $phone.phone} + + + + + {/if} + {/foreach} + {foreach from=$location.email item=eventEmail} + {if $eventEmail.email} + + + + + {/if} + {/foreach} + {/if} {*phone block close*} + {/if} +
+ {ts}Billing Name and Address{/ts} +
+ {$billingName}
+ {$address|nl2br} +
+ {ts}Credit Card Information{/ts} +
+ {$credit_card_type}
+ {$credit_card_number}
+ {ts}Expires:{/ts} {$credit_card_exp_date|truncate:7:''|crmDate} +
+ {ts}Event Information and Location{/ts} +
+ {$event.event_title}
+ {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if} +
+ {ts}Participant Role{/ts} + + {$event.participant_role} +
+ {$location.address.1.display|nl2br} +
+ {ts}Event Contacts:{/ts} +
+ {if $phone.phone_type} + {$phone.phone_type_display} + {else} + {ts}Phone{/ts} + {/if} + + {$phone.phone} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if} +
+ {ts}Email{/ts} + + {$eventEmail.email} +
+
+
+ + + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/payment_or_refund_notification_subject.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/payment_or_refund_notification_subject.tpl new file mode 100644 index 000000000000..0bd6ab689f0b --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/payment_or_refund_notification_subject.tpl @@ -0,0 +1,2 @@ +{if $isRefund}{ts}Refund Notification{/ts}{else}{ts}Payment Receipt{/ts}{/if} - {if $component eq 'event'}{$event.title}{/if} - {contact.display_name} + diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/petition_confirmation_needed_subject.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/petition_confirmation_needed_subject.tpl new file mode 100644 index 000000000000..2d39e4c4dcf2 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/petition_confirmation_needed_subject.tpl @@ -0,0 +1 @@ +Confirmation of signature needed for {$petition.title} - {contact.display_name} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/petition_sign_subject.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/petition_sign_subject.tpl new file mode 100644 index 000000000000..4b53e92119c6 --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/petition_sign_subject.tpl @@ -0,0 +1 @@ +Thank you for signing {$petition.title}, {contact.display_name} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/pledge_acknowledge_subject.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/pledge_acknowledge_subject.tpl new file mode 100644 index 000000000000..60864d3e988e --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/pledge_acknowledge_subject.tpl @@ -0,0 +1 @@ +{ts}Thank you for your Pledge{/ts}, {contact.display_name} diff --git a/CRM/Upgrade/5.0.beta1.msg_template/message_templates/pledge_reminder_subject.tpl b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/pledge_reminder_subject.tpl new file mode 100644 index 000000000000..e648dc2dea9b --- /dev/null +++ b/CRM/Upgrade/5.0.beta1.msg_template/message_templates/pledge_reminder_subject.tpl @@ -0,0 +1 @@ +{ts}Pledge Payment Reminder{/ts} {ts}for{/ts} {contact.display_name} diff --git a/CRM/Upgrade/Incremental/php/FiveOne.php b/CRM/Upgrade/Incremental/php/FiveOne.php new file mode 100644 index 000000000000..cb3d6f92d8a2 --- /dev/null +++ b/CRM/Upgrade/Incremental/php/FiveOne.php @@ -0,0 +1,87 @@ +' . ts('A new permission has been added called %1 This Permission is now used to control access to the Manage Tags screen', array(1 => 'manage tags')) . '

'; + // } + } + + /** + * Compute any messages which should be displayed after upgrade. + * + * @param string $postUpgradeMessage + * alterable. + * @param string $rev + * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. + */ + public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { + // Example: Generate a post-upgrade message. + // if ($rev == '5.12.34') { + // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); + // } + } + + /* + * Important! All upgrade functions MUST add a 'runSql' task. + * Uncomment and use the following template for a new upgrade version + * (change the x in the function name): + */ + + // /** + // * Upgrade function. + // * + // * @param string $rev + // */ + // public function upgrade_5_0_x($rev) { + // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); + // $this->addTask('Do the foo change', 'taskFoo', ...); + // // Additional tasks here... + // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. + // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. + // } + + // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { + // return TRUE; + // } + +} diff --git a/CRM/Upgrade/Incremental/sql/5.0.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.0.beta1.mysql.tpl index b58251174b72..72b6a4edf8cf 100644 --- a/CRM/Upgrade/Incremental/sql/5.0.beta1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/5.0.beta1.mysql.tpl @@ -1 +1,5 @@ {* file to handle db changes in 5.0.beta1 during upgrade *} + +-- CRM-20184 Missing email_greeting in Workflow Templates +{include file='../CRM/Upgrade/5.0.beta1.msg_template/civicrm_msg_template.tpl'} + diff --git a/CRM/Upgrade/Incremental/sql/5.1.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.1.alpha1.mysql.tpl new file mode 100644 index 000000000000..38caa89e4018 --- /dev/null +++ b/CRM/Upgrade/Incremental/sql/5.1.alpha1.mysql.tpl @@ -0,0 +1 @@ +{* file to handle db changes in 5.1.alpha1 during upgrade *} diff --git a/js/Common.js b/js/Common.js index 15f3528b2d6e..43cc526b7213 100644 --- a/js/Common.js +++ b/js/Common.js @@ -1260,7 +1260,8 @@ if (!CRM.vars) CRM.vars = {}; if (title.length) { text = title + "\n" + text; } - alert(text); + // strip html tags as they are not parsed in standard alerts + alert($("
").html(text).text()); return null; } }; diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql index f6218ab6d998..fc29d0a4b19c 100644 --- a/sql/civicrm_generated.mysql +++ b/sql/civicrm_generated.mysql @@ -398,7 +398,7 @@ UNLOCK TABLES; LOCK TABLES `civicrm_domain` WRITE; /*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */; -INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'5.0.beta1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); +INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'5.1.alpha1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */; UNLOCK TABLES; diff --git a/templates/CRM/Activity/Selector/Selector.tpl b/templates/CRM/Activity/Selector/Selector.tpl index a9a7c883994b..6cc3b32be39e 100644 --- a/templates/CRM/Activity/Selector/Selector.tpl +++ b/templates/CRM/Activity/Selector/Selector.tpl @@ -37,9 +37,9 @@ {$form.activity_type_exclude_filter_id.label}
{$form.activity_type_exclude_filter_id.html|crmAddClass:medium} - {include file="CRM/Core/DateRange.tpl" fieldName="activity_date" from='_low' to='_high' label='Date'} + {include file="CRM/Core/DateRange.tpl" fieldName="activity_date" from='_low' to='_high' label=''} - {ts}Status{/ts}
{$form.status_id.html|crmAddClass:medium} +
{$form.status_id.html|crmAddClass:medium} diff --git a/templates/CRM/Batch/Form/Entry.tpl b/templates/CRM/Batch/Form/Entry.tpl index 60340e1fa9e0..1f97a2b21bd9 100644 --- a/templates/CRM/Batch/Form/Entry.tpl +++ b/templates/CRM/Batch/Form/Entry.tpl @@ -45,11 +45,15 @@ {/if} - + - +
{ts}Total amount expected{/ts} + + {$batchTotal|crmMoney}
{ts}Total amount entered{/ts} + + {$config->defaultCurrencySymbol}
diff --git a/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl b/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl index dd726fc421b6..134528e77621 100644 --- a/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl +++ b/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl @@ -45,7 +45,7 @@ {if $groupElementType eq 'select'}
- {if $title}{$form.group.label}{/if} + {if $title}{$form.group.label}
{/if} {$form.group.html}
{else} diff --git a/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl b/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl index c046f6293154..eb85deaa4435 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl @@ -25,7 +25,6 @@ +--------------------------------------------------------------------+ *} {crmRegion name="contribute-form-contributionpage-settings-main"} -
{if $action eq 0}

{ts}This is the first step in creating a new online Contribution Page. You can create one or more different Contribution Pages for different purposes, audiences, campaigns, etc. Each page can have it's own introductory message, pre-configured contribution amounts, custom data collection fields, etc.{/ts}

@@ -34,6 +33,8 @@ {ts}Use this form to edit the page title, financial type (e.g. donation, campaign contribution, etc.), goal amount, introduction, and status (active/inactive) for this online contribution page.{/ts} {/if}
+
+
{include file="CRM/common/formButtons.tpl" location="top"}
{/if} + {if !$single} + + {/if} {foreach from=$columnHeaders item=header} {/if} - + + {/if} + + + diff --git a/templates/CRM/Custom/Page/Option.tpl b/templates/CRM/Custom/Page/Option.tpl index f388d80ff5d2..2322e6a3d83b 100644 --- a/templates/CRM/Custom/Page/Option.tpl +++ b/templates/CRM/Custom/Page/Option.tpl @@ -42,6 +42,7 @@ + @@ -70,6 +71,7 @@ {sClass:'crm-custom_option-label'}, {sClass:'crm-custom_option-value'}, {sClass:'crm-custom_option-default_value'}, + {sClass:'crm-custom_option-default_description'}, {sClass:'crm-custom_option-is_active'}, {sClass:'crm-custom_option-links'}, {sClass:'hiddenElement'} diff --git a/templates/CRM/Pledge/Form/Selector.tpl b/templates/CRM/Pledge/Form/Selector.tpl index 4099d6072994..b6c03b1f09fe 100644 --- a/templates/CRM/Pledge/Form/Selector.tpl +++ b/templates/CRM/Pledge/Form/Selector.tpl @@ -34,9 +34,7 @@ {if ! $single and $context eq 'Search' } {/if} - {if $single} - {/if} {foreach from=$columnHeaders item=header} {/if} diff --git a/tests/phpunit/CRM/Contribute/Form/Task/PDFLetterCommonTest.php b/tests/phpunit/CRM/Contribute/Form/Task/PDFLetterCommonTest.php index aed99437d5a7..93ef591a3945 100644 --- a/tests/phpunit/CRM/Contribute/Form/Task/PDFLetterCommonTest.php +++ b/tests/phpunit/CRM/Contribute/Form/Task/PDFLetterCommonTest.php @@ -376,4 +376,78 @@ public function hook_aggregateTokenValues(&$values, $contactIDs, $job = NULL, $t } } + /** + * @param string $token + * @param string $entity + * @param string $textToSearch + * @param bool $expected + * + * @dataProvider isHtmlTokenInTableCellProvider + */ + public function testIsHtmlTokenInTableCell($token, $entity, $textToSearch, $expected) { + $this->assertEquals($expected, + CRM_Contribute_Form_Task_PDFLetterCommon::isHtmlTokenInTableCell($token, $entity, $textToSearch) + ); + } + + public function isHtmlTokenInTableCellProvider() { + return [ + + 'simplest TRUE' => [ + 'token', + 'entity', + '', + TRUE, + ], + + 'simplest FALSE' => [ + 'token', + 'entity', + '{entity.token}', + FALSE, + ], + + 'token between two tables' => [ + 'token', + 'entity', + '
{$form.title.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contribution_page' field='title' id=$contributionPageID}{/if}{$form.title.html}
diff --git a/templates/CRM/Contribute/Form/Selector.tpl b/templates/CRM/Contribute/Form/Selector.tpl index 57b961e702ce..7d8c47b52016 100644 --- a/templates/CRM/Contribute/Form/Selector.tpl +++ b/templates/CRM/Contribute/Form/Selector.tpl @@ -32,6 +32,9 @@ {if !$single and $context eq 'Search' } 		{$form.toggleSelect.html} {if $header.sort} @@ -56,7 +59,8 @@ {assign var=cbName value=$row.checkbox} {$form.$cbName.html}{$row.contact_type}   {$row.sort_name}{$row.contact_type}{$row.sort_name} {if !$row.contribution_soft_credit_amount} diff --git a/templates/CRM/Custom/Form/Option.tpl b/templates/CRM/Custom/Form/Option.tpl index 67da17099910..2f869d71143f 100644 --- a/templates/CRM/Custom/Form/Option.tpl +++ b/templates/CRM/Custom/Form/Option.tpl @@ -42,6 +42,9 @@
{$form.value.label} {$form.value.html}
{$form.description.label}{$form.description.html}
{$form.weight.label} {$form.weight.html}
{ts}Label{/ts} {ts}Value{/ts}{ts}Description{/ts} {ts}Default{/ts} {ts}Enabled?{/ts}  {$form.toggleSelect.html} {if $header.sort} @@ -60,8 +58,8 @@ {if ! $single } + {$row.contact_type} - {$row.contact_type}   {$row.sort_name} {entity.token}
Top
+ {entity.token} +
Bottom
', + FALSE, + ], + + 'token in two tables' => [ + 'token', + 'entity', + '
{entity.token}
foo
+
{entity.token}
foo
', + TRUE, + ], + + 'token outside of table and inside of table' => [ + 'token', + 'entity', + ' {entity.token} +
{entity.token}
foo
', + FALSE, + ], + + 'token inside more complicated table' => [ + 'token', + 'entity', + '
{entity.token}
', + TRUE, + ], + + 'token inside something that looks like table cell' => [ + 'token', + 'entity', + ' {entity.token} +
Bottom
', + FALSE, + ], + + ]; + } + } diff --git a/tests/phpunit/CRM/Logging/SchemaTest.php b/tests/phpunit/CRM/Logging/SchemaTest.php index 889cdaf3d08b..27f72364b979 100644 --- a/tests/phpunit/CRM/Logging/SchemaTest.php +++ b/tests/phpunit/CRM/Logging/SchemaTest.php @@ -30,4 +30,15 @@ public function testQueryRewrite($query, $expectedQuery) { $this->assertEquals($expectedQuery, CRM_Logging_Schema::fixTimeStampAndNotNullSQL($query)); } + public function testLogEngine() { + $schema = new CRM_Logging_Schema(); + $schema->enableLogging(); + $log_table = CRM_Core_DAO::executeQuery("SHOW CREATE TABLE log_civicrm_acl"); + while ($log_table->fetch()) { + $this->assertRegexp('/ENGINE=ARCHIVE/', $log_table->Create_Table); + } + $schema->disableLogging(); + $schema->dropAllLogTables(); + } + } diff --git a/tests/phpunit/CRM/Utils/versionCheckTest.php b/tests/phpunit/CRM/Utils/versionCheckTest.php index 4c0322d93cf1..eb8980cb8298 100644 --- a/tests/phpunit/CRM/Utils/versionCheckTest.php +++ b/tests/phpunit/CRM/Utils/versionCheckTest.php @@ -275,59 +275,64 @@ public function testGetSiteStats() { // Stats array should have correct elements. $this->assertArrayHasKey('version', $stats); - $this->assertArrayHasKey('hash', $stats); - $this->assertArrayHasKey('uf', $stats); - $this->assertArrayHasKey('lang', $stats); - $this->assertArrayHasKey('co', $stats); - $this->assertArrayHasKey('ufv', $stats); - $this->assertArrayHasKey('PHP', $stats); - $this->assertArrayHasKey('MySQL', $stats); - $this->assertArrayHasKey('communityMessagesUrl', $stats); - $this->assertArrayHasKey('domain_isoCode', $stats); - $this->assertArrayHasKey('PPTypes', $stats); - $this->assertArrayHasKey('entities', $stats); - $this->assertArrayHasKey('extensions', $stats); - $this->assertType('array', $stats['entities']); - $this->assertType('array', $stats['extensions']); - - // Assert $stats['domain_isoCode'] is correct. - $this->assertEquals($country['iso_code'], $stats['domain_isoCode']); - - $entity_names = array(); - foreach ($stats['entities'] as $entity) { - $entity_names[] = $entity['name']; - $this->assertType('int', $entity['size'], "Stats entity {$entity['name']} has integer size?"); - } - - $expected_entity_names = array( - 'Activity', - 'Case', - 'Contact', - 'Relationship', - 'Campaign', - 'Contribution', - 'ContributionPage', - 'ContributionProduct', - 'Widget', - 'Discount', - 'PriceSetEntity', - 'UFGroup', - 'Event', - 'Participant', - 'Friend', - 'Grant', - 'Mailing', - 'Membership', - 'MembershipBlock', - 'Pledge', - 'PledgeBlock', - 'Delivered', - ); - sort($entity_names); - sort($expected_entity_names); - $this->assertEquals($expected_entity_names, $entity_names); - // TODO: Also test for enabled extensions. + // See CRM_Utils_VersionCheck::getSiteStats where alpha versions don't get + // full stats generated + if (array_key_exists('version', $stats) && strpos($stats['version'], 'alpha') === FALSE) { + $this->assertArrayHasKey('hash', $stats); + $this->assertArrayHasKey('uf', $stats); + $this->assertArrayHasKey('lang', $stats); + $this->assertArrayHasKey('co', $stats); + $this->assertArrayHasKey('ufv', $stats); + $this->assertArrayHasKey('PHP', $stats); + $this->assertArrayHasKey('MySQL', $stats); + $this->assertArrayHasKey('communityMessagesUrl', $stats); + $this->assertArrayHasKey('domain_isoCode', $stats); + $this->assertArrayHasKey('PPTypes', $stats); + $this->assertArrayHasKey('entities', $stats); + $this->assertArrayHasKey('extensions', $stats); + $this->assertType('array', $stats['entities']); + $this->assertType('array', $stats['extensions']); + + // Assert $stats['domain_isoCode'] is correct. + $this->assertEquals($country['iso_code'], $stats['domain_isoCode']); + + $entity_names = array(); + foreach ($stats['entities'] as $entity) { + $entity_names[] = $entity['name']; + $this->assertType('int', $entity['size'], "Stats entity {$entity['name']} has integer size?"); + } + + $expected_entity_names = array( + 'Activity', + 'Case', + 'Contact', + 'Relationship', + 'Campaign', + 'Contribution', + 'ContributionPage', + 'ContributionProduct', + 'Widget', + 'Discount', + 'PriceSetEntity', + 'UFGroup', + 'Event', + 'Participant', + 'Friend', + 'Grant', + 'Mailing', + 'Membership', + 'MembershipBlock', + 'Pledge', + 'PledgeBlock', + 'Delivered', + ); + sort($entity_names); + sort($expected_entity_names); + $this->assertEquals($expected_entity_names, $entity_names); + + // TODO: Also test for enabled extensions. + } } } diff --git a/xml/templates/message_templates/contribution_invoice_receipt_subject.tpl b/xml/templates/message_templates/contribution_invoice_receipt_subject.tpl index f99fe4475025..80d07865574d 100644 --- a/xml/templates/message_templates/contribution_invoice_receipt_subject.tpl +++ b/xml/templates/message_templates/contribution_invoice_receipt_subject.tpl @@ -9,3 +9,4 @@ {else} {ts}Invoice{/ts} {/if} +- {contact.display_name} diff --git a/xml/templates/message_templates/contribution_offline_receipt_html.tpl b/xml/templates/message_templates/contribution_offline_receipt_html.tpl index 8a840cef62c2..a4cbeee05ed5 100644 --- a/xml/templates/message_templates/contribution_offline_receipt_html.tpl +++ b/xml/templates/message_templates/contribution_offline_receipt_html.tpl @@ -21,7 +21,7 @@ - +

{contact.email_greeting},

{if $formValues.receipt_text}

{$formValues.receipt_text|htmlize}

{else} diff --git a/xml/templates/message_templates/contribution_offline_receipt_subject.tpl b/xml/templates/message_templates/contribution_offline_receipt_subject.tpl index a2e2f61c7650..2a19c6e6c3b2 100644 --- a/xml/templates/message_templates/contribution_offline_receipt_subject.tpl +++ b/xml/templates/message_templates/contribution_offline_receipt_subject.tpl @@ -1 +1 @@ -{ts}Contribution Receipt{/ts} +{ts}Contribution Receipt{/ts} - {contact.display_name} diff --git a/xml/templates/message_templates/contribution_offline_receipt_text.tpl b/xml/templates/message_templates/contribution_offline_receipt_text.tpl index 6b46e34259eb..5bfac13c7357 100644 --- a/xml/templates/message_templates/contribution_offline_receipt_text.tpl +++ b/xml/templates/message_templates/contribution_offline_receipt_text.tpl @@ -1,3 +1,5 @@ +{contact.email_greeting}, + {if $formValues.receipt_text} {$formValues.receipt_text} {else}{ts}Thank you for your support.{/ts}{/if} diff --git a/xml/templates/message_templates/contribution_online_receipt_html.tpl b/xml/templates/message_templates/contribution_online_receipt_html.tpl index ec976ed0e525..61dc72d657b4 100644 --- a/xml/templates/message_templates/contribution_online_receipt_html.tpl +++ b/xml/templates/message_templates/contribution_online_receipt_html.tpl @@ -21,7 +21,7 @@ - +

{contact.email_greeting},

{if $receipt_text}

{$receipt_text|htmlize}

{/if} diff --git a/xml/templates/message_templates/contribution_online_receipt_subject.tpl b/xml/templates/message_templates/contribution_online_receipt_subject.tpl index 32d4e402a82c..052dce5bd748 100644 --- a/xml/templates/message_templates/contribution_online_receipt_subject.tpl +++ b/xml/templates/message_templates/contribution_online_receipt_subject.tpl @@ -1 +1 @@ -{if $is_pay_later}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} +{if $is_pay_later}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} - {contact.display_name} diff --git a/xml/templates/message_templates/contribution_online_receipt_text.tpl b/xml/templates/message_templates/contribution_online_receipt_text.tpl index c6328bc46e89..2820950ed170 100644 --- a/xml/templates/message_templates/contribution_online_receipt_text.tpl +++ b/xml/templates/message_templates/contribution_online_receipt_text.tpl @@ -1,3 +1,5 @@ +{contact.email_greeting}, + {if $receipt_text} {$receipt_text} {/if} @@ -206,4 +208,4 @@ {$customName}: {$customValue} {/if} {/foreach} -{/if} \ No newline at end of file +{/if} diff --git a/xml/templates/message_templates/contribution_recurring_billing_html.tpl b/xml/templates/message_templates/contribution_recurring_billing_html.tpl index f2b9d4884239..c7b962f4857e 100644 --- a/xml/templates/message_templates/contribution_recurring_billing_html.tpl +++ b/xml/templates/message_templates/contribution_recurring_billing_html.tpl @@ -21,7 +21,7 @@ -

{ts 1=$contact.display_name}Dear %1{/ts},

+

{contact.email_greeting},

{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Billing details for your recurring contribution of %1, every %2 %3 have been updated.{/ts}

@@ -62,4 +62,4 @@ - \ No newline at end of file + diff --git a/xml/templates/message_templates/contribution_recurring_billing_subject.tpl b/xml/templates/message_templates/contribution_recurring_billing_subject.tpl index 69d9c9012910..0a2a03b06449 100644 --- a/xml/templates/message_templates/contribution_recurring_billing_subject.tpl +++ b/xml/templates/message_templates/contribution_recurring_billing_subject.tpl @@ -1 +1 @@ -{ts}Recurring Contribution Billing Updates{/ts} \ No newline at end of file +{ts}Recurring Contribution Billing Updates{/ts} - {contact.display_name} diff --git a/xml/templates/message_templates/contribution_recurring_billing_text.tpl b/xml/templates/message_templates/contribution_recurring_billing_text.tpl index 37e7ed750216..d4732cc615b8 100644 --- a/xml/templates/message_templates/contribution_recurring_billing_text.tpl +++ b/xml/templates/message_templates/contribution_recurring_billing_text.tpl @@ -1,4 +1,4 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, +{contact.email_greeting}, {ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Billing details for your recurring contribution of %1, every %2 %3 have been updated.{/ts} @@ -20,4 +20,4 @@ {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} -{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts} \ No newline at end of file +{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts} diff --git a/xml/templates/message_templates/contribution_recurring_cancelled_html.tpl b/xml/templates/message_templates/contribution_recurring_cancelled_html.tpl index 674333e079fb..99bd2f84150e 100644 --- a/xml/templates/message_templates/contribution_recurring_cancelled_html.tpl +++ b/xml/templates/message_templates/contribution_recurring_cancelled_html.tpl @@ -21,7 +21,7 @@ -

{ts 1=$contact.display_name}Dear %1{/ts},

+

{contact.email_greeting},

{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Your recurring contribution of %1, every %2 %3 has been cancelled as requested.{/ts}

diff --git a/xml/templates/message_templates/contribution_recurring_cancelled_subject.tpl b/xml/templates/message_templates/contribution_recurring_cancelled_subject.tpl index d389480e14fa..2b5a4d805fba 100644 --- a/xml/templates/message_templates/contribution_recurring_cancelled_subject.tpl +++ b/xml/templates/message_templates/contribution_recurring_cancelled_subject.tpl @@ -1 +1 @@ -{ts}Recurring Contribution Cancellation Notification{/ts} +{ts}Recurring Contribution Cancellation Notification{/ts} - {contact.display_name} diff --git a/xml/templates/message_templates/contribution_recurring_cancelled_text.tpl b/xml/templates/message_templates/contribution_recurring_cancelled_text.tpl index f10d37432f5c..40c2986c7023 100644 --- a/xml/templates/message_templates/contribution_recurring_cancelled_text.tpl +++ b/xml/templates/message_templates/contribution_recurring_cancelled_text.tpl @@ -1,3 +1,3 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, +{contact.email_greeting}, {ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Your recurring contribution of %1, every %2 %3 has been cancelled as requested.{/ts} diff --git a/xml/templates/message_templates/contribution_recurring_edit_html.tpl b/xml/templates/message_templates/contribution_recurring_edit_html.tpl index 0ef701f9c28b..894157b0b5b5 100644 --- a/xml/templates/message_templates/contribution_recurring_edit_html.tpl +++ b/xml/templates/message_templates/contribution_recurring_edit_html.tpl @@ -21,7 +21,7 @@ -

{ts 1=$contact.display_name}Dear %1{/ts},

+

{contact.email_greeting},

{ts}Your recurring contribution has been updated as requested:{/ts}

{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Recurring contribution is for %1, every %2 %3(s){/ts}{if $installments}{ts 1=$installments} for %1 installments{/ts}{/if}.

diff --git a/xml/templates/message_templates/contribution_recurring_edit_subject.tpl b/xml/templates/message_templates/contribution_recurring_edit_subject.tpl index d4a5da1aea99..304649521623 100644 --- a/xml/templates/message_templates/contribution_recurring_edit_subject.tpl +++ b/xml/templates/message_templates/contribution_recurring_edit_subject.tpl @@ -1 +1 @@ -{ts}Recurring Contribution Update Notification{/ts} \ No newline at end of file +{ts}Recurring Contribution Update Notification{/ts} - {contact.display_name} diff --git a/xml/templates/message_templates/contribution_recurring_edit_text.tpl b/xml/templates/message_templates/contribution_recurring_edit_text.tpl index b1e038b5da3d..74b7f51bdce2 100644 --- a/xml/templates/message_templates/contribution_recurring_edit_text.tpl +++ b/xml/templates/message_templates/contribution_recurring_edit_text.tpl @@ -1,8 +1,8 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, +{contact.email_greeting}, {ts}Your recurring contribution has been updated as requested:{/ts} {ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Recurring contribution is for %1, every %2 %3(s){/ts} {if $installments}{ts 1=$installments} for %1 installments.{/ts}{/if} -{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts} \ No newline at end of file +{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts} diff --git a/xml/templates/message_templates/contribution_recurring_notify_html.tpl b/xml/templates/message_templates/contribution_recurring_notify_html.tpl index 3ed5eb713ef1..2582e7cbba33 100644 --- a/xml/templates/message_templates/contribution_recurring_notify_html.tpl +++ b/xml/templates/message_templates/contribution_recurring_notify_html.tpl @@ -21,7 +21,7 @@ -

{ts 1=$displayName}Dear %1{/ts},

+

{contact.email_greeting},

diff --git a/xml/templates/message_templates/contribution_recurring_notify_subject.tpl b/xml/templates/message_templates/contribution_recurring_notify_subject.tpl index 0dfee3ad3925..c9a9d927ad0e 100644 --- a/xml/templates/message_templates/contribution_recurring_notify_subject.tpl +++ b/xml/templates/message_templates/contribution_recurring_notify_subject.tpl @@ -1 +1 @@ -{ts}Recurring Contribution Notification{/ts} +{ts}Recurring Contribution Notification{/ts} - {contact.display_name} diff --git a/xml/templates/message_templates/contribution_recurring_notify_text.tpl b/xml/templates/message_templates/contribution_recurring_notify_text.tpl index 46aa380a370c..cf54ba592dd9 100644 --- a/xml/templates/message_templates/contribution_recurring_notify_text.tpl +++ b/xml/templates/message_templates/contribution_recurring_notify_text.tpl @@ -1,4 +1,4 @@ -{ts 1=$displayName}Dear %1{/ts}, +{contact.email_greeting}, {if $recur_txnType eq 'START'} {if $auto_renew_membership} diff --git a/xml/templates/message_templates/event_offline_receipt_subject.tpl b/xml/templates/message_templates/event_offline_receipt_subject.tpl index 5cbe60c144e7..e686b72f8c84 100644 --- a/xml/templates/message_templates/event_offline_receipt_subject.tpl +++ b/xml/templates/message_templates/event_offline_receipt_subject.tpl @@ -1 +1 @@ -{ts}Event Confirmation{/ts} - {$event.title} +{ts}Event Confirmation{/ts} - {$event.title} - {contact.display_name} diff --git a/xml/templates/message_templates/event_online_receipt_subject.tpl b/xml/templates/message_templates/event_online_receipt_subject.tpl index c847397dbb7b..fab66f239692 100644 --- a/xml/templates/message_templates/event_online_receipt_subject.tpl +++ b/xml/templates/message_templates/event_online_receipt_subject.tpl @@ -1 +1 @@ -{if $isOnWaitlist}{ts}Wait List Confirmation{/ts}{else}{ts}Registration Confirmation{/ts}{/if} - {$event.event_title} \ No newline at end of file +{if $isOnWaitlist}{ts}Wait List Confirmation{/ts}{else}{ts}Registration Confirmation{/ts}{/if} - {$event.event_title} - {contact.display_name} diff --git a/xml/templates/message_templates/event_registration_receipt_html.tpl b/xml/templates/message_templates/event_registration_receipt_html.tpl index 3436a1903486..121d07efa2a8 100644 --- a/xml/templates/message_templates/event_registration_receipt_html.tpl +++ b/xml/templates/message_templates/event_registration_receipt_html.tpl @@ -9,7 +9,7 @@ {capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} -

Dear {contact.display_name},

+

{contact.email_greeting},

{if $is_pay_later}

This is being sent to you as an acknowledgement that you have registered one or more members for the following workshop, event or purchase. Please note, however, that the status of your payment is pending, and the registration for this event will not be completed until your payment is received. diff --git a/xml/templates/message_templates/event_registration_receipt_text.tpl b/xml/templates/message_templates/event_registration_receipt_text.tpl index 695b53d60432..2a8d3f054581 100644 --- a/xml/templates/message_templates/event_registration_receipt_text.tpl +++ b/xml/templates/message_templates/event_registration_receipt_text.tpl @@ -1,4 +1,4 @@ -Dear {contact.display_name}, +{contact.email_greeting}, {if $is_pay_later} This is being sent to you as an acknowledgement that you have registered one or more members for the following workshop, event or purchase. Please note, however, that the status of your payment is pending, and the registration for this event will not be completed until your payment is received. {else} diff --git a/xml/templates/message_templates/membership_autorenew_billing_html.tpl b/xml/templates/message_templates/membership_autorenew_billing_html.tpl index a8ec69f11623..2a126e61ea5b 100644 --- a/xml/templates/message_templates/membership_autorenew_billing_html.tpl +++ b/xml/templates/message_templates/membership_autorenew_billing_html.tpl @@ -21,7 +21,7 @@ -

{ts 1=$contact.display_name}Dear %1{/ts},

+

{contact.email_greeting},

{ts 1=$membershipType}Billing details for your automatically renewed %1 membership have been updated.{/ts}

diff --git a/xml/templates/message_templates/membership_autorenew_billing_subject.tpl b/xml/templates/message_templates/membership_autorenew_billing_subject.tpl index c03dab7845b9..3579f9033090 100644 --- a/xml/templates/message_templates/membership_autorenew_billing_subject.tpl +++ b/xml/templates/message_templates/membership_autorenew_billing_subject.tpl @@ -1 +1 @@ -{ts}Membership Autorenewal Billing Updates{/ts} \ No newline at end of file +{ts}Membership Autorenewal Billing Updates{/ts} - {contact.display_name} diff --git a/xml/templates/message_templates/membership_autorenew_billing_text.tpl b/xml/templates/message_templates/membership_autorenew_billing_text.tpl index 8df337a3a21b..1100caf19107 100644 --- a/xml/templates/message_templates/membership_autorenew_billing_text.tpl +++ b/xml/templates/message_templates/membership_autorenew_billing_text.tpl @@ -1,4 +1,4 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, +{contact.email_greeting}, {ts 1=$membershipType}Billing details for your automatically renewed %1 membership have been updated.{/ts} @@ -20,4 +20,4 @@ {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} -{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts} \ No newline at end of file +{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts} diff --git a/xml/templates/message_templates/membership_autorenew_cancelled_html.tpl b/xml/templates/message_templates/membership_autorenew_cancelled_html.tpl index 77e11ff632f1..b9709cfe60aa 100644 --- a/xml/templates/message_templates/membership_autorenew_cancelled_html.tpl +++ b/xml/templates/message_templates/membership_autorenew_cancelled_html.tpl @@ -21,7 +21,7 @@ - +

{contact.email_greeting},

{ts 1=$membershipType}The automatic renewal of your %1 membership has been cancelled as requested. This does not affect the status of your membership - you will receive a separate notification when your membership is up for renewal.{/ts}

diff --git a/xml/templates/message_templates/membership_autorenew_cancelled_subject.tpl b/xml/templates/message_templates/membership_autorenew_cancelled_subject.tpl index ccfb0de98f69..69c2ab8a3c1e 100644 --- a/xml/templates/message_templates/membership_autorenew_cancelled_subject.tpl +++ b/xml/templates/message_templates/membership_autorenew_cancelled_subject.tpl @@ -1 +1 @@ -{ts}Autorenew Membership Cancellation Notification{/ts} +{ts}Autorenew Membership Cancellation Notification{/ts} - {contact.display_name} diff --git a/xml/templates/message_templates/membership_autorenew_cancelled_text.tpl b/xml/templates/message_templates/membership_autorenew_cancelled_text.tpl index 51cec8cff6a7..635767841175 100644 --- a/xml/templates/message_templates/membership_autorenew_cancelled_text.tpl +++ b/xml/templates/message_templates/membership_autorenew_cancelled_text.tpl @@ -1,3 +1,5 @@ +{contact.email_greeting}, + {ts 1=$membershipType}The automatic renewal of your %1 membership has been cancelled as requested. This does not affect the status of your membership - you will receive a separate notification when your membership is up for renewal.{/ts} =========================================================== diff --git a/xml/templates/message_templates/membership_offline_receipt_html.tpl b/xml/templates/message_templates/membership_offline_receipt_html.tpl index 8d5347a721c6..4f7ed9eea917 100644 --- a/xml/templates/message_templates/membership_offline_receipt_html.tpl +++ b/xml/templates/message_templates/membership_offline_receipt_html.tpl @@ -21,6 +21,7 @@ +

{contact.email_greeting},

{if $formValues.receipt_text_signup}

{$formValues.receipt_text_signup|htmlize}

{elseif $formValues.receipt_text_renewal} diff --git a/xml/templates/message_templates/membership_offline_receipt_subject.tpl b/xml/templates/message_templates/membership_offline_receipt_subject.tpl index ccc8b3cfa6a0..22f1b0b6a0af 100644 --- a/xml/templates/message_templates/membership_offline_receipt_subject.tpl +++ b/xml/templates/message_templates/membership_offline_receipt_subject.tpl @@ -3,3 +3,4 @@ {elseif $receiptType EQ 'membership renewal'} {ts}Membership Renewal Confirmation and Receipt{/ts} {/if} +{contact.display_name} diff --git a/xml/templates/message_templates/membership_offline_receipt_text.tpl b/xml/templates/message_templates/membership_offline_receipt_text.tpl index 7df285af46b2..057bb14b0440 100644 --- a/xml/templates/message_templates/membership_offline_receipt_text.tpl +++ b/xml/templates/message_templates/membership_offline_receipt_text.tpl @@ -1,3 +1,5 @@ +{contact.email_greeting}, + {if $formValues.receipt_text_signup} {$formValues.receipt_text_signup} {elseif $formValues.receipt_text_renewal} diff --git a/xml/templates/message_templates/membership_online_receipt_html.tpl b/xml/templates/message_templates/membership_online_receipt_html.tpl index 2e6136414f14..a1e20138885d 100644 --- a/xml/templates/message_templates/membership_online_receipt_html.tpl +++ b/xml/templates/message_templates/membership_online_receipt_html.tpl @@ -21,7 +21,7 @@ - +

{contact.email_greeting},

{if $receipt_text}

{$receipt_text|htmlize}

{/if} diff --git a/xml/templates/message_templates/membership_online_receipt_subject.tpl b/xml/templates/message_templates/membership_online_receipt_subject.tpl index 32d4e402a82c..052dce5bd748 100644 --- a/xml/templates/message_templates/membership_online_receipt_subject.tpl +++ b/xml/templates/message_templates/membership_online_receipt_subject.tpl @@ -1 +1 @@ -{if $is_pay_later}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} +{if $is_pay_later}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} - {contact.display_name} diff --git a/xml/templates/message_templates/membership_online_receipt_text.tpl b/xml/templates/message_templates/membership_online_receipt_text.tpl index aebd6d484ebb..5d8420876c2b 100644 --- a/xml/templates/message_templates/membership_online_receipt_text.tpl +++ b/xml/templates/message_templates/membership_online_receipt_text.tpl @@ -1,3 +1,5 @@ +{contact.email_greeting}, + {if $receipt_text} {$receipt_text} {/if} diff --git a/xml/templates/message_templates/participant_cancelled_html.tpl b/xml/templates/message_templates/participant_cancelled_html.tpl index 4a882c1259b3..f6bc1b12172b 100644 --- a/xml/templates/message_templates/participant_cancelled_html.tpl +++ b/xml/templates/message_templates/participant_cancelled_html.tpl @@ -21,7 +21,7 @@ -

{ts 1=$contact.display_name}Dear %1{/ts},

+

{contact.email_greeting},

{ts}Your Event Registration has been cancelled.{/ts}

diff --git a/xml/templates/message_templates/participant_cancelled_subject.tpl b/xml/templates/message_templates/participant_cancelled_subject.tpl index e45a6be64c9f..e39740983922 100644 --- a/xml/templates/message_templates/participant_cancelled_subject.tpl +++ b/xml/templates/message_templates/participant_cancelled_subject.tpl @@ -1 +1 @@ -{ts 1=$event.event_title}Event Registration Cancelled for %1{/ts} +{ts 1=$event.event_title}Event Registration Cancelled for %1{/ts} - {contact.display_name} diff --git a/xml/templates/message_templates/participant_cancelled_text.tpl b/xml/templates/message_templates/participant_cancelled_text.tpl index b4430b33d194..566fdfd7372f 100644 --- a/xml/templates/message_templates/participant_cancelled_text.tpl +++ b/xml/templates/message_templates/participant_cancelled_text.tpl @@ -1,4 +1,4 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, +{contact.email_greeting}, {ts}Your Event Registration has been cancelled.{/ts} diff --git a/xml/templates/message_templates/participant_confirm_html.tpl b/xml/templates/message_templates/participant_confirm_html.tpl index ca6816d166f3..af4fa8b53550 100644 --- a/xml/templates/message_templates/participant_confirm_html.tpl +++ b/xml/templates/message_templates/participant_confirm_html.tpl @@ -21,7 +21,7 @@ -

{ts 1=$contact.display_name}Dear %1{/ts},

+

{contact.email_greeting},

{if !$isAdditional and $participant.id} diff --git a/xml/templates/message_templates/participant_confirm_subject.tpl b/xml/templates/message_templates/participant_confirm_subject.tpl index 2f3b9479727e..5bac86835b0e 100644 --- a/xml/templates/message_templates/participant_confirm_subject.tpl +++ b/xml/templates/message_templates/participant_confirm_subject.tpl @@ -1 +1 @@ -{ts 1=$event.event_title}Confirm your registration for %1{/ts} +{ts 1=$event.event_title}Confirm your registration for %1{/ts} - {contact.display_name} diff --git a/xml/templates/message_templates/participant_confirm_text.tpl b/xml/templates/message_templates/participant_confirm_text.tpl index e8f90132b5c1..3dc53a1999e0 100644 --- a/xml/templates/message_templates/participant_confirm_text.tpl +++ b/xml/templates/message_templates/participant_confirm_text.tpl @@ -1,4 +1,4 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, +{contact.email_greeting}, {if !$isAdditional and $participant.id} =========================================================== diff --git a/xml/templates/message_templates/participant_expired_html.tpl b/xml/templates/message_templates/participant_expired_html.tpl index a11ff72685cf..7af4dea95cb5 100644 --- a/xml/templates/message_templates/participant_expired_html.tpl +++ b/xml/templates/message_templates/participant_expired_html.tpl @@ -21,7 +21,7 @@ -

{ts 1=$contact.display_name}Dear %1{/ts},

+

{contact.email_greeting},

{ts 1=$event.event_title}Your pending event registration for %1 has expired because you did not confirm your registration.{/ts}

{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions diff --git a/xml/templates/message_templates/participant_expired_subject.tpl b/xml/templates/message_templates/participant_expired_subject.tpl index aeb56d320432..a62fd9e56697 100644 --- a/xml/templates/message_templates/participant_expired_subject.tpl +++ b/xml/templates/message_templates/participant_expired_subject.tpl @@ -1 +1 @@ -{ts 1=$event.event_title}Event registration has expired for %1{/ts} +{ts 1=$event.event_title}Event registration has expired for %1{/ts} - {contact.display_name} diff --git a/xml/templates/message_templates/participant_expired_text.tpl b/xml/templates/message_templates/participant_expired_text.tpl index be649c11daee..bc8e673f982a 100644 --- a/xml/templates/message_templates/participant_expired_text.tpl +++ b/xml/templates/message_templates/participant_expired_text.tpl @@ -1,4 +1,4 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, +{contact.email_greeting}, {ts 1=$event.event_title}Your pending event registration for %1 has expired because you did not confirm your registration.{/ts} diff --git a/xml/templates/message_templates/participant_transferred_html.tpl b/xml/templates/message_templates/participant_transferred_html.tpl index 26cbf37e1524..ff1a1596084d 100644 --- a/xml/templates/message_templates/participant_transferred_html.tpl +++ b/xml/templates/message_templates/participant_transferred_html.tpl @@ -21,7 +21,7 @@ -

{ts 1=$contact.display_name}Dear %1{/ts},

+

{contact.email_greeting},

{ts 1=$to_participant}Your Event Registration has been Transferred to %1.{/ts}

diff --git a/xml/templates/message_templates/participant_transferred_subject.tpl b/xml/templates/message_templates/participant_transferred_subject.tpl index 6488ece90bae..2e2bf244d575 100644 --- a/xml/templates/message_templates/participant_transferred_subject.tpl +++ b/xml/templates/message_templates/participant_transferred_subject.tpl @@ -1 +1 @@ -{ts 1=$event.event_title}Event Registration Transferred for %1{/ts} +{ts 1=$event.event_title}Event Registration Transferred for %1{/ts} - {contact.display_name} diff --git a/xml/templates/message_templates/participant_transferred_text.tpl b/xml/templates/message_templates/participant_transferred_text.tpl index aeac8a7ba159..eaaec828dc74 100644 --- a/xml/templates/message_templates/participant_transferred_text.tpl +++ b/xml/templates/message_templates/participant_transferred_text.tpl @@ -1,4 +1,4 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, +{contact.email_greeting}, {ts 1=$to_participant}Your Event Registration has been transferred to %1.{/ts} diff --git a/xml/templates/message_templates/payment_or_refund_notification_html.tpl b/xml/templates/message_templates/payment_or_refund_notification_html.tpl index 709d7915d99e..d32860804575 100644 --- a/xml/templates/message_templates/payment_or_refund_notification_html.tpl +++ b/xml/templates/message_templates/payment_or_refund_notification_html.tpl @@ -12,7 +12,6 @@ {capture assign=emptyBlockStyle }style="padding: 10px; border-bottom: 1px solid #999;background-color: #f7f7f7;"{/capture} {capture assign=emptyBlockValueStyle }style="padding: 10px; border-bottom: 1px solid #999;"{/capture} -

Dear {$contactDisplayName}

@@ -25,6 +24,7 @@ diff --git a/xml/templates/message_templates/pledge_acknowledge_subject.tpl b/xml/templates/message_templates/pledge_acknowledge_subject.tpl index 9648c9c71ba7..60864d3e988e 100644 --- a/xml/templates/message_templates/pledge_acknowledge_subject.tpl +++ b/xml/templates/message_templates/pledge_acknowledge_subject.tpl @@ -1 +1 @@ -{ts}Thank you for your Pledge{/ts} +{ts}Thank you for your Pledge{/ts}, {contact.display_name} diff --git a/xml/templates/message_templates/pledge_acknowledge_text.tpl b/xml/templates/message_templates/pledge_acknowledge_text.tpl index 571f1b1bea2a..492bfbd8b1fb 100644 --- a/xml/templates/message_templates/pledge_acknowledge_text.tpl +++ b/xml/templates/message_templates/pledge_acknowledge_text.tpl @@ -1,4 +1,4 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, +{contact.email_greeting}, {ts}Thank you for your generous pledge. Please print this acknowledgment for your records.{/ts} diff --git a/xml/templates/message_templates/pledge_reminder_html.tpl b/xml/templates/message_templates/pledge_reminder_html.tpl index c2e42a57748e..2e92d0509d6e 100644 --- a/xml/templates/message_templates/pledge_reminder_html.tpl +++ b/xml/templates/message_templates/pledge_reminder_html.tpl @@ -21,7 +21,7 @@ diff --git a/xml/templates/message_templates/pledge_reminder_subject.tpl b/xml/templates/message_templates/pledge_reminder_subject.tpl index 9e06198c3481..e648dc2dea9b 100644 --- a/xml/templates/message_templates/pledge_reminder_subject.tpl +++ b/xml/templates/message_templates/pledge_reminder_subject.tpl @@ -1 +1 @@ -{ts}Pledge Payment Reminder{/ts} +{ts}Pledge Payment Reminder{/ts} {ts}for{/ts} {contact.display_name} diff --git a/xml/templates/message_templates/pledge_reminder_text.tpl b/xml/templates/message_templates/pledge_reminder_text.tpl index 2761c3d36ac8..a91a596b293a 100644 --- a/xml/templates/message_templates/pledge_reminder_text.tpl +++ b/xml/templates/message_templates/pledge_reminder_text.tpl @@ -1,4 +1,4 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, +{contact.email_greeting}, {ts 1=$next_payment|truncate:10:''|crmDate}This is a reminder that the next payment on your pledge is due on %1.{/ts} diff --git a/xml/version.xml b/xml/version.xml index 4dd101b6548a..4cb418360836 100644 --- a/xml/version.xml +++ b/xml/version.xml @@ -1,4 +1,4 @@ - 5.0.beta1 + 5.1.alpha1
{if $isRefund} +

{contact.email_greeting},

{ts}A refund has been issued based on changes in your registration selections.{/ts}

{else}

{ts}A payment has been received.{/ts}

diff --git a/xml/templates/message_templates/payment_or_refund_notification_subject.tpl b/xml/templates/message_templates/payment_or_refund_notification_subject.tpl index ef17a4ce556b..0bd6ab689f0b 100644 --- a/xml/templates/message_templates/payment_or_refund_notification_subject.tpl +++ b/xml/templates/message_templates/payment_or_refund_notification_subject.tpl @@ -1 +1,2 @@ -{if $isRefund}{ts}Refund Notification{/ts}{else}{ts}Payment Receipt{/ts}{/if} - {if $component eq 'event'}{$event.title}{/if} \ No newline at end of file +{if $isRefund}{ts}Refund Notification{/ts}{else}{ts}Payment Receipt{/ts}{/if} - {if $component eq 'event'}{$event.title}{/if} - {contact.display_name} + diff --git a/xml/templates/message_templates/payment_or_refund_notification_text.tpl b/xml/templates/message_templates/payment_or_refund_notification_text.tpl index c713864c05f4..be2892f1d960 100644 --- a/xml/templates/message_templates/payment_or_refund_notification_text.tpl +++ b/xml/templates/message_templates/payment_or_refund_notification_text.tpl @@ -1,4 +1,4 @@ -Dear {$contactDisplayName} +{contact.email_greeting}, {if $isRefund} {ts}A refund has been issued based on changes in your registration selections.{/ts} {else} diff --git a/xml/templates/message_templates/petition_confirmation_needed_html.tpl b/xml/templates/message_templates/petition_confirmation_needed_html.tpl index 2d30dc11c79d..bc444b91905e 100644 --- a/xml/templates/message_templates/petition_confirmation_needed_html.tpl +++ b/xml/templates/message_templates/petition_confirmation_needed_html.tpl @@ -1,3 +1,5 @@ +

{contact.email_greeting},

+

Thank you for signing {$petition.title}.

In order to complete your signature, we must confirm your e-mail. diff --git a/xml/templates/message_templates/petition_confirmation_needed_subject.tpl b/xml/templates/message_templates/petition_confirmation_needed_subject.tpl index 8f86ab9231a6..2d39e4c4dcf2 100644 --- a/xml/templates/message_templates/petition_confirmation_needed_subject.tpl +++ b/xml/templates/message_templates/petition_confirmation_needed_subject.tpl @@ -1 +1 @@ -Confirmation of signature needed for {$petition.title} +Confirmation of signature needed for {$petition.title} - {contact.display_name} diff --git a/xml/templates/message_templates/petition_confirmation_needed_text.tpl b/xml/templates/message_templates/petition_confirmation_needed_text.tpl index 8549b39b4c41..a393a55aabbb 100644 --- a/xml/templates/message_templates/petition_confirmation_needed_text.tpl +++ b/xml/templates/message_templates/petition_confirmation_needed_text.tpl @@ -1,3 +1,5 @@ +{contact.email_greeting}, + Thank you for signing {$petition.title}. In order to complete your signature, we must confirm your e-mail. diff --git a/xml/templates/message_templates/petition_sign_html.tpl b/xml/templates/message_templates/petition_sign_html.tpl index 6dfbaab34d57..53e38943f76c 100644 --- a/xml/templates/message_templates/petition_sign_html.tpl +++ b/xml/templates/message_templates/petition_sign_html.tpl @@ -1,3 +1,5 @@ +

{contact.email_greeting},

+

Thank you for signing {$petition.title}.

{include file="CRM/Campaign/Page/Petition/SocialNetwork.tpl" petition_id=$survey_id noscript=true emailMode=true} diff --git a/xml/templates/message_templates/petition_sign_subject.tpl b/xml/templates/message_templates/petition_sign_subject.tpl index 49edf1e89b5a..4b53e92119c6 100644 --- a/xml/templates/message_templates/petition_sign_subject.tpl +++ b/xml/templates/message_templates/petition_sign_subject.tpl @@ -1 +1 @@ -Thank you for signing {$petition.title} \ No newline at end of file +Thank you for signing {$petition.title}, {contact.display_name} diff --git a/xml/templates/message_templates/petition_sign_text.tpl b/xml/templates/message_templates/petition_sign_text.tpl index 8e8a555dfbf3..5dde4b8dceba 100644 --- a/xml/templates/message_templates/petition_sign_text.tpl +++ b/xml/templates/message_templates/petition_sign_text.tpl @@ -1 +1,3 @@ +{contact.email_greeting}, + Thank you for signing {$petition.title}. diff --git a/xml/templates/message_templates/pledge_acknowledge_html.tpl b/xml/templates/message_templates/pledge_acknowledge_html.tpl index c0727c407892..f0ec3e83be9d 100644 --- a/xml/templates/message_templates/pledge_acknowledge_html.tpl +++ b/xml/templates/message_templates/pledge_acknowledge_html.tpl @@ -21,7 +21,7 @@
-

{ts 1=$contact.display_name}dear %1{/ts},

+

{contact.email_greeting},

{ts}thank you for your generous pledge. please print this acknowledgment for your records.{/ts}
-

{ts 1=$contact.display_name}Dear %1{/ts},

+

{contact.email_greeting},

{ts 1=$next_payment|truncate:10:''|crmDate}This is a reminder that the next payment on your pledge is due on %1.{/ts}