Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Additional fixes to workflow templates #15749

Merged
merged 2 commits into from
Nov 6, 2019
Merged

Additional fixes to workflow templates #15749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb34252
Additional changes to workflow message templates
magnolia61 Nov 6, 2019
8406034
Fix Smarty Syntax in payment_or_refund_notification_text template and…
seamuslee001 Nov 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions tests/phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public function testAddPaymentUsingCreditCardForPartiallyPaidContribution() {
'From: site@something.com',
'Dear Anthony,',
'Payment Details',
'Total Fees: $ 100.00',
'Total Amount: $ 100.00',
'This Payment Amount: $ 70.00',
'Balance Owed: $ 0.00 ',
'Billing Name and Address',
Expand Down Expand Up @@ -238,8 +238,8 @@ public function testMultiplePaymentForPartiallyPaidContributionWithOneCreditCard
$mut->assertSubjects(['Payment Receipt - Mr. Anthony Anderson II']);
$mut->checkMailLog([
'Dear Anthony,',
'A payment has been received',
'Total Fees: $ 100.00',
'Below you will find a receipt for this payment.',
'Total Amount: $ 100.00',
'This Payment Amount: $ 50.00',
'Balance Owed: $ 20.00 ',
'Paid By: Check',
Expand Down Expand Up @@ -268,8 +268,8 @@ public function testAddPaymentUsingCreditCardForPendingPayLaterContribution() {
$this->checkResults([100], 1);

$mut->checkMailLog([
'A payment has been received',
'Total Fees: $ 100.00',
'Below you will find a receipt for this payment.',
'Total Amount: $ 100.00',
'This Payment Amount: $ 100.00',
'Balance Owed: $ 0.00 ',
'Paid By: Credit Card',
Expand Down
10 changes: 5 additions & 5 deletions tests/phpunit/api/v3/PaymentTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ public function testPaymentEmailReceipt() {
$mut->checkMailLog([
'From: "FIXME" <info@EXAMPLE.ORG>',
'Dear Anthony,',
'Total Fees: $ 300.00',
'Total Amount: $ 300.00',
'This Payment Amount: $ 50.00',
//150 was paid in the 1st payment.
'Balance Owed: $ 100.00',
Expand Down Expand Up @@ -221,8 +221,8 @@ public function testPaymentEmailReceiptFullyPaid() {
$mut->checkMailLog([
'From: "FIXME" <info@EXAMPLE.ORG>',
'Dear Anthony,',
'A payment has been received.',
'Total Fees: $ 300.00',
'Below you will find a receipt for this payment.',
'Total Amount: $ 300.00',
'This Payment Amount: $ 150.00',
'Balance Owed: $ 0.00',
'Thank you for completing this payment.',
Expand Down Expand Up @@ -273,12 +273,12 @@ public function testRefundEmailReceipt($thousandSeparator) {
$mut->checkMailLog([
'Dear Anthony,',
'A refund has been issued based on changes in your registration selections.',
'Total Fees: $ 300' . $decimalSeparator . '00',
'Total Amount: $ 300' . $decimalSeparator . '00',
'Refund Amount: $ -30' . $decimalSeparator . '00',
'Event Information and Location',
'Paid By: Check',
'Transaction Date: November 13th, 2018 12:01 PM',
'You Paid: $ 170' . $decimalSeparator . '00',
'Totally Paid: $ 170' . $decimalSeparator . '00',
]);
$mut->stop();
$mut->clearMessages();
Expand Down
2 changes: 1 addition & 1 deletion xml/templates/message_templates/case_activity_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{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;">
<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">

<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
Expand Down
2 changes: 1 addition & 1 deletion xml/templates/message_templates/contribution_dupalert_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{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;">
<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">

<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
Expand Down
2 changes: 1 addition & 1 deletion xml/templates/message_templates/contribution_offline_receipt_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{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;">
<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">

<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
Expand Down
4 changes: 2 additions & 2 deletions xml/templates/message_templates/contribution_online_receipt_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}

<center>
<table width="500" border="0" cellpadding="0" cellspacing="0" id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left;">
<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">

<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
Expand All @@ -33,7 +33,7 @@
</td>
</tr>
</table>
<table width="500" style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;">
<table style="width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;">

{if $amount}

Expand Down
6 changes: 3 additions & 3 deletions xml/templates/message_templates/contribution_recurring_billing_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{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;">
<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">

<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
Expand All @@ -28,8 +28,8 @@
<tr>
</table>

<table width="500" style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;">
<tr>
<table style="width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;">
<tr>
<th {$headerStyle}>
{ts}Billing Name and Address{/ts}
</th>
Expand Down
2 changes: 1 addition & 1 deletion xml/templates/message_templates/contribution_recurring_cancelled_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{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;">
<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">

<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
Expand Down
2 changes: 1 addition & 1 deletion xml/templates/message_templates/contribution_recurring_edit_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{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;">
<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">

<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
Expand Down
2 changes: 1 addition & 1 deletion xml/templates/message_templates/contribution_recurring_notify_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{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;">
<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">

<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
Expand Down
4 changes: 2 additions & 2 deletions xml/templates/message_templates/event_offline_receipt_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{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;">
<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">

<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
Expand All @@ -21,7 +21,7 @@

<tr>
<td>
<p>{contact.email_greeting}</p>
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}<p>{$greeting},</p>{/if}

{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}
<p>{$event.confirm_email_text|htmlize}</p>
Expand Down
2 changes: 1 addition & 1 deletion xml/templates/message_templates/event_offline_receipt_text.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{contact.email_greeting}
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}{$greeting},{/if}
{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}
{$event.confirm_email_text}
{/if}
Expand Down
12 changes: 5 additions & 7 deletions xml/templates/message_templates/event_online_receipt_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@


<center>
<table width="700" border="0" cellpadding="0" cellspacing="0" id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left;">
<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">

<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
Expand Down Expand Up @@ -56,7 +56,7 @@
</tr>
<tr>
<td>
<table width="700" style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;">
<table style="width:100%; max-width:700px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;">
<tr>
<th {$headerStyle}>
{ts}Event Information and Location{/ts}
Expand Down Expand Up @@ -246,9 +246,9 @@
{if $individual}
<tr {$participantTotal}>
<td colspan=3>{ts}Participant Total{/ts}</td>
<td colspan=2>{$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney}</td>
<td colspan=1>{$individual.$priceset.totalTaxAmt|crmMoney}</td>
<td colspan=2>{$individual.$priceset.totalAmtWithTax|crmMoney}</td>
<td colspan=2>{$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney}</td>
<td colspan=1>{$individual.$priceset.totalTaxAmt|crmMoney}</td>
<td colspan=2>{$individual.$priceset.totalAmtWithTax|crmMoney}</td>
</tr>
{/if}
</table>
Expand Down Expand Up @@ -503,8 +503,6 @@
</td>
</tr>
{/if}
</td>
</tr>
</table>
</center>

Expand Down
2 changes: 1 addition & 1 deletion xml/templates/message_templates/event_registration_receipt_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
{$source}
{/if}
<p>&nbsp;</p>
<table width="600">
<table width="700">
<thead>
<tr>
{if $line_items}
Expand Down
2 changes: 1 addition & 1 deletion xml/templates/message_templates/friend_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{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;">
<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">

<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
Expand Down
6 changes: 3 additions & 3 deletions xml/templates/message_templates/membership_autorenew_billing_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{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;">
<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">

<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
Expand All @@ -28,8 +28,8 @@
<tr>
</table>

<table width="500" style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;">
<tr>
<table style="width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;">
<tr>
<th {$headerStyle}>
{ts}Billing Name and Address{/ts}
</th>
Expand Down
4 changes: 2 additions & 2 deletions xml/templates/message_templates/membership_autorenew_cancelled_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}

<center>
<table width="500" border="0" cellpadding="0" cellspacing="0" id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left;">
<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">

<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
Expand All @@ -27,7 +27,7 @@
</td>
</tr>
</table>
<table width="500" style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;">
<table style="width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;">

<tr>
<th {$headerStyle}>
Expand Down
2 changes: 1 addition & 1 deletion xml/templates/message_templates/membership_offline_receipt_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{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;">
<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">

<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
Expand Down
4 changes: 2 additions & 2 deletions xml/templates/message_templates/membership_online_receipt_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}

<center>
<table width="500" border="0" cellpadding="0" cellspacing="0" id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left;">
<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">

<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
Expand All @@ -33,7 +33,7 @@
</td>
</tr>
</table>
<table width="500" style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;">
<table style="width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;">

{if $membership_assign && !$useForMember}
<tr>
Expand Down
2 changes: 1 addition & 1 deletion xml/templates/message_templates/participant_cancelled_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{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;">
<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">

<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
Expand Down
9 changes: 4 additions & 5 deletions xml/templates/message_templates/participant_confirm_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
{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;">

<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">
<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
<!-- END HEADER -->
Expand All @@ -34,14 +33,14 @@
<tr>
<td colspan="2" {$valueStyle}>
{capture assign=confirmUrl}{crmURL p='civicrm/event/confirm' q="reset=1&participantId=`$participant.id`&cs=`$checksumValue`" a=true h=0 fe=1}{/capture}
<a href="{$confirmUrl}">{ts}Go to a web page where you can confirm your registration online{/ts}</a>
<a href="{$confirmUrl}">{ts}Click here to confirm and complete your registration{/ts}</a>
</td>
</tr>
{/if}
{if $event.allow_selfcancelxfer }
{ts}This event allows for self-cancel or transfer{/ts}
{ts}This event allows for{/ts}
{capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participantID`&{contact.checksum}" h=0 a=1 fe=1}{/capture}
<a href="{$selfService}">{ts}Self service cancel transfer{/ts}</a>
<a href="{$selfService}"> {ts}self service cancel or transfer{/ts}</a>
{/if}

<tr>
Expand Down
2 changes: 1 addition & 1 deletion xml/templates/message_templates/participant_expired_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{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;">
<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">

<!-- BEGIN HEADER -->
<!-- You can add table row(s) here with logo or other header elements -->
Expand Down
2 changes: 1 addition & 1 deletion xml/templates/message_templates/participant_transferred_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{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;">
<table id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;">

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