This commit is contained in:
Mike Jolley 2012-03-12 16:14:00 +00:00
parent 88cfadd6e8
commit 8914d1856a
4 changed files with 14 additions and 3 deletions

View File

@ -836,7 +836,7 @@ $woocommerce_settings['tax'] = apply_filters('woocommerce_tax_settings', array(
), ),
array( array(
'desc' => __( 'Also display tax row if no taxes are applicable', 'woocommerce' ), 'desc' => __( 'Display taxes even when the amount if zero', 'woocommerce' ),
'id' => 'woocommerce_display_cart_taxes_if_zero', 'id' => 'woocommerce_display_cart_taxes_if_zero',
'std' => 'no', 'std' => 'no',
'type' => 'checkbox', 'type' => 'checkbox',

View File

@ -506,7 +506,9 @@ class WC_Order {
endif; endif;
elseif ( get_option( 'woocommerce_display_cart_taxes_if_zero' ) == 'yes' ) : elseif ( get_option( 'woocommerce_display_cart_taxes_if_zero' ) == 'yes' ) :
$total_rows[ $woocommerce->countries->tax_or_vat() ] = _x( 'NA', 'Relating to tax', 'woocommerce' );
$total_rows[ $woocommerce->countries->tax_or_vat() ] = _x( 'N/A', 'Relating to tax', 'woocommerce' );
endif; endif;
if ($this->get_order_discount() > 0) if ($this->get_order_discount() > 0)

View File

@ -149,6 +149,15 @@ $available_methods = $woocommerce->shipping->get_available_shipping_methods();
<?php <?php
endif; endif;
elseif (get_option('woocommerce_display_cart_taxes_if_zero')=='yes') :
?>
<tr class="tax">
<th><?php _e('Tax', 'woocommerce'); ?></th>
<td><?php _ex( 'N/A', 'Relating to tax', 'woocommerce' ); ?></td>
</tr>
<?php
endif; endif;
?> ?>

View File

@ -154,7 +154,7 @@ $available_methods = $woocommerce->shipping->get_available_shipping_methods();
<tr class="tax"> <tr class="tax">
<th colspan="2"><?php echo $woocommerce->countries->tax_or_vat(); ?></th> <th colspan="2"><?php echo $woocommerce->countries->tax_or_vat(); ?></th>
<td><?php _ex( 'NA', 'Relating to tax', 'woocommerce' ); ?></td> <td><?php _ex( 'N/A', 'Relating to tax', 'woocommerce' ); ?></td>
</tr> </tr>
<?php <?php