Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ex tax calcs Closes #4100

This commit is contained in:
Mike Jolley 2013-11-13 11:37:15 +00:00
parent 814d21c20e
commit b116d7619d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/class-wc-cart.php
View File

@ -1092,16 +1092,16 @@ class WC_Cart {
// Work out a new base price without the shop's base tax // Work out a new base price without the shop's base tax
$taxes = $this->tax->calc_tax( $line_price, $item_tax_rates ); $taxes = $this->tax->calc_tax( $line_price, $item_tax_rates );
// Now we have a new item price (excluding TAX) // Now we have the item price (excluding TAX)
$line_subtotal = $line_price - array_sum( $taxes ); $line_subtotal = $line_price;
$line_subtotal_tax = array_sum( $taxes ); $line_subtotal_tax = array_sum( $taxes );
// Now calc product rates // Now calc product rates
$discounted_price = $this->get_discounted_price( $values, $base_price, true ); $discounted_price = $this->get_discounted_price( $values, $base_price );
$discounted_taxes = $this->tax->calc_tax( $discounted_price * $values['quantity'], $item_tax_rates ); $discounted_taxes = $this->tax->calc_tax( $discounted_price * $values['quantity'], $item_tax_rates );
$discounted_tax_amount = array_sum( $discounted_taxes ); $discounted_tax_amount = array_sum( $discounted_taxes );
$line_tax = $discounted_tax_amount; $line_tax = $discounted_tax_amount;
$line_total = ( $discounted_price * $values['quantity'] ) - $line_tax; $line_total = $discounted_price * $values['quantity'];
// Tax rows - merge the totals we just got // Tax rows - merge the totals we just got
foreach ( array_keys( $this->taxes + $discounted_taxes ) as $key ) { foreach ( array_keys( $this->taxes + $discounted_taxes ) as $key ) {