From d9f8d639496206c9e2bd7d1a146dff77f87d7de9 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Fri, 10 Dec 2021 09:14:39 -0500 Subject: [PATCH] Bump minimum upgradable version to 4.6.12 --- .../civicrm_msg_template.tpl | 16 - .../contribution_online_receipt_html.tpl | 473 --------------- .../message_templates/test_preview_html.tpl | 10 - .../civicrm_msg_template.tpl | 16 - .../event_online_receipt_html.tpl | 518 ---------------- .../event_online_receipt_text.tpl | 305 ---------- .../civicrm_msg_template.tpl | 16 - .../contribution_invoice_receipt_html.tpl | 434 -------------- .../civicrm_msg_template.tpl | 57 -- .../contribution_invoice_receipt_html.tpl | 434 -------------- .../contribution_invoice_receipt_subject.tpl | 11 - .../contribution_invoice_receipt_text.tpl | 1 - .../contribution_offline_receipt_html.tpl | 319 ---------- .../contribution_offline_receipt_text.tpl | 118 ---- .../contribution_online_receipt_html.tpl | 473 --------------- .../contribution_online_receipt_text.tpl | 209 ------- .../event_offline_receipt_html.tpl | 526 ---------------- .../event_offline_receipt_text.tpl | 303 ---------- .../event_online_receipt_html.tpl | 506 ---------------- .../event_online_receipt_text.tpl | 301 ---------- .../membership_offline_receipt_html.tpl | 296 --------- .../membership_offline_receipt_text.tpl | 113 ---- .../membership_online_receipt_html.tpl | 565 ------------------ .../membership_online_receipt_text.tpl | 243 -------- .../civicrm_msg_template.tpl | 50 -- .../pcp_owner_notify_html.tpl | 27 - .../pcp_owner_notify_subject.tpl | 1 - .../pcp_owner_notify_text.tpl | 20 - CRM/Upgrade/Form.php | 2 +- CRM/Upgrade/Incremental/php/FourSix.php | 186 ------ CRM/Upgrade/Incremental/sql/4.4.7.mysql.tpl | 6 - CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl | 46 -- CRM/Upgrade/Incremental/sql/4.6.1.mysql.tpl | 1 - CRM/Upgrade/Incremental/sql/4.6.10.mysql.tpl | 13 - CRM/Upgrade/Incremental/sql/4.6.11.mysql.tpl | 1 - CRM/Upgrade/Incremental/sql/4.6.12.mysql.tpl | 13 - CRM/Upgrade/Incremental/sql/4.6.2.mysql.tpl | 1 - CRM/Upgrade/Incremental/sql/4.6.3.mysql.tpl | 73 --- CRM/Upgrade/Incremental/sql/4.6.4.mysql.tpl | 2 - CRM/Upgrade/Incremental/sql/4.6.5.mysql.tpl | 35 -- CRM/Upgrade/Incremental/sql/4.6.6.mysql.tpl | 11 - CRM/Upgrade/Incremental/sql/4.6.7.mysql.tpl | 5 - CRM/Upgrade/Incremental/sql/4.6.8.mysql.tpl | 1 - CRM/Upgrade/Incremental/sql/4.6.9.mysql.tpl | 59 -- .../Incremental/sql/4.6.alpha1.mysql.tpl | 155 ----- .../Incremental/sql/4.6.alpha2.mysql.tpl | 1 - .../Incremental/sql/4.6.alpha3.mysql.tpl | 126 ---- .../Incremental/sql/4.6.alpha4.mysql.tpl | 21 - .../Incremental/sql/4.6.alpha5.mysql.tpl | 5 - .../Incremental/sql/4.6.alpha6.mysql.tpl | 8 - .../Incremental/sql/4.6.alpha7.mysql.tpl | 25 - .../Incremental/sql/4.6.beta1.mysql.tpl | 99 --- .../Incremental/sql/4.6.beta2.mysql.tpl | 8 - .../Incremental/sql/4.6.beta3.mysql.tpl | 27 - .../Incremental/sql/4.6.beta4.mysql.tpl | 10 - .../Incremental/sql/4.6.beta5.mysql.tpl | 1 - 56 files changed, 1 insertion(+), 7301 deletions(-) delete mode 100644 CRM/Upgrade/4.6.10.msg_template/civicrm_msg_template.tpl delete mode 100644 CRM/Upgrade/4.6.10.msg_template/message_templates/contribution_online_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.6.10.msg_template/message_templates/test_preview_html.tpl delete mode 100644 CRM/Upgrade/4.6.3.msg_template/civicrm_msg_template.tpl delete mode 100644 CRM/Upgrade/4.6.3.msg_template/message_templates/event_online_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.6.3.msg_template/message_templates/event_online_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.6.9.msg_template/civicrm_msg_template.tpl delete mode 100644 CRM/Upgrade/4.6.9.msg_template/message_templates/contribution_invoice_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.6.alpha1.msg_template/civicrm_msg_template.tpl delete mode 100644 CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_subject.tpl delete mode 100644 CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_offline_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_offline_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_online_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_online_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_offline_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_offline_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_online_receipt_html.tpl delete mode 100644 CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_online_receipt_text.tpl delete mode 100644 CRM/Upgrade/4.6.alpha4.msg_template/civicrm_msg_template.tpl delete mode 100644 CRM/Upgrade/4.6.alpha4.msg_template/message_templates/pcp_owner_notify_html.tpl delete mode 100644 CRM/Upgrade/4.6.alpha4.msg_template/message_templates/pcp_owner_notify_subject.tpl delete mode 100644 CRM/Upgrade/4.6.alpha4.msg_template/message_templates/pcp_owner_notify_text.tpl delete mode 100644 CRM/Upgrade/Incremental/php/FourSix.php delete mode 100644 CRM/Upgrade/Incremental/sql/4.4.7.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.1.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.10.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.11.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.12.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.2.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.3.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.4.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.5.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.6.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.7.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.8.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.9.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.alpha2.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.alpha3.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.alpha4.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.alpha5.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.alpha7.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.beta1.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.beta2.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.beta3.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.beta4.mysql.tpl delete mode 100644 CRM/Upgrade/Incremental/sql/4.6.beta5.mysql.tpl diff --git a/CRM/Upgrade/4.6.10.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.6.10.msg_template/civicrm_msg_template.tpl deleted file mode 100644 index 8eb3dd9948..0000000000 --- a/CRM/Upgrade/4.6.10.msg_template/civicrm_msg_template.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{php} - $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.6.10.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.6.10.msg_template/message_templates/contribution_online_receipt_html.tpl b/CRM/Upgrade/4.6.10.msg_template/message_templates/contribution_online_receipt_html.tpl deleted file mode 100644 index ec976ed0e5..0000000000 --- a/CRM/Upgrade/4.6.10.msg_template/message_templates/contribution_online_receipt_html.tpl +++ /dev/null @@ -1,473 +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} - {if $dataArray} - - - - - - {foreach from=$dataArray item=value key=priceset} - - {if $priceset || $priceset == 0} - - - {else} - - - {/if} - - {/foreach} - - {/if} - {if $totalTaxAmount} - - - - - {/if} - - - - - - {else} - - {if $totalTaxAmount} - - - - - {/if} - - - - - - {/if} - - {/if} - - - {if $receive_date} - - - - - {/if} - - {if $is_monetary and $trxn_id} - - - - - {/if} - - {if $is_recur} - {if $contributeMode eq 'notify' or $contributeMode eq 'directIPN'} - - - {if $updateSubscriptionBillingUrl} - - - - {/if} - - - - - {/if} - {/if} - - {if $honor_block_is_active} - - - - {foreach from=$honoreeProfile item=value key=label} - - - - - {/foreach} - {elseif $softCreditTypes and $softCredits} - {foreach from=$softCreditTypes item=softCreditType key=n} - - - - {foreach from=$softCredits.$n item=value key=label} - - - - - {/foreach} - {/foreach} - {/if} - - {if $pcpBlock} - - - - - - - - {if $pcp_roll_nickname} - - - - - {/if} - {if $pcp_personal_note} - - - - - {/if} - {/if} - - {if $onBehalfProfile} - - - - {foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName} - - - - - {/foreach} - {/if} - - {if $isShare} - - - - {/if} - - {if ! ($contributeMode eq 'notify' OR $contributeMode eq 'directIPN') and $is_monetary} - {if $is_pay_later && !$isBillingAddressRequiredForPayLater} - - - - - - - {elseif $amount GT 0} - - - - - - - {/if} - {/if} - - {if $contributeMode eq 'direct' AND !$is_pay_later AND $amount GT 0} - - - - - - - {/if} - - {if $selectPremium} - - - - - - - {if $option} - - - - - {/if} - {if $sku} - - - - - {/if} - {if $start_date} - - - - - {/if} - {if $end_date} - - - - - {/if} - {if $contact_email OR $contact_phone} - - - - {/if} - {if $is_deductible AND $price} - - - - {/if} - {/if} - - {if $customPre} - - - - {foreach from=$customPre item=customValue key=customName} - {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields} - - - - - {/if} - {/foreach} - {/if} - - {if $customPost} - - - - {foreach from=$customPost item=customValue key=customName} - {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields} - - - - - {/if} - {/foreach} - {/if} - -
- {ts}Contribution Information{/ts} -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - {if $dataArray} - - - - {/if} - - - {foreach from=$value item=line} - - - - - {if $getTaxDetails} - - {if $line.tax_rate != "" || $line.tax_amount != ""} - - - {else} - - - {/if} - {/if} - - - {/foreach} -
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/ts}{ts}Subtotal{/ts}{ts}Tax Rate{/ts}{ts}Tax Amount{/ts}{ts}Total{/ts}
- {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} - 		- {$line.qty} - - {$line.unit_price|crmMoney:$currency} - - {$line.unit_price*$line.qty|crmMoney:$currency} - - {$line.tax_rate|string_format:"%.2f"}% - - {$line.tax_amount|crmMoney:$currency} - - {$line.line_total+$line.tax_amount|crmMoney:$currency} -
-
- {ts} Amount before Tax : {/ts} - - {$amount-$totalTaxAmount|crmMoney:$currency} -
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}No{/ts} {$taxTerm} {$value|crmMoney:$currency}
- {ts}Total Tax{/ts} - - {$totalTaxAmount|crmMoney:$currency} -
- {ts}Total Amount{/ts} - - {$amount|crmMoney:$currency} -
- {ts}Total Tax Amount{/ts} - - {$totalTaxAmount|crmMoney:$currency} -
- {ts}Amount{/ts} - - {$amount|crmMoney:$currency} {if $amount_level} - {$amount_level}{/if} -
- {ts}Date{/ts} - - {$receive_date|crmDate} -
- {ts}Transaction #{/ts} - - {$trxn_id} -
- {ts 1=$cancelSubscriptionUrl}This is a recurring contribution. You can cancel future contributions by visiting this web page.{/ts} -
- {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by visiting this web page.{/ts} -
- {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments for this recurring contribution by visiting this web page.{/ts} -
- {$soft_credit_type} -
- {$label} - - {$value} -
- {$softCreditType} -
- {$label} - - {$value} -
- {ts}Personal Campaign Page{/ts} -
- {ts}Display In Honor Roll{/ts} - - {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if} -
- {ts}Nickname{/ts} - - {$pcp_roll_nickname} -
- {ts}Personal Note{/ts} - - {$pcp_personal_note} -
- {$onBehalfProfile_grouptitle} -
- {$onBehalfName} - - {$onBehalfValue} -
- {capture assign=contributionUrl}{crmURL p='civicrm/contribute/transact' q="reset=1&id=`$contributionPageId`" a=true fe=1 h=1}{/capture} - {include file="CRM/common/SocialNetwork.tpl" emailMode=true url=$contributionUrl title=$title pageURL=$contributionUrl} -
- {ts}Registered Email{/ts} -
- {$email} -
- {ts}Billing Name and Address{/ts} -
- {$billingName}
- {$address|nl2br}
- {$email} -
- {ts}Credit Card Information{/ts} -
- {$credit_card_type}
- {$credit_card_number}
- {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
-
- {ts}Premium Information{/ts} -
- {$product_name} -
- {ts}Option{/ts} - - {$option} -
- {ts}SKU{/ts} - - {$sku} -
- {ts}Start Date{/ts} - - {$start_date|crmDate} -
- {ts}End Date{/ts} - - {$end_date|crmDate} -
-

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

- {if $contact_email} -

{$contact_email}

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

{$contact_phone}

- {/if} -
-

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

-
- {$customPre_grouptitle} -
- {$customName} - - {$customValue} -
- {$customPost_grouptitle} -
- {$customName} - - {$customValue} -
-
- - - diff --git a/CRM/Upgrade/4.6.10.msg_template/message_templates/test_preview_html.tpl b/CRM/Upgrade/4.6.10.msg_template/message_templates/test_preview_html.tpl deleted file mode 100644 index 131da32e6e..0000000000 --- a/CRM/Upgrade/4.6.10.msg_template/message_templates/test_preview_html.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- - - - -
-

{ts}Test-drive Email / Receipt{/ts}

-

{ts}This is a test-drive email. No live financial transaction has occurred.{/ts}

-
-
diff --git a/CRM/Upgrade/4.6.3.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.6.3.msg_template/civicrm_msg_template.tpl deleted file mode 100644 index 91e09550f9..0000000000 --- a/CRM/Upgrade/4.6.3.msg_template/civicrm_msg_template.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{php} - $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.6.3.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.6.3.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.6.3.msg_template/message_templates/event_online_receipt_html.tpl deleted file mode 100644 index 4de01793ed..0000000000 --- a/CRM/Upgrade/4.6.3.msg_template/message_templates/event_online_receipt_html.tpl +++ /dev/null @@ -1,518 +0,0 @@ - - - - - - - - -{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} -{capture assign=tdfirstStyle}style="width: 180px; padding-bottom: 15px;"{/capture} -{capture assign=tdStyle}style="width: 100px;"{/capture} -{capture assign=participantTotal}style="margin: 0.5em 0 0.5em;padding: 0.5em;background-color: #999999;font-weight: bold;color: #FAFAFA;border-radius: 2px;"{/capture} - - -
- - - - - - - - - - - - - - -
-

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 $dataArray} - - - - - {foreach from=$dataArray item=value key=priceset} - - {if $priceset || $priceset == 0} - - - {else} - - - {/if} - - {/foreach} - {/if} - {/if} - - {if $amounts && !$lineItem} - {foreach from=$amounts item=amnt key=level} - - - - {/foreach} - {/if} - - {if $totalTaxAmount} - - - - - {/if} - {if $isPrimary} - - - - - {if $pricesetFieldsCount } - - - - {/if} - - {if $register_date} - - - - - {/if} - - {if $receive_date} - - - - - {/if} - - {if $contributionTypeName} - - - - - {/if} - - {if $trxn_id} - - - - - {/if} - - {if $paidBy} - - - - - {/if} - - {if $checkNumber} - - - - - {/if} - - {if $contributeMode ne 'notify' and !$isAmountzero and (!$is_pay_later or $isBillingAddressRequiredForPayLater) and !$isOnWaitlist and !$isRequireApproval} - - - - - - - {/if} - - {if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} - - - - - - - {/if} - - {/if} - - {/if} {* End of conditional section for Paid events *} - - -{if $customPre} -{foreach from=$customPre item=customPr key=i} - - {foreach from=$customPr item=customValue key=customName} - {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - - - - - {/if} - {/foreach} -{/foreach} -{/if} - -{if $customPost} -{foreach from=$customPost item=customPos key=j} - - {foreach from=$customPos item=customValue key=customName} - {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - - - - -{/if} -{/foreach} -{/foreach} -{/if} - -{if $customProfile} -{foreach from=$customProfile.profile item=eachParticipant key=participantID} - - {foreach from=$eachParticipant item=eachProfile key=pid} - - {foreach from=$eachProfile item=val key=field} - {foreach from=$val item=v key=f} - - - {/foreach} - - {/foreach} -{/foreach} -{/foreach} -{/if} - - {if $customGroup} - {foreach from=$customGroup item=value key=customName} - - - - {foreach from=$value item=v key=n} - - - - - {/foreach} - {/foreach} - {/if} - -
- {ts}Event Information and Location{/ts} -
- {$event.event_title}
- {$event.event_start_date|date_format:"%A"} {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|date_format:"%A"} {$event.event_end_date|crmDate}{/if}{/if} -
- {ts}Your schedule:{/ts} -
- {assign var='group_by_day' value='NA'} - {foreach from=$conference_sessions item=session} - {if $session.start_date|date_format:"%Y/%m/%d" != $group_by_day|date_format:"%Y/%m/%d"} - {assign var='group_by_day' value=$session.start_date} - {$group_by_day|date_format:"%m/%d/%Y"}
- {/if} - {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}
- {if $session.location}    {$session.location}
{/if} - {/foreach} -
- {ts}Participant Role{/ts} - - {$event.participant_role} -
- {if $location.address.1.name} - {$location.address.1.name}
- {/if} - {if $location.address.1.street_address} - {$location.address.1.street_address}
- {/if} - {if $location.address.1.supplemental_address_1} - {$location.address.1.supplemental_address_1}
- {/if} - {if $location.address.1.supplemental_address_2} - {$location.address.1.supplemental_address_2}
- {/if} - {if $location.address.1.city} - {$location.address.1.city}, {$location.address.1.state_province} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if}
- {/if} -
- {ts}Event Contacts:{/ts} -
- {if $phone.phone_type} - {$phone.phone_type_display} - {else} - {ts}Phone{/ts} - {/if} - - {$phone.phone} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if} -
- {ts}Email{/ts} - - {$eventEmail.email} -
- {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} - {ts}Download iCalendar File{/ts} -
- {capture assign=eventUrl}{crmURL p='civicrm/event/info' q="id=`$event.id`&reset=1" a=true fe=1 h=1}{/capture} - {include file="CRM/common/SocialNetwork.tpl" emailMode=true url=$eventUrl title=$event.title pageURL=$eventUrl} -
- {ts}You were registered by:{/ts} -
- {$payer.name} -
- {$event.fee_label} -
- {ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info} -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - {if $dataArray} - - - - {/if} - - {if $pricesetFieldsCount }{/if} - - {foreach from=$value item=line} - - - - - {if $dataArray} - - {if $line.tax_rate != "" || $line.tax_amount != ""} - - - {else} - - - {/if} - {/if} - - {if $pricesetFieldsCount } {/if} - - {/foreach} - {if $individual} - - - - - - - {/if} -
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/ts}{ts}SubTotal{/ts}{ts}Tax Rate{/ts}{ts}Tax Amount{/ts}{ts}Total{/ts}{ts}Total Participants{/ts}
- {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} - 		- {$line.qty} - - {$line.unit_price|crmMoney:$currency} - - {$line.unit_price*$line.qty|crmMoney} - - {$line.tax_rate|string_format:"%.2f"}% - - {$line.tax_amount|crmMoney} - - {$line.line_total+$line.tax_amount|crmMoney:$currency} - {$line.participant_count}
{ts}Participant Total{/ts}{$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney}{$individual.$priceset.totalTaxAmt|crmMoney}{$individual.$priceset.totalAmtWithTax|crmMoney}
-
- {ts} Amount Before Tax: {/ts} - - {$totalAmount-$totalTaxAmount|crmMoney} -
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}No{/ts} {$taxTerm} {$value|crmMoney:$currency}
- {$amnt.amount|crmMoney:$currency} {$amnt.label} -
- {ts}Total Tax Amount{/ts} - - {$totalTaxAmount|crmMoney:$currency} -
- {ts}Total Amount{/ts} - - {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if} -
- {ts}Total Participants{/ts} - {assign var="count" value= 0} - {foreach from=$lineItem item=pcount} - {assign var="lineItemCount" value=0} - {if $pcount neq 'skip'} - {foreach from=$pcount item=p_count} - {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} - {/foreach} - {if $lineItemCount < 1 } - {assign var="lineItemCount" value=1} - {/if} - {assign var="count" value=$count+$lineItemCount} - {/if} - {/foreach} - {$count} -
- {ts}Registration Date{/ts} - - {$register_date|crmDate} -
- {ts}Transaction Date{/ts} - - {$receive_date|crmDate} -
- {ts}Financial Type{/ts} - - {$contributionTypeName} -
- {ts}Transaction #{/ts} - - {$trxn_id} -
- {ts}Paid By{/ts} - - {$paidBy} -
- {ts}Check Number{/ts} - - {$checkNumber} -
- {ts}Billing Name and Address{/ts} -
- {$billingName}
- {$address|nl2br} -
- {ts}Credit Card Information{/ts} -
- {$credit_card_type}
- {$credit_card_number}
- {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} -
{$customPre_grouptitle.$i}
{$customName}{$customValue}
{$customPost_grouptitle.$j}
{$customName}{$customValue}
{ts 1=$participantID+2}Participant %1{/ts}
{$customProfile.title.$pid}
{$field}{$v}
- {$customName} -
- {$n} - - {$v} -
-
-
- - - diff --git a/CRM/Upgrade/4.6.3.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.6.3.msg_template/message_templates/event_online_receipt_text.tpl deleted file mode 100644 index e6b33f79b9..0000000000 --- a/CRM/Upgrade/4.6.3.msg_template/message_templates/event_online_receipt_text.tpl +++ /dev/null @@ -1,305 +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} -{if $dataArray} -{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture} -{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture} -{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture} -{/if} -{capture assign=ts_total}{ts}Total{/ts}{/capture} -{if $pricesetFieldsCount }{capture assign=ts_participant_total}{ts}Total Participants{/ts}{/capture}{/if} -{$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {if $dataArray} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {/if} {$ts_total|string_format:"%10s"} {$ts_participant_total|string_format:"%10s"} ------------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if} - -{foreach from=$value item=line} -{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if} -{capture assign=ts_item}{if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:"..."|string_format:"%-30s"} {$line.qty|string_format:"%5s"} {$line.unit_price|crmMoney:$currency|string_format:"%10s"} {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:"%10s"} {if $line.tax_rate != "" || $line.tax_amount != ""} {$line.tax_rate|string_format:"%.2f"} % {$line.tax_amount|crmMoney:$currency|string_format:"%10s"} {else} {/if} {/if} {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:"%10s"}{$ts_participant_count|string_format:"%10s"} -{/foreach} ----------------------------------------------------------------------------------------------------------------- -{if $individual}{ts}Participant Total{/ts} {$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:"%29s"} {$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:"%33s"} {$individual.$priceset.totalAmtWithTax|crmMoney:$currency|string_format:"%12s"}{/if} -{/if} -{""|string_format:"%120s"} -{/foreach} -{""|string_format:"%120s"} - -{if $dataArray} -{ts}Amount before Tax{/ts}: {$totalAmount-$totalTaxAmount|crmMoney:$currency} - -{foreach from=$dataArray item=value key=priceset} -{if $priceset || $priceset == 0} -{$taxTerm} {$priceset|string_format:"%.2f"}%: {$value|crmMoney:$currency} -{else} -{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency} -{/if} -{/foreach} -{/if} -{/if} - -{if $amounts && !$lineItem} -{foreach from=$amounts item=amnt key=level}{$amnt.amount|crmMoney:$currency} {$amnt.label} -{/foreach} -{/if} - -{if $totalTaxAmount} -{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency} -{/if} -{if $isPrimary } - -{ts}Total Amount{/ts}: {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if} - -{if $pricesetFieldsCount } - {assign var="count" value= 0} - {foreach from=$lineItem item=pcount} - {assign var="lineItemCount" value=0} - {if $pcount neq 'skip'} - {foreach from=$pcount item=p_count} - {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} - {/foreach} - {if $lineItemCount < 1 } - {assign var="lineItemCount" value=1} - {/if} - {assign var="count" value=$count+$lineItemCount} - {/if} - {/foreach} - -{ts}Total Participants{/ts}: {$count} -{/if} - -{if $register_date} -{ts}Registration Date{/ts}: {$register_date|crmDate} -{/if} -{if $receive_date} -{ts}Transaction Date{/ts}: {$receive_date|crmDate} -{/if} -{if $contributionTypeName} -{ts}Financial Type{/ts}: {$contributionTypeName} -{/if} -{if $trxn_id} -{ts}Transaction #{/ts}: {$trxn_id} -{/if} -{if $paidBy} -{ts}Paid By{/ts}: {$paidBy} -{/if} -{if $checkNumber} -{ts}Check Number{/ts}: {$checkNumber} -{/if} -{if $contributeMode ne 'notify' and !$isAmountzero and (!$is_pay_later or $isBillingAddressRequiredForPayLater) and !$isOnWaitlist and !$isRequireApproval} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Billing Name and Address{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$billingName} -{$address} -{/if} - -{if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Credit Card Information{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$credit_card_type} -{$credit_card_number} -{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} -{/if} -{/if} -{/if} {* End of conditional section for Paid events *} - -{if $customPre} -{foreach from=$customPre item=customPr key=i} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$customPre_grouptitle.$i} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$customPr item=customValue key=customName} -{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - {$customName}: {$customValue} -{/if} -{/foreach} -{/foreach} -{/if} - -{if $customPost} -{foreach from=$customPost item=customPos key=j} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$customPost_grouptitle.$j} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$customPos item=customValue key=customName} -{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - {$customName}: {$customValue} -{/if} -{/foreach} -{/foreach} -{/if} -{if $customProfile} - -{foreach from=$customProfile.profile item=eachParticipant key=participantID} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts 1=$participantID+2}Participant Information - Participant %1{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$eachParticipant item=eachProfile key=pid} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{$customProfile.title.$pid} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{foreach from=$eachProfile item=val key=field} -{foreach from=$val item=v key=f} -{$field}: {$v} -{/foreach} -{/foreach} -{/foreach} -{/foreach} -{/if} -{if $customGroup} -{foreach from=$customGroup item=value key=customName} -=========================================================={if $pricesetFieldsCount }===================={/if} - -{$customName} -=========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$value item=v key=n} -{$n}: {$v} -{/foreach} -{/foreach} -{/if} diff --git a/CRM/Upgrade/4.6.9.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.6.9.msg_template/civicrm_msg_template.tpl deleted file mode 100644 index afe8784f36..0000000000 --- a/CRM/Upgrade/4.6.9.msg_template/civicrm_msg_template.tpl +++ /dev/null @@ -1,16 +0,0 @@ -{php} - $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.6.9.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.6.9.msg_template/message_templates/contribution_invoice_receipt_html.tpl b/CRM/Upgrade/4.6.9.msg_template/message_templates/contribution_invoice_receipt_html.tpl deleted file mode 100644 index 0274f093e9..0000000000 --- a/CRM/Upgrade/4.6.9.msg_template/message_templates/contribution_invoice_receipt_html.tpl +++ /dev/null @@ -1,434 +0,0 @@ - - - - - - - - - - - -
-
- - - - - - - - - {if $organization_name} - - {else} - - {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
INVOICEInvoice Date:{$domain_organization}
{$display_name} ({$organization_name}){$display_name}{$invoice_date} - {if $domain_street_address } - {$domain_street_address} - {/if} - {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}
{$street_address} {$supplemental_address_1}Invoice Number:{if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if} - {if $domain_state }{$domain_state}{/if}
{$supplemental_address_2} {$stateProvinceAbbreviation}{$invoice_id}{if $domain_city} - {$domain_city} - {/if} - {if $domain_postal_code } - {$domain_postal_code} - {/if} -
{$city} {$postal_code}Reference: {if $domain_country} - {$domain_country} - {/if}
{$source} {if $domain_phone}{$domain_phone}{/if}
{if $domain_email} - {$domain_email} - {/if}
- - - - -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - - - - {foreach from=$lineItem item=value key=priceset name=taxpricevalue} - {if $smarty.foreach.taxpricevalue.index eq 0} - - {else} - - {/if} - - - - - {if $value.tax_amount != ''} - - {else} - - {/if} - - - {/foreach} - - - - - - - {foreach from = $dataArray item = value key = priceset} - - - {if $priceset} - - - {elseif $priceset == 0} - - - - {/if} - {/foreach} - - - - - - - - - - - - {if $is_pay_later == 0} - - - - - - - - - - - - - - - {/if} -


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

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

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


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

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

 - - - - - - - - - - - - - - - - - -
Customer: {$display_name}
Credit Note#: {$creditnote_id}
Credit Amount:{$amount|crmMoney:$currency}
-
- {/if} -
- - diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/civicrm_msg_template.tpl deleted file mode 100644 index e68f1f339a..0000000000 --- a/CRM/Upgrade/4.6.alpha1.msg_template/civicrm_msg_template.tpl +++ /dev/null @@ -1,57 +0,0 @@ -{php} - $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.6.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( - 'contribution_invoice_receipt' => ts('Contribution Invoice Receipt', 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.6.alpha1.msg_template/message_templates/`$vName`_subject.tpl"} - {fetch assign=text file="`$smarty.const.SMARTY_DIR`/../../CRM/Upgrade/4.6.alpha1.msg_template/message_templates/`$vName`_text.tpl"} - {fetch assign=html file="`$smarty.const.SMARTY_DIR`/../../CRM/Upgrade/4.6.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.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl deleted file mode 100644 index e51ffe6bcb..0000000000 --- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl +++ /dev/null @@ -1,434 +0,0 @@ - - - - - - - - - - - -
-
- - - - - - - - - {if $organization_name} - - {else} - - {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
INVOICEInvoice Date:{$domain_organization}
{$display_name} ({$organization_name}){$display_name}{$invoice_date} - {if $domain_street_address } - {$domain_street_address} - {/if} - {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}
{$street_address} {$supplemental_address_1}Invoice Number:{if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if} - {if $domain_state }{$domain_state}{/if}
{$supplemental_address_2} {$stateProvinceAbbreviation}{$invoice_id}{if $domain_city} - {$domain_city} - {/if} - {if $domain_postal_code } - {$domain_postal_code} - {/if} -
{$city} {$postal_code}Reference: {if $domain_country} - {$domain_country} - {/if}
{$source} {if $domain_phone}{$domain_phone}{/if}
{if $domain_email} - {$domain_email} - {/if}
- - - - -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - - - - {foreach from=$lineItem item=value key=priceset name=taxpricevalue} - {if $smarty.foreach.taxpricevalue.index eq 0} - - {else} - - {/if} - - - - - {if $value.tax_amount != ''} - - {else} - - {/if} - - - {/foreach} - - - - - - - {foreach from = $dataArray item = value key = priceset} - - - {if $priceset} - - - {elseif $priceset == 0} - - - - {/if} - {/foreach} - - - - - - - - - - - - {if $is_pay_later == 0} - - - - - - - - - - - - - - - {/if} -


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

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

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


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

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

 - - - - - - - - - - - - - - - - - -
Customer: {$display_name}
Credit Note#: {$creditnote_id}
Credit Amount:{$amount|crmMoney:$currency}
-
- {/if} -
- - diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_subject.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_subject.tpl deleted file mode 100644 index f99fe44750..0000000000 --- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_subject.tpl +++ /dev/null @@ -1,11 +0,0 @@ -{if $title} - {if $component} - {if $component == 'event'} - {ts 1=$title}Event Registration Invoice: %1{/ts} - {else} - {ts 1=$title}Contribution Invoice: %1{/ts} - {/if} - {/if} -{else} - {ts}Invoice{/ts} -{/if} diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_text.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_text.tpl deleted file mode 100644 index 37e2edf09d..0000000000 --- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_text.tpl +++ /dev/null @@ -1 +0,0 @@ -{ts}Contribution Invoice{/ts} diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_offline_receipt_html.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_offline_receipt_html.tpl deleted file mode 100644 index af1145a26e..0000000000 --- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_offline_receipt_html.tpl +++ /dev/null @@ -1,319 +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 $getTaxDetails && $dataArray} - - - - - - {foreach from=$dataArray item=value key=priceset} - - {if $priceset || $priceset == 0 || $value != ''} - - - {else} - - - {/if} - - {/foreach} - {/if} - - {if isset($totalTaxAmount) && $totalTaxAmount !== 'null'} - - - - - {/if} - - - - - - - {if $receive_date} - - - - - {/if} - - {if $receipt_date} - - - - - {/if} - - {if $formValues.paidBy and !$formValues.hidden_CreditCard} - - - - - {if $formValues.check_number} - - - - - {/if} - {/if} - - {if $formValues.trxn_id} - - - - - {/if} - - {if $ccContribution} - - - - - - - - - - - - - {/if} - - {if $softCreditTypes and $softCredits} - {foreach from=$softCreditTypes item=softCreditType key=n} - - - - {foreach from=$softCredits.$n item=value key=label} - - - - - {/foreach} - {/foreach} - {/if} - - {if $customGroup} - {foreach from=$customGroup item=value key=customName} - - - - {foreach from=$value item=v key=n} - - - - - {/foreach} - {/foreach} - {/if} - - {if $formValues.product_name} - - - - - - - {if $formValues.product_option} - - - - - {/if} - {if $formValues.product_sku} - - - - - {/if} - {if $fulfilled_date} - - - - - {/if} - {/if} - -
- {ts}Contribution Information{/ts} -
- {ts}Financial Type{/ts} - - {$formValues.contributionType_name} -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - {if $getTaxDetails} - - - - {/if} - - - {foreach from=$value item=line} - - - - - {if $getTaxDetails} - - {if $line.tax_rate != "" || $line.tax_amount != ""} - - - {else} - - - {/if} - {/if} - - - {/foreach} -
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/ts}{ts}Subtotal{/ts}{ts}Tax Rate{/ts}{ts}Tax Amount{/ts}{ts}Total{/ts}
- {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} - 		- {$line.qty} - - {$line.unit_price|crmMoney:$currency} - - {$line.unit_price*$line.qty|crmMoney:$currency} - - {$line.tax_rate|string_format:"%.2f"}% - - {$line.tax_amount|crmMoney:$currency} - - {$line.line_total+$line.tax_amount|crmMoney:$currency} -
-
- {ts} Amount before Tax : {/ts} - - {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency} -
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}No{/ts} {$taxTerm} {$value|crmMoney:$currency}
- {ts}Total Tax Amount{/ts} - - {$totalTaxAmount|crmMoney:$currency} -
- {ts}Total Amount{/ts} - - {$formValues.total_amount|crmMoney:$currency} -
- {ts}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.6.alpha1.msg_template/message_templates/contribution_offline_receipt_text.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_offline_receipt_text.tpl deleted file mode 100644 index cb3547a089..0000000000 --- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_offline_receipt_text.tpl +++ /dev/null @@ -1,118 +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} -{if $getTaxDetails} -{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture} -{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture} -{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture} -{/if} -{capture assign=ts_total}{ts}Total{/ts}{/capture} -{$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {if $getTaxDetails} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate} {$ts_taxAmount|string_format:"%10s"} {/if} {$ts_total|string_format:"%10s"} ----------------------------------------------------------- -{foreach from=$value item=line} -{capture assign=ts_item}{if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:"..."|string_format:"%-30s"} {$line.qty|string_format:"%5s"} {$line.unit_price|crmMoney:$currency|string_format:"%10s"} {if $getTaxDetails}{$line.unit_price*$line.qty|crmMoney:$currency|string_format:"%10s"} {if $line.tax_rate != "" || $line.tax_amount != ""} {$line.tax_rate|string_format:"%.2f"} % {$line.tax_amount|crmMoney:$currency|string_format:"%10s"} {else} {/if} {/if} {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:"%10s"} -{/foreach} -{/foreach} -{/if} - -{if $getTaxDetails && $dataArray} -{ts}Amount before Tax{/ts} : {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency} - -{foreach from=$dataArray item=value key=priceset} -{if $priceset || $priceset == 0 || $value != ''} -{$taxTerm} {$priceset|string_format:"%.2f"}% : {$value|crmMoney:$currency} -{else} -{ts}No{/ts} {$taxTerm} : {$value|crmMoney:$currency} -{/if} -{/foreach} -{/if} - -{if isset($totalTaxAmount) && $totalTaxAmount !== 'null'} -{ts}Total Tax Amount{/ts} : {$totalTaxAmount|crmMoney:$currency} -{/if} -{ts}Total Amount{/ts} : {$formValues.total_amount|crmMoney:$currency} -{if $receive_date} -{ts}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.6.alpha1.msg_template/message_templates/contribution_online_receipt_html.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_online_receipt_html.tpl deleted file mode 100644 index 537f2557d3..0000000000 --- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_online_receipt_html.tpl +++ /dev/null @@ -1,473 +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} - {if $dataArray} - - - - - - {foreach from=$dataArray item=value key=priceset} - - {if $priceset || $priceset == 0} - - - {else} - - - {/if} - - {/foreach} - - {/if} - {if $totalTaxAmount} - - - - - {/if} - - - - - - {else} - - {if $totalTaxAmount} - - - - - {/if} - - - - - - {/if} - - {/if} - - - {if $receive_date} - - - - - {/if} - - {if $is_monetary and $trxn_id} - - - - - {/if} - - {if $is_recur} - {if $contributeMode eq 'notify' or $contributeMode eq 'directIPN'} - - - {if $updateSubscriptionBillingUrl} - - - - {/if} - - - - - {/if} - {/if} - - {if $honor_block_is_active} - - - - {foreach from=$honoreeProfile item=value key=label} - - - - - {/foreach} - {elseif $softCreditTypes and $softCredits} - {foreach from=$softCreditTypes item=softCreditType key=n} - - - - {foreach from=$softCredits.$n item=value key=label} - - - - - {/foreach} - {/foreach} - {/if} - - {if $pcpBlock} - - - - - - - - {if $pcp_roll_nickname} - - - - - {/if} - {if $pcp_personal_note} - - - - - {/if} - {/if} - - {if $onBehalfProfile} - - - - {foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName} - - - - - {/foreach} - {/if} - - {if $isShare} - - - - {/if} - - {if ! ($contributeMode eq 'notify' OR $contributeMode eq 'directIPN') and $is_monetary} - {if $is_pay_later && !$isBillingAddressRequiredForPayLater} - - - - - - - {elseif $amount GT 0} - - - - - - - {/if} - {/if} - - {if $contributeMode eq 'direct' AND !$is_pay_later AND $amount GT 0} - - - - - - - {/if} - - {if $selectPremium} - - - - - - - {if $option} - - - - - {/if} - {if $sku} - - - - - {/if} - {if $start_date} - - - - - {/if} - {if $end_date} - - - - - {/if} - {if $contact_email OR $contact_phone} - - - - {/if} - {if $is_deductible AND $price} - - - - {/if} - {/if} - - {if $customPre} - - - - {foreach from=$customPre item=customValue key=customName} - {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields} - - - - - {/if} - {/foreach} - {/if} - - {if $customPost} - - - - {foreach from=$customPost item=customValue key=customName} - {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields} - - - - - {/if} - {/foreach} - {/if} - -
- {ts}Contribution Information{/ts} -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - {if $dataArray} - - - - {/if} - - - {foreach from=$value item=line} - - - - - {if $getTaxDetails} - - {if $line.tax_rate != "" || $line.tax_amount != ""} - - - {else} - - - {/if} - {/if} - - - {/foreach} -
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/ts}{ts}Subtotal{/ts}{ts}Tax Rate{/ts}{ts}Tax Amount{/ts}{ts}Total{/ts}
- {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} - 		- {$line.qty} - - {$line.unit_price|crmMoney:$currency} - - {$line.unit_price*$line.qty|crmMoney:$currency} - - {$line.tax_rate|string_format:"%.2f"}% - - {$line.tax_amount|crmMoney:$currency} - - {$line.line_total+$line.tax_amount|crmMoney:$currency} -
-
- {ts} Amount before Tax : {/ts} - - {$amount-$totalTaxAmount|crmMoney:$currency} -
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}No{/ts} {$taxTerm} {$value|crmMoney:$currency}
- {ts}Total Tax{/ts} - - {$totalTaxAmount|crmMoney:$currency} -
- {ts}Total Amount{/ts} - - {$amount|crmMoney:$currency} -
- {ts}Total Tax Amount{/ts} - - {$totalTaxAmount|crmMoney:$currency} -
- {ts}Amount{/ts} - - {$amount|crmMoney:$currency} {if $amount_level} - {$amount_level}{/if} -
- {ts}Date{/ts} - - {$receive_date|crmDate} -
- {ts}Transaction #{/ts} - - {$trxn_id} -
- {ts 1=$cancelSubscriptionUrl}This is a recurring contribution. You can cancel future contributions by visiting this web page.{/ts} -
- {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by visiting this web page.{/ts} -
- {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments for this recurring contribution by visiting this web page.{/ts} -
- {$soft_credit_type} -
- {$label} - - {$value} -
- {$softCreditType} -
- {$label} - - {$value} -
- {ts}Personal Campaign Page{/ts} -
- {ts}Display In Honor Roll{/ts} - - {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if} -
- {ts}Nickname{/ts} - - {$pcp_roll_nickname} -
- {ts}Personal Note{/ts} - - {$pcp_personal_note} -
- {$onBehalfProfile_grouptitle} -
- {$onBehalfName} - - {$onBehalfValue} -
- {capture assign=contributionUrl}{crmURL p='civicrm/contribute/transact' q="reset=1&id=`$contributionPageId`" a=true fe=1 h=1}{/capture} - {include file="CRM/common/SocialNetwork.tpl" emailMode=true url=$contributionUrl title=$title pageURL=$contributionUrl} -
- {ts}Registered Email{/ts} -
- {$email} -
- {ts}Billing Name and Address{/ts} -
- {$billingName}
- {$address|nl2br}
- {$email} -
- {ts}Credit Card Information{/ts} -
- {$credit_card_type}
- {$credit_card_number}
- {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
-
- {ts}Premium Information{/ts} -
- {$product_name} -
- {ts}Option{/ts} - - {$option} -
- {ts}SKU{/ts} - - {$sku} -
- {ts}Start Date{/ts} - - {$start_date|crmDate} -
- {ts}End Date{/ts} - - {$end_date|crmDate} -
-

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

- {if $contact_email} -

{$contact_email}

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

{$contact_phone}

- {/if} -
-

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

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

{$event.confirm_email_text|htmlize}

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

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

- {if $isPrimary} -

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

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

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

- {if $isPrimary} -

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

- {/if} - {elseif $is_pay_later} -

{$pay_later_receipt}

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

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

- {/if} - -
- - - - - - - - - {if $event.participant_role neq 'Attendee' and $defaultRole} - - - - - {/if} - - {if $isShowLocation} - - - - {/if} - - {if $location.phone.1.phone || $location.email.1.email} - - - - {foreach from=$location.phone item=phone} - {if $phone.phone} - - - - - {/if} - {/foreach} - {foreach from=$location.email item=eventEmail} - {if $eventEmail.email} - - - - - {/if} - {/foreach} - {/if} - - {if $event.is_public} - - - - {/if} - - {if $email} - - - - - - - {/if} - - - {if $event.is_monetary} - - - - - - {if $lineItem} - {foreach from=$lineItem item=value key=priceset} - {if $value neq 'skip'} - {if $isPrimary} - {if $lineItem|@count GT 1} {* Header for multi participant registration cases. *} - - - - {/if} - {/if} - - - - {/if} - {/foreach} - {if $dataArray} - - - - - {foreach from=$dataArray item=value key=priceset} - - {if $priceset || $priceset == 0} - - - {else} - - - {/if} - - {/foreach} - {/if} - {/if} - - {if $amount && !$lineItem} - {foreach from=$amount item=amnt key=level} - - - - {/foreach} - {/if} - {if $totalTaxAmount} - - - - - {/if} - {if $isPrimary} - - - - - {if $balanceAmount} - - - - - {/if} - {if $pricesetFieldsCount } - - - - - {/if} - {if $is_pay_later} - - - - {/if} - - {if $register_date} - - - - - {/if} - - {if $receive_date} - - - - - {/if} - - {if $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 $dataArray} - - - - {/if} - - {if $pricesetFieldsCount }{/if} - - {foreach from=$value item=line} - - - - - {if $dataArray} - - {if $line.tax_rate != "" || $line.tax_amount != ""} - - - {else} - - - {/if} - {/if} - - {if $pricesetFieldsCount } - - {/if} - - {/foreach} -
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/ts}{ts}SubTotal{/ts}{ts}Tax Rate{/ts}{ts}Tax Amount{/ts}{ts}Total{/ts}{ts}Total Participants{/ts}
- {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} - 		- {$line.qty} - - {$line.unit_price|crmMoney} - - {$line.unit_price*$line.qty|crmMoney} - - {$line.tax_rate|string_format:"%.2f"}% - - {$line.tax_amount|crmMoney} - - {$line.line_total+$line.tax_amount|crmMoney} - - {$line.participant_count} -
-
- {ts} Amount Before Tax : {/ts} - - {$totalAmount-$totalTaxAmount|crmMoney} -
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}No{/ts} {$taxTerm} {$value|crmMoney:$currency}
- {$amnt.amount|crmMoney} {$amnt.label} -
- {ts}Total Tax Amount{/ts} - - {$totalTaxAmount|crmMoney:$currency} -
- {if $balanceAmount} - {ts}Total Paid{/ts} - {else} - {ts}Total Amount{/ts} - {/if} - - {$totalAmount|crmMoney} {if $hookDiscount.message}({$hookDiscount.message}){/if} -
- {ts}Balance{/ts} - - {$balanceAmount|crmMoney} -
- {ts}Total Participants{/ts} - {assign var="count" value= 0} - {foreach from=$lineItem item=pcount} - {assign var="lineItemCount" value=0} - {if $pcount neq 'skip'} - {foreach from=$pcount item=p_count} - {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} - {/foreach} - {if $lineItemCount < 1 } - assign var="lineItemCount" value=1} - {/if} - {assign var="count" value=$count+$lineItemCount} - {/if} - {/foreach} - {$count} -
- {$pay_later_receipt} -
- {ts}Registration Date{/ts} - - {$register_date|crmDate} -
- {ts}Transaction Date{/ts} - - {$receive_date|crmDate} -
- {ts}Financial Type{/ts} - - {$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.6.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl deleted file mode 100644 index d1a5a52d74..0000000000 --- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_offline_receipt_text.tpl +++ /dev/null @@ -1,303 +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} -{if $dataArray} -{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture} -{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture} -{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture} -{/if} -{capture assign=ts_total}{ts}Total{/ts}{/capture} -{capture assign=ts_participant_total}{if $pricesetFieldsCount }{ts}Total Participants{/ts}{/if}{/capture} -{$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {if $dataArray} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {/if} {$ts_total|string_format:"%10s"} {$ts_participant_total|string_format:"%10s"} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{foreach from=$value item=line} -{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if} -{capture assign=ts_item}{if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:"..."|string_format:"%-30s"} {$line.qty|string_format:"%5s"} {$line.unit_price|crmMoney|string_format:"%10s"} {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:"%10s"} {if $line.tax_rate != "" || $line.tax_amount != ""} {$line.tax_rate|string_format:"%.2f"} % {$line.tax_amount|crmMoney:$currency|string_format:"%10s"} {else} {/if} {/if} {$line.line_total+$line.tax_amount|crmMoney|string_format:"%10s"} {$ts_participant_count|string_format:"%10s"} -{/foreach} -{/if} -{/foreach} - -{if $dataArray} -{ts}Amount before Tax{/ts}: {$totalAmount-$totalTaxAmount|crmMoney:$currency} - -{foreach from=$dataArray item=value key=priceset} -{if $priceset || $priceset == 0} -{$taxTerm} {$priceset|string_format:"%.2f"}%: {$value|crmMoney:$currency} -{else} -{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency} -{/if} -{/foreach} -{/if} -{/if} - -{if $amount && !$lineItem} -{foreach from=$amount item=amnt key=level}{$amnt.amount|crmMoney} {$amnt.label} -{/foreach} -{/if} - -{if $totalTaxAmount} -{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency} -{/if} -{if $isPrimary} - -{if $balanceAmount}{ts}Total Paid{/ts}{else}{ts}Total Amount{/ts}{/if}: {$totalAmount|crmMoney} {if $hookDiscount.message}({$hookDiscount.message}){/if} - -{if $balanceAmount} -{ts}Balance{/ts}: {$balanceAmount|crmMoney} -{/if} - -{if $pricesetFieldsCount } - {assign var="count" value= 0} - {foreach from=$lineItem item=pcount} - {assign var="lineItemCount" value=0} - {if $pcount neq 'skip'} - {foreach from=$pcount item=p_count} - {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} - {/foreach} - {if $lineItemCount < 1 } - {assign var="lineItemCount" value=1} - {/if} - {assign var="count" value=$count+$lineItemCount} - {/if} - {/foreach} - -{ts}Total Participants{/ts}: {$count} -{/if} - -{if $is_pay_later } - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$pay_later_receipt} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{/if} - -{if $register_date} -{ts}Registration Date{/ts}: {$register_date|crmDate} -{/if} -{if $receive_date} -{ts}Transaction Date{/ts}: {$receive_date|crmDate} -{/if} -{if $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.6.alpha1.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_html.tpl deleted file mode 100644 index d5be9dd8a0..0000000000 --- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_html.tpl +++ /dev/null @@ -1,506 +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 $dataArray} - - - - - {foreach from=$dataArray item=value key=priceset} - - {if $priceset || $priceset == 0} - - - {else} - - - {/if} - - {/foreach} - {/if} - {/if} - - {if $amounts && !$lineItem} - {foreach from=$amounts item=amnt key=level} - - - - {/foreach} - {/if} - - {if $totalTaxAmount} - - - - - {/if} - {if $isPrimary} - - - - - {if $pricesetFieldsCount } - - - - {/if} - - {if $register_date} - - - - - {/if} - - {if $receive_date} - - - - - {/if} - - {if $contributionTypeName} - - - - - {/if} - - {if $trxn_id} - - - - - {/if} - - {if $paidBy} - - - - - {/if} - - {if $checkNumber} - - - - - {/if} - - {if $contributeMode ne 'notify' and !$isAmountzero and (!$is_pay_later or $isBillingAddressRequiredForPayLater) and !$isOnWaitlist and !$isRequireApproval} - - - - - - - {/if} - - {if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} - - - - - - - {/if} - - {/if} - - {/if} {* End of conditional section for Paid events *} - - -{if $customPre} -{foreach from=$customPre item=customPr key=i} - - {foreach from=$customPr item=customValue key=customName} - {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - - - - - {/if} - {/foreach} -{/foreach} -{/if} - -{if $customPost} -{foreach from=$customPost item=customPos key=j} - - {foreach from=$customPos item=customValue key=customName} - {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - - - - -{/if} -{/foreach} -{/foreach} -{/if} - -{if $customProfile} -{foreach from=$customProfile.profile item=eachParticipant key=participantID} - - {foreach from=$eachParticipant item=eachProfile key=pid} - - {foreach from=$eachProfile item=val key=field} - {foreach from=$val item=v key=f} - - - {/foreach} - - {/foreach} -{/foreach} -{/foreach} -{/if} - - {if $customGroup} - {foreach from=$customGroup item=value key=customName} - - - - {foreach from=$value item=v key=n} - - - - - {/foreach} - {/foreach} - {/if} - -
- {ts}Event Information and Location{/ts} -
- {$event.event_title}
- {$event.event_start_date|date_format:"%A"} {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|date_format:"%A"} {$event.event_end_date|crmDate}{/if}{/if} -
- {ts}Your schedule:{/ts} -
- {assign var='group_by_day' value='NA'} - {foreach from=$conference_sessions item=session} - {if $session.start_date|date_format:"%Y/%m/%d" != $group_by_day|date_format:"%Y/%m/%d"} - {assign var='group_by_day' value=$session.start_date} - {$group_by_day|date_format:"%m/%d/%Y"}
- {/if} - {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}
- {if $session.location}    {$session.location}
{/if} - {/foreach} -
- {ts}Participant Role{/ts} - - {$event.participant_role} -
- {if $location.address.1.name} - {$location.address.1.name}
- {/if} - {if $location.address.1.street_address} - {$location.address.1.street_address}
- {/if} - {if $location.address.1.supplemental_address_1} - {$location.address.1.supplemental_address_1}
- {/if} - {if $location.address.1.supplemental_address_2} - {$location.address.1.supplemental_address_2}
- {/if} - {if $location.address.1.city} - {$location.address.1.city}, {$location.address.1.state_province} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if}
- {/if} -
- {ts}Event Contacts:{/ts} -
- {if $phone.phone_type} - {$phone.phone_type_display} - {else} - {ts}Phone{/ts} - {/if} - - {$phone.phone} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if} -
- {ts}Email{/ts} - - {$eventEmail.email} -
- {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} - {ts}Download iCalendar File{/ts} -
- {capture assign=eventUrl}{crmURL p='civicrm/event/info' q="id=`$event.id`&reset=1" a=true fe=1 h=1}{/capture} - {include file="CRM/common/SocialNetwork.tpl" emailMode=true url=$eventUrl title=$event.title pageURL=$eventUrl} -
- {ts}You were registered by:{/ts} -
- {$payer.name} -
- {$event.fee_label} -
- {ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info} -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - - {if $dataArray} - - - - {/if} - - {if $pricesetFieldsCount }{/if} - - {foreach from=$value item=line} - - - - - {if $dataArray} - - {if $line.tax_rate != "" || $line.tax_amount != ""} - - - {else} - - - {/if} - {/if} - - {if $pricesetFieldsCount } {/if} - - {/foreach} -
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/ts}{ts}SubTotal{/ts}{ts}Tax Rate{/ts}{ts}Tax Amount{/ts}{ts}Total{/ts}{ts}Total Participants{/ts}
- {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} - 		- {$line.qty} - - {$line.unit_price|crmMoney:$currency} - - {$line.unit_price*$line.qty|crmMoney} - - {$line.tax_rate|string_format:"%.2f"}% - - {$line.tax_amount|crmMoney} - - {$line.line_total+$line.tax_amount|crmMoney:$currency} - {$line.participant_count}
-
- {ts} Amount Before Tax: {/ts} - - {$totalAmount-$totalTaxAmount|crmMoney} -
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}No{/ts} {$taxTerm} {$value|crmMoney:$currency}
- {$amnt.amount|crmMoney:$currency} {$amnt.label} -
- {ts}Total Tax Amount{/ts} - - {$totalTaxAmount|crmMoney:$currency} -
- {ts}Total Amount{/ts} - - {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if} -
- {ts}Total Participants{/ts} - {assign var="count" value= 0} - {foreach from=$lineItem item=pcount} - {assign var="lineItemCount" value=0} - {if $pcount neq 'skip'} - {foreach from=$pcount item=p_count} - {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} - {/foreach} - {if $lineItemCount < 1 } - {assign var="lineItemCount" value=1} - {/if} - {assign var="count" value=$count+$lineItemCount} - {/if} - {/foreach} - {$count} -
- {ts}Registration Date{/ts} - - {$register_date|crmDate} -
- {ts}Transaction Date{/ts} - - {$receive_date|crmDate} -
- {ts}Financial Type{/ts} - - {$contributionTypeName} -
- {ts}Transaction #{/ts} - - {$trxn_id} -
- {ts}Paid By{/ts} - - {$paidBy} -
- {ts}Check Number{/ts} - - {$checkNumber} -
- {ts}Billing Name and Address{/ts} -
- {$billingName}
- {$address|nl2br} -
- {ts}Credit Card Information{/ts} -
- {$credit_card_type}
- {$credit_card_number}
- {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} -
{$customPre_grouptitle.$i}
{$customName}{$customValue}
{$customPost_grouptitle.$j}
{$customName}{$customValue}
{ts 1=$participantID+2}Participant %1{/ts}
{$customProfile.title.$pid}
{$field}{$v}
- {$customName} -
- {$n} - - {$v} -
-
-
- - - diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_text.tpl deleted file mode 100644 index ee41487e10..0000000000 --- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/event_online_receipt_text.tpl +++ /dev/null @@ -1,301 +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} -{if $dataArray} -{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture} -{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture} -{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture} -{/if} -{capture assign=ts_total}{ts}Total{/ts}{/capture} -{if $pricesetFieldsCount }{capture assign=ts_participant_total}{ts}Total Participants{/ts}{/capture}{/if} -{$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {if $dataArray} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {/if} {$ts_total|string_format:"%10s"} {$ts_participant_total|string_format:"%10s"} ------------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{foreach from=$value item=line} -{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if} -{capture assign=ts_item}{if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:"..."|string_format:"%-30s"} {$line.qty|string_format:"%5s"} {$line.unit_price|crmMoney:$currency|string_format:"%10s"} {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:"%10s"} {if $line.tax_rate != "" || $line.tax_amount != ""} {$line.tax_rate|string_format:"%.2f"} % {$line.tax_amount|crmMoney:$currency|string_format:"%10s"} {else} {/if} {/if} {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:"%10s"}{$ts_participant_count|string_format:"%10s"} -{/foreach} -{/if} -{/foreach} - -{if $dataArray} -{ts}Amount before Tax{/ts}: {$totalAmount-$totalTaxAmount|crmMoney:$currency} - -{foreach from=$dataArray item=value key=priceset} -{if $priceset || $priceset == 0} -{$taxTerm} {$priceset|string_format:"%.2f"}%: {$value|crmMoney:$currency} -{else} -{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency} -{/if} -{/foreach} -{/if} -{/if} - -{if $amounts && !$lineItem} -{foreach from=$amounts item=amnt key=level}{$amnt.amount|crmMoney:$currency} {$amnt.label} -{/foreach} -{/if} - -{if $totalTaxAmount} -{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency} -{/if} -{if $isPrimary } - -{ts}Total Amount{/ts}: {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if} - -{if $pricesetFieldsCount } - {assign var="count" value= 0} - {foreach from=$lineItem item=pcount} - {assign var="lineItemCount" value=0} - {if $pcount neq 'skip'} - {foreach from=$pcount item=p_count} - {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} - {/foreach} - {if $lineItemCount < 1 } - {assign var="lineItemCount" value=1} - {/if} - {assign var="count" value=$count+$lineItemCount} - {/if} - {/foreach} - -{ts}Total Participants{/ts}: {$count} -{/if} - -{if $register_date} -{ts}Registration Date{/ts}: {$register_date|crmDate} -{/if} -{if $receive_date} -{ts}Transaction Date{/ts}: {$receive_date|crmDate} -{/if} -{if $contributionTypeName} -{ts}Financial Type{/ts}: {$contributionTypeName} -{/if} -{if $trxn_id} -{ts}Transaction #{/ts}: {$trxn_id} -{/if} -{if $paidBy} -{ts}Paid By{/ts}: {$paidBy} -{/if} -{if $checkNumber} -{ts}Check Number{/ts}: {$checkNumber} -{/if} -{if $contributeMode ne 'notify' and !$isAmountzero and (!$is_pay_later or $isBillingAddressRequiredForPayLater) and !$isOnWaitlist and !$isRequireApproval} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Billing Name and Address{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$billingName} -{$address} -{/if} - -{if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts}Credit Card Information{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$credit_card_type} -{$credit_card_number} -{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} -{/if} -{/if} -{/if} {* End of conditional section for Paid events *} - -{if $customPre} -{foreach from=$customPre item=customPr key=i} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$customPre_grouptitle.$i} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$customPr item=customValue key=customName} -{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - {$customName}: {$customValue} -{/if} -{/foreach} -{/foreach} -{/if} - -{if $customPost} -{foreach from=$customPost item=customPos key=j} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{$customPost_grouptitle.$j} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$customPos item=customValue key=customName} -{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} - {$customName}: {$customValue} -{/if} -{/foreach} -{/foreach} -{/if} -{if $customProfile} - -{foreach from=$customProfile.profile item=eachParticipant key=participantID} -==========================================================={if $pricesetFieldsCount }===================={/if} - -{ts 1=$participantID+2}Participant Information - Participant %1{/ts} - -==========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$eachParticipant item=eachProfile key=pid} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{$customProfile.title.$pid} -----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} - -{foreach from=$eachProfile item=val key=field} -{foreach from=$val item=v key=f} -{$field}: {$v} -{/foreach} -{/foreach} -{/foreach} -{/foreach} -{/if} -{if $customGroup} -{foreach from=$customGroup item=value key=customName} -=========================================================={if $pricesetFieldsCount }===================={/if} - -{$customName} -=========================================================={if $pricesetFieldsCount }===================={/if} - -{foreach from=$value item=v key=n} -{$n}: {$v} -{/foreach} -{/foreach} -{/if} diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_offline_receipt_html.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_offline_receipt_html.tpl deleted file mode 100644 index 8a2c0e1eab..0000000000 --- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_offline_receipt_html.tpl +++ /dev/null @@ -1,296 +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 $dataArray} - - - - - {foreach from=$dataArray item=value key=priceset} - - {if $priceset} - - - {elseif $priceset == 0} - - - {/if} - - {/foreach} - {/if} - {/if} - {if isset($totalTaxAmount)} - - - - - {/if} - - - - - {if $receive_date} - - - - - {/if} - {if $formValues.paidBy} - - - - - {if $formValues.check_number} - - - - - {/if} - {/if} - {/if} - {/if} -
- {ts}Membership Information{/ts} -
- {ts}Membership Type{/ts} - - {$membership_name} -
- {ts}Membership Start Date{/ts} - - {$mem_start_date} -
- {ts}Membership End Date{/ts} - - {$mem_end_date} -
- {ts}Membership Fee{/ts} -
- {ts}Financial Type{/ts} - - {$formValues.contributionType_name} -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} - - - - {if $dataArray} - - - - - {/if} - - - - {foreach from=$value item=line} - - - - {if $dataArray} - - {if $line.tax_rate != "" || $line.tax_amount != ""} - - - {else} - - - {/if} - - {/if} - - - - {/foreach} -
{ts}Item{/ts}{ts}Fee{/ts}{ts}SubTotal{/ts}{ts}Tax Rate{/ts}{ts}Tax Amount{/ts}{ts}Total{/ts}{ts}Membership Start Date{/ts}{ts}Membership End Date{/ts}
- {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} - 		- {$line.line_total|crmMoney} - - {$line.unit_price*$line.qty|crmMoney} - - {$line.tax_rate|string_format:"%.2f"}% - - {$line.tax_amount|crmMoney} - - {$line.line_total+$line.tax_amount|crmMoney} - - {$line.start_date} - - {$line.end_date} -
-
- {ts}Amount Before Tax : {/ts} - - {$formValues.total_amount-$totalTaxAmount|crmMoney} -
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}No{/ts} {$taxTerm} {$value|crmMoney:$currency}
- {ts}Total Tax Amount{/ts} - - {$totalTaxAmount|crmMoney:$currency} -
- {ts}Amount{/ts} - - {$formValues.total_amount|crmMoney} -
- {ts}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.6.alpha1.msg_template/message_templates/membership_offline_receipt_text.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_offline_receipt_text.tpl deleted file mode 100644 index 0254609ceb..0000000000 --- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_offline_receipt_text.tpl +++ /dev/null @@ -1,113 +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} -{if $dataArray} -{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture} -{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture} -{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture} -{capture assign=ts_total}{ts}Total{/ts}{/capture} -{/if} -{capture assign=ts_start_date}{ts}Membership Start Date{/ts}{/capture} -{capture assign=ts_end_date}{ts}Membership End Date{/ts}{/capture} -{$ts_item|string_format:"%-30s"} {$ts_total|string_format:"%10s"} {if $dataArray} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {$ts_total|string_format:"%10s"} {/if} {$ts_start_date|string_format:"%20s"} {$ts_end_date|string_format:"%20s"} --------------------------------------------------------------------------------------------------- - -{foreach from=$value item=line} -{capture assign=ts_item}{if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:"..."|string_format:"%-30s"} {$line.line_total|crmMoney|string_format:"%10s"} {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:"%10s"} {if $line.tax_rate != "" || $line.tax_amount != ""} {$line.tax_rate|string_format:"%.2f"} % {$line.tax_amount|crmMoney:$currency|string_format:"%10s"} {else} {/if} {$line.line_total+$line.tax_amount|crmMoney|string_format:"%10s"} {/if} {$line.start_date|string_format:"%20s"} {$line.end_date|string_format:"%20s"} -{/foreach} -{/foreach} - -{if $dataArray} -{ts}Amount before Tax{/ts}: {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency} - -{foreach from=$dataArray item=value key=priceset} -{if $priceset} -{$taxTerm} {$priceset|string_format:"%.2f"} %: {$value|crmMoney:$currency} -{elseif $priceset == 0} -{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency} -{/if} -{/foreach} -{/if} --------------------------------------------------------------------------------------------------- -{/if} - -{if isset($totalTaxAmount)} -{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency} -{/if} - -{ts}Amount{/ts}: {$formValues.total_amount|crmMoney} -{if $receive_date} -{ts}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.6.alpha1.msg_template/message_templates/membership_online_receipt_html.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_online_receipt_html.tpl deleted file mode 100644 index b4d8619b2f..0000000000 --- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_online_receipt_html.tpl +++ /dev/null @@ -1,565 +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 $dataArray} - - - - - {foreach from=$dataArray item=value key=priceset} - - {if $priceset || $priceset == 0} - - - {else} - - - {/if} - - {/foreach} - {/if} - {/if} - {if $totalTaxAmount} - - - - - {/if} - - - - - - {/if} - - - {elseif $membership_amount} - - - - - - - - - - - - {/if} - - {if $receive_date} - - - - - {/if} - - {if $is_monetary and $trxn_id} - - - - - {/if} - - {if $membership_trx_id} - - - - - {/if} - {if $is_recur} - {if $contributeMode eq 'notify' or $contributeMode eq 'directIPN'} - - - - - - - {/if} - {/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.) *} - - - - {if $dataArray} - - - - - {/if} - - - - {foreach from=$value item=line} - - - - {if $dataArray} - - {if $line.tax_rate != "" || $line.tax_amount != ""} - - - {else} - - - {/if} - - {/if} - - - - {/foreach} -
{ts}Item{/ts}{ts}Fee{/ts}{ts}SubTotal{/ts}{ts}Tax Rate{/ts}{ts}Tax Amount{/ts}{ts}Total{/ts}{ts}Membership Start Date{/ts}{ts}Membership End Date{/ts}
- {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} - 		- {$line.line_total|crmMoney} - - {$line.unit_price*$line.qty|crmMoney} - - {$line.tax_rate|string_format:"%.2f"}% - - {$line.tax_amount|crmMoney} - - {$line.line_total+$line.tax_amount|crmMoney} - - {$line.start_date} - - {$line.end_date} -
-
- {ts} Amount Before Tax : {/ts} - - {$amount-$totalTaxAmount|crmMoney} -
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}NO{/ts} {$taxTerm} {$value|crmMoney:$currency}
- {ts}Total Tax Amount{/ts} - - {$totalTaxAmount|crmMoney:$currency} -
- {ts}Amount{/ts} - - {$amount|crmMoney} {if $amount_level} - {$amount_level}{/if} -
- {ts}Membership Fee{/ts} -
- {ts 1=$membership_name}%1 Membership{/ts} - - {$membership_amount|crmMoney} -
- {ts}Date{/ts} - - {$receive_date|crmDate} -
- {ts}Transaction #{/ts} - - {$trxn_id} -
- {ts}Membership Transaction #{/ts} - - {$membership_trx_id} -
- {ts 1=$cancelSubscriptionUrl}This membership will be renewed automatically. You can cancel the auto-renewal option by visiting this web page.{/ts} -
- {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by visiting this web page.{/ts} -
- {$soft_credit_type} -
- {$label} - - {$value} -
- {ts}Personal Campaign Page{/ts} -
- {ts}Display In Honor Roll{/ts} - - {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if} -
- {ts}Nickname{/ts} - - {$pcp_roll_nickname} -
- {ts}Personal Note{/ts} - - {$pcp_personal_note} -
- {$onBehalfProfile_grouptitle} -
- {$onBehalfName} - - {$onBehalfValue} -
- {ts}Registered Email{/ts} -
- {$email} -
- {ts}Billing Name and Address{/ts} -
- {$billingName}
- {$address|nl2br}
- {$email} -
- {ts}Credit Card Information{/ts} -
- {$credit_card_type}
- {$credit_card_number}
- {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
-
- {ts}Premium Information{/ts} -
- {$product_name} -
- {ts}Option{/ts} - - {$option} -
- {ts}SKU{/ts} - - {$sku} -
- {ts}Start Date{/ts} - - {$start_date|crmDate} -
- {ts}End Date{/ts} - - {$end_date|crmDate} -
-

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

- {if $contact_email} -

{$contact_email}

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

{$contact_phone}

- {/if} -
-

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

-
- {$customPre_grouptitle} -
- {$customName} - - {$customValue} -
- {$customPost_grouptitle} -
- {$customName} - - {$customValue} -
-
- - - diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_online_receipt_text.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_online_receipt_text.tpl deleted file mode 100644 index 7fba59ab12..0000000000 --- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/membership_online_receipt_text.tpl +++ /dev/null @@ -1,243 +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} -{if $dataArray} -{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture} -{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture} -{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture} -{capture assign=ts_total}{ts}Total{/ts}{/capture} -{/if} -{capture assign=ts_start_date}{ts}Membership Start Date{/ts}{/capture} -{capture assign=ts_end_date}{ts}Membership End Date{/ts}{/capture} -{$ts_item|string_format:"%-30s"} {$ts_total|string_format:"%10s"} {if $dataArray} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {$ts_total|string_format:"%10s"} {/if} {$ts_start_date|string_format:"%20s"} {$ts_end_date|string_format:"%20s"} --------------------------------------------------------------------------------------------------- - -{foreach from=$value item=line} -{capture assign=ts_item}{if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:"..."|string_format:"%-30s"} {$line.line_total|crmMoney|string_format:"%10s"} {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:"%10s"} {if $line.tax_rate != "" || $line.tax_amount != ""} {$line.tax_rate|string_format:"%.2f"} % {$line.tax_amount|crmMoney:$currency|string_format:"%10s"} {else} {/if} {$line.line_total+$line.tax_amount|crmMoney|string_format:"%10s"} {/if} {$line.start_date|string_format:"%20s"} {$line.end_date|string_format:"%20s"} -{/foreach} -{/foreach} - -{if $dataArray} -{ts}Amount before Tax{/ts}: {$amount-$totalTaxAmount|crmMoney:$currency} - -{foreach from=$dataArray item=value key=priceset} -{if $priceset || $priceset == 0} -{$taxTerm} {$priceset|string_format:"%.2f"}%: {$value|crmMoney:$currency} -{else} -{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency} -{/if} -{/foreach} -{/if} --------------------------------------------------------------------------------------------------- -{/if} - -{if $totalTaxAmount} -{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency} -{/if} - -{ts}Amount{/ts}: {$amount|crmMoney} {if $amount_level } - {$amount_level} {/if} -{/if} -{elseif $membership_amount} -=========================================================== -{ts}Membership Fee{/ts} - -=========================================================== -{ts 1=$membership_name}%1 Membership{/ts}: {$membership_amount|crmMoney} -{/if} - -{if $receive_date} - -{ts}Date{/ts}: {$receive_date|crmDate} -{/if} -{if $is_monetary and $trxn_id} -{ts}Transaction #{/ts}: {$trxn_id} - -{/if} -{if $membership_trx_id} -{ts}Membership Transaction #{/ts}: {$membership_trx_id} - -{/if} -{if $is_recur} -{if $contributeMode eq 'notify' or $contributeMode eq 'directIPN'} -{ts 1=$cancelSubscriptionUrl}This membership will be renewed automatically. You can cancel the auto-renewal option by visiting this web page: %1.{/ts} - -{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.6.alpha4.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.6.alpha4.msg_template/civicrm_msg_template.tpl deleted file mode 100644 index 63ad6dd61d..0000000000 --- a/CRM/Upgrade/4.6.alpha4.msg_template/civicrm_msg_template.tpl +++ /dev/null @@ -1,50 +0,0 @@ -{php} - $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.6.alpha4.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} - -{php} - $ovNames = array( - 'contribution' => array( - 'pcp_owner_notify' => ts('Personal Campaign Pages - Owner 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.6.alpha4.msg_template/message_templates/`$vName`_subject.tpl"} - {fetch assign=text file="`$smarty.const.SMARTY_DIR`/../../CRM/Upgrade/4.6.alpha4.msg_template/message_templates/`$vName`_text.tpl"} - {fetch assign=html file="`$smarty.const.SMARTY_DIR`/../../CRM/Upgrade/4.6.alpha4.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.6.alpha4.msg_template/message_templates/pcp_owner_notify_html.tpl b/CRM/Upgrade/4.6.alpha4.msg_template/message_templates/pcp_owner_notify_html.tpl deleted file mode 100644 index 007ee41956..0000000000 --- a/CRM/Upgrade/4.6.alpha4.msg_template/message_templates/pcp_owner_notify_html.tpl +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - -{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} - -

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

-

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

- - - - - -
{ts}Receive Date{/ts}: {$receive_date|crmDate}
{ts}Amount{/ts}: {$total_amount|crmMoney}
{ts}Name{/ts}: {$donors_display_name}
{ts}Email{/ts}: {$donors_email}
- - diff --git a/CRM/Upgrade/4.6.alpha4.msg_template/message_templates/pcp_owner_notify_subject.tpl b/CRM/Upgrade/4.6.alpha4.msg_template/message_templates/pcp_owner_notify_subject.tpl deleted file mode 100644 index 83d9e8f933..0000000000 --- a/CRM/Upgrade/4.6.alpha4.msg_template/message_templates/pcp_owner_notify_subject.tpl +++ /dev/null @@ -1 +0,0 @@ -{ts}Someone has just donated to your personal campaign page{/ts} diff --git a/CRM/Upgrade/4.6.alpha4.msg_template/message_templates/pcp_owner_notify_text.tpl b/CRM/Upgrade/4.6.alpha4.msg_template/message_templates/pcp_owner_notify_text.tpl deleted file mode 100644 index 3edd98a62f..0000000000 --- a/CRM/Upgrade/4.6.alpha4.msg_template/message_templates/pcp_owner_notify_text.tpl +++ /dev/null @@ -1,20 +0,0 @@ -=========================================================== -{ts}Personal Campaign Page Owner Notification{/ts} - -=========================================================== -{ts}You have received a donation at your personal page{/ts}: {$page_title} ->> {$pcpInfoURL} - -{ts}Your fundraising total has been updated.{/ts} -{ts}The donor's information is listed below. You can choose to contact them and convey your thanks if you wish.{/ts} -{if $is_honor_roll_enabled} - {ts}The donor's name has been added to your honor roll unless they asked not to be included.{/ts} -{/if} - -{ts}Receive Date{/ts}: {$receive_date|crmDate} - -{ts}Amount{/ts}: {$total_amount|crmMoney} - -{ts}Name{/ts}: {$donors_display_name} - -{ts}Email{/ts}: {$donors_email} diff --git a/CRM/Upgrade/Form.php b/CRM/Upgrade/Form.php index 79305b2fce..4c67923560 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.5.9'; + const MINIMUM_UPGRADABLE_VERSION = '4.6.12'; /** * @var \CRM_Core_Config diff --git a/CRM/Upgrade/Incremental/php/FourSix.php b/CRM/Upgrade/Incremental/php/FourSix.php deleted file mode 100644 index 41fc98f13f..0000000000 --- a/CRM/Upgrade/Incremental/php/FourSix.php +++ /dev/null @@ -1,186 +0,0 @@ -
' . ts('Default versions of the following System Workflow Message Templates have been modified to handle new functionality:
  • Events - Registration Confirmation and Receipt (on-line)
  • Events - Registration Confirmation and Receipt (off-line)
  • Contributions - Receipt (on-line)
  • Contributions - Receipt (off-line)
  • Memberships - Receipt (on-line)
  • Memberships - Signup and Renewal Receipts (off-line)
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).'); - } - if ($rev == '4.6.alpha3') { - $postUpgradeMessage .= '

' . ts('A new permission has been added for editing message templates. Previously, users needed the "administer CiviCRM" permission. Now, users need the new permission called "edit message templates." Please check your CMS permissions to ensure that users who should be able to edit message templates are assigned this new permission.'); - } - } - - /** - * CRM-16846 - This function incorrectly omits running the 4.6.alpha3 sql file. - * - * Instead of correcting it here (which would not run again for sites already on 4.6), - * the file is re-run conditionally during 4.6.6 - * @see upgrade_4_6_6 - * - * @param string $rev - */ - public function upgrade_4_6_alpha3($rev) { - // Task to process sql. - $this->addTask('Add and update reference_date column for Schedule Reminders', 'updateReferenceDate'); - } - - /** - * Add new column reference_date to civicrm_action_log in order to track. - * - * CRM-15728, actual action_start_date for membership entity for only those schedule reminders which are not repeatable - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function updateReferenceDate(CRM_Queue_TaskContext $ctx) { - //Add column civicrm_action_log.reference_date if not exists. - $sql = "SELECT count(*) FROM information_schema.columns WHERE table_schema = database() AND table_name = 'civicrm_action_log' AND COLUMN_NAME = 'reference_date' "; - $res = CRM_Core_DAO::singleValueQuery($sql); - - if ($res <= 0) { - $query = "ALTER TABLE `civicrm_action_log` - ADD COLUMN `reference_date` date COMMENT 'Stores the date from the entity which triggered this reminder action (e.g. membership.end_date for most membership renewal reminders)'"; - CRM_Core_DAO::executeQuery($query); - } - - //Retrieve schedule reminders for membership entity and is not repeatable and no absolute date chosen. - $query = "SELECT schedule.* FROM civicrm_action_schedule schedule - INNER JOIN civicrm_action_mapping mapper ON mapper.id = schedule.mapping_id AND - mapper.entity = 'civicrm_membership' AND - schedule.is_repeat = 0 AND - schedule.start_action_date IS NOT NULL"; - - // construct basic where clauses - $where = [ - //choose reminder older then 9 months - 'reminder.action_date_time >= DATE_SUB(reminder.action_date_time, INTERVAL 9 MONTH)', - ]; - $dao = CRM_Core_DAO::executeQuery($query); - while ($dao->fetch()) { - - $referenceColumn = str_replace('membership_', "m.", $dao->start_action_date); - $value = implode(', ', explode(CRM_Core_DAO::VALUE_SEPARATOR, trim($dao->entity_value, CRM_Core_DAO::VALUE_SEPARATOR))); - if (!empty($value)) { - $where[] = "m.membership_type_id IN ({$value})"; - } - else { - $where[] = "m.membership_type_id IS NULL"; - } - - //Create new action_log records where action_start_date changes and exclude reminders for additional contacts - //and select contacts are active - $sql = "UPDATE civicrm_action_log reminder - LEFT JOIN civicrm_membership m - ON reminder.entity_id = m.id AND - reminder.entity_table = 'civicrm_membership' AND - ( m.is_override IS NULL OR m.is_override = 0 ) - INNER JOIN civicrm_contact c - ON c.id = m.contact_id AND - c.is_deleted = 0 AND c.is_deceased = 0 - SET reminder.reference_date = {$referenceColumn} - WHERE " . implode(" AND ", $where); - CRM_Core_DAO::executeQuery($sql); - } - - return TRUE; - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_6_1($rev) { - // CRM-16289 - Fix invalid data in log_civicrm_case.case_type_id. - $this->addTask('Cleanup case type id data in log table.', 'fixCaseLog'); - } - - /** - * Upgrade function. - * - * @param string $rev - */ - public function upgrade_4_6_6($rev) { - // CRM-16846 - This sql file may have been previously skipped. Conditionally run it again if it doesn't appear to have run before. - if (!CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_state_province WHERE abbreviation = '100' AND country_id = 1193")) { - $this->addTask('Update Slovenian municipalities', 'task_4_6_x_runOnlySql', '4.6.alpha3'); - } - // CRM-16846 - This sql file may have been previously skipped. No harm in running it again because it's just UPDATE statements. - $this->addTask('State-province update from 4.4.7', 'task_4_6_x_runOnlySql', '4.4.7'); - - $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); - } - - /** - * Remove special characters from case_type_id column in log_civicrm_case. - * - * CRM-16289 - If logging enabled and upgrading from 4.4 or earlier, log_civicrm_case.case_type_id will contain special characters. - * This will cause ALTER TABLE to fail when changing this column to an INT - * - * @param \CRM_Queue_TaskContext $ctx - * - * @return bool - */ - public static function fixCaseLog(CRM_Queue_TaskContext $ctx) { - $sql = "SELECT count(*) FROM information_schema.columns WHERE table_schema = database() AND table_name = 'log_civicrm_case'"; - $res = CRM_Core_DAO::singleValueQuery($sql); - - if ($res) { - // executeQuery doesn't like running multiple engine changes in one pass, so have to break it up. dgg - $query = "ALTER TABLE `log_civicrm_case` ENGINE = InnoDB;"; - CRM_Core_DAO::executeQuery($query); - $query = "UPDATE log_civicrm_case SET case_type_id = replace(case_type_id, 0x01, '');"; - CRM_Core_DAO::executeQuery($query); - $query = "ALTER TABLE `log_civicrm_case` ENGINE = ARCHIVE;"; - CRM_Core_DAO::executeQuery($query); - $query = "ALTER TABLE log_civicrm_case MODIFY `case_type_id` int(10) unsigned DEFAULT NULL COMMENT 'FK to civicrm_case_type.id';"; - CRM_Core_DAO::executeQuery($query); - } - return TRUE; - } - - /** - * Queue Task Callback for CRM-16846 - * - * Run a sql file without resetting locale to that version - * - * @param \CRM_Queue_TaskContext $ctx - * @param string $rev - * - * @return bool - */ - public static function task_4_6_x_runOnlySql(CRM_Queue_TaskContext $ctx, $rev) { - $upgrade = new CRM_Upgrade_Form(); - $smarty = CRM_Core_Smarty::singleton(); - $smarty->assign('domainID', CRM_Core_Config::domainID()); - - $fileName = dirname(__DIR__) . "/sql/$rev.mysql.tpl"; - - $upgrade->source($smarty->fetch($fileName), TRUE); - - return TRUE; - } - -} diff --git a/CRM/Upgrade/Incremental/sql/4.4.7.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.4.7.mysql.tpl deleted file mode 100644 index 7ad0a53795..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.4.7.mysql.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{* file to handle db changes in 4.4.7 during upgrade *} --- CRM-13571 -UPDATE civicrm_state_province SET name = 'Møre og Romsdal' WHERE name = 'M�re og Romsdal'; - --- CRM-13604 -UPDATE civicrm_state_province SET name = 'Sololá' WHERE name = 'Solol�'; diff --git a/CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl deleted file mode 100644 index 2380d47679..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.0.mysql.tpl +++ /dev/null @@ -1,46 +0,0 @@ -{* file to handle db changes in 4.6.0 during upgrade *} - ---CRM-16148 add missing option names -SELECT @option_group_id_pcm := max(id) from civicrm_option_group where name = 'preferred_communication_method'; -SELECT @option_group_id_notePrivacy := max(id) from civicrm_option_group where name = 'note_privacy'; - -UPDATE civicrm_option_value -SET name = 'Phone' -WHERE option_group_id = @option_group_id_pcm AND value = 1; -UPDATE civicrm_option_value -SET name = 'Email' -WHERE option_group_id = @option_group_id_pcm AND value = 2; -UPDATE civicrm_option_value -SET name = 'Postal Mail' -WHERE option_group_id = @option_group_id_pcm AND value = 3; -UPDATE civicrm_option_value -SET name = 'SMS' -WHERE option_group_id = @option_group_id_pcm AND value = 4; -UPDATE civicrm_option_value -SET name = 'Fax' -WHERE option_group_id = @option_group_id_pcm AND value = 5; - -UPDATE civicrm_option_value -SET name = 'None' -WHERE option_group_id = @option_group_id_notePrivacy AND value = 0; -UPDATE civicrm_option_value -SET name = 'Author Only' -WHERE option_group_id = @option_group_id_notePrivacy AND value = 1; - ---These labels were never translated so just copy them over as names -{if $multilingual} - UPDATE civicrm_option_value v, civicrm_option_group g - SET v.name = v.label_{$locales.0} - WHERE g.id = v.option_group_id AND g.name IN - ('group_type', 'safe_file_extension', 'wysiwyg_editor'); -{else} - UPDATE civicrm_option_value v, civicrm_option_group g - SET v.name = v.label - WHERE g.id = v.option_group_id AND g.name IN - ('group_type', 'safe_file_extension', 'wysiwyg_editor'); -{/if} - ---This one is weird. What the heck is this anyway? -UPDATE civicrm_option_value v, civicrm_option_group g -SET v.name = v.value -WHERE g.id = v.option_group_id AND g.name = 'redaction_rule'; diff --git a/CRM/Upgrade/Incremental/sql/4.6.1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.1.mysql.tpl deleted file mode 100644 index 232ca048ac..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.1.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.6.10.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.10.mysql.tpl deleted file mode 100644 index 6554f670c7..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.10.mysql.tpl +++ /dev/null @@ -1,13 +0,0 @@ -{* file to handle db changes in 4.6.10 during upgrade *} - --- CRM-17384 - remove duplicate support menu which may have been added in 4.6.9 -DELETE n1 -FROM civicrm_navigation n1, civicrm_navigation n2 -WHERE n1.name = 'Support' AND n1.domain_id = {$domainID} AND n2.name = 'Support' AND n2.domain_id = {$domainID} AND n1.id < n2.id; - --- CRM-17384 - re-add sid in case the site admin deleted the new support menu after upgrading to 4.6.9 -UPDATE civicrm_navigation SET url = 'https://civicrm.org/register-your-site?src=iam&sid={ldelim}sid{rdelim}' WHERE name = 'Register your site'; -UPDATE civicrm_navigation SET url = 'https://civicrm.org/become-a-member?src=iam&sid={ldelim}sid{rdelim}' WHERE name = 'Join CiviCRM'; - ---CRM-17357 PHP fatal error during creation of receipt PDF -{include file='../CRM/Upgrade/4.6.10.msg_template/civicrm_msg_template.tpl'} diff --git a/CRM/Upgrade/Incremental/sql/4.6.11.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.11.mysql.tpl deleted file mode 100644 index 14ccb97a5a..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.11.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.6.11 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.6.12.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.12.mysql.tpl deleted file mode 100644 index 6ae76a7d9d..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.12.mysql.tpl +++ /dev/null @@ -1,13 +0,0 @@ -{* file to handle db changes in 4.6.12 during upgrade *} - --- CRM-16173, CRM-16831 -SELECT @parent_id := id from `civicrm_navigation` where name = 'System Settings' AND domain_id = {$domainID}; -SELECT @add_weight_id := weight from `civicrm_navigation` where `name` = 'Manage Extensions' and `parent_id` = @parent_id; -UPDATE `civicrm_navigation` -SET `weight` = `weight`+1 -WHERE `parent_id` = @parent_id -AND `weight` > @add_weight_id; -INSERT INTO `civicrm_navigation` -( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight ) -VALUES -( {$domainID}, 'civicrm/a/#/cxn', '{ts escape="sql" skip="true"}Connections{/ts}', 'Connections', 'administer CiviCRM', '', @parent_id , '1', NULL, @add_weight_id + 1 ); diff --git a/CRM/Upgrade/Incremental/sql/4.6.2.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.2.mysql.tpl deleted file mode 100644 index 6397d782aa..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.2.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.6.2 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.6.3.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.3.mysql.tpl deleted file mode 100644 index c9d1db7a91..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.3.mysql.tpl +++ /dev/null @@ -1,73 +0,0 @@ -{* file to handle db changes in 4.6.3 during upgrade *} --- CRM-16307 fix CRM-15578 typo - Require access CiviMail permission for A/B Testing feature -UPDATE civicrm_navigation -SET permission = 'access CiviMail', permission_operator = '' -WHERE name = 'New A/B Test' OR name = 'Manage A/B Tests'; - ---CRM-16320 -{include file='../CRM/Upgrade/4.6.3.msg_template/civicrm_msg_template.tpl'} - --- CRM-16452 Missing administrative divisions for Georgia -SELECT @country_id := id from civicrm_country where name = 'Georgia' AND iso_code = 'GE'; -INSERT INTO civicrm_state_province (country_id, abbreviation, name) - VALUES - (@country_id, "AB", "Abkhazia"), - (@country_id, "AJ", "Adjara"), - (@country_id, "TB", "Tbilisi"), - (@country_id, "GU", "Guria"), - (@country_id, "IM", "Imereti"), - (@country_id, "KA", "Kakheti"), - (@country_id, "KK", "Kvemo Kartli"), - (@country_id, "MM", "Mtskheta-Mtianeti"), - (@country_id, "RL", "Racha-Lechkhumi and Kvemo Svaneti"), - (@country_id, "SZ", "Samegrelo-Zemo Svaneti"), - (@country_id, "SJ", "Samtskhe-Javakheti"), - (@country_id, "SK", "Shida Kartli"); - ---CRM-16391 and CRM-16392 -UPDATE civicrm_uf_field -SET {localize field="label"}label = '{ts escape="sql"}Financial Type{/ts}'{/localize} -WHERE field_type = 'Contribution' AND field_name='financial_type'; - -UPDATE civicrm_uf_field -SET {localize field="label"}label = '{ts escape="sql"}Membership Type{/ts}'{/localize} -WHERE field_type = 'Membership' AND field_name='membership_type'; - --- CRM-16367: adding the shared payment token table -CREATE TABLE IF NOT EXISTS `civicrm_payment_token` ( - `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Payment Token ID', - `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact ID for the owner of the token', - `payment_processor_id` int unsigned NOT NULL , - `token` varchar(255) NOT NULL COMMENT 'Externally provided token string', - `created_date` timestamp DEFAULT CURRENT_TIMESTAMP COMMENT 'Date created', - `created_id` int unsigned COMMENT 'Contact ID of token creator', - `expiry_date` datetime COMMENT 'Date this token expires', - `email` varchar(255) COMMENT 'Email at the time of token creation. Useful for fraud forensics', - `billing_first_name` varchar(255) COMMENT 'Billing first name at the time of token creation. Useful for fraud forensics', - `billing_middle_name` varchar(255) COMMENT 'Billing middle name at the time of token creation. Useful for fraud forensics', - `billing_last_name` varchar(255) COMMENT 'Billing last name at the time of token creation. Useful for fraud forensics', - `masked_account_number` varchar(255) COMMENT 'Holds the part of the card number or account details that may be retained or displayed', - `ip_address` varchar(255) COMMENT 'IP used when creating the token. Useful for fraud forensics' , - PRIMARY KEY ( `id` ), - CONSTRAINT FK_civicrm_payment_token_contact_id FOREIGN KEY (`contact_id`) - REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE, - CONSTRAINT FK_civicrm_payment_token_payment_processor_id FOREIGN KEY (`payment_processor_id`) - REFERENCES `civicrm_payment_processor`(`id`) ON DELETE RESTRICT, - CONSTRAINT FK_civicrm_payment_token_created_id FOREIGN KEY (`created_id`) - REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL -) -ENGINE=InnoDB DEFAULT -CHARACTER SET utf8 -COLLATE utf8_unicode_ci; - --- CRM-16367: adding a reference to the token table to the recurring contributions table. -ALTER TABLE civicrm_contribution_recur - ADD COLUMN `payment_token_id` int(10) unsigned DEFAULT NULL COMMENT 'Optionally used to store a link to a payment token used for this recurring contribution.', - ADD CONSTRAINT `FK_civicrm_contribution_recur_payment_token_id` FOREIGN KEY (`payment_token_id`) REFERENCES `civicrm_payment_token` (`id`) ON DELETE SET NULL; - ---CRM-16480: set total_amount and financial_type fields 'is_required' to null -SELECT @uf_group_id_contribution := max(id) from civicrm_uf_group where name = 'contribution_batch_entry'; -SELECT @uf_group_id_membership := max(id) from civicrm_uf_group where name = 'membership_batch_entry'; - -UPDATE civicrm_uf_field -SET is_required = 0 WHERE uf_group_id IN (@uf_group_id_contribution, @uf_group_id_membership) AND field_name IN ('financial_type', 'total_amount'); diff --git a/CRM/Upgrade/Incremental/sql/4.6.4.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.4.mysql.tpl deleted file mode 100644 index b0c7be82e5..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.4.mysql.tpl +++ /dev/null @@ -1,2 +0,0 @@ -{* file to handle db changes in 4.6.4 during upgrade *} -UPDATE civicrm_uf_group SET group_type = 'Contact,Organization' WHERE civicrm_uf_group.name = 'on_behalf_organization' AND group_type <> 'Contact,Organization'; diff --git a/CRM/Upgrade/Incremental/sql/4.6.5.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.5.mysql.tpl deleted file mode 100644 index 047bea59f5..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.5.mysql.tpl +++ /dev/null @@ -1,35 +0,0 @@ -{* file to handle db changes in 4.6.5 during upgrade *} - --- CRM-16173 -CREATE TABLE IF NOT EXISTS `civicrm_cxn` ( - `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Connection ID', - `app_guid` varchar(128) COMMENT 'Application GUID', - `app_meta` text COMMENT 'Application Metadata (JSON)', - `cxn_guid` varchar(128) COMMENT 'Connection GUID', - `secret` text COMMENT 'Shared secret', - `perm` text COMMENT 'Permissions approved for the service (JSON)', - `options` text COMMENT 'Options for the service (JSON)', - `is_active` tinyint DEFAULT 1 COMMENT 'Is connection currently enabled?', - `created_date` timestamp NULL DEFAULT NULL COMMENT 'When was the connection was created.', - `modified_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When the connection was created or modified.', - `fetched_date` timestamp NULL DEFAULT NULL COMMENT 'The last time the application metadata was fetched.' , - PRIMARY KEY ( `id` ) - , UNIQUE INDEX `UI_appid`( - app_guid - ) - , UNIQUE INDEX `UI_keypair_cxnid`( - cxn_guid - ) -) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ; - --- CRM-16417 add failed payment activity type -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"}Failed Payment{/ts}'{/localize}, @option_group_id_act_val+1, -'Failed Payment', NULL, 1, NULL, @option_group_id_act_wt+1, {localize}'{ts escape="sql"}Failed payment.{/ts}'{/localize}, 0, 1, 1, @contributeCompId, NULL); diff --git a/CRM/Upgrade/Incremental/sql/4.6.6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.6.mysql.tpl deleted file mode 100644 index 3da4eb64e2..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.6.mysql.tpl +++ /dev/null @@ -1,11 +0,0 @@ -{* file to handle db changes in 4.6.6 during upgrade *} - --- CRM-16846 - This upgrade may have been previously skipped so moving it to 4.6.6 --- update permission for editing message templates (CRM-15819) - -SELECT @messages_menu_id := id FROM civicrm_navigation WHERE name = 'Mailings'; - -UPDATE `civicrm_navigation` -SET `permission` = 'edit message templates' -WHERE `parent_id` = @messages_menu_id -AND name = 'Message Templates'; diff --git a/CRM/Upgrade/Incremental/sql/4.6.7.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.7.mysql.tpl deleted file mode 100644 index 665f8dcf9f..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.7.mysql.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{* file to handle db changes in 4.6.7 during upgrade *} - --- CRM-17016 State list for Fiji incomplete -SELECT @country_id := id from civicrm_country where name = 'Fiji' AND iso_code = 'FJ'; -INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES (@country_id, "C", "Central"); diff --git a/CRM/Upgrade/Incremental/sql/4.6.8.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.8.mysql.tpl deleted file mode 100644 index 23b84cf1b3..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.8.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.6.8 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.6.9.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.9.mysql.tpl deleted file mode 100644 index e2b2343081..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.9.mysql.tpl +++ /dev/null @@ -1,59 +0,0 @@ -{* file to handle db changes in 4.6.9 during upgrade *} - --- CRM-17112 - Add Missing countries Saint Barthélemy and Saint Martin -INSERT INTO civicrm_country (name,iso_code,region_id,is_province_abbreviated) VALUES("Saint Barthélemy", "BL", "2", "0"); -INSERT INTO civicrm_country (name,iso_code,region_id,is_province_abbreviated) VALUES("Saint Martin (French part)", "MF", "2", "0"); - --- CRM-17039 - Add credit note for cancelled payments -{include file='../CRM/Upgrade/4.6.9.msg_template/civicrm_msg_template.tpl'} - --- CRM-17258 - Add created id, owner_id to report instances. -ALTER TABLE civicrm_report_instance -ADD COLUMN `created_id` int(10) unsigned DEFAULT NULL COMMENT 'FK to contact table.', -ADD COLUMN `owner_id` int(10) unsigned DEFAULT NULL COMMENT 'FK to contact table.', -ADD CONSTRAINT `FK_civicrm_report_instance_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact` (`id`) ON DELETE SET NULL, -ADD CONSTRAINT `FK_civicrm_report_instance_owner_id` FOREIGN KEY (`owner_id`) REFERENCES `civicrm_contact` (`id`) ON DELETE SET NULL; - --- CRM-16907 -SELECT @navMaxWeight := MAX(ROUND(weight)) from civicrm_navigation WHERE parent_id IS NULL; - --- Add "support" menu if it's not there already -INSERT INTO civicrm_navigation (domain_id, label, name, is_active, weight) -SELECT * FROM (SELECT {$domainID} as domain_id, 'Support' as label, 'Help' as name, 1 as is_active, @navMaxWeight + 1 as weight) AS tmp -WHERE NOT EXISTS ( -SELECT name FROM civicrm_navigation WHERE name = 'Help' AND domain_id = {$domainID} -) LIMIT 1; - -SELECT @adminHelplastID := id FROM civicrm_navigation WHERE name = 'Help' AND domain_id = {$domainID}; - -UPDATE civicrm_navigation -SET name = 'Support', label = '{ts escape="sql" skip="true"}Support{/ts}' -WHERE id = @adminHelplastID; - -DELETE FROM civicrm_navigation where parent_id = @adminHelplastID AND (name = 'Developer' OR url LIKE "http://civicrm.org%"); - -INSERT INTO civicrm_navigation -( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight ) -VALUES -( {$domainID}, 'https://civicrm.org/get-started?src=iam', '{ts escape="sql" skip="true"}Get started{/ts}', 'Get started', NULL, 'AND', @adminHelplastID, '1', NULL, 1 ), -( {$domainID}, 'https://civicrm.org/documentation?src=iam', '{ts escape="sql" skip="true"}Documentation{/ts}', 'Documentation', NULL, 'AND', @adminHelplastID, '1', NULL, 2 ), -( {$domainID}, 'https://civicrm.org/ask-a-question?src=iam', '{ts escape="sql" skip="true"}Ask a question{/ts}', 'Ask a question', NULL, 'AND', @adminHelplastID, '1', NULL, 3 ), -( {$domainID}, 'https://civicrm.org/experts?src=iam', '{ts escape="sql" skip="true"}Get expert help{/ts}', 'Get expert help', NULL, 'AND', @adminHelplastID, '1', NULL, 4 ), -( {$domainID}, 'https://civicrm.org/about?src=iam', '{ts escape="sql" skip="true"}About CiviCRM{/ts}', 'About CiviCRM', NULL, 'AND', @adminHelplastID, '1', 1, 5 ), -( {$domainID}, 'https://civicrm.org/register-your-site?src=iam&sid={ldelim}sid{rdelim}', '{ts escape="sql" skip="true"}Register your site{/ts}', 'Register your site', NULL, 'AND', @adminHelplastID, '1', NULL, 6 ), -( {$domainID}, 'https://civicrm.org/become-a-member?src=iam&sid={ldelim}sid{rdelim}', '{ts escape="sql" skip="true"}Join CiviCRM{/ts}', 'Join CiviCRM', NULL, 'AND', @adminHelplastID, '1', NULL, 7 ); - -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', '', @adminHelplastID, '1', 1, 8 ); - -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}, 'https://civicrm.org/developer-documentation?src=iam', '{ts escape="sql" skip="true"}Developer Docs{/ts}', 'Developer Docs', 'administer CiviCRM', '', @devellastID, '1', NULL, 3 ); - --- Set CiviCRM URLs to https -UPDATE civicrm_navigation SET url = REPLACE(url, 'http://civicrm.org', 'https://civicrm.org'); diff --git a/CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl deleted file mode 100644 index b5b305e1c5..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl +++ /dev/null @@ -1,155 +0,0 @@ -{* file to handle db changes in 4.6.alpha1 during upgrade *} - -{include file='../CRM/Upgrade/4.6.alpha1.msg_template/civicrm_msg_template.tpl'} - --- Financial account relationship -SELECT @option_group_id_arel := max(id) from civicrm_option_group where name = 'account_relationship'; -SELECT @option_group_id_arel_wt := MAX(weight) FROM civicrm_option_value WHERE option_group_id = @option_group_id_arel; -SELECT @option_group_id_arel_val := MAX(CAST( `value` AS UNSIGNED )) FROM civicrm_option_value WHERE option_group_id = @option_group_id_arel; -INSERT INTO - `civicrm_option_value` (`option_group_id`, {localize field='label'}label{/localize}, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, {localize field='description'}`description`{/localize}, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`) -VALUES -(@option_group_id_arel, {localize}'{ts escape="sql"}Sales Tax Account is{/ts}'{/localize}, @option_group_id_arel_val+1, 'Sales Tax Account is', NULL, 0, 0, @option_group_id_arel_wt+1, {localize}'Sales Tax Account is'{/localize}, 0, 1, 1, 2, NULL); - --- Add new column tax_amount in contribution and lineitem table -ALTER TABLE `civicrm_contribution` ADD `tax_amount` DECIMAL( 20, 2 ) DEFAULT NULL COMMENT 'Total tax amount of this contribution.'; -ALTER TABLE `civicrm_line_item` ADD `tax_amount` DECIMAL( 20, 2 ) DEFAULT NULL COMMENT 'tax of each item'; - --- Insert menu item at Administer > CiviContribute, below the Payment Processors. -SELECT @parent_id := id from `civicrm_navigation` where name = 'CiviContribute' AND domain_id = {$domainID}; -SELECT @add_weight_id := weight from `civicrm_navigation` where `name` = 'Payment Processors' and `parent_id` = @parent_id; - -UPDATE `civicrm_navigation` -SET `weight` = `weight`+1 -WHERE `parent_id` = @parent_id -AND `weight` > @add_weight_id; - -INSERT INTO `civicrm_navigation` - ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight ) -VALUES - ( {$domainID}, 'civicrm/admin/setting/preferences/contribute', '{ts escape="sql" skip="true"}CiviContribute Component Settings{/ts}', 'CiviContribute Component Settings', 'administer CiviCRM', '', @parent_id, '1', NULL, @add_weight_id + 1 ); - -CREATE TABLE IF NOT EXISTS `civicrm_mailing_abtest` ( - `id` int unsigned NOT NULL AUTO_INCREMENT , - `name` varchar(128) COMMENT 'Name of the A/B test', - `status` varchar(32) COMMENT 'Status', - `mailing_id_a` int unsigned COMMENT 'The first experimental mailing (\"A\" condition)', - `mailing_id_b` int unsigned COMMENT 'The second experimental mailing (\"B\" condition)', - `mailing_id_c` int unsigned COMMENT 'The final, general mailing (derived from A or B)', - `domain_id` int unsigned COMMENT 'Which site is this mailing for', - `testing_criteria_id` int unsigned , - `winner_criteria_id` int unsigned , - `specific_url` varchar(255) COMMENT 'What specific url to track', - `declare_winning_time` datetime COMMENT 'In how much time to declare winner', - `group_percentage` int unsigned -, - PRIMARY KEY ( `id` ) -) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ; - --- Insert menu items under "Mailings" for A/B Tests -SELECT @parent_id := id from `civicrm_navigation` where name = 'Mailings' AND domain_id = {$domainID}; -SELECT @add_weight_id := weight from `civicrm_navigation` where `name` = 'Find Mass SMS' and `parent_id` = @parent_id; - -UPDATE `civicrm_navigation` -SET `weight` = `weight`+2 -WHERE `parent_id` = @parent_id -AND `weight` > @add_weight_id; - -INSERT INTO `civicrm_navigation` -( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight ) -VALUES -( {$domainID}, 'civicrm/a/#/abtest/new', '{ts escape="sql" skip="true"}New A/B Test{/ts}', 'New A/B Test', 'access CiviMail,create mailings', 'OR', @parent_id , '1', NULL, @add_weight_id + 1 ), -( {$domainID}, 'civicrm/a/#/abtest', '{ts escape="sql" skip="true"}Manage A/B Tests{/ts}', 'Manage A/B Tests', 'access CiviMail,create mailings', 'OR', @parent_id, '1', 1, @add_weight_id + 2 ); - - --- New activity types required for Print and Email Invoice -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(CAST( `value` AS UNSIGNED )) FROM civicrm_option_value WHERE option_group_id = @option_group_id_act; - -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"}Downloaded Invoice{/ts}'{/localize}, @option_group_id_act_val+1, 'Downloaded Invoice', NULL, 1, NULL, @option_group_id_act_wt+1, {localize}'{ts escape="sql"}Downloaded Invoice.{/ts}'{/localize}, 0, 1, 1, NULL, NULL), - (@option_group_id_act, {localize}'{ts escape="sql"}Emailed Invoice{/ts}'{/localize}, @option_group_id_act_val+2, 'Emailed Invoice', NULL, 1, NULL, @option_group_id_act_wt+2, {localize}'{ts escape="sql"}Emailed Invoice.{/ts}'{/localize}, 0, 1, 1, NULL, NULL); - --- New option for Contact Dashboard -SELECT @option_group_id_udOpt := max(id) from civicrm_option_group where name = 'user_dashboard_options'; -SELECT @option_group_id_udOpt_wt := MAX(weight) FROM civicrm_option_value WHERE option_group_id = @option_group_id_udOpt; -SELECT @option_group_id_udOpt_val := MAX(CAST( `value` AS UNSIGNED )) FROM civicrm_option_value WHERE option_group_id = @option_group_id_udOpt; - -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_udOpt, {localize}'{ts escape="sql"}Invoices / Credit Notes{/ts}'{/localize}, @option_group_id_udOpt_val+1, 'Invoices / Credit Notes', NULL, 0, NULL, @option_group_id_udOpt_wt+1, 0, 0, 1, NULL, NULL); - --- Add new column creditnote_id in contribution table -ALTER TABLE `civicrm_contribution` ADD `creditnote_id` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'unique credit note id, system generated or passed in'; - --- Add new column is_billing_required in contribution_page and event table -ALTER TABLE `civicrm_event` ADD COLUMN `is_billing_required` tinyint(4) DEFAULT '0' COMMENT 'Billing block required for Event'; -ALTER TABLE `civicrm_contribution_page` ADD COLUMN `is_billing_required` tinyint(4) DEFAULT '0' COMMENT 'Billing block required for Contribution Page'; - --- CRM-15256 -ALTER TABLE civicrm_action_schedule ADD used_for VARCHAR(64) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Used for repeating entity' AFTER sms_provider_id; - -CREATE TABLE IF NOT EXISTS `civicrm_recurring_entity` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key', - `parent_id` int(10) unsigned NOT NULL COMMENT 'recurring entity parent id', - `entity_id` int(10) unsigned DEFAULT NULL COMMENT 'recurring entity child id', - `entity_table` varchar(64) COLLATE utf8_unicode_ci NOT NULL COMMENT 'physical tablename for entity, e.g. civicrm_event', - `mode` tinyint(4) NOT NULL DEFAULT '1' COMMENT '1-this entity, 2-this and the following entities, 3-all the entities', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=87 ; - --- add batch type for pledge payments -SELECT @option_group_id := id FROM civicrm_option_group WHERE name = 'batch_type'; - -SELECT @max_option_value:= max(ROUND(value)) FROM civicrm_option_value WHERE option_group_id = @option_group_id; - -INSERT INTO civicrm_option_value(option_group_id, {localize field='label'}`label`{/localize}, value, name,weight) -VALUES (@option_group_id, {localize}'{ts escape="sql"}Pledge Payment{/ts}'{/localize}, @max_option_value+1, 'Pledge Payment','3'); - ---CRM-12281: To update name of Latvian provinces. -UPDATE `civicrm_state_province` SET `name` = (N'Jūrmala') where `id` = 3552; -UPDATE `civicrm_state_province` SET `name` = (N'Liepāja') WHERE `id` = 3553; -UPDATE `civicrm_state_province` SET `name` = (N'Rēzekne') WHERE `id` = 3554; -UPDATE `civicrm_state_province` SET `name` = (N'Rīga') WHERE `id` = 3555; - ---CRM-15361: Allow selection of location type when sending bulk email -ALTER TABLE civicrm_mailing ADD COLUMN location_type_id INT(10) unsigned DEFAULT 0 COMMENT 'With email_selection_method, determines which email address to use'; -ALTER TABLE civicrm_mailing ADD COLUMN email_selection_method varchar(20) DEFAULT 'automatic' COMMENT 'With location_type_id, determine how to choose the email address to use.'; - --- CRM-15500 fix -ALTER TABLE `civicrm_action_schedule` CHANGE `limit_to` `limit_to` TINYINT( 4 ) NULL DEFAULT NULL; - --- CRM-15453 Recurring Contributions report template AND instance -SELECT @option_group_id_report := MAX(id) FROM civicrm_option_group WHERE name = 'report_template'; -SELECT @weight := MAX(weight) FROM civicrm_option_value WHERE option_group_id = @option_group_id_report; -SELECT @contribCompId := MAX(id) FROM civicrm_component where name = 'CiviContribute'; -INSERT INTO civicrm_option_value -(option_group_id, {localize field='label'}label{/localize}, value, name, weight, {localize field='description'}description{/localize}, is_active, component_id) VALUES -(@option_group_id_report, {localize}'Recurring Contributions Report'{/localize}, 'contribute/recur', 'CRM_Report_Form_Contribute_Recur', @weight := @weight + 1, {localize}'Shows information about the status of recurring contributions'{/localize}, 1, @contribCompId); -INSERT INTO `civicrm_report_instance` -( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`) -VALUES -( {$domainID}, 'Pending Recurring Contributions', 'contribute/recur', 'Shows all pending recurring contributions', 'access CiviContribute', '{literal}a:39:{s:6:"fields";a:7:{s:9:"sort_name";s:1:"1";s:6:"amount";s:1:"1";s:22:"contribution_status_id";s:1:"1";s:18:"frequency_interval";s:1:"1";s:14:"frequency_unit";s:1:"1";s:12:"installments";s:1:"1";s:8:"end_date";s:1:"1";}s:25:"contribution_status_id_op";s:2:"in";s:28:"contribution_status_id_value";a:1:{i:0;s:1:"5";}s:11:"currency_op";s:2:"in";s:14:"currency_value";a:0:{}s:20:"financial_type_id_op";s:2:"in";s:23:"financial_type_id_value";a:0:{}s:17:"frequency_unit_op";s:2:"in";s:20:"frequency_unit_value";a:0:{}s:22:"frequency_interval_min";s:0:"";s:22:"frequency_interval_max";s:0:"";s:21:"frequency_interval_op";s:3:"lte";s:24:"frequency_interval_value";s:0:"";s:16:"installments_min";s:0:"";s:16:"installments_max";s:0:"";s:15:"installments_op";s:3:"lte";s:18:"installments_value";s:0:"";s:19:"start_date_relative";s:0:"";s:15:"start_date_from";s:0:"";s:13:"start_date_to";s:0:"";s:37:"next_sched_contribution_date_relative";s:0:"";s:33:"next_sched_contribution_date_from";s:0:"";s:31:"next_sched_contribution_date_to";s:0:"";s:17:"end_date_relative";s:0:"";s:13:"end_date_from";s:0:"";s:11:"end_date_to";s:0:"";s:28:"calculated_end_date_relative";s:0:"";s:24:"calculated_end_date_from";s:0:"";s:22:"calculated_end_date_to";s:0:"";s:9:"order_bys";a:1:{i:1;a:1:{s:6:"column";s:1:"-";}}s:11:"description";s:41:"Shows all pending recurring contributions";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:9:"row_count";s:0:"";s:14:"addToDashboard";s:1:"1";s:10:"permission";s:21:"access CiviContribute";s:9:"parent_id";s:0:"";s:11:"instance_id";N;}{/literal}'); - --- CRM-15557-- -ALTER TABLE civicrm_line_item MODIFY COLUMN qty decimal(20,2); - --- CRM-15740 -ALTER TABLE `civicrm_mailing_trackable_url` CHANGE `url` `url` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT 'The URL to be tracked.'; - --- CRM-15765 missing Indonesian provinces and revise outdated names -INSERT INTO `civicrm_state_province` (`id`, `country_id`, `abbreviation`, `name`) -VALUES (NULL, 1102, "SR", "Sulawesi Barat"), (NULL, 1102, "KT", "Kalimantan Tengah"), (NULL, 1102, "KU", "Kalimantan Utara"); - -UPDATE `civicrm_state_province` SET `name`='Kepulauan Bangka Belitung' WHERE `id` = 3056; -UPDATE `civicrm_state_province` SET `name`='Papua Barat', `abbreviation`='PB' WHERE `id` = 3060; -UPDATE `civicrm_state_province` SET `name`='DKI Jakarta' WHERE `id` = 3083; -UPDATE `civicrm_state_province` SET `name`='DI Yogyakarta' WHERE `id` = 3085; -UPDATE `civicrm_state_province` SET `abbreviation`='KI' WHERE `id` = 3066; - --- CRM-15203 Handle MembershipPayment records while upgrade -INSERT INTO civicrm_membership_payment (contribution_id, membership_id) select cc.id, cm.id FROM civicrm_contribution cc LEFT JOIN civicrm_membership_payment cmp ON cc.id = cmp.contribution_id LEFT JOIN civicrm_membership cm ON cc.contribution_recur_id = cm.contribution_recur_id WHERE cc.contribution_recur_id IS NOT NULL AND cmp.id IS NULL AND cm.id IS NOT NULL; diff --git a/CRM/Upgrade/Incremental/sql/4.6.alpha2.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha2.mysql.tpl deleted file mode 100644 index b39393b4b2..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.alpha2.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.6.alpha2 during upgrade *} diff --git a/CRM/Upgrade/Incremental/sql/4.6.alpha3.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha3.mysql.tpl deleted file mode 100644 index db3e801142..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.alpha3.mysql.tpl +++ /dev/null @@ -1,126 +0,0 @@ -{* CRM-16846 - This file may have been accidentally skipped and so is conditionally re-run during 4.6.6 upgrade *} - --- Use proper names for Slovenian municipalities -UPDATE `civicrm_state_province` SET `name` = (N'Ajdovščina') WHERE `id` = 4383; -UPDATE `civicrm_state_province` SET `name` = (N'Braslovče') WHERE `id` = 4392; -UPDATE `civicrm_state_province` SET `name` = (N'Brežice') WHERE `id` = 4395; -UPDATE `civicrm_state_province` SET `name` = (N'Črenšovci') WHERE `id` = 4402; -UPDATE `civicrm_state_province` SET `name` = (N'Črna na Koroškem') WHERE `id` = 4403; -UPDATE `civicrm_state_province` SET `name` = (N'Črnomelj') WHERE `id` = 4404; -UPDATE `civicrm_state_province` SET `name` = (N'Divača') WHERE `id` = 4406; -UPDATE `civicrm_state_province` SET `name` = (N'Domžale') WHERE `id` = 4414; -UPDATE `civicrm_state_province` SET `name` = (N'Gorišnica') WHERE `id` = 4419; -UPDATE `civicrm_state_province` SET `name` = (N'Hoče-Slivnica') WHERE `id` = 4426; -UPDATE `civicrm_state_province` SET `name` = (N'Hodoš') WHERE `id` = 4427; -UPDATE `civicrm_state_province` SET `name` = (N'Horjul') WHERE `id` = 4428; -UPDATE `civicrm_state_province` SET `name` = (N'Ilirska Bistrica') WHERE `id` = 4433; -UPDATE `civicrm_state_province` SET `name` = (N'Ivančna Gorica') WHERE `id` = 4434; -UPDATE `civicrm_state_province` SET `name` = (N'Juršinci') WHERE `id` = 4438; -UPDATE `civicrm_state_province` SET `name` = (N'Kidričevo') WHERE `id` = 4441; -UPDATE `civicrm_state_province` SET `name` = (N'Kočevje') WHERE `id` = 4444; -UPDATE `civicrm_state_province` SET `name` = (N'Križevci') WHERE `id` = 4452; -UPDATE `civicrm_state_province` SET `name` = (N'Krško') WHERE `id` = 4453; -UPDATE `civicrm_state_province` SET `name` = (N'Laško') WHERE `id` = 4456; -UPDATE `civicrm_state_province` SET `name` = (N'Loška dolina') WHERE `id` = 4464; -UPDATE `civicrm_state_province` SET `name` = (N'Loški Potok') WHERE `id` = 4465; -UPDATE `civicrm_state_province` SET `name` = (N'Luče') WHERE `id` = 4467; -UPDATE `civicrm_state_province` SET `name` = (N'Majšperk') WHERE `id` = 4469; -UPDATE `civicrm_state_province` SET `name` = (N'Mengeš') WHERE `id` = 4473; -UPDATE `civicrm_state_province` SET `name` = (N'Mežica') WHERE `id` = 4475; -UPDATE `civicrm_state_province` SET `name` = (N'Miklavž na Dravskem polju') WHERE `id` = 4476; -UPDATE `civicrm_state_province` SET `name` = (N'Mirna Peč') WHERE `id` = 4478; -UPDATE `civicrm_state_province` SET `name` = (N'Moravče') WHERE `id` = 4480; -UPDATE `civicrm_state_province` SET `name` = (N'Novo mesto') WHERE `id` = 4488; -UPDATE `civicrm_state_province` SET `name` = (N'Sveti Andraž v Slovenskih goricah') WHERE `id` = 4490; -UPDATE `civicrm_state_province` SET `name` = (N'Šalovci') WHERE `id` = 4492; -UPDATE `civicrm_state_province` SET `name` = (N'Šempeter-Vrtojba') WHERE `id` = 4493; -UPDATE `civicrm_state_province` SET `name` = (N'Šenčur') WHERE `id` = 4494; -UPDATE `civicrm_state_province` SET `name` = (N'Šentilj') WHERE `id` = 4495; -UPDATE `civicrm_state_province` SET `name` = (N'Šentjernej') WHERE `id` = 4496; -UPDATE `civicrm_state_province` SET `name` = (N'Šentjur') WHERE `id` = 4497; -UPDATE `civicrm_state_province` SET `name` = (N'Škocjan') WHERE `id` = 4498; -UPDATE `civicrm_state_province` SET `name` = (N'Škofja Loka') WHERE `id` = 4499; -UPDATE `civicrm_state_province` SET `name` = (N'Škofljica') WHERE `id` = 4500; -UPDATE `civicrm_state_province` SET `name` = (N'Šmarje pri Jelšah') WHERE `id` = 4501; -UPDATE `civicrm_state_province` SET `name` = (N'Šmartno ob Paki') WHERE `id` = 4502; -UPDATE `civicrm_state_province` SET `name` = (N'Šmartno pri Litiji') WHERE `id` = 4503; -UPDATE `civicrm_state_province` SET `name` = (N'Šoštanj') WHERE `id` = 4504; -UPDATE `civicrm_state_province` SET `name` = (N'Štore') WHERE `id` = 4505; -UPDATE `civicrm_state_province` SET `name` = (N'Tišina') WHERE `id` = 4507; -UPDATE `civicrm_state_province` SET `name` = (N'Trbovlje') WHERE `id` = 4509; -UPDATE `civicrm_state_province` SET `name` = (N'Tržič') WHERE `id` = 4512; -UPDATE `civicrm_state_province` SET `name` = (N'Turnišče') WHERE `id` = 4514; -UPDATE `civicrm_state_province` SET `name` = (N'Velike Lašče') WHERE `id` = 4517; -UPDATE `civicrm_state_province` SET `name` = (N'Veržej') WHERE `id` = 4518; -UPDATE `civicrm_state_province` SET `name` = (N'Zavrč') WHERE `id` = 4527; -UPDATE `civicrm_state_province` SET `name` = (N'Zreče') WHERE `id` = 4528; -UPDATE `civicrm_state_province` SET `name` = (N'Žalec') WHERE `id` = 4529; -UPDATE `civicrm_state_province` SET `name` = (N'Železniki') WHERE `id` = 4530; -UPDATE `civicrm_state_province` SET `name` = (N'Žetale') WHERE `id` = 4531; -UPDATE `civicrm_state_province` SET `name` = (N'Žiri') WHERE `id` = 4532; -UPDATE `civicrm_state_province` SET `name` = (N'Žirovnica') WHERE `id` = 4533; -UPDATE `civicrm_state_province` SET `name` = (N'Žužemberk') WHERE `id` = 4534; - --- Add missing Slovenian municipalities -INSERT INTO civicrm_state_province (country_id, abbreviation, name) -VALUES - (1193, "86", "Ankaran"), - (1193, "87", "Apače"), - (1193, "88", "Cirkulane"), - (1193, "89", "Gorje"), - (1193, "90", "Kostanjevica na Krki"), - (1193, "91", "Log-Dragomer"), - (1193, "92", "Makole"), - (1193, "93", "Mirna"), - (1193, "94", "Mokronog-Trebelno"), - (1193, "95", "Odranci"), - (1193, "96", "Oplotnica"), - (1193, "97", "Ormož"), - (1193, "98", "Osilnica"), - (1193, "99", "Pesnica"), - (1193, "100", "Piran"), - (1193, "101", "Pivka"), - (1193, "102", "Podčetrtek"), - (1193, "103", "Podlehnik"), - (1193, "104", "Podvelka"), - (1193, "105", "Poljčane"), - (1193, "106", "Polzela"), - (1193, "107", "Postojna"), - (1193, "108", "Prebold"), - (1193, "109", "Preddvor"), - (1193, "110", "Prevalje"), - (1193, "111", "Ptuj"), - (1193, "112", "Puconci"), - (1193, "113", "Rače-Fram"), - (1193, "114", "Radeče"), - (1193, "115", "Radenci"), - (1193, "139", "Radlje ob Dravi"), - (1193, "145", "Radovljica"), - (1193, "171", "Ravne na Koroškem"), - (1193, "172", "Razkrižje"), - (1193, "173", "Rečica ob Savinji"), - (1193, "174", "Renče-Vogrsko"), - (1193, "175", "Ribnica"), - (1193, "176", "Ribnica na Pohorju"), - (1193, "177", "Rogaška Slatina"), - (1193, "178", "Rogašovci"), - (1193, "179", "Rogatec"), - (1193, "180", "Ruše"), - (1193, "195", "Selnica ob Dravi"), - (1193, "196", "Semič"), - (1193, "197", "Šentrupert"), - (1193, "198", "Sevnica"), - (1193, "199", "Sežana"), - (1193, "200", "Slovenj Gradec"), - (1193, "201", "Slovenska Bistrica"), - (1193, "202", "Slovenske Konjice"), - (1193, "203", "Šmarješke Toplice"), - (1193, "204", "Sodražica"), - (1193, "205", "Solčava"), - (1193, "206", "Središče ob Dravi"), - (1193, "207", "Starše"), - (1193, "208", "Straža"), - (1193, "209", "Sveta Trojica v Slovenskih goricah"), - (1193, "210", "Sveti Jurij v Slovenskih goricah"), - (1193, "211", "Sveti Tomaž"), - (1193, "212", "Vodice"); diff --git a/CRM/Upgrade/Incremental/sql/4.6.alpha4.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha4.mysql.tpl deleted file mode 100644 index a4b3e7e3d2..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.alpha4.mysql.tpl +++ /dev/null @@ -1,21 +0,0 @@ -{* file to handle db changes in 4.6.alpha4 during upgrade *} ---CRM-15821 PCP Owner Notification - -{include file='../CRM/Upgrade/4.6.alpha4.msg_template/civicrm_msg_template.tpl'} - --- Add new column owner_notify_id in pcp block table -ALTER TABLE `civicrm_pcp_block` ADD `owner_notify_id` INT NULL DEFAULT NULL COMMENT 'FK to option_value where option_group = pcp_owner_notification'; - --- Add new column is_notify in pcp table -ALTER TABLE `civicrm_pcp` ADD `is_notify` INT NOT NULL DEFAULT '0'; - ---Add PCP owner notification option group -INSERT INTO `civicrm_option_group` ( `name`, {localize field='title'}`title`{/localize}, `is_active` ) VALUES ('pcp_owner_notify', {localize}'{ts escape="sql"}PCP owner notifications{/ts}'{/localize}, 1); - -SELECT @ogid_pcp_owner := MAX(id) FROM `civicrm_option_group`; - -INSERT INTO `civicrm_option_value` (`option_group_id`, {localize field='label'}`label`{/localize}, `value`, `name`, `is_default`, `weight`) VALUES (@ogid_pcp_owner, {localize}'{ts escape="sql"}Owner chooses whether to receive notifications{/ts}'{/localize}, '1', 'owner_chooses', 1, 1), (@ogid_pcp_owner, {localize}'{ts escape="sql"}Notifications are sent to ALL owners{/ts}'{/localize}, '2', 'all_owners', 0, 2),(@ogid_pcp_owner, {localize}'{ts escape="sql"}Notifications are NOT available{/ts}'{/localize}, '3', 'no_notifications', 0, 3); - -UPDATE `civicrm_pcp_block` SET `owner_notify_id` = 3; -UPDATE `civicrm_pcp` SET `is_notify` = 0; - diff --git a/CRM/Upgrade/Incremental/sql/4.6.alpha5.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha5.mysql.tpl deleted file mode 100644 index b04f1db600..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.alpha5.mysql.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{* file to handle db changes in 4.6.alpha5 during upgrade *} - --- CRM-15910 -ALTER TABLE `civicrm_contact` - CHANGE COLUMN `external_identifier` `external_identifier` VARCHAR(64) DEFAULT NULL; diff --git a/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl deleted file mode 100644 index dee21cb640..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.alpha6.mysql.tpl +++ /dev/null @@ -1,8 +0,0 @@ -{* file to handle db changes in 4.6.alpha6 during upgrade *} - -UPDATE `civicrm_navigation` SET url = 'civicrm/api' WHERE url = 'civicrm/api/explorer'; - --- 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.6.alpha7.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha7.mysql.tpl deleted file mode 100644 index b915ce303a..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.alpha7.mysql.tpl +++ /dev/null @@ -1,25 +0,0 @@ -{* file to handle db changes in 4.6.alpha7 during upgrade *} - --- location_type_id should have default NULL, not invalid id 0 -ALTER TABLE civicrm_mailing CHANGE `location_type_id` `location_type_id` int(10) unsigned DEFAULT NULL COMMENT 'With email_selection_method, determines which email address to use'; - --- CRM-15970 - Track authorship of of A/B tests -ALTER TABLE civicrm_mailing_abtest - ADD COLUMN `created_id` int unsigned COMMENT 'FK to Contact ID', - ADD COLUMN `created_date` datetime COMMENT 'When was this item created', - ADD COLUMN `testing_criteria` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL, - ADD COLUMN `winner_criteria` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL, - ADD CONSTRAINT FK_civicrm_mailing_abtest_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL; - --- Move A/B test option-values into code -DELETE FROM civicrm_option_group WHERE name IN ('mailing_ab_status', 'mailing_ab_testing_criteria', 'mailing_ab_winner_criteria'); -UPDATE civicrm_mailing_abtest SET testing_criteria = 'subject' WHERE testing_criteria_id = 1; -UPDATE civicrm_mailing_abtest SET testing_criteria = 'from' WHERE testing_criteria_id = 2; -UPDATE civicrm_mailing_abtest SET testing_criteria = 'full_email' WHERE testing_criteria_id = 3; -UPDATE civicrm_mailing_abtest SET winner_criteria = 'open' WHERE winner_criteria_id = 1; -UPDATE civicrm_mailing_abtest SET winner_criteria = 'unique_click' WHERE winner_criteria_id = 2; -UPDATE civicrm_mailing_abtest SET winner_criteria = 'link_click' WHERE winner_criteria_id = 3; - -ALTER TABLE civicrm_mailing_abtest - DROP COLUMN `testing_criteria_id`, - DROP COLUMN `winner_criteria_id`; diff --git a/CRM/Upgrade/Incremental/sql/4.6.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.beta1.mysql.tpl deleted file mode 100644 index 9d87b0710b..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.beta1.mysql.tpl +++ /dev/null @@ -1,99 +0,0 @@ -{* file to handle db changes in 4.6.beta1 during upgrade *} --- See https://issues.civicrm.org/jira/browse/CRM-15361 -UPDATE civicrm_mailing SET location_type_id = NULL WHERE location_type_id = 0; -ALTER TABLE civicrm_mailing ADD CONSTRAINT FK_civicrm_mailing_location_type_id FOREIGN KEY FK_civicrm_mailing_location_type_id(`location_type_id`) REFERENCES `civicrm_location_type`(`id`) ON DELETE SET NULL; - -SELECT @parent_id := id from `civicrm_navigation` where name = 'Customize Data and Screens' AND domain_id = {$domainID}; -SELECT @add_weight_id := weight from `civicrm_navigation` where `name` = 'Search Preferences' and `parent_id` = @parent_id; -UPDATE `civicrm_navigation` -SET `weight` = `weight`+1 -WHERE `parent_id` = @parent_id -AND `weight` > @add_weight_id; -INSERT INTO `civicrm_navigation` -( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight ) -VALUES -( {$domainID}, 'civicrm/admin/setting/preferences/date?reset=1', '{ts escape="sql" skip="true"}Date Preferences{/ts}', 'Date Preferences', 'administer CiviCRM', '', @parent_id , '1', NULL, @add_weight_id + 1 ); - - --- CRM-15934 -SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Quota'; -INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern) - VALUES - (@bounceTypeID, 'doesn.t have enough disk space left'), - (@bounceTypeID, 'exceeded storage allocation'), - (@bounceTypeID, 'running out of disk space'); - -UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = '(disk(space)?|over the allowed|exceed(ed|s)?|storage) quota' WHERE `pattern` = '(disk|over the allowed|exceed(ed|s)?|storage) quota'; -UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = '(mail|in)(box|folder) ((for user \\w+ )?is )?full' WHERE `pattern` = 'mailbox ((for user w+ )?is )?full'; -UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'mailbox (has exceeded|is over) the limit' WHERE `pattern` = 'mailbox has exceeded the limit'; -UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'quota ?(usage|violation|exceeded)' WHERE `pattern` = 'quota (usage|violation|exceeded)'; - -SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Inactive'; -INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern) - VALUES - (@bounceTypeID, 'account that you tried to reach is disabled'), - (@bounceTypeID, 'User banned'); - -UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'not accepting (mail|messages)' WHERE `pattern` = 'not accepting mail'; - -SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Loop'; -UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = '(mail( forwarding)?|routing).loop' WHERE `pattern` = '(mail|routing) loop'; -UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'too many (hops|recursive forwards)' WHERE `pattern` = 'too many hops'; - -SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Relay'; -INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern) - VALUES - (@bounceTypeID, 'unrouteable address'), - (@bounceTypeID, 'We don.t handle mail for'), - (@bounceTypeID, 'we do not relay'), - (@bounceTypeID, 'Rejected by next-hop'), - (@bounceTypeID, 'not permitted to( *550)? relay through this server'); - -UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'relay(ing)? (not permitted|(access )?denied)' WHERE `pattern` = 'relay (not permitted|access denied)'; - -SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Host'; -INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern) - VALUES - (@bounceTypeID, 'server requires authentication'), - (@bounceTypeID, 'authentication (is )?required'); - -UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'server is (down or unreachable|not responding)' WHERE `pattern` = 'server is down or unreachable'; - -SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Invalid'; -INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern) - VALUES - (@bounceTypeID, '5.1.0 Address rejected'), - (@bounceTypeID, 'no valid recipients?'), - (@bounceTypeID, 'RecipNotFound'), - (@bounceTypeID, 'no one at this address'), - (@bounceTypeID, 'misconfigured forwarding address'), - (@bounceTypeID, 'account is not allowed'), - (@bounceTypeID, 'Address .<[^>]*>. not known here'), - (@bounceTypeID, '{literal}Recipient address rejected: ([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}{/literal}'), - (@bounceTypeID, 'Non sono riuscito a trovare l.indirizzo e-mail'), - (@bounceTypeID, 'nadie con esta direcci..?n'), - (@bounceTypeID, 'ni bilo mogo..?e najti prejemnikovega e-po..?tnega naslova'), - (@bounceTypeID, 'Elektronski naslov (je ukinjen|ne obstaja)'), - (@bounceTypeID, 'nepravilno nastavljen predal'); - -UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'address(es)?( you (entered|specified))? (could|was)( not|n.t)( be)? found' WHERE `pattern` = 'address(es)? could not be found'; -UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'address(ee)? (unknown|invalid)' WHERE `pattern` = 'addressee unknown'; -UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = '(mail )?delivery (to this user )?is not allowed' WHERE `pattern` = 'mail delivery to this user is not allowed'; -UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'no such (mail drop|mailbox( \\w+)?|(e-?mail )?address|recipient|(local )?user|person)( here)?' WHERE `pattern` = 'no such (mail drop|mailbox( w+)?|(e-?mail )?address|recipient|(local )?user)( here)?'; -UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'no mailbox (here )?by that name' WHERE `pattern` = 'no mailbox here by that name'; -UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'recipient (does not exist|(is )?unknown|rejected|denied|not found)' WHERE `pattern` = 'recipient (does not exist|(is )?unknown)'; -UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = 'unknown (local( |-)part|recipient|address error)' WHERE `pattern` = 'unknown (local( |-)part|recipient)'; - -SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Spam'; -INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern) - VALUES - (@bounceTypeID, 'Client host .[^ ]*. blocked'), - (@bounceTypeID, 'automatic(ally-generated)? messages are not accepted'), - (@bounceTypeID, 'denied by policy'), - (@bounceTypeID, 'has no corresponding reverse \\(PTR\\) address'), - (@bounceTypeID, 'has a policy that( [^ ]*)? prohibited the mail that you sent'), - (@bounceTypeID, 'is likely unsolicited mail'), - (@bounceTypeID, 'Local Policy Violation'), - (@bounceTypeID, 'ni bilo mogo..?e dostaviti zaradi varnostnega pravilnika'); - -UPDATE `civicrm_mailing_bounce_pattern` SET `pattern` = '(detected|rejected) as spam' WHERE `pattern` = 'detected as spam'; diff --git a/CRM/Upgrade/Incremental/sql/4.6.beta2.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.beta2.mysql.tpl deleted file mode 100644 index fa8109ae9c..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.beta2.mysql.tpl +++ /dev/null @@ -1,8 +0,0 @@ -{* file to handle db changes in 4.6.beta2 during upgrade *} --- CRM-16018 -ALTER TABLE `civicrm_membership_block` CHANGE `membership_types` `membership_types` VARCHAR( 1024 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci COMMENT 'Membership types to be exposed by this block.'; - --- CRM-15578 Require access CiviMail permission for A/B Testing feature -UPDATE civicrm_navigation -SET permission = 'access CivMail', permission_operator = '' -WHERE name = 'New A/B Test' OR name = 'Manage A/B Tests'; diff --git a/CRM/Upgrade/Incremental/sql/4.6.beta3.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.beta3.mysql.tpl deleted file mode 100644 index a93f69ec8f..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.beta3.mysql.tpl +++ /dev/null @@ -1,27 +0,0 @@ -{* file to handle db changes in 4.6.beta3 during upgrade *} - -{*--CRM-15979 - differentiate between standalone mailings, A/B tests, and A/B final-winner *} -ALTER TABLE `civicrm_mailing` ADD mailing_type varchar(32) CHARACTER SET utf8 COLLATE utf8_unicode_ci COMMENT 'differentiate between standalone mailings, A/B tests, and A/B final-winner'; - -UPDATE `civicrm_mailing`cm -LEFT JOIN civicrm_mailing_abtest ab -ON cm.id = ab.mailing_id_a - OR cm.id = ab.mailing_id_b - OR cm.id = ab.mailing_id_c - SET `mailing_type` = CASE - WHEN cm.id IN (ab.mailing_id_a,ab.mailing_id_b) THEN 'experiment' - WHEN cm.id IN (ab.mailing_id_c) THEN 'winner' - ELSE 'standalone' - END -WHERE cm.id IS NOT NULL; - --- CRM-16059 -UPDATE civicrm_state_province SET name = 'Dobrich' WHERE name = 'Dobric'; -UPDATE civicrm_state_province SET name = 'Yambol' WHERE name = 'Jambol'; -UPDATE civicrm_state_province SET name = 'Kardzhali' WHERE name = 'Kardzali'; -UPDATE civicrm_state_province SET name = 'Kyustendil' WHERE name = 'Kjstendil'; -UPDATE civicrm_state_province SET name = 'Lovech' WHERE name = 'Lovec'; -UPDATE civicrm_state_province SET name = 'Smolyan' WHERE name = 'Smoljan'; -UPDATE civicrm_state_province SET name = 'Shumen' WHERE name = 'Sumen'; -UPDATE civicrm_state_province SET name = 'Targovishte' WHERE name = 'Targoviste'; -UPDATE civicrm_state_province SET name = 'Vratsa' WHERE name = 'Vraca'; diff --git a/CRM/Upgrade/Incremental/sql/4.6.beta4.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.beta4.mysql.tpl deleted file mode 100644 index 21593636ad..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.beta4.mysql.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{* file to handle db changes in 4.6.beta4 during upgrade *} --- CRM-14792 -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(CAST( `value` AS UNSIGNED )) FROM civicrm_option_value WHERE option_group_id = @option_group_id_act; - -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"}Contact Merged{/ts}'{/localize}, @option_group_id_act_val+1, 'Contact Merged', NULL, 1, NULL, @option_group_id_act_wt+1, {localize}'{ts escape="sql"}Contact Merged{/ts}'{/localize}, 0, 1, 1, NULL, NULL); diff --git a/CRM/Upgrade/Incremental/sql/4.6.beta5.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.beta5.mysql.tpl deleted file mode 100644 index 4575b4ac28..0000000000 --- a/CRM/Upgrade/Incremental/sql/4.6.beta5.mysql.tpl +++ /dev/null @@ -1 +0,0 @@ -{* file to handle db changes in 4.6.beta5 during upgrade *} -- 2.25.1