From a2bfe99c182aead041384d6de0c9e8dd566ea0de Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Fri, 12 Oct 2012 09:59:40 +0100
Subject: [PATCH] Tax settings page clean.

---
 admin/settings/settings-init.php      | 12 +++---------
 admin/settings/settings-tax-rates.php | 15 +++++++++++++--
 readme.txt                            |  1 +
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/admin/settings/settings-init.php b/admin/settings/settings-init.php
index a7c5c6bba49..aa5b51fdef1 100644
--- a/admin/settings/settings-init.php
+++ b/admin/settings/settings-init.php
@@ -925,18 +925,16 @@ $woocommerce_settings['tax'] = apply_filters('woocommerce_tax_settings', array(
 		'desc' 		=> __( 'Enable taxes and tax calculations', 'woocommerce' ),
 		'id' 		=> 'woocommerce_calc_taxes',
 		'std' 		=> 'no',
-		'type' 		=> 'checkbox',
-		'checkboxgroup'		=> 'start',
-		'show_if_checked' 	=> 'option',
+		'type' 		=> 'checkbox'
 	),
 	
 	array(
+		'name' => __( 'Calculation settings', 'woocommerce' ),
 		'desc' 		=> __( 'Calculate tax based on the customer shipping address', 'woocommerce' ),
 		'id' 		=> 'woocommerce_tax_shipping_address',
 		'std' 		=> 'yes',
 		'type' 		=> 'checkbox',
-		'show_if_checked' 	=> 'yes',
-		'checkboxgroup'		=> ''
+		'checkboxgroup'		=> 'start'
 	),
 	
 	array(
@@ -944,7 +942,6 @@ $woocommerce_settings['tax'] = apply_filters('woocommerce_tax_settings', array(
 		'id' 		=> 'woocommerce_tax_round_at_subtotal',
 		'std' 		=> 'no',
 		'type' 		=> 'checkbox',
-		'show_if_checked' 	=> 'yes',
 		'checkboxgroup'		=> ''
 	),
 
@@ -952,8 +949,6 @@ $woocommerce_settings['tax'] = apply_filters('woocommerce_tax_settings', array(
 		'desc' 		=> __( 'Display taxes on the cart page', 'woocommerce' ),
 		'id' 		=> 'woocommerce_display_cart_taxes',
 		'std' 		=> 'yes',
-		'type' 		=> 'checkbox',
-		'show_if_checked' 	=> 'yes',
 		'checkboxgroup'		=> ''
 	),
 
@@ -962,7 +957,6 @@ $woocommerce_settings['tax'] = apply_filters('woocommerce_tax_settings', array(
 		'id'            => 'woocommerce_display_cart_taxes_if_zero',
 		'std'           => 'no',
 		'type'          => 'checkbox',
-		'show_if_checked' 	=> 'yes',
 		'checkboxgroup' => 'end',
 	),
 
diff --git a/admin/settings/settings-tax-rates.php b/admin/settings/settings-tax-rates.php
index f3ca8669471..eda7a1e4e25 100644
--- a/admin/settings/settings-tax-rates.php
+++ b/admin/settings/settings-tax-rates.php
@@ -100,10 +100,14 @@ function woocommerce_tax_rates_setting() {
 
 	    		</tbody>
 	    	</table>
+	    	
+	    	<?php if ( empty( $local_tax_rates ) ) : ?>
+	    	<p style="margin: 1em 0 0;"><a href="#" data-tip="<?php _e( 'Add local tax rates to define rules for specific zip codes and cities.', 'woocommerce' ); ?>" class="tips toggle_local_tax_rates">+ <?php _e( 'Local tax rates', 'woocommerce' ); ?></a></p>
+	    	<?php endif; ?>
 	    </td>
 	</tr>
-	<tr valign="top">
-		<th scope="row" class="titledesc"><?php _e('Local Tax Rates', 'woocommerce') ?></th>
+	<tr valign="top" <?php if ( empty( $local_tax_rates ) ) : ?>style="display:none;"<?php endif; ?> class="local_tax_rates">
+		<th scope="row" class="titledesc"><?php _e( 'Local tax rates', 'woocommerce' ); ?></th>
 	    <td class="forminp">
 	    	<a class="button export_rates" href="<?php echo add_query_arg( 'wc_export_tax_rates', 2 ); ?>"><?php _e('Export rates', 'woocommerce'); ?></a>
 	    	<a class="button import_rates" href="<?php echo admin_url( 'admin.php?import=woocommerce_tax_rate_csv' ); ?>"><?php _e('Import rates', 'woocommerce'); ?></a>
@@ -368,6 +372,13 @@ function woocommerce_tax_rates_setting() {
 			}
 			return false;
 		});
+		
+		// Show local rates
+		jQuery( 'a.toggle_local_tax_rates' ).click(function(){
+			jQuery(this).closest('p').hide();
+			jQuery('tr.local_tax_rates').slideDown();
+			return false;
+		});
 
 	});
 	</script>
diff --git a/readme.txt b/readme.txt
index 052a6050c1e..e69048e1e48 100644
--- a/readme.txt
+++ b/readme.txt
@@ -190,6 +190,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
 * Tweak - Removed upsell limit - show whats defined.
 * Tweak - Args for upsells to control per-page and cols.
 * Tweak - Recoded add_to_cart_action for better handling of variations and groups.
+* Tweak - Admin sales stats show totals.
 
 * Fix - Added more error messages for coupons.
 * Fix - Variation sku updating after selection.