Merge branch 'master' of github.com:woothemes/woocommerce

assets/css/admin.scss

@@ -784,14 +784,23 @@ ul.wc_coupon_list_block {
 			padding: 8px;
 			font-size: 11px;
 			text-align: left;
-
+			color: #555;
+			-webkit-touch-callout: none;
+		    -webkit-user-select: none;
+		    -khtml-user-select: none;
+		    -moz-user-select: none;
+		    -ms-user-select: none;
+		    user-select: none;
 			&:last-child {
 				padding-right: 12px;
 			}
 
 			&:first-child {
 				padding-left: 12px;
 			}
+			&.sortable {
+				cursor: pointer;
+			}
 		}
 
 		tbody th, td {

assets/js/admin/meta-boxes-order.js

@@ -628,6 +628,7 @@ jQuery( function ( $ ) {
 					$( '#woocommerce-order-items .inside' ).append( response );
 					runTipTip();
 					removeOrderItemsLoading();
+					$('.woocommerce_order_items').stupidtable();
 				}
 			});
 
@@ -1163,4 +1164,6 @@ jQuery( function ( $ ) {
 
 			return false;
 		});
+
+	$('.woocommerce_order_items').stupidtable();
 });

assets/js/admin/meta-boxes-product-variation.js

@@ -149,10 +149,13 @@ jQuery( function ( $ ) {
 					}
 				});
 
+				var variation_ids = [];
+				variation_ids.push( variation );
+
 				var data = {
-					action: 'woocommerce_remove_variation',
-					variation_id: variation,
-					security: woocommerce_admin_meta_boxes_variations.delete_variation_nonce
+					action: 'woocommerce_remove_variations',
+					variation_ids: variation_ids,
+					security: woocommerce_admin_meta_boxes_variations.delete_variations_nonce
 				};
 
 				$.post( woocommerce_admin_meta_boxes_variations.ajax_url, data, function ( response ) {

assets/js/admin/meta-boxes-product.js

@@ -271,14 +271,20 @@ jQuery( function( $ ){
 		});
 	};
 
+	$('.product_attributes .woocommerce_attribute').each(function(index, el){
+		if ( $(el).css('display') != 'none' && $(el).is('.taxonomy') ) {
+			$('select.attribute_taxonomy').find('option[value="' + $(el).data( 'taxonomy' ) + '"]').attr('disabled','disabled');
+		}
+	});
+
 	// Add rows
 	$('button.add_attribute').on('click', function(){
 
 		var size = $('.product_attributes .woocommerce_attribute').size();
 
 		var attribute_type = $('select.attribute_taxonomy').val();
 
-		if (!attribute_type) {
+		if ( ! attribute_type ) {
 
 			var product_type = $('select#product-type').val();
 			if (product_type!='variable') enable_variation = 'style="display:none;"'; else enable_variation = '';
@@ -327,6 +333,7 @@ jQuery( function( $ ){
 			$('.product_attributes').append( $(thisrow) );
 			$(thisrow).show().find('.woocommerce_attribute_data').show();
 			attribute_row_indexes();
+			$('select.attribute_taxonomy').find('option[value="' + attribute_type + '"]').attr('disabled','disabled');
 
 		}
 
@@ -357,6 +364,7 @@ jQuery( function( $ ){
 			if ($parent.is('.taxonomy')) {
 				$parent.find('select, input[type=text]').val('');
 				$parent.hide();
+				$('select.attribute_taxonomy').find('option[value="' + $parent.data( 'taxonomy' ) + '"]').removeAttr('disabled');
 			} else {
 				$parent.find('select, input[type=text]').val('');
 				$parent.hide();

assets/js/frontend/checkout.js

@@ -50,7 +50,7 @@ jQuery( function( $ ) {
 			s_address_2		= address_2;
 		}
 
-		$( '#order_methods, #order_review' ).block({
+		$( '.woocommerce-checkout-payment, .woocommerce-checkout-review-order-table' ).block({
 			message: null,
 			overlayCSS: {
 				background: '#fff',
@@ -82,15 +82,20 @@ jQuery( function( $ ) {
 			type:		'POST',
 			url:		wc_checkout_params.ajax_url,
 			data:		data,
-			success:	function( response ) {
-				if ( response ) {
-					$( '#order_review' ).html( $.trim( response ) );
-					$( '#order_review' ).find( 'input[name=payment_method]:checked' ).trigger('click');
+			success:	function( data ) {
+				console.log( data );
+				if ( data && data.fragments ) {
+
+					$.each( data.fragments, function( key, value ) {
+						$( key ).replaceWith( value );
+						$( key ).unblock();
+					});
+
+					$( '.woocommerce-checkout' ).find( 'input[name=payment_method]:checked' ).trigger('click');
 					$( 'body' ).trigger('updated_checkout' );
 				}
 			}
 		});
-
 	}
 
 	// Event for updating the checkout
@@ -123,7 +128,6 @@ jQuery( function( $ ) {
 	}).change();
 
 	if ( wc_checkout_params.option_guest_checkout === 'yes' ) {
-
 		$( 'div.create-account' ).hide();
 
 		$( 'input#createaccount' ).change( function() {
@@ -133,7 +137,6 @@ jQuery( function( $ ) {
 				$( 'div.create-account' ).slideDown();
 			}
 		}).change();
-
 	}
 
 	$( '#order_review' )
@@ -410,5 +413,4 @@ jQuery( function( $ ) {
 	if ( wc_checkout_params.is_checkout === '1' ) {
 		$( 'body' ).trigger( 'init_checkout' );
 	}
-
 });