projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: eaf1475)
CRM-17815 fix
authorWeb Access <rohan.katkar@webaccessglobal.com>
Fri, 15 Jan 2016 09:40:53 +0000 (15:10 +0530)
committerWeb Access <rohan.katkar@webaccessglobal.com>
Wed, 20 Jan 2016 05:37:08 +0000 (11:07 +0530)
CRM/Contribute/Form/Task/Invoice.php patch | blob | blame | history
CRM/Upgrade/4.7.beta8.msg_template/civicrm_msg_template.tpl [new file with mode: 0644] patch | blob
CRM/Upgrade/4.7.beta8.msg_template/message_templates/contribution_invoice_receipt_html.tpl [new file with mode: 0644] patch | blob
CRM/Upgrade/Incremental/sql/4.7.beta8.mysql.tpl patch | blob | blame | history
xml/templates/message_templates/contribution_invoice_receipt_html.tpl patch | blob | blame | history

diff --git a/CRM/Contribute/Form/Task/Invoice.php b/CRM/Contribute/Form/Task/Invoice.php
index f0a0c912ecd40018a86ae4d85f8ef3103d089314..90cd0e3dfca8d9894bb35df315bed03286dd7604 100644 (file)
--- a/CRM/Contribute/Form/Task/Invoice.php
+++ b/CRM/Contribute/Form/Task/Invoice.php
@@ -245,6 +245,7 @@ class CRM_Contribute_Form_Task_Invoice extends CRM_Contribute_Form_Task {
     $contributionStatusID = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
     $refundedStatusId = CRM_Utils_Array::key('Refunded', $contributionStatusID);
     $cancelledStatusId = CRM_Utils_Array::key('Cancelled', $contributionStatusID);
+    $pendingStatusId = CRM_Utils_Array::key('Pending', $contributionStatusID);
 
     // getting data from admin page
     $prefixValue = Civi::settings()->get('contribution_invoice_settings');
@@ -428,6 +429,7 @@ class CRM_Contribute_Form_Task_Invoice extends CRM_Contribute_Form_Task {
         'lineItem' => $lineItem,
         'dataArray' => $dataArray,
         'refundedStatusId' => $refundedStatusId,
+        'pendingStatusId' => $pendingStatusId,
         'cancelledStatusId' => $cancelledStatusId,
         'contribution_status_id' => $contribution->contribution_status_id,
         'subTotal' => $subTotal,
diff --git a/CRM/Upgrade/4.7.beta8.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.7.beta8.msg_template/civicrm_msg_template.tpl
new file mode 100644 (file)
index 0000000..c1335a6
--- /dev/null
+++ b/CRM/Upgrade/4.7.beta8.msg_template/civicrm_msg_template.tpl
@@ -0,0 +1,16 @@
+{php}
+  $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.7.beta8.msg_template/message_templates';
+  $templates = array();
+  foreach (preg_grep('/\.tpl$/', scandir($dir)) as $filename) {
+    $parts = explode('_', basename($filename, '.tpl'));
+    $templates[] = array('type' => array_pop($parts), 'name' => implode('_', $parts), 'filename' => "$dir/$filename");
+  }
+  $this->assign('templates', $templates);
+{/php}
+
+{foreach from=$templates item=tpl}
+  {fetch assign=content file=$tpl.filename}
+  SELECT @workflow_id := MAX(id) FROM civicrm_option_value WHERE name = '{$tpl.name}';
+  SELECT @content := msg_{$tpl.type} FROM civicrm_msg_template WHERE workflow_id = @workflow_id AND is_reserved = 1 LIMIT 1;
+  UPDATE civicrm_msg_template SET msg_{$tpl.type} = '{$content|escape:"quotes"}' WHERE workflow_id = @workflow_id AND (is_reserved = 1 OR (is_default = 1 AND msg_{$tpl.type} = @content));
+{/foreach}
diff --git a/CRM/Upgrade/4.7.beta8.msg_template/message_templates/contribution_invoice_receipt_html.tpl b/CRM/Upgrade/4.7.beta8.msg_template/message_templates/contribution_invoice_receipt_html.tpl
new file mode 100644 (file)
index 0000000..16064ca
--- /dev/null
+++ b/CRM/Upgrade/4.7.beta8.msg_template/message_templates/contribution_invoice_receipt_html.tpl
@@ -0,0 +1,437 @@
+<!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>
+    <table style = "margin-top:2px;padding-left:7px;">
+      <tr>
+        <td><img src = "{$resourceBase}/i/civi99.png" height = "34px" width = "99px"></td>
+      </tr>
+    </table>
+    <center>
+      <table style = "padding-right:19px;font-family: Arial, Verdana, sans-serif;" width = "500" height = "100" border = "0" cellpadding = "2" cellspacing = "1">
+  <tr>
+    <td style = "padding-left:15px;" ><b><font size = "4" align = "center">{ts}INVOICE{/ts}</font></b></td>
+          <td colspan = "1"></td>
+          <td style = "padding-left:70px;"><b><font size = "1" align = "center" >{ts}Invoice Date:{/ts}</font></b></td>
+          <td><font size = "1" align = "right">{$domain_organization}</font></td>
+  </tr>
+        <tr>
+         {if $organization_name}
+           <td style = "padding-left:17px;"><font size = "1" align = "center" >{$display_name}  ({$organization_name})</font></td>
+         {else}
+           <td style = "padding-left:15px;"><font size = "1" align = "center" >{$display_name}</font></td>
+         {/if}
+         <td colspan = "1"></td>
+         <td style = "padding-left:70px;"><font size = "1" align = "right">{$invoice_date}</font></td>
+   <td><font size = "1" align = "right">
+  {if $domain_street_address }
+    {$domain_street_address}
+  {/if}
+  {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}</font></td>
+  </tr>
+        <tr>
+          <td style = "padding-left:17px;"><font size = "1" align = "center">{$street_address}   {$supplemental_address_1}</font></td>
+          <td colspan = "1"></td>
+          <td style = "padding-left:70px;"><b><font size = "1" align = "right">{ts}Invoice Number:{/ts}</font></b></td>
+    <td ><font size = "1" align = "right">{if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if}
+    {if $domain_state }{$domain_state}{/if}</font></td>
+        </tr>
+        <tr>
+          <td style = "padding-left:17px;"><font size = "1" align = "center">{$supplemental_address_2}  {$stateProvinceAbbreviation}</font></td>
+          <td colspan="1"></td>
+          <td style = "padding-left:70px;"><font size = "1" align = "right">{$invoice_id}</font></td>
+    <td><font size = "1" align = "right">{if $domain_city}
+    {$domain_city}
+        {/if}
+        {if $domain_postal_code }
+    {$domain_postal_code}
+        {/if}
+    </font></td>
+  </tr>
+  <tr>
+          <td style = "padding-left:17px;"><font size = "1" align = "right">{$city}  {$postal_code}</font></td>
+          <td colspan="1"></td>
+    <td height = "10" style = "padding-left:70px;"><b><font size = "1"align = "right">{ts}Reference:{/ts}</font></b></td>
+    <td><font size = "1" align = "right"> {if $domain_country}
+    {$domain_country}
+        {/if}</font></td>
+  </tr>
+  <tr>
+    <td></td>
+    <td></td>
+    <td style = "padding-left:70px;"><font size = "1"align = "right">{$source}</font></td>
+    <td><font size = "1" align = "right"> {if $domain_phone}{$domain_phone}{/if}</font> </td>
+  </tr>
+  <tr>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td><font size = "1" align = "right"> {if $domain_email}
+    {$domain_email}
+         {/if}</font> </td>
+  </tr>
+      </table>
+      <table style = "margin-top:75px;font-family: Arial, Verdana, sans-serif" width = "590" border = "0"cellpadding = "-5" cellspacing = "19" id = "desc">
+  <tr>
+          <td colspan = "2" {$valueStyle}>
+            <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}
+              <tr>
+                <th style = "padding-right:34px;text-align:left;font-weight:bold;width:200px;"><font size = "1">{ts}Description{/ts}</font></th>
+                <th style = "padding-left:34px;text-align:right;font-weight:bold;" ><font size = "1">{ts}Quantity{/ts}</font></th>
+                <th style = "padding-left:34px;text-align:right;font-weight:bold;"><font size = "1">{ts}Unit Price{/ts}</font></th>
+                <th style = "padding-left:34px;text-align:right;font-weight:bold;width:20px;"><font size = "1">{$taxTerm} </font></th>
+                <th style = "padding-left:34px;text-align:right;font-weight:bold;"><font size = "1">{ts 1=$defaultCurrency}Amount %1{/ts}</font></th>
+              </tr>
+              {foreach from=$lineItem item=value key=priceset name=taxpricevalue}
+    {if $smarty.foreach.taxpricevalue.index eq 0}
+            <tr><td  colspan = "5" ><hr size="3" style = "color:#000;"></hr></td></tr>
+    {else}
+      <tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
+    {/if}
+                <tr>
+                  <td style="text-align:left;" ><font size = "1">
+      {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}<div>{$value.description|truncate:30:"..."}</div>{/if}
+      </font></td>
+      <td style = "padding-left:34px;text-align:right;"><font size = "1"> {$value.qty}</font></td>
+      <td style = "padding-left:34px;text-align:right;"><font size = "1"> {$value.unit_price|crmMoney:$currency}</font></td>
+        {if $value.tax_amount != ''}
+          <td style = "padding-left:34px;text-align:right;width:20px;"><font size = "1"> {$value.tax_rate}%</font></td>
+                    {else}
+          <td style = "padding-left:34px;text-align:right;width:20px;"><font size = "1">{ts 1=$taxTerm}No %1{/ts}</font></td>
+              {/if}
+        <td style = "padding-left:34px;text-align:right;"><font size = "1">{$value.subTotal|crmMoney:$currency}</font></td>
+    </tr>
+              {/foreach}
+          <tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
+          <tr>
+      <td colspan = "3"></td>
+      <td style = "padding-left:20px;text-align:right;"><font size = "1">{ts}Sub Total{/ts}</font></td>
+      <td style = "padding-left:34px;text-align:right;"><font size = "1"> {$subTotal|crmMoney:$currency}</font></td>
+    </tr>
+    {foreach from = $dataArray item = value key = priceset}
+            <tr>
+        <td colspan = "3"></td>
+        {if $priceset}
+          <td style = "padding-left:20px;text-align:right;"><font size = "1"> {ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}</font></td>
+          <td style = "padding-left:34px;text-align:right"><font size = "1" align = "right">{$value|crmMoney:$currency}</font> </td>
+                    {elseif $priceset == 0}
+                      <td style = "padding-left:20px;text-align:right;"><font size = "1">{ts 1=$taxTerm}TOTAL NO %1{/ts}</font></td>
+                      <td style = "padding-left:34px;text-align:right"><font size = "1" align = "right">{$value|crmMoney:$currency}</font> </td>
+                  </tr>
+        {/if}
+    {/foreach}
+          <tr>
+      <td colspan = "3"></td>
+      <td colspan = "2"><hr></hr></td>
+    </tr>
+
+          <tr>
+      <td colspan = "3"></td>
+      <td style = "padding-left:20px;text-align:right;"><b><font size = "1">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>
+      <td style = "padding-left:34px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
+    </tr>
+
+    {if $is_pay_later == 0}
+            <tr>
+        <td colspan = "3"></td>
+        <td style = "padding-left:20px;text-align:right;"><font size = "1">
+           {if $contribution_status_id == $refundedStatusId}
+          {ts}LESS Amount Credited{/ts}
+           {else}
+          {ts}LESS Amount Paid{/ts}
+           {/if}
+        </font></td>
+        <td style = "padding-left:34px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
+      </tr>
+            <tr>
+        <td colspan = "3"></td>
+        <td colspan = "2" ><hr></hr></td>
+      </tr>
+            <tr>
+        <td colspan = "3"></td>
+        <td style = "padding-left:20px;text-align:right;"><b><font size = "1">{ts}AMOUNT DUE:{/ts} </font></b></td>
+                    <td style = "padding-left:34px;text-align:right;"><b><font size = "1">{$amountDue|crmMoney:$currency}</font></b></td>                 <td style = "padding-left:34px;"><font size = "1" align = "right"></fonts></td>
+      </tr>
+    {/if}
+    <br/><br/><br/>
+          <tr>
+      <td colspan = "3"></td>
+    </tr>
+    {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1}
+      <tr>
+        <td><b><font size = "1" align = "center">{ts 1=$dueDate}DUE DATE: %1{/ts}</font></b></td>
+        <td colspan = "3"></td>
+      </tr>
+    {/if}
+            </table>
+          </td>
+        </tr>
+      </table>
+      <table style = "margin-top:5px;padding-right:45px;">
+        <tr>
+          <td><img src = "{$resourceBase}/i/contribute/cut_line.png" height = "15" width = "630"></td>
+        </tr>
+      </table>
+  <table style = "margin-top:6px;padding-right:20px;font-family: Arial, Verdana, sans-serif" width = "480" border = "0"cellpadding = "-5" cellspacing="19" id = "desc">
+    <tr>
+      <td width="60%"><b><font size = "4" align = "right">{ts}PAYMENT ADVICE{/ts}</font></b> <br/><br/> <font size = "1" align = "right"><b>{ts}To: {/ts}</b>      <div style="width:17em;word-wrap:break-word;">
+    {$domain_organization} <br />
+    {$domain_street_address} {$domain_supplemental_address_1} <br />
+    {$domain_supplemental_address_2} {$domain_state} <br />
+    {$domain_city} {$domain_postal_code} <br />
+    {$domain_country} <br />
+    {$domain_phone} <br />
+    {$domain_email}</div>
+    </font><br/><br/><font size="1" align="right">{$notes}</font>
+            </td>
+            <td width="40%">
+        <table  cellpadding = "-10" cellspacing = "22"  align="right" >
+    <tr>
+            <td  colspan = "2"></td>
+      <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Customer: {/ts}</font></td>
+      <td ><font size = "1" align = "right">{$display_name}</font></td>
+    </tr>
+    <tr>
+      <td colspan = "2"></td>
+      <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Invoice Number: {/ts}</font></td>
+      <td><font size = "1" align = "right">{$invoice_id}</font></td>
+    </tr>
+    <tr><td  colspan = "5"style = "color:#F5F5F5;"><hr></hr></td></tr>
+    {if $is_pay_later == 1}
+    <tr>
+                  <td colspan = "2"></td>
+                  <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Amount Due:{/ts}</font></td>
+                  <td><font size = "1" align = "right" style="font-weight:bold;">{$amount|crmMoney:$currency}</font></td>
+    </tr>
+    {else}
+    <tr>
+      <td colspan = "2"></td>
+      <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Amount Due: {/ts}</font></td>
+      <td><font size = "1" align = "right" style="font-weight:bold;">{$amountDue|crmMoney:$currency}</font></td>
+    </tr>
+    {/if}
+    <tr>
+      <td colspan = "2"></td>
+      {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1}
+        <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Due Date:  {/ts}</font></td>
+        <td><font size = "1" align = "right">{$dueDate}</font></td>
+      {/if}
+    </tr>
+    <tr>
+                  <td colspan = "5" style = "color:#F5F5F5;"><hr></hr></td>
+                </tr>
+        </table>
+            </td>
+    </tr>
+  </table>
+
+
+      {if $contribution_status_id == $refundedStatusId || $contribution_status_id == $cancelledStatusId}
+    <table style = "margin-top:2px;padding-left:7px;page-break-before: always;">
+      <tr>
+        <td><img src = "{$resourceBase}/i/civi99.png" height = "34px" width = "99px"></td>
+      </tr>
+    </table>
+    <center>
+
+      <table style = "padding-right:19px;font-family: Arial, Verdana, sans-serif" width = "500" height = "100" border = "0" cellpadding = "2" cellspacing = "1">
+  <tr>
+          <td style = "padding-left:15px;" ><b><font size = "4" align = "center">{ts}CREDIT NOTE{/ts}</font></b></td>
+          <td colspan = "1"></td>
+          <td style = "padding-left:70px;"><b><font size = "1" align = "right">{ts}Date:{/ts}</font></b></td>
+          <td><font size = "1" align = "right">{$domain_organization}</font></td>
+  </tr>
+        <tr>
+         {if $organization_name}
+           <td style = "padding-left:17px;"><font size = "1" align = "center">{$display_name}  ({$organization_name})</font></td>
+           {else}
+           <td style = "padding-left:17px;"><font size = "1" align = "center">{$display_name}</font></td>
+         {/if}
+         <td colspan = "1"></td>
+         <td style = "padding-left:70px;"><font size = "1" align = "right">{$invoice_date}</font></td>
+   <td ><font size = "1" align = "right">
+  {if $domain_street_address }
+    {$domain_street_address}
+  {/if}
+  {if $domain_supplemental_address_1 }
+    {$domain_supplemental_address_1}
+  {/if}</font></td>
+  </tr>
+        <tr>
+          <td style = "padding-left:17px;"><font size = "1" align = "center">{$street_address}   {$supplemental_address_1}</font></td>
+          <td colspan = "1"></td>
+          <td style = "padding-left:70px;"><b><font size = "1" align = "right">{ts}Credit Note Number:{/ts}</font></b></td>
+          <td><font size = "1" align = "right">{if $domain_supplemental_address_2 }
+    {$domain_supplemental_address_2}
+        {/if}
+        {if $domain_state }
+    {$domain_state}
+        {/if}
+    </font></td>
+        </tr>
+        <tr>
+          <td style = "padding-left:17px;"><font size = "1" align = "center">{$supplemental_address_2}  {$stateProvinceAbbreviation}</font></td>
+          <td colspan="1"></td>
+          <td style = "padding-left:70px;"><font size = "1" align = "right">{$creditnote_id}</font></td>
+    <td ><font size = "1" align = "right">{if $domain_city}
+     {$domain_city}
+         {/if}
+         {if $domain_postal_code }
+     {$domain_postal_code}
+         {/if}
+    </font></td>
+  </tr>
+  <tr>
+          <td style = "padding-left:17px;"><font size = "1" align = "right">{$city}  {$postal_code}</font></td>
+          <td colspan="1"></td>
+          <td height = "10" style = "padding-left:70px;"><b><font size = "1"align = "right">{ts}Reference:{/ts}</font></b></td>
+    <td><font size = "1" align = "right"> {if $domain_country}
+    {$domain_country}
+        {/if}</font></td>
+  </tr>
+  <tr>
+          <td></td>
+          <td></td>
+          <td style = "padding-left:70px;"><font size = "1"align = "right">{$source}</font></td>
+    <td><font size = "1" align = "right"> {if $domain_phone}
+    {$domain_phone}
+         {/if}</font> </td>
+  </tr>
+  <tr>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td><font size = "1" align = "right"> {if $domain_email}
+    {$domain_email}
+        {/if}</font> </td>
+  </tr>
+      </table>
+
+      <table style = "margin-top:75px;font-family: Arial, Verdana, sans-serif" width = "590" border = "0"cellpadding = "-5" cellspacing = "19" id = "desc">
+  <tr>
+          <td colspan = "2" {$valueStyle}>
+            <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}
+              <tr>
+                <th style = "padding-right:28px;text-align:left;font-weight:bold;width:200px;"><font size = "1">{ts}Description{/ts}</font></th>
+                <th style = "padding-left:28px;text-align:right;font-weight:bold;"><font size = "1">{ts}Quantity{/ts}</font></th>
+                <th style = "padding-left:28px;text-align:right;font-weight:bold;"><font size = "1">{ts}Unit Price{/ts}</font></th>
+                <th style = "padding-left:28px;text-align:right;font-weight:bold;"><font size = "1">{$taxTerm} </font></th>
+                <th style = "padding-left:28px;text-align:right;font-weight:bold;"><font size = "1">{ts 1=$defaultCurrency}Amount %1{/ts}</font></th>
+              </tr>
+              {foreach from=$lineItem item=value key=priceset name=pricevalue}
+    {if $smarty.foreach.pricevalue.index eq 0}
+          <tr><td  colspan = "5" ><hr size="3" style = "color:#000;"></hr></td></tr>
+    {else}
+    <tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
+    {/if}
+                <tr>
+                  <td style ="text-align:left;"  ><font size = "1">
+      {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}<div>{$value.description|truncate:30:"..."}</div>{/if}
+      </font></td>
+      <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$value.qty}</font></td>
+      <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$value.unit_price|crmMoney:$currency}</font></td>
+        {if $value.tax_amount != ''}
+          <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$value.tax_rate}%</font></td>
+                    {else}
+          <td style = "padding-left:28px;text-align:right"><font size = "1" >{ts 1=$taxTerm}No %1{/ts}</font></td>
+              {/if}
+       <td style = "padding-left:28px;text-align:right;"><font size = "1" >{$value.subTotal|crmMoney:$currency}</font></td>
+    </tr>
+                {/foreach}
+          <tr><td  colspan = "5" style = "color:#F5F5F5;"><hr></hr></td></tr>
+          <tr>
+      <td colspan = "3"></td>
+      <td style = "padding-left:28px;text-align:right;"><font size = "1">{ts}Sub Total{/ts}</font></td>
+      <td style = "padding-left:28px;text-align:right;"><font size = "1"> {$subTotal|crmMoney:$currency}</font></td>
+    </tr>
+    {foreach from = $dataArray item = value key = priceset}
+            <tr>
+        <td colspan = "3"></td>
+        {if $priceset}
+          <td style = "padding-left:28px;text-align:right;"><font size = "1"> {ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}</font></td>
+          <td style = "padding-left:28px;text-align:right;"><font size = "1" align = "right">{$value|crmMoney:$currency}</font> </td>
+                    {elseif $priceset == 0}
+                      <td style = "padding-left:28px;text-align:right;"><font size = "1">{ts 1=$taxTerm}TOTAL NO %1{/ts}</font></td>
+                      <td style = "padding-left:28px;text-align:right;"><font size = "1" align = "right">{$value|crmMoney:$currency}</font> </td>
+                  </tr>
+        {/if}
+    {/foreach}
+          <tr>
+      <td colspan = "3"></td>
+      <td colspan = "2"><hr></hr></td>
+    </tr>
+
+          <tr>
+      <td colspan = "3"></td>
+      <td style = "padding-left:28px;text-align:right;"><b><font size = "1">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>
+      <td style = "padding-left:28px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
+    </tr>
+
+    {if $is_pay_later == 0}
+            <tr>
+        <td colspan = "3"></td>
+        <td style = "padding-left:28px;text-align:right;"><font size = "1" >{ts}LESS Credit to invoice(s){/ts}</font></td>
+        <td style = "padding-left:28px;text-align:right;"><font size = "1">{$amount|crmMoney:$currency}</font></td>
+      </tr>
+            <tr>
+        <td colspan = "3"></td>
+        <td colspan = "2" ><hr></hr></td>
+      </tr>
+            <tr>
+        <td colspan = "3"></td>
+        <td style = "padding-left:28px;text-align:right;"><b><font size = "1">{ts}REMAINING CREDIT{/ts}</font></b></td>
+        <td style = "padding-left:28px;text-align:right;"><b><font size = "1">{$amountDue|crmMoney:$currency}</font></b></td>
+        <td style = "padding-left:28px;"><font size = "1" align = "right"></fonts></td>
+      </tr>
+    {/if}
+    <br/><br/><br/>
+          <tr>
+      <td colspan = "3"></td>
+    </tr>
+          <tr>
+      <td></td>
+      <td colspan = "3"></td>
+    </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+
+      <table style = "margin-top:5px;padding-right:45px;">
+        <tr>
+          <td><img src = "{$resourceBase}/i/contribute/cut_line.png" height = "15" width = "630"></td>
+        </tr>
+      </table>
+
+  <table style = "margin-top:6px;padding-right:20px;font-family: Arial, Verdana, sans-serif" width = "507" border = "0"cellpadding = "-5" cellspacing="19" id = "desc">
+    <tr>
+      <td width="60%"><font size = "4" align = "right"><b>{ts}CREDIT ADVICE{/ts}</b><br/><br /><div  style="font-size:10px;max-width:300px;">{ts}Please do not pay on this advice. Deduct the amount of this Credit Note from your next payment to us{/ts}</div><br/></font></td>
+      <td width="40%">
+              <table    align="right" >
+    <tr>
+            <td colspan = "2"></td>
+      <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Customer:{/ts} </font></td>
+      <td><font size = "1" align = "right" >{$display_name}</font></td>
+    </tr>
+    <tr>
+      <td colspan = "2"></td>
+      <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Credit Note#:{/ts} </font></td>
+      <td><font size = "1" align = "right">{$creditnote_id}</font></td>
+    </tr>
+    <tr><td  colspan = "5"style = "color:#F5F5F5;"><hr></hr></td></tr>
+    <tr>
+                  <td colspan = "2"></td>
+      <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Credit Amount:{/ts}</font></td>
+      <td width='50px'><font size = "1" align = "right" style="font-weight:bold;">{$amount|crmMoney:$currency}</font></td>
+    </tr>
+              </table>
+            </td>
+    </tr>
+  </table>
+ {/if}
+    </center>
+  </body>
+</html>
diff --git a/CRM/Upgrade/Incremental/sql/4.7.beta8.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.beta8.mysql.tpl
index 9f51e0679a0bd66cca217c311ac4aad8dc57adcf..e62327848d0b86ace596133d991ec5a4cadc7583 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.7.beta8.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.beta8.mysql.tpl
@@ -6,3 +6,7 @@ UPDATE civicrm_membership_block cmb JOIN civicrm_price_set_entity cpse ON cmb.en
 -- CRM-17429 - Old contributions may be using this payment processor type, so we'll disable rather than delete it for existing installs:
 UPDATE civicrm_payment_processor_type SET is_active = 0 WHERE name = 'Google_Checkout';
 UPDATE civicrm_payment_processor pp, civicrm_payment_processor_type ppt SET pp.is_active = 0 WHERE pp.payment_processor_type_id = ppt.id AND ppt.name = 'Google_Checkout';
+
+-- CRM-17815
+{include file='../CRM/Upgrade/4.7.beta8.msg_template/civicrm_msg_template.tpl'}
+
diff --git a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
index 67944854673c0ac825c4766d2fc60c8048a4a0ef..16064ca53ce1dbb49b6c59fa15216469f018020c 100644 (file)
--- a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
+++ b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
@@ -160,10 +160,12 @@
           <tr>
       <td colspan = "3"></td>
     </tr>
-          <tr>
-      <td><b><font size = "1" align = "center">{ts 1=$dueDate}DUE DATE: %1{/ts}</font></b></td>
-      <td colspan = "3"></td>
-    </tr>
+    {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1}
+      <tr>
+        <td><b><font size = "1" align = "center">{ts 1=$dueDate}DUE DATE: %1{/ts}</font></b></td>
+        <td colspan = "3"></td>
+      </tr>
+    {/if}
             </table>
           </td>
         </tr>
@@ -213,8 +215,10 @@
     {/if}
     <tr>
       <td colspan = "2"></td>
-      <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Due Date:  {/ts}</font></td>
-      <td><font size = "1" align = "right">{$dueDate}</font></td>
+      {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1}
+        <td><font size = "1" align = "right" style="font-weight:bold;">{ts}Due Date:  {/ts}</font></td>
+        <td><font size = "1" align = "right">{$dueDate}</font></td>
+      {/if}
     </tr>
     <tr>
                   <td colspan = "5" style = "color:#F5F5F5;"><hr></hr></td>