Merge branch 'master' into update/gdpr-checkout-customizer

CHANGELOG.txt

@@ -1,5 +1,49 @@
 == Changelog ==
 
+= 3.3.5 - 2018-04-10 =
+* Fix - Shop page notice should not appear when edting the "Hello World!" page.
+* Fix - Inconsistent order item refund sign.
+* Fix - Change `wc_get_price_excluding_tax` to not round the return value so calculations in admin are not pre-rounded.
+* Fix - Use minimum price instead of maximum price when ordering variable products from low to high on term archives.
+* Fix - `order` and `orderby` on shop page when using rewrite rules.
+* Fix - Ajax loading spinner when using twentyseventeen theme.
+* Fix - Out of Stock products change stock to On Backorder when imported to update existing products.
+* Fix - Visibility dropdown not responding in quick edit when stock management is disabled.
+* Fix - Featured paramenter in products endpoint on REST API.
+* Fix - Linebreaks in order item meta.
+* Fix - Product rating count when updated by admin.
+* Tweak - Define array before attempting to append to it.
+* Tweak - Change WC WP-CLI commands default per_page value to 100.
+* Tweak - Ensure background process class returns `data` as an array.
+* Tweak - Increase orders table checkbox column size on small devices.
+* Tweak - Better support for infinite scroll in Jetpack.
+
+= 3.3.4 - 2018-03-20 =
+* Fix - Fixed undefined index after running setup wizard two times on fresh install.
+* Fix - wc_get_loop_class; force columns to be a minimum of 1.
+* Fix - Added loading spinner to WC panels in menu admin.
+* Fix - Use relative scheme for AJAX endpoint to avoid errors when using a mix of HTTP and HTTPS.
+* Fix - Fix SelectWoo templateSelection property.
+* Fix - Layered nav support on unsupported theme archives.
+* Fix - Prevent full refresh when editing store notice in the customizer.
+* Fix - Only append tax label in email content if taxes are enabled.
+* Fix - More reliable Jetpack detection.
+* Fix - Check if product has weight before calculate weight total in cart.
+* Fix - Correctly handle default ordering on the search page.
+* Fix - Fix default product category handling in installer.
+* Fix - Properly check slugs when updating attributes.
+* Fix - Use gallery thumbnail size for variation image switcher.
+* Fix - Clear subcategory cache when updating product categories.
+* Fix - Round fractional cents when out of base.
+* Fix - Inherit 'is variation' from existing attribute during csv import.
+* Fix - Set is_shortcode loop prop when outputting subcategories.
+* Fix - Reload gateways after updating the order.
+* Tweak - Use wc_get_default_products_per_row as the default for product shortcodes.
+* Tweak - Add post_excerpt to product search.
+* Tweak - Update the description of the user tracking notice in the onboarding wizard.
+* Tweak - Add extra data in order mobile view (status and date).
+* Tweak - Add profile link to order screen.
+
 = 3.3.3 - 2018-02-21 =
 * Fix - Fixed is_numeric check which was affecting order subtotals/totals when using comma decimal separator.
 * Fix - Add missing direct script access checks to loop templates.

assets/css/admin.scss

@@ -826,6 +826,11 @@ table.wc_status_table--tools {
 		margin-left: 10px;
 	}
 
+	label.stock_status_field {
+	  clear: both;
+	  float: left;
+	}
+
 	.dimensions div {
 		display: block;
 		margin: 0.2em 0;
@@ -2882,23 +2887,19 @@ table.wc_shipping {
 
 	th, td {
 		display: table-cell !important;
+		padding: 1em !important;
+		vertical-align: top;
+		line-height: 1.75em;
 	}
 
-	td {
+	&.wc_emails td {
 		vertical-align: middle;
-		padding: 7px;
-		line-height: 2em;
 	}
 
 	tr:nth-child( odd ) td {
 		background: #f9f9f9;
 	}
 
-	th {
-		padding: 9px 7px !important;
-		vertical-align: middle;
-	}
-
 	td.name {
 		font-weight: 700;
 	}
@@ -2920,16 +2921,10 @@ table.wc_shipping {
 			margin: 0;
 		}
 	}
-	th.sort {
-		width: 28px;
-		padding: 0;
-	}
 	td.sort {
-		padding: 0 7px;
 		cursor: move;
 		font-size: 15px;
 		text-align: center;
-		vertical-align: middle;
 
 		&::before {
 			content: '\f333';
@@ -2941,8 +2936,12 @@ table.wc_shipping {
 			width: 17px;
 			float: left;
 			height: 100%;
+			line-height: 24px;
 		}
 	}
+	.wc-payment-gateway-method-name {
+		display: block;
+	}
 	.wc-email-settings-table-name {
 		font-weight: 700;
 		span {
@@ -2958,18 +2957,6 @@ table.wc_shipping {
 			margin: 0 auto;
 		}
 	}
-	.wc-email-settings-table-actions a {
-		@include ir();
-		padding: 0 !important;
-		height: 2em !important;
-		width: 2em;
-
-		&::after {
-			@include icon('\f111');
-			font-family: 'Dashicons';
-			line-height: 1.85;
-		}
-	}
 }
 .wc-shipping-zone-settings {
 	th {
@@ -3059,9 +3046,6 @@ table.wc-shipping-zones, table.wc-shipping-zone-methods, table.wc-shipping-class
 			text-align: center;
 		}
 	}
-	tbody td {
-		padding: 1.5em 1em !important;
-	}
 	td.wc-shipping-zones-blank-state, td.wc-shipping-zone-method-blank-state {
 		background: #f7f1f6 !important;
 		overflow: hidden;
@@ -3298,6 +3282,8 @@ table.wc-shipping-zones, table.wc-shipping-zone-methods, table.wc-shipping-class
 	text-indent: -9999px;
 	border-radius: 10em;
 	position: relative;
+	margin-top: -1px;
+	vertical-align: text-top;
 
 	&:before {
 		content: "";
@@ -3625,6 +3611,7 @@ img.help_tip {
 			}
 		}
 
+		.wc_payment_gateways_wrapper,
 		.wc_emails_wrapper {
 			padding: 0 15px 10px 0;
 		}

assets/css/photoswipe/photoswipe.css

@@ -1,3 +1,35 @@
+/**
+ * WooCommerce Photoswipe styles.
+ * 1. These styles are required to overwrite default theme button styles (Twenty Twelve adds gradients via background-image).
+ * 2. For zooming on mobile.
+ */
+.woocommerce img.pswp__img,
+.woocommerce-page img.pswp__img {
+	max-width: none; /* 2 */
+}
+button.pswp__button {
+	box-shadow: none !important;
+	background-image: url('default-skin/default-skin.png') !important;
+}
+button.pswp__button,
+button.pswp__button:hover,
+button.pswp__button--arrow--left::before,
+button.pswp__button--arrow--right::before {
+	background-color: transparent !important; /* 1 */
+}
+button.pswp__button--arrow--left,
+button.pswp__button--arrow--right,
+button.pswp__button--arrow--left:hover,
+button.pswp__button--arrow--right:hover {
+	background-image: none !important; /* 1 */
+}
+button.pswp__button--close:hover {
+	background-position: 0 -44px;
+}
+button.pswp__button--zoom:hover {
+	background-position: -88px 0;
+}
+
 /*! PhotoSwipe main CSS by Dmitry Semenov | photoswipe.com | MIT license */
 /*
 	Styles for basic PhotoSwipe functionality (sliding area, open/close transitions)

assets/css/twenty-seventeen.scss

@@ -570,30 +570,6 @@ table.variations {
 	}
 }
 
-/**
- * Photoswipe
- * 1. These styles are required to overwrite default theme button styles (Twenty Twelve adds gradients via background-image).
- */
-
-button.pswp__button,
-button.pswp__button:hover,
-button.pswp__button--arrow--left::before,
-button.pswp__button--arrow--right::before {
-	background-color: transparent !important; /* 1 */
-}
-
-button.pswp__button--close:hover {
-	background-position: 0 -44px;
-}
-
-button.pswp__button--zoom:hover {
-	background-position: -88px 0;
-}
-
-.pswp img {
-	max-width: none;
-}
-
 /**
  * Widgets
  */

assets/css/woocommerce.scss

@@ -1673,47 +1673,6 @@ p.demo_store,
 	}
 }
 
-/**
- * Photoswipe
- * 1. These styles are required to overwrite default theme button styles (Twenty Twelve adds gradients via background-image).
- * 2. For zooming on mobile.
- */
-.pswp {
-	z-index: 999999;
-}
-
-.woocommerce img.pswp__img,
-.woocommerce-page img.pswp__img {
-	max-width: none; /* 2 */
-}
-
-button.pswp__button {
-	box-shadow: none !important;
-	background-image: url('photoswipe/default-skin/default-skin.png') !important;
-}
-
-button.pswp__button,
-button.pswp__button:hover,
-button.pswp__button--arrow--left::before,
-button.pswp__button--arrow--right::before {
-	background-color: transparent !important; /* 1 */
-}
-
-button.pswp__button--arrow--left,
-button.pswp__button--arrow--right,
-button.pswp__button--arrow--left:hover,
-button.pswp__button--arrow--right:hover {
-	background-image: none !important; /* 1 */
-}
-
-button.pswp__button--close:hover {
-	background-position: 0 -44px;
-}
-
-button.pswp__button--zoom:hover {
-	background-position: -88px 0;
-}
-
 .woocommerce-message,
 .woocommerce-error,
 .woocommerce-info {

assets/js/admin/woocommerce_admin.js

@@ -297,4 +297,50 @@ jQuery( function ( $ ) {
 
 	// Attribute term table
 	$( 'table.attributes-table tbody tr:nth-child(odd)' ).addClass( 'alternate' );
+
+
+	// Toggle gateway on/off.
+	$( '.wc_gateways' ).on( 'click', '.wc-payment-gateway-method-toggle-enabled', function() {
+		var $link   = $( this ),
+		    $row    = $link.closest( 'tr' ),
+			$table  = $row.closest( 'div' ),
+			$toggle = $link.find( '.woocommerce-input-toggle' );
+
+		var data = {
+			action: 'woocommerce_toggle_gateway_enabled',
+			security: woocommerce_admin.nonces.gateway_toggle,
+			gateway_id: $row.data( 'gateway_id' )
+		};
+
+		$table.block({
+			message: null,
+			overlayCSS: {
+				background: '#fff',
+				opacity: 0.6
+			}
+		});
+
+		$.ajax( {
+			url:      woocommerce_admin.ajax_url,
+			data:     data,
+			dataType : 'json',
+			type     : 'POST',
+			success:  function( response ) {
+				if ( true === response.data ) {
+					$toggle.removeClass( 'woocommerce-input-toggle--enabled, woocommerce-input-toggle--disabled' );
+					$toggle.addClass( 'woocommerce-input-toggle--enabled' );
+				} else if ( false === response.data ) {
+					$toggle.removeClass( 'woocommerce-input-toggle--enabled, woocommerce-input-toggle--disabled' );
+					$toggle.addClass( 'woocommerce-input-toggle--disabled' );
+				} else if ( 'needs_setup' === response.data ) {
+					window.location.href = $link.attr( 'href' );
+				}
+			},
+			complete: function() {
+				$table.unblock();
+			}
+		} );
+
+		return false;
+	});
 });