Skip to content

Commit

Permalink
CRM-20184_Missing_{contact.email_greeting}_in_Workflow_Templates [&di…
Browse files Browse the repository at this point in the history 
…splayname in subject]
  • Loading branch information
@monishdeb @magnolia61
monishdeb authored and magnolia61 committed Mar 20, 2018
1 parent 09f2c73 commit bda01be
Show file tree
Hide file tree
Showing 113 changed files with 4,296 additions and 55 deletions.
16 changes: 16 additions & 0 deletions CRM/Upgrade/5.0.beta1.msg_template/civicrm_msg_template.tpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{php}
$dir = SMARTY_DIR . '/../../CRM/Upgrade/5.0.beta1.msg_template/message_templates';
$templates = array();
foreach (preg_grep('/\.tpl$/', scandir($dir)) as $filename) {
$parts = explode('_', basename($filename, '.tpl'));
$templates[] = array('type' => array_pop($parts), 'name' => implode('_', $parts), 'filename' => "$dir/$filename");
}
$this->assign('templates', $templates);
{/php}

{foreach from=$templates item=tpl}
{fetch assign=content file=$tpl.filename}
SELECT @workflow_id := MAX(id) FROM civicrm_option_value WHERE name = '{$tpl.name}';
SELECT @content := msg_{$tpl.type} FROM civicrm_msg_template WHERE workflow_id = @workflow_id AND is_reserved = 1 LIMIT 1;
UPDATE civicrm_msg_template SET msg_{$tpl.type} = '{$content|escape:"quotes"}' WHERE workflow_id = @workflow_id AND (is_reserved = 1 OR (is_default = 1 AND msg_{$tpl.type} = @content));
{/foreach}
12 changes: 12 additions & 0 deletions ...Upgrade/5.0.beta1.msg_template/message_templates/contribution_invoice_receipt_subject.tpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{if $title}
{if $component}
{if $component == 'event'}
{ts 1=$title}Event Registration Invoice: %1{/ts}
{else}
{ts 1=$title}Contribution Invoice: %1{/ts}
{/if}
{/if}
{else}
{ts}Invoice{/ts}
{/if}
- {contact.display_name}
319 changes: 319 additions & 0 deletions CRM/Upgrade/5.0.beta1.msg_template/message_templates/contribution_offline_receipt_html.tpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,319 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title></title>
</head>
<body>

{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}

<center>
<table width="620" border="0" cellpadding="0" cellspacing="0" id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left;">

<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
<!-- END HEADER -->

<!-- BEGIN CONTENT -->

<tr>
<td>
<p>{contact.email_greeting},</p>
{if $formValues.receipt_text}
<p>{$formValues.receipt_text|htmlize}</p>
{else}
<p>{ts}Thank you for your support.{/ts}</p>
{/if}

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

</td>
</tr>
<tr>
<td>
<table style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;">
<tr>
<th {$headerStyle}>
{ts}Contribution Information{/ts}
</th>
</tr>
<tr>
<td {$labelStyle}>
{ts}Financial Type{/ts}
</td>
<td {$valueStyle}>
{$formValues.contributionType_name}
</td>
</tr>

{if $lineItem and !$is_quick_config}
{foreach from=$lineItem item=value key=priceset}
<tr>
<td colspan="2" {$valueStyle}>
<table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}
<tr>
<th>{ts}Item{/ts}</th>
<th>{ts}Qty{/ts}</th>
<th>{ts}Each{/ts}</th>
{if $getTaxDetails}
<th>{ts}Subtotal{/ts}</th>
<th>{ts}Tax Rate{/ts}</th>
<th>{ts}Tax Amount{/ts}</th>
{/if}
<th>{ts}Total{/ts}</th>
</tr>
{foreach from=$value item=line}
<tr>
<td>
{if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:"..."}</div>{/if}
</td>
<td>
{$line.qty}
</td>
<td>
{$line.unit_price|crmMoney:$currency}
</td>
{if $getTaxDetails}
<td>
{$line.unit_price*$line.qty|crmMoney:$currency}
</td>
{if $line.tax_rate != "" || $line.tax_amount != ""}
<td>
{$line.tax_rate|string_format:"%.2f"}%
</td>
<td>
{$line.tax_amount|crmMoney:$currency}
</td>
{else}
<td></td>
<td></td>
{/if}
{/if}
<td>
{$line.line_total+$line.tax_amount|crmMoney:$currency}
</td>
</tr>
{/foreach}
</table>
</td>
</tr>
{/foreach}
{/if}
{if $getTaxDetails && $dataArray}
<tr>
<td {$labelStyle}>
{ts} Amount before Tax : {/ts}
</td>
<td {$valueStyle}>
{$formValues.total_amount-$totalTaxAmount|crmMoney:$currency}
</td>
</tr>

{foreach from=$dataArray item=value key=priceset}
<tr>
{if $priceset || $priceset == 0 || $value != ''}
<td>&nbsp;{$taxTerm} {$priceset|string_format:"%.2f"}%</td>
<td>&nbsp;{$value|crmMoney:$currency}</td>
{else}
<td>&nbsp;{ts}No{/ts} {$taxTerm}</td>
<td>&nbsp;{$value|crmMoney:$currency}</td>
{/if}
</tr>
{/foreach}
{/if}

{if isset($totalTaxAmount) && $totalTaxAmount !== 'null'}
<tr>
<td {$labelStyle}>
{ts}Total Tax Amount{/ts}
</td>
<td {$valueStyle}>
{$totalTaxAmount|crmMoney:$currency}
</td>
</tr>
{/if}

<tr>
<td {$labelStyle}>
{ts}Total Amount{/ts}
</td>
<td {$valueStyle}>
{$formValues.total_amount|crmMoney:$currency}
</td>
</tr>

{if $receive_date}
<tr>
<td {$labelStyle}>
{ts}Date Received{/ts}
</td>
<td {$valueStyle}>
{$receive_date|truncate:10:''|crmDate}
</td>
</tr>
{/if}

{if $receipt_date}
<tr>
<td {$labelStyle}>
{ts}Receipt Date{/ts}
</td>
<td {$valueStyle}>
{$receipt_date|truncate:10:''|crmDate}
</td>
</tr>
{/if}

{if $formValues.paidBy and !$formValues.hidden_CreditCard}
<tr>
<td {$labelStyle}>
{ts}Paid By{/ts}
</td>
<td {$valueStyle}>
{$formValues.paidBy}
</td>
</tr>
{if $formValues.check_number}
<tr>
<td {$labelStyle}>
{ts}Check Number{/ts}
</td>
<td {$valueStyle}>
{$formValues.check_number}
</td>
</tr>
{/if}
{/if}

{if $formValues.trxn_id}
<tr>
<td {$labelStyle}>
{ts}Transaction ID{/ts}
</td>
<td {$valueStyle}>
{$formValues.trxn_id}
</td>
</tr>
{/if}

{if $ccContribution}
<tr>
<th {$headerStyle}>
{ts}Billing Name and Address{/ts}
</th>
</tr>
<tr>
<td colspan="2" {$valueStyle}>
{$billingName}<br />
{$address|nl2br}
</td>
</tr>
<tr>
<th {$headerStyle}>
{ts}Credit Card Information{/ts}
</th>
</tr>
<tr>
<td colspan="2" {$valueStyle}>
{$credit_card_type}<br />
{$credit_card_number}<br />
{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
</td>
</tr>
{/if}

{if $softCreditTypes and $softCredits}
{foreach from=$softCreditTypes item=softCreditType key=n}
<tr>
<th {$headerStyle}>
{$softCreditType}
</th>
</tr>
{foreach from=$softCredits.$n item=value key=label}
<tr>
<td {$labelStyle}>
{$label}
</td>
<td {$valueStyle}>
{$value}
</td>
</tr>
{/foreach}
{/foreach}
{/if}

{if $customGroup}
{foreach from=$customGroup item=value key=customName}
<tr>
<th {$headerStyle}>
{$customName}
</th>
</tr>
{foreach from=$value item=v key=n}
<tr>
<td {$labelStyle}>
{$n}
</td>
<td {$valueStyle}>
{$v}
</td>
</tr>
{/foreach}
{/foreach}
{/if}

{if $formValues.product_name}
<tr>
<th {$headerStyle}>
{ts}Premium Information{/ts}
</th>
</tr>
<tr>
<td colspan="2" {$labelStyle}>
{$formValues.product_name}
</td>
</tr>
{if $formValues.product_option}
<tr>
<td {$labelStyle}>
{ts}Option{/ts}
</td>
<td {$valueStyle}>
{$formValues.product_option}
</td>
</tr>
{/if}
{if $formValues.product_sku}
<tr>
<td {$labelStyle}>
{ts}SKU{/ts}
</td>
<td {$valueStyle}>
{$formValues.product_sku}
</td>
</tr>
{/if}
{if $fulfilled_date}
<tr>
<td {$labelStyle}>
{ts}Sent{/ts}
</td>
<td {$valueStyle}>
{$fulfilled_date|truncate:10:''|crmDate}
</td>
</tr>
{/if}
{/if}

</table>
</td>
</tr>

</table>
</center>

</body>
</html>
1 change: 1 addition & 0 deletions ...Upgrade/5.0.beta1.msg_template/message_templates/contribution_offline_receipt_subject.tpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ts}Contribution Receipt{/ts} - {contact.display_name}
Loading

0 comments on commit bda01be

Please sign in to comment.