From 6bf96a62cac55d85bb76709dc706485c50685a28 Mon Sep 17 00:00:00 2001
From: Parag Bhilkar <parag.bhilkar@webaccessglobal.com>
Date: Mon, 28 Jul 2014 15:25:01 +0530
Subject: [PATCH] VAT-572 Added Email Invoice option for Refunded Contribution.

---
 css/civicrm.css                               |  2 +-
 .../CRM/Contribute/Form/ContributionView.tpl  | 36 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index 1d30bf5e75..84a331d271 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -4685,5 +4685,5 @@ span.crm-status-icon {
 }
 
 .crm-printButton {
-  padding-left: 469px;
+  float: right;
 }
\ No newline at end of file
diff --git a/templates/CRM/Contribute/Form/ContributionView.tpl b/templates/CRM/Contribute/Form/ContributionView.tpl
index d4ba37f30c..87beb67bd3 100644
--- a/templates/CRM/Contribute/Form/ContributionView.tpl
+++ b/templates/CRM/Contribute/Form/ContributionView.tpl
@@ -50,15 +50,16 @@
     {assign var='pdfUrlParams' value="reset=1&id=$id&cid=$contact_id"}
     {assign var='emailUrlParams' value="reset=1&id=$id&cid=$contact_id&select=email"}
     {if $invoicing}
-      {if $contribution_status != 'Refunded'}
-        <div class="crm-printButton"><a class="button" href="{crmURL p='civicrm/contribute/invoice' q=$pdfUrlParams}">
-        {ts}Print Invoice{/ts}</a>
+      <div class="crm-printButton">
+        <a class="button" href="{crmURL p='civicrm/contribute/invoice' q=$pdfUrlParams}">
+        {if $contribution_status != 'Refunded'}
+          {ts}Print Invoice{/ts}</a>
+        {else}
+          {ts}Print Invoice and Credit Note{/ts}</a>
+        {/if}
         <a class="button" href="{crmURL p='civicrm/contribute/invoice/email' q=$emailUrlParams}">
-        {ts}Email Invoice{/ts}</a></div>
-      {else}
-        <div class="crm-printButton"><a class="button" href="{crmURL p='civicrm/contribute/invoice' q=$pdfUrlParams}">
-        {ts}Print Invoice and Credit Note{/ts}</a></div>
-      {/if}
+          {ts}Email Invoice{/ts}</a>
+      </div>
     {/if}
   </div>
 </div>
@@ -94,7 +95,7 @@
       </td>
     </tr>
   {/if}
-  {if $tax_amount && $invoicing}
+  {if $invoicing && $tax_amount}
     <tr>
       <td class="label">{ts}Total Tax Amount{/ts}</td>
       <td>{$tax_amount|crmMoney:$currency}</td>
@@ -326,15 +327,16 @@
   {/if}
   {include file="CRM/common/formButtons.tpl" location="bottom"}
   {if $invoicing}
-    {if $contribution_status != 'Refunded'}
-      <div class="crm-printButton"><a class="button" href="{crmURL p='civicrm/contribute/invoice' q=$pdfUrlParams}">
-      {ts}Print Invoice{/ts}</a>
+    <div class="crm-printButton">
+      <a class="button" href="{crmURL p='civicrm/contribute/invoice' q=$pdfUrlParams}">
+      {if $contribution_status != 'Refunded'}
+        {ts}Print Invoice{/ts}</a>
+      {else}
+        {ts}Print Invoice and Credit Note{/ts}</a>
+      {/if}
       <a class="button" href="{crmURL p='civicrm/contribute/invoice/email' q=$emailUrlParams}">
-      {ts}Email Invoice{/ts}</a></div>
-    {else}
-      <div class="crm-printButton"><a class="button" href="{crmURL p='civicrm/contribute/invoice' q=$pdfUrlParams}">
-      {ts}Print Invoice and Credit Note{/ts}</a></div>
-    {/if}
+        {ts}Email Invoice{/ts}</a>
+    </div>
   {/if}
 </div>
 </div>
-- 
2.25.1