Merge branch 'master' of https://github.com/wp-e-commerce/WP-e-Commerce

wp-e-commerce · Feb 4, 2017 · f8c577f · f8c577f
2 parents d838771 + 7f14378
commit f8c577f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/wpsc-components/theme-engine-v1/templates/wpsc-shopping_cart_page.php b/wpsc-components/theme-engine-v1/templates/wpsc-shopping_cart_page.php
@@ -147,7 +147,7 @@
                         <?php _e('Please provide a Zipcode and click Calculate in order to continue.', 'wp-e-commerce'); ?>
                      </td>
                   </tr>
-            <?php else: ?>
+            <?php elseif ( ! empty( wpsc_get_customer_meta( 'shippingcountry' ) ) ) : ?>
                <tr class='wpsc_update_location_error'>
                   <td colspan='5' class='shipping_error' >
                      <?php _e('Sorry, shipping quotes could not be calculated with the details provided. Please double check your shipping address details.', 'wp-e-commerce'); ?>

diff --git a/wpsc-includes/wpsc-tracking.php b/wpsc-includes/wpsc-tracking.php
@@ -221,22 +221,14 @@ public function admin_notice() {
 			return;
 		}
 
-		if (
-			stristr( network_site_url( '/' ), 'dev'       ) !== false ||
-			stristr( network_site_url( '/' ), 'localhost' ) !== false ||
-			stristr( network_site_url( '/' ), ':8888'     ) !== false // This is common with MAMP on OS X
-		) {
-			update_option( 'wpsc_usage_tracking_notice', '1' );
-		} else {
-			$optin_url  = esc_url_raw( add_query_arg( 'wpsc_tracking_action', 'opt_into_tracking' ) );
-			$optout_url = esc_url_raw( add_query_arg( 'wpsc_tracking_action', 'opt_out_of_tracking' ) );
-			$extensions_url = $this->api_url . 'store/';
-			echo '<div class="updated"><p>';
-				echo sprintf( __( 'Allow WP eCommerce to track plugin usage? Opt-in to tracking and our newsletter and immediately be emailed a 20%s discount to the WPEC shop, valid towards the <a href="%s" target="_blank">purchase of extensions</a>. No sensitive data is tracked.', 'wp-e-commerce' ), '%', $extensions_url );
-				echo '&nbsp;<a href="' . esc_url( $optin_url ) . '" class="button-secondary">' . __( 'Allow', 'wp-e-commerce' ) . '</a>';
-				echo '&nbsp;<a href="' . esc_url( $optout_url ) . '" class="button-secondary">' . __( 'Do not allow', 'wp-e-commerce' ) . '</a>';
-			echo '</p></div>';
-		}
+		$optin_url  = esc_url_raw( add_query_arg( 'wpsc_tracking_action', 'opt_into_tracking' ) );
+		$optout_url = esc_url_raw( add_query_arg( 'wpsc_tracking_action', 'opt_out_of_tracking' ) );
+		$extensions_url = $this->api_url . 'store/';
+		echo '<div class="updated"><p>';
+			echo sprintf( __( 'Allow WP eCommerce to track plugin usage? Opt-in to tracking and our newsletter and immediately be emailed a 20%s discount to the WPEC shop, valid towards the <a href="%s" target="_blank">purchase of extensions</a>. No sensitive data is tracked.', 'wp-e-commerce' ), '%', $extensions_url );
+			echo '&nbsp;<a href="' . esc_url( $optin_url ) . '" class="button-secondary">' . __( 'Allow', 'wp-e-commerce' ) . '</a>';
+			echo '&nbsp;<a href="' . esc_url( $optout_url ) . '" class="button-secondary">' . __( 'Do not allow', 'wp-e-commerce' ) . '</a>';
+		echo '</p></div>';
 	}
 
 	/**