Fixed shipping tax calculation for tax exempt customer.

[fa-stable.git] / taxes / tax_calc.inc

diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc
index 3f54bd226aa65ee6871e86e30598f11f57d9ec37..f094169589467f0846cf5500c433fbc7c6f8bf96 100644 (file)
--- a/taxes/tax_calc.inc
+++ b/taxes/tax_calc.inc
@@ -18,7 +18,6 @@ include_once($path_to_root . "/taxes/db/item_tax_types_db.inc");
 // returns the price of a given item minus any included taxes
 // for item $stock_id with line price $price,
 // with applicable tax rates $tax_group_array or group id $tax_group
-//
 
 function get_tax_free_price_for_item($stock_id, $price, $tax_group, $tax_included, $tax_group_array=null)
 {
@@ -41,16 +40,16 @@ function get_tax_free_price_for_item($stock_id, $price, $tax_group, $tax_include
        if ($tax_array == null)
                return $price;
        
-       $tax_multiplier = 0;    
+       $tax_multiplier = 0;
 
-       // loop for all items
+       // loop for all taxes
 
        foreach ($tax_array as $taxitem) 
        {
-                       $tax_multiplier += $taxitem["rate"];
+               $tax_multiplier += $taxitem["rate"];
        }
-       
-       return round($price / (1 + ($tax_multiplier / 100)),  2*user_price_dec());
+
+       return round($price / (1 + ($tax_multiplier / 100)),  user_price_dec());
 }
 //
 //     Full price (incl. VAT) for item $stock_id with line price $price,
@@ -86,7 +85,7 @@ function get_full_price_for_item($stock_id, $price, $tax_group, $tax_included, $
                        $tax_multiplier += $taxitem["rate"];
        }
        
-       return round($price * (1 + ($tax_multiplier / 100)),  2*user_price_dec());
+       return round($price * (1 + ($tax_multiplier / 100)),  user_price_dec());
 }
 
 //---------------------------------------------------------------------------------
@@ -155,24 +154,25 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
        for ($i = 0; $i < count($items); $i++)
        {
                $item_taxes = get_taxes_for_item($items[$i], $ret_tax_array);
-
                if ($item_taxes != null) 
                {
                        foreach ($item_taxes as $item_tax) 
                        {
-                               $index = $item_tax['tax_type_id'];
-                               if($tax_included==1) {// 2008-11-26 Joe Hunt Taxes are stored without roundings
-                                 $nprice = get_tax_free_price_for_item($items[$i], $prices[$i], $tax_group, $tax_included);
-                                 $ret_tax_array[$index]['Value'] += ($nprice * $item_tax['rate'] / 100);
-                                 $ret_tax_array[$index]['Net'] += $nprice;
-                               } else {
-                                 $ret_tax_array[$index]['Value'] += ($prices[$i] * $item_tax['rate'] / 100);
-                                 $ret_tax_array[$index]['Net'] += $prices[$i];
+                               if ($item_tax['rate'] !== null) {
+                                       $index = $item_tax['tax_type_id'];
+                                       if($tax_included==1) {// 2008-11-26 Joe Hunt Taxes are stored without roundings
+                                         $nprice = get_tax_free_price_for_item($items[$i], $prices[$i], $tax_group, $tax_included, null, $item_tax['tax_type_id']);
+                                         $ret_tax_array[$index]['Value'] += $nprice*$item_tax['rate']/100;
+                                         $ret_tax_array[$index]['Net'] += $nprice;
+                                       } else {
+                                         $ret_tax_array[$index]['Value'] += ($prices[$i] * $item_tax['rate'] / 100);
+                                         $ret_tax_array[$index]['Net'] += $prices[$i];
+                                       }
                                }
                        }
                }
        }
-       
+
        // add the shipping taxes, only if non-zero, and only if tax group taxes shipping
        if ($shipping_cost != 0) 
        {
@@ -190,23 +190,22 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
                                        }
                                }
                                $shipping_net = round2($shipping_cost / (1 + ($tax_rate / 100)), user_price_dec());
-                       }       
+                       }
                        foreach ($item_taxes as $item_tax) 
                        {
                                $index = $item_tax['tax_type_id'];
-                               if(isset($ret_tax_array[$index])) {
-                                 if($tax_included==1) {// 2008-11-26 Joe Hunt Taxes are stored without roundings
-                                       $ret_tax_array[$index]['Value'] += ($shipping_net * $item_tax['rate'] / 100);
-                                   $ret_tax_array[$index]['Net'] += $shipping_net;
-                                 } else {
-                                       $ret_tax_array[$index]['Value'] += ($shipping_cost * $item_tax['rate'] / 100);
-                                   $ret_tax_array[$index]['Net'] += $shipping_cost;
-                                }
+                               if ($item_tax['rate'] !== null && $ret_tax_array[$index]['rate'] !== null) {
+                                         if($tax_included==1) {// 2008-11-26 Joe Hunt Taxes are stored without roundings
+                                               $ret_tax_array[$index]['Value'] += ($shipping_net * $item_tax['rate'] / 100, $dec);
+                                           $ret_tax_array[$index]['Net'] += $shipping_net;
+                                         } else {
+                                               $ret_tax_array[$index]['Value'] += ($shipping_cost * $item_tax['rate'] / 100, $dec);
+                                           $ret_tax_array[$index]['Net'] += $shipping_cost;
+                                         }
                                }
                        }
                }
        }
-       
        //print_r($ret_tax_array);
 
        return $ret_tax_array;