From 16c5faa5db26149e5f1b7d3f45e3d5f2c24bf422 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Tue, 11 Apr 2023 14:59:03 -0400 Subject: [PATCH] Bump minimum upgradable version to 4.7.32 --- CRM/Core/BAO/CustomGroup.php | 11 +- .../civicrm_msg_template.tpl | 16 - .../event_offline_receipt_html.tpl | 513 ------ .../event_offline_receipt_text.tpl | 292 ---- .../event_online_receipt_html.tpl | 514 ------ .../event_online_receipt_text.tpl | 302 ---- .../event_registration_receipt_html.tpl | 175 --- .../event_registration_receipt_text.tpl | 80 - .../participant_cancelled_html.tpl | 129 -- .../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_text.tpl | 45 - .../payment_or_refund_notification_html.tpl | 255 --- .../payment_or_refund_notification_text.tpl | 104 -- .../civicrm_msg_template.tpl | 16 - .../contribution_recurring_notify_html.tpl | 129 -- .../contribution_recurring_notify_text.tpl | 54 - .../membership_online_receipt_html.tpl | 556 ------- .../membership_online_receipt_text.tpl | 241 --- .../civicrm_msg_template.tpl | 16 - .../contribution_invoice_receipt_html.tpl | 458 ------ .../payment_or_refund_notification_html.tpl | 253 --- .../payment_or_refund_notification_text.tpl | 102 -- .../civicrm_msg_template.tpl | 16 - .../contribution_invoice_receipt_html.tpl | 458 ------ .../civicrm_msg_template.tpl | 16 - .../event_offline_receipt_html.tpl | 527 ------- .../event_offline_receipt_text.tpl | 304 ---- .../event_online_receipt_html.tpl | 526 ------- .../event_online_receipt_text.tpl | 311 ---- .../civicrm_msg_template.tpl | 16 - .../event_online_receipt_html.tpl | 528 ------- .../event_online_receipt_text.tpl | 314 ---- .../civicrm_msg_template.tpl | 16 - .../contribution_invoice_receipt_html.tpl | 433 ----- .../pcp_owner_notify_html.tpl | 27 - .../pcp_owner_notify_text.tpl | 20 - .../civicrm_msg_template.tpl | 56 - .../event_online_receipt_html.tpl | 526 ------- .../event_online_receipt_text.tpl | 311 ---- .../participant_confirm_html.tpl | 201 --- .../participant_confirm_text.tpl | 93 -- .../participant_transferred_html.tpl | 146 -- .../participant_transferred_subject.tpl | 1 - .../participant_transferred_text.tpl | 57 - .../civicrm_msg_template.tpl | 16 - .../contribution_invoice_receipt_html.tpl | 437 ------ CRM/Upgrade/Form.php | 2 +- CRM/Upgrade/Incremental/php/FourSeven.php | 1394 ----------------- CRM/Upgrade/Incremental/sql/4.7.0.mysql.tpl | 1 - CRM/Upgrade/Incremental/sql/4.7.1.mysql.tpl | 1 - CRM/Upgrade/Incremental/sql/4.7.10.mysql.tpl | 23 - CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl | 279 ---- CRM/Upgrade/Incremental/sql/4.7.12.mysql.tpl | 10 - CRM/Upgrade/Incremental/sql/4.7.13.mysql.tpl | 24 - CRM/Upgrade/Incremental/sql/4.7.14.mysql.tpl | 19 - CRM/Upgrade/Incremental/sql/4.7.15.mysql.tpl | 4 - CRM/Upgrade/Incremental/sql/4.7.16.mysql.tpl | 28 - CRM/Upgrade/Incremental/sql/4.7.17.mysql.tpl | 14 - CRM/Upgrade/Incremental/sql/4.7.18.mysql.tpl | 79 - CRM/Upgrade/Incremental/sql/4.7.19.mysql.tpl | 55 - CRM/Upgrade/Incremental/sql/4.7.2.mysql.tpl | 1 - CRM/Upgrade/Incremental/sql/4.7.20.mysql.tpl | 10 - CRM/Upgrade/Incremental/sql/4.7.21.mysql.tpl | 12 - CRM/Upgrade/Incremental/sql/4.7.22.mysql.tpl | 1 - CRM/Upgrade/Incremental/sql/4.7.23.mysql.tpl | 43 - CRM/Upgrade/Incremental/sql/4.7.24.mysql.tpl | 12 - CRM/Upgrade/Incremental/sql/4.7.25.mysql.tpl | 22 - CRM/Upgrade/Incremental/sql/4.7.26.mysql.tpl | 1 - CRM/Upgrade/Incremental/sql/4.7.27.mysql.tpl | 1 - CRM/Upgrade/Incremental/sql/4.7.28.mysql.tpl | 56 - CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl | 1 - CRM/Upgrade/Incremental/sql/4.7.3.mysql.tpl | 1 - CRM/Upgrade/Incremental/sql/4.7.30.mysql.tpl | 16 - CRM/Upgrade/Incremental/sql/4.7.31.mysql.tpl | 12 - CRM/Upgrade/Incremental/sql/4.7.32.mysql.tpl | 14 - CRM/Upgrade/Incremental/sql/4.7.4.mysql.tpl | 1 - CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl | 33 - CRM/Upgrade/Incremental/sql/4.7.6.mysql.tpl | 1 - CRM/Upgrade/Incremental/sql/4.7.7.mysql.tpl | 76 - CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl | 17 - CRM/Upgrade/Incremental/sql/4.7.9.mysql.tpl | 44 - .../Incremental/sql/4.7.alpha1.mysql.tpl | 187 --- .../Incremental/sql/4.7.alpha2.mysql.tpl | 25 - .../Incremental/sql/4.7.alpha3.mysql.tpl | 6 - .../Incremental/sql/4.7.alpha4.mysql.tpl | 1 - .../Incremental/sql/4.7.alpha5.mysql.tpl | 1 - .../Incremental/sql/4.7.beta1.mysql.tpl | 49 - .../Incremental/sql/4.7.beta2.mysql.tpl | 23 - .../Incremental/sql/4.7.beta3.mysql.tpl | 8 - .../Incremental/sql/4.7.beta4.mysql.tpl | 8 - .../Incremental/sql/4.7.beta5.mysql.tpl | 1 - .../Incremental/sql/4.7.beta6.mysql.tpl | 18 - .../Incremental/sql/4.7.beta7.mysql.tpl | 7 - .../Incremental/sql/4.7.beta8.mysql.tpl | 12 - 99 files changed, 3 insertions(+), 12892 deletions(-) delete mode 100644 CRM/Upgrade/4.7.11.msg_template/civicrm_msg_template.tpl delete mode 100644 CRM/Upgrade/4.7.11.msg_template/message_templates/event_offline_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.7.11.msg_template/message_templates/event_offline_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.7.11.msg_template/message_templates/event_online_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.7.11.msg_template/message_templates/event_online_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.7.11.msg_template/message_templates/event_registration_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.7.11.msg_template/message_templates/event_registration_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.7.11.msg_template/message_templates/participant_cancelled_html.tpl delete mode 100644 CRM/Upgrade/4.7.11.msg_template/message_templates/participant_cancelled_text.tpl delete mode 100644 CRM/Upgrade/4.7.11.msg_template/message_templates/participant_confirm_html.tpl delete mode 100644 CRM/Upgrade/4.7.11.msg_template/message_templates/participant_confirm_text.tpl delete mode 100644 CRM/Upgrade/4.7.11.msg_template/message_templates/participant_expired_html.tpl delete mode 100644 CRM/Upgrade/4.7.11.msg_template/message_templates/participant_expired_text.tpl delete mode 100644 CRM/Upgrade/4.7.11.msg_template/message_templates/participant_transferred_html.tpl delete mode 100644 CRM/Upgrade/4.7.11.msg_template/message_templates/participant_transferred_text.tpl delete mode 100644 CRM/Upgrade/4.7.11.msg_template/message_templates/payment_or_refund_notification_html.tpl delete mode 100644 CRM/Upgrade/4.7.11.msg_template/message_templates/payment_or_refund_notification_text.tpl delete mode 100644 CRM/Upgrade/4.7.14.msg_template/civicrm_msg_template.tpl delete mode 100644 CRM/Upgrade/4.7.14.msg_template/message_templates/contribution_recurring_notify_html.tpl delete mode 100644 CRM/Upgrade/4.7.14.msg_template/message_templates/contribution_recurring_notify_text.tpl delete mode 100644 CRM/Upgrade/4.7.14.msg_template/message_templates/membership_online_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.7.14.msg_template/message_templates/membership_online_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.7.19.msg_template/civicrm_msg_template.tpl delete mode 100644 CRM/Upgrade/4.7.19.msg_template/message_templates/contribution_invoice_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.7.19.msg_template/message_templates/payment_or_refund_notification_html.tpl delete mode 100644 CRM/Upgrade/4.7.19.msg_template/message_templates/payment_or_refund_notification_text.tpl delete mode 100644 CRM/Upgrade/4.7.23.msg_template/civicrm_msg_template.tpl delete mode 100644 CRM/Upgrade/4.7.23.msg_template/message_templates/contribution_invoice_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.7.4.msg_template/civicrm_msg_template.tpl delete mode 100644 CRM/Upgrade/4.7.4.msg_template/message_templates/event_offline_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.7.4.msg_template/message_templates/event_offline_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.7.4.msg_template/message_templates/event_online_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.7.4.msg_template/message_templates/event_online_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.7.5.msg_template/civicrm_msg_template.tpl delete mode 100644 CRM/Upgrade/4.7.5.msg_template/message_templates/event_online_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.7.5.msg_template/message_templates/event_online_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.7.alpha1.msg_template/civicrm_msg_template.tpl delete mode 100644 CRM/Upgrade/4.7.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.7.alpha1.msg_template/message_templates/pcp_owner_notify_html.tpl delete mode 100644 CRM/Upgrade/4.7.alpha1.msg_template/message_templates/pcp_owner_notify_text.tpl delete mode 100644 CRM/Upgrade/4.7.beta1.msg_template/civicrm_msg_template.tpl delete mode 100644 CRM/Upgrade/4.7.beta1.msg_template/message_templates/event_online_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.7.beta1.msg_template/message_templates/event_online_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.7.beta1.msg_template/message_templates/participant_confirm_html.tpl delete mode 100644 CRM/Upgrade/4.7.beta1.msg_template/message_templates/participant_confirm_text.tpl delete mode 100644 CRM/Upgrade/4.7.beta1.msg_template/message_templates/participant_transferred_html.tpl delete mode 100644 CRM/Upgrade/4.7.beta1.msg_template/message_templates/participant_transferred_subject.tpl delete mode 100644 CRM/Upgrade/4.7.beta1.msg_template/message_templates/participant_transferred_text.tpl delete mode 100644 CRM/Upgrade/4.7.beta8.msg_template/civicrm_msg_template.tpl delete mode 100644 CRM/Upgrade/4.7.beta8.msg_template/message_templates/contribution_invoice_receipt_html.tpl delete mode 100644 CRM/Upgrade/Incremental/php/FourSeven.php delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.0.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.1.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.10.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.12.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.13.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.14.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.15.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.16.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.17.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.18.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.19.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.2.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.20.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.21.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.22.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.23.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.24.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.25.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.26.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.27.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.28.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.3.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.30.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.31.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.32.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.4.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.6.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.7.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.9.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.alpha2.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.alpha3.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.alpha4.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.alpha5.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.beta1.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.beta2.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.beta3.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.beta4.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.beta5.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.beta6.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.beta7.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.7.beta8.mysql.tpl diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php index 586b148d6f..625316815d 100644 --- a/CRM/Core/BAO/CustomGroup.php +++ b/CRM/Core/BAO/CustomGroup.php @@ -105,12 +105,8 @@ class CRM_Core_BAO_CustomGroup extends CRM_Core_DAO_CustomGroup implements \Civi 'icon', 'extends_entity_column_id', 'extends', + 'is_public', ]; - $current_db_version = CRM_Core_BAO_Domain::version(); - $is_public_version = version_compare($current_db_version, '4.7.19', '>='); - if ($is_public_version) { - $fields[] = 'is_public'; - } foreach ($fields as $field) { if (isset($params[$field])) { $group->$field = $params[$field]; @@ -427,14 +423,11 @@ class CRM_Core_BAO_CustomGroup extends CRM_Core_DAO_CustomGroup implements \Civi 'extends_entity_column_id', 'extends_entity_column_value', 'max_multiple', + 'is_public', ], ]; $current_db_version = CRM_Core_BAO_Domain::version(); - $is_public_version = version_compare($current_db_version, '4.7.19', '>='); $serialize_version = version_compare($current_db_version, '5.27.alpha1', '>='); - if ($is_public_version) { - $tableData['custom_group'][] = 'is_public'; - } if ($serialize_version) { $tableData['custom_field'][] = 'serialize'; } diff --git a/CRM/Upgrade/4.7.11.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.7.11.msg_template/civicrm_msg_template.tpl deleted file mode 100644 index 3db538690e..0000000000 --- a/CRM/Upgrade/4.7.11.msg_template/civicrm_msg_template.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{php} - $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.7.11.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/4.7.11.msg_template/message_templates/event_offline_receipt_html.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/event_offline_receipt_html.tpl deleted file mode 100644 index 58ff6f1fd1..0000000000 --- a/CRM/Upgrade/4.7.11.msg_template/message_templates/event_offline_receipt_html.tpl +++ /dev/null @@ -1,513 +0,0 @@ - - - - - - - - -{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 $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)} -

{$event.confirm_email_text|htmlize}

- {/if} - - {if $isOnWaitlist} -

{ts}You have been added to the WAIT LIST for this event.{/ts}

- {if $isPrimary} -

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

- {/if} - {elseif $isRequireApproval} -

{ts}Your registration has been submitted.{/ts}

- {if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

- {/if} - {elseif $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 $event.participant_role neq 'Attendee' and $defaultRole} - - - - - {/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} - - {if $event.is_public} - - - - {/if} - - {if $email} - - - - - - - {/if} - - - {if $event.is_monetary} - - - - - - {if $lineItem} - {foreach from=$lineItem item=value key=priceset} - {if $value neq 'skip'} - {if $isPrimary} - {if $lineItem|@count GT 1} {* Header for multi participant registration cases. *} - - - - {/if} - {/if} - - - - {/if} - {/foreach} - {if $dataArray} - - - - - {foreach from=$dataArray item=value key=priceset} - - {if $priceset || $priceset == 0} - - - {else} - - - {/if} - - {/foreach} - {/if} - {/if} - - {if $amount && !$lineItem} - {foreach from=$amount item=amnt key=level} - - - - {/foreach} - {/if} - {if $totalTaxAmount} - - - - - {/if} - {if $isPrimary} - - - - - {if $balanceAmount} - - - - - {/if} - {if $pricesetFieldsCount } - - - - - {/if} - {if $is_pay_later} - - - - {/if} - - {if $register_date} - - - - - {/if} - - {if $receive_date} - - - - - {/if} - - {if $financialTypeName} - - - - - {/if} - - {if $trxn_id} - - - - - {/if} - - {if $paidBy} - - - - - {/if} - - {if $checkNumber} - - - - - {/if} - - {if $contributeMode ne 'notify' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} - - - - - - - {/if} - - {if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} - - - - - - - {/if} - - {/if} - - {/if} {* End of conditional section for Paid events *} - - {if $customPre} - - - - {foreach from=$customPre item=value key=customName} - {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - - - - - {/if} - {/foreach} - {/if} - - {if $customPost} - - - - {foreach from=$customPost item=value key=customName} - {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - - - - - {/if} - {/foreach} - {/if} - - {if $customProfile} - {foreach from=$customProfile item=value key=customName} - - - - {foreach from=$value item=val key=field} - {if $field eq 'additionalCustomPre' or $field eq 'additionalCustomPost'} - - - - {foreach from=$val item=v key=f} - - - - - {/foreach} - {/if} - {/foreach} - {/foreach} - {/if} - - {if $customGroup} - {foreach from=$customGroup item=value key=customName} - - - - {foreach from=$value item=v key=n} - - - - - {/foreach} - {/foreach} - {/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} - - {$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} -
- {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} -
- {$email} -
- {$event.fee_label} -
- {ts 1=$priceset+1}Participant %1{/ts} -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - {if $dataArray} - - - - {/if} - - {if $pricesetFieldsCount }{/if} - - {foreach from=$value item=line} - - - - - {if $dataArray} - - {if $line.tax_rate != "" || $line.tax_amount != ""} - - - {else} - - - {/if} - {/if} - - {if $pricesetFieldsCount } - - {/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}{ts}Total Participants{/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} - - {$line.unit_price*$line.qty|crmMoney} - - {$line.tax_rate|string_format:"%.2f"}% - - {$line.tax_amount|crmMoney} - - {$line.line_total+$line.tax_amount|crmMoney} - - {$line.participant_count} -
-
- {ts}Amount Before Tax:{/ts} - - {$totalAmount-$totalTaxAmount|crmMoney} -
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}No{/ts} {$taxTerm} {$value|crmMoney:$currency}
- {$amnt.amount|crmMoney} {$amnt.label} -
- {ts}Total Tax Amount{/ts} - - {$totalTaxAmount|crmMoney:$currency} -
- {if $balanceAmount} - {ts}Total Paid{/ts} - {else} - {ts}Total Amount{/ts} - {/if} - - {$totalAmount|crmMoney} {if $hookDiscount.message}({$hookDiscount.message}){/if} -
- {ts}Balance{/ts} - - {$balanceAmount|crmMoney} -
- {ts}Total Participants{/ts} - {assign var="count" value= 0} - {foreach from=$lineItem item=pcount} - {assign var="lineItemCount" value=0} - {if $pcount neq 'skip'} - {foreach from=$pcount item=p_count} - {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} - {/foreach} - {if $lineItemCount < 1 } - assign var="lineItemCount" value=1} - {/if} - {assign var="count" value=$count+$lineItemCount} - {/if} - {/foreach} - {$count} -
- {$pay_later_receipt} -
- {ts}Registration Date{/ts} - - {$register_date|crmDate} -
- {ts}Transaction Date{/ts} - - {$receive_date|crmDate} -
- {ts}Financial Type{/ts} - - {$financialTypeName} -
- {ts}Transaction #{/ts} - - {$trxn_id} -
- {ts}Paid By{/ts} - - {$paidBy} -
- {ts}Check Number{/ts} - - {$checkNumber} -
- {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} -
- {$customPre_grouptitle} -
- {$customName} - - {$value} -
- {$customPost_grouptitle} -
- {$customName} - - {$value} -
- {ts 1=$customName+1}Participant Information - Participant %1{/ts} -
- {if $field eq 'additionalCustomPre'} - {$additionalCustomPre_grouptitle} - {else} - {$additionalCustomPost_grouptitle} - {/if} -
- {$f} - - {$v} -
- {$customName} -
- {$n} - - {$v} -
-
-
- - - diff --git a/CRM/Upgrade/4.7.11.msg_template/message_templates/event_offline_receipt_text.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/event_offline_receipt_text.tpl deleted file mode 100644 index ceb48e0c20..0000000000 --- a/CRM/Upgrade/4.7.11.msg_template/message_templates/event_offline_receipt_text.tpl +++ /dev/null @@ -1,292 +0,0 @@ -{contact.email_greeting} -{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)} -{$event.confirm_email_text} -{/if} - -{if $isOnWaitlist} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}You have been added to the WAIT LIST for this event.{/ts} - -{if $isPrimary} -{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} - -{/if} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{elseif $isRequireApproval} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Your registration has been submitted.{/ts} - -{if $isPrimary} -{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} - -{/if} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{elseif $is_pay_later} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$pay_later_receipt} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{else} - -{ts}Please print this confirmation for your records.{/ts} -{/if} - - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Event Information and Location{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$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 $event.participant_role neq 'Attendee' and $defaultRole} -{ts}Participant Role{/ts}: {$event.participant_role} -{/if} - -{if $isShowLocation} -{$location.address.1.display|strip_tags:false} -{/if}{*End of isShowLocation condition*} - -{if $location.phone.1.phone || $location.email.1.email} - -{ts}Event Contacts:{/ts} -{foreach from=$location.phone item=phone} -{if $phone.phone} - -{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if} -{/foreach} -{foreach from=$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 $email} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Registered Email{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$email} -{/if} -{if $event.is_monetary} {* This section for Paid events only.*} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$event.fee_label} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{if $lineItem}{foreach from=$lineItem item=value key=priceset} - -{if $value neq 'skip'} -{if $isPrimary} -{if $lineItem|@count GT 1} {* Header for multi participant registration cases. *} -{ts 1=$priceset+1}Participant %1{/ts} -{/if} -{/if} ----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{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} -{capture assign=ts_participant_total}{if $pricesetFieldsCount }{ts}Total Participants{/ts}{/if}{/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|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {/if} {$ts_total|string_format:"%10s"} {$ts_participant_total|string_format:"%10s"} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{foreach from=$value item=line} -{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if} -{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|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|string_format:"%10s"} {$ts_participant_count|string_format:"%10s"} -{/foreach} -{/if} -{/foreach} - -{if $dataArray} -{ts}Amount before Tax{/ts}: {$totalAmount-$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 $amount && !$lineItem} -{foreach from=$amount item=amnt key=level}{$amnt.amount|crmMoney} {$amnt.label} -{/foreach} -{/if} - -{if $totalTaxAmount} -{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency} -{/if} -{if $isPrimary} - -{if $balanceAmount}{ts}Total Paid{/ts}{else}{ts}Total Amount{/ts}{/if}: {$totalAmount|crmMoney} {if $hookDiscount.message}({$hookDiscount.message}){/if} - -{if $balanceAmount} -{ts}Balance{/ts}: {$balanceAmount|crmMoney} -{/if} - -{if $pricesetFieldsCount } - {assign var="count" value= 0} - {foreach from=$lineItem item=pcount} - {assign var="lineItemCount" value=0} - {if $pcount neq 'skip'} - {foreach from=$pcount item=p_count} - {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} - {/foreach} - {if $lineItemCount < 1 } - {assign var="lineItemCount" value=1} - {/if} - {assign var="count" value=$count+$lineItemCount} - {/if} - {/foreach} - -{ts}Total Participants{/ts}: {$count} -{/if} - -{if $is_pay_later } - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$pay_later_receipt} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{/if} - -{if $register_date} -{ts}Registration Date{/ts}: {$register_date|crmDate} -{/if} -{if $receive_date} -{ts}Transaction Date{/ts}: {$receive_date|crmDate} -{/if} -{if $financialTypeName} -{ts}Financial Type{/ts}: {$financialTypeName} -{/if} -{if $trxn_id} -{ts}Transaction #{/ts}: {$trxn_id} -{/if} -{if $paidBy} -{ts}Paid By{/ts}: {$paidBy} -{/if} -{if $checkNumber} -{ts}Check Number{/ts}: {$checkNumber} -{/if} -{if $contributeMode ne 'notify' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Billing Name and Address{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$billingName} -{$address} -{/if} - -{if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} -=========================================================== -{ts}Credit Card Information{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$credit_card_type} -{$credit_card_number} -{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} -{/if} -{/if} -{/if} {* End of conditional section for Paid events *} - -{if $customPre} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$customPre_grouptitle} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$customPre item=value key=customName} -{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} -{$customName}: {$value} -{/if} -{/foreach} -{/if} - -{if $customPost} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$customPost_grouptitle} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$customPost item=value key=customName} -{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} -{$customName}: {$value} -{/if} -{/foreach} -{/if} -{if $customProfile} - -{foreach from=$customProfile item=value key=customName} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts 1=$customName+1}Participant Information - Participant %1{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$value item=val key=field} -{if $field eq 'additionalCustomPre' or $field eq 'additionalCustomPost' } -{if $field eq 'additionalCustomPre' } -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{$additionalCustomPre_grouptitle} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{else} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{$additionalCustomPost_grouptitle} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{/if} -{foreach from=$val item=v key=f} -{$f}: {$v} -{/foreach} -{/if} -{/foreach} -{/foreach} -{/if} -{if $customGroup} -{foreach from=$customGroup item=value key=customName} -=========================================================={if $pricesetFieldsCount }===================={/if} - -{$customName} -=========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$value item=v key=n} -{$n}: {$v} -{/foreach} -{/foreach} -{/if} - - diff --git a/CRM/Upgrade/4.7.11.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/event_online_receipt_html.tpl deleted file mode 100644 index f7ebf3663e..0000000000 --- a/CRM/Upgrade/4.7.11.msg_template/message_templates/event_online_receipt_html.tpl +++ /dev/null @@ -1,514 +0,0 @@ - - - - - - - - -{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=tdfirstStyle}style="width: 180px; padding-bottom: 15px;"{/capture} -{capture assign=tdStyle}style="width: 100px;"{/capture} -{capture assign=participantTotal}style="margin: 0.5em 0 0.5em;padding: 0.5em;background-color: #999999;font-weight: bold;color: #FAFAFA;border-radius: 2px;"{/capture} - - -
- - - - - - - - - - - - - - - - {/if} - - -
-

{contact.email_greeting},

- - {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)} -

{$event.confirm_email_text|htmlize}

- - {else} -

{ts}Thank you for your participation.{/ts} - {if $participant_status}{ts 1=$participant_status}This letter is a confirmation that your registration has been received and your status has been updated to %1.{/ts} - {else}{if $isOnWaitlist}{ts}This letter is a confirmation that your registration has been received and your status has been updated to waitlisted.{/ts}{else}{ts}This letter is a confirmation that your registration has been received and your status has been updated to registered.{/ts}{/if}{/if}.

- - {/if} - -

- {if $isOnWaitlist} -

{ts}You have been added to the WAIT LIST for this event.{/ts}

- {if $isPrimary} -

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

- {/if} - {elseif $isRequireApproval} -

{ts}Your registration has been submitted.{/ts}

- {if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

- {/if} - {elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant} -

{$pay_later_receipt}

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

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

- {/if} - -
- - - - - - - - - - {if $conference_sessions} - - - - - - - {/if} - - {if $event.participant_role neq 'Attendee' and $defaultRole} - - - - - {/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} - - {if $event.is_public} - - - - {/if} - - {if $event.is_share} - - - - {/if} - {if $payer.name} - - - - - - - {/if} - {if $event.is_monetary} - - - - - - {if $lineItem} - {foreach from=$lineItem item=value key=priceset} - {if $value neq 'skip'} - {if $isPrimary} - {if $lineItem|@count GT 1} {* Header for multi participant registration cases. *} - - - - {/if} - {/if} - - - - {/if} - {/foreach} - {if $dataArray} - - - - - {foreach from=$dataArray item=value key=priceset} - - {if $priceset || $priceset == 0} - - - {else} - - - {/if} - - {/foreach} - {/if} - {/if} - - {if $amounts && !$lineItem} - {foreach from=$amounts item=amnt key=level} - - - - {/foreach} - {/if} - - {if $totalTaxAmount} - - - - - {/if} - {if $isPrimary} - - - - - {if $pricesetFieldsCount } - - - - {/if} - - {if $register_date} - - - - - {/if} - - {if $receive_date} - - - - - {/if} - - {if $financialTypeName} - - - - - {/if} - - {if $trxn_id} - - - - - {/if} - - {if $paidBy} - - - - - {/if} - - {if $checkNumber} - - - - - {/if} - - {if $contributeMode ne 'notify' and !$isAmountzero and (!$is_pay_later or $isBillingAddressRequiredForPayLater) and !$isOnWaitlist and !$isRequireApproval} - - - - - - - {/if} - - {if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} - - - - - - - {/if} - - {/if} - - {/if} {* End of conditional section for Paid events *} - - -{if $customPre} -{foreach from=$customPre item=customPr key=i} - - {foreach from=$customPr item=customValue key=customName} - {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - - - - - {/if} - {/foreach} -{/foreach} -{/if} - -{if $customPost} -{foreach from=$customPost item=customPos key=j} - - {foreach from=$customPos item=customValue key=customName} - {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - - - - -{/if} -{/foreach} -{/foreach} -{/if} - -{if $customProfile} -{foreach from=$customProfile.profile item=eachParticipant key=participantID} - - {foreach from=$eachParticipant item=eachProfile key=pid} - - {foreach from=$eachProfile item=val key=field} - {foreach from=$val item=v key=f} - - - {/foreach} - - {/foreach} -{/foreach} -{/foreach} -{/if} - - {if $customGroup} - {foreach from=$customGroup item=value key=customName} - - - - {foreach from=$value item=v key=n} - - - - - {/foreach} - {/foreach} - {/if} -
- {ts}Event Information and Location{/ts} -
- {$event.event_title}
- {$event.event_start_date|date_format:"%A"} {$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|date_format:"%A"} {$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} - - {$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} -
- {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} -
- {capture assign=eventUrl}{crmURL p='civicrm/event/info' q="id=`$event.id`&reset=1" a=true fe=1 h=1}{/capture} - {include file="CRM/common/SocialNetwork.tpl" emailMode=true url=$eventUrl title=$event.title pageURL=$eventUrl} -
- {ts}You were registered by:{/ts} -
- {$payer.name} -
- {$event.fee_label} -
- {ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info} -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - {if $dataArray} - - - - {/if} - - {if $pricesetFieldsCount }{/if} - - {foreach from=$value item=line} - - - - - {if $dataArray} - - {if $line.tax_rate != "" || $line.tax_amount != ""} - - - {else} - - - {/if} - {/if} - - {if $pricesetFieldsCount } {/if} - - {/foreach} - {if $individual} - - - - - - - {/if} -
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/ts}{ts}SubTotal{/ts}{ts}Tax Rate{/ts}{ts}Tax Amount{/ts}{ts}Total{/ts}{ts}Total Participants{/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} - - {$line.tax_rate|string_format:"%.2f"}% - - {$line.tax_amount|crmMoney} - - {$line.line_total+$line.tax_amount|crmMoney:$currency} - {$line.participant_count}
{ts}Participant Total{/ts}{$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney}{$individual.$priceset.totalTaxAmt|crmMoney}{$individual.$priceset.totalAmtWithTax|crmMoney}
-
- {ts} Amount Before Tax: {/ts} - - {$totalAmount-$totalTaxAmount|crmMoney} -
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}No{/ts} {$taxTerm} {$value|crmMoney:$currency}
- {$amnt.amount|crmMoney:$currency} {$amnt.label} -
- {ts}Total Tax Amount{/ts} - - {$totalTaxAmount|crmMoney:$currency} -
- {ts}Total Amount{/ts} - - {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if} -
- {ts}Total Participants{/ts} - {assign var="count" value= 0} - {foreach from=$lineItem item=pcount} - {assign var="lineItemCount" value=0} - {if $pcount neq 'skip'} - {foreach from=$pcount item=p_count} - {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} - {/foreach} - {if $lineItemCount < 1 } - {assign var="lineItemCount" value=1} - {/if} - {assign var="count" value=$count+$lineItemCount} - {/if} - {/foreach} - {$count} -
- {ts}Registration Date{/ts} - - {$register_date|crmDate} -
- {ts}Transaction Date{/ts} - - {$receive_date|crmDate} -
- {ts}Financial Type{/ts} - - {$financialTypeName} -
- {ts}Transaction #{/ts} - - {$trxn_id} -
- {ts}Paid By{/ts} - - {$paidBy} -
- {ts}Check Number{/ts} - - {$checkNumber} -
- {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} -
{$customPre_grouptitle.$i}
{$customName}{$customValue}
{$customPost_grouptitle.$j}
{$customName}{$customValue}
{ts 1=$participantID+2}Participant %1{/ts}
{$customProfile.title.$pid}
{$field}{$v}
- {$customName} -
- {$n} - - {$v} -
- {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}Click here to transfer or cancel your registration.{/ts} -
-
- - - diff --git a/CRM/Upgrade/4.7.11.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/event_online_receipt_text.tpl deleted file mode 100644 index b0233b41ea..0000000000 --- a/CRM/Upgrade/4.7.11.msg_template/message_templates/event_online_receipt_text.tpl +++ /dev/null @@ -1,302 +0,0 @@ -{contact.email_greeting}, - -{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)} -{$event.confirm_email_text} - -{else} - {ts}Thank you for your participation.{/ts} - {if $participant_status}{ts 1=$participant_status}This letter is a confirmation that your registration has been received and your status has been updated to %1.{/ts} - {else}{if $isOnWaitlist}{ts}This letter is a confirmation that your registration has been received and your status has been updated to waitlisted.{/ts}{else}{ts}This letter is a confirmation that your registration has been received and your status has been updated to registered.{/ts}{/if} - {/if}. - -{/if} - -{if $isOnWaitlist} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}You have been added to the WAIT LIST for this event.{/ts} - -{if $isPrimary} -{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} -{/if} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{elseif $isRequireApproval} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Your registration has been submitted.{/ts} - -{if $isPrimary} -{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} - -{/if} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$pay_later_receipt} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{else} - -{ts}Please print this confirmation for your records.{/ts} -{/if} - - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Event Information and Location{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$event.event_title} -{$event.event_start_date|date_format:"%A"} {$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|date_format:"%A"} {$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} - -{if $event.participant_role neq 'Attendee' and $defaultRole} -{ts}Participant Role{/ts}: {$event.participant_role} -{/if} - -{if $isShowLocation} -{$location.address.1.display|strip_tags:false} -{/if}{*End of isShowLocation condition*} - -{if $location.phone.1.phone || $location.email.1.email} - -{ts}Event Contacts:{/ts} -{foreach from=$location.phone item=phone} -{if $phone.phone} - -{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if} -{/foreach} -{foreach from=$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 $payer.name} -You were registered by: {$payer.name} -{/if} -{if $event.is_monetary} {* This section for Paid events only.*} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$event.fee_label} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{if $lineItem}{foreach from=$lineItem item=value key=priceset} - -{if $value neq 'skip'} -{if $isPrimary} -{if $lineItem|@count GT 1} {* Header for multi participant registration cases. *} -{ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info} - -{/if} -{/if} ------------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if} - -{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} -{if $pricesetFieldsCount }{capture assign=ts_participant_total}{ts}Total Participants{/ts}{/capture}{/if} -{$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {if $dataArray} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {/if} {$ts_total|string_format:"%10s"} {$ts_participant_total|string_format:"%10s"} ------------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if} - -{foreach from=$value item=line} -{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if} -{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"}{$ts_participant_count|string_format:"%10s"} -{/foreach} ----------------------------------------------------------------------------------------------------------------- -{if $individual}{ts}Participant Total{/ts} {$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:"%29s"} {$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:"%33s"} {$individual.$priceset.totalAmtWithTax|crmMoney:$currency|string_format:"%12s"}{/if} -{/if} -{""|string_format:"%120s"} -{/foreach} -{""|string_format:"%120s"} - -{if $dataArray} -{ts}Amount before Tax{/ts}: {$totalAmount-$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 $amounts && !$lineItem} -{foreach from=$amounts item=amnt key=level}{$amnt.amount|crmMoney:$currency} {$amnt.label} -{/foreach} -{/if} - -{if $totalTaxAmount} -{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency} -{/if} -{if $isPrimary } - -{ts}Total Amount{/ts}: {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if} - -{if $pricesetFieldsCount } - {assign var="count" value= 0} - {foreach from=$lineItem item=pcount} - {assign var="lineItemCount" value=0} - {if $pcount neq 'skip'} - {foreach from=$pcount item=p_count} - {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} - {/foreach} - {if $lineItemCount < 1 } - {assign var="lineItemCount" value=1} - {/if} - {assign var="count" value=$count+$lineItemCount} - {/if} - {/foreach} - -{ts}Total Participants{/ts}: {$count} -{/if} - -{if $register_date} -{ts}Registration Date{/ts}: {$register_date|crmDate} -{/if} -{if $receive_date} -{ts}Transaction Date{/ts}: {$receive_date|crmDate} -{/if} -{if $financialTypeName} -{ts}Financial Type{/ts}: {$financialTypeName} -{/if} -{if $trxn_id} -{ts}Transaction #{/ts}: {$trxn_id} -{/if} -{if $paidBy} -{ts}Paid By{/ts}: {$paidBy} -{/if} -{if $checkNumber} -{ts}Check Number{/ts}: {$checkNumber} -{/if} -{if $contributeMode ne 'notify' and !$isAmountzero and (!$is_pay_later or $isBillingAddressRequiredForPayLater) and !$isOnWaitlist and !$isRequireApproval} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Billing Name and Address{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$billingName} -{$address} -{/if} - -{if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Credit Card Information{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$credit_card_type} -{$credit_card_number} -{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} -{/if} -{/if} -{/if} {* End of conditional section for Paid events *} - -{if $customPre} -{foreach from=$customPre item=customPr key=i} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$customPre_grouptitle.$i} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$customPr item=customValue key=customName} -{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - {$customName}: {$customValue} -{/if} -{/foreach} -{/foreach} -{/if} - -{if $customPost} -{foreach from=$customPost item=customPos key=j} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$customPost_grouptitle.$j} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$customPos item=customValue key=customName} -{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - {$customName}: {$customValue} -{/if} -{/foreach} -{/foreach} -{/if} -{if $customProfile} - -{foreach from=$customProfile.profile item=eachParticipant key=participantID} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts 1=$participantID+2}Participant Information - Participant %1{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$eachParticipant item=eachProfile key=pid} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{$customProfile.title.$pid} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{foreach from=$eachProfile item=val key=field} -{foreach from=$val item=v key=f} -{$field}: {$v} -{/foreach} -{/foreach} -{/foreach} -{/foreach} -{/if} -{if $customGroup} -{foreach from=$customGroup item=value key=customName} -=========================================================={if $pricesetFieldsCount }===================={/if} - -{$customName} -=========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$value item=v key=n} -{$n}: {$v} -{/foreach} -{/foreach} -{/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} diff --git a/CRM/Upgrade/4.7.11.msg_template/message_templates/event_registration_receipt_html.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/event_registration_receipt_html.tpl deleted file mode 100644 index 3436a19034..0000000000 --- a/CRM/Upgrade/4.7.11.msg_template/message_templates/event_registration_receipt_html.tpl +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - {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} - -

Dear {contact.display_name},

- {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/4.7.11.msg_template/message_templates/event_registration_receipt_text.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/event_registration_receipt_text.tpl deleted file mode 100644 index 695b53d604..0000000000 --- a/CRM/Upgrade/4.7.11.msg_template/message_templates/event_registration_receipt_text.tpl +++ /dev/null @@ -1,80 +0,0 @@ -Dear {contact.display_name}, -{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/4.7.11.msg_template/message_templates/participant_cancelled_html.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_cancelled_html.tpl deleted file mode 100644 index 4a882c1259..0000000000 --- a/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_cancelled_html.tpl +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - -{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} - -
- - - - - - - - - - - - - - - - - - - -
-

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

-

{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/4.7.11.msg_template/message_templates/participant_cancelled_text.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_cancelled_text.tpl deleted file mode 100644 index b4430b33d1..0000000000 --- a/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_cancelled_text.tpl +++ /dev/null @@ -1,47 +0,0 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, - -{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/4.7.11.msg_template/message_templates/participant_confirm_html.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_confirm_html.tpl deleted file mode 100644 index ca6816d166..0000000000 --- a/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_confirm_html.tpl +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - - - -{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} - - - - -
-

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

-
- {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/4.7.11.msg_template/message_templates/participant_confirm_text.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_confirm_text.tpl deleted file mode 100644 index e8f90132b5..0000000000 --- a/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_confirm_text.tpl +++ /dev/null @@ -1,81 +0,0 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, -{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/4.7.11.msg_template/message_templates/participant_expired_html.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_expired_html.tpl deleted file mode 100644 index a11ff72685..0000000000 --- a/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_expired_html.tpl +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - -{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} - -
- - - - - - - - - - - - - - - - - - - -
-

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

-

{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/4.7.11.msg_template/message_templates/participant_expired_text.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_expired_text.tpl deleted file mode 100644 index be649c11da..0000000000 --- a/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_expired_text.tpl +++ /dev/null @@ -1,51 +0,0 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, - -{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/4.7.11.msg_template/message_templates/participant_transferred_html.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_transferred_html.tpl deleted file mode 100644 index 26cbf37e15..0000000000 --- a/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_transferred_html.tpl +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - -{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} - -
- - - - - - - - - - - - - - - - - - - -
-

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

-

{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/4.7.11.msg_template/message_templates/participant_transferred_text.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_transferred_text.tpl deleted file mode 100644 index aeac8a7ba1..0000000000 --- a/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_transferred_text.tpl +++ /dev/null @@ -1,45 +0,0 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, - -{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/4.7.11.msg_template/message_templates/payment_or_refund_notification_html.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/payment_or_refund_notification_html.tpl deleted file mode 100644 index 6d6efeb52d..0000000000 --- a/CRM/Upgrade/4.7.11.msg_template/message_templates/payment_or_refund_notification_html.tpl +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - - -{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} - -

Dear {$contactDisplayName}

-
- - - - - - - - - - - - - - - - - - -
- {if $paymentConfig.confirm_email_text} -

{$paymentConfig.confirm_email_text|htmlize}

- {elseif $isRefund} -

{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 Fees{/ts} - - {$totalAmount|crmMoney} -
- {ts}You Paid{/ts} - - {$totalPaid|crmMoney} -
- {ts}Refund Amount{/ts} - - {$refundAmount|crmMoney} - -
{ts}Payment Details{/ts}
- {ts}{if $component eq 'event'}Total Fees{/if}{/ts} - - {$totalAmount|crmMoney} -
- {ts}This Payment Amount{/ts} - - {$paymentAmount|crmMoney} -
- {ts}Balance Owed{/ts} - - {$amountOwed|crmMoney} -
- {ts}Thank-you. This completes your payment for {if $component eq 'event'}{$event.event_title}{/if}.{/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 neq 'Attendee' and $defaultRole} - - - - - {/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/4.7.11.msg_template/message_templates/payment_or_refund_notification_text.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/payment_or_refund_notification_text.tpl deleted file mode 100644 index a09ad9e162..0000000000 --- a/CRM/Upgrade/4.7.11.msg_template/message_templates/payment_or_refund_notification_text.tpl +++ /dev/null @@ -1,104 +0,0 @@ -Dear {$contactDisplayName} -{if $paymentConfig.confirm_email_text} -{$paymentConfig.confirm_email_text} -{elseif $isRefund} -{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} -=============================================================================== - -{ts}Refund Details{/ts} - -=============================================================================== -{ts}Total Fees{/ts}: {$totalAmount|crmMoney} -{ts}You Paid{/ts}: {$totalPaid|crmMoney} ------------------------------------------------------------------------------------- -{ts}Refund Amount{/ts}: {$refundAmount|crmMoney} - -{else} -=============================================================================== - -{ts}Payment Details{/ts} - -=============================================================================== -{ts}Total Fees{/ts}: {$totalAmount|crmMoney} -{ts}This Payment Amount{/ts}: {$paymentAmount|crmMoney} ------------------------------------------------------------------------------------- -{ts}Balance Owed{/ts}: {$amountOwed|crmMoney} {* This will be zero after final payment. *} - -{if $paymentsComplete} - -{ts}Thank-you. This completes your payment for {/ts}{if $component eq 'event'}{$event.event_title}{/if}. -{/if} -{/if} -{if $receive_date} -{ts}Transaction Date{/ts}: {$receive_date|crmDate} -{/if} -{if $trxn_id} -{ts}Transaction #{/ts}: {$trxn_id} -{/if} -{if $paidBy} -{ts}Paid By{/ts}: {$paidBy} -{/if} -{if $checkNumber} -{ts}Check Number{/ts}: {$checkNumber} -{/if} -{if $contributeMode eq 'direct' and !$isAmountzero} - -=============================================================================== - -{ts}Billing Name and Address{/ts} - -=============================================================================== - -{$billingName} -{$address} -{/if} - -{if $contributeMode eq 'direct' and !$isAmountzero} -=========================================================== -{ts}Credit Card Information{/ts} - -=============================================================================== - -{$credit_card_type} -{$credit_card_number} -{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} -{/if} -{if $component eq 'event'} -=============================================================================== - -{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 $event.participant_role neq 'Attendee' and $defaultRole} -{ts}Participant Role{/ts}: {$event.participant_role} -{/if} - -{if $isShowLocation} -{$location.address.1.display|strip_tags:false} -{/if}{*End of isShowLocation condition*} - -{if $location.phone.1.phone || $location.email.1.email} - -{ts}Event Contacts:{/ts} -{foreach from=$location.phone item=phone} -{if $phone.phone} - -{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if} -{/foreach} -{foreach from=$location.email item=eventEmail} -{if $eventEmail.email} - -{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach} -{/if} -{/if} diff --git a/CRM/Upgrade/4.7.14.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.7.14.msg_template/civicrm_msg_template.tpl deleted file mode 100644 index a0a12e3b54..0000000000 --- a/CRM/Upgrade/4.7.14.msg_template/civicrm_msg_template.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{php} - $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.7.14.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/4.7.14.msg_template/message_templates/contribution_recurring_notify_html.tpl b/CRM/Upgrade/4.7.14.msg_template/message_templates/contribution_recurring_notify_html.tpl deleted file mode 100644 index 3ed5eb713e..0000000000 --- a/CRM/Upgrade/4.7.14.msg_template/message_templates/contribution_recurring_notify_html.tpl +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - -{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} - -
-

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

-
 
-

{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/4.7.14.msg_template/message_templates/contribution_recurring_notify_text.tpl b/CRM/Upgrade/4.7.14.msg_template/message_templates/contribution_recurring_notify_text.tpl deleted file mode 100644 index 46aa380a37..0000000000 --- a/CRM/Upgrade/4.7.14.msg_template/message_templates/contribution_recurring_notify_text.tpl +++ /dev/null @@ -1,54 +0,0 @@ -{ts 1=$displayName}Dear %1{/ts}, - -{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/4.7.14.msg_template/message_templates/membership_online_receipt_html.tpl b/CRM/Upgrade/4.7.14.msg_template/message_templates/membership_online_receipt_html.tpl deleted file mode 100644 index d10ce575fa..0000000000 --- a/CRM/Upgrade/4.7.14.msg_template/message_templates/membership_online_receipt_html.tpl +++ /dev/null @@ -1,556 +0,0 @@ - - - - - - - - -{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 $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/4.7.14.msg_template/message_templates/membership_online_receipt_text.tpl b/CRM/Upgrade/4.7.14.msg_template/message_templates/membership_online_receipt_text.tpl deleted file mode 100644 index aebd6d484e..0000000000 --- a/CRM/Upgrade/4.7.14.msg_template/message_templates/membership_online_receipt_text.tpl +++ /dev/null @@ -1,241 +0,0 @@ -{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/4.7.19.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.7.19.msg_template/civicrm_msg_template.tpl deleted file mode 100644 index 30cf37fa3f..0000000000 --- a/CRM/Upgrade/4.7.19.msg_template/civicrm_msg_template.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{php} - $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.7.19.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/4.7.19.msg_template/message_templates/contribution_invoice_receipt_html.tpl b/CRM/Upgrade/4.7.19.msg_template/message_templates/contribution_invoice_receipt_html.tpl deleted file mode 100644 index 0b5633f53b..0000000000 --- a/CRM/Upgrade/4.7.19.msg_template/message_templates/contribution_invoice_receipt_html.tpl +++ /dev/null @@ -1,458 +0,0 @@ - - - - - - - - - - - -
-
- - - - - - - - - {if $organization_name} - - {else} - - {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{ts}INVOICE{/ts}{ts}Invoice Date:{/ts}{$domain_organization}
{$display_name} ({$organization_name}){$display_name}{$invoice_date} - - {if $domain_street_address }{$domain_street_address}{/if} - {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if} - -
{$street_address} {$supplemental_address_1}{ts}Invoice Number:{/ts} - - {if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if} - {if $domain_state }{$domain_state}{/if} - -
{$supplemental_address_2} {$stateProvinceAbbreviation}{$invoice_id} - - {if $domain_city}{$domain_city}{/if} - {if $domain_postal_code }{$domain_postal_code}{/if} - -
{$city} {$postal_code}{ts}Reference:{/ts} {if $domain_country}{$domain_country}{/if}
{$source} {if $domain_phone}{$domain_phone}{/if}
{if $domain_email}{$domain_email}{/if}
- - - - -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - - - - {foreach from=$lineItem item=value key=priceset name=taxpricevalue} - {if $smarty.foreach.taxpricevalue.index eq 0} - - - - {else} - - - - {/if} - - - - - {if $value.tax_amount != ''} - - {else} - - {/if} - - - {/foreach} - - - - - - - {foreach from = $dataArray item = value key = priceset} - - - {if $priceset} - - - {elseif $priceset == 0} - - - - {/if} - {/foreach} - - - - - - - - - - - {if $is_pay_later == 0} - - - - - - - - - - - - - - - - {/if} -


- - - - {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1} - - - - - {/if} -
{ts}Description{/ts}{ts}Quantity{/ts}{ts}Unit Price{/ts}{$taxTerm} {ts 1=$defaultCurrency}Amount %1{/ts}
- {if $value.html_type eq 'Text'} - {$value.label} - {else} - {$value.field_title} - {$value.label} - {/if} - {if $value.description} -
{$value.description|truncate:30:"..."}
- {/if} - - 		{$value.qty} {$value.unit_price|crmMoney:$currency} {$value.tax_rate}%{ts 1=$taxTerm}No %1{/ts}{$value.subTotal|crmMoney:$currency}
{ts}Sub Total{/ts} {$subTotal|crmMoney:$currency}
{ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}{$value|crmMoney:$currency} {ts 1=$taxTerm}TOTAL NO %1{/ts}{$value|crmMoney:$currency}
{ts 1=$defaultCurrency}TOTAL %1{/ts}{$amount|crmMoney:$currency}
- {if $contribution_status_id == $refundedStatusId} - {ts}LESS Amount Credited{/ts} - {else} - {ts}LESS Amount Paid{/ts} - {/if} - - {$amountPaid|crmMoney:$currency}
{ts}AMOUNT DUE:{/ts} {$amountDue|crmMoney:$currency}
{ts 1=$dueDate}DUE DATE: %1{/ts}
-
- {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1} - - - - -
- - - - - -
{ts}PAYMENT ADVICE{/ts}

{ts}To: {/ts}
- {$domain_organization}
- {$domain_street_address} {$domain_supplemental_address_1}
- {$domain_supplemental_address_2} {$domain_state}
- {$domain_city} {$domain_postal_code}
- {$domain_country}
- {$domain_phone}
- {$domain_email}
-

{$notes} - 		- - - - - - - - - - - - - {if $is_pay_later == 1} - - - - - - {else} - - - - - - {/if} - - - - - - - - -
{ts}Customer: {/ts}{$display_name}
{ts}Invoice Number: {/ts}{$invoice_id}
{ts}Amount Due:{/ts}{$amount|crmMoney:$currency}
{ts}Amount Due: {/ts}{$amountDue|crmMoney:$currency}
{ts}Due Date: {/ts}{$dueDate}
-
- {/if} - - {if $contribution_status_id == $refundedStatusId || $contribution_status_id == $cancelledStatusId} - - - - -
-
- - - - - - - - - - {if $organization_name} - - {else} - - {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{ts}CREDIT NOTE{/ts}{ts}Date:{/ts}{$domain_organization}
{$display_name} ({$organization_name}){$display_name}{$invoice_date} - - {if $domain_street_address }{$domain_street_address}{/if} - {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if} - -
{$street_address} {$supplemental_address_1}{ts}Credit Note Number:{/ts} - - {if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if} - {if $domain_state }{$domain_state}{/if} - -
{$supplemental_address_2} {$stateProvinceAbbreviation}{$creditnote_id} - - {if $domain_city}{$domain_city}{/if} - {if $domain_postal_code }{$domain_postal_code}{/if} - -
{$city} {$postal_code}{ts}Reference:{/ts} - - {if $domain_country}{$domain_country}{/if} - -
{$source} - - {if $domain_phone}{$domain_phone}{/if} - -
- - {if $domain_email}{$domain_email}{/if} - -
- - - - - -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - - - - {foreach from=$lineItem item=value key=priceset name=pricevalue} - {if $smarty.foreach.pricevalue.index eq 0} - - {else} - - {/if} - - - - - {if $value.tax_amount != ''} - - {else} - - {/if} - - - {/foreach} - - - - - - - {foreach from = $dataArray item = value key = priceset} - - - {if $priceset} - - - {elseif $priceset == 0} - - - - {/if} - {/foreach} - - - - - - - - - - {if $is_pay_later == 0} - - - - - - - - - - - - - - - - {/if} -


- - - - - - - -
{ts}Description{/ts}{ts}Quantity{/ts}{ts}Unit Price{/ts}{$taxTerm} {ts 1=$defaultCurrency}Amount %1{/ts}
- - {if $value.html_type eq 'Text'} - {$value.label} - {else} - {$value.field_title} - {$value.label} - {/if} - {if $value.description} -
{$value.description|truncate:30:"..."}
- {/if} - - 		{$value.qty} {$value.unit_price|crmMoney:$currency} {$value.tax_rate}%{ts 1=$taxTerm}No %1{/ts}{$value.subTotal|crmMoney:$currency}
{ts}Sub Total{/ts} {$subTotal|crmMoney:$currency}
{ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}{$value|crmMoney:$currency} {ts 1=$taxTerm}TOTAL NO %1{/ts}{$value|crmMoney:$currency}
{ts 1=$defaultCurrency}TOTAL %1{/ts}{$amount|crmMoney:$currency}
{ts}LESS Credit to invoice(s){/ts}{$amount|crmMoney:$currency}
{ts}REMAINING CREDIT{/ts}{$amountDue|crmMoney:$currency}
-
- - - - -
- - - - - - -
{ts}CREDIT ADVICE{/ts}

{ts}Please do not pay on this advice. Deduct the amount of this Credit Note from your next payment to us{/ts}

 - - - - - - - - - - - - - - - - - -
{ts}Customer:{/ts} {$display_name}
{ts}Credit Note#:{/ts} {$creditnote_id}
{ts}Credit Amount:{/ts}{$amount|crmMoney:$currency}
-
- {/if} -
- - diff --git a/CRM/Upgrade/4.7.19.msg_template/message_templates/payment_or_refund_notification_html.tpl b/CRM/Upgrade/4.7.19.msg_template/message_templates/payment_or_refund_notification_html.tpl deleted file mode 100644 index 709d7915d9..0000000000 --- a/CRM/Upgrade/4.7.19.msg_template/message_templates/payment_or_refund_notification_html.tpl +++ /dev/null @@ -1,253 +0,0 @@ - - - - - - - - -{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} - -

Dear {$contactDisplayName}

-
- - - - - - - - - - - - - - - - - - -
- {if $isRefund} -

{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/4.7.19.msg_template/message_templates/payment_or_refund_notification_text.tpl b/CRM/Upgrade/4.7.19.msg_template/message_templates/payment_or_refund_notification_text.tpl deleted file mode 100644 index c713864c05..0000000000 --- a/CRM/Upgrade/4.7.19.msg_template/message_templates/payment_or_refund_notification_text.tpl +++ /dev/null @@ -1,102 +0,0 @@ -Dear {$contactDisplayName} -{if $isRefund} -{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} -=============================================================================== - -{ts}Refund Details{/ts} - -=============================================================================== -{ts}Total Fees{/ts}: {$totalAmount|crmMoney} -{ts}You Paid{/ts}: {$totalPaid|crmMoney} ------------------------------------------------------------------------------------- -{ts}Refund Amount{/ts}: {$refundAmount|crmMoney} - -{else} -=============================================================================== - -{ts}Payment Details{/ts} - -=============================================================================== -{ts}Total Fees{/ts}: {$totalAmount|crmMoney} -{ts}This Payment Amount{/ts}: {$paymentAmount|crmMoney} ------------------------------------------------------------------------------------- -{ts}Balance Owed{/ts}: {$amountOwed|crmMoney} {* This will be zero after final payment. *} - -{if $paymentsComplete} - -{ts}Thank you for completing payment.{/ts} -{/if} -{/if} -{if $receive_date} -{ts}Transaction Date{/ts}: {$receive_date|crmDate} -{/if} -{if $trxn_id} -{ts}Transaction #{/ts}: {$trxn_id} -{/if} -{if $paidBy} -{ts}Paid By{/ts}: {$paidBy} -{/if} -{if $checkNumber} -{ts}Check Number{/ts}: {$checkNumber} -{/if} -{if $contributeMode eq 'direct' and !$isAmountzero} - -=============================================================================== - -{ts}Billing Name and Address{/ts} - -=============================================================================== - -{$billingName} -{$address} -{/if} - -{if $contributeMode eq 'direct' and !$isAmountzero} -=========================================================== -{ts}Credit Card Information{/ts} - -=============================================================================== - -{$credit_card_type} -{$credit_card_number} -{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} -{/if} -{if $component eq 'event'} -=============================================================================== - -{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 $event.participant_role} -{ts}Participant Role{/ts}: {$event.participant_role} -{/if} - -{if $isShowLocation} -{$location.address.1.display|strip_tags:false} -{/if}{*End of isShowLocation condition*} - -{if $location.phone.1.phone || $location.email.1.email} - -{ts}Event Contacts:{/ts} -{foreach from=$location.phone item=phone} -{if $phone.phone} - -{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if} -{/foreach} -{foreach from=$location.email item=eventEmail} -{if $eventEmail.email} - -{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach} -{/if} -{/if} diff --git a/CRM/Upgrade/4.7.23.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.7.23.msg_template/civicrm_msg_template.tpl deleted file mode 100644 index cfb6dabe04..0000000000 --- a/CRM/Upgrade/4.7.23.msg_template/civicrm_msg_template.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{php} - $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.7.23.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/4.7.23.msg_template/message_templates/contribution_invoice_receipt_html.tpl b/CRM/Upgrade/4.7.23.msg_template/message_templates/contribution_invoice_receipt_html.tpl deleted file mode 100644 index 75d7bf006c..0000000000 --- a/CRM/Upgrade/4.7.23.msg_template/message_templates/contribution_invoice_receipt_html.tpl +++ /dev/null @@ -1,458 +0,0 @@ - - - - - - - - - - - -
-
- - - - - - - - - {if $organization_name} - - {else} - - {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{ts}INVOICE{/ts}{ts}Invoice Date:{/ts}{$domain_organization}
{$display_name} ({$organization_name}){$display_name}{$invoice_date} - - {if $domain_street_address }{$domain_street_address}{/if} - {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if} - -
{$street_address} {$supplemental_address_1}{ts}Invoice Number:{/ts} - - {if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if} - {if $domain_state }{$domain_state}{/if} - -
{$supplemental_address_2} {$stateProvinceAbbreviation}{$invoice_number} - - {if $domain_city}{$domain_city}{/if} - {if $domain_postal_code }{$domain_postal_code}{/if} - -
{$city} {$postal_code}{ts}Reference:{/ts} {if $domain_country}{$domain_country}{/if}
{$source} {if $domain_phone}{$domain_phone}{/if}
{if $domain_email}{$domain_email}{/if}
- - - - -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - - - - {foreach from=$lineItem item=value key=priceset name=taxpricevalue} - {if $smarty.foreach.taxpricevalue.index eq 0} - - - - {else} - - - - {/if} - - - - - {if $value.tax_amount != ''} - - {else} - - {/if} - - - {/foreach} - - - - - - - {foreach from = $dataArray item = value key = priceset} - - - {if $priceset} - - - {elseif $priceset == 0} - - - - {/if} - {/foreach} - - - - - - - - - - - {if $is_pay_later == 0} - - - - - - - - - - - - - - - - {/if} -


- - - - {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1} - - - - - {/if} -
{ts}Description{/ts}{ts}Quantity{/ts}{ts}Unit Price{/ts}{$taxTerm} {ts 1=$defaultCurrency}Amount %1{/ts}
- {if $value.html_type eq 'Text'} - {$value.label} - {else} - {$value.field_title} - {$value.label} - {/if} - {if $value.description} -
{$value.description|truncate:30:"..."}
- {/if} - - 		{$value.qty} {$value.unit_price|crmMoney:$currency} {$value.tax_rate}%{ts 1=$taxTerm}No %1{/ts}{$value.subTotal|crmMoney:$currency}
{ts}Sub Total{/ts} {$subTotal|crmMoney:$currency}
{ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}{$value|crmMoney:$currency} {ts 1=$taxTerm}TOTAL NO %1{/ts}{$value|crmMoney:$currency}
{ts 1=$defaultCurrency}TOTAL %1{/ts}{$amount|crmMoney:$currency}
- {if $contribution_status_id == $refundedStatusId} - {ts}LESS Amount Credited{/ts} - {else} - {ts}LESS Amount Paid{/ts} - {/if} - - {$amountPaid|crmMoney:$currency}
{ts}AMOUNT DUE:{/ts} {$amountDue|crmMoney:$currency}
{ts 1=$dueDate}DUE DATE: %1{/ts}
-
- {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1} - - - - -
- - - - - -
{ts}PAYMENT ADVICE{/ts}

{ts}To: {/ts}
- {$domain_organization}
- {$domain_street_address} {$domain_supplemental_address_1}
- {$domain_supplemental_address_2} {$domain_state}
- {$domain_city} {$domain_postal_code}
- {$domain_country}
- {$domain_phone}
- {$domain_email}
-

{$notes} - 		- - - - - - - - - - - - - {if $is_pay_later == 1} - - - - - - {else} - - - - - - {/if} - - - - - - - - -
{ts}Customer: {/ts}{$display_name}
{ts}Invoice Number: {/ts}{$invoice_id}
{ts}Amount Due:{/ts}{$amount|crmMoney:$currency}
{ts}Amount Due: {/ts}{$amountDue|crmMoney:$currency}
{ts}Due Date: {/ts}{$dueDate}
-
- {/if} - - {if $contribution_status_id == $refundedStatusId || $contribution_status_id == $cancelledStatusId} - - - - -
-
- - - - - - - - - - {if $organization_name} - - {else} - - {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{ts}CREDIT NOTE{/ts}{ts}Date:{/ts}{$domain_organization}
{$display_name} ({$organization_name}){$display_name}{$invoice_date} - - {if $domain_street_address }{$domain_street_address}{/if} - {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if} - -
{$street_address} {$supplemental_address_1}{ts}Credit Note Number:{/ts} - - {if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if} - {if $domain_state }{$domain_state}{/if} - -
{$supplemental_address_2} {$stateProvinceAbbreviation}{$creditnote_id} - - {if $domain_city}{$domain_city}{/if} - {if $domain_postal_code }{$domain_postal_code}{/if} - -
{$city} {$postal_code}{ts}Reference:{/ts} - - {if $domain_country}{$domain_country}{/if} - -
{$source} - - {if $domain_phone}{$domain_phone}{/if} - -
- - {if $domain_email}{$domain_email}{/if} - -
- - - - - -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - - - - {foreach from=$lineItem item=value key=priceset name=pricevalue} - {if $smarty.foreach.pricevalue.index eq 0} - - {else} - - {/if} - - - - - {if $value.tax_amount != ''} - - {else} - - {/if} - - - {/foreach} - - - - - - - {foreach from = $dataArray item = value key = priceset} - - - {if $priceset} - - - {elseif $priceset == 0} - - - - {/if} - {/foreach} - - - - - - - - - - {if $is_pay_later == 0} - - - - - - - - - - - - - - - - {/if} -


- - - - - - - -
{ts}Description{/ts}{ts}Quantity{/ts}{ts}Unit Price{/ts}{$taxTerm} {ts 1=$defaultCurrency}Amount %1{/ts}
- - {if $value.html_type eq 'Text'} - {$value.label} - {else} - {$value.field_title} - {$value.label} - {/if} - {if $value.description} -
{$value.description|truncate:30:"..."}
- {/if} - - 		{$value.qty} {$value.unit_price|crmMoney:$currency} {$value.tax_rate}%{ts 1=$taxTerm}No %1{/ts}{$value.subTotal|crmMoney:$currency}
{ts}Sub Total{/ts} {$subTotal|crmMoney:$currency}
{ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}{$value|crmMoney:$currency} {ts 1=$taxTerm}TOTAL NO %1{/ts}{$value|crmMoney:$currency}
{ts 1=$defaultCurrency}TOTAL %1{/ts}{$amount|crmMoney:$currency}
{ts}LESS Credit to invoice(s){/ts}{$amount|crmMoney:$currency}
{ts}REMAINING CREDIT{/ts}{$amountDue|crmMoney:$currency}
-
- - - - -
- - - - - - -
{ts}CREDIT ADVICE{/ts}

{ts}Please do not pay on this advice. Deduct the amount of this Credit Note from your next payment to us{/ts}

 - - - - - - - - - - - - - - - - - -
{ts}Customer:{/ts} {$display_name}
{ts}Credit Note#:{/ts} {$creditnote_id}
{ts}Credit Amount:{/ts}{$amount|crmMoney:$currency}
-
- {/if} -
- - diff --git a/CRM/Upgrade/4.7.4.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.7.4.msg_template/civicrm_msg_template.tpl deleted file mode 100644 index f66b9c78d1..0000000000 --- a/CRM/Upgrade/4.7.4.msg_template/civicrm_msg_template.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{php} - $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.7.4.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/4.7.4.msg_template/message_templates/event_offline_receipt_html.tpl b/CRM/Upgrade/4.7.4.msg_template/message_templates/event_offline_receipt_html.tpl deleted file mode 100644 index f42bcc33fc..0000000000 --- a/CRM/Upgrade/4.7.4.msg_template/message_templates/event_offline_receipt_html.tpl +++ /dev/null @@ -1,527 +0,0 @@ - - - - - - - - -{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 $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)} -

{$event.confirm_email_text|htmlize}

- {/if} - - {if $isOnWaitlist} -

{ts}You have been added to the WAIT LIST for this event.{/ts}

- {if $isPrimary} -

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

- {/if} - {elseif $isRequireApproval} -

{ts}Your registration has been submitted.{/ts}

- {if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

- {/if} - {elseif $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 $event.participant_role neq 'Attendee' and $defaultRole} - - - - - {/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} - - {if $event.is_public} - - - - {/if} - - {if $email} - - - - - - - {/if} - - - {if $event.is_monetary} - - - - - - {if $lineItem} - {foreach from=$lineItem item=value key=priceset} - {if $value neq 'skip'} - {if $isPrimary} - {if $lineItem|@count GT 1} {* Header for multi participant registration cases. *} - - - - {/if} - {/if} - - - - {/if} - {/foreach} - {if $dataArray} - - - - - {foreach from=$dataArray item=value key=priceset} - - {if $priceset || $priceset == 0} - - - {else} - - - {/if} - - {/foreach} - {/if} - {/if} - - {if $amount && !$lineItem} - {foreach from=$amount item=amnt key=level} - - - - {/foreach} - {/if} - {if $totalTaxAmount} - - - - - {/if} - {if $isPrimary} - - - - - {if $balanceAmount} - - - - - {/if} - {if $pricesetFieldsCount } - - - - - {/if} - {if $is_pay_later} - - - - {/if} - - {if $register_date} - - - - - {/if} - - {if $receive_date} - - - - - {/if} - - {if $financialTypeName} - - - - - {/if} - - {if $trxn_id} - - - - - {/if} - - {if $paidBy} - - - - - {/if} - - {if $checkNumber} - - - - - {/if} - - {if $contributeMode ne 'notify' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} - - - - - - - {/if} - - {if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} - - - - - - - {/if} - - {/if} - - {/if} {* End of conditional section for Paid events *} - - {if $customPre} - - - - {foreach from=$customPre item=value key=customName} - {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - - - - - {/if} - {/foreach} - {/if} - - {if $customPost} - - - - {foreach from=$customPost item=value key=customName} - {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - - - - - {/if} - {/foreach} - {/if} - - {if $customProfile} - {foreach from=$customProfile item=value key=customName} - - - - {foreach from=$value item=val key=field} - {if $field eq 'additionalCustomPre' or $field eq 'additionalCustomPost'} - - - - {foreach from=$val item=v key=f} - - - - - {/foreach} - {/if} - {/foreach} - {/foreach} - {/if} - - {if $customGroup} - {foreach from=$customGroup item=value key=customName} - - - - {foreach from=$value item=v key=n} - - - - - {/foreach} - {/foreach} - {/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} - - {$event.participant_role} -
- {if $location.address.1.name} - {$location.address.1.name}
- {/if} - {if $location.address.1.street_address} - {$location.address.1.street_address}
- {/if} - {if $location.address.1.supplemental_address_1} - {$location.address.1.supplemental_address_1}
- {/if} - {if $location.address.1.supplemental_address_2} - {$location.address.1.supplemental_address_2}
- {/if} - {if $location.address.1.city} - {$location.address.1.city} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if}
- {/if} -
- {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} -
- {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} -
- {$email} -
- {$event.fee_label} -
- {ts 1=$priceset+1}Participant %1{/ts} -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - {if $dataArray} - - - - {/if} - - {if $pricesetFieldsCount }{/if} - - {foreach from=$value item=line} - - - - - {if $dataArray} - - {if $line.tax_rate != "" || $line.tax_amount != ""} - - - {else} - - - {/if} - {/if} - - {if $pricesetFieldsCount } - - {/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}{ts}Total Participants{/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} - - {$line.unit_price*$line.qty|crmMoney} - - {$line.tax_rate|string_format:"%.2f"}% - - {$line.tax_amount|crmMoney} - - {$line.line_total+$line.tax_amount|crmMoney} - - {$line.participant_count} -
-
- {ts}Amount Before Tax:{/ts} - - {$totalAmount-$totalTaxAmount|crmMoney} -
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}No{/ts} {$taxTerm} {$value|crmMoney:$currency}
- {$amnt.amount|crmMoney} {$amnt.label} -
- {ts}Total Tax Amount{/ts} - - {$totalTaxAmount|crmMoney:$currency} -
- {if $balanceAmount} - {ts}Total Paid{/ts} - {else} - {ts}Total Amount{/ts} - {/if} - - {$totalAmount|crmMoney} {if $hookDiscount.message}({$hookDiscount.message}){/if} -
- {ts}Balance{/ts} - - {$balanceAmount|crmMoney} -
- {ts}Total Participants{/ts} - {assign var="count" value= 0} - {foreach from=$lineItem item=pcount} - {assign var="lineItemCount" value=0} - {if $pcount neq 'skip'} - {foreach from=$pcount item=p_count} - {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} - {/foreach} - {if $lineItemCount < 1 } - assign var="lineItemCount" value=1} - {/if} - {assign var="count" value=$count+$lineItemCount} - {/if} - {/foreach} - {$count} -
- {$pay_later_receipt} -
- {ts}Registration Date{/ts} - - {$register_date|crmDate} -
- {ts}Transaction Date{/ts} - - {$receive_date|crmDate} -
- {ts}Financial Type{/ts} - - {$financialTypeName} -
- {ts}Transaction #{/ts} - - {$trxn_id} -
- {ts}Paid By{/ts} - - {$paidBy} -
- {ts}Check Number{/ts} - - {$checkNumber} -
- {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} -
- {$customPre_grouptitle} -
- {$customName} - - {$value} -
- {$customPost_grouptitle} -
- {$customName} - - {$value} -
- {ts 1=$customName+1}Participant Information - Participant %1{/ts} -
- {if $field eq 'additionalCustomPre'} - {$additionalCustomPre_grouptitle} - {else} - {$additionalCustomPost_grouptitle} - {/if} -
- {$f} - - {$v} -
- {$customName} -
- {$n} - - {$v} -
-
-
- - - diff --git a/CRM/Upgrade/4.7.4.msg_template/message_templates/event_offline_receipt_text.tpl b/CRM/Upgrade/4.7.4.msg_template/message_templates/event_offline_receipt_text.tpl deleted file mode 100644 index 678fa7b5b7..0000000000 --- a/CRM/Upgrade/4.7.4.msg_template/message_templates/event_offline_receipt_text.tpl +++ /dev/null @@ -1,304 +0,0 @@ -{contact.email_greeting} -{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)} -{$event.confirm_email_text} -{/if} - -{if $isOnWaitlist} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}You have been added to the WAIT LIST for this event.{/ts} - -{if $isPrimary} -{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} - -{/if} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{elseif $isRequireApproval} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Your registration has been submitted.{/ts} - -{if $isPrimary} -{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} - -{/if} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{elseif $is_pay_later} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$pay_later_receipt} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{else} - -{ts}Please print this confirmation for your records.{/ts} -{/if} - - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Event Information and Location{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$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 $event.participant_role neq 'Attendee' and $defaultRole} -{ts}Participant Role{/ts}: {$event.participant_role} -{/if} - -{if $isShowLocation} -{if $location.address.1.name} - -{$location.address.1.name} -{/if} -{if $location.address.1.street_address}{$location.address.1.street_address} -{/if} -{if $location.address.1.supplemental_address_1}{$location.address.1.supplemental_address_1} -{/if} -{if $location.address.1.supplemental_address_2}{$location.address.1.supplemental_address_2} -{/if} -{if $location.address.1.city}{$location.address.1.city} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if} -{/if} - -{/if}{*End of isShowLocation condition*} - -{if $location.phone.1.phone || $location.email.1.email} - -{ts}Event Contacts:{/ts} -{foreach from=$location.phone item=phone} -{if $phone.phone} - -{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if} -{/foreach} -{foreach from=$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 $email} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Registered Email{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$email} -{/if} -{if $event.is_monetary} {* This section for Paid events only.*} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$event.fee_label} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{if $lineItem}{foreach from=$lineItem item=value key=priceset} - -{if $value neq 'skip'} -{if $isPrimary} -{if $lineItem|@count GT 1} {* Header for multi participant registration cases. *} -{ts 1=$priceset+1}Participant %1{/ts} -{/if} -{/if} ----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{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} -{capture assign=ts_participant_total}{if $pricesetFieldsCount }{ts}Total Participants{/ts}{/if}{/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|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {/if} {$ts_total|string_format:"%10s"} {$ts_participant_total|string_format:"%10s"} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{foreach from=$value item=line} -{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if} -{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|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|string_format:"%10s"} {$ts_participant_count|string_format:"%10s"} -{/foreach} -{/if} -{/foreach} - -{if $dataArray} -{ts}Amount before Tax{/ts}: {$totalAmount-$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 $amount && !$lineItem} -{foreach from=$amount item=amnt key=level}{$amnt.amount|crmMoney} {$amnt.label} -{/foreach} -{/if} - -{if $totalTaxAmount} -{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency} -{/if} -{if $isPrimary} - -{if $balanceAmount}{ts}Total Paid{/ts}{else}{ts}Total Amount{/ts}{/if}: {$totalAmount|crmMoney} {if $hookDiscount.message}({$hookDiscount.message}){/if} - -{if $balanceAmount} -{ts}Balance{/ts}: {$balanceAmount|crmMoney} -{/if} - -{if $pricesetFieldsCount } - {assign var="count" value= 0} - {foreach from=$lineItem item=pcount} - {assign var="lineItemCount" value=0} - {if $pcount neq 'skip'} - {foreach from=$pcount item=p_count} - {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} - {/foreach} - {if $lineItemCount < 1 } - {assign var="lineItemCount" value=1} - {/if} - {assign var="count" value=$count+$lineItemCount} - {/if} - {/foreach} - -{ts}Total Participants{/ts}: {$count} -{/if} - -{if $is_pay_later } - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$pay_later_receipt} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{/if} - -{if $register_date} -{ts}Registration Date{/ts}: {$register_date|crmDate} -{/if} -{if $receive_date} -{ts}Transaction Date{/ts}: {$receive_date|crmDate} -{/if} -{if $financialTypeName} -{ts}Financial Type{/ts}: {$financialTypeName} -{/if} -{if $trxn_id} -{ts}Transaction #{/ts}: {$trxn_id} -{/if} -{if $paidBy} -{ts}Paid By{/ts}: {$paidBy} -{/if} -{if $checkNumber} -{ts}Check Number{/ts}: {$checkNumber} -{/if} -{if $contributeMode ne 'notify' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Billing Name and Address{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$billingName} -{$address} -{/if} - -{if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} -=========================================================== -{ts}Credit Card Information{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$credit_card_type} -{$credit_card_number} -{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} -{/if} -{/if} -{/if} {* End of conditional section for Paid events *} - -{if $customPre} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$customPre_grouptitle} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$customPre item=value key=customName} -{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} -{$customName}: {$value} -{/if} -{/foreach} -{/if} - -{if $customPost} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$customPost_grouptitle} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$customPost item=value key=customName} -{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} -{$customName}: {$value} -{/if} -{/foreach} -{/if} -{if $customProfile} - -{foreach from=$customProfile item=value key=customName} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts 1=$customName+1}Participant Information - Participant %1{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$value item=val key=field} -{if $field eq 'additionalCustomPre' or $field eq 'additionalCustomPost' } -{if $field eq 'additionalCustomPre' } -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{$additionalCustomPre_grouptitle} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{else} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{$additionalCustomPost_grouptitle} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{/if} -{foreach from=$val item=v key=f} -{$f}: {$v} -{/foreach} -{/if} -{/foreach} -{/foreach} -{/if} -{if $customGroup} -{foreach from=$customGroup item=value key=customName} -=========================================================={if $pricesetFieldsCount }===================={/if} - -{$customName} -=========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$value item=v key=n} -{$n}: {$v} -{/foreach} -{/foreach} -{/if} - - diff --git a/CRM/Upgrade/4.7.4.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.7.4.msg_template/message_templates/event_online_receipt_html.tpl deleted file mode 100644 index 90d93bb5fb..0000000000 --- a/CRM/Upgrade/4.7.4.msg_template/message_templates/event_online_receipt_html.tpl +++ /dev/null @@ -1,526 +0,0 @@ - - - - - - - - -{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=tdfirstStyle}style="width: 180px; padding-bottom: 15px;"{/capture} -{capture assign=tdStyle}style="width: 100px;"{/capture} -{capture assign=participantTotal}style="margin: 0.5em 0 0.5em;padding: 0.5em;background-color: #999999;font-weight: bold;color: #FAFAFA;border-radius: 2px;"{/capture} - - -
- - - - - - - - - - - - - - - - {/if} - - -
-

{contact.email_greeting},

- - {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)} -

{$event.confirm_email_text|htmlize}

- - {else} -

Thank you for your participation. This letter is a confirmation that your registration has been received and your status has been updated to {if $participant_status}{$participant_status}{else}{if $isOnWaitlist}waitlisted{else}registered{/if}{/if}.

- - {/if} - -

- {if $isOnWaitlist} -

{ts}You have been added to the WAIT LIST for this event.{/ts}

- {if $isPrimary} -

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

- {/if} - {elseif $isRequireApproval} -

{ts}Your registration has been submitted.{/ts}

- {if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

- {/if} - {elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant} -

{$pay_later_receipt}

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

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

- {/if} - -
- - - - - - - - - - {if $conference_sessions} - - - - - - - {/if} - - {if $event.participant_role neq 'Attendee' and $defaultRole} - - - - - {/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} - - {if $event.is_public} - - - - {/if} - - {if $event.is_share} - - - - {/if} - {if $payer.name} - - - - - - - {/if} - {if $event.is_monetary} - - - - - - {if $lineItem} - {foreach from=$lineItem item=value key=priceset} - {if $value neq 'skip'} - {if $isPrimary} - {if $lineItem|@count GT 1} {* Header for multi participant registration cases. *} - - - - {/if} - {/if} - - - - {/if} - {/foreach} - {if $dataArray} - - - - - {foreach from=$dataArray item=value key=priceset} - - {if $priceset || $priceset == 0} - - - {else} - - - {/if} - - {/foreach} - {/if} - {/if} - - {if $amounts && !$lineItem} - {foreach from=$amounts item=amnt key=level} - - - - {/foreach} - {/if} - - {if $totalTaxAmount} - - - - - {/if} - {if $isPrimary} - - - - - {if $pricesetFieldsCount } - - - - {/if} - - {if $register_date} - - - - - {/if} - - {if $receive_date} - - - - - {/if} - - {if $financialTypeName} - - - - - {/if} - - {if $trxn_id} - - - - - {/if} - - {if $paidBy} - - - - - {/if} - - {if $checkNumber} - - - - - {/if} - - {if $contributeMode ne 'notify' and !$isAmountzero and (!$is_pay_later or $isBillingAddressRequiredForPayLater) and !$isOnWaitlist and !$isRequireApproval} - - - - - - - {/if} - - {if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} - - - - - - - {/if} - - {/if} - - {/if} {* End of conditional section for Paid events *} - - -{if $customPre} -{foreach from=$customPre item=customPr key=i} - - {foreach from=$customPr item=customValue key=customName} - {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - - - - - {/if} - {/foreach} -{/foreach} -{/if} - -{if $customPost} -{foreach from=$customPost item=customPos key=j} - - {foreach from=$customPos item=customValue key=customName} - {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - - - - -{/if} -{/foreach} -{/foreach} -{/if} - -{if $customProfile} -{foreach from=$customProfile.profile item=eachParticipant key=participantID} - - {foreach from=$eachParticipant item=eachProfile key=pid} - - {foreach from=$eachProfile item=val key=field} - {foreach from=$val item=v key=f} - - - {/foreach} - - {/foreach} -{/foreach} -{/foreach} -{/if} - - {if $customGroup} - {foreach from=$customGroup item=value key=customName} - - - - {foreach from=$value item=v key=n} - - - - - {/foreach} - {/foreach} - {/if} -
- {ts}Event Information and Location{/ts} -
- {$event.event_title}
- {$event.event_start_date|date_format:"%A"} {$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|date_format:"%A"} {$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} - - {$event.participant_role} -
- {if $location.address.1.name} - {$location.address.1.name}
- {/if} - {if $location.address.1.street_address} - {$location.address.1.street_address}
- {/if} - {if $location.address.1.supplemental_address_1} - {$location.address.1.supplemental_address_1}
- {/if} - {if $location.address.1.supplemental_address_2} - {$location.address.1.supplemental_address_2}
- {/if} - {if $location.address.1.city} - {$location.address.1.city}, {$location.address.1.state_province} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if}
- {/if} -
- {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} -
- {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} -
- {capture assign=eventUrl}{crmURL p='civicrm/event/info' q="id=`$event.id`&reset=1" a=true fe=1 h=1}{/capture} - {include file="CRM/common/SocialNetwork.tpl" emailMode=true url=$eventUrl title=$event.title pageURL=$eventUrl} -
- {ts}You were registered by:{/ts} -
- {$payer.name} -
- {$event.fee_label} -
- {ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info} -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - {if $dataArray} - - - - {/if} - - {if $pricesetFieldsCount }{/if} - - {foreach from=$value item=line} - - - - - {if $dataArray} - - {if $line.tax_rate != "" || $line.tax_amount != ""} - - - {else} - - - {/if} - {/if} - - {if $pricesetFieldsCount } {/if} - - {/foreach} - {if $individual} - - - - - - - {/if} -
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/ts}{ts}SubTotal{/ts}{ts}Tax Rate{/ts}{ts}Tax Amount{/ts}{ts}Total{/ts}{ts}Total Participants{/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} - - {$line.tax_rate|string_format:"%.2f"}% - - {$line.tax_amount|crmMoney} - - {$line.line_total+$line.tax_amount|crmMoney:$currency} - {$line.participant_count}
{ts}Participant Total{/ts}{$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney}{$individual.$priceset.totalTaxAmt|crmMoney}{$individual.$priceset.totalAmtWithTax|crmMoney}
-
- {ts} Amount Before Tax: {/ts} - - {$totalAmount-$totalTaxAmount|crmMoney} -
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}No{/ts} {$taxTerm} {$value|crmMoney:$currency}
- {$amnt.amount|crmMoney:$currency} {$amnt.label} -
- {ts}Total Tax Amount{/ts} - - {$totalTaxAmount|crmMoney:$currency} -
- {ts}Total Amount{/ts} - - {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if} -
- {ts}Total Participants{/ts} - {assign var="count" value= 0} - {foreach from=$lineItem item=pcount} - {assign var="lineItemCount" value=0} - {if $pcount neq 'skip'} - {foreach from=$pcount item=p_count} - {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} - {/foreach} - {if $lineItemCount < 1 } - {assign var="lineItemCount" value=1} - {/if} - {assign var="count" value=$count+$lineItemCount} - {/if} - {/foreach} - {$count} -
- {ts}Registration Date{/ts} - - {$register_date|crmDate} -
- {ts}Transaction Date{/ts} - - {$receive_date|crmDate} -
- {ts}Financial Type{/ts} - - {$financialTypeName} -
- {ts}Transaction #{/ts} - - {$trxn_id} -
- {ts}Paid By{/ts} - - {$paidBy} -
- {ts}Check Number{/ts} - - {$checkNumber} -
- {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} -
{$customPre_grouptitle.$i}
{$customName}{$customValue}
{$customPost_grouptitle.$j}
{$customName}{$customValue}
{ts 1=$participantID+2}Participant %1{/ts}
{$customProfile.title.$pid}
{$field}{$v}
- {$customName} -
- {$n} - - {$v} -
- {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}Click here to transfer or cancel your registration.{/ts} -
-
- - - diff --git a/CRM/Upgrade/4.7.4.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.7.4.msg_template/message_templates/event_online_receipt_text.tpl deleted file mode 100644 index e5a9c23f22..0000000000 --- a/CRM/Upgrade/4.7.4.msg_template/message_templates/event_online_receipt_text.tpl +++ /dev/null @@ -1,311 +0,0 @@ -{contact.email_greeting}, - -{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)} -{$event.confirm_email_text} - -{else} -Thank you for your participation. This letter is a confirmation that your registration has been received and your status has been updated to {if $participant_status}{$participant_status}{else}{if $isOnWaitlist}waitlisted{else}registered{/if}{/if}. - -{/if} - -{if $isOnWaitlist} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}You have been added to the WAIT LIST for this event.{/ts} - -{if $isPrimary} -{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} -{/if} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{elseif $isRequireApproval} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Your registration has been submitted.{/ts} - -{if $isPrimary} -{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} - -{/if} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$pay_later_receipt} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{else} - -{ts}Please print this confirmation for your records.{/ts} -{/if} - - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Event Information and Location{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$event.event_title} -{$event.event_start_date|date_format:"%A"} {$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|date_format:"%A"} {$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} - -{if $event.participant_role neq 'Attendee' and $defaultRole} -{ts}Participant Role{/ts}: {$event.participant_role} -{/if} - -{if $isShowLocation} -{if $location.address.1.name} - -{$location.address.1.name} -{/if} -{if $location.address.1.street_address}{$location.address.1.street_address} -{/if} -{if $location.address.1.supplemental_address_1}{$location.address.1.supplemental_address_1} -{/if} -{if $location.address.1.supplemental_address_2}{$location.address.1.supplemental_address_2} -{/if} -{if $location.address.1.city}{$location.address.1.city}, {$location.address.1.state_province} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if} -{/if} - -{/if}{*End of isShowLocation condition*} - -{if $location.phone.1.phone || $location.email.1.email} - -{ts}Event Contacts:{/ts} -{foreach from=$location.phone item=phone} -{if $phone.phone} - -{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if} -{/foreach} -{foreach from=$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 $payer.name} -You were registered by: {$payer.name} -{/if} -{if $event.is_monetary} {* This section for Paid events only.*} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$event.fee_label} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{if $lineItem}{foreach from=$lineItem item=value key=priceset} - -{if $value neq 'skip'} -{if $isPrimary} -{if $lineItem|@count GT 1} {* Header for multi participant registration cases. *} -{ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info} - -{/if} -{/if} ------------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if} - -{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} -{if $pricesetFieldsCount }{capture assign=ts_participant_total}{ts}Total Participants{/ts}{/capture}{/if} -{$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {if $dataArray} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {/if} {$ts_total|string_format:"%10s"} {$ts_participant_total|string_format:"%10s"} ------------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if} - -{foreach from=$value item=line} -{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if} -{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"}{$ts_participant_count|string_format:"%10s"} -{/foreach} ----------------------------------------------------------------------------------------------------------------- -{if $individual}{ts}Participant Total{/ts} {$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:"%29s"} {$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:"%33s"} {$individual.$priceset.totalAmtWithTax|crmMoney:$currency|string_format:"%12s"}{/if} -{/if} -{""|string_format:"%120s"} -{/foreach} -{""|string_format:"%120s"} - -{if $dataArray} -{ts}Amount before Tax{/ts}: {$totalAmount-$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 $amounts && !$lineItem} -{foreach from=$amounts item=amnt key=level}{$amnt.amount|crmMoney:$currency} {$amnt.label} -{/foreach} -{/if} - -{if $totalTaxAmount} -{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency} -{/if} -{if $isPrimary } - -{ts}Total Amount{/ts}: {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if} - -{if $pricesetFieldsCount } - {assign var="count" value= 0} - {foreach from=$lineItem item=pcount} - {assign var="lineItemCount" value=0} - {if $pcount neq 'skip'} - {foreach from=$pcount item=p_count} - {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} - {/foreach} - {if $lineItemCount < 1 } - {assign var="lineItemCount" value=1} - {/if} - {assign var="count" value=$count+$lineItemCount} - {/if} - {/foreach} - -{ts}Total Participants{/ts}: {$count} -{/if} - -{if $register_date} -{ts}Registration Date{/ts}: {$register_date|crmDate} -{/if} -{if $receive_date} -{ts}Transaction Date{/ts}: {$receive_date|crmDate} -{/if} -{if $financialTypeName} -{ts}Financial Type{/ts}: {$financialTypeName} -{/if} -{if $trxn_id} -{ts}Transaction #{/ts}: {$trxn_id} -{/if} -{if $paidBy} -{ts}Paid By{/ts}: {$paidBy} -{/if} -{if $checkNumber} -{ts}Check Number{/ts}: {$checkNumber} -{/if} -{if $contributeMode ne 'notify' and !$isAmountzero and (!$is_pay_later or $isBillingAddressRequiredForPayLater) and !$isOnWaitlist and !$isRequireApproval} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Billing Name and Address{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$billingName} -{$address} -{/if} - -{if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Credit Card Information{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$credit_card_type} -{$credit_card_number} -{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} -{/if} -{/if} -{/if} {* End of conditional section for Paid events *} - -{if $customPre} -{foreach from=$customPre item=customPr key=i} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$customPre_grouptitle.$i} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$customPr item=customValue key=customName} -{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - {$customName}: {$customValue} -{/if} -{/foreach} -{/foreach} -{/if} - -{if $customPost} -{foreach from=$customPost item=customPos key=j} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$customPost_grouptitle.$j} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$customPos item=customValue key=customName} -{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - {$customName}: {$customValue} -{/if} -{/foreach} -{/foreach} -{/if} -{if $customProfile} - -{foreach from=$customProfile.profile item=eachParticipant key=participantID} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts 1=$participantID+2}Participant Information - Participant %1{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$eachParticipant item=eachProfile key=pid} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{$customProfile.title.$pid} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{foreach from=$eachProfile item=val key=field} -{foreach from=$val item=v key=f} -{$field}: {$v} -{/foreach} -{/foreach} -{/foreach} -{/foreach} -{/if} -{if $customGroup} -{foreach from=$customGroup item=value key=customName} -=========================================================={if $pricesetFieldsCount }===================={/if} - -{$customName} -=========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$value item=v key=n} -{$n}: {$v} -{/foreach} -{/foreach} -{/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} diff --git a/CRM/Upgrade/4.7.5.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.7.5.msg_template/civicrm_msg_template.tpl deleted file mode 100644 index 66a5177567..0000000000 --- a/CRM/Upgrade/4.7.5.msg_template/civicrm_msg_template.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{php} - $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.7.5.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/4.7.5.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.7.5.msg_template/message_templates/event_online_receipt_html.tpl deleted file mode 100644 index 278850b791..0000000000 --- a/CRM/Upgrade/4.7.5.msg_template/message_templates/event_online_receipt_html.tpl +++ /dev/null @@ -1,528 +0,0 @@ - - - - - - - - -{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=tdfirstStyle}style="width: 180px; padding-bottom: 15px;"{/capture} -{capture assign=tdStyle}style="width: 100px;"{/capture} -{capture assign=participantTotal}style="margin: 0.5em 0 0.5em;padding: 0.5em;background-color: #999999;font-weight: bold;color: #FAFAFA;border-radius: 2px;"{/capture} - - -
- - - - - - - - - - - - - - - - {/if} - - -
-

{contact.email_greeting},

- - {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)} -

{$event.confirm_email_text|htmlize}

- - {else} -

{ts}Thank you for your participation.{/ts} - {if $participant_status}{ts 1=$participant_status}This letter is a confirmation that your registration has been received and your status has been updated to %1.{/ts} - {else}{if $isOnWaitlist}{ts}This letter is a confirmation that your registration has been received and your status has been updated to waitlisted.{/ts}{else}{ts}This letter is a confirmation that your registration has been received and your status has been updated to registered.{/ts}{/if}{/if}.

- - {/if} - -

- {if $isOnWaitlist} -

{ts}You have been added to the WAIT LIST for this event.{/ts}

- {if $isPrimary} -

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

- {/if} - {elseif $isRequireApproval} -

{ts}Your registration has been submitted.{/ts}

- {if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

- {/if} - {elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant} -

{$pay_later_receipt}

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

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

- {/if} - -
- - - - - - - - - - {if $conference_sessions} - - - - - - - {/if} - - {if $event.participant_role neq 'Attendee' and $defaultRole} - - - - - {/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} - - {if $event.is_public} - - - - {/if} - - {if $event.is_share} - - - - {/if} - {if $payer.name} - - - - - - - {/if} - {if $event.is_monetary} - - - - - - {if $lineItem} - {foreach from=$lineItem item=value key=priceset} - {if $value neq 'skip'} - {if $isPrimary} - {if $lineItem|@count GT 1} {* Header for multi participant registration cases. *} - - - - {/if} - {/if} - - - - {/if} - {/foreach} - {if $dataArray} - - - - - {foreach from=$dataArray item=value key=priceset} - - {if $priceset || $priceset == 0} - - - {else} - - - {/if} - - {/foreach} - {/if} - {/if} - - {if $amounts && !$lineItem} - {foreach from=$amounts item=amnt key=level} - - - - {/foreach} - {/if} - - {if $totalTaxAmount} - - - - - {/if} - {if $isPrimary} - - - - - {if $pricesetFieldsCount } - - - - {/if} - - {if $register_date} - - - - - {/if} - - {if $receive_date} - - - - - {/if} - - {if $financialTypeName} - - - - - {/if} - - {if $trxn_id} - - - - - {/if} - - {if $paidBy} - - - - - {/if} - - {if $checkNumber} - - - - - {/if} - - {if $contributeMode ne 'notify' and !$isAmountzero and (!$is_pay_later or $isBillingAddressRequiredForPayLater) and !$isOnWaitlist and !$isRequireApproval} - - - - - - - {/if} - - {if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} - - - - - - - {/if} - - {/if} - - {/if} {* End of conditional section for Paid events *} - - -{if $customPre} -{foreach from=$customPre item=customPr key=i} - - {foreach from=$customPr item=customValue key=customName} - {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - - - - - {/if} - {/foreach} -{/foreach} -{/if} - -{if $customPost} -{foreach from=$customPost item=customPos key=j} - - {foreach from=$customPos item=customValue key=customName} - {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - - - - -{/if} -{/foreach} -{/foreach} -{/if} - -{if $customProfile} -{foreach from=$customProfile.profile item=eachParticipant key=participantID} - - {foreach from=$eachParticipant item=eachProfile key=pid} - - {foreach from=$eachProfile item=val key=field} - {foreach from=$val item=v key=f} - - - {/foreach} - - {/foreach} -{/foreach} -{/foreach} -{/if} - - {if $customGroup} - {foreach from=$customGroup item=value key=customName} - - - - {foreach from=$value item=v key=n} - - - - - {/foreach} - {/foreach} - {/if} -
- {ts}Event Information and Location{/ts} -
- {$event.event_title}
- {$event.event_start_date|date_format:"%A"} {$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|date_format:"%A"} {$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} - - {$event.participant_role} -
- {if $location.address.1.name} - {$location.address.1.name}
- {/if} - {if $location.address.1.street_address} - {$location.address.1.street_address}
- {/if} - {if $location.address.1.supplemental_address_1} - {$location.address.1.supplemental_address_1}
- {/if} - {if $location.address.1.supplemental_address_2} - {$location.address.1.supplemental_address_2}
- {/if} - {if $location.address.1.city} - {$location.address.1.city}, {$location.address.1.state_province} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if}
- {/if} -
- {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} -
- {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} -
- {capture assign=eventUrl}{crmURL p='civicrm/event/info' q="id=`$event.id`&reset=1" a=true fe=1 h=1}{/capture} - {include file="CRM/common/SocialNetwork.tpl" emailMode=true url=$eventUrl title=$event.title pageURL=$eventUrl} -
- {ts}You were registered by:{/ts} -
- {$payer.name} -
- {$event.fee_label} -
- {ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info} -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - {if $dataArray} - - - - {/if} - - {if $pricesetFieldsCount }{/if} - - {foreach from=$value item=line} - - - - - {if $dataArray} - - {if $line.tax_rate != "" || $line.tax_amount != ""} - - - {else} - - - {/if} - {/if} - - {if $pricesetFieldsCount } {/if} - - {/foreach} - {if $individual} - - - - - - - {/if} -
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/ts}{ts}SubTotal{/ts}{ts}Tax Rate{/ts}{ts}Tax Amount{/ts}{ts}Total{/ts}{ts}Total Participants{/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} - - {$line.tax_rate|string_format:"%.2f"}% - - {$line.tax_amount|crmMoney} - - {$line.line_total+$line.tax_amount|crmMoney:$currency} - {$line.participant_count}
{ts}Participant Total{/ts}{$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney}{$individual.$priceset.totalTaxAmt|crmMoney}{$individual.$priceset.totalAmtWithTax|crmMoney}
-
- {ts} Amount Before Tax: {/ts} - - {$totalAmount-$totalTaxAmount|crmMoney} -
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}No{/ts} {$taxTerm} {$value|crmMoney:$currency}
- {$amnt.amount|crmMoney:$currency} {$amnt.label} -
- {ts}Total Tax Amount{/ts} - - {$totalTaxAmount|crmMoney:$currency} -
- {ts}Total Amount{/ts} - - {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if} -
- {ts}Total Participants{/ts} - {assign var="count" value= 0} - {foreach from=$lineItem item=pcount} - {assign var="lineItemCount" value=0} - {if $pcount neq 'skip'} - {foreach from=$pcount item=p_count} - {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} - {/foreach} - {if $lineItemCount < 1 } - {assign var="lineItemCount" value=1} - {/if} - {assign var="count" value=$count+$lineItemCount} - {/if} - {/foreach} - {$count} -
- {ts}Registration Date{/ts} - - {$register_date|crmDate} -
- {ts}Transaction Date{/ts} - - {$receive_date|crmDate} -
- {ts}Financial Type{/ts} - - {$financialTypeName} -
- {ts}Transaction #{/ts} - - {$trxn_id} -
- {ts}Paid By{/ts} - - {$paidBy} -
- {ts}Check Number{/ts} - - {$checkNumber} -
- {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} -
{$customPre_grouptitle.$i}
{$customName}{$customValue}
{$customPost_grouptitle.$j}
{$customName}{$customValue}
{ts 1=$participantID+2}Participant %1{/ts}
{$customProfile.title.$pid}
{$field}{$v}
- {$customName} -
- {$n} - - {$v} -
- {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}Click here to transfer or cancel your registration.{/ts} -
-
- - - diff --git a/CRM/Upgrade/4.7.5.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.7.5.msg_template/message_templates/event_online_receipt_text.tpl deleted file mode 100644 index d056a8c607..0000000000 --- a/CRM/Upgrade/4.7.5.msg_template/message_templates/event_online_receipt_text.tpl +++ /dev/null @@ -1,314 +0,0 @@ -{contact.email_greeting}, - -{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)} -{$event.confirm_email_text} - -{else} - {ts}Thank you for your participation.{/ts} - {if $participant_status}{ts 1=$participant_status}This letter is a confirmation that your registration has been received and your status has been updated to %1.{/ts} - {else}{if $isOnWaitlist}{ts}This letter is a confirmation that your registration has been received and your status has been updated to waitlisted.{/ts}{else}{ts}This letter is a confirmation that your registration has been received and your status has been updated to registered.{/ts}{/if} - {/if}. - -{/if} - -{if $isOnWaitlist} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}You have been added to the WAIT LIST for this event.{/ts} - -{if $isPrimary} -{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} -{/if} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{elseif $isRequireApproval} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Your registration has been submitted.{/ts} - -{if $isPrimary} -{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} - -{/if} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$pay_later_receipt} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{else} - -{ts}Please print this confirmation for your records.{/ts} -{/if} - - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Event Information and Location{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$event.event_title} -{$event.event_start_date|date_format:"%A"} {$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|date_format:"%A"} {$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} - -{if $event.participant_role neq 'Attendee' and $defaultRole} -{ts}Participant Role{/ts}: {$event.participant_role} -{/if} - -{if $isShowLocation} -{if $location.address.1.name} - -{$location.address.1.name} -{/if} -{if $location.address.1.street_address}{$location.address.1.street_address} -{/if} -{if $location.address.1.supplemental_address_1}{$location.address.1.supplemental_address_1} -{/if} -{if $location.address.1.supplemental_address_2}{$location.address.1.supplemental_address_2} -{/if} -{if $location.address.1.city}{$location.address.1.city}, {$location.address.1.state_province} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if} -{/if} - -{/if}{*End of isShowLocation condition*} - -{if $location.phone.1.phone || $location.email.1.email} - -{ts}Event Contacts:{/ts} -{foreach from=$location.phone item=phone} -{if $phone.phone} - -{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if} -{/foreach} -{foreach from=$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 $payer.name} -You were registered by: {$payer.name} -{/if} -{if $event.is_monetary} {* This section for Paid events only.*} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$event.fee_label} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{if $lineItem}{foreach from=$lineItem item=value key=priceset} - -{if $value neq 'skip'} -{if $isPrimary} -{if $lineItem|@count GT 1} {* Header for multi participant registration cases. *} -{ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info} - -{/if} -{/if} ------------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if} - -{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} -{if $pricesetFieldsCount }{capture assign=ts_participant_total}{ts}Total Participants{/ts}{/capture}{/if} -{$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {if $dataArray} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {/if} {$ts_total|string_format:"%10s"} {$ts_participant_total|string_format:"%10s"} ------------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if} - -{foreach from=$value item=line} -{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if} -{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"}{$ts_participant_count|string_format:"%10s"} -{/foreach} ----------------------------------------------------------------------------------------------------------------- -{if $individual}{ts}Participant Total{/ts} {$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:"%29s"} {$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:"%33s"} {$individual.$priceset.totalAmtWithTax|crmMoney:$currency|string_format:"%12s"}{/if} -{/if} -{""|string_format:"%120s"} -{/foreach} -{""|string_format:"%120s"} - -{if $dataArray} -{ts}Amount before Tax{/ts}: {$totalAmount-$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 $amounts && !$lineItem} -{foreach from=$amounts item=amnt key=level}{$amnt.amount|crmMoney:$currency} {$amnt.label} -{/foreach} -{/if} - -{if $totalTaxAmount} -{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency} -{/if} -{if $isPrimary } - -{ts}Total Amount{/ts}: {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if} - -{if $pricesetFieldsCount } - {assign var="count" value= 0} - {foreach from=$lineItem item=pcount} - {assign var="lineItemCount" value=0} - {if $pcount neq 'skip'} - {foreach from=$pcount item=p_count} - {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} - {/foreach} - {if $lineItemCount < 1 } - {assign var="lineItemCount" value=1} - {/if} - {assign var="count" value=$count+$lineItemCount} - {/if} - {/foreach} - -{ts}Total Participants{/ts}: {$count} -{/if} - -{if $register_date} -{ts}Registration Date{/ts}: {$register_date|crmDate} -{/if} -{if $receive_date} -{ts}Transaction Date{/ts}: {$receive_date|crmDate} -{/if} -{if $financialTypeName} -{ts}Financial Type{/ts}: {$financialTypeName} -{/if} -{if $trxn_id} -{ts}Transaction #{/ts}: {$trxn_id} -{/if} -{if $paidBy} -{ts}Paid By{/ts}: {$paidBy} -{/if} -{if $checkNumber} -{ts}Check Number{/ts}: {$checkNumber} -{/if} -{if $contributeMode ne 'notify' and !$isAmountzero and (!$is_pay_later or $isBillingAddressRequiredForPayLater) and !$isOnWaitlist and !$isRequireApproval} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Billing Name and Address{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$billingName} -{$address} -{/if} - -{if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Credit Card Information{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$credit_card_type} -{$credit_card_number} -{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} -{/if} -{/if} -{/if} {* End of conditional section for Paid events *} - -{if $customPre} -{foreach from=$customPre item=customPr key=i} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$customPre_grouptitle.$i} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$customPr item=customValue key=customName} -{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - {$customName}: {$customValue} -{/if} -{/foreach} -{/foreach} -{/if} - -{if $customPost} -{foreach from=$customPost item=customPos key=j} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$customPost_grouptitle.$j} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$customPos item=customValue key=customName} -{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - {$customName}: {$customValue} -{/if} -{/foreach} -{/foreach} -{/if} -{if $customProfile} - -{foreach from=$customProfile.profile item=eachParticipant key=participantID} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts 1=$participantID+2}Participant Information - Participant %1{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$eachParticipant item=eachProfile key=pid} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{$customProfile.title.$pid} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{foreach from=$eachProfile item=val key=field} -{foreach from=$val item=v key=f} -{$field}: {$v} -{/foreach} -{/foreach} -{/foreach} -{/foreach} -{/if} -{if $customGroup} -{foreach from=$customGroup item=value key=customName} -=========================================================={if $pricesetFieldsCount }===================={/if} - -{$customName} -=========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$value item=v key=n} -{$n}: {$v} -{/foreach} -{/foreach} -{/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} diff --git a/CRM/Upgrade/4.7.alpha1.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.7.alpha1.msg_template/civicrm_msg_template.tpl deleted file mode 100644 index c2c68d1509..0000000000 --- a/CRM/Upgrade/4.7.alpha1.msg_template/civicrm_msg_template.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{php} - $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.7.alpha1.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/4.7.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl b/CRM/Upgrade/4.7.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl deleted file mode 100644 index e88f1bd39b..0000000000 --- a/CRM/Upgrade/4.7.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl +++ /dev/null @@ -1,433 +0,0 @@ - - - - - - - - - - - -
-
- - - - - - - - - {if $organization_name} - - {else} - - {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{ts}INVOICE{/ts}{ts}Invoice Date:{/ts}{$domain_organization}
{$display_name} ({$organization_name}){$display_name}{$invoice_date} - {if $domain_street_address } - {$domain_street_address} - {/if} - {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}
{$street_address} {$supplemental_address_1}{ts}Invoice Number:{/ts}{if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if} - {if $domain_state }{$domain_state}{/if}
{$supplemental_address_2} {$stateProvinceAbbreviation}{$invoice_id}{if $domain_city} - {$domain_city} - {/if} - {if $domain_postal_code } - {$domain_postal_code} - {/if} -
{$city} {$postal_code}{ts}Reference:{/ts} {if $domain_country} - {$domain_country} - {/if}
{$source} {if $domain_phone}{$domain_phone}{/if}
{if $domain_email} - {$domain_email} - {/if}
- - - - -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - - - - {foreach from=$lineItem item=value key=priceset name=taxpricevalue} - {if $smarty.foreach.taxpricevalue.index eq 0} - - {else} - - {/if} - - - - - {if $value.tax_amount != ''} - - {else} - - {/if} - - - {/foreach} - - - - - - - {foreach from = $dataArray item = value key = priceset} - - - {if $priceset} - - - {elseif $priceset == 0} - - - - {/if} - {/foreach} - - - - - - - - - - - - {if $is_pay_later == 0} - - - - - - - - - - - - - - - {/if} -


- - - - - - - -
{ts}Description{/ts}{ts}Quantity{/ts}{ts}Unit Price{/ts}{$taxTerm} {ts 1=$defaultCurrency}Amount %1{/ts}
- {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}
{$value.description|truncate:30:"..."}
{/if} - 		{$value.qty} {$value.unit_price|crmMoney:$currency} {$value.tax_rate}%{ts 1=$taxTerm}No %1{/ts}{$value.subTotal|crmMoney:$currency}
{ts}Sub Total{/ts} {$subTotal|crmMoney:$currency}
{ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}{$value|crmMoney:$currency} {ts 1=$taxTerm}TOTAL NO %1{/ts}{$value|crmMoney:$currency}
{ts 1=$defaultCurrency}TOTAL %1{/ts}{$amount|crmMoney:$currency}
- {if $contribution_status_id == $refundedStatusId} - {ts}LESS Amount Credited{/ts} - {else} - {ts}LESS Amount Paid{/ts} - {/if} - {$amount|crmMoney:$currency}
{ts}AMOUNT DUE:{/ts} {$amountDue|crmMoney:$currency}
{ts 1=$dueDate}DUE DATE: %1{/ts}
-
- - - - -
- - - - - -
{ts}PAYMENT ADVICE{/ts}

{ts}To: {/ts}
- {$domain_organization}
- {$domain_street_address} {$domain_supplemental_address_1}
- {$domain_supplemental_address_2} {$domain_state}
- {$domain_city} {$domain_postal_code}
- {$domain_country}
- {$domain_phone}
- {$domain_email}
-

{$notes} - 		- - - - - - - - - - - - - {if $is_pay_later == 1} - - - - - - {else} - - - - - - {/if} - - - - - - - - -
{ts}Customer: {/ts}{$display_name}
{ts}Invoice Number: {/ts}{$invoice_id}
{ts}Amount Due:{/ts}{$amount|crmMoney:$currency}
{ts}Amount Due: {/ts}{$amountDue|crmMoney:$currency}
{ts}Due Date: {/ts}{$dueDate}
-
- - - {if $contribution_status_id == $refundedStatusId} - - - - -
-
- - - - - - - - - - {if $organization_name} - - {else} - - {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{ts}CREDIT NOTE{/ts}{ts}Date:{/ts}{$domain_organization}
{$display_name} ({$organization_name}){$display_name}{$invoice_date} - {if $domain_street_address } - {$domain_street_address} - {/if} - {if $domain_supplemental_address_1 } - {$domain_supplemental_address_1} - {/if}
{$street_address} {$supplemental_address_1}{ts}Credit Note Number:{/ts}{if $domain_supplemental_address_2 } - {$domain_supplemental_address_2} - {/if} - {if $domain_state } - {$domain_state} - {/if} -
{$supplemental_address_2} {$stateProvinceAbbreviation}{$creditnote_id}{if $domain_city} - {$domain_city} - {/if} - {if $domain_postal_code } - {$domain_postal_code} - {/if} -
{$city} {$postal_code}{ts}Reference:{/ts} {if $domain_country} - {$domain_country} - {/if}
{$source} {if $domain_phone} - {$domain_phone} - {/if}
{if $domain_email} - {$domain_email} - {/if}
- - - - - -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - - - - {foreach from=$lineItem item=value key=priceset name=pricevalue} - {if $smarty.foreach.pricevalue.index eq 0} - - {else} - - {/if} - - - - - {if $value.tax_amount != ''} - - {else} - - {/if} - - - {/foreach} - - - - - - - {foreach from = $dataArray item = value key = priceset} - - - {if $priceset} - - - {elseif $priceset == 0} - - - - {/if} - {/foreach} - - - - - - - - - - - - {if $is_pay_later == 0} - - - - - - - - - - - - - - - - {/if} -


- - - - - - - -
{ts}Description{/ts}{ts}Quantity{/ts}{ts}Unit Price{/ts}{$taxTerm} {ts 1=$defaultCurrency}Amount %1{/ts}
- {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}
{$value.description|truncate:30:"..."}
{/if} - 		{$value.qty} {$value.unit_price|crmMoney:$currency} {$value.tax_rate}%{ts 1=$taxTerm}No %1{/ts}{$value.subTotal|crmMoney:$currency}
{ts}Sub Total{/ts} {$subTotal|crmMoney:$currency}
{ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}{$value|crmMoney:$currency} {ts 1=$taxTerm}TOTAL NO %1{/ts}{$value|crmMoney:$currency}
{ts 1=$defaultCurrency}TOTAL %1{/ts}{$amount|crmMoney:$currency}
{ts}LESS Credit to invoice(s){/ts}{$amount|crmMoney:$currency}
{ts}REMAINING CREDIT{/ts}{$amountDue|crmMoney:$currency}
-
- - - - - -
- - - - - - -
{ts}CREDIT ADVICE{/ts}

{ts}Please do not pay on this advice. Deduct the amount of this Credit Note from your next payment to us{/ts}

 - - - - - - - - - - - - - - - - - -
{ts}Customer:{/ts} {$display_name}
{ts}Credit Note#:{/ts} {$creditnote_id}
{ts}Credit Amount:{/ts}{$amount|crmMoney:$currency}
-
- {/if} -
- - diff --git a/CRM/Upgrade/4.7.alpha1.msg_template/message_templates/pcp_owner_notify_html.tpl b/CRM/Upgrade/4.7.alpha1.msg_template/message_templates/pcp_owner_notify_html.tpl deleted file mode 100644 index 9e4b6d29d6..0000000000 --- a/CRM/Upgrade/4.7.alpha1.msg_template/message_templates/pcp_owner_notify_html.tpl +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - -{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} - -

{ts}You have received a donation at your personal page{/ts}: {$page_title}

-

{ts}Your fundraising total has been updated.{/ts}
- {ts}The donor's information is listed below. You can choose to contact them and convey your thanks if you wish.{/ts}
- {if $is_honor_roll_enabled} - {ts}The donor's name has been added to your honor roll unless they asked not to be included.{/ts}
- {/if} -

- - - - - -
{ts}Received{/ts}: {$receive_date|crmDate}
{ts}Amount{/ts}: {$total_amount|crmMoney:$currency}
{ts}Name{/ts}: {$donors_display_name}
{ts}Email{/ts}: {$donors_email}
- - diff --git a/CRM/Upgrade/4.7.alpha1.msg_template/message_templates/pcp_owner_notify_text.tpl b/CRM/Upgrade/4.7.alpha1.msg_template/message_templates/pcp_owner_notify_text.tpl deleted file mode 100644 index 4c7f7841af..0000000000 --- a/CRM/Upgrade/4.7.alpha1.msg_template/message_templates/pcp_owner_notify_text.tpl +++ /dev/null @@ -1,20 +0,0 @@ -=========================================================== -{ts}Personal Campaign Page Owner Notification{/ts} - -=========================================================== -{ts}You have received a donation at your personal page{/ts}: {$page_title} ->> {$pcpInfoURL} - -{ts}Your fundraising total has been updated.{/ts} -{ts}The donor's information is listed below. You can choose to contact them and convey your thanks if you wish.{/ts} -{if $is_honor_roll_enabled} - {ts}The donor's name has been added to your honor roll unless they asked not to be included.{/ts} -{/if} - -{ts}Received{/ts}: {$receive_date|crmDate} - -{ts}Amount{/ts}: {$total_amount|crmMoney:$currency} - -{ts}Name{/ts}: {$donors_display_name} - -{ts}Email{/ts}: {$donors_email} diff --git a/CRM/Upgrade/4.7.beta1.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.7.beta1.msg_template/civicrm_msg_template.tpl deleted file mode 100644 index 9189f0b384..0000000000 --- a/CRM/Upgrade/4.7.beta1.msg_template/civicrm_msg_template.tpl +++ /dev/null @@ -1,56 +0,0 @@ -{php} - $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.7.beta1.msg_template/message_templates'; - $templates = array(); - $ovNames = array( - 'event' => array( - 'participant_transferred' => ts('Events - Registration Transferred Notice', array('escape' => 'sql')), - ), - ); - - $this->assign('ovNames', $ovNames); - $this->assign('dir', $dir); - - 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=$ovNames key=name item=ignore} - SELECT @tpl_ogid_{$name} := MAX(id) FROM civicrm_option_group WHERE name = 'msg_tpl_workflow_{$name}'; - SELECT @max_val := MAX(ROUND(op.value)) FROM civicrm_option_value op WHERE op.option_group_id = @tpl_ogid_{$name}; - SELECT @max_wt := max(weight) from civicrm_option_value where option_group_id=@tpl_ogid_{$name}; -{/foreach} - -INSERT INTO civicrm_option_value - (option_group_id, name, {localize field='label'}label{/localize}, value, weight) VALUES -{foreach from=$ovNames key=gName item=ovs name=for_groups} -{foreach from=$ovs key=vName item=label name=for_values} - (@tpl_ogid_{$gName}, '{$vName}', {localize}'{$label}'{/localize}, (SELECT @max_val := @max_val+1), (SELECT @max_wt := @max_wt+1)) {if $smarty.foreach.for_groups.last and $smarty.foreach.for_values.last};{else},{/if} -{/foreach} -{/foreach} - -{foreach from=$ovNames key=gName item=ovs} -{foreach from=$ovs key=vName item=label} - SELECT @tpl_ovid_{$vName} := MAX(id) FROM civicrm_option_value WHERE option_group_id = @tpl_ogid_{$gName} AND name = '{$vName}'; -{/foreach} -{/foreach} - -INSERT INTO civicrm_msg_template - (msg_title, msg_subject, msg_text, msg_html, workflow_id, is_default, is_reserved) VALUES -{foreach from=$ovNames key=gName item=ovs name=for_groups} -{foreach from=$ovs key=vName item=title name=for_values} - {fetch assign=subject file="`$smarty.const.SMARTY_DIR`/../../CRM/Upgrade/4.7.beta1.msg_template/message_templates/`$vName`_subject.tpl"} - {fetch assign=text file="`$smarty.const.SMARTY_DIR`/../../CRM/Upgrade/4.7.beta1.msg_template/message_templates/`$vName`_text.tpl"} - {fetch assign=html file="`$smarty.const.SMARTY_DIR`/../../CRM/Upgrade/4.7.beta1.msg_template/message_templates/`$vName`_html.tpl"} - ('{$title}', '{$subject|escape:"quotes"}', '{$text|escape:"quotes"}', '{$html|escape:"quotes"}', @tpl_ovid_{$vName}, 1, 0), - ('{$title}', '{$subject|escape:"quotes"}', '{$text|escape:"quotes"}', '{$html|escape:"quotes"}', @tpl_ovid_{$vName}, 0, 1) {if $smarty.foreach.for_groups.last and $smarty.foreach.for_values.last};{else},{/if} -{/foreach} -{/foreach} - -{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/4.7.beta1.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.7.beta1.msg_template/message_templates/event_online_receipt_html.tpl deleted file mode 100644 index fa1beb268b..0000000000 --- a/CRM/Upgrade/4.7.beta1.msg_template/message_templates/event_online_receipt_html.tpl +++ /dev/null @@ -1,526 +0,0 @@ - - - - - - - - -{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=tdfirstStyle}style="width: 180px; padding-bottom: 15px;"{/capture} -{capture assign=tdStyle}style="width: 100px;"{/capture} -{capture assign=participantTotal}style="margin: 0.5em 0 0.5em;padding: 0.5em;background-color: #999999;font-weight: bold;color: #FAFAFA;border-radius: 2px;"{/capture} - - -
- - - - - - - - - - - - - - - - {/if} - - -
-

{contact.email_greeting},

- - {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)} -

{$event.confirm_email_text|htmlize}

- - {else} -

Thank you for your participation. This letter is a confirmation that your registration has been received and your status has been updated to {if $participant_status}{$participant_status}{else}{if $isOnWaitlist}waitlisted{else}registered{/if}{/if}.

- - {/if} - -

- {if $isOnWaitlist} -

{ts}You have been added to the WAIT LIST for this event.{/ts}

- {if $isPrimary} -

{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}

- {/if} - {elseif $isRequireApproval} -

{ts}Your registration has been submitted.{/ts}

- {if $isPrimary} -

{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}

- {/if} - {elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant} -

{$pay_later_receipt}

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

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

- {/if} - -
- - - - - - - - - - {if $conference_sessions} - - - - - - - {/if} - - {if $event.participant_role neq 'Attendee' and $defaultRole} - - - - - {/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} - - {if $event.is_public} - - - - {/if} - - {if $event.is_share} - - - - {/if} - {if $payer.name} - - - - - - - {/if} - {if $event.is_monetary} - - - - - - {if $lineItem} - {foreach from=$lineItem item=value key=priceset} - {if $value neq 'skip'} - {if $isPrimary} - {if $lineItem|@count GT 1} {* Header for multi participant registration cases. *} - - - - {/if} - {/if} - - - - {/if} - {/foreach} - {if $dataArray} - - - - - {foreach from=$dataArray item=value key=priceset} - - {if $priceset || $priceset == 0} - - - {else} - - - {/if} - - {/foreach} - {/if} - {/if} - - {if $amounts && !$lineItem} - {foreach from=$amounts item=amnt key=level} - - - - {/foreach} - {/if} - - {if $totalTaxAmount} - - - - - {/if} - {if $isPrimary} - - - - - {if $pricesetFieldsCount } - - - - {/if} - - {if $register_date} - - - - - {/if} - - {if $receive_date} - - - - - {/if} - - {if $contributionTypeName} - - - - - {/if} - - {if $trxn_id} - - - - - {/if} - - {if $paidBy} - - - - - {/if} - - {if $checkNumber} - - - - - {/if} - - {if $contributeMode ne 'notify' and !$isAmountzero and (!$is_pay_later or $isBillingAddressRequiredForPayLater) and !$isOnWaitlist and !$isRequireApproval} - - - - - - - {/if} - - {if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} - - - - - - - {/if} - - {/if} - - {/if} {* End of conditional section for Paid events *} - - -{if $customPre} -{foreach from=$customPre item=customPr key=i} - - {foreach from=$customPr item=customValue key=customName} - {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - - - - - {/if} - {/foreach} -{/foreach} -{/if} - -{if $customPost} -{foreach from=$customPost item=customPos key=j} - - {foreach from=$customPos item=customValue key=customName} - {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - - - - -{/if} -{/foreach} -{/foreach} -{/if} - -{if $customProfile} -{foreach from=$customProfile.profile item=eachParticipant key=participantID} - - {foreach from=$eachParticipant item=eachProfile key=pid} - - {foreach from=$eachProfile item=val key=field} - {foreach from=$val item=v key=f} - - - {/foreach} - - {/foreach} -{/foreach} -{/foreach} -{/if} - - {if $customGroup} - {foreach from=$customGroup item=value key=customName} - - - - {foreach from=$value item=v key=n} - - - - - {/foreach} - {/foreach} - {/if} -
- {ts}Event Information and Location{/ts} -
- {$event.event_title}
- {$event.event_start_date|date_format:"%A"} {$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|date_format:"%A"} {$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} - - {$event.participant_role} -
- {if $location.address.1.name} - {$location.address.1.name}
- {/if} - {if $location.address.1.street_address} - {$location.address.1.street_address}
- {/if} - {if $location.address.1.supplemental_address_1} - {$location.address.1.supplemental_address_1}
- {/if} - {if $location.address.1.supplemental_address_2} - {$location.address.1.supplemental_address_2}
- {/if} - {if $location.address.1.city} - {$location.address.1.city}, {$location.address.1.state_province} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if}
- {/if} -
- {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} -
- {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} -
- {capture assign=eventUrl}{crmURL p='civicrm/event/info' q="id=`$event.id`&reset=1" a=true fe=1 h=1}{/capture} - {include file="CRM/common/SocialNetwork.tpl" emailMode=true url=$eventUrl title=$event.title pageURL=$eventUrl} -
- {ts}You were registered by:{/ts} -
- {$payer.name} -
- {$event.fee_label} -
- {ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info} -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - {if $dataArray} - - - - {/if} - - {if $pricesetFieldsCount }{/if} - - {foreach from=$value item=line} - - - - - {if $dataArray} - - {if $line.tax_rate != "" || $line.tax_amount != ""} - - - {else} - - - {/if} - {/if} - - {if $pricesetFieldsCount } {/if} - - {/foreach} - {if $individual} - - - - - - - {/if} -
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/ts}{ts}SubTotal{/ts}{ts}Tax Rate{/ts}{ts}Tax Amount{/ts}{ts}Total{/ts}{ts}Total Participants{/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} - - {$line.tax_rate|string_format:"%.2f"}% - - {$line.tax_amount|crmMoney} - - {$line.line_total+$line.tax_amount|crmMoney:$currency} - {$line.participant_count}
{ts}Participant Total{/ts}{$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney}{$individual.$priceset.totalTaxAmt|crmMoney}{$individual.$priceset.totalAmtWithTax|crmMoney}
-
- {ts} Amount Before Tax: {/ts} - - {$totalAmount-$totalTaxAmount|crmMoney} -
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}No{/ts} {$taxTerm} {$value|crmMoney:$currency}
- {$amnt.amount|crmMoney:$currency} {$amnt.label} -
- {ts}Total Tax Amount{/ts} - - {$totalTaxAmount|crmMoney:$currency} -
- {ts}Total Amount{/ts} - - {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if} -
- {ts}Total Participants{/ts} - {assign var="count" value= 0} - {foreach from=$lineItem item=pcount} - {assign var="lineItemCount" value=0} - {if $pcount neq 'skip'} - {foreach from=$pcount item=p_count} - {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} - {/foreach} - {if $lineItemCount < 1 } - {assign var="lineItemCount" value=1} - {/if} - {assign var="count" value=$count+$lineItemCount} - {/if} - {/foreach} - {$count} -
- {ts}Registration Date{/ts} - - {$register_date|crmDate} -
- {ts}Transaction Date{/ts} - - {$receive_date|crmDate} -
- {ts}Financial Type{/ts} - - {$contributionTypeName} -
- {ts}Transaction #{/ts} - - {$trxn_id} -
- {ts}Paid By{/ts} - - {$paidBy} -
- {ts}Check Number{/ts} - - {$checkNumber} -
- {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} -
{$customPre_grouptitle.$i}
{$customName}{$customValue}
{$customPost_grouptitle.$j}
{$customName}{$customValue}
{ts 1=$participantID+2}Participant %1{/ts}
{$customProfile.title.$pid}
{$field}{$v}
- {$customName} -
- {$n} - - {$v} -
- {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}Click here to transfer or cancel your registration.{/ts} -
-
- - - diff --git a/CRM/Upgrade/4.7.beta1.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.7.beta1.msg_template/message_templates/event_online_receipt_text.tpl deleted file mode 100644 index ba5703c2a4..0000000000 --- a/CRM/Upgrade/4.7.beta1.msg_template/message_templates/event_online_receipt_text.tpl +++ /dev/null @@ -1,311 +0,0 @@ -{contact.email_greeting}, - -{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)} -{$event.confirm_email_text} - -{else} -Thank you for your participation. This letter is a confirmation that your registration has been received and your status has been updated to {if $participant_status}{$participant_status}{else}{if $isOnWaitlist}waitlisted{else}registered{/if}{/if}. - -{/if} - -{if $isOnWaitlist} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}You have been added to the WAIT LIST for this event.{/ts} - -{if $isPrimary} -{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} -{/if} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{elseif $isRequireApproval} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Your registration has been submitted.{/ts} - -{if $isPrimary} -{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} - -{/if} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$pay_later_receipt} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{else} - -{ts}Please print this confirmation for your records.{/ts} -{/if} - - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Event Information and Location{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$event.event_title} -{$event.event_start_date|date_format:"%A"} {$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|date_format:"%A"} {$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} - -{if $event.participant_role neq 'Attendee' and $defaultRole} -{ts}Participant Role{/ts}: {$event.participant_role} -{/if} - -{if $isShowLocation} -{if $location.address.1.name} - -{$location.address.1.name} -{/if} -{if $location.address.1.street_address}{$location.address.1.street_address} -{/if} -{if $location.address.1.supplemental_address_1}{$location.address.1.supplemental_address_1} -{/if} -{if $location.address.1.supplemental_address_2}{$location.address.1.supplemental_address_2} -{/if} -{if $location.address.1.city}{$location.address.1.city}, {$location.address.1.state_province} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if} -{/if} - -{/if}{*End of isShowLocation condition*} - -{if $location.phone.1.phone || $location.email.1.email} - -{ts}Event Contacts:{/ts} -{foreach from=$location.phone item=phone} -{if $phone.phone} - -{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if} -{/foreach} -{foreach from=$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 $payer.name} -You were registered by: {$payer.name} -{/if} -{if $event.is_monetary} {* This section for Paid events only.*} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$event.fee_label} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{if $lineItem}{foreach from=$lineItem item=value key=priceset} - -{if $value neq 'skip'} -{if $isPrimary} -{if $lineItem|@count GT 1} {* Header for multi participant registration cases. *} -{ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info} - -{/if} -{/if} ------------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if} - -{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} -{if $pricesetFieldsCount }{capture assign=ts_participant_total}{ts}Total Participants{/ts}{/capture}{/if} -{$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {if $dataArray} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {/if} {$ts_total|string_format:"%10s"} {$ts_participant_total|string_format:"%10s"} ------------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if} - -{foreach from=$value item=line} -{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if} -{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"}{$ts_participant_count|string_format:"%10s"} -{/foreach} ----------------------------------------------------------------------------------------------------------------- -{if $individual}{ts}Participant Total{/ts} {$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:"%29s"} {$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:"%33s"} {$individual.$priceset.totalAmtWithTax|crmMoney:$currency|string_format:"%12s"}{/if} -{/if} -{""|string_format:"%120s"} -{/foreach} -{""|string_format:"%120s"} - -{if $dataArray} -{ts}Amount before Tax{/ts}: {$totalAmount-$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 $amounts && !$lineItem} -{foreach from=$amounts item=amnt key=level}{$amnt.amount|crmMoney:$currency} {$amnt.label} -{/foreach} -{/if} - -{if $totalTaxAmount} -{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency} -{/if} -{if $isPrimary } - -{ts}Total Amount{/ts}: {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if} - -{if $pricesetFieldsCount } - {assign var="count" value= 0} - {foreach from=$lineItem item=pcount} - {assign var="lineItemCount" value=0} - {if $pcount neq 'skip'} - {foreach from=$pcount item=p_count} - {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} - {/foreach} - {if $lineItemCount < 1 } - {assign var="lineItemCount" value=1} - {/if} - {assign var="count" value=$count+$lineItemCount} - {/if} - {/foreach} - -{ts}Total Participants{/ts}: {$count} -{/if} - -{if $register_date} -{ts}Registration Date{/ts}: {$register_date|crmDate} -{/if} -{if $receive_date} -{ts}Transaction Date{/ts}: {$receive_date|crmDate} -{/if} -{if $contributionTypeName} -{ts}Financial Type{/ts}: {$contributionTypeName} -{/if} -{if $trxn_id} -{ts}Transaction #{/ts}: {$trxn_id} -{/if} -{if $paidBy} -{ts}Paid By{/ts}: {$paidBy} -{/if} -{if $checkNumber} -{ts}Check Number{/ts}: {$checkNumber} -{/if} -{if $contributeMode ne 'notify' and !$isAmountzero and (!$is_pay_later or $isBillingAddressRequiredForPayLater) and !$isOnWaitlist and !$isRequireApproval} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Billing Name and Address{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$billingName} -{$address} -{/if} - -{if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Credit Card Information{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$credit_card_type} -{$credit_card_number} -{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} -{/if} -{/if} -{/if} {* End of conditional section for Paid events *} - -{if $customPre} -{foreach from=$customPre item=customPr key=i} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$customPre_grouptitle.$i} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$customPr item=customValue key=customName} -{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - {$customName}: {$customValue} -{/if} -{/foreach} -{/foreach} -{/if} - -{if $customPost} -{foreach from=$customPost item=customPos key=j} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$customPost_grouptitle.$j} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$customPos item=customValue key=customName} -{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - {$customName}: {$customValue} -{/if} -{/foreach} -{/foreach} -{/if} -{if $customProfile} - -{foreach from=$customProfile.profile item=eachParticipant key=participantID} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts 1=$participantID+2}Participant Information - Participant %1{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$eachParticipant item=eachProfile key=pid} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{$customProfile.title.$pid} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{foreach from=$eachProfile item=val key=field} -{foreach from=$val item=v key=f} -{$field}: {$v} -{/foreach} -{/foreach} -{/foreach} -{/foreach} -{/if} -{if $customGroup} -{foreach from=$customGroup item=value key=customName} -=========================================================={if $pricesetFieldsCount }===================={/if} - -{$customName} -=========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$value item=v key=n} -{$n}: {$v} -{/foreach} -{/foreach} -{/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} diff --git a/CRM/Upgrade/4.7.beta1.msg_template/message_templates/participant_confirm_html.tpl b/CRM/Upgrade/4.7.beta1.msg_template/message_templates/participant_confirm_html.tpl deleted file mode 100644 index 7585ee306f..0000000000 --- a/CRM/Upgrade/4.7.beta1.msg_template/message_templates/participant_confirm_html.tpl +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - -{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} - - - - -
-

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

-
- {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} -
- {if $event.location.address.1.name} - {$event.location.address.1.name}
- {/if} - {if $event.location.address.1.street_address} - {$event.location.address.1.street_address}
- {/if} - {if $event.location.address.1.supplemental_address_1} - {$event.location.address.1.supplemental_address_1}
- {/if} - {if $event.location.address.1.supplemental_address_2} - {$event.location.address.1.supplemental_address_2}
- {/if} - {if $event.location.address.1.city} - {$event.location.address.1.city} {$event.location.address.1.postal_code} - {if $event.location.address.1.postal_code_suffix} - - {$event.location.address.1.postal_code_suffix} - {/if} - {/if} -
- {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/4.7.beta1.msg_template/message_templates/participant_confirm_text.tpl b/CRM/Upgrade/4.7.beta1.msg_template/message_templates/participant_confirm_text.tpl deleted file mode 100644 index cb4795b824..0000000000 --- a/CRM/Upgrade/4.7.beta1.msg_template/message_templates/participant_confirm_text.tpl +++ /dev/null @@ -1,93 +0,0 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, -{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} -{if $event.location.address.1.name} - -{$event.location.address.1.name} -{/if} -{if $event.location.address.1.street_address}{$event.location.address.1.street_address} -{/if} -{if $event.location.address.1.supplemental_address_1}{$event.location.address.1.supplemental_address_1} -{/if} -{if $event.location.address.1.supplemental_address_2}{$event.location.address.1.supplemental_address_2} -{/if} -{if $event.location.address.1.city}{$event.location.address.1.city} {$event.location.address.1.postal_code}{if $event.location.address.1.postal_code_suffix} - {$event.location.address.1.postal_code_suffix}{/if} -{/if} - -{/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/4.7.beta1.msg_template/message_templates/participant_transferred_html.tpl b/CRM/Upgrade/4.7.beta1.msg_template/message_templates/participant_transferred_html.tpl deleted file mode 100644 index efb55af315..0000000000 --- a/CRM/Upgrade/4.7.beta1.msg_template/message_templates/participant_transferred_html.tpl +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - -{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} - -
- - - - - - - - - - - - - - - - - - - -
-

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

-

{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} -
- {if $event.location.address.1.name} - {$event.location.address.1.name}
- {/if} - {if $event.location.address.1.street_address} - {$event.location.address.1.street_address}
- {/if} - {if $event.location.address.1.supplemental_address_1} - {$event.location.address.1.supplemental_address_1}
- {/if} - {if $event.location.address.1.supplemental_address_2} - {$event.location.address.1.supplemental_address_2}
- {/if} - {if $event.location.address.1.city} - {$event.location.address.1.city} {$event.location.address.1.postal_code} - {if $event.location.address.1.postal_code_suffix} - - {$event.location.address.1.postal_code_suffix} - {/if} - {/if} -
- {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/4.7.beta1.msg_template/message_templates/participant_transferred_subject.tpl b/CRM/Upgrade/4.7.beta1.msg_template/message_templates/participant_transferred_subject.tpl deleted file mode 100644 index 6488ece90b..0000000000 --- a/CRM/Upgrade/4.7.beta1.msg_template/message_templates/participant_transferred_subject.tpl +++ /dev/null @@ -1 +0,0 @@ -{ts 1=$event.event_title}Event Registration Transferred for %1{/ts} diff --git a/CRM/Upgrade/4.7.beta1.msg_template/message_templates/participant_transferred_text.tpl b/CRM/Upgrade/4.7.beta1.msg_template/message_templates/participant_transferred_text.tpl deleted file mode 100644 index 6c50c9b450..0000000000 --- a/CRM/Upgrade/4.7.beta1.msg_template/message_templates/participant_transferred_text.tpl +++ /dev/null @@ -1,57 +0,0 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, - -{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} -{if $event.location.address.1.name} - -{$event.location.address.1.name} -{/if} -{if $event.location.address.1.street_address}{$event.location.address.1.street_address} -{/if} -{if $event.location.address.1.supplemental_address_1}{$event.location.address.1.supplemental_address_1} -{/if} -{if $event.location.address.1.supplemental_address_2}{$event.location.address.1.supplemental_address_2} -{/if} -{if $event.location.address.1.city}{$event.location.address.1.city} {$event.location.address.1.postal_code}{if $event.location.address.1.postal_code_suffix} - $event.location.address.1.postal_code_suffix}{/if} -{/if} - -{/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/4.7.beta8.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.7.beta8.msg_template/civicrm_msg_template.tpl deleted file mode 100644 index c1335a695c..0000000000 --- a/CRM/Upgrade/4.7.beta8.msg_template/civicrm_msg_template.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{php} - $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.7.beta8.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/4.7.beta8.msg_template/message_templates/contribution_invoice_receipt_html.tpl b/CRM/Upgrade/4.7.beta8.msg_template/message_templates/contribution_invoice_receipt_html.tpl deleted file mode 100644 index 8606e18e58..0000000000 --- a/CRM/Upgrade/4.7.beta8.msg_template/message_templates/contribution_invoice_receipt_html.tpl +++ /dev/null @@ -1,437 +0,0 @@ - - - - - - - - - - - -
-
- - - - - - - - - {if $organization_name} - - {else} - - {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{ts}INVOICE{/ts}{ts}Invoice Date:{/ts}{$domain_organization}
{$display_name} ({$organization_name}){$display_name}{$invoice_date} - {if $domain_street_address } - {$domain_street_address} - {/if} - {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}
{$street_address} {$supplemental_address_1}{ts}Invoice Number:{/ts}{if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if} - {if $domain_state }{$domain_state}{/if}
{$supplemental_address_2} {$stateProvinceAbbreviation}{$invoice_id}{if $domain_city} - {$domain_city} - {/if} - {if $domain_postal_code } - {$domain_postal_code} - {/if} -
{$city} {$postal_code}{ts}Reference:{/ts} {if $domain_country} - {$domain_country} - {/if}
{$source} {if $domain_phone}{$domain_phone}{/if}
{if $domain_email} - {$domain_email} - {/if}
- - - - -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - - - - {foreach from=$lineItem item=value key=priceset name=taxpricevalue} - {if $smarty.foreach.taxpricevalue.index eq 0} - - {else} - - {/if} - - - - - {if $value.tax_amount != ''} - - {else} - - {/if} - - - {/foreach} - - - - - - - {foreach from = $dataArray item = value key = priceset} - - - {if $priceset} - - - {elseif $priceset == 0} - - - - {/if} - {/foreach} - - - - - - - - - - - - {if $is_pay_later == 0} - - - - - - - - - - - - - - - {/if} -


- - - - {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1} - - - - - {/if} -
{ts}Description{/ts}{ts}Quantity{/ts}{ts}Unit Price{/ts}{$taxTerm} {ts 1=$defaultCurrency}Amount %1{/ts}
- {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}
{$value.description|truncate:30:"..."}
{/if} - 		{$value.qty} {$value.unit_price|crmMoney:$currency} {$value.tax_rate}%{ts 1=$taxTerm}No %1{/ts}{$value.subTotal|crmMoney:$currency}
{ts}Sub Total{/ts} {$subTotal|crmMoney:$currency}
{ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}{$value|crmMoney:$currency} {ts 1=$taxTerm}TOTAL NO %1{/ts}{$value|crmMoney:$currency}
{ts 1=$defaultCurrency}TOTAL %1{/ts}{$amount|crmMoney:$currency}
- {if $contribution_status_id == $refundedStatusId} - {ts}LESS Amount Credited{/ts} - {else} - {ts}LESS Amount Paid{/ts} - {/if} - {$amount|crmMoney:$currency}
{ts}AMOUNT DUE:{/ts} {$amountDue|crmMoney:$currency}
{ts 1=$dueDate}DUE DATE: %1{/ts}
-
- {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1} - - - - -
- - - - - -
{ts}PAYMENT ADVICE{/ts}

{ts}To: {/ts}
- {$domain_organization}
- {$domain_street_address} {$domain_supplemental_address_1}
- {$domain_supplemental_address_2} {$domain_state}
- {$domain_city} {$domain_postal_code}
- {$domain_country}
- {$domain_phone}
- {$domain_email}
-

{$notes} - 		- - - - - - - - - - - - - {if $is_pay_later == 1} - - - - - - {else} - - - - - - {/if} - - - - - - - - -
{ts}Customer: {/ts}{$display_name}
{ts}Invoice Number: {/ts}{$invoice_id}
{ts}Amount Due:{/ts}{$amount|crmMoney:$currency}
{ts}Amount Due: {/ts}{$amountDue|crmMoney:$currency}
{ts}Due Date: {/ts}{$dueDate}
-
- -{/if} - - {if $contribution_status_id == $refundedStatusId || $contribution_status_id == $cancelledStatusId} - - - - -
-
- - - - - - - - - - {if $organization_name} - - {else} - - {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{ts}CREDIT NOTE{/ts}{ts}Date:{/ts}{$domain_organization}
{$display_name} ({$organization_name}){$display_name}{$invoice_date} - {if $domain_street_address } - {$domain_street_address} - {/if} - {if $domain_supplemental_address_1 } - {$domain_supplemental_address_1} - {/if}
{$street_address} {$supplemental_address_1}{ts}Credit Note Number:{/ts}{if $domain_supplemental_address_2 } - {$domain_supplemental_address_2} - {/if} - {if $domain_state } - {$domain_state} - {/if} -
{$supplemental_address_2} {$stateProvinceAbbreviation}{$creditnote_id}{if $domain_city} - {$domain_city} - {/if} - {if $domain_postal_code } - {$domain_postal_code} - {/if} -
{$city} {$postal_code}{ts}Reference:{/ts} {if $domain_country} - {$domain_country} - {/if}
{$source} {if $domain_phone} - {$domain_phone} - {/if}
{if $domain_email} - {$domain_email} - {/if}
- - - - - -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - - - - {foreach from=$lineItem item=value key=priceset name=pricevalue} - {if $smarty.foreach.pricevalue.index eq 0} - - {else} - - {/if} - - - - - {if $value.tax_amount != ''} - - {else} - - {/if} - - - {/foreach} - - - - - - - {foreach from = $dataArray item = value key = priceset} - - - {if $priceset} - - - {elseif $priceset == 0} - - - - {/if} - {/foreach} - - - - - - - - - - - - {if $is_pay_later == 0} - - - - - - - - - - - - - - - - {/if} -


- - - - - - - -
{ts}Description{/ts}{ts}Quantity{/ts}{ts}Unit Price{/ts}{$taxTerm} {ts 1=$defaultCurrency}Amount %1{/ts}
- {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}
{$value.description|truncate:30:"..."}
{/if} - 		{$value.qty} {$value.unit_price|crmMoney:$currency} {$value.tax_rate}%{ts 1=$taxTerm}No %1{/ts}{$value.subTotal|crmMoney:$currency}
{ts}Sub Total{/ts} {$subTotal|crmMoney:$currency}
{ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}{$value|crmMoney:$currency} {ts 1=$taxTerm}TOTAL NO %1{/ts}{$value|crmMoney:$currency}
{ts 1=$defaultCurrency}TOTAL %1{/ts}{$amount|crmMoney:$currency}
{ts}LESS Credit to invoice(s){/ts}{$amount|crmMoney:$currency}
{ts}REMAINING CREDIT{/ts}{$amountDue|crmMoney:$currency}
-
- - - - - -
- - - - - - -
{ts}CREDIT ADVICE{/ts}

{ts}Please do not pay on this advice. Deduct the amount of this Credit Note from your next payment to us{/ts}

 - - - - - - - - - - - - - - - - - -
{ts}Customer:{/ts} {$display_name}
{ts}Credit Note#:{/ts} {$creditnote_id}
{ts}Credit Amount:{/ts}{$amount|crmMoney:$currency}
-
- {/if} -
- - diff --git a/CRM/Upgrade/Form.php b/CRM/Upgrade/Form.php index 1fb14e1aa8..1b7c110ceb 100644 --- a/CRM/Upgrade/Form.php +++ b/CRM/Upgrade/Form.php @@ -25,7 +25,7 @@ class CRM_Upgrade_Form extends CRM_Core_Form { /** * Minimum previous CiviCRM version we can directly upgrade from */ - const MINIMUM_UPGRADABLE_VERSION = '4.6.12'; + const MINIMUM_UPGRADABLE_VERSION = '4.7.32'; /** * @var \CRM_Core_Config diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php deleted file mode 100644 index 4db947ad4d..0000000000 --- a/CRM/Upgrade/Incremental/php/FourSeven.php +++ /dev/null @@ -1,1394 +0,0 @@ -fatalErrorTemplate) && $config->fatalErrorTemplate != 'CRM/common/fatal.tpl') { - $preUpgradeMessage .= '

' . ts('The custom fatal error template setting will be removed during the upgrade. You are currently using this custom template: %1 . Following the upgrade you will need to use the standard approach to overriding template files, as described in the documentation.', [1 => $config->fatalErrorTemplate]) . '

'; - } - } - if ($rev == '4.7.alpha4') { - // CRM-17004 Warn of Moneris removal - $count = 1; - // Query only works in 4.3+ - if (version_compare($currentVer, "4.3.0") > 0) { - // Disable i18nRewrite for multilingual because the view might not yet exist (added in 5.13.0) - $i18nRewrite = FALSE; - $count = CRM_Core_DAO::singleValueQuery("SELECT COUNT(id) FROM civicrm_payment_processor WHERE payment_processor_type_id IN (SELECT id FROM civicrm_payment_processor_type WHERE name = 'Moneris')", TRUE, NULL, FALSE, $i18nRewrite); - } - if ($count && !function_exists('moneris_civicrm_managed')) { - $preUpgradeMessage .= '

' . ts('The %1 payment processor is no longer bundled with CiviCRM. After upgrading you will need to install the extension to continue using it.', [1 => 'Moneris']) . '

'; - } - } - if ($rev == '4.7.13') { - $preUpgradeMessage .= '

' . ts('A new permission has been added called %1 This Permission is now used to control access to the Manage Tags screen', [1 => 'manage tags']) . '

'; - } - if ($rev == '4.7.22') { - // Based on support inquiries for 4.7.21, show message during 4.7.22. - // For affected users, this issue prevents loading the regular status screen. - if (!$this->checkImageUploadDir()) { - $preUpgradeMessage .= '

' . ts('There appears to be an inconsistency in the configuration of "Image Upload URL" and "Image Upload Directory".') . '

' - . '

' - . ts('Further advice will be displayed at the end of the upgrade.') - . '

'; - } - } - if ($rev == '4.7.27') { - $params = [ - 1 => 'Close accounting batches created by user', - 2 => 'Close all accounting batches', - 3 => 'Reopen accounting batches created by user', - 4 => 'Reopen all accounting batches', - 5 => 'https://wiki.civicrm.org/confluence/display/CRMDOC/Default+Permissions+and+Roles', - ]; - $preUpgradeMessage .= '

' . ts('A new set of batch permissions has been added called "%1", "%2", "%3" and "%4". These permissions are now used to control access to the Accounting Batches tasks. If your users need to be able to Reopen or Close batches you may need to give them additional permissions. Read more', $params) . '

'; - } - if ($rev == '4.7.32') { - $preUpgradeMessage .= '

' . ts('A new %1 permission has been added. It is not granted by default. If you use SMS, you may wish to review your permissions.', [1 => 'send SMS']) . '

'; - } - } - - /** - * 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) { - if ($rev == '4.7.alpha1') { - $config = CRM_Core_Config::singleton(); - // FIXME: Performing an upgrade step during postUpgrade message phase is probably bad - $editor_id = self::updateWysiwyg(); - $msg = NULL; - $ext_href = 'href="' . CRM_Utils_System::url('civicrm/admin/extensions', 'reset=1') . '"'; - $dsp_href = 'href="' . CRM_Utils_System::url('civicrm/admin/setting/preferences/display', 'reset=1') . '"'; - $blog_href = 'href="https://civicrm.org/blogs/colemanw/big-changes-wysiwyg-editing-47"'; - switch ($editor_id) { - // TinyMCE - case 1: - $msg = ts('Your configured editor "TinyMCE" is no longer part of the main CiviCRM download. To continue using it, visit the Manage Extensions page to download and install the TinyMCE extension.', [1 => $ext_href]); - break; - - // Drupal/Joomla editor - case 3: - case 4: - $msg = ts('CiviCRM no longer integrates with the "%1 Default Editor." Your wysiwyg setting has been reset to the built-in CKEditor. Learn more...', [1 => $config->userFramework, 2 => $blog_href]); - break; - } - if ($msg) { - $postUpgradeMessage .= '

' . $msg . '

'; - } - $postUpgradeMessage .= '

' . ts('CiviCRM now includes the easy-to-use CKEditor Configurator. To customize the features and display of your wysiwyg editor, visit the Display Preferences page. Learn more...', [1 => $dsp_href, 2 => $blog_href]) . '

'; - - $postUpgradeMessage .= '

' . ts('Default version of the following System Workflow Message Templates have been modified:
  • Personal Campaign Pages - Owner Notification
If you have modified these templates, please review the new default versions and implement updates as needed to your copies (Administer > Communications > Message Templates > System Workflow Messages).'); - - $postUpgradeMessage .= '

' . ts('The custom fatal error template setting has been removed.') . '

'; - } - //if ($rev == '4.7.11') { - // $postUpgradeMessage .= '

' . ts("WARNING: For increased security, profile submissions embedded in remote sites are no longer allowed to create or edit data by default. If you need to allow users to submit profiles from external sites, you can restore this at Administer > System Settings > Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.) > 'Accept profile submissions from external sites'"); - //} - if ($rev == '4.7.11') { - $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'."); - } - if ($rev == '4.7.14') { - $ck_href = 'href="' . CRM_Utils_System::url('civicrm/admin/ckeditor') . '"'; - $postUpgradeMessage .= '

' . ts('CiviMail no longer forces CKEditor to add html/head/body tags to email content because some sites place these in the message header/footer. This was added in 4.7.5 and is now disabled by default.') - . '
' . ts('You can re-enable it by visiting the CKEditor Config screen and setting "fullPage = true" under the Advanced Options of the CiviMail preset.', [1 => $ck_href]) - . '

'; - } - if ($rev == '4.7.19') { - $postUpgradeMessage .= '

' . ts('Default version of the following System Workflow Message Templates have been modified:
  • Additional Payment Receipt or Refund Notification
  • Contribution Invoice
If you have modified these templates, please review the new default versions and implement updates as needed to your copies (Administer > Communications > Message Templates > System Workflow Messages).'); - $check = CRM_Core_DAO::singleValueQuery("SELECT count(id) FROM civicrm_domain"); - $smsCheck = CRM_Core_DAO::singleValueQuery("SELECT count(id) FROM civicrm_sms_provider"); - if ($check > 1 && (bool) $smsCheck) { - $postUpgradeMessage .= '

civicrm_sms_provider ' . ts('has now had a domain id column added. As there is more than 1 domains in this install you need to manually set the domain id for the providers in this install') . '

'; - } - } - if ($rev == '4.7.22') { - // Based on support inquiries for 4.7.21, show message during 4.7.22. - // For affected users, this issue prevents loading the regular status screen. - if (!$this->checkImageUploadDir()) { - $config = CRM_Core_Config::singleton(); - $postUpgradeMessage .= - '

' . ts('Warning') . '

' - . '

' . ts('There appears to be an inconsistency in the configuration of "Image Upload URL" and "Image Upload Directory".') . '

' - . sprintf("
  • imageUploadDir: %s
  • imageUploadURL: %s
", htmlentities($config->imageUploadDir), htmlentities($config->imageUploadURL)) - . '

' - . ts('You may need to check that:

  • (a) the path and URL match,
  • (b) the httpd/htaccess policy allows requests for files inside this folder,
  • and (c) the web domain matches the normal web domain.
') - . '

' - . '

' - . ts('(Note: Although files should be readable, it is best if they are not listable or browseable.)') - . '

' - . '

' - . ts('If this remains unresolved, then some important screens may fail to load.') - . '

'; - } - } - if ($rev == '4.7.23') { - $postUpgradeMessage .= '

' . ts('Default version of the following System Workflow Message Templates have been modified:
  • Contribution Invoice
If you have modified these templates, please review the new default versions and implement updates as needed to your copies (Administer > Communications > Message Templates > System Workflow Messages).'); - } - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_alpha1($rev) { - $this->addTask('Drop action scheudle mapping foreign key', 'dropActionScheudleMappingForeignKey'); - $this->addTask('Migrate \'on behalf of\' information to module_data', 'migrateOnBehalfOfInfo'); - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask(ts('Migrate Settings to %1', [1 => $rev]), 'migrateSettings', $rev); - $this->addTask('Add Getting Started dashlet', 'addGettingStartedDashlet', $rev); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_alpha4($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask(ts('Remove %1', [1 => 'Moneris']), 'removePaymentProcessorType', 'Moneris'); - $this->addTask('Update Smart Groups', 'fixContactTypeInSmartGroups'); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_beta2($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask('Delete unused file', 'deleteVersionCheckCacheFile'); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_beta6($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask('Disable flexible jobs extension', 'disableFlexibleJobsExtension'); - $this->addTask('Add Index to financial_trxn trxn_id field', 'addIndexFinancialTrxnTrxnID'); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_1($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask('Add Index to civicrm_contribution creditnote_id field', 'addIndexContributionCreditNoteID'); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_2($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask('Fix Index on civicrm_financial_item combined entity_id + entity_table', 'addCombinedIndexFinancialItemEntityIDEntityType'); - $this->addTask('enable financial account relationships for chargeback & refund', 'addRefundAndChargeBackAccountsIfNotExist'); - $this->addTask('Add Index to civicrm_contribution.source', 'addIndexContributionSource'); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_3($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask('Add Index to civicrm_contribution.total_amount', 'addIndexContributionAmount'); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_4($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask('Add Contact Deleted by Merge Activity Type', 'addDeletedByMergeActivityType'); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_7($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - // https://issues.civicrm.org/jira/browse/CRM-18006 - if (CRM_Core_DAO::checkTableExists('civicrm_install_canary')) { - CRM_Core_DAO::executeQuery('ALTER TABLE civicrm_install_canary ENGINE=InnoDB'); - } - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_8($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask('Upgrade mailing foreign key constraints', 'upgradeMailingFKs'); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_10($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask('Upgrade Add Help Pre and Post Fields to price value table', 'addHelpPreAndHelpPostFieldsPriceFieldValue'); - $this->addTask('Alter index and type for image URL', 'alterIndexAndTypeForImageURL'); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_11($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask('Dashboard schema updates', 'dashboardSchemaUpdate'); - $this->addTask('Fill in setting "remote_profile_submissions"', 'migrateRemoteSubmissionsSetting'); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_12($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask('Add Data Type column to civicrm_option_group', 'addDataTypeColumnToOptionGroupTable'); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_13($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask('CRM-19372 - Add column to allow for payment processors to set what card types are accepted', 'addColumn', - 'civicrm_payment_processor', 'accepted_credit_cards', "text DEFAULT NULL COMMENT 'array of accepted credit card types'"); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_14($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask('Add WYSIWYG Editor Presets', 'addWysiwygPresets'); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_15($rev) { - $this->addTask('CRM-19626 - Add min_amount column to civicrm_price_set', 'addColumn', - 'civicrm_price_set', 'min_amount', "INT(10) UNSIGNED DEFAULT '0' COMMENT 'Minimum Amount required for this set.'"); - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_16($rev) { - $this->addTask('CRM-19723 - Add icon column to civicrm_option_value', 'addColumn', - 'civicrm_option_value', 'icon', "varchar(255) COMMENT 'crm-i icon class' DEFAULT NULL"); - $this->addTask('CRM-19769 - Add color column to civicrm_tag', 'addColumn', - 'civicrm_tag', 'color', "varchar(255) COMMENT 'Hex color value e.g. #ffffff' DEFAULT NULL"); - $this->addTask('CRM-19779 - Add color column to civicrm_option_value', 'addColumn', - 'civicrm_option_value', 'color', "varchar(255) COMMENT 'Hex color value e.g. #ffffff' DEFAULT NULL"); - $this->addTask('Add new CiviMail fields', 'addMailingTemplateType'); - $this->addTask('CRM-19770 - Add is_star column to civicrm_activity', 'addColumn', - 'civicrm_activity', 'is_star', "tinyint DEFAULT '0' COMMENT 'Activity marked as favorite.'"); - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_18($rev) { - $this->addTask('Update Kenyan Provinces', 'updateKenyanProvinces'); - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_19($rev) { - if (CRM_Core_BAO_SchemaHandler::checkIfFieldExists('civicrm_financial_account', 'opening_balance')) { - $query = "SELECT id FROM civicrm_financial_account WHERE opening_balance <> 0 OR current_period_opening_balance <> 0"; - $result = CRM_Core_DAO::executeQuery($query); - if (!$result->N) { - $this->addTask('Drop Column current_period_opening_balance From civicrm_financial_account table.', 'dropColumn', 'civicrm_financial_account', 'current_period_opening_balance'); - $this->addTask('Drop Column opening_balance From civicrm_financial_account table.', 'dropColumn', 'civicrm_financial_account', 'opening_balance'); - } - } - $this->addTask('CRM-19961 - Add domain_id column to civicrm_sms_provider', 'addColumn', - 'civicrm_sms_provider', 'domain_id', "int(10) unsigned COMMENT 'Which Domain is this sms provier for'"); - $this->addTask('CRM-19961 - Populate domain id table and perhaps add foreign key', 'populateSMSProviderDomainId'); - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask('CRM-16633 - Add "Change Case Subject" activity', 'addChangeCaseSubjectActivityType'); - $this->addTask('Add is_public column to civicrm_custom_group', 'addColumn', - 'civicrm_custom_group', 'is_public', "boolean DEFAULT '1' COMMENT 'Is this property public?'"); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_20($rev) { - $this->addtask('Fix Schema on civicrm_action_schedule', 'fixSchemaOnCiviCRMActionSchedule'); - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask('Add activity_status column to civicrm_mail_settings', 'addColumn', - 'civicrm_mail_settings', 'activity_status', "varchar (255) DEFAULT NULL COMMENT 'Name of status to use when creating email to activity.'"); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_23($rev) { - $this->addTask('CRM-20387 - Add invoice_number column to civicrm_contribution', 'addColumn', - 'civicrm_contribution', 'invoice_number', "varchar(255) COMMENT 'Human readable invoice number' DEFAULT NULL"); - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_25($rev) { - $this->addTask("CRM-20927 - Add column to 'civicrm_menu' for additional metadata", 'addColumn', - 'civicrm_menu', 'module_data', "text COMMENT 'All other menu metadata not stored in other fields'"); - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask('Add cancel button text column to civicrm_uf_group', 'addColumn', - 'civicrm_uf_group', 'cancel_button_text', "varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Custom Text to display on the cancel button when used in create or edit mode'", TRUE); - $this->addTask('Add Submit button text column to civicrm_uf_group', 'addColumn', - 'civicrm_uf_group', 'submit_button_text', "varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Custom Text to display on the submit button on profile edit/create screens'", TRUE); - - $this->addTask('CRM-20958 - Add created_date to civicrm_activity', 'addColumn', - 'civicrm_activity', 'created_date', "timestamp NULL DEFAULT NULL COMMENT 'When was the activity was created.'"); - $this->addTask('CRM-20958 - Add modified_date to civicrm_activity', 'addColumn', - 'civicrm_activity', 'modified_date', "timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When was the activity (or closely related entity) was created or modified or deleted.'"); - $this->addTask('CRM-20958 - Add created_date to civicrm_case', 'addColumn', - 'civicrm_case', 'created_date', "timestamp NULL DEFAULT NULL COMMENT 'When was the case was created.'"); - $this->addTask('CRM-20958 - Add modified_date to civicrm_case', 'addColumn', - 'civicrm_case', 'modified_date', "timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When was the case (or closely related entity) was created or modified or deleted.'"); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_27($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask('CRM-20892 Change created_date to default to NULL', 'civiMailingCreatedDateNull'); - $this->addTask('CRM-21234 Missing subdivisions of Tajikistan', 'tajikistanMissingSubdivisions'); - $this->addTask('CRM-20892 - Add modified_date to civicrm_mailing', 'addColumn', - 'civicrm_mailing', 'modified_date', "timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When the mailing (or closely related entity) was created or modified or deleted.'"); - $this->addTask('CRM-21195 - Add icon field to civicrm_navigation', 'addColumn', - 'civicrm_navigation', 'icon', "varchar(255) NULL DEFAULT NULL COMMENT 'CSS class name for an icon'"); - $this->addTask('CRM-12167 - Add visibility column to civicrm_price_field_value', 'addColumn', - 'civicrm_price_field_value', 'visibility_id', 'int(10) unsigned DEFAULT 1 COMMENT "Implicit FK to civicrm_option_group with name = \'visibility\'"'); - $this->addTask('Remove broken Contribution_logging reports', 'removeContributionLoggingReports'); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_28($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask('CRM-20572: Fix date fields in save search criteria of Contrib Sybunt custom search ', 'fixDateFieldsInSmartGroups'); - // CRM-20868 : Update invoice_numbers (in batch) with value in [invoice prefix][contribution id] format - $contributionSettings = Civi::settings()->get('contribution_invoice_settings'); - if (!empty($contributionSettings['invoicing']) && !empty($contributionSettings['invoice_prefix'])) { - [$minId, $maxId] = CRM_Core_DAO::executeQuery("SELECT coalesce(min(id),0), coalesce(max(id),0) - FROM civicrm_contribution ")->getDatabaseResult()->fetchRow(); - for ($startId = $minId; $startId <= $maxId; $startId += self::BATCH_SIZE) { - $endId = $startId + self::BATCH_SIZE - 1; - $title = ts("Upgrade DB to %1: Update Contribution Invoice number (%2 => %3)", [ - 1 => $rev, - 2 => $startId, - 3 => $endId, - ]); - $this->addTask($title, 'updateContributionInvoiceNumber', $startId, $endId, $contributionSettings['invoice_prefix']); - } - } - - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_31($rev) { - $this->addTask('CRM-21225: Add display title field to civicrm_uf_group', 'addColumn', 'civicrm_uf_group', 'frontend_title', - "VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL COMMENT 'Profile Form Public title'", TRUE, '4.7.31'); - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - $this->addTask('Rebuild Multilingual Schema', 'rebuildMultilingalSchema', '4.7.31'); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_7_32($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - - $this->addTask('CRM-21733: Add status_override_end_date field to civicrm_membership table', 'addColumn', 'civicrm_membership', 'status_override_end_date', - "date DEFAULT NULL COMMENT 'The end date of membership status override if (Override until selected date) override type is selected.'"); - } - - // /** - // * Upgrade function. - // * - // * @param string $rev - // */ - // public function upgrade_4_7_x($rev) { - // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); - // // 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. - // } - - /** - * @see https://issues.civicrm.org/jira/browse/CRM-16354 - * - * @return int - */ - public static function updateWysiwyg() { - $editorID = Civi::settings()->get('editor_id'); - // Previously a numeric value indicated one of 4 wysiwyg editors shipped in core, and no value indicated 'Textarea' - // Now the options are "Textarea", "CKEditor", and the rest have been dropped from core. - $newEditor = $editorID ? "CKEditor" : "Textarea"; - Civi::settings()->set('editor_id', $newEditor); - - return $editorID; - } - - /** - * Migrate any last remaining options from `civicrm_domain.config_backend` to `civicrm_setting`. - * Cleanup setting schema. - * - * @param CRM_Queue_TaskContext $ctx - * @return bool - */ - public static function migrateSettings(CRM_Queue_TaskContext $ctx) { - // Tip: If there are problems with adding the new uniqueness index, try inspecting: - // SELECT name, domain_id, contact_id, count(*) AS dupes FROM civicrm_setting cs GROUP BY name, domain_id, contact_id HAVING dupes > 1; - - // Nav records are expendable. https://forum.civicrm.org/index.php?topic=36933.0 - CRM_Core_DAO::executeQuery('DELETE FROM civicrm_setting WHERE contact_id IS NOT NULL AND name = "navigation"'); - - CRM_Core_DAO::executeQuery('ALTER TABLE civicrm_setting DROP INDEX index_group_name'); - CRM_Core_DAO::executeQuery('ALTER TABLE civicrm_setting DROP COLUMN group_name'); - - // Handle Strange activity_tab_filter settings. - CRM_Core_DAO::executeQuery('CREATE TABLE civicrm_activity_setting LIKE civicrm_setting'); - CRM_Core_DAO::executeQuery('ALTER TABLE civicrm_activity_setting ADD UNIQUE INDEX index_domain_contact_name (domain_id, contact_id, name)'); - CRM_Core_DAO::executeQuery('INSERT INTO civicrm_activity_setting (name, contact_id, domain_id, value) - SELECT DISTINCT name, contact_id, domain_id, value - FROM civicrm_setting - WHERE name = "activity_tab_filter" - AND value is not NULL'); - CRM_Core_DAO::executeQuery('DELETE FROM civicrm_setting WHERE name = "activity_tab_filter"'); - - $date = CRM_Utils_Time::getTime('Y-m-d H:i:s'); - CRM_Core_DAO::executeQuery('ALTER TABLE civicrm_setting ADD UNIQUE INDEX index_domain_contact_name (domain_id, contact_id, name)'); - CRM_Core_DAO::executeQuery("INSERT INTO civicrm_setting (name, contact_id, domain_id, value, is_domain, created_id, created_date) - SELECT name, contact_id, domain_id, value, 0, contact_id,'$date' - FROM civicrm_activity_setting - WHERE name = 'activity_tab_filter' - AND value is not NULL" - ); - CRM_Core_DAO::executeQuery('DROP TABLE civicrm_activity_setting'); - - $domainDao = CRM_Core_DAO::executeQuery('SELECT id, config_backend FROM civicrm_domain'); - while ($domainDao->fetch()) { - $settings = CRM_Upgrade_Incremental_php_FourSeven::convertBackendToSettings($domainDao->id, $domainDao->config_backend); - CRM_Core_Error::debug_var('convertBackendToSettings', [ - 'domainId' => $domainDao->id, - 'backend' => $domainDao->config_backend, - 'settings' => $settings, - ]); - - foreach ($settings as $name => $value) { - $rowParams = [ - 1 => [$domainDao->id, 'Positive'], - 2 => [$name, 'String'], - 3 => [serialize($value), 'String'], - ]; - $settingId = CRM_Core_DAO::singleValueQuery( - 'SELECT id FROM civicrm_setting WHERE domain_id = %1 AND name = %2', - $rowParams); - if (!$settingId) { - CRM_Core_DAO::executeQuery( - 'INSERT INTO civicrm_setting (domain_id, name, value, is_domain) VALUES (%1,%2,%3,1)', - $rowParams); - } - } - } - - CRM_Core_DAO::executeQuery('ALTER TABLE civicrm_domain DROP COLUMN config_backend'); - - return TRUE; - } - - /** - * Take a config_backend blob and produce an equivalent list of settings. - * - * @param int $domainId - * Domain ID. - * @param string $config_backend - * Serialized blob. - * @return array - */ - public static function convertBackendToSettings($domainId, $config_backend) { - if (!$config_backend) { - return []; - } - - $backend = unserialize($config_backend); - if (!$backend) { - return []; - } - - $mappings = \CRM_Core_Config_MagicMerge::getPropertyMap(); - $settings = []; - foreach ($backend as $propertyName => $propertyValue) { - if (isset($mappings[$propertyName][0]) && preg_match('/^setting/', $mappings[$propertyName][0])) { - // $mapping format: $propertyName => Array(0 => $type, 1 => $setting|NULL). - $settingName = $mappings[$propertyName][1] ?? $propertyName; - $settings[$settingName] = $propertyValue; - } - } - - return $settings; - } - - /** - * Update Invoice number for all completed contribution. - * - * @param \CRM_Queue_TaskContext $ctx - * @param int $startID - * @param int $endID - * @param string $invoicePrefix - * - * @return bool - */ - public static function updateContributionInvoiceNumber(CRM_Queue_TaskContext $ctx, $startID, $endID, $invoicePrefix) { - CRM_Core_DAO::executeQuery(" - UPDATE `civicrm_contribution` SET `invoice_number` = CONCAT(%1, `id`) - WHERE `id` >= %2 AND `id` <= %3 AND `invoice_number` IS NOT NULL", - [ - 1 => [$invoicePrefix, 'String'], - 2 => [$startID, 'Integer'], - 3 => [$endID, 'Integer'], - ] - ); - - return TRUE; - } - - /** - * Add Getting Started dashlet to dashboard - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function addGettingStartedDashlet(CRM_Queue_TaskContext $ctx) { - $sql = "SELECT count(*) FROM civicrm_dashboard WHERE name='getting-started'"; - $res = CRM_Core_DAO::singleValueQuery($sql); - $domainId = CRM_Core_Config::domainID(); - if ($res <= 0) { - $sql = "INSERT INTO `civicrm_dashboard` - ( `domain_id`, `name`, `label`, `url`, `permission`, `permission_operator`, `column_no`, `is_minimized`, `is_active`, `weight`, `fullscreen_url`, `is_fullscreen`, `is_reserved`) VALUES ( {$domainId}, 'getting-started', 'Getting Started', 'civicrm/dashlet/getting-started?reset=1&snippet=5', 'access CiviCRM', NULL, 0, 0, 1, 0, 'civicrm/dashlet/getting-started?reset=1&snippet=5&context=dashletFullscreen', 1, 1)"; - CRM_Core_DAO::executeQuery($sql); - // Add default position for Getting Started Dashlet ( left column) - $sql = "INSERT INTO `civicrm_dashboard_contact` (dashboard_id, contact_id, column_no, is_active) -SELECT (SELECT MAX(id) FROM `civicrm_dashboard`), contact_id, 0, IF (SUM(is_active) > 0, 1, 0) -FROM `civicrm_dashboard_contact` JOIN `civicrm_contact` WHERE civicrm_dashboard_contact.contact_id = civicrm_contact.id GROUP BY contact_id"; - CRM_Core_DAO::executeQuery($sql); - } - return TRUE; - } - - /** - * Migrate on-behalf information to uf_join.module_data as on-behalf columns will be dropped - * on DB upgrade - * - * @param CRM_Queue_TaskContext $ctx - * - * @return bool - * TRUE for success - */ - public static function migrateOnBehalfOfInfo(CRM_Queue_TaskContext $ctx) { - $domain = new CRM_Core_DAO_Domain(); - $domain->find(TRUE); - - // fetch onBehalf entry in UFJoin table - $ufGroupDAO = new CRM_Core_DAO_UFJoin(); - $ufGroupDAO->module = 'OnBehalf'; - $ufGroupDAO->find(TRUE); - - $forOrgColums = ['is_for_organization']; - if ($domain->locales) { - $locales = explode(CRM_Core_DAO::VALUE_SEPARATOR, $domain->locales); - foreach ($locales as $locale) { - $forOrgColums[] = "for_organization_{$locale}"; - } - } - else { - $forOrgColums[] = "for_organization"; - } - - $query = " - SELECT " . implode(", ", $forOrgColums) . ", uj.id as join_id, uj.uf_group_id as uf_group_id - FROM civicrm_contribution_page cp - INNER JOIN civicrm_uf_join uj ON uj.entity_id = cp.id AND uj.module = 'OnBehalf'"; - $dao = CRM_Core_DAO::executeQuery($query, [], TRUE, NULL, FALSE, FALSE); - - if ($dao->N) { - while ($dao->fetch()) { - $onBehalfParams['on_behalf'] = ['is_for_organization' => $dao->is_for_organization]; - if ($domain->locales) { - foreach ($locales as $locale) { - $for_organization = "for_organization_{$locale}"; - $onBehalfParams['on_behalf'] += [ - $locale => [ - 'for_organization' => $dao->$for_organization, - ], - ]; - } - } - else { - $onBehalfParams['on_behalf'] += [ - 'default' => [ - 'for_organization' => $dao->for_organization, - ], - ]; - } - $ufJoinParam = [ - 'id' => $dao->join_id, - 'module' => 'on_behalf', - 'uf_group_id' => $dao->uf_group_id, - 'module_data' => json_encode($onBehalfParams), - ]; - CRM_Core_BAO_UFJoin::create($ufJoinParam); - } - } - - return TRUE; - } - - /** - * v4.7.11 adds a new setting "remote_profile_submissions". This is - * long-standing feature that existing sites may be using; however, it's - * a bit prone to abuse. For new sites, the default is to disable it - * (since that is more secure). For existing sites, the default is to - * enable it (since that is more compatible). - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function migrateRemoteSubmissionsSetting(CRM_Queue_TaskContext $ctx) { - $domains = CRM_Core_DAO::executeQuery("SELECT DISTINCT d.id FROM civicrm_domain d LEFT JOIN civicrm_setting s ON d.id=s.domain_id AND s.name = 'remote_profile_submissions' WHERE s.id IS NULL"); - while ($domains->fetch()) { - CRM_Core_DAO::executeQuery( - "INSERT INTO civicrm_setting (`name`, `value`, `domain_id`, `is_domain`, `contact_id`, `component_id`, `created_date`, `created_id`) - VALUES (%2, %3, %4, %5, NULL, NULL, %6, NULL)", - [ - 2 => ['remote_profile_submissions', 'String'], - 3 => ['s:1:"1";', 'String'], - 4 => [$domains->id, 'Integer'], - 5 => [1, 'Integer'], - 6 => [date('Y-m-d H:i:s'), 'String'], - ] - ); - } - return TRUE; - } - - /** - * CRM-11782 - Get rid of VALUE_SEPARATOR character in saved search form values - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function fixContactTypeInSmartGroups(CRM_Queue_TaskContext $ctx) { - $sep = CRM_Core_DAO::VALUE_SEPARATOR; - $dao = CRM_Core_DAO::executeQuery("SELECT id, form_values FROM civicrm_saved_search WHERE form_values LIKE '%$sep%'"); - while ($dao->fetch()) { - $formValues = unserialize($dao->form_values); - if (isset($formValues['contact_type']) && is_array($formValues['contact_type'])) { - $newVals = []; - foreach ($formValues['contact_type'] as $key => $val) { - $newVals[str_replace($sep, '__', $key)] = is_string($val) ? str_replace($sep, '__', $val) : $val; - } - $formValues['contact_type'] = $newVals; - } - CRM_Core_DAO::executeQuery("UPDATE civicrm_saved_search SET form_values = %1 WHERE id = {$dao->id}", [1 => [serialize($formValues), 'String']]); - } - - return TRUE; - } - - /** - * CRM-17637 - Ths file location has been moved; delete the old one - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function deleteVersionCheckCacheFile(CRM_Queue_TaskContext $ctx) { - $config = CRM_Core_Config::singleton(); - $cacheFile = $config->uploadDir . 'version-info-cache.json'; - if (file_exists($cacheFile)) { - unlink($cacheFile); - } - return TRUE; - } - - /** - * CRM-17669 and CRM-17686, make scheduled jobs more flexible, disable the 4.6 extension if installed - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function disableFlexibleJobsExtension(CRM_Queue_TaskContext $ctx) { - try { - civicrm_api3('Extension', 'disable', ['key' => 'com.klangsoft.flexiblejobs']); - } - catch (CRM_Core_Exception $e) { - // just ignore if the extension isn't installed - } - - return TRUE; - } - - /** - * CRM-17752 add index to civicrm_financial_trxn.trxn_id (deliberately non-unique). - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function addIndexFinancialTrxnTrxnID(CRM_Queue_TaskContext $ctx) { - $tables = ['civicrm_financial_trxn' => ['trxn_id']]; - CRM_Core_BAO_SchemaHandler::createIndexes($tables); - return TRUE; - } - - /** - * CRM-17882 Add index to civicrm_contribution.credit_note_id. - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function addIndexContributionCreditNoteID(CRM_Queue_TaskContext $ctx) { - $tables = ['civicrm_contribution' => ['creditnote_id']]; - CRM_Core_BAO_SchemaHandler::createIndexes($tables); - return TRUE; - } - - /** - * CRM-17775 Add correct index for table civicrm_financial_item. - * - * Note that the entity ID should always precede the entity_table as - * it is more unique. This is better for performance and does not cause fallback - * to no index if table it omitted. - * - * @return bool - */ - public static function addCombinedIndexFinancialItemEntityIDEntityType() { - CRM_Core_BAO_SchemaHandler::dropIndexIfExists('civicrm_financial_item', 'UI_id'); - CRM_Core_BAO_SchemaHandler::dropIndexIfExists('civicrm_financial_item', 'IX_Entity'); - CRM_Core_BAO_SchemaHandler::createIndexes([ - 'civicrm_financial_item' => [['entity_id', 'entity_table']], - ]); - return TRUE; - } - - /** - * CRM-17951 Add accounts option values for refund and chargeback. - * - * Add Chargeback contribution status and Chargeback and Contra account relationships, - * checking first if one exists. - */ - public static function addRefundAndChargeBackAccountsIfNotExist() { - // First we enable and edit the record for Credit contra - this exists but is disabled for most sites. - // Using the ensure function (below) will not enabled a disabled option (by design). - CRM_Core_DAO::executeQuery("UPDATE civicrm_option_value v - INNER JOIN civicrm_option_group g on v.option_group_id=g.id and g.name='account_relationship' - SET v.is_active=1, v.label='Credit/Contra Revenue Account is', v.name='Credit/Contra Revenue Account is', v.description='Credit/Contra Revenue Account is' - WHERE v.name = 'Credit/Contra Account is';"); - - CRM_Core_BAO_OptionValue::ensureOptionValueExists([ - 'option_group_id' => 'account_relationship', - 'name' => 'Chargeback Account is', - 'label' => ts('Chargeback Account is'), - 'is_active' => TRUE, - 'component_id' => 'CiviContribute', - ]); - - CRM_Core_BAO_OptionValue::ensureOptionValueExists([ - 'option_group_id' => 'contribution_status', - 'name' => 'Chargeback', - 'label' => ts('Chargeback'), - 'is_active' => TRUE, - 'component_id' => 'CiviContribute', - ]); - return TRUE; - } - - /** - * CRM-17999 Add index to civicrm_contribution.source. - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function addIndexContributionSource(CRM_Queue_TaskContext $ctx) { - CRM_Core_BAO_SchemaHandler::createIndexes(['civicrm_contribution' => ['source']]); - return TRUE; - } - - /** - * CRM-18124 Add index to civicrm_contribution.total_amount. - * - * Note that I made this a combined index with receive_date because the issue included - * both criteria and they seemed likely to be used in conjunction to me in other cases. - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function addIndexContributionAmount(CRM_Queue_TaskContext $ctx) { - CRM_Core_BAO_SchemaHandler::createIndexes([ - 'civicrm_contribution' => [['total_amount', 'receive_date']], - ]); - return TRUE; - } - - /** - * CRM-18124 Add index to civicrm_contribution.total_amount. - * - * Note that I made this a combined index with receive_date because the issue included - * both criteria and they seemed likely to be used in conjunction to me in other cases. - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function addDeletedByMergeActivityType(CRM_Queue_TaskContext $ctx) { - CRM_Core_BAO_OptionValue::ensureOptionValueExists([ - 'option_group_id' => 'activity_type', - 'name' => 'Contact Deleted by Merge', - 'label' => ts('Contact Deleted by Merge'), - 'description' => ts('Contact was merged into another contact'), - 'is_active' => TRUE, - 'filter' => 1, - ]); - return TRUE; - } - - /** - * CRM-12252 Add Help Pre and Help Post Fields for Price Field Value Table. - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function addHelpPreAndHelpPostFieldsPriceFieldValue(CRM_Queue_TaskContext $ctx) { - $domain = new CRM_Core_DAO_Domain(); - $domain->find(TRUE); - if ($domain->locales) { - $locales = explode(CRM_Core_DAO::VALUE_SEPARATOR, $domain->locales); - foreach ($locales as $locale) { - if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists("civicrm_price_field_value", "help_pre_{$locale}")) { - CRM_Core_DAO::executeQuery("ALTER TABLE `civicrm_price_field_value` - ADD COLUMN `help_pre_{$locale}` text COLLATE utf8_unicode_ci COMMENT 'Price field option pre help text.'", [], TRUE, NULL, FALSE, FALSE); - } - if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists("civicrm_price_field_value", "help_post_{$locale}")) { - CRM_Core_DAO::executeQuery("ALTER TABLE `civicrm_price_field_value` - ADD COLUMN `help_post_{$locale}` text COLLATE utf8_unicode_ci COMMENT 'Price field option post help text.'", [], TRUE, NULL, FALSE, FALSE); - } - } - CRM_Core_I18n_Schema::rebuildMultilingualSchema($locales, NULL, TRUE); - } - else { - if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists('civicrm_price_field_value', 'help_pre')) { - CRM_Core_DAO::executeQuery("ALTER TABLE `civicrm_price_field_value` - ADD COLUMN `help_pre` text COLLATE utf8_unicode_ci COMMENT 'Price field option pre help text.'"); - } - if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists('civicrm_price_field_value', 'help_post')) { - CRM_Core_DAO::executeQuery("ALTER TABLE `civicrm_price_field_value` - ADD COLUMN `help_post` text COLLATE utf8_unicode_ci COMMENT 'Price field option post help text.'"); - } - } - return TRUE; - } - - /** - * CRM-18464 Check if Foreign key exists and also drop any index of same name accidentially created. - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function dropActionScheudleMappingForeignKey(CRM_Queue_TaskContext $ctx) { - CRM_Core_BAO_SchemaHandler::safeRemoveFK('civicrm_action_schedule', 'FK_civicrm_action_schedule_mapping_id'); - return TRUE; - } - - /** - * CRM-18345 Don't delete mailing data on email/phone deletion - * Implemented here in CRM-18526 - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function upgradeMailingFKs(CRM_Queue_TaskContext $ctx) { - - // Safely drop the foreign keys - CRM_Core_BAO_SchemaHandler::safeRemoveFK('civicrm_mailing_event_queue', 'FK_civicrm_mailing_event_queue_email_id'); - CRM_Core_BAO_SchemaHandler::safeRemoveFK('civicrm_mailing_event_queue', 'FK_civicrm_mailing_event_queue_phone_id'); - CRM_Core_BAO_SchemaHandler::safeRemoveFK('civicrm_mailing_recipients', 'FK_civicrm_mailing_recipients_email_id'); - CRM_Core_BAO_SchemaHandler::safeRemoveFK('civicrm_mailing_recipients', 'FK_civicrm_mailing_recipients_phone_id'); - - // Set up the new foreign keys - CRM_Core_DAO::executeQuery("SET FOREIGN_KEY_CHECKS = 0;"); - - CRM_Core_DAO::executeQuery(" - ALTER TABLE `civicrm_mailing_event_queue` - ADD CONSTRAINT `FK_civicrm_mailing_event_queue_email_id` - FOREIGN KEY (`email_id`) - REFERENCES `civicrm_email`(`id`) - ON DELETE SET NULL - ON UPDATE RESTRICT; - "); - - CRM_Core_DAO::executeQuery(" - ALTER TABLE `civicrm_mailing_event_queue` - ADD CONSTRAINT `FK_civicrm_mailing_event_queue_phone_id` - FOREIGN KEY (`phone_id`) - REFERENCES `civicrm_phone`(`id`) - ON DELETE SET NULL - ON UPDATE RESTRICT; - "); - - CRM_Core_DAO::executeQuery(" - ALTER TABLE `civicrm_mailing_recipients` - ADD CONSTRAINT `FK_civicrm_mailing_recipients_email_id` - FOREIGN KEY (`email_id`) - REFERENCES `civicrm_email`(`id`) - ON DELETE SET NULL - ON UPDATE RESTRICT; - "); - - CRM_Core_DAO::executeQuery(" - ALTER TABLE `civicrm_mailing_recipients` - ADD CONSTRAINT `FK_civicrm_mailing_recipients_phone_id` - FOREIGN KEY (`phone_id`) - REFERENCES `civicrm_phone`(`id`) - ON DELETE SET NULL - ON UPDATE RESTRICT; - "); - - CRM_Core_DAO::executeQuery("SET FOREIGN_KEY_CHECKS = 1;"); - - return TRUE; - } - - /** - * CRM-17663 - Dashboard schema changes - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function dashboardSchemaUpdate(CRM_Queue_TaskContext $ctx) { - if (!CRM_Core_BAO_SchemaHandler::checkIfIndexExists('civicrm_dashboard_contact', 'index_dashboard_id_contact_id')) { - // Delete any stray duplicate rows and add unique index to prevent new dupes and enable INSERT/UPDATE combo query - CRM_Core_DAO::executeQuery('DELETE c1 FROM civicrm_dashboard_contact c1, civicrm_dashboard_contact c2 WHERE c1.contact_id = c2.contact_id AND c1.dashboard_id = c2.dashboard_id AND c1.id > c2.id'); - CRM_Core_DAO::executeQuery('ALTER TABLE civicrm_dashboard_contact ADD UNIQUE INDEX index_dashboard_id_contact_id (dashboard_id, contact_id);'); - } - $domain = new CRM_Core_DAO_Domain(); - $domain->find(TRUE); - CRM_Core_BAO_SchemaHandler::dropColumn('civicrm_dashboard_contact', 'content', FALSE, TRUE); - CRM_Core_BAO_SchemaHandler::dropColumn('civicrm_dashboard_contact', 'is_minimized', FALSE, TRUE); - CRM_Core_BAO_SchemaHandler::dropColumn('civicrm_dashboard_contact', 'is_fullscreen', FALSE, TRUE); - CRM_Core_BAO_SchemaHandler::dropColumn('civicrm_dashboard_contact', 'created_date', FALSE, TRUE); - CRM_Core_BAO_SchemaHandler::dropColumn('civicrm_dashboard', 'is_fullscreen', FALSE, TRUE); - CRM_Core_BAO_SchemaHandler::dropColumn('civicrm_dashboard', 'is_minimized', FALSE, TRUE); - CRM_Core_BAO_SchemaHandler::dropColumn('civicrm_dashboard', 'column_no', FALSE, TRUE); - CRM_Core_BAO_SchemaHandler::dropColumn('civicrm_dashboard', 'weight', FALSE, TRUE); - - CRM_Core_DAO::executeQuery('UPDATE civicrm_dashboard SET url = REPLACE(url, "&snippet=5", ""), fullscreen_url = REPLACE(fullscreen_url, "&snippet=5", "")'); - - if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists('civicrm_dashboard', 'cache_minutes')) { - CRM_Core_DAO::executeQuery('ALTER TABLE civicrm_dashboard ADD COLUMN cache_minutes int unsigned NOT NULL DEFAULT 60 COMMENT "Number of minutes to cache dashlet content in browser localStorage."', - [], TRUE, NULL, FALSE, FALSE); - } - if ($domain->locales) { - $locales = explode(CRM_Core_DAO::VALUE_SEPARATOR, $domain->locales); - CRM_Core_I18n_Schema::rebuildMultilingualSchema($locales, NULL, TRUE); - } - - CRM_Core_DAO::executeQuery('UPDATE civicrm_dashboard SET cache_minutes = 1440 WHERE name = "blog"'); - CRM_Core_DAO::executeQuery('UPDATE civicrm_dashboard SET cache_minutes = 7200 WHERE name IN ("activity","getting-started")'); - return TRUE; - } - - /** - * CRM-19100 - Alter Index and Type for Image URL - * @return bool - */ - public static function alterIndexAndTypeForImageURL() { - $length = []; - CRM_Core_BAO_SchemaHandler::dropIndexIfExists('civicrm_contact', 'index_image_url'); - CRM_Core_DAO::executeQuery("ALTER TABLE `civicrm_contact` CHANGE `image_URL` `image_URL` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'optional URL for preferred image (photo, logo, etc.) to display for this contact.'"); - - $length['civicrm_contact']['image_URL'] = 128; - CRM_Core_BAO_SchemaHandler::createIndexes(['civicrm_contact' => ['image_URL']], 'index', $length); - - return TRUE; - } - - /** - * Add mailing template type. - * - * @return bool - */ - public static function addMailingTemplateType() { - if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists('civicrm_mailing', 'template_type', FALSE)) { - CRM_Core_DAO::executeQuery(' - ALTER TABLE civicrm_mailing - ADD COLUMN `template_type` varchar(64) NOT NULL DEFAULT \'traditional\' COMMENT \'The language/processing system used for email templates.\', - ADD COLUMN `template_options` longtext COMMENT \'Advanced options used by the email templating system. (JSON encoded)\' - '); - } - return TRUE; - } - - /** - * CRM-18651 Add DataType column to Option Group Table - * @return bool - */ - public static function addDataTypeColumnToOptionGroupTable() { - if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists('civicrm_option_group', 'data_type')) { - CRM_Core_DAO::executeQuery("ALTER TABLE `civicrm_option_group` ADD COLUMN `data_type` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL comment 'Data Type of Option Group.'", - [], TRUE, NULL, FALSE, FALSE); - } - $domain = new CRM_Core_DAO_Domain(); - $domain->find(TRUE); - if ($domain->locales) { - $locales = explode(CRM_Core_DAO::VALUE_SEPARATOR, $domain->locales); - CRM_Core_I18n_Schema::rebuildMultilingualSchema($locales, NULL, TRUE); - } - - CRM_Core_DAO::executeQuery("UPDATE `civicrm_option_group` SET `data_type` = 'Integer' - WHERE name IN ('activity_type', 'gender', 'payment_instrument', 'participant_role', 'event_type')"); - return TRUE; - } - - /** - * CRM-19372 Add field to store accepted credit credit cards for a payment processor. - * @return bool - */ - public static function addWysiwygPresets() { - CRM_Core_BAO_OptionGroup::ensureOptionGroupExists([ - 'name' => 'wysiwyg_presets', - 'title' => ts('WYSIWYG Editor Presets'), - 'is_reserved' => 1, - ]); - $values = [ - 'default' => ['label' => ts('Default'), 'is_default' => 1], - 'civimail' => ['label' => ts('CiviMail'), 'component_id' => 'CiviMail'], - 'civievent' => ['label' => ts('CiviEvent'), 'component_id' => 'CiviEvent'], - ]; - foreach ($values as $name => $value) { - CRM_Core_BAO_OptionValue::ensureOptionValueExists($value + [ - 'name' => $name, - 'option_group_id' => 'wysiwyg_presets', - ]); - } - $fileName = Civi::paths()->getPath('[civicrm.files]/persist/crm-ckeditor-config.js'); - // Ensure the config file contains the allowedContent setting - if (file_exists($fileName)) { - $config = file_get_contents($fileName); - $pos = strrpos($config, '};'); - $setting = "\n\tconfig.allowedContent = true;\n"; - $config = substr_replace($config, $setting, $pos, 0); - unlink($fileName); - $newFileName = Civi::paths()->getPath('[civicrm.files]/persist/crm-ckeditor-default.js'); - file_put_contents($newFileName, $config); - } - return TRUE; - } - - /** - * Update Kenyan Provinces to reflect changes per CRM-20062 - * - * @param \CRM_Queue_TaskContext $ctx - */ - public static function updateKenyanProvinces(CRM_Queue_TaskContext $ctx) { - $kenyaCountryID = CRM_Core_DAO::singleValueQuery('SELECT max(id) from civicrm_country where iso_code = "KE"'); - $oldProvinces = [ - 'Nairobi Municipality', - 'Coast', - 'North-Eastern Kaskazini Mashariki', - 'Rift Valley', - 'Western Magharibi', - ]; - self::deprecateStateProvinces($kenyaCountryID, $oldProvinces); - return TRUE; - } - - /** - * Deprecate provinces that no longer exist. - * - * @param int $countryID - * @param array $provinces - */ - public static function deprecateStateProvinces($countryID, $provinces) { - foreach ($provinces as $province) { - $existingStateID = CRM_Core_DAO::singleValueQuery(" - SELECT id FROM civicrm_state_province - WHERE country_id = %1 - AND name = %2 - ", - [1 => [$countryID, 'Int'], 2 => [$province, 'String']]); - - if (!$existingStateID) { - continue; - } - if (!CRM_Core_DAO::singleValueQuery(" - SELECT count(*) FROM civicrm_address - WHERE state_province_id = %1 - ", [1 => [$existingStateID, 'Int']]) - ) { - CRM_Core_DAO::executeQuery("DELETE FROM civicrm_state_province WHERE id = %1", [1 => [$existingStateID, 'Int']]); - } - else { - $params = ['1' => [ts("Former - $province"), 'String']]; - CRM_Core_DAO::executeQuery(" - UPDATE civicrm_state_province SET name = %1 WHERE id = $existingStateID - ", $params); - } - } - } - - /** - * @see https://issues.civicrm.org/jira/browse/CRM-19961 - * Poputate newly added domain id column and add foriegn key onto table. - */ - public static function populateSMSProviderDomainId() { - $count = CRM_Core_DAO::singleValueQuery("SELECT count(id) FROM civicrm_domain"); - if ($count == 1) { - CRM_Core_DAO::executeQuery("UPDATE civicrm_sms_provider SET domain_id = (SELECT id FROM civicrm_domain)"); - } - if (!parent::checkFKExists('civicrm_sms_provider', 'FK_civicrm_sms_provider_domain_id')) { - CRM_Core_DAO::executeQuery("SET FOREIGN_KEY_CHECKS = 0;"); - CRM_Core_DAO::executeQuery("ALTER TABLE `civicrm_sms_provider` - ADD CONSTRAINT FK_civicrm_sms_provider_domain_id - FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`) - ON DELETE SET NULL"); - - CRM_Core_DAO::executeQuery("SET FOREIGN_KEY_CHECKS = 1;"); - } - return TRUE; - } - - /** - * CRM-16633 - Add activity type for Change Case Status - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function addChangeCaseSubjectActivityType(CRM_Queue_TaskContext $ctx) { - CRM_Core_BAO_OptionValue::ensureOptionValueExists([ - 'option_group_id' => 'activity_type', - 'name' => 'Change Case Subject', - 'label' => ts('Change Case Subject'), - 'is_active' => TRUE, - 'component_id' => 'CiviCase', - 'icon' => 'fa-pencil-square-o', - ]); - return TRUE; - } - - /** - * CRM-19986 fix schema differnces in civicrm_action_schedule - */ - public static function fixSchemaOnCiviCRMActionSchedule() { - if (!parent::checkFKExists('civicrm_action_schedule', 'FK_civicrm_action_schedule_sms_template_id')) { - CRM_Core_DAO::executeQuery("ALTER TABLE `civicrm_action_schedule` - ADD CONSTRAINT FK_civicrm_action_schedule_sms_template_id - FOREIGN KEY (`sms_template_id`) REFERENCES `civicrm_msg_template`(`id`) - ON DELETE SET NULL"); - } - CRM_Core_DAO::executeQuery("ALTER TABLE `civicrm_action_schedule` - CHANGE `mapping_id` `mapping_id` varchar(64) COLLATE - utf8_unicode_ci DEFAULT NULL COMMENT 'Name/ID of the mapping to use on this table'"); - return TRUE; - } - - /** - * Add in missing Tajikistan Subdivisions - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function tajikistanMissingSubdivisions(CRM_Queue_TaskContext $ctx) { - $sql = 'INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES'; - $updates = []; - if (!CRM_Core_DAO::singleValueQuery("Select id FROM civicrm_state_province WHERE country_id = 1209 AND name = 'Dushanbe'")) { - $updates[] = '(NULL, 1209, "DU", "Dushanbe")'; - } - if (!CRM_Core_DAO::singleValueQuery("Select id FROM civicrm_state_province WHERE country_id = 1209 AND name = 'Nohiyahoi Tobei Jumhurí'")) { - $updates[] = '(NULL, 1209, "RA", "Nohiyahoi Tobei Jumhurí")'; - } - if (!empty($updates)) { - CRM_Core_DAO::executeQuery($sql . implode(', ', $updates)); - } - return TRUE; - } - - /** - * Remove the contribution logging reports which have been broken for a very long time. - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function removeContributionLoggingReports(CRM_Queue_TaskContext $ctx) { - if (class_exists('CRM_Report_Form_Contribute_LoggingDetail') || class_exists('CRM_Report_Form_Contribute_LoggingSummary')) { - // Perhaps the site has overridden these classes. The core ones are broken but they - // may have functional ones. - return TRUE; - } - $options = civicrm_api3('OptionValue', 'get', ['option_group_id' => 'report_template', 'options' => ['limit' => 0]]); - foreach ($options['values'] as $option) { - if ($option['name'] === 'CRM_Report_Form_Contribute_LoggingDetail' || $option['name'] === 'CRM_Report_Form_Contribute_LoggingSummary') { - $instances = civicrm_api3('ReportInstance', 'get', ['report_id' => $option['value']]); - if ($instances['count']) { - foreach ($instances['values'] as $instance) { - if ($instance['navigation_id']) { - civicrm_api3('Navigation', 'delete', ['id' => $instance['navigation_id']]); - } - civicrm_api3('ReportInstance', 'delete', ['id' => $instance['id']]); - } - } - civicrm_api3('OptionValue', 'delete', ['id' => $option['id']]); - } - } - return TRUE; - } - - /** - * @return bool - */ - protected function checkImageUploadDir() { - $config = CRM_Core_Config::singleton(); - $check = new CRM_Utils_Check_Component_Security(); - return $config->imageUploadDir && $config->imageUploadURL && $check->isDirAccessible($config->imageUploadDir, $config->imageUploadURL); - } - - /** - * CRM-20572 - Format date fields in Contrib Sybunt custom search's saved criteria. - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function fixDateFieldsInSmartGroups(CRM_Queue_TaskContext $ctx) { - $dao = CRM_Core_DAO::executeQuery("SELECT id, form_values FROM civicrm_saved_search WHERE form_values LIKE '%CRM_Contact_Form_Search_Custom_ContribSYBNT%'"); - while ($dao->fetch()) { - $formValues = unserialize($dao->form_values); - CRM_Contact_Form_Search_Custom_ContribSYBNT::formatSavedSearchFields($formValues); - CRM_Core_DAO::executeQuery("UPDATE civicrm_saved_search SET form_values = %1 WHERE id = {$dao->id}", [1 => [serialize($formValues), 'String']]); - } - return TRUE; - } - - /** - * CRM-20892 Convert default of created_date in civicrm_mailing table to NULL - * @return bool - */ - public static function civiMailingCreatedDateNull(CRM_Queue_TaskContext $ctx) { - $dataType = 'timestamp'; - if (CRM_Utils_Check_Component_Timestamps::isFieldType('civicrm_mailing', 'created_date', 'datetime')) { - $dataType = 'datetime'; - } - CRM_Core_DAO::executeQuery("ALTER TABLE civicrm_mailing CHANGE created_date created_date {$dataType} NULL DEFAULT NULL COMMENT 'Date and time this mailing was created.'"); - return TRUE; - } - -} diff --git a/CRM/Upgrade/Incremental/sql/4.7.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.0.mysql.tpl deleted file mode 100644 index 6cc7c4d415..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.0.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.7.0 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.7.1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.1.mysql.tpl deleted file mode 100644 index 65ea99d5a1..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.1.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.7.1 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.7.10.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.10.mysql.tpl deleted file mode 100644 index fb4220c755..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.10.mysql.tpl +++ /dev/null @@ -1,23 +0,0 @@ -{* file to handle db changes in 4.7.10 during upgrade *} -SELECT @option_group_id_report := max(id) from civicrm_option_group where name = 'report_template'; -SELECT @contributeCompId := max(id) FROM civicrm_component where name = 'CiviContribute'; -SELECT @option_group_id_report_wt := MAX(weight) FROM civicrm_option_value WHERE option_group_id = @option_group_id_report; -INSERT INTO - civicrm_option_value (`option_group_id`, {localize field='label'}label{/localize}, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, {localize field='description'}description{/localize}, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`) -VALUES - (@option_group_id_report, {localize}'{ts escape="sql"}Deferred Revenue Details{/ts}'{/localize}, 'contribute/deferredrevenue', 'CRM_Report_Form_Contribute_DeferredRevenue', NULL, 0, NULL, @option_group_id_report_wt+1, {localize}'{ts escape="sql"}Deferred Revenue Details Report{/ts}'{/localize}, 0, 0, 1, @contributeCompId, NULL); - --- CRM-18854 -ALTER TABLE civicrm_pledge_block ADD pledge_start_date varchar(64) NULL DEFAULT NULL COMMENT 'The date that the first scheduled pledge occurs.'; -ALTER TABLE civicrm_pledge_block ADD is_pledge_start_date_visible TINYINT(4) NOT NULL DEFAULT 0 COMMENT 'If true - recurring start date is shown.'; -ALTER TABLE civicrm_pledge_block ADD is_pledge_start_date_editable TINYINT(4) NOT NULL DEFAULT 0 COMMENT 'If true - recurring start date is editable.'; -ALTER TABLE civicrm_contribution_page ADD adjust_recur_start_date TINYINT(4) NOT NULL DEFAULT 0 COMMENT 'If true - user is able to adjust payment start date.' AFTER is_recur_installments; - --- CRM-17608 Merge to DOCx or ODT template -SELECT @option_group_id_ext := max(id) from civicrm_option_group where name = 'safe_file_extension'; -SELECT @option_group_id_ext_wt := MAX(weight) FROM civicrm_option_value WHERE option_group_id = @option_group_id_ext; -SELECT @option_group_id_ext_val := MAX(CAST( `value` AS UNSIGNED )) FROM civicrm_option_value WHERE option_group_id = @option_group_id_ext; -INSERT INTO - `civicrm_option_value` (`option_group_id`, {localize field='label'}label{/localize}, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `is_optgroup`, `is_reserved`, `is_active`) -VALUES - (@option_group_id_ext, {localize}'{ts escape="sql"}odt{/ts}'{/localize}, @option_group_id_ext_val+1, 'odt', NULL, 0, 0, @option_group_id_ext_wt+1, 0, 1, 1); diff --git a/CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl deleted file mode 100644 index d0eeed5ce4..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl +++ /dev/null @@ -1,279 +0,0 @@ -{* file to handle db changes in 4.7.11 during upgrade *} - --- CRM-19134 Missing French overseas departments. -INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES - (NULL, 1076, "GP", "Guadeloupe"), - (NULL, 1076, "MQ", "Martinique"), - (NULL, 1076, "GF", "Guyane"), - (NULL, 1076, "RE", "La Réunion"), - (NULL, 1076, "YT", "Mayotte"); - --- CRM-17663 Fix missing dashboard names -UPDATE civicrm_dashboard SET name = 'activity' WHERE (name IS NULL OR name = '') AND url LIKE "civicrm/dashlet/activity?%"; -UPDATE civicrm_dashboard SET name = 'myCases' WHERE (name IS NULL OR name = '') AND url LIKE "civicrm/dashlet/myCases?%"; -UPDATE civicrm_dashboard SET name = 'allCases' WHERE (name IS NULL OR name = '') AND url LIKE "civicrm/dashlet/allCases?%"; -UPDATE civicrm_dashboard SET name = 'casedashboard' WHERE (name IS NULL OR name = '') AND url LIKE "civicrm/dashlet/casedashboard?%"; - --- CRM-19291 Fix names on dashlets where name is an empty string -{if $multilingual} -UPDATE civicrm_dashboard SET name = label_{$locales.0} WHERE name = ''; -{else} -UPDATE civicrm_dashboard SET name = label WHERE name = ''; -{/if} - --- CRM-18508 Display State/Province in event address in registration emails -{include file='../CRM/Upgrade/4.7.11.msg_template/civicrm_msg_template.tpl'} - --- CRM-19034 Fix Capitlisation of Country names. -UPDATE civicrm_country SET name = "American Samoa" WHERE lower(name) = lower("American Samoa"); -UPDATE civicrm_country SET name = "Andorra" WHERE lower(name) = lower("Andorra"); -UPDATE civicrm_country SET name = "Angola" WHERE lower(name) = lower("Angola"); -UPDATE civicrm_country SET name = "Anguilla" WHERE lower(name) = lower("Anguilla"); -UPDATE civicrm_country SET name = "Antarctica" WHERE lower(name) = lower("Antarctica"); -UPDATE civicrm_country SET name = "Antigua and Barbuda" WHERE lower(name) = lower("Antigua and Barbuda"); -UPDATE civicrm_country SET name = "Argentina" WHERE lower(name) = lower("Argentina"); -UPDATE civicrm_country SET name = "Armenia" WHERE lower(name) = lower("Armenia"); -UPDATE civicrm_country SET name = "Aruba" WHERE lower(name) = lower("Aruba"); -UPDATE civicrm_country SET name = "Australia" WHERE lower(name) = lower("Australia"); -UPDATE civicrm_country SET name = "Austria" WHERE lower(name) = lower("Austria"); -UPDATE civicrm_country SET name = "Azerbaijan" WHERE lower(name) = lower("Azerbaijan"); -UPDATE civicrm_country SET name = "Bahrain" WHERE lower(name) = lower("Bahrain"); -UPDATE civicrm_country SET name = "Bangladesh" WHERE lower(name) = lower("Bangladesh"); -UPDATE civicrm_country SET name = "Barbados" WHERE lower(name) = lower("Barbados"); -UPDATE civicrm_country SET name = "Belarus" WHERE lower(name) = lower("Belarus"); -UPDATE civicrm_country SET name = "Belgium" WHERE lower(name) = lower("Belgium"); -UPDATE civicrm_country SET name = "Belize" WHERE lower(name) = lower("Belize"); -UPDATE civicrm_country SET name = "Benin" WHERE lower(name) = lower("Benin"); -UPDATE civicrm_country SET name = "Bermuda" WHERE lower(name) = lower("Bermuda"); -UPDATE civicrm_country SET name = "Bhutan" WHERE lower(name) = lower("Bhutan"); -UPDATE civicrm_country SET name = "Bolivia" WHERE lower(name) = lower("Bolivia"); -UPDATE civicrm_country SET name = "Bosnia and Herzegovina" WHERE lower(name) = lower("Bosnia and Herzegovina"); -UPDATE civicrm_country SET name = "Botswana" WHERE lower(name) = lower("Botswana"); -UPDATE civicrm_country SET name = "Bouvet Island" WHERE lower(name) = lower("Bouvet Island"); -UPDATE civicrm_country SET name = "Brazil" WHERE lower(name) = lower("Brazil"); -UPDATE civicrm_country SET name = "British Indian Ocean Territory" WHERE lower(name) = lower("British Indian Ocean Territory"); -UPDATE civicrm_country SET name = "Virgin Islands, U.S." WHERE lower(name) = lower("Virgin Islands, U.S."); -UPDATE civicrm_country SET name = "Brunei Darussalam" WHERE lower(name) = lower("Brunei Darussalam"); -UPDATE civicrm_country SET name = "Bulgaria" WHERE lower(name) = lower("Bulgaria"); -UPDATE civicrm_country SET name = "Burkina Faso" WHERE lower(name) = lower("Burkina Faso"); -UPDATE civicrm_country SET name = "Myanmar" WHERE lower(name) = lower("Myanmar"); -UPDATE civicrm_country SET name = "Burundi" WHERE lower(name) = lower("Burundi"); -UPDATE civicrm_country SET name = "Cambodia" WHERE lower(name) = lower("Cambodia"); -UPDATE civicrm_country SET name = "Cameroon" WHERE lower(name) = lower("Cameroon"); -UPDATE civicrm_country SET name = "Canada" WHERE lower(name) = lower("Canada"); -UPDATE civicrm_country SET name = "Cape Verde" WHERE lower(name) = lower("Cape Verde"); -UPDATE civicrm_country SET name = "Cayman Islands" WHERE lower(name) = lower("Cayman Islands"); -UPDATE civicrm_country SET name = "Central African Republic" WHERE lower(name) = lower("Central African Republic"); -UPDATE civicrm_country SET name = "Chad" WHERE lower(name) = lower("Chad"); -UPDATE civicrm_country SET name = "Chile" WHERE lower(name) = lower("Chile"); -UPDATE civicrm_country SET name = "China" WHERE lower(name) = lower("China"); -UPDATE civicrm_country SET name = "Christmas Island" WHERE lower(name) = lower("Christmas Island"); -UPDATE civicrm_country SET name = "Cocos (Keeling) Islands" WHERE lower(name) = lower("Cocos (Keeling) Islands"); -UPDATE civicrm_country SET name = "Colombia" WHERE lower(name) = lower("Colombia"); -UPDATE civicrm_country SET name = "Comoros" WHERE lower(name) = lower("Comoros"); -UPDATE civicrm_country SET name = "Congo, Republic Of The" WHERE lower(name) = lower("Congo, Republic of The"); -UPDATE civicrm_country SET name = "Congo, The Democratic Republic of the" WHERE lower(name) = lower("Congo, The Democratic Republic of the"); -UPDATE civicrm_country SET name = "Cook Islands" WHERE lower(name) = lower("Cook Islands"); -UPDATE civicrm_country SET name = "Costa Rica" WHERE lower(name) = lower("Costa Rica"); -UPDATE civicrm_country SET name = "Côte d'Ivoire" WHERE lower(name) = lower("Côte d'Ivoire"); -UPDATE civicrm_country SET name = "Croatia" WHERE lower(name) = lower("Croatia"); -UPDATE civicrm_country SET name = "Cuba" WHERE lower(name) = lower("Cuba"); -UPDATE civicrm_country SET name = "Cyprus" WHERE lower(name) = lower("Cyprus"); -UPDATE civicrm_country SET name = "Czech Republic" WHERE lower(name) = lower("Czech Republic"); -UPDATE civicrm_country SET name = "Denmark" WHERE lower(name) = lower("Denmark"); -UPDATE civicrm_country SET name = "Djibouti" WHERE lower(name) = lower("Djibouti"); -UPDATE civicrm_country SET name = "Dominica" WHERE lower(name) = lower("Dominica"); -UPDATE civicrm_country SET name = "Dominican Republic" WHERE lower(name) = lower("Dominican Republic"); -UPDATE civicrm_country SET name = "Timor-Leste" WHERE lower(name) = lower("Timor-Leste"); -UPDATE civicrm_country SET name = "Ecuador" WHERE lower(name) = lower("Ecuador"); -UPDATE civicrm_country SET name = "Egypt" WHERE lower(name) = lower("Egypt"); -UPDATE civicrm_country SET name = "El Salvador" WHERE lower(name) = lower("El Salvador"); -UPDATE civicrm_country SET name = "Equatorial Guinea" WHERE lower(name) = lower("Equatorial Guinea"); -UPDATE civicrm_country SET name = "Eritrea" WHERE lower(name) = lower("Eritrea"); -UPDATE civicrm_country SET name = "Estonia" WHERE lower(name) = lower("Estonia"); -UPDATE civicrm_country SET name = "Ethiopia" WHERE lower(name) = lower("Ethiopia"); -UPDATE civicrm_country SET name = "European Union" WHERE lower(name) = lower("European Union"); -UPDATE civicrm_country SET name = "Falkland Islands (Malvinas)" WHERE lower(name) = lower("Falkland Islands (Malvinas)"); -UPDATE civicrm_country SET name = "Faroe Islands" WHERE lower(name) = lower("Faroe Islands"); -UPDATE civicrm_country SET name = "Fiji" WHERE lower(name) = lower("Fiji"); -UPDATE civicrm_country SET name = "Finland" WHERE lower(name) = lower("Finland"); -UPDATE civicrm_country SET name = "France" WHERE lower(name) = lower("France"); -UPDATE civicrm_country SET name = "French Guiana" WHERE lower(name) = lower("French Guiana"); -UPDATE civicrm_country SET name = "French Polynesia" WHERE lower(name) = lower("French Polynesia"); -UPDATE civicrm_country SET name = "French Southern Territories" WHERE lower(name) = lower("French Southern Territories"); -UPDATE civicrm_country SET name = "Gabon" WHERE lower(name) = lower("Gabon"); -UPDATE civicrm_country SET name = "Georgia" WHERE lower(name) = lower("Georgia"); -UPDATE civicrm_country SET name = "Germany" WHERE lower(name) = lower("Germany"); -UPDATE civicrm_country SET name = "Ghana" WHERE lower(name) = lower("Ghana"); -UPDATE civicrm_country SET name = "Gibraltar" WHERE lower(name) = lower("Gibraltar"); -UPDATE civicrm_country SET name = "Greece" WHERE lower(name) = lower("Greece"); -UPDATE civicrm_country SET name = "Greenland" WHERE lower(name) = lower("Greenland"); -UPDATE civicrm_country SET name = "Grenada" WHERE lower(name) = lower("Grenada"); -UPDATE civicrm_country SET name = "Guadeloupe" WHERE lower(name) = lower("Guadeloupe"); -UPDATE civicrm_country SET name = "Guam" WHERE lower(name) = lower("Guam"); -UPDATE civicrm_country SET name = "Guatemala" WHERE lower(name) = lower("Guatemala"); -UPDATE civicrm_country SET name = "Guinea" WHERE lower(name) = lower("Guinea"); -UPDATE civicrm_country SET name = "Guinea-Bissau" WHERE lower(name) = lower("Guinea-Bissau"); -UPDATE civicrm_country SET name = "Guyana" WHERE lower(name) = lower("Guyana"); -UPDATE civicrm_country SET name = "Haiti" WHERE lower(name) = lower("Haiti"); -UPDATE civicrm_country SET name = "Heard Island and McDonald Islands" WHERE lower(name) = lower("Heard Island and McDonald Islands"); -UPDATE civicrm_country SET name = "Holy See (Vatican City State)" WHERE lower(name) = lower("Holy See (Vatican City State)"); -UPDATE civicrm_country SET name = "Honduras" WHERE lower(name) = lower("Honduras"); -UPDATE civicrm_country SET name = "Hong Kong" WHERE lower(name) = lower("Hong Kong"); -UPDATE civicrm_country SET name = "Hungary" WHERE lower(name) = lower("Hungary"); -UPDATE civicrm_country SET name = "Iceland" WHERE lower(name) = lower("Iceland"); -UPDATE civicrm_country SET name = "India" WHERE lower(name) = lower("India"); -UPDATE civicrm_country SET name = "Indonesia" WHERE lower(name) = lower("Indonesia"); -UPDATE civicrm_country SET name = "Iran, Islamic Republic of" WHERE lower(name) = lower("Iran, Islamic Republic of"); -UPDATE civicrm_country SET name = "Iraq" WHERE lower(name) = lower("Iraq"); -UPDATE civicrm_country SET name = "Ireland" WHERE lower(name) = lower("Ireland"); -UPDATE civicrm_country SET name = "Israel" WHERE lower(name) = lower("Israel"); -UPDATE civicrm_country SET name = "Italy" WHERE lower(name) = lower("Italy"); -UPDATE civicrm_country SET name = "Jamaica" WHERE lower(name) = lower("Jamaica"); -UPDATE civicrm_country SET name = "Japan" WHERE lower(name) = lower("Japan"); -UPDATE civicrm_country SET name = "Jordan" WHERE lower(name) = lower("Jordan"); -UPDATE civicrm_country SET name = "Kazakhstan" WHERE lower(name) = lower("Kazakhstan"); -UPDATE civicrm_country SET name = "Kenya" WHERE lower(name) = lower("Kenya"); -UPDATE civicrm_country SET name = "Kiribati" WHERE lower(name) = lower("Kiribati"); -UPDATE civicrm_country SET name = "Korea, Democratic People's Republic of" WHERE lower(name) = lower("Korea, Democratic People's Republic of"); -UPDATE civicrm_country SET name = "Korea, Republic of" WHERE lower(name) = lower("Korea, Republic of"); -UPDATE civicrm_country SET name = "Kuwait" WHERE lower(name) = lower("Kuwait"); -UPDATE civicrm_country SET name = "Kyrgyzstan" WHERE lower(name) = lower("Kyrgyzstan"); -UPDATE civicrm_country SET name = "Lao People\'s Democratic Republic" WHERE lower(name) = lower("Lao People\'s Democratic Republic"); -UPDATE civicrm_country SET name = "Latvia" WHERE lower(name) = lower("Latvia"); -UPDATE civicrm_country SET name = "Lebanon" WHERE lower(name) = lower("Lebanon"); -UPDATE civicrm_country SET name = "Lesotho" WHERE lower(name) = lower("Lesotho"); -UPDATE civicrm_country SET name = "Liberia" WHERE lower(name) = lower("Liberia"); -UPDATE civicrm_country SET name = "Libya" WHERE lower(name) = lower("Libya"); -UPDATE civicrm_country SET name = "Liechtenstein" WHERE lower(name) = lower("Liechtenstein"); -UPDATE civicrm_country SET name = "Lithuania" WHERE lower(name) = lower("Lithuania"); -UPDATE civicrm_country SET name = "Luxembourg" WHERE lower(name) = lower("Luxembourg"); -UPDATE civicrm_country SET name = "Macao" WHERE lower(name) = lower("Macao"); -UPDATE civicrm_country SET name = "Macedonia, Republic of" WHERE lower(name) = lower("Macedonia, Republic of"); -UPDATE civicrm_country SET name = "Madagascar" WHERE lower(name) = lower("Madagascar"); -UPDATE civicrm_country SET name = "Malawi" WHERE lower(name) = lower("Malawi"); -UPDATE civicrm_country SET name = "Malaysia" WHERE lower(name) = lower("Malaysia"); -UPDATE civicrm_country SET name = "Maldives" WHERE lower(name) = lower("Maldives"); -UPDATE civicrm_country SET name = "Mali" WHERE lower(name) = lower("Mali"); -UPDATE civicrm_country SET name = "Malta" WHERE lower(name) = lower("Malta"); -UPDATE civicrm_country SET name = "Marshall Islands" WHERE lower(name) = lower("Marshall Islands"); -UPDATE civicrm_country SET name = "Martinique" WHERE lower(name) = lower("Martinique"); -UPDATE civicrm_country SET name = "Mauritania" WHERE lower(name) = lower("Mauritania"); -UPDATE civicrm_country SET name = "Mauritius" WHERE lower(name) = lower("Mauritius"); -UPDATE civicrm_country SET name = "Mayotte" WHERE lower(name) = lower("Mayotte"); -UPDATE civicrm_country SET name = "Mexico" WHERE lower(name) = lower("Mexico"); -UPDATE civicrm_country SET name = "Micronesia, Federated States of" WHERE lower(name) = lower("Micronesia, Federated States of"); -UPDATE civicrm_country SET name = "Moldova" WHERE lower(name) = lower("Moldova"); -UPDATE civicrm_country SET name = "Monaco" WHERE lower(name) = lower("Monaco"); -UPDATE civicrm_country SET name = "Mongolia" WHERE lower(name) = lower("Mongolia"); -UPDATE civicrm_country SET name = "Montserrat" WHERE lower(name) = lower("Montserrat"); -UPDATE civicrm_country SET name = "Morocco" WHERE lower(name) = lower("Morocco"); -UPDATE civicrm_country SET name = "Mozambique" WHERE lower(name) = lower("Mozambique"); -UPDATE civicrm_country SET name = "Namibia" WHERE lower(name) = lower("Namibia"); -UPDATE civicrm_country SET name = "Nauru" WHERE lower(name) = lower("Nauru"); -UPDATE civicrm_country SET name = "Nepal" WHERE lower(name) = lower("Nepal"); -UPDATE civicrm_country SET name = "Netherlands" WHERE lower(name) = lower("Netherlands"); -UPDATE civicrm_country SET name = "New Caledonia" WHERE lower(name) = lower("New Caledonia"); -UPDATE civicrm_country SET name = "New Zealand" WHERE lower(name) = lower("New Zealand"); -UPDATE civicrm_country SET name = "Nicaragua" WHERE lower(name) = lower("Nicaragua"); -UPDATE civicrm_country SET name = "Niger" WHERE lower(name) = lower("Niger"); -UPDATE civicrm_country SET name = "Nigeria" WHERE lower(name) = lower("Nigeria"); -UPDATE civicrm_country SET name = "Niue" WHERE lower(name) = lower("Niue"); -UPDATE civicrm_country SET name = "Norfolk Island" WHERE lower(name) = lower("Norfolk Island"); -UPDATE civicrm_country SET name = "Northern Mariana Islands" WHERE lower(name) = lower("Northern Mariana Islands"); -UPDATE civicrm_country SET name = "Norway" WHERE lower(name) = lower("Norway"); -UPDATE civicrm_country SET name = "Oman" WHERE lower(name) = lower("Oman"); -UPDATE civicrm_country SET name = "Pakistan" WHERE lower(name) = lower("Pakistan"); -UPDATE civicrm_country SET name = "Palau" WHERE lower(name) = lower("Palau"); -UPDATE civicrm_country SET name = "Palestinian Territory" WHERE lower(name) = lower("Palestinian Territory"); -UPDATE civicrm_country SET name = "Panama" WHERE lower(name) = lower("Panama"); -UPDATE civicrm_country SET name = "Papua New Guinea" WHERE lower(name) = lower("Papua New Guinea"); -UPDATE civicrm_country SET name = "Paraguay" WHERE lower(name) = lower("Paraguay"); -UPDATE civicrm_country SET name = "Peru" WHERE lower(name) = lower("Peru"); -UPDATE civicrm_country SET name = "Philippines" WHERE lower(name) = lower("Philippines"); -UPDATE civicrm_country SET name = "Pitcairn" WHERE lower(name) = lower("Pitcairn"); -UPDATE civicrm_country SET name = "Poland" WHERE lower(name) = lower("Poland"); -UPDATE civicrm_country SET name = "Portugal" WHERE lower(name) = lower("Portugal"); -UPDATE civicrm_country SET name = "Puerto Rico" WHERE lower(name) = lower("Puerto Rico"); -UPDATE civicrm_country SET name = "Qatar" WHERE lower(name) = lower("Qatar"); -UPDATE civicrm_country SET name = "Romania" WHERE lower(name) = lower("Romania"); -UPDATE civicrm_country SET name = "Russian Federation" WHERE lower(name) = lower("Russian Federation"); -UPDATE civicrm_country SET name = "Rwanda" WHERE lower(name) = lower("Rwanda"); -UPDATE civicrm_country SET name = "Reunion" WHERE lower(name) = lower("Reunion"); -UPDATE civicrm_country SET name = "Saint Helena" WHERE lower(name) = lower("Saint Helena"); -UPDATE civicrm_country SET name = "Saint Kitts and Nevis" WHERE lower(name) = lower("Saint Kitts and Nevis"); -UPDATE civicrm_country SET name = "Saint Lucia" WHERE lower(name) = lower("Saint Lucia"); -UPDATE civicrm_country SET name = "Saint Pierre and Miquelon" WHERE lower(name) = lower("Saint Pierre and Miquelon"); -UPDATE civicrm_country SET name = "Saint Vincent and the Grenadines" WHERE lower(name) = lower("Saint Vincent and the Grenadines"); -UPDATE civicrm_country SET name = "Samoa" WHERE lower(name) = lower("Samoa"); -UPDATE civicrm_country SET name = "San Marino" WHERE lower(name) = lower("San Marino"); -UPDATE civicrm_country SET name = "Saudi Arabia" WHERE lower(name) = lower("Saudi Arabia"); -UPDATE civicrm_country SET name = "Senegal" WHERE lower(name) = lower("Senegal"); -UPDATE civicrm_country SET name = "Seychelles" WHERE lower(name) = lower("Seychelles"); -UPDATE civicrm_country SET name = "Sierra Leone" WHERE lower(name) = lower("Sierra Leone"); -UPDATE civicrm_country SET name = "Singapore" WHERE lower(name) = lower("Singapore"); -UPDATE civicrm_country SET name = "Slovakia" WHERE lower(name) = lower("Slovakia"); -UPDATE civicrm_country SET name = "Slovenia" WHERE lower(name) = lower("Slovenia"); -UPDATE civicrm_country SET name = "Solomon Islands" WHERE lower(name) = lower("Solomon Islands"); -UPDATE civicrm_country SET name = "Somalia" WHERE lower(name) = lower("Somalia"); -UPDATE civicrm_country SET name = "South Africa" WHERE lower(name) = lower("South Africa"); -UPDATE civicrm_country SET name = "South Georgia and the South Sandwich Islands" WHERE lower(name) = lower("South Georgia and the South Sandwich Islands"); -UPDATE civicrm_country SET name = "Spain" WHERE lower(name) = lower("Spain"); -UPDATE civicrm_country SET name = "Sri Lanka" WHERE lower(name) = lower("Sri Lanka"); -UPDATE civicrm_country SET name = "Sudan" WHERE lower(name) = lower("Sudan"); -UPDATE civicrm_country SET name = "Suriname" WHERE lower(name) = lower("Suriname"); -UPDATE civicrm_country SET name = "Svalbard and Jan Mayen" WHERE lower(name) = lower("Svalbard and Jan Mayen"); -UPDATE civicrm_country SET name = "Swaziland" WHERE lower(name) = lower("Swaziland"); -UPDATE civicrm_country SET name = "Sweden" WHERE lower(name) = lower("Sweden"); -UPDATE civicrm_country SET name = "Switzerland" WHERE lower(name) = lower("Switzerland"); -UPDATE civicrm_country SET name = "Syrian Arab Republic" WHERE lower(name) = lower("Syrian Arab Republic"); -UPDATE civicrm_country SET name = "Sao Tome and Principe" WHERE lower(name) = lower("Sao Tome and Principe"); -UPDATE civicrm_country SET name = "Taiwan" WHERE lower(name) = lower("Taiwan"); -UPDATE civicrm_country SET name = "Tajikistan" WHERE lower(name) = lower("Tajikistan"); -UPDATE civicrm_country SET name = "Tanzania, United Republic of" WHERE lower(name) = lower("Tanzania, United Republic of"); -UPDATE civicrm_country SET name = "Thailand" WHERE lower(name) = lower("Thailand"); -UPDATE civicrm_country SET name = "Bahamas" WHERE lower(name) = lower("Bahamas"); -UPDATE civicrm_country SET name = "Gambia" WHERE lower(name) = lower("Gambia"); -UPDATE civicrm_country SET name = "Togo" WHERE lower(name) = lower("Togo"); -UPDATE civicrm_country SET name = "Tokelau" WHERE lower(name) = lower("Tokelau"); -UPDATE civicrm_country SET name = "Tonga" WHERE lower(name) = lower("Tonga"); -UPDATE civicrm_country SET name = "Trinidad and Tobago" WHERE lower(name) = lower("Trinidad and Tobago"); -UPDATE civicrm_country SET name = "Tunisia" WHERE lower(name) = lower("Tunisia"); -UPDATE civicrm_country SET name = "Turkey" WHERE lower(name) = lower("Turkey"); -UPDATE civicrm_country SET name = "Turkmenistan" WHERE lower(name) = lower("Turkmenistan"); -UPDATE civicrm_country SET name = "Turks and Caicos Islands" WHERE lower(name) = lower("Turks and Caicos Islands"); -UPDATE civicrm_country SET name = "Tuvalu" WHERE lower(name) = lower("Tuvalu"); -UPDATE civicrm_country SET name = "Uganda" WHERE lower(name) = lower("Uganda"); -UPDATE civicrm_country SET name = "Ukraine" WHERE lower(name) = lower("Ukraine"); -UPDATE civicrm_country SET name = "United Arab Emirates" WHERE lower(name) = lower("United Arab Emirates"); -UPDATE civicrm_country SET name = "United Kingdom" WHERE lower(name) = lower("United Kingdom"); -UPDATE civicrm_country SET name = "United States Minor Outlying Islands" WHERE lower(name) = lower("United States Minor Outlying Islands"); -UPDATE civicrm_country SET name = "United States" WHERE lower(name) = lower("United States"); -UPDATE civicrm_country SET name = "Uruguay" WHERE lower(name) = lower("Uruguay"); -UPDATE civicrm_country SET name = "Uzbekistan" WHERE lower(name) = lower("Uzbekistan"); -UPDATE civicrm_country SET name = "Vanuatu" WHERE lower(name) = lower("Vanuatu"); -UPDATE civicrm_country SET name = "Venezuela" WHERE lower(name) = lower("Venezuela"); -UPDATE civicrm_country SET name = "Viet Nam" WHERE lower(name) = lower("Viet Nam"); -UPDATE civicrm_country SET name = "Virgin Islands, British" WHERE lower(name) = lower("Virgin Islands, British"); -UPDATE civicrm_country SET name = "Wallis and Futuna" WHERE lower(name) = lower("Wallis and Futuna"); -UPDATE civicrm_country SET name = "Western Sahara" WHERE lower(name) = lower("Western Sahara"); -UPDATE civicrm_country SET name = "Yemen" WHERE lower(name) = lower("Yemen"); -UPDATE civicrm_country SET name = "Serbia and Montenegro" WHERE lower(name) = lower("Serbia and Montenegro"); -UPDATE civicrm_country SET name = "Zambia" WHERE lower(name) = lower("Zambia"); -UPDATE civicrm_country SET name = "Zimbabwe" WHERE lower(name) = lower("Zimbabwe"); -UPDATE civicrm_country SET name = "Åland Islands" WHERE lower(name) = lower("Åland Islands"); -UPDATE civicrm_country SET name = "Serbia" WHERE lower(name) = lower("Serbia"); -UPDATE civicrm_country SET name = "Montenegro" WHERE lower(name) = lower("Montenegro"); -UPDATE civicrm_country SET name = "Jersey" WHERE lower(name) = lower("Jersey"); -UPDATE civicrm_country SET name = "Guernsey" WHERE lower(name) = lower("Guernsey"); -UPDATE civicrm_country SET name = "Isle of Man" WHERE lower(name) = lower("Isle of Man"); -UPDATE civicrm_country SET name = "South Sudan" WHERE lower(name) = lower("South Sudan"); -UPDATE civicrm_country SET name = "Curaçao" WHERE lower(name) = lower("Curaçao"); -UPDATE civicrm_country SET name = "Sint Maarten (Dutch Part)" WHERE lower(name) = lower("Sint Maarten (Dutch Part)"); -UPDATE civicrm_country SET name = "Bonaire, Saint Eustatius and Saba" WHERE lower(name) = lower("Bonaire, Saint Eustatius and Saba"); -UPDATE civicrm_country SET name = "Kosovo" WHERE lower(name) = lower("Kosovo"); -UPDATE civicrm_country SET name = "Saint Barthélemy" WHERE lower(name) = lower("Saint Barthélemy"); -UPDATE civicrm_country SET name = "Saint Martin (French part)" WHERE lower(name) = lower("Saint Martin (French part)"); -UPDATE civicrm_country SET name = "Afghanistan" WHERE lower(name) = lower("Afghanistan"); -UPDATE civicrm_country SET name = "Albania" WHERE lower(name) = lower("Albania"); -UPDATE civicrm_country SET name = "Algeria" WHERE lower(name) = lower("Algeria"); diff --git a/CRM/Upgrade/Incremental/sql/4.7.12.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.12.mysql.tpl deleted file mode 100644 index 4d7d5118f6..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.12.mysql.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{* file to handle db changes in 4.7.12 during upgrade *} - --- CRM-19271 -ALTER TABLE civicrm_action_schedule CHANGE start_action_condition start_action_condition VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Reminder Action'; - --- CRM-19367 -SELECT @option_group_id_fat := max(id) from civicrm_option_group where name = 'financial_account_type'; - -UPDATE civicrm_option_value SET {localize field="description"}description = 'Things you owe, like a grant still to be disbursed'{/localize} - WHERE name = 'Liability' AND option_group_id = @option_group_id_fat; diff --git a/CRM/Upgrade/Incremental/sql/4.7.13.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.13.mysql.tpl deleted file mode 100644 index dca3640814..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.13.mysql.tpl +++ /dev/null @@ -1,24 +0,0 @@ -{* file to handle db changes in 4.7.13 during upgrade *} - --- CRM-19427 -ALTER TABLE `civicrm_price_field_value` CHANGE `deductible_amount` `non_deductible_amount` DECIMAL( 20, 2 ) NOT NULL DEFAULT '0.00' COMMENT 'Portion of total amount which is NOT tax deductible.'; - -ALTER TABLE `civicrm_line_item` CHANGE `deductible_amount` `non_deductible_amount` DECIMAL( 20, 2 ) NOT NULL DEFAULT '0.00' COMMENT 'Portion of total amount which is NOT tax deductible.'; - --- CRM-15371 Manage tags with new *manage tags* permission (used to need *administer CiviCRM* permission) -UPDATE civicrm_navigation SET - `url` = 'civicrm/tag?reset=1', - `permission` = 'manage tags' -WHERE `name` = 'Manage Tags (Categories)'; - -UPDATE civicrm_navigation SET - `url` = 'civicrm/tag?reset=1&action=add', - `permission` = 'manage tags' -WHERE `name` = 'New Tag'; - -UPDATE civicrm_navigation SET - `url` = 'civicrm/tag?reset=1' -WHERE `name` = 'Tags (Categories)'; - --- CRM-16352: Add language filter support for mass mailing -ALTER TABLE civicrm_mailing ADD COLUMN `language` varchar(5) DEFAULT NULL COMMENT 'Language of the content of the mailing. Useful for tokens.'; diff --git a/CRM/Upgrade/Incremental/sql/4.7.14.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.14.mysql.tpl deleted file mode 100644 index 139631cc2e..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.14.mysql.tpl +++ /dev/null @@ -1,19 +0,0 @@ -{* file to handle db changes in 4.7.14 during upgrade *} --- CRM-19616 Fix Manage Tags and New Tag Url issues. -UPDATE civicrm_navigation SET - `url` = 'civicrm/tag?reset=1' -WHERE `name` = 'Manage Tags (Categories)' -AND `url` = 'civicrm/tag?reset=1&action=add'; - -UPDATE civicrm_navigation SET - `url` = 'civicrm/tag?reset=1&action=add' -WHERE `name` = 'New Tag' -AND `url` = 'civicrm/admin/tag?reset=1'; - -UPDATE civicrm_navigation SET - `url` = 'civicrm/tag?reset=1' -WHERE `name` = 'Tags (Categories)' -AND `url` = 'civicrm/admin/tag?reset=1'; - --- Handle message template changes -{include file='../CRM/Upgrade/4.7.14.msg_template/civicrm_msg_template.tpl'} diff --git a/CRM/Upgrade/Incremental/sql/4.7.15.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.15.mysql.tpl deleted file mode 100644 index 4052097c03..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.15.mysql.tpl +++ /dev/null @@ -1,4 +0,0 @@ -{* file to handle db changes in 4.7.15 during upgrade *} - --- CRM-19685 (fix for inconsistencies) -UPDATE civicrm_contact SET preferred_mail_format = 'Both' WHERE preferred_mail_format IS NULL; diff --git a/CRM/Upgrade/Incremental/sql/4.7.16.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.16.mysql.tpl deleted file mode 100644 index 54ab063979..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.16.mysql.tpl +++ /dev/null @@ -1,28 +0,0 @@ -{* file to handle db changes in 4.7.16 during upgrade *} - --- CRM-19723 add icons -SELECT @option_group_id_act := max(id) from civicrm_option_group where name = 'activity_type'; -UPDATE civicrm_option_value SET icon = 'fa-slideshare' WHERE option_group_id = @option_group_id_act AND name = 'Meeting'; -UPDATE civicrm_option_value SET icon = 'fa-phone' WHERE option_group_id = @option_group_id_act AND name = 'Phone Call'; -UPDATE civicrm_option_value SET icon = 'fa-envelope-o' WHERE option_group_id = @option_group_id_act AND name = 'Email'; -UPDATE civicrm_option_value SET icon = 'fa-mobile' WHERE option_group_id = @option_group_id_act AND name = 'SMS'; -UPDATE civicrm_option_value SET icon = 'fa-file-pdf-o' WHERE option_group_id = @option_group_id_act AND name = 'Print PDF Letter'; -UPDATE civicrm_option_value SET icon = 'fa-folder-open-o' WHERE option_group_id = @option_group_id_act AND name = 'Open Case'; -UPDATE civicrm_option_value SET icon = 'fa-share-square-o' WHERE option_group_id = @option_group_id_act AND name = 'Follow up'; -UPDATE civicrm_option_value SET icon = 'fa-random' WHERE option_group_id = @option_group_id_act AND name = 'Change Case Type'; -UPDATE civicrm_option_value SET icon = 'fa-pencil-square-o' WHERE option_group_id = @option_group_id_act AND name = 'Change Case Status'; -UPDATE civicrm_option_value SET icon = 'fa-calendar' WHERE option_group_id = @option_group_id_act AND name = 'Change Case Start Date'; -UPDATE civicrm_option_value SET icon = 'fa-user-plus' WHERE option_group_id = @option_group_id_act AND name = 'Assign Case Role'; -UPDATE civicrm_option_value SET icon = 'fa-user-times' WHERE option_group_id = @option_group_id_act AND name = 'Remove Case Role'; -UPDATE civicrm_option_value SET icon = 'fa-file-pdf-o' WHERE option_group_id = @option_group_id_act AND name = 'Print PDF Letter'; -UPDATE civicrm_option_value SET icon = 'fa-compress' WHERE option_group_id = @option_group_id_act AND name = 'Merge Case'; -UPDATE civicrm_option_value SET icon = 'fa-user-circle-o' WHERE option_group_id = @option_group_id_act AND name = 'Reassigned Case'; -UPDATE civicrm_option_value SET icon = 'fa-link' WHERE option_group_id = @option_group_id_act AND name = 'Link Cases'; -UPDATE civicrm_option_value SET icon = 'fa-tags' WHERE option_group_id = @option_group_id_act AND name = 'Change Case Tags'; -UPDATE civicrm_option_value SET icon = 'fa-users' WHERE option_group_id = @option_group_id_act AND name = 'Add Client To Case'; - --- CRM-17663 repair null dashlet names -UPDATE `civicrm_dashboard` - SET name = CONCAT('report/', SUBSTRING_INDEX(SUBSTRING_INDEX(url, '?', 1), '/', -1)) - WHERE name IS NULL AND url LIKE "civicrm/report/instance/%"; - diff --git a/CRM/Upgrade/Incremental/sql/4.7.17.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.17.mysql.tpl deleted file mode 100644 index 03a47793e2..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.17.mysql.tpl +++ /dev/null @@ -1,14 +0,0 @@ -{* file to handle db changes in 4.7.17 during upgrade *} - --- CRM-19943 -UPDATE civicrm_navigation SET url = 'civicrm/tag' WHERE url = 'civicrm/tag?reset=1'; -UPDATE civicrm_navigation SET url = REPLACE(url, 'civicrm/tag', 'civicrm/tag/edit') WHERE url LIKE 'civicrm/tag?%'; - --- CRM-19815, CRM-19830 update references to check_number to reflect unique name -UPDATE civicrm_uf_field SET field_name = 'contribution_check_number' WHERE field_name = 'check_number'; -UPDATE civicrm_mapping_field SET name = 'contribution_check_number' WHERE name = 'check_number'; - --- CRM-20158 -ALTER TABLE `civicrm_financial_trxn` - ADD card_type INT( 10 ) UNSIGNED NULL DEFAULT NULL COMMENT 'FK to accept_creditcard option group values' AFTER payment_instrument_id, - ADD pan_truncation INT UNSIGNED NULL COMMENT 'Last 4 digits of credit card.' AFTER check_number; diff --git a/CRM/Upgrade/Incremental/sql/4.7.18.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.18.mysql.tpl deleted file mode 100644 index d2ebea11ad..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.18.mysql.tpl +++ /dev/null @@ -1,79 +0,0 @@ -{* file to handle db changes in 4.7.18 during upgrade *} - --- CRM-20062 New counties of Kenya. -SELECT @country_id := max(id) from civicrm_country where iso_code = "KE"; -INSERT IGNORE INTO civicrm_state_province (country_id, abbreviation, name) VALUES -(@country_id, "01", "Baringo"), -(@country_id, "02", "Bomet"), -(@country_id, "03", "Bungoma"), -(@country_id, "04", "Busia"), -(@country_id, "05", "Elgeyo/Marakwet"), -(@country_id, "06", "Embu"), -(@country_id, "07", "Garissa"), -(@country_id, "08", "Homa Bay"), -(@country_id, "09", "Isiolo"), -(@country_id, "10", "Kajiado"), -(@country_id, "11", "Kakamega"), -(@country_id, "12", "Kericho"), -(@country_id, "13", "Kiambu"), -(@country_id, "14", "Kilifi"), -(@country_id, "15", "Kirinyaga"), -(@country_id, "16", "Kisii"), -(@country_id, "17", "Kisumu"), -(@country_id, "18", "Kitui"), -(@country_id, "19", "Kwale"), -(@country_id, "20", "Laikipia"), -(@country_id, "21", "Lamu"), -(@country_id, "22", "Machakos"), -(@country_id, "23", "Makueni"), -(@country_id, "24", "Mandera"), -(@country_id, "25", "Marsabit"), -(@country_id, "26", "Meru"), -(@country_id, "27", "Migori"), -(@country_id, "28", "Mombasa"), -(@country_id, "29", "Murang'a"), -(@country_id, "30", "Nairobi City"), -(@country_id, "31", "Nakuru"), -(@country_id, "32", "Nandi"), -(@country_id, "33", "Narok"), -(@country_id, "34", "Nyamira"), -(@country_id, "35", "Nyandarua"), -(@country_id, "36", "Nyeri"), -(@country_id, "37", "Samburu"), -(@country_id, "38", "Siaya"), -(@country_id, "39", "Taita/Taveta"), -(@country_id, "40", "Tana River"), -(@country_id, "41", "Tharaka-Nithi"), -(@country_id, "42", "Trans Nzoia"), -(@country_id, "43", "Turkana"), -(@country_id, "44", "Uasin Gishu"), -(@country_id, "45", "Vihiga"), -(@country_id, "46", "Wajir"), -(@country_id, "47", "West Pokot"); - --- CRM-19993 Fixes for ISO compliance with countries and counties -INSERT INTO `civicrm_state_province` (`id`, `country_id`, `abbreviation`, `name`) VALUES -(NULL, 1101, "CH", "Chandigarh"), -(NULL, 1083, "CP", "Central"), -(NULL, 1083, "EP", "Eastern"), -(NULL, 1083, "NP", "Northern"), -(NULL, 1083, "WP", "Western"), -(NULL, 1181, "K", "Saint Kitts"), -(NULL, 1181, "N", "Nevis"), -(NULL, 1190, "E", "Eastern"), -(NULL, 1190, "N", "Northern"), -(NULL, 1190, "S", "Southern"); - -UPDATE `civicrm_state_province` SET `name`='Uttarakhand', `abbreviation`='UT' WHERE `name` = 'Uttaranchal' AND `abbreviation`='UL'; -UPDATE `civicrm_state_province` SET `name`='Yunlin County' WHERE `name` = 'Yunlin Conuty'; -UPDATE `civicrm_country` SET `name`='Palestine, State of' WHERE `name` = 'Palestinian Territory'; -UPDATE `civicrm_country` SET `name`='Virgin Islands, British' WHERE `name` = 'Virgin Islands,British'; - --- CRM-20102 make case_type_id required -ALTER TABLE `civicrm_case` DROP FOREIGN KEY `FK_civicrm_case_case_type_id`; -ALTER TABLE `civicrm_case` MODIFY `case_type_id` int(10) unsigned NOT NULL COMMENT 'FK to civicrm_case_type.id'; -ALTER TABLE `civicrm_case` ADD CONSTRAINT `FK_civicrm_case_case_type_id` FOREIGN KEY (`case_type_id`) REFERENCES `civicrm_case_type` (`id`); - ---- CRM-19715 Remove Close Accounting Period code - now in an extension. -DELETE FROM civicrm_navigation -WHERE url = 'civicrm/admin/contribute/closeaccperiod?reset=1' AND name = 'Close Accounting Period'; diff --git a/CRM/Upgrade/Incremental/sql/4.7.19.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.19.mysql.tpl deleted file mode 100644 index 2e644c5155..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.19.mysql.tpl +++ /dev/null @@ -1,55 +0,0 @@ -{* file to handle db changes in 4.7.19 during upgrade *} --- CRM-19715 -SELECT @option_group_id_act := max(id) from civicrm_option_group where name = 'activity_type'; -SELECT @close_acc_period_act_val := `value` FROM civicrm_option_value WHERE option_group_id = @option_group_id_act AND name = 'Close Accounting Period'; -SELECT @close_accounting_period_activity_count := count(id) FROM `civicrm_activity` WHERE `activity_type_id` = @close_acc_period_act_val; - --- Delete Close Accounting Period activity type -DELETE FROM civicrm_option_value - WHERE option_group_id = @option_group_id_act AND name = 'Close Accounting Period' AND @close_accounting_period_activity_count = 0; - --- CRM-19517 Disable all price fields and price field options that use disabled fianancial types -UPDATE civicrm_price_field_value cpfv -INNER JOIN civicrm_financial_type cft ON cft.id = cpfv.financial_type_id -INNER JOIN civicrm_price_field pf ON pf.id = cpfv.price_field_id -INNER JOIN civicrm_price_set ps ON ps.id = pf.price_set_id -SET cpfv.is_active = 0 -WHERE cft.is_active = 0 AND ps.is_quick_config = 0; - -UPDATE civicrm_price_field cpf -LEFT JOIN (SELECT DISTINCT price_field_id AS price_field_id - FROM civicrm_price_field_value - WHERE is_active = 1) AS price_field -ON price_field.price_field_id = cpf.id -SET cpf.is_active = 0 -WHERE price_field.price_field_id IS NULL; - --- CRM-20400 -{include file='../CRM/Upgrade/4.7.19.msg_template/civicrm_msg_template.tpl'} - --- CRM-20402 Improve dectection of spam bounces -SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Spam'; -UPDATE civicrm_mailing_bounce_pattern SET pattern = '(detected|rejected) (as|due to) spam' WHERE bounce_type_id = @bounceTypeID AND pattern = '(detected|rejected) as spam'; - --- CRM-19464 add 'Supplemental Address 3', increment weights after supplemental_address_2 to slot in this new one -SELECT @option_group_id_adOpt := max(id) from civicrm_option_group where name = 'address_options'; -SELECT @max_val := MAX(ROUND(op.value)) FROM civicrm_option_value op WHERE op.option_group_id = @option_group_id_adOpt; -SELECT @supp2_wt := weight FROM civicrm_option_value WHERE name = 'supplemental_address_2'; -UPDATE civicrm_option_value SET weight = weight + 1 WHERE option_group_id = @option_group_id_adOpt AND weight > @supp2_wt; -INSERT INTO - `civicrm_option_value` (`option_group_id`, {localize field='label'}label{/localize}, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, {localize field='description'}description{/localize}, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`, `icon`) -VALUES - (@option_group_id_adOpt, {localize}'{ts escape="sql"}Supplemental Address 3{/ts}'{/localize}, (SELECT @max_val := @max_val + 1), 'supplemental_address_3', NULL, 0, NULL, (SELECT @supp2_wt := @supp2_wt + 1), {localize}''{/localize}, 0, 0, 1, NULL, NULL, NULL); - --- Some legacy sites have `0000-00-00 00:00:00` values in --- `civicrm_financial_trxn.trxn_date` which correspond to the same value in --- `civicrm_contribution.receive_date` --- MySQL 5.7 may bork when comparing datetime columns to '0000-00-00 00:00:00' so cast the column to a CHAR(20) when comparing -UPDATE civicrm_financial_trxn SET trxn_date = NULL WHERE CAST(trxn_date AS CHAR(20)) = '0000-00-00 00:00:00'; -UPDATE civicrm_contribution SET receive_date = NULL WHERE CAST(receive_date AS CHAR(20)) = '0000-00-00 00:00:00'; - --- CRM-20439 rename card_type to card_type_id of civicrm_financial_trxn table (IIDA-126) -ALTER TABLE `civicrm_financial_trxn` CHANGE `card_type` `card_type_id` INT(10) UNSIGNED NULL DEFAULT NULL COMMENT 'FK to accept_creditcard option group values'; - --- CRM-20465 -ALTER TABLE `civicrm_financial_trxn` CHANGE `pan_truncation` `pan_truncation` VARCHAR( 4 ) NULL DEFAULT NULL COMMENT 'Last 4 digits of credit card'; diff --git a/CRM/Upgrade/Incremental/sql/4.7.2.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.2.mysql.tpl deleted file mode 100644 index 8a258e453a..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.2.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.7.2 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.7.20.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.20.mysql.tpl deleted file mode 100644 index c9205fd5aa..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.20.mysql.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{* file to handle db changes in 4.7.20 during upgrade *} - --- CRM-20576 -{if $multilingual} - {foreach from=$locales item=locale} - ALTER TABLE civicrm_batch CHANGE title_{$locale} title_{$locale} varchar(255); - {/foreach} -{else} - ALTER TABLE civicrm_batch CHANGE title title varchar(255); -{/if} diff --git a/CRM/Upgrade/Incremental/sql/4.7.21.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.21.mysql.tpl deleted file mode 100644 index 6fadcfa256..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.21.mysql.tpl +++ /dev/null @@ -1,12 +0,0 @@ -{* file to handle db changes in 4.7.21 during upgrade *} - --- CRM-20606 (spelling mistake in Austrian provinces) -UPDATE civicrm_state_province - SET name = 'Niederösterreich' - WHERE country_id = 1014 - AND name = 'Niederosterreich'; - -UPDATE civicrm_state_province - SET name = 'Oberösterreich' - WHERE country_id = 1014 - AND name = 'Oberosterreich'; diff --git a/CRM/Upgrade/Incremental/sql/4.7.22.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.22.mysql.tpl deleted file mode 100644 index d475831b71..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.22.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* v4.7.22 is an urgent release. It should have not have schema changes. *} diff --git a/CRM/Upgrade/Incremental/sql/4.7.23.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.23.mysql.tpl deleted file mode 100644 index dbedca1b2f..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.23.mysql.tpl +++ /dev/null @@ -1,43 +0,0 @@ -{* file to handle db changes in 4.7.23 during upgrade *} - -{include file='../CRM/Upgrade/4.7.23.msg_template/civicrm_msg_template.tpl'} - --- CRM-20816: Add CiviCase settings - -SELECT @civicaseAdminId := id FROM civicrm_navigation WHERE name = 'CiviCase' AND domain_id = {$domainID}; - -INSERT INTO civicrm_navigation -(domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight) -VALUES -({$domainID}, 'civicrm/admin/setting/case?reset=1', '{ts escape="sql" skip="true"}CiviCase Settings{/ts}', 'CiviCase Settings', NULL, 'AND', @civicaseAdminId, '1', NULL, 1); - --- CRM-20387 -UPDATE `civicrm_contribution` SET `invoice_number` = `invoice_id` WHERE `invoice_id` LIKE CONCAT('%', `id`); - --- CRM-20830 -UPDATE `civicrm_option_value` -SET filter = 1 -WHERE option_group_id = (SELECT id FROM civicrm_option_group WHERE name = 'activity_status') -AND name = 'Completed'; - -UPDATE `civicrm_option_value` -SET filter = 2 -WHERE option_group_id = (SELECT id FROM civicrm_option_group WHERE name = 'activity_status') -AND name IN ('Cancelled', 'Unreachable', 'Not Required', 'No-show'); - --- CRM-20848 : Set non-quick-config price field and their respective price options to active if it's not -UPDATE civicrm_price_field_value cpfv -INNER JOIN civicrm_financial_type cft ON cft.id = cpfv.financial_type_id -INNER JOIN civicrm_price_field pf ON pf.id = cpfv.price_field_id -INNER JOIN civicrm_price_set ps ON ps.id = pf.price_set_id -SET cpfv.is_active = 1 -WHERE ps.is_quick_config = 1; - -UPDATE civicrm_price_field cpf -LEFT JOIN (SELECT DISTINCT price_field_id AS price_field_id - FROM civicrm_price_field_value - WHERE is_active = 1) AS price_field -ON price_field.price_field_id = cpf.id -LEFT JOIN civicrm_price_set ps ON ps.id = cpf.price_set_id -SET cpf.is_active = 1 -WHERE ps.is_quick_config = 1 AND cpf.is_active = 0; diff --git a/CRM/Upgrade/Incremental/sql/4.7.24.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.24.mysql.tpl deleted file mode 100644 index 1c5df66513..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.24.mysql.tpl +++ /dev/null @@ -1,12 +0,0 @@ -{* file to handle db changes in 4.7.24 during upgrade *} ---Add pledge status option group -INSERT INTO `civicrm_option_group` ( `name`, {localize field='title'}`title`{/localize}, `is_active` ) VALUES ('pledge_status', {localize}'{ts escape="sql"}Pledge Status{/ts}'{/localize}, 1); - -SELECT @option_group_id_ps := MAX(id) FROM `civicrm_option_group` where name = 'pledge_status'; - -INSERT INTO `civicrm_option_value` (`option_group_id`, {localize field='label'}`label`{/localize}, `value`, `name`, `is_default`, `weight`) VALUES -(@option_group_id_ps, {localize}'{ts escape="sql"}Completed{/ts}'{/localize} , 1, 'Completed', NULL, 1), -(@option_group_id_ps, {localize}'{ts escape="sql"}Pending{/ts}'{/localize} , 2, 'Pending', NULL, 2), -(@option_group_id_ps, {localize}'{ts escape="sql"}Cancelled{/ts}'{/localize} , 3, 'Cancelled', NULL, 3), -(@option_group_id_ps, {localize}'{ts escape="sql"}In Progress{/ts}'{/localize}, 5, 'In Progress', NULL, 4), -(@option_group_id_ps, {localize}'{ts escape="sql"}Overdue{/ts}'{/localize} , 6, 'Overdue', NULL, 5); diff --git a/CRM/Upgrade/Incremental/sql/4.7.25.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.25.mysql.tpl deleted file mode 100644 index d6d7aba13b..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.25.mysql.tpl +++ /dev/null @@ -1,22 +0,0 @@ -{* file to handle db changes in 4.7.25 during upgrade *} - ---CRM-21061 Increase report_id size from 64 to 512 to match civicrm_option_value.value column -ALTER TABLE civicrm_report_instance CHANGE COLUMN report_id report_id varchar(512) COMMENT 'FK to civicrm_option_value for the report template'; - --- CRM-18231 Environment variables support -INSERT INTO civicrm_option_group - (name, {localize field='title'}title{/localize}, is_reserved, is_active) VALUES ('environment', {localize}'{ts escape="sql"}Environment{/ts}'{/localize}, 0, 1); - -SELECT @option_group_id_env := max(id) from civicrm_option_group where name = 'environment'; -INSERT INTO civicrm_option_value (`option_group_id`, {localize field='label'}label{/localize}, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, {localize field='description'}description{/localize}, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`) - VALUES - (@option_group_id_env, {localize}'{ts escape="sql"}Production{/ts}'{/localize}, 'Production', 'Production', NULL, 0, 1, 1, {localize}'{ts escape="sql"}Production Environment{/ts}'{/localize}, 0, 0, 1, NULL, NULL), - (@option_group_id_env, {localize}'{ts escape="sql"}Staging{/ts}'{/localize}, 'Staging', 'Staging', NULL, 0, NULL, 2, {localize}'{ts escape="sql"}Staging Environment{/ts}'{/localize}, 0, 0, 1, NULL, NULL), - (@option_group_id_env, {localize}'{ts escape="sql"}Development{/ts}'{/localize}, 'Development', 'Development', NULL, 0, NULL, 3, {localize}'{ts escape="sql"}Development Environment{/ts}'{/localize}, 0, 0, 1, NULL, NULL); - --- CRM-20935 Clean up orphaned profile links for deleted events -DELETE civicrm_uf_join -FROM civicrm_uf_join -LEFT JOIN civicrm_event e on civicrm_uf_join.entity_id = e.id -WHERE (civicrm_uf_join.module = 'CiviEvent' OR civicrm_uf_join.module = 'CiviEvent_Additional') -AND e.id IS NULL; diff --git a/CRM/Upgrade/Incremental/sql/4.7.26.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.26.mysql.tpl deleted file mode 100644 index 5eefccfff8..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.26.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.7.26 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.7.27.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.27.mysql.tpl deleted file mode 100644 index a971b26276..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.27.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.7.27 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.7.28.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.28.mysql.tpl deleted file mode 100644 index 61b278164c..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.28.mysql.tpl +++ /dev/null @@ -1,56 +0,0 @@ -{* file to handle db changes in 4.7.28 during upgrade *} - --- CRM-21268 Missing French overseas departments. - INSERT IGNORE INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES - (NULL, 1076, "WF", "Wallis-et-Futuna"), - (NULL, 1076, "NC", "Nouvelle-Calédonie"), - --- CRM-21283 Add in missing parishes and regions of Barbados and Antigua and Barbuda - (NULL, 1009, "03", "Saint George"), - (NULL, 1009, "04", "Saint John"), - (NULL, 1009, "05", "Saint Mary"), - (NULL, 1009, "06", "Saint Paul"), - (NULL, 1009, "07", "Saint Peter"), - (NULL, 1009, "08", "Saint Philip"), - (NULL, 1009, "10", "Barbuda"), - (NULL, 1009, "11", "Redonda"), - (NULL, 1018, "01", "Christ Church"), - (NULL, 1018, "02", "Saint Andrew"), - (NULL, 1018, "03", "Saint George"), - (NULL, 1018, "04", "Saint James"), - (NULL, 1018, "05", "Saint John"), - (NULL, 1018, "06", "Saint Joseph"), - (NULL, 1018, "07", "Saint Lucy"), - (NULL, 1018, "08", "Saint Michael"), - (NULL, 1018, "09", "Saint Peter"), - (NULL, 1018, "10", "Saint Philip"), - (NULL, 1018, "11", "Saint Thomas"); - --- CRM-21337 ISO compliance for Romanian and Bulgarian counties -UPDATE `civicrm_state_province` SET `name` = 'Argeș' WHERE `name` = 'Arges' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Bacău' WHERE `name` = 'Bacau' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Bistrița-Năsăud' WHERE `name` = 'Bistrita-Nasaud' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Botoșani' WHERE `name` = 'Boto\'ani' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Brașov' WHERE `name` = 'Bra\'ov' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Brăila' WHERE `name` = 'Braila' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Buzău' WHERE `name` = 'Buzau' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Caraș-Severin' WHERE `name` = 'Caras-Severin' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Călărași' WHERE `name` = 'Ca la ras\'i' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Constanța' WHERE `name` = 'Constant\'a' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Dâmbovița' WHERE `name` = 'Dambovit\'a' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Galați' WHERE `name` = 'Galat\'i' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Ialomița' WHERE `name` = 'Ialomit\'a' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Iași' WHERE `name` = 'Ias\'i' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Maramureș' WHERE `name` = 'Maramures' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Mehedinți' WHERE `name` = 'Mehedint\'i' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Mureș' WHERE `name` = 'Mures' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Neamț' WHERE `name` = 'Neamt' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Sălaj' WHERE `name` = 'Sa laj' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Timiș' WHERE `name` = 'Timis' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Vâlcea' WHERE `name` = 'Valcea' AND `country_id` = 1176; -UPDATE `civicrm_state_province` SET `name` = 'Pazardzhik' WHERE `name` = 'Pazardzik' AND `country_id` = 1033; - --- CRM-20772 Price set calculation precision when sales tax enabled -ALTER TABLE `civicrm_membership_type` CHANGE `minimum_fee` `minimum_fee` DECIMAL(18,9) NULL DEFAULT '0.00' COMMENT 'Minimum fee for this membership (0 for free/complimentary memberships).'; -ALTER TABLE `civicrm_price_field_value` CHANGE `amount` `amount` DECIMAL(18,9) NOT NULL COMMENT 'Price field option amount'; - diff --git a/CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl deleted file mode 100644 index 444a0ba0e1..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.7.29 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.7.3.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.3.mysql.tpl deleted file mode 100644 index 2d0e3cbcca..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.3.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.7.3 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.7.30.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.30.mysql.tpl deleted file mode 100644 index 5c72d66dcb..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.30.mysql.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{* file to handle db changes in 4.7.30 during upgrade *} - --- CRM-21407 ISO compliance for German counties -UPDATE `civicrm_state_province` SET `name` = 'Baden-Württemberg' WHERE `name` = 'Baden-Wuerttemberg' AND `country_id` = 1082; -UPDATE `civicrm_state_province` SET `abbreviation` = 'BE' WHERE `name` = 'Berlin' AND `abbreviation` = 'BR' AND `country_id` = 1082; -UPDATE `civicrm_state_province` SET `name` = 'Thüringen' WHERE `name` = 'Thueringen' AND `country_id` = 1082; - --- CRM-21378 Ensure that email abuse reports are treated as spam -SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Spam'; -INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern) VALUES (@bounceTypeID, 'abuse report'); - - --- CRM-21532 Add French state/departments -SELECT @country_id := id from civicrm_country where name = 'France' AND iso_code = 'FR'; -INSERT IGNORE INTO `civicrm_state_province` (`id`, `country_id`, `abbreviation`, `name`) VALUES -(NULL, @country_id, "52", "Haute-Marne"); diff --git a/CRM/Upgrade/Incremental/sql/4.7.31.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.31.mysql.tpl deleted file mode 100644 index a40e4357d1..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.31.mysql.tpl +++ /dev/null @@ -1,12 +0,0 @@ -{* file to handle db changes in 4.7.31 during upgrade *} - --- CRM-18300 Remove "_[id]" suffix from name column for profiles referenced --- by name in core code. -UPDATE IGNORE civicrm_uf_group SET name = 'new_individual' WHERE name = concat('new_individual_', id); -UPDATE IGNORE civicrm_uf_group SET name = 'new_organization' WHERE name = concat('new_organization_', id); -UPDATE IGNORE civicrm_uf_group SET name = 'new_household' WHERE name = concat('new_household_', id); -UPDATE IGNORE civicrm_uf_group SET name = 'summary_overlay' WHERE name = concat('summary_overlay_', id); -UPDATE IGNORE civicrm_uf_group SET name = 'contribution_batch_entry' WHERE name = concat('contribution_batch_entry_', id); -UPDATE IGNORE civicrm_uf_group SET name = 'membership_batch_entry' WHERE name = concat('membership_batch_entry_', id); -UPDATE IGNORE civicrm_uf_group SET name = 'shared_address' WHERE name = concat('shared_address_', id); -UPDATE IGNORE civicrm_uf_group SET name = 'event_registration' WHERE name = concat('event_registration_', id); diff --git a/CRM/Upgrade/Incremental/sql/4.7.32.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.32.mysql.tpl deleted file mode 100644 index b542246f42..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.32.mysql.tpl +++ /dev/null @@ -1,14 +0,0 @@ -{* file to handle db changes in 4.7.32 during upgrade *} - --- CRM-21837 - Missing states for Gabon -SELECT @country_id := id from civicrm_country where name = 'Gabon' AND iso_code = 'GA'; -INSERT IGNORE INTO `civicrm_state_province` (`id`, `country_id`, `abbreviation`, `name`) VALUES -(NULL, @country_id, "01", "Estuaire"), -(NULL, @country_id, "02", "Haut-Ogooué"), -(NULL, @country_id, "03", "Moyen-Ogooué"), -(NULL, @country_id, "04", "Ngounié"), -(NULL, @country_id, "05", "Nyanga"), -(NULL, @country_id, "06", "Ogooué-Ivindo"), -(NULL, @country_id, "07", "Ogooué-Lolo"), -(NULL, @country_id, "08", "Ogooué-Maritime"), -(NULL, @country_id, "09", "Woleu-Ntem"); diff --git a/CRM/Upgrade/Incremental/sql/4.7.4.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.4.mysql.tpl deleted file mode 100644 index 1079b1ad15..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.4.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.7.4 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl deleted file mode 100644 index 5138ace125..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl +++ /dev/null @@ -1,33 +0,0 @@ -{* file to handle db changes in 4.7.5 during upgrade *} -{include file='../CRM/Upgrade/4.7.5.msg_template/civicrm_msg_template.tpl'} - --- Minor fix for CRM-16173, CRM-16831 - change labels, add separator, etc. -SELECT @parent_id := id from `civicrm_navigation` where name = 'System Settings' AND domain_id = {$domainID}; -UPDATE `civicrm_navigation` SET `label` = 'Components' where `name` = 'Enable Components' and `parent_id` = @parent_id; - -UPDATE - `civicrm_navigation` AS nav1 - JOIN `civicrm_navigation` AS nav2 ON - nav1.name = 'Connections' - AND nav2.name = 'Manage Extensions' - AND nav1.parent_id = @parent_id -SET - nav1.weight = nav2.weight, - nav2.weight = nav1.weight, - nav2.has_separator = 1, - nav2.label = 'Extensions'; - --- CRM-18327 filter value missed on the contact deleted by merge activity -- -UPDATE civicrm_option_value ov -LEFT JOIN civicrm_option_group og ON og.id = ov.option_group_id -SET filter = 1 -WHERE ov.name = 'Contact Deleted by Merge' AND og.name = 'activity_type'; - --- CRM-18241 Change field length of civicrm_option_value.label from 255 to 512 -- -{if $multilingual} - {foreach from=$locales item=loc} - ALTER TABLE civicrm_option_value CHANGE label_{$loc} label_{$loc} varchar( 512 ) DEFAULT NULL ; - {/foreach} -{else} - ALTER TABLE civicrm_option_value CHANGE label label varchar( 512 ) DEFAULT NULL ; -{/if} diff --git a/CRM/Upgrade/Incremental/sql/4.7.6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.6.mysql.tpl deleted file mode 100644 index f29916faf9..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.6.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.7.6 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.7.7.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.7.mysql.tpl deleted file mode 100644 index ce446ac804..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.7.mysql.tpl +++ /dev/null @@ -1,76 +0,0 @@ -{* file to handle db changes in 4.7.7 during upgrade *} -# CRM-17852 - Misspeled state names in Estonia/Lithuania -#Estonia - -SET @EstoniaCountryId = (SELECT id FROM civicrm_country cc WHERE cc.name = 'Estonia'); - -UPDATE civicrm_state_province SET name = 'Harjumaa' where name='Harjumsa' AND country_id = @EstoniaCountryId; -UPDATE civicrm_state_province SET name = 'Hiiumaa' where name='Hitumea' AND country_id = @EstoniaCountryId; -UPDATE civicrm_state_province SET name = 'Ida-Virumaa' where name='Ida-Virumsa' AND country_id = @EstoniaCountryId; -UPDATE civicrm_state_province SET name = 'Jõgevamaa' where name='Jogevamsa' AND country_id = @EstoniaCountryId; -UPDATE civicrm_state_province SET name = 'Järvamaa' where name='Jarvamsa' AND country_id = @EstoniaCountryId; -UPDATE civicrm_state_province SET name = 'Läänemaa' where name='Lasnemsa' AND country_id = @EstoniaCountryId; -UPDATE civicrm_state_province SET name = 'Lääne-Virumaa' where name='Laane-Virumaa' AND country_id = @EstoniaCountryId; -UPDATE civicrm_state_province SET name = 'Põlvamaa' where name='Polvamea' AND country_id = @EstoniaCountryId; -UPDATE civicrm_state_province SET name = 'Pärnumaa' where name='Parnumsa' AND country_id = @EstoniaCountryId; -UPDATE civicrm_state_province SET name = 'Raplamaa' where name='Raplamsa' AND country_id = @EstoniaCountryId; -UPDATE civicrm_state_province SET name = 'Saaremaa' where name='Saaremsa' AND country_id = @EstoniaCountryId; -UPDATE civicrm_state_province SET name = 'Tartumaa' where name='Tartumsa' AND country_id = @EstoniaCountryId; -UPDATE civicrm_state_province SET name = 'Viljandimaa' where name='Viljandimsa' AND country_id = @EstoniaCountryId; -UPDATE civicrm_state_province SET name = 'Võrumaa' where name='Vorumaa' AND country_id = @EstoniaCountryId; - -#Lithuania - -SET @LithuaniaCountryId = (SELECT id FROM civicrm_country cc WHERE cc.name = 'Lithuania'); - -UPDATE civicrm_state_province SET name = 'Klaipėdos Apskritis' where name='Klaipedos Apskritis' AND country_id = @LithuaniaCountryId; -UPDATE civicrm_state_province SET name = 'Marijampolės Apskritis' where name='Marijampoles Apskritis' AND country_id = @LithuaniaCountryId; -UPDATE civicrm_state_province SET name = 'Panevėžio Apskritis' where name='Panevezio Apskritis' AND country_id = @LithuaniaCountryId; -UPDATE civicrm_state_province SET name = 'Šiaulių Apskritis' where name='Sisuliu Apskritis' AND country_id = @LithuaniaCountryId; -UPDATE civicrm_state_province SET name = 'Tauragės Apskritis' where name='Taurages Apskritis' AND country_id = @LithuaniaCountryId; -UPDATE civicrm_state_province SET name = 'Telšių Apskritis' where name='Telsiu Apskritis' AND country_id = @LithuaniaCountryId; - -# CRM-18014 - Missspeled county names in Sweden - -SET @SwedenCountryId = (SELECT id FROM civicrm_country cc WHERE cc.name = 'Sweden'); - -UPDATE civicrm_state_province SET name = 'Blekinge län' where name='Blekinge lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Dalarnas län' where name='Dalarnas lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Gävleborgs län' where name='Gavleborge lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Gotlands län' where name='Gotlands lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Hallands län' where name='Hallands lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Jämtlands län' where name='Jamtlande lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Jönköpings län' where name='Jonkopings lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Kalmar län' where name='Kalmar lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Kronobergs län' where name='Kronoberge lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Norrbottens län' where name='Norrbottena lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Örebro län' where name='Orebro lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Östergötlands län' where name='Ostergotlands lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Skåne län' where name='Skane lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Södermanlands län' where name='Sodermanlands lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Stockholms län' where name='Stockholms lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Uppsala län' where name='Uppsala lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Värmlands län' where name='Varmlanda lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Västerbottens län' where name='Vasterbottens lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Västernorrlands län' where name='Vasternorrlands lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Västmanlands län' where name='Vastmanlanda lan' AND country_id = @SwedenCountryId; -UPDATE civicrm_state_province SET name = 'Västra Götalands län' where name='Vastra Gotalands lan' AND country_id = @SwedenCountryId; - -{include file='../CRM/Upgrade/4.7.4.msg_template/civicrm_msg_template.tpl'} - --- CRM-18037 - update preferred mail format to set as default -UPDATE `civicrm_contact` SET `preferred_mail_format` = 'Both' WHERE `preferred_mail_format` IS NULL; - --- Fix weight interchange of `Extensions` and `Connections` navigation menu -SELECT @parent_id := id from `civicrm_navigation` where name = 'System Settings' AND domain_id = {$domainID}; -UPDATE - `civicrm_navigation` AS nav1 - JOIN `civicrm_navigation` AS nav2 ON - nav1.name = 'Connections' - AND nav2.name = 'Manage Extensions' - AND nav2.has_separator = 1 - AND nav1.parent_id = @parent_id - AND nav1.weight > nav2.weight -SET - nav1.weight = nav2.weight, - nav2.weight = nav1.weight; diff --git a/CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl deleted file mode 100644 index 146fbcefb9..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl +++ /dev/null @@ -1,17 +0,0 @@ -{* file to handle db changes in 4.7.8 during upgrade *} - --- CRM-18516 Convert the date fields relating to group caching and acl caching timestamp -ALTER TABLE civicrm_group CHANGE cache_date cache_date timestamp NULL DEFAULT NULL , CHANGE refresh_date refresh_date timestamp NULL DEFAULT NULL; -ALTER TABLE civicrm_acl_cache CHANGE modified_date modified_date timestamp NULL DEFAULT NULL; - --- CRM-18537 -DELETE FROM civicrm_state_province WHERE name = 'Fernando de Noronha'; - --- CRM-17118 extend civicrm_address postal_code to accept full data strings from paypal etc. -ALTER TABLE civicrm_address CHANGE `postal_code` `postal_code` varchar(64) ; - --- CRM-16189 -SELECT @contributionNavId := id, @domainID := domain_id FROM civicrm_navigation WHERE name = 'Contributions'; -SELECT @navMaxWeight := MAX(ROUND(weight))+1 from civicrm_navigation WHERE parent_id = @contributionNavId; - -UPDATE civicrm_navigation SET has_separator = 1 WHERE name = 'Manage Price Sets' AND parent_id = @contributionNavId; diff --git a/CRM/Upgrade/Incremental/sql/4.7.9.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.9.mysql.tpl deleted file mode 100644 index cfce4adccc..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.9.mysql.tpl +++ /dev/null @@ -1,44 +0,0 @@ -{* file to handle db changes in 4.7.9 during upgrade *} - --- CRM-17607 Change PDF activity type label -SELECT @option_group_id_act := max(id) from civicrm_option_group where name = 'activity_type'; -UPDATE civicrm_option_value SET - {localize field="label"}label = '{ts escape="sql"}Print/Merge Document{/ts}'{/localize}, - {localize field="description"}description = '{ts escape="sql"}Export letters and other printable documents.{/ts}'{/localize} -WHERE name = 'Print PDF Letter' AND option_group_id = @option_group_id_act; - --- CRM-18699 Fix Wake Island misspelling, was Wake Ialand -UPDATE civicrm_state_province SET name="Wake Island" WHERE name="Wake Ialand"; - --- CRM-18960 Change title in Getting Started widget -UPDATE civicrm_dashboard SET - {localize field="label"}label = '{ts escape="sql"}CiviCRM Resources{/ts}'{/localize} -WHERE name = 'getting-started'; - --- CRM-16189 -ALTER TABLE civicrm_financial_account - ADD `opening_balance` decimal(20,2) DEFAULT '0.00' COMMENT 'Contains the opening balance for this financial account', - ADD `current_period_opening_balance` decimal(20,2) DEFAULT '0.00' COMMENT 'Contains the opening balance for the current period for this financial account'; - -ALTER TABLE civicrm_contribution -ADD `revenue_recognition_date` datetime DEFAULT NULL COMMENT 'Stores the date when revenue should be recognized.'; - --- CRM-16189 Financial account relationship -SELECT @option_group_id_arel := max(id) from civicrm_option_group where name = 'account_relationship'; -SELECT @option_group_id_arel_wt := MAX(weight) FROM civicrm_option_value WHERE option_group_id = @option_group_id_arel; -SELECT @option_group_id_arel_val := MAX(CAST( `value` AS UNSIGNED )) FROM civicrm_option_value WHERE option_group_id = @option_group_id_arel; - -INSERT INTO - `civicrm_option_value` (`option_group_id`, {localize field='label'}label{/localize}, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, {localize field='description'}`description`{/localize}, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`) -VALUES -(@option_group_id_arel, {localize}'{ts escape="sql"}Deferred Revenue Account is{/ts}'{/localize}, @option_group_id_arel_val+1, 'Deferred Revenue Account is', NULL, 0, 0, @option_group_id_arel_wt+1, {localize}'{ts escape="sql"}Deferred Revenue Account is{/ts}'{/localize}, 0, 1, 1, 2, NULL); - -SELECT @option_group_id_fat := max(id) from civicrm_option_group where name = 'financial_account_type'; -SELECT @opLiability := value FROM civicrm_option_value WHERE name = 'Liability' and option_group_id = @option_group_id_fat; -SELECT @domainContactId := contact_id from civicrm_domain where id = {$domainID}; -INSERT IGNORE INTO - `civicrm_financial_account` (`name`, `contact_id`, `financial_account_type_id`, `description`, `accounting_code`, `account_type_code`, `is_reserved`, `is_active`, `is_deductible`, `is_default`) -VALUES - ('Deferred Revenue - Event Fee', @domainContactId, @opLiability, 'Event revenue to be recognized in future months when the events occur', '2730', 'OCLIAB', 0, 1, 0, 0), - ('Deferred Revenue - Member Dues', @domainContactId, @opLiability, 'Membership revenue to be recognized in future months', '2740', 'OCLIAB', 0, 1, 0, 0); - diff --git a/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl deleted file mode 100644 index df1ad7d5c7..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl +++ /dev/null @@ -1,187 +0,0 @@ -{* file to handle db changes in 4.7.alpha1 during upgrade *} - --- Add new columns for multilingual purpose -ALTER TABLE `civicrm_action_schedule` ADD COLUMN `filter_contact_language` varchar(128) DEFAULT NULL COMMENT 'Used for multilingual installation'; -ALTER TABLE `civicrm_action_schedule` ADD COLUMN `communication_language` varchar(8) DEFAULT NULL COMMENT 'Used for multilingual installation'; -ALTER TABLE `civicrm_action_schedule` MODIFY COLUMN mapping_id varchar(64); --- Q: Should we validate that local civicrm_action_mapping records have expected IDs? - --- CRM-16354 -SELECT @option_group_id_wysiwyg := max(id) from civicrm_option_group where name = 'wysiwyg_editor'; - -UPDATE civicrm_option_value SET name = 'Textarea', {localize field='label'}label = 'Textarea'{/localize} - WHERE value = 1 AND option_group_id = @option_group_id_wysiwyg; - -DELETE FROM civicrm_option_value WHERE name IN ('Joomla Default Editor', 'Drupal Default Editor') - AND option_group_id = @option_group_id_wysiwyg; - -UPDATE civicrm_option_value SET is_active = 1, is_reserved = 1 WHERE option_group_id = @option_group_id_wysiwyg; - ---CRM-16719 -SELECT @option_group_id_report := max(id) from civicrm_option_group where name = 'report_template'; - -UPDATE civicrm_option_value SET {localize field="label"}label = 'Activity Details Report'{/localize} - WHERE value = 'activity' AND option_group_id = @option_group_id_report; - -UPDATE civicrm_option_value SET {localize field="label"}label = 'Activity Summary Report'{/localize} - WHERE value = 'activitySummary' AND option_group_id = @option_group_id_report; - ---CRM-11369 -UPDATE civicrm_participant_status_type SET {localize field='label'}label = 'Pending (pay later)'{/localize} WHERE name = 'Pending from pay later'; -UPDATE civicrm_participant_status_type SET {localize field='label'}label = 'Pending (incomplete transaction)'{/localize} WHERE name = 'Pending from incomplete transaction'; - ---CRM-16853 PCP Owner Notification ---CRM-16853 Contribution Invoice Receipt Translation - -{include file='../CRM/Upgrade/4.7.alpha1.msg_template/civicrm_msg_template.tpl'} - --- CRM-16478 Remove custom fatal error template path -DELETE FROM civicrm_setting WHERE name = 'fatalErrorTemplate'; - -UPDATE civicrm_state_province SET name = 'Bataan' WHERE name = 'Batasn'; - ---CRM-16914 -ALTER TABLE civicrm_payment_processor -ADD COLUMN -`payment_instrument_id` int unsigned DEFAULT 1 COMMENT 'Payment Instrument ID'; - -ALTER TABLE civicrm_payment_processor_type -ADD COLUMN -`payment_instrument_id` int unsigned DEFAULT 1 COMMENT 'Payment Instrument ID'; - --- CRM-16447 -UPDATE civicrm_state_province SET name = 'Northern Ostrobothnia' WHERE name = 'Nothern Ostrobothnia'; - --- CRM-14078 -UPDATE civicrm_option_group SET {localize field="title"}title = '{ts escape="sql"}Payment Methods{/ts}'{/localize} WHERE name = 'payment_instrument'; -UPDATE civicrm_navigation SET label = '{ts escape="sql"}Payment Methods{/ts}' WHERE name = 'Payment Instruments'; - --- CRM-16176 -{if $multilingual} - {foreach from=$locales item=locale} - ALTER TABLE civicrm_relationship_type ADD label_a_b_{$locale} varchar(64); - ALTER TABLE civicrm_relationship_type ADD label_b_a_{$locale} varchar(64); - ALTER TABLE civicrm_relationship_type ADD description_{$locale} varchar(255); - - UPDATE civicrm_relationship_type SET label_a_b_{$locale} = label_a_b; - UPDATE civicrm_relationship_type SET label_b_a_{$locale} = label_b_a; - UPDATE civicrm_relationship_type SET description_{$locale} = description; - {/foreach} - - ALTER TABLE civicrm_relationship_type DROP label_a_b; - ALTER TABLE civicrm_relationship_type DROP label_b_a; - ALTER TABLE civicrm_relationship_type DROP description; -{/if} - --- CRM-13283 -CREATE TABLE IF NOT EXISTS `civicrm_status_pref` ( - `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Status Preference ID', - `domain_id` int unsigned NOT NULL COMMENT 'Which Domain is this Status Preference for', - `name` varchar(255) NOT NULL COMMENT 'Name of the status check this preference references.', - `hush_until` date DEFAULT NULL COMMENT 'expires ignore_severity. NULL never hushes.', - `ignore_severity` int unsigned DEFAULT 1 COMMENT 'Hush messages up to and including this severity.', - `prefs` varchar(255) COMMENT 'These settings are per-check, and can\'t be compared across checks.', - `check_info` varchar(255) COMMENT 'These values are per-check, and can\'t be compared across checks.' -, - PRIMARY KEY ( `id` ) - - , INDEX `UI_status_pref_name`( - name - ) - -, CONSTRAINT FK_civicrm_status_pref_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`) -) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ; - --- CRM-17005 -UPDATE civicrm_country SET name = 'PALESTINIAN TERRITORY' WHERE name = 'PALESTINIAN TERRITORY, OCCUPIED'; - --- CRM-17145 update Activity detail data type -ALTER TABLE `civicrm_activity` CHANGE `details` `details` LONGTEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Details about the activity (agenda, notes, etc).'; - --- CRM-17136 Added Punjab Province for Pakistan -INSERT IGNORE INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES -(NULL, 1163, "PB", "Punjab"); - --- CRM-16195: Move relative date filters from code to database -INSERT INTO - `civicrm_option_group` (`name`, {localize field='title'}`title`{/localize}, `is_reserved`, `is_active`, `is_locked`) - VALUES - ('relative_date_filters' , {localize}'{ts escape="sql"}Relative Date Filters{/ts}'{/localize} , 1, 1, 0); - -SELECT @option_group_id_date_filter := max(id) from civicrm_option_group where name = 'relative_date_filters'; - -INSERT INTO - `civicrm_option_value` (`option_group_id`, {localize field='label'}`label`{/localize}, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`) - VALUES - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Today{/ts}'{/localize}, 'this.day', 'this.day', NULL, NULL, NULL,1, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}This week{/ts}'{/localize}, 'this.week', 'this.week', NULL, NULL, NULL,2, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}This calendar month{/ts}'{/localize}, 'this.month', 'this.month', NULL, NULL, NULL,3, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}This quarter{/ts}'{/localize}, 'this.quarter', 'this.quarter', NULL, NULL, NULL,4, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}This fiscal year{/ts}'{/localize}, 'this.fiscal_year', 'this.fiscal_year', NULL, NULL, NULL,5, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}This calendar year{/ts}'{/localize}, 'this.year', 'this.year', NULL, NULL, NULL,6, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Yesterday{/ts}'{/localize}, 'previous.day', 'previous.day', NULL, NULL, NULL,7, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Previous week{/ts}'{/localize}, 'previous.week', 'previous.week', NULL, NULL, NULL,8, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Previous calendar month{/ts}'{/localize}, 'previous.month', 'previous.month', NULL, NULL, NULL,9, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Previous quarter{/ts}'{/localize}, 'previous.quarter', 'previous.quarter', NULL, NULL, NULL,10, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Previous fiscal year{/ts}'{/localize}, 'previous.fiscal_year', 'previous.fiscal_year', NULL, NULL, NULL,11, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Previous calendar year{/ts}'{/localize}, 'previous.year', 'previous.year', NULL, NULL, NULL,12, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Last 7 days including today{/ts}'{/localize}, 'ending.week', 'ending.week', NULL, NULL, NULL,13, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Last 30 days including today{/ts}'{/localize}, 'ending.month', 'ending.month', NULL, NULL, NULL,14, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Last 60 days including today{/ts}'{/localize}, 'ending_2.month', 'ending_2.month', NULL, NULL, NULL,15, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Last 90 days including today{/ts}'{/localize}, 'ending.quarter', 'ending.quarter', NULL, NULL, NULL,16, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Last 12 months including today{/ts}'{/localize}, 'ending.year', 'ending.year', NULL, NULL, NULL,17, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Last 2 years including today{/ts}'{/localize}, 'ending_2.year', 'ending_2.year', NULL, NULL, NULL,18, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Last 3 years including today{/ts}'{/localize}, 'ending_3.year', 'ending_3.year', NULL, NULL, NULL,19, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Tomorrow{/ts}'{/localize}, 'starting.day', 'starting.day', NULL, NULL, NULL,20, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Next week{/ts}'{/localize}, 'next.week', 'next.week', NULL, NULL, NULL,21, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Next calendar month{/ts}'{/localize}, 'next.month', 'next.month', NULL, NULL, NULL,22, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Next quarter{/ts}'{/localize}, 'next.quarter', 'next.quarter', NULL, NULL, NULL,23, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Next fiscal year{/ts}'{/localize}, 'next.fiscal_year', 'next.fiscal_year', NULL, NULL, NULL,24, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Next calendar year{/ts}'{/localize}, 'next.year', 'next.year', NULL, NULL, NULL,25, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Next 7 days including today{/ts}'{/localize}, 'starting.week', 'starting.week', NULL, NULL, NULL,26, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Next 30 days including today{/ts}'{/localize}, 'starting.month', 'starting.month', NULL, NULL, NULL,27, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Next 60 days including today{/ts}'{/localize}, 'starting_2.month', 'starting_2.month', NULL, NULL, NULL,28, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Next 90 days including today{/ts}'{/localize}, 'starting.quarter', 'starting.quarter', NULL, NULL, NULL,29, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Next 12 months including today{/ts}'{/localize}, 'starting.year', 'starting.year', NULL, NULL, NULL,30, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Current week to-date{/ts}'{/localize}, 'current.week', 'current.week', NULL, NULL, NULL,31, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Current calendar month to-date{/ts}'{/localize}, 'current.month', 'current.month', NULL, NULL, NULL,32, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Current quarter to-date{/ts}'{/localize}, 'current.quarter', 'current.quarter', NULL, NULL, NULL,33, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Current calendar year to-date{/ts}'{/localize}, 'current.year', 'current.year', NULL, NULL, NULL,34, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}To end of yesterday{/ts}'{/localize}, 'earlier.day', 'earlier.day', NULL, NULL, NULL,35, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}To end of previous week{/ts}'{/localize}, 'earlier.week', 'earlier.week', NULL, NULL, NULL,36, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}To end of previous calendar month{/ts}'{/localize}, 'earlier.month', 'earlier.month', NULL, NULL, NULL,37, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}To end of previous quarter{/ts}'{/localize}, 'earlier.quarter', 'earlier.quarter', NULL, NULL, NULL,38, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}To end of previous calendar year{/ts}'{/localize}, 'earlier.year', 'earlier.year', NULL, NULL, NULL,39, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}From start of current day{/ts}'{/localize}, 'greater.day', 'greater.day', NULL, NULL, NULL,40, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}From start of current week{/ts}'{/localize}, 'greater.week', 'greater.week', NULL, NULL, NULL,41, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}From start of current calendar month{/ts}'{/localize}, 'greater.month', 'greater.month', NULL, NULL, NULL,42, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}From start of current quarter{/ts}'{/localize}, 'greater.quarter', 'greater.quarter', NULL, NULL, NULL,43, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}From start of current calendar year{/ts}'{/localize}, 'greater.year', 'greater.year', NULL, NULL, NULL,44, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}To end of current week{/ts}'{/localize}, 'less.week', 'less.week', NULL, NULL, NULL,45, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}To end of current calendar month{/ts}'{/localize}, 'less.month', 'less.month', NULL, NULL, NULL,46, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}To end of current quarter{/ts}'{/localize}, 'less.quarter', 'less.quarter', NULL, NULL, NULL,47, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}To end of current calendar year{/ts}'{/localize}, 'less.year', 'less.year', NULL, NULL, NULL,48, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Previous 2 days{/ts}'{/localize}, 'previous_2.day', 'previous_2.day', NULL, NULL, NULL,49, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Previous 2 weeks{/ts}'{/localize}, 'previous_2.week', 'previous_2.week', NULL, NULL, NULL,50, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Previous 2 calendar months{/ts}'{/localize}, 'previous_2.month', 'previous_2.month', NULL, NULL, NULL,51, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Previous 2 quarters{/ts}'{/localize}, 'previous_2.quarter', 'previous_2.quarter', NULL, NULL, NULL,52, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Previous 2 calendar years{/ts}'{/localize}, 'previous_2.year', 'previous_2.year', NULL, NULL, NULL,53, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Day prior to yesterday{/ts}'{/localize}, 'previous_before.day', 'previous_before.day', NULL, NULL, NULL,54, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Week prior to previous week{/ts}'{/localize}, 'previous_before.week', 'previous_before.week', NULL, NULL, NULL,55, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Month prior to previous calendar month{/ts}'{/localize}, 'previous_before.month', 'previous_before.month', NULL, NULL, NULL,56, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Quarter prior to previous quarter{/ts}'{/localize}, 'previous_before.quarter', 'previous_before.quarter', NULL, NULL, NULL,57, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}Year prior to previous calendar year{/ts}'{/localize}, 'previous_before.year', 'previous_before.year', NULL, NULL, NULL,58, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}From end of previous week{/ts}'{/localize}, 'greater_previous.week', 'greater_previous.week', NULL, NULL, NULL,59, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}From end of previous calendar month{/ts}'{/localize}, 'greater_previous.month', 'greater_previous.month', NULL, NULL, NULL,60, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}From end of previous quarter{/ts}'{/localize}, 'greater_previous.quarter', 'greater_previous.quarter', NULL, NULL, NULL,61, 0, 0, 1, NULL, NULL), - (@option_group_id_date_filter, {localize}'{ts escape="sql"}From end of previous calendar year{/ts}'{/localize}, 'greater_previous.year', 'greater_previous.year', NULL, NULL, NULL,62, 0, 0, 1, NULL, NULL); - --- CRM-16873 -{if $multilingual} - {foreach from=$locales item=loc} - ALTER TABLE civicrm_contribution_page DROP for_organization_{$loc}; - {/foreach} -{else} - ALTER TABLE civicrm_contribution_page DROP for_organization; -{/if} -ALTER TABLE civicrm_contribution_page DROP is_for_organization; diff --git a/CRM/Upgrade/Incremental/sql/4.7.alpha2.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.alpha2.mysql.tpl deleted file mode 100644 index 94ad4cc155..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.alpha2.mysql.tpl +++ /dev/null @@ -1,25 +0,0 @@ -{* file to handle db changes in 4.7.alpha2 during upgrade *} - --- CRM-17221 -UPDATE civicrm_state_province SET name = 'Phuket' WHERE name = 'Phaket'; - --- Modify Instance for Soft Credit Reports - CRM-17169 -UPDATE civicrm_report_instance -SET form_values = '{literal}a:23:{s:6:"fields";a:5:{s:21:"display_name_creditor";s:1:"1";s:24:"display_name_constituent";s:1:"1";s:14:"email_creditor";s:1:"1";s:14:"phone_creditor";s:1:"1";s:6:"amount";s:1:"1";}s:5:"id_op";s:2:"in";s:8:"id_value";a:0:{}s:21:"receive_date_relative";s:1:"0";s:17:"receive_date_from";s:0:"";s:15:"receive_date_to";s:0:"";s:25:"contribution_status_id_op";s:2:"in";s:28:"contribution_status_id_value";a:1:{i:0;s:1:"1";}s:10:"amount_min";s:0:"";s:10:"amount_max";s:0:"";s:9:"amount_op";s:3:"lte";s:12:"amount_value";s:0:"";s:6:"gid_op";s:2:"in";s:9:"gid_value";a:0:{}s:8:"tagid_op";s:2:"in";s:11:"tagid_value";a:0:{}s:11:"description";s:20:"Soft Credit details.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:21:"access CiviContribute";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}{/literal}' -WHERE report_id = 'contribute/softcredit'; - --- CRM-17302 -SELECT @option_group_id_act := max(id) from civicrm_option_group where name = 'activity_type'; -SELECT @CompId := MAX(id) FROM civicrm_component where name = 'CiviContribute'; - -UPDATE civicrm_option_value -SET component_id = @CompId -WHERE (name = 'Cancel Recurring Contribution' OR name = 'Update Recurring Contribution Billing Details' OR name = 'Update Recurring Contribution') AND option_group_id = @option_group_id_act; - --- CRM-17184 -INSERT INTO `civicrm_state_province` -(`name`, `abbreviation`, `country_id`) -VALUES -('La Libertad', 'LI', 1066), -('La Paz', 'PA', 1066), -('La Union','UN', 1066); diff --git a/CRM/Upgrade/Incremental/sql/4.7.alpha3.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.alpha3.mysql.tpl deleted file mode 100644 index aba608aa7f..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.alpha3.mysql.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{* file to handle db changes in 4.7.alpha3 during upgrade *} --- CRM-17309 -INSERT INTO civicrm_mailing_bounce_pattern -(bounce_type_id,pattern) -VALUES -(3,'Unable to resolve MX record for'); diff --git a/CRM/Upgrade/Incremental/sql/4.7.alpha4.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.alpha4.mysql.tpl deleted file mode 100644 index 45d45f3484..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.alpha4.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.7.alpha4 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.7.alpha5.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.alpha5.mysql.tpl deleted file mode 100644 index ccaf1835c2..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.alpha5.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.7.alpha5 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.7.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.beta1.mysql.tpl deleted file mode 100644 index 1f3d76106b..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.beta1.mysql.tpl +++ /dev/null @@ -1,49 +0,0 @@ -{* file to handle db changes in 4.7.beta1 during upgrade *} - --- CRM-16901 Recurring contributions summary report template -SELECT @option_group_id_report := max(id) from civicrm_option_group where name = 'report_template'; -SELECT @contributeCompId := max(id) FROM civicrm_component where name = 'CiviContribute'; -INSERT INTO - civicrm_option_value (`option_group_id`, {localize field='label'}label{/localize}, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, {localize field='description'}description{/localize}, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`) -VALUES - (@option_group_id_report, {localize}'{ts escape="sql"}Recurring Contributions Summary{/ts}'{/localize}, 'contribute/recursummary', 'CRM_Report_Form_Contribute_RecurSummary', NULL, 0, NULL, 49, {localize}'{ts escape="sql"}Provides simple summary for each payment instrument for which there are recurring contributions (e.g. Credit Card, Standing Order, Direct Debit etc.), showing within a given date range.{/ts}'{/localize}, 0, 0, 1, @contributeCompId, NULL); - -SELECT @parent_id := id from civicrm_navigation where name = 'Administration Console' AND domain_id = {$domainID}; -INSERT INTO civicrm_navigation -( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight ) -VALUES -( {$domainID}, 'civicrm/a/#/status', '{ts escape="sql" skip="true"}System Status{/ts}', 'System Status', 'administer CiviCRM', '', @parent_id, '1', NULL, 0 ); - -UPDATE civicrm_contact SET is_deceased = 0 WHERE is_deceased IS NULL; - --- CRM-16597 -UPDATE civicrm_option_value SET {localize field="label"}label = '{ts escape="sql"}Pledge Detail Report{/ts}'{/localize}, {localize field="description"}description = '{ts escape="sql"}List of pledges including amount pledged, pledge status, next payment date, balance due, total amount paid etc.{/ts}'{/localize} WHERE option_group_id = @option_group_id_report AND name = 'CRM_Report_Form_Pledge_Detail'; - -UPDATE civicrm_option_value SET {localize field="description"}description = '{ts escape="sql"}Groups and totals pledges by criteria including contact, time period, pledge status, location, etc.{/ts}'{/localize} WHERE option_group_id = @option_group_id_report AND name = 'CRM_Report_Form_Pledge_Summary'; - -UPDATE civicrm_report_instance SET title = '{ts escape="sql"}Pledge Detail{/ts}', description = '{ts escape="sql"}List of pledges including amount pledged, pledge status, next payment date, balance due, total amount paid etc.{/ts}' WHERE report_id = 'pledge/detail'; - --- CRM-17503 PayPal Express processor type can support recurring payments -UPDATE civicrm_payment_processor_type pp -LEFT JOIN civicrm_payment_processor p ON p.payment_processor_type_id = pp.id -SET pp.is_recur = 1, p.is_recur = 1 -WHERE pp.name='PayPal_Express'; - -UPDATE civicrm_preferences_date SET description = '{ts escape="sql"}Used in search forms and for relationships.{/ts}' -WHERE name = 'searchDate'; - ---CRM-16761 Self service cancel or transfer for events -ALTER TABLE civicrm_event - ADD COLUMN selfcancelxfer_time INT(10) unsigned DEFAULT 0 COMMENT 'Number of hours prior to event start date to allow self-service cancellation or transfer.', - ADD COLUMN allow_selfcancelxfer TINYINT(4) DEFAULT '0' COMMENT 'Allow self service cancellation or transfer for event?'; -ALTER TABLE civicrm_participant - ADD COLUMN transferred_to_contact_id INT(10) unsigned DEFAULT NULL COMMENT 'Contact to which the event registration is transferred', - ADD CONSTRAINT `FK_civicrm_participant_transferred_to_contact_id` FOREIGN KEY (`transferred_to_contact_id`) REFERENCES `civicrm_contact` (`id`) ON DELETE SET NULL; - -INSERT INTO civicrm_participant_status_type(name, {localize field='label'}label{/localize}, class, is_reserved, is_active, is_counted, weight, visibility_id) -VALUES ('Transferred', {localize}'{ts escape="sql"}Transferred{/ts}'{/localize}, 'Negative', 1, 1, 0, 16, 2); - -{include file='../CRM/Upgrade/4.7.beta1.msg_template/civicrm_msg_template.tpl'} - --- CRM-16259 Added is_payment flag -ALTER TABLE civicrm_financial_trxn ADD COLUMN is_payment tinyint(4) DEFAULT '0' COMMENT 'Is this entry either a payment or a reversal of a payment?'; diff --git a/CRM/Upgrade/Incremental/sql/4.7.beta2.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.beta2.mysql.tpl deleted file mode 100644 index 979864fc48..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.beta2.mysql.tpl +++ /dev/null @@ -1,23 +0,0 @@ -{* file to handle db changes in 4.7.beta2 during upgrade *} - --- CRM-17404 NULL values in 'do_not_*' fields if blank in contact:create API -UPDATE civicrm_contact SET do_not_email = 0 WHERE do_not_email IS NULL; -UPDATE civicrm_contact SET do_not_phone = 0 WHERE do_not_phone IS NULL; -UPDATE civicrm_contact SET do_not_mail = 0 WHERE do_not_mail IS NULL; -UPDATE civicrm_contact SET do_not_sms = 0 WHERE do_not_sms IS NULL; -UPDATE civicrm_contact SET do_not_trade = 0 WHERE do_not_trade IS NULL; -ALTER TABLE civicrm_contact ALTER COLUMN do_not_email SET DEFAULT 0; -ALTER TABLE civicrm_contact ALTER COLUMN do_not_phone SET DEFAULT 0; -ALTER TABLE civicrm_contact ALTER COLUMN do_not_mail SET DEFAULT 0; -ALTER TABLE civicrm_contact ALTER COLUMN do_not_sms SET DEFAULT 0; -ALTER TABLE civicrm_contact ALTER COLUMN do_not_trade SET DEFAULT 0; - --- CRM-17147 People with empty deceased-flag ('is null') get removed from recipient list of a mailing -UPDATE civicrm_contact SET is_deceased = 0 WHERE is_deceased IS NULL; -ALTER TABLE civicrm_contact ALTER COLUMN is_deceased SET DEFAULT 0; - --- CRM-17637 -INSERT INTO `civicrm_job` -( domain_id, run_frequency, last_run, name, description, api_entity, api_action, parameters, is_active ) -VALUES -( {$domainID}, 'Daily' , NULL, '{ts escape="sql" skip="true"}CiviCRM Update Check{/ts}', '{ts escape="sql" skip="true"}Checks for CiviCRM version updates. Important for keeping the database secure. Also sends anonymous usage statistics to civicrm.org to to assist in prioritizing ongoing development efforts.{/ts}', 'job', 'version_check', NULL, 1); diff --git a/CRM/Upgrade/Incremental/sql/4.7.beta3.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.beta3.mysql.tpl deleted file mode 100644 index a2ca323fa4..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.beta3.mysql.tpl +++ /dev/null @@ -1,8 +0,0 @@ -{* file to handle db changes in 4.7.beta3 during upgrade *} - --- CRM-17660 Add missing Cameroon Provinces and add missing Indian province. -INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES -(1038, "LT", "Littoral"), -(1038, "NW", "Nord-Ouest"), -(1101, "TG", "Telangana"); - diff --git a/CRM/Upgrade/Incremental/sql/4.7.beta4.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.beta4.mysql.tpl deleted file mode 100644 index 04b977cd4a..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.beta4.mysql.tpl +++ /dev/null @@ -1,8 +0,0 @@ -{* file to handle db changes in 4.7.beta4 during upgrade *} - --- Add flag for existing payments - -UPDATE civicrm_financial_trxn ft INNER JOIN - (SELECT financial_account_id FROM civicrm_entity_financial_account efa INNER JOIN civicrm_option_value v ON efa.account_relationship = v.value AND v.name = 'Asset Account is' - INNER JOIN civicrm_option_group g ON v.option_group_id = g.id WHERE g.name = 'account_relationship' GROUP BY financial_account_id) - AS asset_fa ON ft.to_financial_account_id = asset_fa.financial_account_id SET ft.is_payment = TRUE; diff --git a/CRM/Upgrade/Incremental/sql/4.7.beta5.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.beta5.mysql.tpl deleted file mode 100644 index a97a616157..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.beta5.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.7.beta5 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.7.beta6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.beta6.mysql.tpl deleted file mode 100644 index 16ff252ea7..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.beta6.mysql.tpl +++ /dev/null @@ -1,18 +0,0 @@ -{* file to handle db changes in 4.7.beta6 during upgrade *} - --- CRM-17686 -ALTER TABLE `civicrm_job` -ADD COLUMN `scheduled_run_date` timestamp NULL DEFAULT NULL COMMENT 'When is this cron entry scheduled to run' AFTER `last_run`; - --- CRM-17745: Make maximum additional participants configurable -ALTER TABLE civicrm_event -ADD COLUMN max_additional_participants int(10) unsigned -DEFAULT 0 -COMMENT 'Maximum number of additional participants that can be registered on a single booking' -AFTER is_multiple_registrations; -UPDATE civicrm_event -SET max_additional_participants = 9 -WHERE is_multiple_registrations = 1; - -SELECT @domainID := min(id) FROM civicrm_domain; -INSERT INTO civicrm_setting(name, value, domain_id, is_domain) values ('installed', 'i:1;', @domainID, 1); diff --git a/CRM/Upgrade/Incremental/sql/4.7.beta7.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.beta7.mysql.tpl deleted file mode 100644 index f9bc4bc907..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.beta7.mysql.tpl +++ /dev/null @@ -1,7 +0,0 @@ -{* file to handle db changes in 4.7.beta7 during upgrade *} - --- CRM-17800 -INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES (NULL, 1187, "04", "Ash Sharqiyah"); -UPDATE civicrm_state_province SET name = 'Al Bahah' WHERE name = 'Al Batah'; -UPDATE civicrm_state_province SET name = 'Al Hudud Ash Shamaliyah' WHERE name = 'Al H,udd ash Shamallyah'; - diff --git a/CRM/Upgrade/Incremental/sql/4.7.beta8.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.beta8.mysql.tpl deleted file mode 100644 index e62327848d..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.7.beta8.mysql.tpl +++ /dev/null @@ -1,12 +0,0 @@ -{* file to handle db changes in 4.7.beta8 during upgrade *} - --- CRM-17552 -UPDATE civicrm_membership_block cmb JOIN civicrm_price_set_entity cpse ON cmb.entity_table = cpse.entity_table AND cmb.entity_id = cpse.entity_id JOIN civicrm_price_set cps ON cpse.price_set_id = cps.id SET cmb.is_required = 1 WHERE cmb.entity_table = 'civicrm_contribution_page' AND cps.is_quick_config = 0; - --- CRM-17429 - Old contributions may be using this payment processor type, so we'll disable rather than delete it for existing installs: -UPDATE civicrm_payment_processor_type SET is_active = 0 WHERE name = 'Google_Checkout'; -UPDATE civicrm_payment_processor pp, civicrm_payment_processor_type ppt SET pp.is_active = 0 WHERE pp.payment_processor_type_id = ppt.id AND ppt.name = 'Google_Checkout'; - --- CRM-17815 -{include file='../CRM/Upgrade/4.7.beta8.msg_template/civicrm_msg_template.tpl'} - -- 2.25.1