From 01604562966dd5675c51493d8f5e3e68e3d7e81b Mon Sep 17 00:00:00 2001 From: Parag Bhilkar Date: Tue, 19 Aug 2014 21:43:40 +0530 Subject: [PATCH] Display tax amount in receipts for membership and event offline contribution with and without price set. --- CRM/Contribute/Form/Contribution.php | 5 +---- CRM/Event/Form/Participant.php | 1 + CRM/Member/Form/Membership.php | 7 ++++++- .../contribution_offline_receipt_html.tpl | 4 ++-- .../contribution_offline_receipt_text.tpl | 4 ++-- .../message_templates/membership_offline_receipt_html.tpl | 2 +- .../message_templates/membership_offline_receipt_text.tpl | 2 +- .../contribution_offline_receipt_html.tpl | 4 ++-- .../contribution_offline_receipt_text.tpl | 4 ++-- .../message_templates/membership_offline_receipt_html.tpl | 2 +- .../message_templates/membership_offline_receipt_text.tpl | 2 +- 11 files changed, 20 insertions(+), 17 deletions(-) diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php index 2c5e91cd05..93c5de0145 100644 --- a/CRM/Contribute/Form/Contribution.php +++ b/CRM/Contribute/Form/Contribution.php @@ -1352,7 +1352,6 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP $getTaxDetails = FALSE; $invoiceSettings = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME,'contribution_invoice_settings'); $invoicing = CRM_Utils_Array::value('invoicing', $invoiceSettings); - $this->assign('invoicing', $invoicing); if ($invoicing) { if ($this->_action & CRM_Core_Action::ADD) { $line = $lineItem; @@ -1374,9 +1373,6 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP } } } - else { - $taxRate = array($submittedValues['tax_amount']); - } if ($invoicing) { if ($this->_action & CRM_Core_Action::UPDATE) { @@ -1394,6 +1390,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP $this->assign('totalTaxAmount', $submittedValues['tax_amount']); $this->assign('getTaxDetails', $getTaxDetails); $this->assign('dataArray', $taxRate); + $this->assign('taxTerm', CRM_Utils_Array::value('tax_term', $invoiceSettings)); } else { $this->assign('totalTaxAmount', CRM_Utils_Array::value('tax_amount', $submittedValues)); diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php index 87f877781b..2e5c7801e4 100644 --- a/CRM/Event/Form/Participant.php +++ b/CRM/Event/Form/Participant.php @@ -1711,6 +1711,7 @@ class CRM_Event_Form_Participant extends CRM_Contact_Form_Task { } } $this->assign('totalTaxAmount', $totalTaxAmount); + $this->assign('taxTerm', CRM_Utils_Array::value('tax_term', $invoiceSettings)); $this->assign('dataArray', $dataArray); } if (!empty($additionalParticipantDetails)) { diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php index 1866add14d..a18814cb8e 100644 --- a/CRM/Member/Form/Membership.php +++ b/CRM/Member/Form/Membership.php @@ -1655,6 +1655,7 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )'; if (!empty($lineItem[$priceSetId])) { $invoiceSettings = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME,'contribution_invoice_settings'); $invoicing = CRM_Utils_Array::value('invoicing', $invoiceSettings); + $taxAmount = FALSE; $totalTaxAmount = 0; foreach ($lineItem[$priceSetId] as & $priceFieldOp) { if (!empty($priceFieldOp['membership_type_id'])) { @@ -1666,6 +1667,7 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )'; $priceFieldOp['start_date'] = $priceFieldOp['end_date'] = 'N/A'; } if ($invoicing && isset($priceFieldOp['tax_amount'])) { + $taxAmount = TRUE; $totalTaxAmount += $priceFieldOp['tax_amount']; } } @@ -1680,7 +1682,10 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )'; } } } - $this->assign('totalTaxAmount', $totalTaxAmount); + if ($taxAmount) { + $this->assign('totalTaxAmount', $totalTaxAmount); + $this->assign('taxTerm', CRM_Utils_Array::value('tax_term', $invoiceSettings)); + } $this->assign('dataArray', $dataArray); } } diff --git a/CRM/Upgrade/4.5.beta5.msg_template/message_templates/contribution_offline_receipt_html.tpl b/CRM/Upgrade/4.5.beta5.msg_template/message_templates/contribution_offline_receipt_html.tpl index 264e0fee87..f24045b0dc 100644 --- a/CRM/Upgrade/4.5.beta5.msg_template/message_templates/contribution_offline_receipt_html.tpl +++ b/CRM/Upgrade/4.5.beta5.msg_template/message_templates/contribution_offline_receipt_html.tpl @@ -82,7 +82,7 @@ {if $line.tax_rate != "" || $line.tax_amount != ""} - {$line.tax_rate}% + {$line.tax_rate|string_format:"%.2f"}% {$line.tax_amount|crmMoney:$currency} @@ -125,7 +125,7 @@ {/foreach} {/if} - {if $getTaxDetails && $totalTaxAmount !== 'null'} + {if isset($totalTaxAmount) && $totalTaxAmount !== 'null'} {ts}Total Tax Amount{/ts} diff --git a/CRM/Upgrade/4.5.beta5.msg_template/message_templates/contribution_offline_receipt_text.tpl b/CRM/Upgrade/4.5.beta5.msg_template/message_templates/contribution_offline_receipt_text.tpl index 7eacb63d83..fe202d4d6b 100644 --- a/CRM/Upgrade/4.5.beta5.msg_template/message_templates/contribution_offline_receipt_text.tpl +++ b/CRM/Upgrade/4.5.beta5.msg_template/message_templates/contribution_offline_receipt_text.tpl @@ -25,7 +25,7 @@ {$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} % {$line.tax_amount|crmMoney:$currency|string_format:"%10s"} {else} {/if} {/if} {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:"%10s"} +{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} @@ -42,7 +42,7 @@ {/foreach} {/if} -{if $getTaxDetails && $totalTaxAmount !== 'null'} +{if isset($totalTaxAmount) && $totalTaxAmount !== 'null'} {ts}Total Tax Amount{/ts} : {$totalTaxAmount|crmMoney:$currency} {/if} {ts}Total Amount{/ts} : {$formValues.total_amount|crmMoney:$currency} diff --git a/CRM/Upgrade/4.5.beta5.msg_template/message_templates/membership_offline_receipt_html.tpl b/CRM/Upgrade/4.5.beta5.msg_template/message_templates/membership_offline_receipt_html.tpl index 17fdb8f660..45f339420f 100644 --- a/CRM/Upgrade/4.5.beta5.msg_template/message_templates/membership_offline_receipt_html.tpl +++ b/CRM/Upgrade/4.5.beta5.msg_template/message_templates/membership_offline_receipt_html.tpl @@ -165,7 +165,7 @@ {/foreach} {/if} {/if} - {if $totalTaxAmount} + {if isset($totalTaxAmount)} {ts}Total Tax Amount{/ts} diff --git a/CRM/Upgrade/4.5.beta5.msg_template/message_templates/membership_offline_receipt_text.tpl b/CRM/Upgrade/4.5.beta5.msg_template/message_templates/membership_offline_receipt_text.tpl index 072957de86..6e43489938 100644 --- a/CRM/Upgrade/4.5.beta5.msg_template/message_templates/membership_offline_receipt_text.tpl +++ b/CRM/Upgrade/4.5.beta5.msg_template/message_templates/membership_offline_receipt_text.tpl @@ -63,7 +63,7 @@ -------------------------------------------------------------------------------------------------- {/if} -{if $totalTaxAmount} +{if isset($totalTaxAmount)} {ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency} {/if} diff --git a/xml/templates/message_templates/contribution_offline_receipt_html.tpl b/xml/templates/message_templates/contribution_offline_receipt_html.tpl index 264e0fee87..f24045b0dc 100644 --- a/xml/templates/message_templates/contribution_offline_receipt_html.tpl +++ b/xml/templates/message_templates/contribution_offline_receipt_html.tpl @@ -82,7 +82,7 @@ {if $line.tax_rate != "" || $line.tax_amount != ""} - {$line.tax_rate}% + {$line.tax_rate|string_format:"%.2f"}% {$line.tax_amount|crmMoney:$currency} @@ -125,7 +125,7 @@ {/foreach} {/if} - {if $getTaxDetails && $totalTaxAmount !== 'null'} + {if isset($totalTaxAmount) && $totalTaxAmount !== 'null'} {ts}Total Tax Amount{/ts} diff --git a/xml/templates/message_templates/contribution_offline_receipt_text.tpl b/xml/templates/message_templates/contribution_offline_receipt_text.tpl index 7eacb63d83..fe202d4d6b 100644 --- a/xml/templates/message_templates/contribution_offline_receipt_text.tpl +++ b/xml/templates/message_templates/contribution_offline_receipt_text.tpl @@ -25,7 +25,7 @@ {$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} % {$line.tax_amount|crmMoney:$currency|string_format:"%10s"} {else} {/if} {/if} {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:"%10s"} +{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} @@ -42,7 +42,7 @@ {/foreach} {/if} -{if $getTaxDetails && $totalTaxAmount !== 'null'} +{if isset($totalTaxAmount) && $totalTaxAmount !== 'null'} {ts}Total Tax Amount{/ts} : {$totalTaxAmount|crmMoney:$currency} {/if} {ts}Total Amount{/ts} : {$formValues.total_amount|crmMoney:$currency} diff --git a/xml/templates/message_templates/membership_offline_receipt_html.tpl b/xml/templates/message_templates/membership_offline_receipt_html.tpl index 17fdb8f660..45f339420f 100644 --- a/xml/templates/message_templates/membership_offline_receipt_html.tpl +++ b/xml/templates/message_templates/membership_offline_receipt_html.tpl @@ -165,7 +165,7 @@ {/foreach} {/if} {/if} - {if $totalTaxAmount} + {if isset($totalTaxAmount)} {ts}Total Tax Amount{/ts} diff --git a/xml/templates/message_templates/membership_offline_receipt_text.tpl b/xml/templates/message_templates/membership_offline_receipt_text.tpl index 072957de86..6e43489938 100644 --- a/xml/templates/message_templates/membership_offline_receipt_text.tpl +++ b/xml/templates/message_templates/membership_offline_receipt_text.tpl @@ -63,7 +63,7 @@ -------------------------------------------------------------------------------------------------- {/if} -{if $totalTaxAmount} +{if isset($totalTaxAmount)} {ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency} {/if} -- 2.25.1