Changeset 356307

Timestamp:

03/06/2011 09:47:40 PM (13 years ago)

Author:

jghazally

Message:

Fix the tax on your account page ...

File:

• wp-e-commerce/branches/3.8-development/wpsc-theme/functions/wpsc-user_log_functions.php (modified) (4 diffs)

wp-e-commerce/branches/3.8-development/wpsc-theme/functions/wpsc-user_log_functions.php

@@ -490 +490 @@
             echo "</tr>";
 
+
             $endtotal = $total_shipping = 0;
             foreach ( (array)$cart_log as $cart_row ) {
@@ -523 +524 @@
                 echo " <td>";
                 $gst = $cart_row['tax_charged'];
-                if($gst > 0)
-                    $endtotal += $gst * $cart_row['quantity'];
-
+                if( $gst > 0)
+                    $gsttotal += $gst;
                 echo wpsc_currency_display( $gst , array('display_as_html' => false) );
                 echo " </td>";
@@ -564 +564 @@
             $endtotal += $purchase['wpec_taxes_total'];
             echo wpsc_currency_display( $total_shipping, array('display_as_html' => false)  ) . "<br />";
-            echo wpsc_currency_display( $purchase['wpec_taxes_total'] , array('display_as_html' => false) ). "<br />";
+            if ( $gsttotal ){ //if false then must be exclusive.. doesnt seem too reliable needs more testing
+                echo wpsc_currency_display( $gsttotal , array('display_as_html' => false) ). "<br />";
+            } else {
+                echo wpsc_currency_display( $purchase['wpec_taxes_total'] , array('display_as_html' => false) ). "<br />";
+            }
             echo wpsc_currency_display( $endtotal , array('display_as_html' => false) );
             echo " </td>";
@@ -606 +610 @@
                             break;
                         default:
-                            echo "  <tr><td>" . $form_field['name'] . ":</td><td>" . $form_field['value'] . "</td></tr>";
+                            echo "  <tr><td>" . $form_field['name'] . ":</td><td>" .  . "</td></tr>";
 
                     }