Rerun

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

diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc
index 08efec416550deb9376b788efce1f3171dcd157a..5d9852991038e6da43cf39ada5f7e7c5afb719c0 100644 (file)
--- a/taxes/tax_calc.inc
+++ b/taxes/tax_calc.inc
@@ -154,12 +154,11 @@ 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) 
                        {
-                               if ($item_tax['rate'] != null) {
+                               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']);
@@ -194,22 +193,19 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
                        }
                        foreach ($item_taxes as $item_tax) 
                        {
-                               if ($item_tax['rate'] != null) {
-                                       $index = $item_tax['tax_type_id'];
-                                       if(isset($ret_tax_array[$index])) {
+                               $index = $item_tax['tax_type_id'];
+                               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);
                                            $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;
-                                        }
-                                       }
+                                         }
                                }
                        }
                }
        }
-       
        //print_r($ret_tax_array);
 
        return $ret_tax_array;