3.13.0 Release (#2350)

* Fix undefined and deprecated _usort_terms_by_name (#2345)

Fixes #2344

* Remove server param from shipwire active check (#2346)

Possible fix for shipping methods disabling themselves on their own out of thin air

* Fix setting of shiwire test mode on/off (#2347)

* add braintree to core

* styling changes

* Increase card labels font size

* do some class renaming

* spacing

* disable plugin and avoid fatals

wpsc-admin/includes/settings-tabs/shipping.php

@@ -195,7 +195,10 @@ public function display() {
 						</tr>
 						<tr>
 							<th><?php esc_html_e( 'Use Test Server?', 'wp-e-commerce' ); ?></th>
-							<td><input type="checkbox" name='wpsc_options[shipwire_test_server]' value="0" <?php checked( '1',  get_option( 'shipwire_test_server', '0' ) ); ?> /></td>
+							<td>
+								<input <?php checked( get_option( 'shipwire_test_server', '0' ) ); ?> type="radio" name="wpsc_options[shipwire_test_server]" value="1" /> <?php _e( 'Yes', 'wp-e-commerce' ); ?>
+								<input <?php checked( (bool) get_option( 'shipwire_test_server', '0' ), false ); ?> type="radio" name="wpsc_options[shipwire_test_server]" value="0" /> <?php _e( 'No', 'wp-e-commerce' ); ?>
+							</td>
 						</tr>
 						<tr>
 							<th><?php esc_html_e( 'Force Sync with Shipwire', 'wp-e-commerce' ); ?></th>

wpsc-admin/js/settings-page.js

@@ -990,7 +990,7 @@
 					action    : 'sync_shipwire_products',
 					email     : $('input[name="wpsc_options[shipwireemail]"]').val(),
 					password  : $('input[name="wpsc_options[shipwirepassword]"]').val(),
-					server    : $('input[name="wpsc_options[shipwire_test_server]"]').val(),
+					server    : $('input[name="wpsc_options[shipwire_test_server]"]:checked').val(),
 					nonce     : WPSC_Settings_Page.shipping_module_settings_form_nonce
 				},
 				ajax_callback = function(response) {

wpsc-components/merchant-core-v3/classes/payment-gateway.php

@@ -235,7 +235,7 @@ public static function register_file( $file ) {
 		$classname = ucwords( str_replace( '-', ' ', $filename ) );
 		$classname = 'WPSC_Payment_Gateway_' . str_replace( ' ', '_', $classname );
 
-		if ( file_exists( $file ) ) {
+		if ( file_exists( $file ) && ! class_exists( $classname ) ) {
 			require_once $file;
 		}