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

out of state rounding tweaks

This commit is contained in:
Mike Jolley 2012-06-05 12:21:52 +01:00
parent 439d21e395
commit 405a1eb147
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
classes/class-wc-cart.php
View File

@ -1071,7 +1071,7 @@ class WC_Cart {
// ADJUST BASE if tax rate is different (different region or modified tax class)
if ( $tax_rates !== $base_tax_rates ) {
$base_taxes = $this->tax->calc_tax( $row_base_price, $base_tax_rates, true );
$base_taxes = $this->tax->calc_tax( $row_base_price, $base_tax_rates, true, true );
$modded_taxes = $this->tax->calc_tax( $row_base_price - array_sum($base_taxes), $tax_rates, false );
$row_base_price = ( $row_base_price - array_sum( $base_taxes ) ) + array_sum( $modded_taxes );
@ -1139,12 +1139,12 @@ class WC_Cart {
if ( $_product->is_taxable() ) {
// Get rates
$tax_rates = $this->tax->get_rates( $_product->get_tax_class() );
$tax_rates = $this->tax->get_rates( $_product->get_tax_class() );
/**
* ADJUST TAX - Checkout calculations when customer is OUTSIDE the shop base country and prices INCLUDE tax
* ADJUST TAX - Calculations when customer is OUTSIDE the shop base country/state and prices INCLUDE tax
* OR
* ADJUST TAX - Checkout calculations when a tax class is modified
* ADJUST TAX - Calculations when a tax class is modified
*/
if ( ( $woocommerce->customer->is_customer_outside_base() && ( defined('WOOCOMMERCE_CHECKOUT') || $woocommerce->customer->has_calculated_shipping() ) ) || ( $_product->get_tax_class() !== $_product->tax_class ) ) {
@ -1153,7 +1153,7 @@ class WC_Cart {
// Work out new price based on region
$row_base_price = $base_price * $values['quantity'];
$base_taxes = $this->tax->calc_tax( $row_base_price, $base_tax_rates, true );
$base_taxes = $this->tax->calc_tax( $row_base_price, $base_tax_rates, true, true ); // Unrounded
$taxes = $this->tax->calc_tax( $row_base_price - array_sum($base_taxes), $tax_rates, false );
// Tax amount
@ -1209,7 +1209,7 @@ class WC_Cart {
// Line prices
$line_tax = ( get_option('woocommerce_tax_round_at_subtotal') == 'no' ) ? round( $discounted_tax_amount, 2 ) : $discounted_tax_amount;
$line_total = ( $discounted_price * $values['quantity'] ) - round( $line_tax, 2 );
$line_total = round( ( $discounted_price * $values['quantity'] ) - round( $line_tax, 2 ), 2 );
// Add any product discounts (after tax)
$this->apply_product_discounts_after_tax( $values, $line_total + $discounted_tax_amount );
@ -1743,7 +1743,7 @@ class WC_Cart {
} elseif ( ! $this->display_cart_ex_tax && $tax_rates !== $base_tax_rates && $this->prices_include_tax ) {
$base_taxes = $this->tax->calc_tax( $price * $quantity, $base_tax_rates, true );
$base_taxes = $this->tax->calc_tax( $price * $quantity, $base_tax_rates, true, true );
$modded_taxes = $this->tax->calc_tax( ( $price * $quantity ) - array_sum( $base_taxes ), $tax_rates, false );
$row_price = (( $price * $quantity ) - array_sum( $base_taxes )) + array_sum( $modded_taxes );

8
classes/class-wc-tax.php
View File

@ -351,7 +351,7 @@ class WC_Tax {
* @param bool passed price includes tax
* @return array array of rates/amounts
*/
function calc_tax( $price, $rates, $price_includes_tax = true ) {
function calc_tax( $price, $rates, $price_includes_tax = true, $supress_rounding = false ) {
$price = $price * 100; // To avoid float rounding errors, work with integers (pence)
@ -391,7 +391,7 @@ class WC_Tax {
$tax_amount = ($tax_amount / 100);
// Rounding
if ( get_option( 'woocommerce_tax_round_at_subtotal' ) == 'no' ) :
if ( get_option( 'woocommerce_tax_round_at_subtotal' ) == 'no' && ! $supress_rounding ) :
$tax_amount = round( $tax_amount, 2 );
endif;
@ -413,7 +413,7 @@ class WC_Tax {
$tax_amount = ($tax_amount / 100);
// Rounding
if ( get_option( 'woocommerce_tax_round_at_subtotal' ) == 'no' ) :
if ( get_option( 'woocommerce_tax_round_at_subtotal' ) == 'no' && ! $supress_rounding ) :
$tax_amount = round( $tax_amount, 2 );
endif;
@ -436,7 +436,7 @@ class WC_Tax {
$tax_amount = ($tax_amount / 100);
// Rounding
if ( get_option( 'woocommerce_tax_round_at_subtotal' ) == 'no' ) :
if ( get_option( 'woocommerce_tax_round_at_subtotal' ) == 'no' && ! $supress_rounding ) :
$tax_amount = round( $tax_amount, 2 );
endif;

1
readme.txt
View File

@ -167,6 +167,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
* Fix - Variation duplication respects post status
* Fix - Minimum coupon amount check
* Fix - Prevent double add to cart with related products
* Fix - Out of base tax rounding
* Localization - Updated localisations
= 1.5.6 - 17/05/2012 =

2
woocommerce.php
View File

@ -1386,7 +1386,7 @@ class Woocommerce {
'_transient_wc_product_children_ids_$post_id',
'_transient_wc_product_total_stock_$post_id',
'_transient_wc_average_rating_$post_id',
'_transient_wc_product_type_$post_id',
'_transient_wc_product_type_$post_id'
)");
} else {
$wpdb->query("DELETE FROM `$wpdb->options` WHERE `option_name` LIKE ('_transient_wc_product_children_ids_%')");