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

Merge pull request #1022 from GeertDD/totals-excl-tax 

Don't print 'incl.' if the cart subtotal excludes tax
This commit is contained in:
Mike Jolley 2012-05-10 02:36:38 -07:00
parent dbeb935cd5 24de04094c
commit ecf2a32466
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
templates/cart/totals.php
View File

@ -111,7 +111,14 @@ $available_methods = $woocommerce->shipping->get_available_shipping_methods();
if ($tax==0) continue; if ($tax==0) continue;
?> ?>
<tr class="tax-rate tax-rate-<?php echo $key; ?>"> <tr class="tax-rate tax-rate-<?php echo $key; ?>">
<th><?php if (get_option('woocommerce_prices_include_tax')=='yes') : _e('incl.', 'woocommerce'); endif; ?> <?php echo $woocommerce->cart->tax->get_rate_label( $key ); ?></th> <th>
<?php
if ( get_option( 'woocommerce_display_totals_excluding_tax' ) == 'no' && get_option( 'woocommerce_prices_include_tax' ) == 'yes' ) {
_e( 'incl.', 'woocommerce' );
}
echo $woocommerce->cart->tax->get_rate_label( $key );
?>
</th>
<td><?php echo woocommerce_price($tax); ?></td> <td><?php echo woocommerce_price($tax); ?></td>
</tr> </tr>
<?php <?php
@ -132,7 +139,14 @@ $available_methods = $woocommerce->shipping->get_available_shipping_methods();
if ($tax==0) continue; if ($tax==0) continue;
?> ?>
<tr class="tax-rate tax-rate-<?php echo $key; ?>"> <tr class="tax-rate tax-rate-<?php echo $key; ?>">
<th><?php if (get_option('woocommerce_prices_include_tax')=='yes') : _e('incl.', 'woocommerce'); endif; ?> <?php echo $woocommerce->cart->tax->get_rate_label( $key ); ?></th> <th>
<?php
if ( get_option( 'woocommerce_display_totals_excluding_tax' ) == 'no' && get_option( 'woocommerce_prices_include_tax' ) == 'yes' ) {
_e( 'incl.', 'woocommerce' );
}
echo $woocommerce->cart->tax->get_rate_label( $key );
?>
</th>
<td><?php echo woocommerce_price($tax); ?></td> <td><?php echo woocommerce_price($tax); ?></td>
</tr> </tr>
<?php <?php