CRM-19585 Changes to function name and signature

---------------------------------------- * CRM-19585: Sales tax issue https://issues.civicrm.org/jira/browse/CRM-19585
civicrm · Feb 1, 2017 · 2029971 · 2029971
1 parent ea4c834
commit 2029971
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
@@ -5458,14 +5458,17 @@ public static function createProportionalFinancialEntries($entityParams, $lineIt
   }
 
   /**
-   * Calculate Tax for each item when Financial Type is changed.
+   * Calculate tax for individual line items.
    *
    * @param array $lineItem
+   *   an array of lineitems
    *
    * @param int $contributionId
+   *   the id of the contribution
    *
+   * @return array
    */
-  public static function calculateTaxAfterChangeInFinancialTypeForLineItems($lineItem, $contributionId) {
+  public static function calculateTaxForLineItems($lineItem, $contributionId) {
     $taxAmount = 0;
     $previousLineItem = CRM_Price_BAO_LineItem::getLineItemsByContributionID($contributionId);
     foreach ($lineItem as $items) {

diff --git a/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php b/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
@@ -1229,24 +1229,24 @@ public function createContributionWithTax() {
   }
 
   /**
-   * test for function calculateTaxAfterChangeInFinancialTypeForLineItems()
+   * test for function calculateTaxForLineItems()
    */
-  public function testcalculateTaxAfterChangeInFinancialTypeForLineItems() {
+  public function testcalculateTaxForLineItems() {
     list($contribution, $financialAccount) = $this->createContributionWithTax();
     $lineItems = CRM_Price_BAO_LineItem::getLineItemsByContributionID($contribution['id']);
     foreach ($lineItems as $id => $lineItem) {
       $lineItems[$id]['line_total'] = 300;
       $lineItems[$id]['tax_rate'] = 20;
       $lineItems[$id]['id'] = $id;
     }
-    $taxAmount = CRM_Contribute_BAO_Contribution::calculateTaxAfterChangeInFinancialTypeForLineItems(array($lineItems), $contribution['id']);
+    $taxAmount = CRM_Contribute_BAO_Contribution::calculateTaxForLineItems(array($lineItems), $contribution['id']);
     $this->assertEquals($taxAmount, 20.00, 'Amount does not match.');
     foreach ($lineItems as $id => $lineItem) {
       $lineItems[$id]['line_total'] = 300;
       $lineItems[$id]['tax_rate'] = 0;
       $lineItems[$id]['id'] = $id;
     }
-    $taxAmount = CRM_Contribute_BAO_Contribution::calculateTaxAfterChangeInFinancialTypeForLineItems(array($lineItems), $contribution['id']);
+    $taxAmount = CRM_Contribute_BAO_Contribution::calculateTaxForLineItems(array($lineItems), $contribution['id']);
     $this->assertEquals($taxAmount, 0, 'Amount does not match.');
   }