From 60191b78b2902fa26cf0e88fd47d11e204c171af Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 8 Sep 2021 14:19:52 -0400 Subject: [PATCH] Bump minimum upgradable version to 4.5.9 --- CRM/Core/EntityReference.php | 9 - .../civicrm_msg_template.tpl | 16 - .../contribution_recurring_edit_html.tpl | 36 - .../contribution_recurring_edit_text.tpl | 8 - .../contribution_recurring_notify_html.tpl | 125 ---- .../contribution_recurring_notify_text.tpl | 50 -- .../civicrm_msg_template.tpl | 57 -- .../contribution_offline_receipt_html.tpl | 265 ------- .../contribution_offline_receipt_text.tpl | 98 --- .../contribution_online_receipt_html.tpl | 409 ----------- .../contribution_online_receipt_text.tpl | 188 ----- .../event_offline_receipt_html.tpl | 474 ------------ .../event_offline_receipt_text.tpl | 281 -------- .../event_online_receipt_html.tpl | 454 ------------ .../event_online_receipt_text.tpl | 279 -------- .../membership_online_receipt_html.tpl | 509 ------------- .../membership_online_receipt_text.tpl | 220 ------ .../participant_cancelled_html.tpl | 146 ---- .../participant_cancelled_text.tpl | 59 -- .../participant_confirm_html.tpl | 187 ----- .../participant_confirm_text.tpl | 89 --- .../participant_expired_html.tpl | 149 ---- .../participant_expired_text.tpl | 63 -- .../payment_or_refund_notification_html.tpl | 269 ------- ...payment_or_refund_notification_subject.tpl | 1 - .../payment_or_refund_notification_text.tpl | 116 --- .../pledge_acknowledge_html.tpl | 117 --- .../pledge_acknowledge_text.tpl | 45 -- .../civicrm_msg_template.tpl | 32 - .../membership_offline_receipt_html.tpl | 240 ------- .../membership_offline_receipt_text.tpl | 90 --- ...sive Design Newsletter - Single Column.tpl | 496 ------------- ...ponsive Design Newsletter - Two Column.tpl | 672 ------------------ CRM/Upgrade/Form.php | 2 +- CRM/Upgrade/Incremental/php/FourFive.php | 358 ---------- CRM/Upgrade/Incremental/sql/4.5.0.mysql.tpl | 11 - CRM/Upgrade/Incremental/sql/4.5.1.mysql.tpl | 1 - CRM/Upgrade/Incremental/sql/4.5.2.mysql.tpl | 5 - CRM/Upgrade/Incremental/sql/4.5.3.mysql.tpl | 12 - CRM/Upgrade/Incremental/sql/4.5.4.mysql.tpl | 1 - CRM/Upgrade/Incremental/sql/4.5.5.mysql.tpl | 5 - CRM/Upgrade/Incremental/sql/4.5.6.mysql.tpl | 4 - CRM/Upgrade/Incremental/sql/4.5.7.mysql.tpl | 6 - CRM/Upgrade/Incremental/sql/4.5.8.mysql.tpl | 1 - CRM/Upgrade/Incremental/sql/4.5.9.mysql.tpl | 1 - .../Incremental/sql/4.5.alpha1.mysql.tpl | 541 -------------- .../Incremental/sql/4.5.alpha2.mysql.tpl | 35 - .../Incremental/sql/4.5.beta1.mysql.tpl | 6 - .../Incremental/sql/4.5.beta2.mysql.tpl | 13 - .../Incremental/sql/4.5.beta3.mysql.tpl | 4 - .../Incremental/sql/4.5.beta4.mysql.tpl | 1 - .../Incremental/sql/4.5.beta5.mysql.tpl | 1 - .../Incremental/sql/4.5.beta6.mysql.tpl | 1 - .../Incremental/sql/4.5.beta7.mysql.tpl | 2 - .../Incremental/sql/4.5.beta8.mysql.tpl | 18 - .../Incremental/sql/4.5.beta9.mysql.tpl | 36 - 56 files changed, 1 insertion(+), 7313 deletions(-) delete mode 100644 CRM/Core/EntityReference.php delete mode 100644 CRM/Upgrade/4.5.0.msg_template/civicrm_msg_template.tpl delete mode 100644 CRM/Upgrade/4.5.0.msg_template/message_templates/contribution_recurring_edit_html.tpl delete mode 100644 CRM/Upgrade/4.5.0.msg_template/message_templates/contribution_recurring_edit_text.tpl delete mode 100644 CRM/Upgrade/4.5.0.msg_template/message_templates/contribution_recurring_notify_html.tpl delete mode 100644 CRM/Upgrade/4.5.0.msg_template/message_templates/contribution_recurring_notify_text.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/civicrm_msg_template.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_offline_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_offline_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_online_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_online_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/membership_online_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/membership_online_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_cancelled_html.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_cancelled_text.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_html.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_text.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_expired_html.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_expired_text.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_html.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_subject.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_text.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/pledge_acknowledge_html.tpl delete mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/pledge_acknowledge_text.tpl delete mode 100644 CRM/Upgrade/4.5.beta2.msg_template/civicrm_msg_template.tpl delete mode 100644 CRM/Upgrade/4.5.beta2.msg_template/message_templates/membership_offline_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.5.beta2.msg_template/message_templates/membership_offline_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Single Column.tpl delete mode 100644 CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Two Column.tpl delete mode 100644 CRM/Upgrade/Incremental/php/FourFive.php delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.0.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.1.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.2.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.3.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.4.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.5.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.6.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.7.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.8.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.9.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.alpha2.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.beta1.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.beta2.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.beta3.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.beta4.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.beta5.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.beta6.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.beta7.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.beta8.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.5.beta9.mysql.tpl diff --git a/CRM/Core/EntityReference.php b/CRM/Core/EntityReference.php deleted file mode 100644 index 0d3a48ed6b..0000000000 --- a/CRM/Core/EntityReference.php +++ /dev/null @@ -1,9 +0,0 @@ - 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.5.0.msg_template/message_templates/contribution_recurring_edit_html.tpl b/CRM/Upgrade/4.5.0.msg_template/message_templates/contribution_recurring_edit_html.tpl deleted file mode 100644 index 0ef701f9c2..0000000000 --- a/CRM/Upgrade/4.5.0.msg_template/message_templates/contribution_recurring_edit_html.tpl +++ /dev/null @@ -1,36 +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 recurring contribution has been updated as requested:{/ts} -

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

- -

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

-
-
- - - diff --git a/CRM/Upgrade/4.5.0.msg_template/message_templates/contribution_recurring_edit_text.tpl b/CRM/Upgrade/4.5.0.msg_template/message_templates/contribution_recurring_edit_text.tpl deleted file mode 100644 index 774597acd7..0000000000 --- a/CRM/Upgrade/4.5.0.msg_template/message_templates/contribution_recurring_edit_text.tpl +++ /dev/null @@ -1,8 +0,0 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, - -{ts}Your recurring contribution has been updated as requested:{/ts} - -{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Recurring contribution is for %1, every %2 %3(s){/ts} -{if $installments}{ts 1=$installments} for %1 installments.{/ts}{/if} - -{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts} diff --git a/CRM/Upgrade/4.5.0.msg_template/message_templates/contribution_recurring_notify_html.tpl b/CRM/Upgrade/4.5.0.msg_template/message_templates/contribution_recurring_notify_html.tpl deleted file mode 100644 index f7b6387c81..0000000000 --- a/CRM/Upgrade/4.5.0.msg_template/message_templates/contribution_recurring_notify_html.tpl +++ /dev/null @@ -1,125 +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} - - - - - - - - - - {else} - - - - - - - - - - - - - {/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.5.0.msg_template/message_templates/contribution_recurring_notify_text.tpl b/CRM/Upgrade/4.5.0.msg_template/message_templates/contribution_recurring_notify_text.tpl deleted file mode 100644 index 6146808ce2..0000000000 --- a/CRM/Upgrade/4.5.0.msg_template/message_templates/contribution_recurring_notify_text.tpl +++ /dev/null @@ -1,50 +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} - -{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by visiting this web page.{/ts} - -{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} - -{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by visiting this web page.{/ts} - -{ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments for this recurring contribution by visiting this web page.{/ts} -{/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.5.alpha1.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/civicrm_msg_template.tpl deleted file mode 100644 index 07553db60b..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/civicrm_msg_template.tpl +++ /dev/null @@ -1,57 +0,0 @@ -{php} - $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.5.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} - -{php} - $ovNames = array( - 'contribution' => array( - 'payment_or_refund_notification' => ts('Additional Payment Receipt or Refund Notification', array('escape' => 'sql')), - ), - ); - - $this->assign('ovNames', $ovNames); - $this->assign('dir', $dir); -{/php} - -{foreach from=$ovNames key=name item=ignore} - SELECT @tpl_ogid_{$name} := MAX(id) FROM civicrm_option_group WHERE name = 'msg_tpl_workflow_{$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}, {$smarty.foreach.for_values.iteration}, {$smarty.foreach.for_values.iteration}) {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.5.alpha1.msg_template/message_templates/`$vName`_subject.tpl"} - {fetch assign=text file="`$smarty.const.SMARTY_DIR`/../../CRM/Upgrade/4.5.alpha1.msg_template/message_templates/`$vName`_text.tpl"} - {fetch assign=html file="`$smarty.const.SMARTY_DIR`/../../CRM/Upgrade/4.5.alpha1.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} diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_offline_receipt_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_offline_receipt_html.tpl deleted file mode 100644 index 8f85b57180..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_offline_receipt_html.tpl +++ /dev/null @@ -1,265 +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 $formValues.receipt_text} -

{$formValues.receipt_text|htmlize}

- {else} -

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

- {/if} - -

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

- -
- - - - - - - - - - {if $lineItem and !$is_quick_config} - {foreach from=$lineItem item=value key=priceset} - - - - {/foreach} - {/if} - - - - - - - {if $receive_date} - - - - - {/if} - - {if $receipt_date} - - - - - {/if} - - {if $formValues.paidBy and !$formValues.hidden_CreditCard} - - - - - {if $formValues.check_number} - - - - - {/if} - {/if} - - {if $formValues.trxn_id} - - - - - {/if} - - {if $ccContribution} - - - - - - - - - - - - - {/if} - - {if $softCreditTypes and $softCredits} - {foreach from=$softCreditTypes item=softCreditType key=n} - - - - {foreach from=$softCredits.$n item=value key=label} - - - - - {/foreach} - {/foreach} - {/if} - - {if $customGroup} - {foreach from=$customGroup item=value key=customName} - - - - {foreach from=$value item=v key=n} - - - - - {/foreach} - {/foreach} - {/if} - - {if $formValues.product_name} - - - - - - - {if $formValues.product_option} - - - - - {/if} - {if $formValues.product_sku} - - - - - {/if} - {if $fulfilled_date} - - - - - {/if} - {/if} - -
- {ts}Contribution Information{/ts} -
- {ts}Financial Type{/ts} - - {$formValues.contributionType_name} -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - - - {foreach from=$value item=line} - - - - - - - {/foreach} -
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/ts}{ts}Total{/ts}
- {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} - 		- {$line.qty} - - {$line.unit_price|crmMoney:$currency} - - {$line.line_total|crmMoney:$currency} -
-
- {ts}Total Amount{/ts} - - {$formValues.total_amount|crmMoney:$currency} -
- {ts}Received Date{/ts} - - {$receive_date|truncate:10:''|crmDate} -
- {ts}Receipt Date{/ts} - - {$receipt_date|truncate:10:''|crmDate} -
- {ts}Paid By{/ts} - - {$formValues.paidBy} -
- {ts}Check Number{/ts} - - {$formValues.check_number} -
- {ts}Transaction ID{/ts} - - {$formValues.trxn_id} -
- {ts}Billing Name and Address{/ts} -
- {$billingName}
- {$address|nl2br} -
- {ts}Credit Card Information{/ts} -
- {$credit_card_type}
- {$credit_card_number}
- {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} -
- {$softCreditType} -
- {$label} - - {$value} -
- {$customName} -
- {$n} - - {$v} -
- {ts}Premium Information{/ts} -
- {$formValues.product_name} -
- {ts}Option{/ts} - - {$formValues.product_option} -
- {ts}SKU{/ts} - - {$formValues.product_sku} -
- {ts}Sent{/ts} - - {$fulfilled_date|truncate:10:''|crmDate} -
-
-
- - - diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_offline_receipt_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_offline_receipt_text.tpl deleted file mode 100644 index 1bf0cca726..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_offline_receipt_text.tpl +++ /dev/null @@ -1,98 +0,0 @@ -{if $formValues.receipt_text} -{$formValues.receipt_text} -{else}{ts}Thank you for your support.{/ts}{/if} - -{ts}Please print this receipt for your records.{/ts} - - -=========================================================== -{ts}Contribution Information{/ts} - -=========================================================== -{ts}Financial Type{/ts}: {$formValues.contributionType_name} -{if $lineItem} -{foreach from=$lineItem item=value key=priceset} ---------------------------------------------------------- -{capture assign=ts_item}{ts}Item{/ts}{/capture} -{capture assign=ts_qty}{ts}Qty{/ts}{/capture} -{capture assign=ts_each}{ts}Each{/ts}{/capture} -{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} -{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"} {$line.line_total|crmMoney:$currency|string_format:"%10s"} -{/foreach} -{/foreach} -{/if} - -{ts}Total Amount{/ts}: {$formValues.total_amount|crmMoney:$currency} -{if $receive_date} -{ts}Received Date{/ts}: {$receive_date|truncate:10:''|crmDate} -{/if} -{if $receipt_date} -{ts}Receipt Date{/ts}: {$receipt_date|truncate:10:''|crmDate} -{/if} -{if $formValues.paidBy and !$formValues.hidden_CreditCard} -{ts}Paid By{/ts}: {$formValues.paidBy} -{if $formValues.check_number} -{ts}Check Number{/ts}: {$formValues.check_number} -{/if} -{/if} -{if $formValues.trxn_id} -{ts}Transaction ID{/ts}: {$formValues.trxn_id} -{/if} - -{if $ccContribution} -=========================================================== -{ts}Billing Name and Address{/ts} - -=========================================================== -{$billingName} -{$address} - -=========================================================== -{ts}Credit Card Information{/ts} - -=========================================================== -{$credit_card_type} -{$credit_card_number} -{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} -{/if} -{if $customGroup} -{foreach from=$customGroup item=value key=customName} -=========================================================== -{$customName} -=========================================================== -{foreach from=$value item=v key=n} -{$n}: {$v} -{/foreach} -{/foreach} -{/if} - -{if $softCreditTypes and $softCredits} -{foreach from=$softCreditTypes item=softCreditType key=n} -=========================================================== -{$softCreditType} -=========================================================== -{foreach from=$softCredits.$n item=value key=label} -{$label}: {$value} -{/foreach} -{/foreach} -{/if} - -{if $formValues.product_name} -=========================================================== -{ts}Premium Information{/ts} - -=========================================================== -{$formValues.product_name} -{if $formValues.product_option} -{ts}Option{/ts}: {$formValues.product_option} -{/if} -{if $formValues.product_sku} -{ts}SKU{/ts}: {$formValues.product_sku} -{/if} -{if $fulfilled_date} -{ts}Sent{/ts}: {$fulfilled_date|crmDate} -{/if} -{/if} diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_online_receipt_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_online_receipt_html.tpl deleted file mode 100644 index 8970c3af47..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_online_receipt_html.tpl +++ /dev/null @@ -1,409 +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 $amount} - - - - - - - {if $lineItem and $priceSetID and !$is_quick_config} - - {foreach from=$lineItem item=value key=priceset} - - - - {/foreach} - - - - - - {else} - - - - - - - {/if} - - {/if} - - - {if $receive_date} - - - - - {/if} - - {if $is_monetary and $trxn_id} - - - - - {/if} - - {if $is_recur} - {if $contributeMode eq 'notify' or $contributeMode eq 'directIPN'} - - - {if $updateSubscriptionBillingUrl} - - - - {/if} - - - - - {/if} - {/if} - - {if $honor_block_is_active} - - - - {foreach from=$honoreeProfile item=value key=label} - - - - - {/foreach} - {elseif $softCreditTypes and $softCredits} - {foreach from=$softCreditTypes item=softCreditType key=n} - - - - {foreach from=$softCredits.$n item=value key=label} - - - - - {/foreach} - {/foreach} - {/if} - - {if $pcpBlock} - - - - - - - - {if $pcp_roll_nickname} - - - - - {/if} - {if $pcp_personal_note} - - - - - {/if} - {/if} - - {if $onBehalfProfile} - - - - {foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName} - - - - - {/foreach} - {/if} - - {if $isShare} - - - - {/if} - - {if ! ($contributeMode eq 'notify' OR $contributeMode eq 'directIPN') and $is_monetary} - {if $is_pay_later} - - - - - - - {elseif $amount GT 0} - - - - - - - {/if} - {/if} - - {if $contributeMode eq 'direct' AND !$is_pay_later AND $amount GT 0} - - - - - - - {/if} - - {if $selectPremium} - - - - - - - {if $option} - - - - - {/if} - {if $sku} - - - - - {/if} - {if $start_date} - - - - - {/if} - {if $end_date} - - - - - {/if} - {if $contact_email OR $contact_phone} - - - - {/if} - {if $is_deductible AND $price} - - - - {/if} - {/if} - - {if $customPre} - - - - {foreach from=$customPre item=customValue key=customName} - {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields} - - - - - {/if} - {/foreach} - {/if} - - {if $customPost} - - - - {foreach from=$customPost item=customValue key=customName} - {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields} - - - - - {/if} - {/foreach} - {/if} - -
- {ts}Contribution Information{/ts} -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - - - {foreach from=$value item=line} - - - - - - - {/foreach} -
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/ts}{ts}Total{/ts}
- {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} - 		- {$line.qty} - - {$line.unit_price|crmMoney:$currency} - - {$line.line_total|crmMoney:$currency} -
-
- {ts}Total Amount{/ts} - - {$amount|crmMoney:$currency} -
- {ts}Amount{/ts} - - {$amount|crmMoney:$currency} {if $amount_level} - {$amount_level}{/if} -
- {ts}Date{/ts} - - {$receive_date|crmDate} -
- {ts}Transaction #{/ts} - - {$trxn_id} -
- {ts 1=$cancelSubscriptionUrl}This is a recurring contribution. You can cancel future contributions by visiting this web page.{/ts} -
- {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by visiting this web page.{/ts} -
- {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments for this recurring contribution by visiting this web page.{/ts} -
- {$soft_credit_type} -
- {$label} - - {$value} -
- {$softCreditType} -
- {$label} - - {$value} -
- {ts}Personal Campaign Page{/ts} -
- {ts}Display In Honor Roll{/ts} - - {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if} -
- {ts}Nickname{/ts} - - {$pcp_roll_nickname} -
- {ts}Personal Note{/ts} - - {$pcp_personal_note} -
- {$onBehalfProfile_grouptitle} -
- {$onBehalfName} - - {$onBehalfValue} -
- {capture assign=contributionUrl}{crmURL p='civicrm/contribute/transact' q="reset=1&id=`$contributionPageId`" a=true fe=1 h=1}{/capture} - {include file="CRM/common/SocialNetwork.tpl" emailMode=true url=$contributionUrl title=$title pageURL=$contributionUrl} -
- {ts}Registered Email{/ts} -
- {$email} -
- {ts}Billing Name and Address{/ts} -
- {$billingName}
- {$address|nl2br}
- {$email} -
- {ts}Credit Card Information{/ts} -
- {$credit_card_type}
- {$credit_card_number}
- {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
-
- {ts}Premium Information{/ts} -
- {$product_name} -
- {ts}Option{/ts} - - {$option} -
- {ts}SKU{/ts} - - {$sku} -
- {ts}Start Date{/ts} - - {$start_date|crmDate} -
- {ts}End Date{/ts} - - {$end_date|crmDate} -
-

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

- {if $contact_email} -

{$contact_email}

- {/if} - {if $contact_phone} -

{$contact_phone}

- {/if} -
-

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

-
- {$customPre_grouptitle} -
- {$customName} - - {$customValue} -
- {$customPost_grouptitle} -
- {$customName} - - {$customValue} -
-
- - - diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_online_receipt_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_online_receipt_text.tpl deleted file mode 100644 index aa8fe70241..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/contribution_online_receipt_text.tpl +++ /dev/null @@ -1,188 +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 $amount} -=========================================================== -{ts}Contribution Information{/ts} - -=========================================================== -{if $lineItem and $priceSetID and !$is_quick_config} -{foreach from=$lineItem item=value key=priceset} ---------------------------------------------------------- -{capture assign=ts_item}{ts}Item{/ts}{/capture} -{capture assign=ts_qty}{ts}Qty{/ts}{/capture} -{capture assign=ts_each}{ts}Each{/ts}{/capture} -{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} -{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"} {$line.line_total|crmMoney:$currency|string_format:"%10s"} -{/foreach} -{/foreach} - -{ts}Total Amount{/ts}: {$amount|crmMoney:$currency} -{else} -{ts}Amount{/ts}: {$amount|crmMoney:$currency} {if $amount_level } - {$amount_level} {/if} -{/if} -{/if} -{if $receive_date} - -{ts}Date{/ts}: {$receive_date|crmDate} -{/if} -{if $is_monetary and $trxn_id} -{ts}Transaction #{/ts}: {$trxn_id} -{/if} - -{if $is_recur and ($contributeMode eq 'notify' or $contributeMode eq 'directIPN')} -{ts}This is a recurring contribution. You can cancel future contributions at:{/ts} - -{$cancelSubscriptionUrl} - -{if $updateSubscriptionBillingUrl} -{ts}You can update billing details for this recurring contribution at:{/ts} - -{$updateSubscriptionBillingUrl} - -{/if} -{ts}You can update recurring contribution amount or change the number of installments for this recurring contribution at:{/ts} - -{$updateSubscriptionUrl} - -{/if} - -{if $honor_block_is_active} -=========================================================== -{$soft_credit_type} -=========================================================== -{foreach from=$honoreeProfile item=value key=label} -{$label}: {$value} -{/foreach} -{elseif $softCreditTypes and $softCredits} -{foreach from=$softCreditTypes item=softCreditType key=n} -=========================================================== -{$softCreditType} -=========================================================== -{foreach from=$softCredits.$n item=value key=label} -{$label}: {$value} -{/foreach} -{/foreach} -{/if} -{if $pcpBlock} -=========================================================== -{ts}Personal Campaign Page{/ts} - -=========================================================== -{ts}Display In Honor Roll{/ts}: {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if} - -{if $pcp_roll_nickname}{ts}Nickname{/ts}: {$pcp_roll_nickname}{/if} - -{if $pcp_personal_note}{ts}Personal Note{/ts}: {$pcp_personal_note}{/if} - -{/if} -{if $onBehalfProfile} -=========================================================== -{ts}On Behalf Of{/ts} - -=========================================================== -{foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName} -{$onBehalfName}: {$onBehalfValue} -{/foreach} -{/if} - -{if !( $contributeMode eq 'notify' OR $contributeMode eq 'directIPN' ) and $is_monetary} -{if $is_pay_later} -=========================================================== -{ts}Registered Email{/ts} - -=========================================================== -{$email} -{elseif $amount GT 0} -=========================================================== -{ts}Billing Name and Address{/ts} - -=========================================================== -{$billingName} -{$address} - -{$email} -{/if} {* End ! is_pay_later condition. *} -{/if} -{if $contributeMode eq 'direct' AND !$is_pay_later AND $amount GT 0} - -=========================================================== -{ts}Credit Card Information{/ts} - -=========================================================== -{$credit_card_type} -{$credit_card_number} -{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} -{/if} - -{if $selectPremium } -=========================================================== -{ts}Premium Information{/ts} - -=========================================================== -{$product_name} -{if $option} -{ts}Option{/ts}: {$option} -{/if} -{if $sku} -{ts}SKU{/ts}: {$sku} -{/if} -{if $start_date} -{ts}Start Date{/ts}: {$start_date|crmDate} -{/if} -{if $end_date} -{ts}End Date{/ts}: {$end_date|crmDate} -{/if} -{if $contact_email OR $contact_phone} - -{ts}For information about this premium, contact:{/ts} - -{if $contact_email} - {$contact_email} -{/if} -{if $contact_phone} - {$contact_phone} -{/if} -{/if} -{if $is_deductible AND $price} - -{ts 1=$price|crmMoney:$currency}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}{/if} -{/if} - -{if $customPre} -=========================================================== -{$customPre_grouptitle} - -=========================================================== -{foreach from=$customPre item=customValue key=customName} -{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - {$customName}: {$customValue} -{/if} -{/foreach} -{/if} - - -{if $customPost} -=========================================================== -{$customPost_grouptitle} - -=========================================================== -{foreach from=$customPost item=customValue key=customName} -{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - {$customName}: {$customValue} -{/if} -{/foreach} -{/if} diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl deleted file mode 100644 index c346302e59..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl +++ /dev/null @@ -1,474 +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 $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} - - {if $amount && !$lineItem} - {foreach from=$amount item=amnt key=level} - - - - {/foreach} - {/if} - {if $isPrimary} - - - - - {if $balanceAmount} - - - - - {/if} - {if $pricesetFieldsCount } - - - - - {/if} - {if $is_pay_later} - - - - {/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 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 $pricesetFieldsCount }{/if} - - {foreach from=$value item=line} - - - - - - {if $pricesetFieldsCount } - - {/if} - - {/foreach} -
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/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.line_total|crmMoney} - - {$line.participant_count} -
-
- {$amnt.amount|crmMoney} {$amnt.label} -
- {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} - - {$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} -
- {$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.5.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl deleted file mode 100644 index fcc0a43be5..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl +++ /dev/null @@ -1,281 +0,0 @@ -{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} -{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"} {$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"} {$line.line_total|crmMoney|string_format:"%10s"} {$ts_participant_count|string_format:"%10s"} -{/foreach} -{/if} -{/foreach} -{/if} -{if $amount && !$lineItem} -{foreach from=$amount item=amnt key=level}{$amnt.amount|crmMoney} {$amnt.label} -{/foreach} -{/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 $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 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.5.alpha1.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_html.tpl deleted file mode 100644 index 70540857c2..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_html.tpl +++ /dev/null @@ -1,454 +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 $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} - - {if $amounts && !$lineItem} - {foreach from=$amounts item=amnt key=level} - - - - {/foreach} - {/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 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 $pricesetFieldsCount }{/if} - - {foreach from=$value item=line} - - - - - - {if $pricesetFieldsCount } {/if} - - {/foreach} -
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/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.line_total|crmMoney:$currency} - {$line.participant_count}
-
- {$amnt.amount|crmMoney:$currency} {$amnt.label} -
- {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} -
-
-
- - - diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_text.tpl deleted file mode 100644 index d6f5c64535..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_text.tpl +++ /dev/null @@ -1,279 +0,0 @@ -Dear {contact.display_name}, - -{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} -{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"} {$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"} {$line.line_total|crmMoney:$currency|string_format:"%10s"}{$ts_participant_count|string_format:"%10s"} -{/foreach} -{/if} -{/foreach} -{/if} -{if $amounts && !$lineItem} -{foreach from=$amounts item=amnt key=level}{$amnt.amount|crmMoney:$currency} {$amnt.label} -{/foreach} -{/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 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} diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/membership_online_receipt_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/membership_online_receipt_html.tpl deleted file mode 100644 index af216f8956..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/membership_online_receipt_html.tpl +++ /dev/null @@ -1,509 +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} - {if ! $is_separate_payment } - - - - - {else} - - - - - {/if} - {/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} - - - - - - {/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} - {/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}Additional Contribution{/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.) *} - - - - - - - {foreach from=$value item=line} - - - - - - - {/foreach} -
{ts}Item{/ts}{ts}Fee{/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.start_date} - - {$line.end_date} -
-
- {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.5.alpha1.msg_template/message_templates/membership_online_receipt_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/membership_online_receipt_text.tpl deleted file mode 100644 index 481eaf84a6..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/membership_online_receipt_text.tpl +++ /dev/null @@ -1,220 +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} -{if ! $is_separate_payment } -{ts}Contribution Amount{/ts}: {$amount|crmMoney} -{else} -{ts}Additional Contribution{/ts}: {$amount|crmMoney} -{/if} -{/if} -------------------------------------------- -{ts}Total{/ts}: {$amount+$membership_amount|crmMoney} -{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} -{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"} {$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"} {$line.start_date|string_format:"%20s"} {$line.end_date|string_format:"%20s"} -{/foreach} -{/foreach} --------------------------------------------------------------------------------------------------- -{/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} - -{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by visiting this web page.{/ts} -{/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.5.alpha1.msg_template/message_templates/participant_cancelled_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_cancelled_html.tpl deleted file mode 100644 index d7af3a7859..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_cancelled_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}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} -
- {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.5.alpha1.msg_template/message_templates/participant_cancelled_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_cancelled_text.tpl deleted file mode 100644 index f79abd2c02..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_cancelled_text.tpl +++ /dev/null @@ -1,59 +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} -{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.5.alpha1.msg_template/message_templates/participant_confirm_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_html.tpl deleted file mode 100644 index b1a5aa349c..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_html.tpl +++ /dev/null @@ -1,187 +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} - - - - - - - - -
-

{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=$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.5.alpha1.msg_template/message_templates/participant_confirm_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_text.tpl deleted file mode 100644 index 73d15a6f1b..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_text.tpl +++ /dev/null @@ -1,89 +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} - -=========================================================== -{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.5.alpha1.msg_template/message_templates/participant_expired_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_expired_html.tpl deleted file mode 100644 index ca2621f9e5..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_expired_html.tpl +++ /dev/null @@ -1,149 +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} -
- {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.5.alpha1.msg_template/message_templates/participant_expired_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_expired_text.tpl deleted file mode 100644 index 534c1c6578..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_expired_text.tpl +++ /dev/null @@ -1,63 +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} -{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.5.alpha1.msg_template/message_templates/payment_or_refund_notification_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_html.tpl deleted file mode 100644 index 56d344d311..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_html.tpl +++ /dev/null @@ -1,269 +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} -
- {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} -
-
-
- - - diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_subject.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_subject.tpl deleted file mode 100644 index 3849cf8dfd..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_subject.tpl +++ /dev/null @@ -1 +0,0 @@ -{if $isRefund}{ts}Refund Notification{/ts}{else}{ts}Payment Receipt{/ts}{/if} - {if $component eq 'event'}{$event.title}{/if} diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_text.tpl deleted file mode 100644 index 35a37f5e5f..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_text.tpl +++ /dev/null @@ -1,116 +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} -{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} diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/pledge_acknowledge_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/pledge_acknowledge_html.tpl deleted file mode 100644 index c0727c4078..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/pledge_acknowledge_html.tpl +++ /dev/null @@ -1,117 +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}thank you for your generous pledge. please print this acknowledgment for your records.{/ts}

-
- - - - - - - - - - - - - - - - - - - - {if $payments} - {assign var="count" value="1"} - {foreach from=$payments item=payment} - - - - - {assign var="count" value=`$count+1`} - {/foreach} - {/if} - - - - - - {if $customGroup} - {foreach from=$customGroup item=value key=customName} - - - - {foreach from=$value item=v key=n} - - - - - {/foreach} - {/foreach} - {/if} - -
- {ts}Pledge Information{/ts} -
- {ts}Pledge Received{/ts} - - {$create_date|truncate:10:''|crmDate} -
- {ts}Total Pledge Amount{/ts} - - {$total_pledge_amount|crmMoney:$currency} -
- {ts}Payment Schedule{/ts} -
-

{ts 1=$scheduled_amount|crmMoney:$currency 2=$frequency_interval 3=$frequency_unit 4=$installments}%1 every %2 %3 for %4 installments.{/ts}

- - {if $frequency_day} -

{ts 1=$frequency_day 2=$frequency_unit}Payments are due on day %1 of the %2.{/ts}

- {/if} -
- {ts 1=$count}Payment %1{/ts} - - {$payment.amount|crmMoney:$currency} {if $payment.status eq 1}{ts}paid{/ts} {$payment.receive_date|truncate:10:''|crmDate}{else}{ts}due{/ts} {$payment.due_date|truncate:10:''|crmDate}{/if} -
-

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

-
- {$customName} -
- {$n} - - {$v} -
-
-
- - - diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/pledge_acknowledge_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/pledge_acknowledge_text.tpl deleted file mode 100644 index 571f1b1bea..0000000000 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/pledge_acknowledge_text.tpl +++ /dev/null @@ -1,45 +0,0 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, - -{ts}Thank you for your generous pledge. Please print this acknowledgment for your records.{/ts} - -=========================================================== -{ts}Pledge Information{/ts} - -=========================================================== -{ts}Pledge Received{/ts}: {$create_date|truncate:10:''|crmDate} -{ts}Total Pledge Amount{/ts}: {$total_pledge_amount|crmMoney:$currency} - -=========================================================== -{ts}Payment Schedule{/ts} - -=========================================================== -{ts 1=$scheduled_amount|crmMoney:$currency 2=$frequency_interval 3=$frequency_unit 4=$installments}%1 every %2 %3 for %4 installments.{/ts} - -{if $frequency_day} - -{ts 1=$frequency_day 2=$frequency_unit}Payments are due on day %1 of the %2.{/ts} -{/if} - -{if $payments} -{assign var="count" value="1"} -{foreach from=$payments item=payment} - -{ts 1=$count}Payment %1{/ts}: {$payment.amount|crmMoney:$currency} {if $payment.status eq 1}{ts}paid{/ts} {$payment.receive_date|truncate:10:''|crmDate}{else}{ts}due{/ts} {$payment.due_date|truncate:10:''|crmDate}{/if} -{assign var="count" value=`$count+1`} -{/foreach} -{/if} - - -{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions -or need to modify your payment schedule.{/ts} - -{if $customGroup} -{foreach from=$customGroup item=value key=customName} -=========================================================== -{$customName} -=========================================================== -{foreach from=$value item=v key=n} -{$n}: {$v} -{/foreach} -{/foreach} -{/if} diff --git a/CRM/Upgrade/4.5.beta2.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.5.beta2.msg_template/civicrm_msg_template.tpl deleted file mode 100644 index 744e544566..0000000000 --- a/CRM/Upgrade/4.5.beta2.msg_template/civicrm_msg_template.tpl +++ /dev/null @@ -1,32 +0,0 @@ -{php} - $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample'; - $templates = array(); - foreach (preg_grep('/\.tpl$/', scandir($dir)) as $filename) { - $templates[] = array('name' => basename($filename, '.tpl'), 'filename' => "$dir/$filename"); - } - $this->assign('templates', $templates); -{/php} - -{foreach from=$templates item=tpl} - {fetch assign=content file=$tpl.filename} -INSERT INTO civicrm_msg_template - (msg_title, msg_subject, msg_text, msg_html, workflow_id, is_default, is_reserved) VALUES - ('{$tpl.name} Template', '{$tpl.name}', '', '{$content|escape:"quotes"}' ,NULL, 1, 0); -{/foreach} - -{php} - $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.5.beta2.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.5.beta2.msg_template/message_templates/membership_offline_receipt_html.tpl b/CRM/Upgrade/4.5.beta2.msg_template/message_templates/membership_offline_receipt_html.tpl deleted file mode 100644 index 06c43bb6da..0000000000 --- a/CRM/Upgrade/4.5.beta2.msg_template/message_templates/membership_offline_receipt_html.tpl +++ /dev/null @@ -1,240 +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 $isPrimary} - - - - {/if} - - {if $customValues} - - - - {/if} - -
- {if $formValues.receipt_text_signup} -

{$formValues.receipt_text_signup|htmlize}

- {elseif $formValues.receipt_text_renewal} -

{$formValues.receipt_text_renewal|htmlize}

- {else} -

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

- {/if} - {if ! $cancelled} -

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

- {/if} -
- - {if !$lineItem} - - - - - - - - {/if} - {if ! $cancelled} - {if !$lineItem} - - - - - - - - - {/if} - {if $formValues.total_amount OR $formValues.total_amount eq 0 } - - - - {if $formValues.contributionType_name} - - - - - {/if} - - {if $lineItem} - {foreach from=$lineItem item=value key=priceset} - - - - {/foreach} - {/if} - - - - - {if $receive_date} - - - - - {/if} - {if $formValues.paidBy} - - - - - {if $formValues.check_number} - - - - - {/if} - {/if} - {/if} - {/if} -
- {ts}Membership Information{/ts} -
- {ts}Membership Type{/ts} - - {$membership_name} -
- {ts}Membership Start Date{/ts} - - {$mem_start_date} -
- {ts}Membership End Date{/ts} - - {$mem_end_date} -
- {ts}Membership Fee{/ts} -
- {ts}Financial Type{/ts} - - {$formValues.contributionType_name} -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - - - {foreach from=$value item=line} - - - - - - - {/foreach} -
{ts}Item{/ts}{ts}Fee{/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.start_date} - - {$line.end_date} -
-
- {ts}Amount{/ts} - - {$formValues.total_amount|crmMoney} -
- {ts}Received Date{/ts} - - {$receive_date|truncate:10:''|crmDate} -
- {ts}Paid By{/ts} - - {$formValues.paidBy} -
- {ts}Check Number{/ts} - - {$formValues.check_number} -
-
- - - {if $contributeMode ne 'notify' and !$isAmountzero and !$is_pay_later } - - - - - - - {/if} - - {if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later} - - - - - - - - - - - {/if} - -
- {ts}Billing Name and Address{/ts} -
- {$billingName}
- {$address} -
- {ts}Credit Card Information{/ts} -
- {$credit_card_type}
- {$credit_card_number} -
- {ts}Expires{/ts} - - {$credit_card_exp_date|truncate:7:''|crmDate} -
-
- - - - - {foreach from=$customValues item=value key=customName} - - - - - {/foreach} -
- {ts}Membership Options{/ts} -
- {$customName} - - {$value} -
-
-
- - - diff --git a/CRM/Upgrade/4.5.beta2.msg_template/message_templates/membership_offline_receipt_text.tpl b/CRM/Upgrade/4.5.beta2.msg_template/message_templates/membership_offline_receipt_text.tpl deleted file mode 100644 index 383167a68f..0000000000 --- a/CRM/Upgrade/4.5.beta2.msg_template/message_templates/membership_offline_receipt_text.tpl +++ /dev/null @@ -1,90 +0,0 @@ -{if $formValues.receipt_text_signup} -{$formValues.receipt_text_signup} -{elseif $formValues.receipt_text_renewal} -{$formValues.receipt_text_renewal} -{else}{ts}Thank you for your support.{/ts}{/if} - -{if ! $cancelled}{ts}Please print this receipt for your records.{/ts} - - -{/if} -{if !$lineItem} -=========================================================== -{ts}Membership Information{/ts} - -=========================================================== -{ts}Membership Type{/ts}: {$membership_name} -{/if} -{if ! $cancelled} -{if !$lineItem} -{ts}Membership Start Date{/ts}: {$mem_start_date} -{ts}Membership End Date{/ts}: {$mem_end_date} -{/if} - -{if $formValues.total_amount OR $formValues.total_amount eq 0 } -=========================================================== -{ts}Membership Fee{/ts} - -=========================================================== -{if $formValues.contributionType_name} -{ts}Financial Type{/ts}: {$formValues.contributionType_name} -{/if} -{if $lineItem} -{foreach from=$lineItem item=value key=priceset} -{capture assign=ts_item}{ts}Item{/ts}{/capture} -{capture assign=ts_total}{ts}Fee{/ts}{/capture} -{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"} {$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"} {$line.start_date|string_format:"%20s"} {$line.end_date|string_format:"%20s"} -{/foreach} -{/foreach} --------------------------------------------------------------------------------------------------- -{/if} -{ts}Amount{/ts}: {$formValues.total_amount|crmMoney} -{if $receive_date} -{ts}Received Date{/ts}: {$receive_date|truncate:10:''|crmDate} -{/if} -{if $formValues.paidBy} -{ts}Paid By{/ts}: {$formValues.paidBy} -{if $formValues.check_number} -{ts}Check Number{/ts}: {$formValues.check_number} -{/if} -{/if} -{/if} -{/if} - -{if $isPrimary } -{if $contributeMode ne 'notify' and !$isAmountzero and !$is_pay_later } - -=========================================================== -{ts}Billing Name and Address{/ts} - -=========================================================== -{$billingName} -{$address} -{/if} - -{if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later} -=========================================================== -{ts}Credit Card Information{/ts} - -=========================================================== -{$credit_card_type} -{$credit_card_number} -{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} -{/if} -{/if} - -{if $customValues} -=========================================================== -{ts}Membership Options{/ts} - -=========================================================== -{foreach from=$customValues item=value key=customName} - {$customName} : {$value} -{/foreach} -{/if} diff --git a/CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Single Column.tpl b/CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Single Column.tpl deleted file mode 100644 index 86ffc2351d..0000000000 --- a/CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Single Column.tpl +++ /dev/null @@ -1,496 +0,0 @@ - - - - - - - - - - - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - -
 
- - - - - - -
Organization or Program Name Here
- - - - - - - -
Month and Year
-
 
-
-
- - - - - - - - -
- - - - - - -
- - - - - - - - - -
- - - - - - - - - - -
Replace with your own logo -
 
-
-
 
-
-
- - - - - - -
- - - - - - - - - - -
Headline Here
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
 
Your Heading Here
 
-

{contact.email_greeting},

-

Replace with your text and images, and remember to link the facebook and twitter links in the footer to your pages. Have fun!

-
Read More
 
-
-
-
-
-
- - - - - - - - -
- - - - - - -
- - - - - - -
- - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
 
Your Heading Here
 
-

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna

-
Read More
 
-
-
-
-
-
- - - - - - - - -
- - - - - - -
- - - - - - -
- - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - - -
-
-
 
-

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna

-
-
-
-
-
-
- - - - - - - - -
- - - - - - -
- - - - - - -
- - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - - - - - -
-
-
 
-

Remember to link the facebook and twitter links below to your pages!

-
Read More
-
-
-
-
-
- - - - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - -
 
- - - - - - - - - - - -
 Unsubscribe | Subscribe | Opt out
 {domain.address}
- - - - - - - - - - - -
-
- 		  -
- 		 
-
 
-
-
- - - diff --git a/CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Two Column.tpl b/CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Two Column.tpl deleted file mode 100644 index 14c140fa13..0000000000 --- a/CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Two Column.tpl +++ /dev/null @@ -1,672 +0,0 @@ - - - - - - - - - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - -
 
- - - - - - -
Organization or Program Name Here
- - - - - - - -
Month Year
-
 
-
-
- - - - - - - - -
- - - - - - -
- - - - - - - -
- - - - - - - - - - -
Replace with your own logo
 -
 
-
- -
-
-
-
- - - - - - - - -
- - - - - - -
- - - - - - - - - - - -
- - - - - - -
- - - - - - - - - - -
Hero Story Heading
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
 
Subheading Here
 
Replace with your text and images, and remember to link the facebook and twitter links in the footer to your pages. Have fun!
 
-
-
-
Section Heading Here
-
-
- - - - - - - - -
- - - - - - -
- - - - - - - - - - - - - - -
 
- - - - - - -
- - - - - - - -
- - - - - - - - -
 
- - - - - - - - - - - - - - - - - - - - -
Heading Here
 
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna
Read More
-
-
 
-
-
- - - - - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - - - - -
 
 
- - - - - - -
- - - - - - - -
- - - - - - - - -
 
- - - - - - - - - - - - - - - - - - - - -
Heading Here
 
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna
Read More
-
-
 
-
-
- - - - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - - - - - -
 
 
- - - - - - -
- - - - - - - -
- - - - - - - - -
 
- - - - - - - - - - - - - - - - - - - - -
Heading Here
 
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna
Read More
-
-
 
-
-
- - - - - - - - - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
 
 
- - - - - - -
- - - - - - - -
- - - - - - - - -
 
- - - - - - - - - - - - - - - - - - - - -
Heading Here
 
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna
Read More
-
-
 
-

Remember to link the facebook and twitter links below to your pages!

-
-
-
- - - - - - - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - - - - - -
 
- - - - - - - - - - - -
 Unsubscribe | Subscribe | Opt out
 {domain.address}
- - - - - - - - - - -
-
  -
- 		 
-
 
 
-
-
- - - diff --git a/CRM/Upgrade/Form.php b/CRM/Upgrade/Form.php index 4d993118e6..79305b2fce 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.4.7'; + const MINIMUM_UPGRADABLE_VERSION = '4.5.9'; /** * @var \CRM_Core_Config diff --git a/CRM/Upgrade/Incremental/php/FourFive.php b/CRM/Upgrade/Incremental/php/FourFive.php deleted file mode 100644 index 0f27a0be48..0000000000 --- a/CRM/Upgrade/Incremental/php/FourFive.php +++ /dev/null @@ -1,358 +0,0 @@ -
' . ts('Default versions of the following System Workflow Message Templates have been modified to handle new functionality: 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). (learn more...)', [1 => 'http://wiki.civicrm.org/confluence/display/CRMDOC/Updating+System+Workflow+Message+Templates+after+Upgrades+-+method+1+-+kdiff']); - $postUpgradeMessage .= '

' . ts('This release allows you to view and edit multiple-record custom field sets in a table format which will be more usable in some cases. You can try out the format by navigating to Administer > Custom Data & Screens > Custom Fields. Click Settings for a custom field set and change Display Style to "Tab with Tables".'); - $postUpgradeMessage .= '

' . ts('This release changes the way that anonymous event registrations match participants with existing contacts. By default, all event participants will be matched with existing individuals using the Unsupervised rule, even if multiple registrations with the same email address are allowed. However, you can now select a different matching rule to use for each event. Please review your events to make sure you choose the appropriate matching rule and collect sufficient information for it to match contacts.'); - } - if ($rev == '4.5.beta2') { - $postUpgradeMessage .= '

' . ts('If you use CiviMail for newsletters or other communications, check out the new sample CiviMail templates which use responsive design to optimize display on mobile devices (Administer > Communications > Message Templates ).'); - } - if ($rev == '4.5.1') { - $postUpgradeMessage .= '

' . ts('WARNING: If you use CiviCase with v4.5.alpha*, v4.5.beta*, or v4.5.0, it is possible that previous upgrades corrupted some CiviCase metadata. If you have not already done so, please identify any custom field sets, smart groups, or reports which refer to CiviCase and ensure that they are properly configured.'); - } - } - - /** - * @param $rev - * - * @return bool - */ - public function upgrade_4_5_alpha1($rev) { - // task to process sql - $this->addTask('Migrate honoree information to module_data', 'migrateHonoreeInfo'); - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => '4.5.alpha1']), 'runSql', $rev); - $this->addTask('Set default for Individual name fields configuration', 'addNameFieldOptions'); - - // CRM-14522 - The below schema checking is done as foreign key name - // for pdf_format_id column varies for different databases - // if DB is been into upgrade for 3.4.2 version, it would have pdf_format_id name for FK - // else FK_civicrm_msg_template_pdf_format_id - $config = CRM_Core_Config::singleton(); - $dsn = CRM_Utils_SQL::autoSwitchDSN($config->dsn); - $dbUf = DB::parseDSN($dsn); - $query = " -SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS -WHERE TABLE_NAME = 'civicrm_msg_template' -AND CONSTRAINT_TYPE = 'FOREIGN KEY' -AND TABLE_SCHEMA = %1 -"; - $params = [1 => [$dbUf['database'], 'String']]; - $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, NULL, FALSE, FALSE); - if ($dao->fetch()) { - if ($dao->CONSTRAINT_NAME == 'FK_civicrm_msg_template_pdf_format_id' || - $dao->CONSTRAINT_NAME == 'pdf_format_id' - ) { - $sqlDropFK = "ALTER TABLE `civicrm_msg_template` -DROP FOREIGN KEY `{$dao->CONSTRAINT_NAME}`, -DROP KEY `{$dao->CONSTRAINT_NAME}`"; - CRM_Core_DAO::executeQuery($sqlDropFK, [], TRUE, NULL, FALSE, FALSE); - } - } - - return TRUE; - } - - /** - * @param $rev - * - * @return bool - */ - public function upgrade_4_5_beta9($rev) { - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => '4.5.beta9']), 'runSql', $rev); - - $entityTable = [ - 'Participant' => 'civicrm_participant_payment', - 'Contribution' => 'civicrm_contribution', - 'Membership' => 'civicrm_membership', - ]; - - foreach ($entityTable as $label => $tableName) { - list($minId, $maxId) = CRM_Core_DAO::executeQuery("SELECT coalesce(min(id),0), coalesce(max(id),0) - FROM {$tableName}")->getDatabaseResult()->fetchRow(); - for ($startId = $minId; $startId <= $maxId; $startId += self::BATCH_SIZE) { - $endId = $startId + self::BATCH_SIZE - 1; - $title = ts("Upgrade DB to 4.5.beta9: Fix line items for {$label} (%1 => %2)", [ - 1 => $startId, - 2 => $endId, - ]); - $this->addTask($title, 'task_4_5_0_fixLineItem', $startId, $endId, $label); - } - } - return TRUE; - } - - /** - * (Queue Task Callback) - * - * update the line items - * - * - * @param CRM_Queue_TaskContext $ctx - * @param int $startId - * the first/lowest entity ID to convert. - * @param int $endId - * the last/highest entity ID to convert. - * @param string $entityTable - * - * @return bool - */ - public static function task_4_5_0_fixLineItem(CRM_Queue_TaskContext $ctx, $startId, $endId, $entityTable) { - - $sqlParams = [ - 1 => [$startId, 'Integer'], - 2 => [$endId, 'Integer'], - ]; - switch ($entityTable) { - case 'Contribution': - // update all the line item entity_table and entity_id with contribution due to bug CRM-15055 - CRM_Core_DAO::executeQuery("UPDATE civicrm_line_item li - INNER JOIN civicrm_contribution cc ON cc.id = li.contribution_id - SET entity_id = li.contribution_id, entity_table = 'civicrm_contribution' - WHERE li.contribution_id IS NOT NULL AND li.entity_table <> 'civicrm_participant' AND (cc.id BETWEEN %1 AND %2)", $sqlParams); - - // update the civicrm_line_item.contribution_id - CRM_Core_DAO::executeQuery("UPDATE civicrm_line_item li - INNER JOIN civicrm_contribution cc ON cc.id = li.entity_id - SET contribution_id = entity_id - WHERE li.contribution_id IS NULL AND li.entity_table = 'civicrm_contribution' AND (cc.id BETWEEN %1 AND %2)", $sqlParams); - break; - - case 'Participant': - // update the civicrm_line_item.contribution_id - CRM_Core_DAO::executeQuery("UPDATE civicrm_line_item li - INNER JOIN civicrm_participant_payment pp ON pp.participant_id = li.entity_id - SET li.contribution_id = pp.contribution_id - WHERE li.entity_table = 'civicrm_participant' AND li.contribution_id IS NULL AND (pp.id BETWEEN %1 AND %2)", $sqlParams); - break; - - case 'Membership': - $upgrade = new CRM_Upgrade_Form(); - // update the line item of membership - CRM_Core_DAO::executeQuery("UPDATE civicrm_line_item li - INNER JOIN civicrm_membership_payment mp ON mp.contribution_id = li.contribution_id - INNER JOIN civicrm_membership cm ON mp.membership_id = cm.id - INNER JOIN civicrm_price_field_value pv ON pv.id = li.price_field_value_id - SET li.entity_table = 'civicrm_membership', li.entity_id = mp.membership_id - WHERE li.entity_table = 'civicrm_contribution' - AND pv.membership_type_id IS NOT NULL AND cm.membership_type_id = pv.membership_type_id AND (cm.id BETWEEN %1 AND %2)", $sqlParams); - - CRM_Core_DAO::executeQuery("UPDATE civicrm_line_item li - INNER JOIN civicrm_membership_payment mp ON mp.contribution_id = li.contribution_id - INNER JOIN civicrm_price_field_value pv ON pv.id = li.price_field_value_id - SET li.entity_table = 'civicrm_membership', li.entity_id = mp.membership_id - WHERE li.entity_table = 'civicrm_contribution' - AND pv.membership_type_id IS NOT NULL AND (mp.membership_id BETWEEN %1 AND %2)", $sqlParams); - - CRM_Core_DAO::executeQuery("INSERT INTO civicrm_line_item (entity_table, entity_id, price_field_id, label, - qty, unit_price, line_total, price_field_value_id, financial_type_id) - SELECT 'civicrm_membership', cm.id, cpf.id price_field_id, cpfv.label, 1 as qty, cpfv.amount, cpfv.amount line_total, - cpfv.id price_field_value_id, cpfv.financial_type_id FROM civicrm_membership cm - LEFT JOIN civicrm_membership_payment cmp ON cmp.membership_id = cm.id - INNER JOIN civicrm_price_field_value cpfv ON cpfv.membership_type_id = cm.membership_type_id - INNER JOIN civicrm_price_field cpf ON cpf.id = cpfv.price_field_id - INNER JOIN civicrm_price_set cps ON cps.id = cpf.price_set_id - WHERE cmp.contribution_id IS NULL AND cps.name = 'default_membership_type_amount' AND (cm.id BETWEEN %1 AND %2)", $sqlParams); - break; - } - return TRUE; - } - - /** - * Add defaults for the newly introduced name fields configuration in 'contact_edit_options' setting - * - * @param CRM_Queue_TaskContext $ctx - * - * @return bool - * TRUE for success - */ - public static function addNameFieldOptions(CRM_Queue_TaskContext $ctx) { - $query = "SELECT `value` FROM `civicrm_setting` WHERE `group_name` = 'CiviCRM Preferences' AND `name` = 'contact_edit_options'"; - $dao = CRM_Core_DAO::executeQuery($query); - $dao->fetch(); - $oldValue = unserialize($dao->value); - - $newValue = $oldValue . '1214151617'; - - $query = "UPDATE `civicrm_setting` SET `value` = %1 WHERE `group_name` = 'CiviCRM Preferences' AND `name` = 'contact_edit_options'"; - $params = [1 => [serialize($newValue), 'String']]; - CRM_Core_DAO::executeQuery($query, $params); - - return TRUE; - } - - /** - * Migrate honoree information to uf_join.module_data as honoree columns (text and title) will be dropped - * on DB upgrade - * - * @param CRM_Queue_TaskContext $ctx - * - * @return bool - * TRUE for success - */ - public static function migrateHonoreeInfo(CRM_Queue_TaskContext $ctx) { - $query = "ALTER TABLE `civicrm_uf_join` - ADD COLUMN `module_data` longtext COMMENT 'Json serialized array of data used by the ufjoin.module'"; - CRM_Core_DAO::executeQuery($query); - - $honorTypes = array_keys(CRM_Core_OptionGroup::values('honor_type')); - $ufGroupDAO = new CRM_Core_DAO_UFGroup(); - $ufGroupDAO->name = 'new_individual'; - $ufGroupDAO->find(TRUE); - - $query = "SELECT * FROM civicrm_contribution_page"; - $dao = CRM_Core_DAO::executeQuery($query); - - if ($dao->N) { - $domain = new CRM_Core_DAO_Domain(); - $domain->find(TRUE); - while ($dao->fetch()) { - $honorParams = ['soft_credit' => ['soft_credit_types' => $honorTypes]]; - if ($domain->locales) { - $locales = explode(CRM_Core_DAO::VALUE_SEPARATOR, $domain->locales); - foreach ($locales as $locale) { - $honor_block_title = "honor_block_title_{$locale}"; - $honor_block_text = "honor_block_text_{$locale}"; - $honorParams['soft_credit'] += [ - $locale => [ - 'honor_block_title' => $dao->$honor_block_title, - 'honor_block_text' => $dao->$honor_block_text, - ], - ]; - } - } - else { - $honorParams['soft_credit'] += [ - 'default' => [ - 'honor_block_title' => $dao->honor_block_title, - 'honor_block_text' => $dao->honor_block_text, - ], - ]; - } - $ufJoinParam = [ - 'module' => 'soft_credit', - 'entity_table' => 'civicrm_contribution_page', - 'is_active' => $dao->honor_block_is_active, - 'entity_id' => $dao->id, - 'uf_group_id' => $ufGroupDAO->id, - 'module_data' => json_encode($honorParams), - ]; - CRM_Core_BAO_UFJoin::create($ufJoinParam); - } - } - - return TRUE; - } - - /** - * Upgrade function. - * - * @param string $rev - * @return bool - */ - public function upgrade_4_5_9($rev) { - // Task to process sql. - $this->addTask('Upgrade DB to 4.5.9: Fix saved searches consisting of multi-choice custom field(s)', 'updateSavedSearch'); - - return TRUE; - } - - /** - * Update saved search for multi-select custom fields on DB upgrade - * - * @param CRM_Queue_TaskContext $ctx - * - * @return bool TRUE for success - */ - public static function updateSavedSearch(CRM_Queue_TaskContext $ctx) { - $sql = "SELECT id, form_values FROM civicrm_saved_search"; - $dao = CRM_Core_DAO::executeQuery($sql); - while ($dao->fetch()) { - $copy = $formValues = unserialize($dao->form_values); - $update = FALSE; - foreach ($copy as $field => $data_value) { - if (preg_match('/^custom_/', $field) && is_array($data_value) && !array_key_exists("${field}_operator", $formValues)) { - // Now check for CiviCRM_OP_OR as either key or value in the data_value array. - // This is the conclusive evidence of an old-style data format. - if (array_key_exists('CiviCRM_OP_OR', $data_value) || FALSE !== array_search('CiviCRM_OP_OR', $data_value)) { - // We have old style data. Mark this record to be updated. - $update = TRUE; - $op = 'and'; - if (!preg_match('/^custom_([0-9]+)/', $field, $matches)) { - // fatal error? - continue; - } - $fieldID = $matches[1]; - if (array_key_exists('CiviCRM_OP_OR', $data_value)) { - // This indicates data structure identified by jamie in the form: - // value1 => 1, value2 => , value3 => 1. - $data_value = array_keys($data_value, 1); - - // If CiviCRM_OP_OR - change OP from default to OR - if ($data_value['CiviCRM_OP_OR'] == 1) { - $op = 'or'; - } - unset($data_value['CiviCRM_OP_OR']); - } - else { - // The value is here, but it is not set as a key. - // This is using the style identified by Monish - the existence of the value - // indicates an OR search and values are set in the form of: - // 0 => value1, 1 => value1, 3 => value2. - $key = array_search('CiviCRM_OP_OR', $data_value); - $op = 'or'; - unset($data_value[$key]); - } - - //If only Or operator has been chosen, means we need to select all values and - //so to execute OR operation between these values according to new data structure - if (count($data_value) == 0 && $op == 'or') { - $customOption = CRM_Core_BAO_CustomOption::getCustomOption($fieldID); - foreach ($customOption as $option) { - $data_value[] = $option['value'] ?? NULL; - } - } - - $formValues[$field] = $data_value; - $formValues["${field}_operator"] = $op; - } - } - } - - if ($update) { - $sql = "UPDATE civicrm_saved_search SET form_values = %0 WHERE id = %1"; - CRM_Core_DAO::executeQuery($sql, - [ - [serialize($formValues), 'String'], - [$dao->id, 'Integer'], - ] - ); - } - } - return TRUE; - } - -} diff --git a/CRM/Upgrade/Incremental/sql/4.5.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.0.mysql.tpl deleted file mode 100644 index 66aea8ae3c..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.0.mysql.tpl +++ /dev/null @@ -1,11 +0,0 @@ -{* file to handle db changes in 4.5.0 during upgrade *} - -{include file='../CRM/Upgrade/4.5.0.msg_template/civicrm_msg_template.tpl'} - -ALTER TABLE `civicrm_action_schedule` - ADD COLUMN `sms_template_id` int(10) unsigned DEFAULT NULL COMMENT 'SMS Reminder Template. FK to id in civicrm_msg_template.' AFTER `msg_template_id`, - ADD COLUMN `sms_body_text` longtext COLLATE utf8_unicode_ci COMMENT 'Body of the mailing in html format.' AFTER `body_html`, - ADD CONSTRAINT `FK_civicrm_action_schedule_sms_template_id` FOREIGN KEY (`sms_template_id`) REFERENCES civicrm_msg_template(`id`) ON DELETE SET NULL; - -ALTER TABLE `civicrm_msg_template` - ADD COLUMN `is_sms` tinyint(4) DEFAULT '0' COMMENT 'Is this message template used for sms?'; diff --git a/CRM/Upgrade/Incremental/sql/4.5.1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.1.mysql.tpl deleted file mode 100644 index c0965058eb..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.1.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.5.1 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.5.2.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.2.mysql.tpl deleted file mode 100644 index e4f828739b..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.2.mysql.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{* file to handle db changes in 4.5.2 during upgrade *} - --- CRM-15467 Also fix group_type for Honoree Profile -UPDATE civicrm_uf_group SET group_type = 'Individual,Contact' WHERE name = 'honoree_individual'; - diff --git a/CRM/Upgrade/Incremental/sql/4.5.3.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.3.mysql.tpl deleted file mode 100644 index 01e35c7c0a..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.3.mysql.tpl +++ /dev/null @@ -1,12 +0,0 @@ -{* file to handle db changes in 4.5.3 during upgrade *} - --- CRM-15475 -SELECT @membershipStatusId := id FROM civicrm_membership_status WHERE name = 'Cancelled'; -SELECT @membershipStatusWeight := max(weight) + 1 FROM civicrm_membership_status; - -INSERT INTO civicrm_membership_status (id, name, {localize field='label'}label{/localize}, start_event, start_event_adjust_unit, start_event_adjust_interval, end_event, end_event_adjust_unit, end_event_adjust_interval, is_current_member, is_admin, weight, is_default, is_active, is_reserved) -VALUES (@membershipStatusId, 'Cancelled', {localize}'{ts escape="sql"}Cancelled{/ts}'{/localize}, 'join_date', null, null, 'join_date', null, null, 0, 0, @membershipStatusWeight, 0, 0, 1) -ON DUPLICATE KEY UPDATE is_reserved = 1; - --- CRM-15558 -ALTER TABLE `civicrm_mailing_bounce_type` CHANGE `name` `name` VARCHAR( 24 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT 'Type of bounce'; diff --git a/CRM/Upgrade/Incremental/sql/4.5.4.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.4.mysql.tpl deleted file mode 100644 index f5971ae9b7..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.4.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.5.4 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.5.5.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.5.mysql.tpl deleted file mode 100644 index b97d8681e6..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.5.mysql.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{* file to handle db changes in 4.5.5 during upgrade *} - --- https://issues.civicrm.org/jira/browse/CRM-15630 - -UPDATE civicrm_msg_template SET msg_html = REPLACE(msg_html, 'email=true', 'emailMode=true') WHERE msg_title = 'Petition - signature added'; diff --git a/CRM/Upgrade/Incremental/sql/4.5.6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.6.mysql.tpl deleted file mode 100644 index eb65ae8028..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.6.mysql.tpl +++ /dev/null @@ -1,4 +0,0 @@ -{* file to handle db changes in 4.5.6 during upgrade *} - --- CRM-15760 -ALTER TABLE `civicrm_action_schedule` CHANGE `entity_value` `entity_value` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Entity value'; diff --git a/CRM/Upgrade/Incremental/sql/4.5.7.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.7.mysql.tpl deleted file mode 100644 index 3becf6350c..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.7.mysql.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{* file to handle db changes in 4.5.7 during upgrade *} - --- CRM-15931 -UPDATE civicrm_mailing_group SET group_type = 'Include' WHERE group_type = 'include'; -UPDATE civicrm_mailing_group SET group_type = 'Exclude' WHERE group_type = 'exclude'; -UPDATE civicrm_mailing_group SET group_type = 'Base' WHERE group_type = 'base'; diff --git a/CRM/Upgrade/Incremental/sql/4.5.8.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.8.mysql.tpl deleted file mode 100644 index 3c2f7c6ce0..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.8.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.5.8 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.5.9.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.9.mysql.tpl deleted file mode 100644 index 232ca048ac..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.9.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* CRM-16846 - This file is never run, but it doesn't matter because it's empty *} diff --git a/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl deleted file mode 100644 index 540c96db3c..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl +++ /dev/null @@ -1,541 +0,0 @@ -{* file to handle db changes in 4.5.alpha1 during upgrade *} -{include file='../CRM/Upgrade/4.5.alpha1.msg_template/civicrm_msg_template.tpl'} - -ALTER TABLE `civicrm_contact` - ADD COLUMN `formal_title` varchar(64) COMMENT 'Formal (academic or similar) title in front of name. (Prof., Dr. etc.)' AFTER `suffix_id`; - -ALTER TABLE `civicrm_contact` - ADD COLUMN `communication_style_id` int(10) unsigned COMMENT 'Communication style (e.g. formal vs. familiar) to use with this contact. FK to communication styles in civicrm_option_value.' AFTER `formal_title`, - ADD INDEX `index_communication_style_id` (`communication_style_id`); - -INSERT INTO - `civicrm_option_group` (`name`, {localize field='title'}`title`{/localize}, `is_reserved`, `is_active`) -VALUES - ('communication_style', {localize}'{ts escape="sql"}Communication Style{/ts}'{/localize}, 1, 1); - -SELECT @option_group_id_communication_style := max(id) from civicrm_option_group where name = 'communication_style'; - -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_communication_style, {localize}'{ts escape="sql"}Formal{/ts}'{/localize}, 1, 'formal' , NULL, 0, 1, 1, 0, 0, 1, NULL, NULL), - (@option_group_id_communication_style, {localize}'{ts escape="sql"}Familiar{/ts}'{/localize}, 2, 'familiar', NULL, 0, 0, 2, 0, 0, 1, NULL, NULL); - --- Insert menu item at Administer > Communications, above the various Greeting Formats - -SELECT @parent_id := `id` FROM `civicrm_navigation` WHERE `name` = 'Communications' AND `domain_id` = {$domainID}; -SELECT @add_weight := MIN(`weight`) FROM `civicrm_navigation` WHERE `name` IN('Email Greeting Formats', 'Postal Greeting Formats', 'Addressee Formats') AND `parent_id` = @parent_id; - -UPDATE `civicrm_navigation` -SET `weight` = `weight`+1 -WHERE `parent_id` = @parent_id -AND `weight` >= @add_weight; - -INSERT INTO `civicrm_navigation` - ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight ) -VALUES - ( {$domainID}, 'civicrm/admin/options/communication_style&group=communication_style&reset=1', '{ts escape="sql" skip="true"}Communication Style Options{/ts}', 'Communication Style Options', 'administer CiviCRM', '', @parent_id, '1', NULL, @add_weight ); - --- CRM-9988 Change world region of Panama country to America South, Central, North and Caribbean -UPDATE `civicrm_country` SET `region_id` = 2 WHERE `id` = 1166; - -SELECT @option_group_id_contact_edit_options := max(id) from civicrm_option_group where name = 'contact_edit_options'; - -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_contact_edit_options, {localize}'{ts escape="sql"}Prefix{/ts}'{/localize} , 12, 'Prefix' , NULL, 2, NULL, 12, 0, 0, 1, NULL, NULL), - (@option_group_id_contact_edit_options, {localize}'{ts escape="sql"}Formal Title{/ts}'{/localize}, 13, 'Formal Title', NULL, 2, NULL, 13, 0, 0, 1, NULL, NULL), - (@option_group_id_contact_edit_options, {localize}'{ts escape="sql"}First Name{/ts}'{/localize} , 14, 'First Name' , NULL, 2, NULL, 14, 0, 0, 1, NULL, NULL), - (@option_group_id_contact_edit_options, {localize}'{ts escape="sql"}Middle Name{/ts}'{/localize} , 15, 'Middle Name' , NULL, 2, NULL, 15, 0, 0, 1, NULL, NULL), - (@option_group_id_contact_edit_options, {localize}'{ts escape="sql"}Last Name{/ts}'{/localize} , 16, 'Last Name' , NULL, 2, NULL, 16, 0, 0, 1, NULL, NULL), - (@option_group_id_contact_edit_options, {localize}'{ts escape="sql"}Suffix{/ts}'{/localize} , 17, 'Suffix' , NULL, 2, NULL, 17, 0, 0, 1, NULL, NULL); - --- CRM-13857 -ALTER TABLE civicrm_group - ADD COLUMN `modified_id` INT(10) unsigned DEFAULT NULL COMMENT 'FK to contact table, modifier of the group.', - ADD CONSTRAINT `FK_civicrm_group_modified_id` FOREIGN KEY (`modified_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL; - --- CRM-13913 -ALTER TABLE civicrm_word_replacement - ALTER COLUMN `is_active` SET DEFAULT 1; - ---CRM-13833 Implement Soft Credit Type for Contribution -INSERT INTO civicrm_option_group - (name, {localize field='title'}title{/localize}, is_reserved, is_active) VALUES ('soft_credit_type', {localize}'{ts escape="sql"}Soft Credit Types{/ts}'{/localize}, 1, 1); - -SELECT @option_group_id_soft_credit_type := max(id) from civicrm_option_group where name = 'soft_credit_type'; - -INSERT INTO `civicrm_option_value` (`option_group_id`, {localize field='label'}`label`{/localize}, `value`, `name`, `weight`, `is_default`, `is_active`, `is_reserved`) - VALUES - (@option_group_id_soft_credit_type , {localize}'{ts escape="sql"}In Honor of{/ts}'{/localize}, 1, 'in_honor_of', 1, 0, 1, 1), - (@option_group_id_soft_credit_type , {localize}'{ts escape="sql"}In Memory of{/ts}'{/localize}, 2, 'in_memory_of', 2, 0, 1, 1), - (@option_group_id_soft_credit_type , {localize}'{ts escape="sql"}Solicited{/ts}'{/localize}, 3, 'solicited', 3, 0, 1, 1), - (@option_group_id_soft_credit_type , {localize}'{ts escape="sql"}Household{/ts}'{/localize}, 4, 'household', 4, 0, 1, 0), - (@option_group_id_soft_credit_type , {localize}'{ts escape="sql"}Workplace Giving{/ts}'{/localize}, 5, 'workplace', 5, 0, 1, 0), - (@option_group_id_soft_credit_type , {localize}'{ts escape="sql"}Foundation Affiliate{/ts}'{/localize}, 6, 'foundation_affiliate', 6, 0, 1, 0), - (@option_group_id_soft_credit_type , {localize}'{ts escape="sql"}3rd-party Service{/ts}'{/localize}, 7, '3rd-party_service', 7, 0, 1, 0), - (@option_group_id_soft_credit_type , {localize}'{ts escape="sql"}Donor-advised Fund{/ts}'{/localize}, 8, 'donor-advised_fund', 8, 0, 1, 0), - (@option_group_id_soft_credit_type , {localize}'{ts escape="sql"}Matched Gift{/ts}'{/localize}, 9, 'matched_gift', 9, 0, 1, 0), - (@option_group_id_soft_credit_type , {localize}'{ts escape="sql"}Personal Campaign Page{/ts}'{/localize}, 10, 'pcp', 10, 0, 1, 1), - (@option_group_id_soft_credit_type , {localize}'{ts escape="sql"}Gift{/ts}'{/localize}, 11, 'gift', 11, 0, 1, 1); - -ALTER TABLE `civicrm_contribution_soft` - ADD COLUMN `soft_credit_type_id` int(10) unsigned COMMENT 'Soft Credit Type ID.Implicit FK to civicrm_option_value where option_group = soft_credit_type.'; - -INSERT INTO civicrm_contribution_soft(contribution_id, contact_id, amount, currency, soft_credit_type_id) -SELECT id, honor_contact_id, total_amount, currency, honor_type_id -FROM civicrm_contribution -WHERE honor_contact_id IS NOT NULL; - -SELECT @sct_pcp_id := value from civicrm_option_value where name = 'pcp' and option_group_id = @option_group_id_soft_credit_type; - -UPDATE `civicrm_contribution_soft` -SET soft_credit_type_id = @sct_pcp_id -WHERE pcp_id IS NOT NULL; - ---CRM-13734 make basic Case Activity Types reserved -SELECT @option_group_id_activity_type := id from civicrm_option_group where name = 'activity_type'; -SELECT @caseCompId := id FROM `civicrm_component` where `name` like 'CiviCase'; - -UPDATE `civicrm_option_value` -SET is_reserved = 1 -WHERE is_reserved = 0 AND option_group_id = @option_group_id_activity_type AND component_id = @caseCompId; - --- CRM-13912 -ALTER TABLE civicrm_action_schedule -ADD COLUMN `mode` varchar(128) COLLATE utf8_unicode_ci DEFAULT 'Email' COMMENT 'Send the message as email or sms or both.'; - -INSERT INTO -civicrm_option_group (name, {localize field='title'}title{/localize}, is_reserved, is_active) -VALUES -('msg_mode', {localize}'{ts escape="sql"}Message Mode{/ts}'{/localize}, 1, 1); - -SELECT @option_group_id_msg_mode := max(id) from civicrm_option_group where name = 'msg_mode'; - -INSERT INTO -civicrm_option_value (option_group_id, {localize field='label'}`label`{/localize}, value, name, is_default, weight, is_reserved, is_active) -VALUES -(@option_group_id_msg_mode, {localize}'{ts escape="sql"}Email{/ts}'{/localize}, 'Email', 'Email', 1, 1, 1, 1), -(@option_group_id_msg_mode, {localize}'{ts escape="sql"}SMS{/ts}'{/localize},'SMS', 'SMS', 0, 2, 1, 1), -(@option_group_id_msg_mode, {localize}'{ts escape="sql"}User Preference{/ts}'{/localize}, 'User_Preference', 'User Preference', 0, 3, 1, 1); - -ALTER TABLE civicrm_action_schedule ADD sms_provider_id int(10) unsigned NULL COMMENT 'FK to civicrm_sms_provider id '; -ALTER TABLE civicrm_action_schedule ADD CONSTRAINT FK_civicrm_action_schedule_sms_provider_id FOREIGN KEY (`sms_provider_id`) REFERENCES `civicrm_sms_provider` (`id`) ON DELETE SET NULL; - ---CRM-13981 migrate 'In Honor of' to Soft Credits -INSERT INTO `civicrm_uf_group` - (`name`, `group_type`, {localize field='title'}`title`{/localize}, `is_cms_user`, `is_reserved`) -VALUES - ('honoree_individual', 'Individual,Contact', {localize}'{ts escape="sql"}Honoree Individual{/ts}'{/localize}, 0, 1); - -SELECT @uf_group_id_honoree_individual := id from civicrm_uf_group where name = 'honoree_individual'; -SELECT @primaryLocation := id FROM civicrm_location_type WHERE is_default = 1; - -INSERT INTO `civicrm_uf_field` - (`uf_group_id`, `field_name`, `is_required`, `is_reserved`, `weight`, `visibility`, `in_selector`, `is_searchable`, `location_type_id`, {localize field='label'}`label`{/localize}, field_type) -VALUES - (@uf_group_id_honoree_individual, 'prefix_id', 0, 1, 1, 'User and User Admin Only', 0, 1, NULL, {localize}'{ts escape="sql"}Individual Prefix{/ts}'{/localize}, 'Individual'), - (@uf_group_id_honoree_individual, 'first_name', 0, 1, 2, 'User and User Admin Only', 0, 1, NULL, {localize}'{ts escape="sql"}First Name{/ts}'{/localize}, 'Individual'), - (@uf_group_id_honoree_individual, 'last_name', 0, 1, 3, 'User and User Admin Only', 0, 1, NULL, {localize}'{ts escape="sql"}Last Name{/ts}'{/localize}, 'Individual'), - (@uf_group_id_honoree_individual, 'email', 0, 1, 4, 'User and User Admin Only', 0, 1, @primaryLocation, {localize}'{ts escape="sql"}Email Address{/ts}'{/localize}, 'Individual'); - -UPDATE civicrm_uf_join SET uf_group_id = @uf_group_id_honoree_individual WHERE module = 'soft_credit'; - -{if $multilingual} - {foreach from=$locales item=loc} - ALTER TABLE civicrm_contribution_page DROP honor_block_title_{$loc}; - ALTER TABLE civicrm_contribution_page DROP honor_block_text_{$loc}; - {/foreach} -{else} - ALTER TABLE civicrm_contribution_page DROP honor_block_title; - ALTER TABLE civicrm_contribution_page DROP honor_block_text; -{/if} -ALTER TABLE civicrm_contribution_page DROP honor_block_is_active; - -ALTER TABLE civicrm_contribution DROP FOREIGN KEY `FK_civicrm_contribution_honor_contact_id`; -ALTER TABLE civicrm_contribution DROP honor_contact_id; -ALTER TABLE civicrm_contribution DROP honor_type_id; - -ALTER TABLE civicrm_pledge DROP FOREIGN KEY `FK_civicrm_pledge_honor_contact_id`; -ALTER TABLE civicrm_pledge DROP honor_contact_id; -ALTER TABLE civicrm_pledge DROP honor_type_id; - --- CRM-13964 and CRM-13965 -SELECT @option_group_id_cs := max(id) from civicrm_option_group where name = 'contribution_status'; -SELECT @option_val_id_cs_wt := MAX(weight) FROM civicrm_option_value WHERE option_group_id = @option_group_id_cs; -SELECT @option_val_id_cs_val := MAX(ROUND(value)) FROM civicrm_option_value WHERE option_group_id = @option_group_id_cs; - -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_cs, {localize}'{ts escape="sql"}Partially paid{/ts}'{/localize}, @option_val_id_cs_val+1, 'Partially paid', NULL, 0, NULL, @option_val_id_cs_wt+1, 0, 1, 1, NULL, NULL), - (@option_group_id_cs, {localize}'{ts escape="sql"}Pending refund{/ts}'{/localize}, @option_val_id_cs_val+2, 'Pending refund', NULL, 0, NULL, @option_val_id_cs_wt+2, 0, 1, 1, NULL, NULL); - --- participant status adding -SELECT @participant_status_wt := max(id) from civicrm_participant_status_type; - -INSERT INTO civicrm_participant_status_type (name, {localize field='label'}label{/localize}, class, is_reserved, is_active, is_counted, weight, visibility_id) -VALUES - ('Partially paid', {localize}'{ts escape="sql"}Partially paid{/ts}'{/localize}, 'Positive', 1, 1, 1, @participant_status_wt+1, 2), - ('Pending refund', {localize}'{ts escape="sql"}Pending refund{/ts}'{/localize}, 'Positive', 1, 1, 1, @participant_status_wt+2, 2); - --- new activity types required for partial payments -SELECT @option_group_id_act := max(id) from civicrm_option_group where name = 'activity_type'; -SELECT @option_group_id_act_wt := MAX(weight) FROM civicrm_option_value WHERE option_group_id = @option_group_id_act; -SELECT @option_group_id_act_val := MAX(ROUND(value)) FROM civicrm_option_value WHERE option_group_id = @option_group_id_act; -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_act, {localize}'{ts escape="sql"}Payment{/ts}'{/localize}, @option_group_id_act_val+1, 'Payment', NULL, 1, NULL, @option_group_id_act_wt+1, {localize}'{ts escape="sql"}Additional payment recorded for event or membership fee.{/ts}'{/localize}, 0, 1, 1, @contributeCompId, NULL), - (@option_group_id_act, {localize}'{ts escape="sql"}Refund{/ts}'{/localize}, @option_group_id_act_val+2, 'Refund', NULL, 1, NULL, @option_group_id_act_wt+2, {localize}'{ts escape="sql"}Refund recorded for event or membership fee.{/ts}'{/localize}, 0, 1, 1, @contributeCompId, NULL), - (@option_group_id_act, {localize}'{ts escape="sql"}Change Registration{/ts}'{/localize}, @option_group_id_act_val+3, 'Change Registration', NULL, 1, NULL, @option_group_id_act_wt+3, {localize}'{ts escape="sql"}Changes to an existing event registration.{/ts}'{/localize}, 0, 1, 1, @eventCompId, NULL); - --- CRM-13970 -UPDATE civicrm_navigation set url = 'civicrm/admin/options/from_email_address&reset=1' WHERE url LIKE 'civicrm/admin/options/from_email%'; -UPDATE civicrm_navigation set url = CONCAT(SUBSTRING_INDEX(url, '&', 1), '&reset=1') WHERE url LIKE 'civicrm/admin/options/%'; - --- CRM-14181 -ALTER TABLE civicrm_acl CHANGE operation operation VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT 'What operation does this ACL entry control?'; -ALTER TABLE civicrm_campaign_group CHANGE group_type group_type VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Type of Group.'; -ALTER TABLE `civicrm_acl_contact_cache` CHANGE `operation` `operation` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT 'What operation does this user have permission on?'; -ALTER TABLE `civicrm_price_field` CHANGE `html_type` `html_type` VARCHAR( 12 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL; -ALTER TABLE `civicrm_pledge` CHANGE `frequency_unit` `frequency_unit` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT 'month' COMMENT 'Time units for recurrence of pledge payments.'; -ALTER TABLE `civicrm_membership_type` CHANGE `duration_unit` `duration_unit` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Unit in which membership period is expressed.'; -ALTER TABLE `civicrm_membership_type` CHANGE `period_type` `period_type` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Rolling membership period starts on signup date. Fixed membership periods start on fixed_period_start_day.'; -ALTER TABLE `civicrm_membership_status` CHANGE `start_event` `start_event` VARCHAR( 12 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Event when this status starts.'; -ALTER TABLE `civicrm_membership_status` CHANGE `start_event_adjust_unit` `start_event_adjust_unit` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Unit used for adjusting from start_event.'; -ALTER TABLE `civicrm_membership_status` CHANGE `end_event` `end_event` VARCHAR( 12 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Event after which this status ends.'; -ALTER TABLE `civicrm_membership_status` CHANGE `end_event_adjust_unit` `end_event_adjust_unit` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Unit used for adjusting from the ending event.'; -ALTER TABLE `civicrm_mailing_job` CHANGE `status` `status` VARCHAR( 12 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'The state of this job'; -ALTER TABLE `civicrm_mailing_group` CHANGE `group_type` `group_type` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Are the members of the group included or excluded?.'; -ALTER TABLE `civicrm_mailing` CHANGE `visibility` `visibility` VARCHAR( 40 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT 'User and User Admin Only' COMMENT 'In what context(s) is the mailing contents visible (online viewing)'; -ALTER TABLE `civicrm_mailing_component` CHANGE `component_type` `component_type` VARCHAR( 12 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Type of Component.'; -ALTER TABLE `civicrm_mailing_bounce_type` CHANGE `name` `name` VARCHAR( 24 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT 'Type of bounce'; -ALTER TABLE `civicrm_participant_status_type` CHANGE `class` `class` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'the general group of status type this one belongs to'; -ALTER TABLE `civicrm_dedupe_rule_group` CHANGE `contact_type` `contact_type` VARCHAR( 12 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'The type of contacts this group applies to'; -ALTER TABLE `civicrm_dedupe_rule_group` CHANGE `used` `used` VARCHAR( 12 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT 'Whether the rule should be used for cases where usage is Unsupervised, Supervised OR General(programatically)'; -ALTER TABLE `civicrm_word_replacement` CHANGE `match_type` `match_type` VARCHAR( 16 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT 'wildcardMatch'; -ALTER TABLE `civicrm_uf_field` CHANGE `visibility` `visibility` VARCHAR( 32 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT 'User and User Admin Only' COMMENT 'In what context(s) is this field visible.'; -ALTER TABLE `civicrm_mapping_field` CHANGE `operator` `operator` VARCHAR( 16 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'SQL WHERE operator for search-builder mapping fields (search criteria).'; -ALTER TABLE `civicrm_job` CHANGE `run_frequency` `run_frequency` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT 'Daily' COMMENT 'Scheduled job run frequency.'; -ALTER TABLE `civicrm_extension` CHANGE `type` `type` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL; -ALTER TABLE `civicrm_custom_group` CHANGE `style` `style` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Visual relationship between this form and its parent.'; -ALTER TABLE `civicrm_custom_field` CHANGE `data_type` `data_type` VARCHAR( 16 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT 'Controls location of data storage in extended_data table.'; -ALTER TABLE `civicrm_custom_field` CHANGE `html_type` `html_type` VARCHAR( 32 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT 'HTML types plus several built-in extended types.'; -ALTER TABLE `civicrm_action_schedule` CHANGE `start_action_unit` `start_action_unit` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Time units for reminder.'; -ALTER TABLE `civicrm_action_schedule` CHANGE `repetition_frequency_unit` `repetition_frequency_unit` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Time units for repetition of reminder.'; -ALTER TABLE `civicrm_action_schedule` CHANGE `end_frequency_unit` `end_frequency_unit` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Time units till repetition of reminder.'; -ALTER TABLE `civicrm_product` CHANGE `period_type` `period_type` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT 'rolling' COMMENT 'Rolling means we set start/end based on current day, fixed means we set start/end for current year or month(e.g. 1 year + fixed -> we would set start/end for 1/1/06 thru 12/31/06 for any premium chosen in 2006) '; -ALTER TABLE `civicrm_product` CHANGE `duration_unit` `duration_unit` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT 'year'; -ALTER TABLE `civicrm_product` CHANGE `frequency_unit` `frequency_unit` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT 'month' COMMENT 'Frequency unit and interval allow option to store actual delivery frequency for a subscription or service.'; -ALTER TABLE `civicrm_contribution_recur` CHANGE `frequency_unit` `frequency_unit` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT 'month' COMMENT 'Time units for recurrence of payment.'; -ALTER TABLE `civicrm_subscription_history` CHANGE `method` `method` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'How the (un)subscription was triggered'; -ALTER TABLE `civicrm_subscription_history` CHANGE `status` `status` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'The state of the contact within the group'; -ALTER TABLE `civicrm_relationship_type` CHANGE `contact_type_a` `contact_type_a` VARCHAR( 12 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'If defined, contact_a in a relationship of this type must be a specific contact_type.'; -ALTER TABLE `civicrm_relationship_type` CHANGE `contact_type_b` `contact_type_b` VARCHAR( 12 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'If defined, contact_b in a relationship of this type must be a specific contact_type.'; -ALTER TABLE `civicrm_group_contact` CHANGE `status` `status` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'status of contact relative to membership in group'; -ALTER TABLE `civicrm_group` CHANGE `visibility` `visibility` VARCHAR( 24 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT 'User and User Admin Only' COMMENT 'In what context(s) is this field visible.'; -ALTER TABLE `civicrm_contact` CHANGE `preferred_mail_format` `preferred_mail_format` VARCHAR( 8 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT 'Both' COMMENT 'What is the preferred mode of sending an email.'; - --- CRM-14183 -INSERT IGNORE INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1157, "PL", "Plateau"); -UPDATE civicrm_state_province SET name = "Abuja Federal Capital Territory" WHERE name = "Abuja Capital Territory"; - --- CRM-13992 -ALTER TABLE `civicrm_custom_field` - ADD COLUMN `in_selector` tinyint(4) DEFAULT '0' COMMENT 'Should the multi-record custom field values be displayed in tab table listing'; -UPDATE civicrm_custom_field cf - LEFT JOIN civicrm_custom_group cg - ON cf.custom_group_id = cg.id - SET cf.in_selector = 1 - WHERE cg.is_multiple = 1 AND cf.html_type != 'TextArea'; -ALTER TABLE `civicrm_custom_group` - CHANGE COLUMN `style` `style` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Visual relationship between this form and its parent.'; - --- Add "developer" help menu -SELECT @parent_id := `id` FROM `civicrm_navigation` WHERE `name` = 'Help' 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}, NULL, '{ts escape="sql" skip="true"}Developer{/ts}', 'Developer', 'administer CiviCRM', '', @parent_id, '1', NULL, 5 ); - -SET @devellastID:=LAST_INSERT_ID(); -INSERT INTO civicrm_navigation -( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight ) -VALUES -( {$domainID}, 'civicrm/api', '{ts escape="sql" skip="true"}API Explorer{/ts}','API Explorer', 'administer CiviCRM', '', @devellastID, '1', NULL, 1 ), -( {$domainID}, 'http://wiki.civicrm.org/confluence/display/CRMDOC/Develop', '{ts escape="sql" skip="true"}Developer Docs{/ts}', 'Developer Docs', 'administer CiviCRM', '', @devellastID, '1', NULL, 3 ); - --- CRM-14435 -ALTER TABLE `civicrm_mail_settings` - ADD CONSTRAINT `FK_civicrm_mail_settings_domain_id` FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain` (`id`) ON DELETE CASCADE; - --- CRM-14436 -ALTER TABLE `civicrm_mailing` - ADD COLUMN `hash` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Key for validating requests related to this mailing.', - ADD INDEX `index_hash` (`hash`); - --- CRM-14300 -UPDATE `civicrm_event` SET is_template = 0 WHERE is_template IS NULL; -ALTER TABLE `civicrm_event` - CHANGE is_template is_template tinyint(4) DEFAULT '0' COMMENT 'whether the event has template'; - --- CRM-14493 -INSERT IGNORE INTO civicrm_state_province (country_id, abbreviation, name) VALUES (1085, "61", "Pieria"); - --- CRM-14445 -ALTER TABLE `civicrm_option_group` - ADD COLUMN `is_locked` int(1) DEFAULT 0 COMMENT 'A lock to remove the ability to add new options via the UI'; - -UPDATE `civicrm_option_group` SET is_locked = 1 WHERE name IN ('contribution_status','activity_contacts','advanced_search_options','auto_renew_options','contact_autocomplete_options','batch_status','batch_type','batch_mode','contact_edit_options','contact_reference_options','contact_smart_group_display','contact_view_options','financial_item_status','mapping_type','pcp_status','user_dashboard_options','tag_used_for'); - --- CRM-14449 -CREATE TABLE IF NOT EXISTS `civicrm_system_log` ( -`id` INT(11) NOT NULL AUTO_INCREMENT COMMENT 'Primary Key: ID.', -`message` VARCHAR(128) NOT NULL COMMENT 'Standardized message', -`context` LONGTEXT NULL COMMENT 'JSON encoded data', -`level` VARCHAR(9) NOT NULL DEFAULT 'info' COMMENT 'error level per PSR3', -`timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Timestamp of when event occurred.', -`contact_id` INT(11) NULL DEFAULT NULL COMMENT 'Optional Contact ID that created the log. Not an FK as we keep this regardless', - hostname VARCHAR(128) NOT NULL COMMENT 'Optional Name of logging host', -PRIMARY KEY (`id`), -INDEX `message` (`message`), -INDEX `contact_id` (`contact_id`), -INDEX `level` (`level`) -) -COMMENT='Table that contains logs of all system events.' -COLLATE='utf8_general_ci'; - --- CRM-14473 civicrm_case_type table creation and migration -CREATE TABLE IF NOT EXISTS `civicrm_case_type` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Autoincremented type id', - `name` varchar(64) COLLATE utf8_unicode_ci NOT NULL COMMENT 'Machine name for Case Type', - {localize field='title'}title varchar(64) COLLATE utf8_unicode_ci NOT NULL COMMENT 'Natural language name for Case Type'{/localize}, - {localize field='description'}description varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Description of the Case Type'{/localize}, - `is_active` tinyint(4) DEFAULT NULL COMMENT 'Is this entry active?', - `is_reserved` tinyint(4) DEFAULT NULL COMMENT 'Is this case type a predefined system type?', - `weight` int(11) NOT NULL DEFAULT '1' COMMENT 'Ordering of the case types', - `definition` blob COMMENT 'xml definition of case type', - PRIMARY KEY (`id`), - UNIQUE KEY `case_type_name` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1; - -SELECT @option_group_id_case_type := max(id) from civicrm_option_group where name = 'case_type'; - -INSERT IGNORE INTO civicrm_case_type - (id, name, {localize field='title'}title{/localize}, {localize field='description'}description{/localize}, is_active, is_reserved, weight) - SELECT - value, - name, - {localize field='label'}label{/localize}, - {localize field='description'}description{/localize}, - is_active, - is_reserved, - weight - FROM civicrm_option_value - WHERE - option_group_id = @option_group_id_case_type; - --- Remove the special character, earlier used as a separator and reference to civicrm_case_type.id -UPDATE civicrm_case SET case_type_id = replace(case_type_id, 0x01, ''); - -ALTER TABLE civicrm_case - MODIFY case_type_id int(10) unsigned COLLATE utf8_unicode_ci NULL COMMENT 'FK to civicrm_case_type.id', - ADD CONSTRAINT FK_civicrm_case_case_type_id FOREIGN KEY (case_type_id) REFERENCES civicrm_case_type (id) ON DELETE SET NULL; - --- CRM-15343 set the auto increment civicrm_case_type.id start point to max id to avoid conflict in future insertion -SELECT @max_case_type_id := max(id) from civicrm_case_type; -SET @query = CONCAT("ALTER TABLE civicrm_case_type AUTO_INCREMENT = ", IFNULL(@max_case_type_id,1)); -PREPARE alter_case_type_auto_inc FROM @query; -EXECUTE alter_case_type_auto_inc; -DEALLOCATE PREPARE alter_case_type_auto_inc; - -DELETE FROM civicrm_option_value WHERE option_group_id = @option_group_id_case_type; - -DELETE FROM civicrm_option_group WHERE id = @option_group_id_case_type; - --- CRM-14611 -{if $multilingual} - {foreach from=$locales item=locale} - ALTER TABLE civicrm_survey ADD title_{$locale} varchar(255); - UPDATE civicrm_survey SET title_{$locale} = title; - - ALTER TABLE civicrm_survey ADD instructions_{$locale} TEXT; - UPDATE civicrm_survey SET instructions_{$locale} = instructions; - {/foreach} - - ALTER TABLE civicrm_survey DROP title; - ALTER TABLE civicrm_survey DROP instructions; -{/if} - --- CRM-11182 -- Make event confirmation page optional - ALTER TABLE civicrm_event - ADD COLUMN is_confirm_enabled tinyint(4) DEFAULT '1'; - - UPDATE civicrm_event - SET is_confirm_enabled = 1 - WHERE is_monetary = 1; - - UPDATE civicrm_event - SET is_confirm_enabled = 0 - WHERE is_monetary = 0; - --- CRM-11182 -ALTER TABLE civicrm_event - ADD COLUMN dedupe_rule_group_id int(10) unsigned DEFAULT NULL COMMENT 'Rule to use when matching registrations for this event', - ADD CONSTRAINT `FK_civicrm_event_dedupe_rule_group_id` FOREIGN KEY (`dedupe_rule_group_id`) REFERENCES `civicrm_dedupe_rule_group` (`id`); - --- CRM-9288 -SELECT @option_web_id := id FROM civicrm_option_group WHERE name = 'website_type'; - -SELECT @website_default := value FROM civicrm_option_value WHERE option_group_id = @option_web_id and is_default = 1; - -SELECT @website_work := value FROM civicrm_option_value WHERE option_group_id = @option_web_id and name= 'Work'; - -UPDATE civicrm_option_value -SET is_default = 1 WHERE option_group_id = @option_web_id and value = IFNULL(@website_default , @website_work); - -SELECT @website_default := value FROM civicrm_option_value WHERE option_group_id = @option_web_id and is_default = 1; - -ALTER TABLE civicrm_uf_field - ADD COLUMN `website_type_id` int(10) unsigned DEFAULT NULL COMMENT 'Website Type Id, if required' AFTER phone_type_id, - ADD INDEX `IX_website_type_id` (`website_type_id`); - -UPDATE civicrm_uf_field -SET website_type_id = @website_default, -field_name = 'url' WHERE field_name LIKE 'url%'; - -SELECT @website_value := max(cast(value as UNSIGNED)) FROM civicrm_option_value WHERE option_group_id = @option_web_id; -SELECT @website_weight := max(weight) FROM civicrm_option_value WHERE option_group_id = @option_web_id; - -INSERT INTO civicrm_option_value(option_group_id, {localize field='label'}label{/localize}, name, value, weight) -SELECT @option_web_id, {localize}website{/localize}, website, (@website_value := @website_value + 1), (@website_weight := @website_weight + 1) FROM ( -SELECT 'Google+' AS website - UNION ALL -SELECT 'Instagram' AS website - UNION ALL -SELECT 'LinkedIn' AS website - UNION ALL -SELECT 'Pinterest' AS website - UNION ALL -SELECT 'Tumblr' AS website - UNION ALL -SELECT 'SnapChat' AS website - UNION ALL -SELECT 'Vine' AS website -) AS temp -LEFT JOIN civicrm_option_value co ON co.name = temp.website -AND option_group_id = @option_web_id -WHERE co.id IS NULL; - --- CRM-14627 civicrm navigation inconsistent -UPDATE civicrm_navigation -SET civicrm_navigation.url = CONCAT(SUBSTRING(url FROM 1 FOR LOCATE('&', url) - 1), '?', SUBSTRING(url FROM LOCATE('&', url) + 1)) -WHERE civicrm_navigation.url LIKE "%&%" AND civicrm_navigation.url NOT LIKE "%?%"; - --- CRM-14478 Add a "cleanup" policy for managed entities -ALTER TABLE `civicrm_managed` -ADD COLUMN `cleanup` varchar(32) COMMENT 'Policy on when to cleanup entity (always, never, unused)'; - --- CRM-14639 - -SELECT @option_grant_status := id FROM civicrm_option_group WHERE name = 'grant_status'; -UPDATE civicrm_option_value -SET -{if !$multilingual} - label = - CASE - WHEN lower(name) = 'granted' - THEN 'Paid' - WHEN lower(name) = 'approved' - THEN 'Eligible' - WHEN lower(name) = 'rejected' - THEN 'Ineligible' - ELSE 'Submitted' - END, -{else} - {foreach from=$locales item=locale} - label_{$locale} = - CASE - WHEN lower(name) = 'granted' - THEN 'Paid' - WHEN lower(name) = 'approved' - THEN 'Eligible' - WHEN lower(name) = 'rejected' - THEN 'Ineligible' - ELSE 'Submitted' - END, - {/foreach} -{/if} -name = -CASE - WHEN lower(name) = 'granted' - THEN 'Paid' - WHEN lower(name) = 'approved' - THEN 'Eligible' - WHEN lower(name) = 'rejected' - THEN 'Ineligible' - ELSE 'Submitted' -END -WHERE option_group_id = @option_grant_status and name IN ('granted', 'pending', 'approved', 'rejected'); - -SELECT @grant_value := max(cast(value as UNSIGNED)) FROM civicrm_option_value WHERE option_group_id = @option_grant_status; -SELECT @grant_weight := max(weight) FROM civicrm_option_value WHERE option_group_id = @option_grant_status; - -INSERT INTO civicrm_option_value(option_group_id, {localize field='label'}label{/localize}, name, value, weight) -SELECT @option_grant_status, {localize}grantstatus{/localize}, grantstatus, @grant_value := @grant_value + 1, @grant_weight := @grant_weight + 1 FROM ( -SELECT 'Submitted' AS grantstatus - UNION ALL -SELECT 'Approved for Payment' AS grantstatus - UNION ALL -SELECT 'Eligible' AS grantstatus - UNION ALL -SELECT 'Awaiting Information' AS grantstatus - UNION ALL -SELECT 'Withdrawn' AS grantstatus -) AS temp -LEFT JOIN civicrm_option_value co ON co.name = temp.grantstatus -AND option_group_id = @option_grant_status -WHERE co.id IS NULL; - --- Fix trailing single quote in grant status label -{if !$multilingual} - UPDATE civicrm_option_value v - INNER JOIN civicrm_option_group g - ON v.option_group_id = g.id AND g.name = 'grant_status' - SET label = 'Awaiting Information' - WHERE v.label = 'Awaiting Information\'' and v.name = 'Awaiting Information'; -{else} - UPDATE civicrm_option_value v - INNER JOIN civicrm_option_group g - ON v.option_group_id = g.id AND g.name = 'grant_status' - SET - {foreach from=$locales item=locale} - v.label_{$locale} = CASE - WHEN v.label_{$locale} = 'Awaiting Information\'' THEN 'Awaiting Information' - ELSE v.label_{$locale} - END, - {/foreach} - v.name = v.name - WHERE v.name = 'Awaiting Information'; -{/if} - --- CRM-14197 Add contribution_id to civicrm_line_item - -ALTER TABLE civicrm_line_item ADD contribution_id INT(10) unsigned COMMENT 'Contribution ID' NULL AFTER entity_id; - --- FK to civicrm_contribution - -ALTER TABLE civicrm_line_item -ADD CONSTRAINT `FK_civicrm_contribution_id` FOREIGN KEY (`contribution_id`) REFERENCES civicrm_contribution (`id`) ON DELETE SET NULL; - -ALTER TABLE `civicrm_line_item` -DROP INDEX `UI_line_item_value`, -ADD UNIQUE INDEX `UI_line_item_value` (`entity_table`, `entity_id`, `contribution_id`, `price_field_value_id`, `price_field_id`); - --- update case type menu -UPDATE civicrm_navigation set url = 'civicrm/a/#/caseType' WHERE url LIKE 'civicrm/admin/options/case_type%'; diff --git a/CRM/Upgrade/Incremental/sql/4.5.alpha2.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.alpha2.mysql.tpl deleted file mode 100644 index d315558c61..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.alpha2.mysql.tpl +++ /dev/null @@ -1,35 +0,0 @@ -UPDATE civicrm_dashboard - SET civicrm_dashboard.url = CONCAT(SUBSTRING(url FROM 1 FOR LOCATE('&', url) - 1), '?', SUBSTRING(url FROM LOCATE('&', url) + 1)) - WHERE civicrm_dashboard.url LIKE "%&%" AND civicrm_dashboard.url NOT LIKE "%?%"; - -UPDATE civicrm_dashboard - SET civicrm_dashboard.fullscreen_url = CONCAT(SUBSTRING(fullscreen_url FROM 1 FOR LOCATE('&', fullscreen_url) - 1), '?', SUBSTRING(fullscreen_url FROM LOCATE('&', fullscreen_url) + 1)) - WHERE civicrm_dashboard.fullscreen_url LIKE "%&%" AND civicrm_dashboard.fullscreen_url NOT LIKE "%?%"; - --- CRM-14843 Added States for Chile and Modify Santiago Metropolitan for consistency -INSERT IGNORE INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES - (NULL, 1044, "LR", "Los Rios"), - (NULL, 1044, "AP", "Arica y Parinacota"), - (NULL, 1169, "AMA", "Amazonas"); - -UPDATE civicrm_state_province - SET name = "Santiago Metropolitan", abbreviation = "SM" - WHERE name = "Region Metropolitana de Santiago" AND abbreviation = "RM"; - --- CRM-14879 contact fields for scheduled reminders -INSERT INTO civicrm_action_mapping - (entity, entity_value, entity_value_label, entity_status, entity_status_label, entity_date_start, entity_date_end, entity_recipient) - VALUES - ( 'civicrm_contact', 'civicrm_contact', 'Date Field', 'contact_date_reminder_options', 'Annual Options', 'date_field', NULL, NULL); - -INSERT INTO `civicrm_option_group` (`name`, {localize field='title'}`title`{/localize}, `is_reserved`, `is_active`, `is_locked`) - VALUES - ('contact_date_reminder_options', {localize}'{ts escape="sql"}Contact Date Reminder Options{/ts}'{/localize}, 1, 1, 1); - -SELECT @option_group_id_contactDateMode := max(id) from civicrm_option_group where name = 'contact_date_reminder_options'; - -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_contactDateMode, {localize}'{ts escape="sql"}Actual date only{/ts}'{/localize}, '1', 'Actual date only', NULL, NULL, 0, 1, 0, 1, 1, NULL, NULL), - (@option_group_id_contactDateMode, {localize}'{ts escape="sql"}Each anniversary{/ts}'{/localize}, '2', 'Each anniversary', NULL, NULL, 0, 2, 0, 1, 1, NULL, NULL); diff --git a/CRM/Upgrade/Incremental/sql/4.5.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.beta1.mysql.tpl deleted file mode 100644 index f1a4e4ba1c..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.beta1.mysql.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{* file to handle db changes in 4.5.beta1 during upgrade *} --- CRM-14807 -ALTER TABLE `civicrm_action_schedule` - ADD COLUMN `from_name` varchar(255) AFTER `absolute_date`; -ALTER TABLE `civicrm_action_schedule` - ADD COLUMN `from_email` varchar(255) AFTER `from_name`; diff --git a/CRM/Upgrade/Incremental/sql/4.5.beta2.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.beta2.mysql.tpl deleted file mode 100644 index 35218350a5..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.beta2.mysql.tpl +++ /dev/null @@ -1,13 +0,0 @@ -{* file to handle db changes in 4.5.beta2 during upgrade *} - -{include file='../CRM/Upgrade/4.5.beta2.msg_template/civicrm_msg_template.tpl'} - ---CRM-14948 To delete list of outdated Russian provinance -DELETE FROM `civicrm_state_province` WHERE `name` IN ('Komi-Permyatskiy avtonomnyy okrug','Taymyrskiy (Dolgano-Nenetskiy)','Evenkiyskiy avtonomnyy okrug','Koryakskiy avtonomnyy okrug','Ust\'-Ordynskiy Buryatskiy','Aginskiy Buryatskiy avtonomnyy'); - ---CRM-14948 To update new list of new Russian provinance -UPDATE `civicrm_state_province` SET `name`='Perm krai',`abbreviation`='PEK',`country_id`= 1177 WHERE `id` = 4270; - -UPDATE `civicrm_state_province` SET `name`='Kamchatka Krai',`country_id`= 1177 WHERE `id` = 4252; - -UPDATE `civicrm_state_province` SET `name`='Zabaykalsky Krai',`abbreviation`='ZSK',`country_id`= 1177 WHERE `id` = 4247; diff --git a/CRM/Upgrade/Incremental/sql/4.5.beta3.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.beta3.mysql.tpl deleted file mode 100644 index 27bd4bac6d..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.beta3.mysql.tpl +++ /dev/null @@ -1,4 +0,0 @@ -{* file to handle db changes in 4.5.beta3 during upgrade *} ---CRM-15009 -ALTER TABLE `civicrm_payment_processor` -CHANGE COLUMN `signature` `signature` LONGTEXT NULL DEFAULT NULL; diff --git a/CRM/Upgrade/Incremental/sql/4.5.beta4.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.beta4.mysql.tpl deleted file mode 100644 index a3f33a5978..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.beta4.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.5.beta4 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.5.beta5.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.beta5.mysql.tpl deleted file mode 100644 index ba5b8053fd..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.beta5.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.5.beta5 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.5.beta6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.beta6.mysql.tpl deleted file mode 100644 index 6d58233b9a..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.beta6.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.5.beta6 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.5.beta7.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.beta7.mysql.tpl deleted file mode 100644 index 15c91a5eb1..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.beta7.mysql.tpl +++ /dev/null @@ -1,2 +0,0 @@ -{* file to handle db changes in 4.5.beta7 during upgrade *} -UPDATE civicrm_contribution SET net_amount = total_amount - fee_amount WHERE net_amount = 0 OR net_amount IS NULL; diff --git a/CRM/Upgrade/Incremental/sql/4.5.beta8.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.beta8.mysql.tpl deleted file mode 100644 index de6aaf381e..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.beta8.mysql.tpl +++ /dev/null @@ -1,18 +0,0 @@ -{* file to handle db changes in 4.5.beta8 during upgrade *} - --- CRM-15143 Add Postal Code to contact reference and quick search options -SELECT @option_group_id_cao := max(id) from civicrm_option_group where name = 'contact_autocomplete_options'; -SELECT @option_val_id_cao_wt := MAX(weight) FROM civicrm_option_value WHERE option_group_id = @option_group_id_cao; -SELECT @option_val_id_cao_val := MAX(ROUND(value)) FROM civicrm_option_value WHERE option_group_id = @option_group_id_cao; -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_cao, {localize}'{ts escape="sql"}Postal Code{/ts}'{/localize}, @option_val_id_cao_val+1, 'postal_code', NULL, 0, NULL, @option_val_id_cao_wt+1, 0, 1, 1, NULL, NULL); - -SELECT @option_group_id_cro := max(id) from civicrm_option_group where name = 'contact_reference_options'; -SELECT @option_val_id_cro_wt := MAX(weight) FROM civicrm_option_value WHERE option_group_id = @option_group_id_cro; -SELECT @option_val_id_cro_val := MAX(ROUND(value)) FROM civicrm_option_value WHERE option_group_id = @option_group_id_cro; -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_cro, {localize}'{ts escape="sql"}Postal Code{/ts}'{/localize}, @option_val_id_cro_val+1, 'postal_code', NULL, 0, NULL, @option_val_id_cro_wt+1, 0, 1, 1, NULL, NULL); diff --git a/CRM/Upgrade/Incremental/sql/4.5.beta9.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.beta9.mysql.tpl deleted file mode 100644 index 8bfdb728ff..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.5.beta9.mysql.tpl +++ /dev/null @@ -1,36 +0,0 @@ -{* file to handle db changes in 4.5.beta9 during upgrade *} - --- CRM-15211 -UPDATE `civicrm_dashboard` SET `permission` = 'access my cases and activities,access all cases and activities', `permission_operator` = 'OR' WHERE `name` = 'casedashboard'; - --- CRM-15218 -UPDATE `civicrm_uf_group` SET name = LOWER(name) WHERE name IN ("New_Individual", "New_Organization", "New_Household"); - --- CRM-15220 -UPDATE `civicrm_navigation` SET url = 'civicrm/admin/options/grant_type?reset=1' WHERE url = 'civicrm/admin/options/grant_type&reset=1'; - -SELECT @parent_id := `id` FROM `civicrm_navigation` WHERE `name` = 'CiviGrant' 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/options/grant_status?reset=1', '{ts escape="sql" skip="true"}Grant Status{/ts}', 'Grant Status', 'access CiviGrant,administer CiviCRM', 'AND', @parent_id, '1', NULL, 2 ); - --- CRM-14853 -UPDATE civicrm_financial_trxn cft -INNER JOIN ( SELECT max(cft.id) trxn_id, ceft.entity_id contribution_id -FROM civicrm_financial_trxn cft -LEFT JOIN civicrm_entity_financial_trxn ceft ON ceft.financial_trxn_id = cft.id -WHERE ceft.entity_table = 'civicrm_contribution' -GROUP BY ceft.entity_id ) as temp ON temp.trxn_id = cft.id -INNER JOIN civicrm_contribution cc ON cc.id = temp.contribution_id -AND cc.payment_instrument_id <> cft.payment_instrument_id -SET cft.payment_instrument_id = cc.payment_instrument_id; - ---CRM-15086 -SELECT @option_group_id_batch_status := id FROM civicrm_option_group WHERE name = 'batch_status'; - -UPDATE civicrm_option_value SET name = 'Open' WHERE value = 1 AND option_group_id = @option_group_id_batch_status; -UPDATE civicrm_option_value SET name = 'Closed' WHERE value = 2 AND option_group_id = @option_group_id_batch_status; -UPDATE civicrm_option_value SET name = 'Data Entry' WHERE value = 3 AND option_group_id = @option_group_id_batch_status; -UPDATE civicrm_option_value SET name = 'Reopened' WHERE value = 4 AND option_group_id = @option_group_id_batch_status; -UPDATE civicrm_option_value SET name = 'Exported' WHERE value = 5 AND option_group_id = @option_group_id_batch_status; -- 2.25.1