CRM-15409 fix issue of printpdf button on popup and spelling mistecks of invoice...

----------------------------------------
* CRM-15409: Add Sales Tax and Invoicing support
  https://issues.civicrm.org/jira/browse/CRM-15409

diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index 38b3d6e432c127040fec20c570336183b0669af6..f52cb843182724b7c7b6ee65bda0146285ba023c 100644 (file)
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -373,6 +373,13 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
     }
 
     $this->assign('taxRates', json_encode(CRM_Core_PseudoConstant::getTaxRates()));
+    $config = CRM_Core_Config::singleton();
+    $this->assign('currency', $config->defaultCurrencySymbol);
+    $invoiceSettings = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME,'contribution_invoice_settings');
+    $invoicing = CRM_Utils_Array::value('invoicing', $invoiceSettings);
+    if (isset($invoicing)){
+      $this->assign('taxTerm', CRM_Utils_Array::value('tax_term', $invoiceSettings));
+    }
     // build price set form.
     $buildPriceSet = FALSE;
     if ($this->_priceSetId || !empty($_POST['price_set_id'])) {

diff --git a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl
index bb5cf903381ccd1f946ab57456f87176e374bc90..e51ffe6bcb903f28823d8bb2c5b04741b9f48cdb 100644 (file)
--- a/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl
+++ b/CRM/Upgrade/4.6.alpha1.msg_template/message_templates/contribution_invoice_receipt_html.tpl
@@ -13,7 +13,7 @@
     <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">TAX INVOICE</font></b></td>
+    <td style = "padding-left:15px;" ><b><font size = "4" align = "center">INVOICE</font></b></td>
           <td colspan = "1"></td>
           <td style = "padding-left:70px;"><b><font size = "1" align = "center" >Invoice Date:</font></b></td>
           <td><font size = "1" align = "right">{$domain_organization}</font></td>
@@ -35,7 +35,7 @@
         <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">Incoice Number:</font></b></td>
+          <td style = "padding-left:70px;"><b><font size = "1" align = "right">Invoice Number:</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>

diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl
index c24cb02f39dff028dddf5c2eb66fa0e9da0bc1e3..80aa2a301442f0db86e13cda8274f7be6466376f 100644 (file)
--- a/templates/CRM/Member/Form/Membership.tpl
+++ b/templates/CRM/Member/Form/Membership.tpl
@@ -169,7 +169,7 @@
           <tr class="crm-membership-form-block-total_amount">
             <td class="label">{$form.total_amount.label}</td>
             <td>{$form.total_amount.html}<br />
-              <span class="description">{ts}Membership payment amount.{/ts}</span></td>
+              <span class="description">{ts}Membership payment amount.{/ts}</span><div class="totaltaxAmount"></div></td>
           </tr>
           <tr class="crm-membership-form-block-contribution-contact">
             <td class="label">{$form.is_different_contribution_contact.label}</td>
@@ -233,7 +233,7 @@
                 <tr class="crm-membership-form-block-total_amount">
                   <td class="label">{$form.total_amount.label}</td>
                   <td>{$form.total_amount.html}<br />
-                    <span class="description">{ts}Membership payment amount. A contribution record will be created for this amount.{/ts}</span></td>
+                    <span class="description">{ts}Membership payment amount. A contribution record will be created for this amount.{/ts}</span><div class="totaltaxAmount"></div></td>
                 </tr>
                 <tr class="crm-membership-form-block-receive_date">
                   <td class="label">{$form.receive_date.label}</td>
@@ -341,7 +341,6 @@
 
     {literal}
     <script type="text/javascript">
-
       function setPaymentBlock(mode, checkboxEvent) {
         var memType = parseInt(cj('#membership_type_id_1').val( ));
         var isPriceSet = 0;
@@ -375,9 +374,10 @@
         cj("#financial_type_id").val(allMemberships[memType]['financial_type_id']);
         var term = cj('#num_terms').val();
         var taxRates = '{/literal}{$taxRates}{literal}';
+        var taxTerm = '{/literal}{$taxTerm}{literal}';
         var taxRates = JSON.parse(taxRates);
         var taxRate = taxRates[allMemberships[memType]['financial_type_id']];
-
+        var currency = '{/literal}{$currency}{literal}';
         if ( term ) {
           if (!taxRate) {
             var feeTotal = allMemberships[memType]['total_amount_numeric'] * term;
@@ -393,9 +393,12 @@
       cj("#total_amount").val( feeTotal );
           }
           else {
+      var feeTotal = allMemberships[memType]['total_amount'];
       cj("#total_amount").val( allMemberships[memType]['total_amount'] );
           }
         }
+        var taxMessage = taxRate!=undefined ? 'Includes '+taxTerm+' amount of '+currency+''+feeTotal.toFixed(2):'';
+        cj('.totaltaxAmount').html(taxMessage);
       }
 
 

diff --git a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
index bb5cf903381ccd1f946ab57456f87176e374bc90..e51ffe6bcb903f28823d8bb2c5b04741b9f48cdb 100644 (file)
--- a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
+++ b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
@@ -13,7 +13,7 @@
     <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">TAX INVOICE</font></b></td>
+    <td style = "padding-left:15px;" ><b><font size = "4" align = "center">INVOICE</font></b></td>
           <td colspan = "1"></td>
           <td style = "padding-left:70px;"><b><font size = "1" align = "center" >Invoice Date:</font></b></td>
           <td><font size = "1" align = "right">{$domain_organization}</font></td>
@@ -35,7 +35,7 @@
         <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">Incoice Number:</font></b></td>
+          <td style = "padding-left:70px;"><b><font size = "1" align = "right">Invoice Number:</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>