Merge branch 'master' into update/use-post-author-for-customer-id

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,33 @@
+### All Submissions:
+
+* [ ] Have you followed the [WooCommerce Contributing guideline](https://github.com/woocommerce/woocommerce/blob/master/.github/CONTRIBUTING.md)?
+* [ ] Does your code follow the [WordPress' coding standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/)?
+* [ ] Have you checked to ensure there aren't other open [Pull Requests](../../pulls) for the same update/change?
+
+<!-- Mark completed items with an [x] -->
+
+<!-- You can erase any parts of this template not applicable to your Pull Request. -->
+
+### Changes proposed in this Pull Request:
+
+<!-- Describe the changes made to this Pull Request, and the reason for such changes. -->
+
+Closes # .
+
+### How to test the changes in this Pull Request:
+
+1.
+2.
+3.
+
+### Other information:
+
+* [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
+* [ ] Have you written new tests for your changes, as applicable?
+* [ ] Have you successfully ran tests with your changes locally?
+
+<!-- Mark completed items with an [x] -->
+
+### Changelog entry
+
+> Enter a short summary of all changes on this Pull Request. This will appear in the changelog if accepted.

CHANGELOG.txt

@@ -1,7 +1,7 @@
 == Changelog ==
 
 = 3.3.5 - 2018-04-10 =
-* Fix - Shop page notice should not appear when edting the "Hello World!" page.
+* Fix - Shop page notice should not appear when editing 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.

apigen/hook-docs.php

@@ -58,34 +58,42 @@ class WC_HookFinder {
 	}
 
 	public static function process_hooks() {
-		// If we have one, get the PHP files from it.
-		$template_files 	= self::get_files( '*.php', GLOB_MARK, '../templates/' );
-		$template_files[]	= '../includes/wc-template-functions.php';
-		$template_files[]	= '../includes/wc-template-hooks.php';
+		self::$files_to_scan = array();
 
-		$shortcode_files 	= self::get_files( '*.php', GLOB_MARK, '../includes/shortcodes/' );
-		$widget_files	 	= self::get_files( '*.php', GLOB_MARK, '../includes/widgets/' );
-		$admin_files 		= self::get_files( '*.php', GLOB_MARK, '../includes/admin/' );
-		$class_files 		= self::get_files( '*.php', GLOB_MARK, '../includes/' );
-		$other_files		= array(
-			'../woocommerce.php'
+		self::$files_to_scan['Template Files']     = self::get_files( '*.php', GLOB_MARK, '../templates/' );
+		self::$files_to_scan['Template Functions'] = array( '../includes/wc-template-functions.php', '../includes/wc-template-hooks.php' );
+		self::$files_to_scan['Shortcodes']         = self::get_files( '*.php', GLOB_MARK, '../includes/shortcodes/' );
+		self::$files_to_scan['Widgets']            = self::get_files( '*.php', GLOB_MARK, '../includes/widgets/' );
+		self::$files_to_scan['Data Stores']        = self::get_files( '*.php', GLOB_MARK, '../includes/data-stores' );
+		self::$files_to_scan['Core Classes']       = array_merge(
+			self::get_files( '*.php', GLOB_MARK, '../includes/' ),
+			self::get_files( '*.php', GLOB_MARK, '../includes/abstracts/' ),
+			self::get_files( '*.php', GLOB_MARK, '../includes/customizer/' ),
+			self::get_files( '*.php', GLOB_MARK, '../includes/emails/' ),
+			self::get_files( '*.php', GLOB_MARK, '../includes/export/' ),
+			self::get_files( '*.php', GLOB_MARK, '../includes/gateways/' ),
+			self::get_files( '*.php', GLOB_MARK, '../includes/import/' ),
+			self::get_files( '*.php', GLOB_MARK, '../includes/shipping/' )
 		);
 
-		self::$files_to_scan = array(
-			'Template Hooks'  => $template_files,
-			'Shortcode Hooks' => $shortcode_files,
-			'Widget Hooks'    => $widget_files,
-			'Class Hooks'     => $class_files,
-			'Admin Hooks'     => $admin_files,
-			'Other Hooks'     => $other_files,
-		);
+		self::$files_to_scan = array_filter( self::$files_to_scan );
 
 		$scanned = array();
 
 		ob_start();
 
+		$index = array();
+
+		foreach ( self::$files_to_scan as $heading => $files ) {
+			$index[] = '<a href="#hooks-' . str_replace( ' ', '-', strtolower( $heading ) ) . '">' . $heading . '</a>';
+		}
+
 		echo '<div id="content">';
 		echo '<h1>Action and Filter Hook Reference</h1>';
+		echo '<div class="description">
+			<p>This is simply a list of action and filter hooks found within WooCommerce files. View the source to see supported params and usage.</p>
+			<p>' . implode( ', ', $index ) . '</p>
+		</div>';
 
 		foreach ( self::$files_to_scan as $heading => $files ) {
 			self::$custom_hooks_found = array();
@@ -125,43 +133,36 @@ class WC_HookFinder {
 								case 'filter' :
 								case 'action' :
 									$hook = trim( $token[1], "'" );
+									$hook = str_replace( '_FUNCTION_', strtoupper( $current_function ), $hook );
+									$hook = str_replace( '_CLASS_', strtoupper( $current_class ), $hook );
+									$hook = str_replace( '$this', strtoupper( $current_class ), $hook );
+									$hook = str_replace( array( '.', '{', '}', '"', "'", ' ', ')', '(' ), '', $hook );
 									$loop = 0;
 
-									if ( '_' === substr( $hook, '-1', 1 ) ) {
-										$hook .= '{';
-										$open = true;
-										// Keep adding to hook until we find a comma or colon
-										while ( 1 ) {
-											$loop ++;
-											$next_hook  = trim( trim( is_string( $tokens[ $index + $loop ] ) ? $tokens[ $index + $loop ] : $tokens[ $index + $loop ][1], '"' ), "'" );
+									// Keep adding to hook until we find a comma or colon
+									while ( 1 ) {
+										$loop ++;
+										$prev_hook = is_string( $tokens[ $index + $loop - 1 ] ) ? $tokens[ $index + $loop - 1 ] : $tokens[ $index + $loop - 1 ][1];
+										$next_hook = is_string( $tokens[ $index + $loop ] ) ? $tokens[ $index + $loop ] : $tokens[ $index + $loop ][1];
 
-											if ( in_array( $next_hook, array( '.', '{', '}', '"', "'", ' ' ) ) ) {
-												continue;
-											}
-
-											$hook_first = substr( $next_hook, 0, 1 );
-											$hook_last  = substr( $next_hook, -1, 1 );
-
-											if ( in_array( $next_hook, array( ',', ';' ) ) ) {
-												if ( $open ) {
-													$hook .= '}';
-													$open = false;
-												}
-												break;
-											}
-
-											if ( '_' === $hook_first ) {
-												$next_hook = '}' . $next_hook;
-												$open = false;
-											}
-
-											if ( '_' === $hook_last ) {
-												$next_hook .= '{';
-												$open = true;
-											}
-
-											$hook .= $next_hook;
+										if ( in_array( $next_hook, array( '.', '{', '}', '"', "'", ' ', ')', '(' ) ) ) {
+											continue;
 										}
+
+										if ( in_array( $next_hook, array( ',', ';' ) ) ) {
+											break;
+										}
+
+										$hook_first = substr( $next_hook, 0, 1 );
+										$hook_last  = substr( $next_hook, -1, 1 );
+
+										if ( '{' === $hook_first || '}' === $hook_last || '$' === $hook_first || ')' === $hook_last || '>' === substr( $prev_hook, -1, 1 ) ) {
+											$next_hook = strtoupper( $next_hook );
+										}
+
+										$next_hook = str_replace( array( '.', '{', '}', '"', "'", ' ', ')', '(' ), '', $next_hook );
+
+										$hook .= $next_hook;
 									}
 
 									if ( isset( self::$custom_hooks_found[ $hook ] ) ) {
@@ -185,14 +186,14 @@ class WC_HookFinder {
 
 			foreach ( self::$custom_hooks_found as $hook => $details ) {
 				if ( ! strstr( $hook, 'woocommerce' ) && ! strstr( $hook, 'product' ) && ! strstr( $hook, 'wc_' ) ) {
-					unset( self::$custom_hooks_found[ $hook ] );
+					//unset( self::$custom_hooks_found[ $hook ] );
 				}
 			}
 
 			ksort( self::$custom_hooks_found );
 
 			if ( ! empty( self::$custom_hooks_found ) ) {
-				echo '<div class="panel panel-default"><div class="panel-heading"><h2>' . $heading . '</h2></div>';
+				echo '<div class="panel panel-default"><div class="panel-heading"><h2 id="hooks-' . str_replace( ' ', '-', strtolower( $heading ) ) . '">' . $heading . '</h2></div>';
 
 				echo '<table class="summary table table-bordered table-striped"><thead><tr><th>Hook</th><th>Type</th><th>File(s)</th></tr></thead><tbody>';
 

assets/css/activation-rtl.css

@@ -1 +1 @@
-div.woocommerce-message{overflow:hidden;position:relative;border-right-color:#cc99c2!important}div.woocommerce-message p{max-width:700px}div.woocommerce-message p:last-child{max-width:inherit}.woocommerce-message .button-primary,p.woocommerce-actions .button-primary{background:#bb77ae;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;color:#fff;text-shadow:0 -1px 1px #a36597,-1px 0 1px #a36597,0 1px 1px #a36597,1px 0 1px #a36597}.woocommerce-message .button-primary:active,.woocommerce-message .button-primary:focus,.woocommerce-message .button-primary:hover,p.woocommerce-actions .button-primary:active,p.woocommerce-actions .button-primary:focus,p.woocommerce-actions .button-primary:hover{background:#a36597;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.woocommerce-message a.woocommerce-message-close,p.woocommerce-actions a.woocommerce-message-close{position:absolute;top:0;left:0;padding:10px 21px 10px 15px;font-size:13px;line-height:1.23076923;text-decoration:none}.woocommerce-message a.woocommerce-message-close::before,p.woocommerce-actions a.woocommerce-message-close::before{position:absolute;top:8px;right:0;transition:all .1s ease-in-out}.woocommerce-message .button-primary,.woocommerce-message .button-secondary,p.woocommerce-actions .button-primary,p.woocommerce-actions .button-secondary{text-decoration:none!important}.woocommerce-message .twitter-share-button,p.woocommerce-actions .twitter-share-button{margin-top:-3px;margin-right:3px;vertical-align:middle}.woocommerce-about-text,p.woocommerce-actions{margin-bottom:1em!important}div.woocommerce-legacy-shipping-notice,div.woocommerce-no-shipping-methods-notice{overflow:hidden;padding:1px 12px}div.woocommerce-legacy-shipping-notice p,div.woocommerce-no-shipping-methods-notice p{position:relative;z-index:1;max-width:700px;line-height:1.5em;margin:12px 0}div.woocommerce-legacy-shipping-notice p.main,div.woocommerce-no-shipping-methods-notice p.main{font-size:1.1em}div.woocommerce-legacy-shipping-notice::before,div.woocommerce-no-shipping-methods-notice::before{content:'\e01b';font-family:WooCommerce;text-align:center;line-height:1;color:#f7f1f6;display:block;width:1em;font-size:20em;top:36px;left:12px;position:absolute}
+div.woocommerce-message{overflow:hidden;position:relative;border-right-color:#cc99c2!important}div.woocommerce-message p{max-width:700px}div.woocommerce-message p:last-child{max-width:inherit}.woocommerce-message .button-primary,p.woocommerce-actions .button-primary{background:#bb77ae;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;color:#fff;text-shadow:0 -1px 1px #a36597,-1px 0 1px #a36597,0 1px 1px #a36597,1px 0 1px #a36597}.woocommerce-message .button-primary:active,.woocommerce-message .button-primary:focus,.woocommerce-message .button-primary:hover,p.woocommerce-actions .button-primary:active,p.woocommerce-actions .button-primary:focus,p.woocommerce-actions .button-primary:hover{background:#a36597;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.woocommerce-message a.woocommerce-message-close,p.woocommerce-actions a.woocommerce-message-close{position:static;float:left;top:0;left:0;padding:0 28px 10px 15px;margin-top:-10px;font-size:13px;line-height:1.23076923;text-decoration:none}.woocommerce-message a.woocommerce-message-close::before,p.woocommerce-actions a.woocommerce-message-close::before{position:relative;top:18px;right:-20px;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}.woocommerce-message .button-primary,.woocommerce-message .button-secondary,p.woocommerce-actions .button-primary,p.woocommerce-actions .button-secondary{text-decoration:none!important}.woocommerce-message .twitter-share-button,p.woocommerce-actions .twitter-share-button{margin-top:-3px;margin-right:3px;vertical-align:middle}.woocommerce-about-text,p.woocommerce-actions{margin-bottom:1em!important}div.woocommerce-legacy-shipping-notice,div.woocommerce-no-shipping-methods-notice{overflow:hidden;padding:1px 12px}div.woocommerce-legacy-shipping-notice p,div.woocommerce-no-shipping-methods-notice p{position:relative;z-index:1;max-width:700px;line-height:1.5em;margin:12px 0}div.woocommerce-legacy-shipping-notice p.main,div.woocommerce-no-shipping-methods-notice p.main{font-size:1.1em}div.woocommerce-legacy-shipping-notice::before,div.woocommerce-no-shipping-methods-notice::before{content:'\e01b';font-family:WooCommerce;text-align:center;line-height:1;color:#f7f1f6;display:block;width:1em;font-size:20em;top:36px;left:12px;position:absolute}

assets/css/activation.css

@@ -1 +1 @@
-div.woocommerce-message{overflow:hidden;position:relative;border-left-color:#cc99c2!important}div.woocommerce-message p{max-width:700px}div.woocommerce-message p:last-child{max-width:inherit}.woocommerce-message .button-primary,p.woocommerce-actions .button-primary{background:#bb77ae;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;color:#fff;text-shadow:0 -1px 1px #a36597,1px 0 1px #a36597,0 1px 1px #a36597,-1px 0 1px #a36597}.woocommerce-message .button-primary:active,.woocommerce-message .button-primary:focus,.woocommerce-message .button-primary:hover,p.woocommerce-actions .button-primary:active,p.woocommerce-actions .button-primary:focus,p.woocommerce-actions .button-primary:hover{background:#a36597;border-color:#a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.woocommerce-message a.woocommerce-message-close,p.woocommerce-actions a.woocommerce-message-close{position:absolute;top:0;right:0;padding:10px 15px 10px 21px;font-size:13px;line-height:1.23076923;text-decoration:none}.woocommerce-message a.woocommerce-message-close::before,p.woocommerce-actions a.woocommerce-message-close::before{position:absolute;top:8px;left:0;transition:all .1s ease-in-out}.woocommerce-message .button-primary,.woocommerce-message .button-secondary,p.woocommerce-actions .button-primary,p.woocommerce-actions .button-secondary{text-decoration:none!important}.woocommerce-message .twitter-share-button,p.woocommerce-actions .twitter-share-button{margin-top:-3px;margin-left:3px;vertical-align:middle}.woocommerce-about-text,p.woocommerce-actions{margin-bottom:1em!important}div.woocommerce-legacy-shipping-notice,div.woocommerce-no-shipping-methods-notice{overflow:hidden;padding:1px 12px}div.woocommerce-legacy-shipping-notice p,div.woocommerce-no-shipping-methods-notice p{position:relative;z-index:1;max-width:700px;line-height:1.5em;margin:12px 0}div.woocommerce-legacy-shipping-notice p.main,div.woocommerce-no-shipping-methods-notice p.main{font-size:1.1em}div.woocommerce-legacy-shipping-notice::before,div.woocommerce-no-shipping-methods-notice::before{content:'\e01b';font-family:WooCommerce;text-align:center;line-height:1;color:#f7f1f6;display:block;width:1em;font-size:20em;top:36px;right:12px;position:absolute}
+div.woocommerce-message{overflow:hidden;position:relative;border-left-color:#cc99c2!important}div.woocommerce-message p{max-width:700px}div.woocommerce-message p:last-child{max-width:inherit}.woocommerce-message .button-primary,p.woocommerce-actions .button-primary{background:#bb77ae;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;color:#fff;text-shadow:0 -1px 1px #a36597,1px 0 1px #a36597,0 1px 1px #a36597,-1px 0 1px #a36597}.woocommerce-message .button-primary:active,.woocommerce-message .button-primary:focus,.woocommerce-message .button-primary:hover,p.woocommerce-actions .button-primary:active,p.woocommerce-actions .button-primary:focus,p.woocommerce-actions .button-primary:hover{background:#a36597;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.woocommerce-message a.woocommerce-message-close,p.woocommerce-actions a.woocommerce-message-close{position:static;float:right;top:0;right:0;padding:0 15px 10px 28px;margin-top:-10px;font-size:13px;line-height:1.23076923;text-decoration:none}.woocommerce-message a.woocommerce-message-close::before,p.woocommerce-actions a.woocommerce-message-close::before{position:relative;top:18px;left:-20px;-webkit-transition:all .1s ease-in-out;transition:all .1s ease-in-out}.woocommerce-message .button-primary,.woocommerce-message .button-secondary,p.woocommerce-actions .button-primary,p.woocommerce-actions .button-secondary{text-decoration:none!important}.woocommerce-message .twitter-share-button,p.woocommerce-actions .twitter-share-button{margin-top:-3px;margin-left:3px;vertical-align:middle}.woocommerce-about-text,p.woocommerce-actions{margin-bottom:1em!important}div.woocommerce-legacy-shipping-notice,div.woocommerce-no-shipping-methods-notice{overflow:hidden;padding:1px 12px}div.woocommerce-legacy-shipping-notice p,div.woocommerce-no-shipping-methods-notice p{position:relative;z-index:1;max-width:700px;line-height:1.5em;margin:12px 0}div.woocommerce-legacy-shipping-notice p.main,div.woocommerce-no-shipping-methods-notice p.main{font-size:1.1em}div.woocommerce-legacy-shipping-notice::before,div.woocommerce-no-shipping-methods-notice::before{content:'\e01b';font-family:WooCommerce;text-align:center;line-height:1;color:#f7f1f6;display:block;width:1em;font-size:20em;top:36px;right:12px;position:absolute}

assets/css/activation.scss

@@ -35,17 +35,19 @@ p.woocommerce-actions,
 	}
 
 	a.woocommerce-message-close {
-		position: absolute;
+		position: static;
+		float: right;
 		top: 0;
 		right: 0;
-		padding: 10px 15px 10px 21px;
+		padding: 0px 15px 10px 28px;
+		margin-top: -10px;
 		font-size: 13px;
 		line-height: 1.23076923;
 		text-decoration: none;
 		&::before {
-			position: absolute;
-			top: 8px;
-			left: 0;
+			position: relative;
+			top: 18px;
+			left: -20px;
 			transition: all 0.1s ease-in-out;
 		}
 	}

assets/css/admin.scss

@@ -543,17 +543,17 @@
 	}
 
 	a.woocommerce-message-close {
-		position: absolute;
-		top: 10px;
-		right: 10px;
-		padding: 10px 15px 10px 21px;
+		position: static;
+		float: right;
+		padding: 0px 15px 10px 28px;
+		margin-top: -10px;
 		font-size: 13px;
 		line-height: 1.23076923;
 		text-decoration: none;
 		&::before {
-			position: absolute;
-			top: 8px;
-			left: 0;
+			position: relative;
+			top: 18px;
+			left: -20px;
 			transition: all 0.1s ease-in-out;
 		}
 	}
@@ -2887,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;
 	}
@@ -2925,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';
@@ -2946,8 +2936,12 @@ table.wc_shipping {
 			width: 17px;
 			float: left;
 			height: 100%;
+			line-height: 24px;
 		}
 	}
+	.wc-payment-gateway-method-name {
+		font-weight: normal;
+	}
 	.wc-email-settings-table-name {
 		font-weight: 700;
 		span {
@@ -2956,6 +2950,13 @@ table.wc_shipping {
 			margin: 0 0 0 4px !important;
 		}
 	}
+	.wc-payment-gateway-method-toggle-enabled,
+	.wc-payment-gateway-method-toggle-disabled {
+		padding-top: 1px;
+		display: block;
+		outline: 0;
+		box-shadow: none;
+	}
 	.wc-email-settings-table-status {
 		text-align: center;
 		width: 1em;
@@ -2963,18 +2964,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 {
@@ -3064,9 +3053,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;
@@ -3303,6 +3289,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: "";
@@ -3325,6 +3313,9 @@ table.wc-shipping-zones, table.wc-shipping-zone-methods, table.wc-shipping-class
 			left: 0;
 		}
 	}
+	&.woocommerce-input-toggle--loading {
+		opacity: 0.5;
+	}
 }
 
 .wc-modal-shipping-method-settings {
@@ -3495,12 +3486,16 @@ img.help_tip {
 			margin: 0;
 			padding: 6px;
 			box-sizing: border-box;
+			vertical-align: top;
 		}
 
 		select {
 			width: 400px;
 			margin: 0;
 			box-sizing: border-box;
+			height: 32px;
+			line-height: 32px;
+			vertical-align: top;
 		}
 
 		input[size] {
@@ -3542,6 +3537,11 @@ img.help_tip {
 			padding-right: 24px;
 		}
 
+		th label {
+			position: relative;
+			display: block;
+		}
+
 		.select2-container {
 			vertical-align: top;
 			margin-bottom: 3px;
@@ -3553,8 +3553,10 @@ img.help_tip {
 
 		th img.help_tip,
 		th .woocommerce-help-tip {
-			margin: 2px -24px 0 0;
-			float: right;
+			margin: -8px -24px 0 0;
+			position: absolute;
+			right: 0;
+			top: 50%;
 		}
 
 		.wp-list-table .woocommerce-help-tip {
@@ -3604,18 +3606,12 @@ img.help_tip {
 		}
 
 		.colorpickpreview {
-			padding: 6px;
-			padding-left: 20px;
+			padding: 7px 0;
+			line-height: 1em;
+			display: inline-block;
+			width: 26px;
 			border: 1px solid #ddd;
-			/* rtl:ignore */
-			border-right: 0;
-			/* rtl:ignore */
-			margin-left: -3px;
-		}
-
-		.colorpick {
-			/* rtl:ignore */
-			border-left: 0;
+			font-size: 14px;
 		}
 
 		.image_width_settings {
@@ -3630,6 +3626,7 @@ img.help_tip {
 			}
 		}
 
+		.wc_payment_gateways_wrapper,
 		.wc_emails_wrapper {
 			padding: 0 15px 10px 0;
 		}
@@ -5489,6 +5486,7 @@ table.bar_chart {
 	.woocommerce-BlankState-cta {
 		font-size: 1.2em;
 		padding: 0.75em 1.5em;
+		margin: 0 .25em;
 		height: auto;
 		display: inline-block !important
 	}

assets/css/auth-rtl.css

@@ -1 +1 @@
-body{background:#f1f1f1;box-shadow:none;margin:100px auto 24px;padding:0}#wc-logo{border:0;margin:0 0 24px;padding:0;text-align:center}#wc-logo img{max-width:50%}.wc-auth-content{background:#fff;box-shadow:0 1px 3px rgba(0,0,0,.13);overflow:hidden;padding:24px 24px 0;zoom:1}.wc-auth-content h1,.wc-auth-content h2,.wc-auth-content h3,.wc-auth-content table{border:0;clear:none;color:#666;margin:0 0 24px;padding:0}.wc-auth-content p,.wc-auth-content ul{color:#666;font-size:1em;line-height:1.75em;margin:0 0 24px}.wc-auth-content p{padding:0}.wc-auth-content a{color:#a16696}.wc-auth-content a:focus,.wc-auth-content a:hover{color:#111}.wc-auth-content .wc-auth-login label{color:#999;display:block;margin-bottom:.5em}.wc-auth-content .wc-auth-login input{box-sizing:border-box;font-size:1.3em;padding:.5em;width:100%}.wc-auth-content .wc-auth-login .wc-auth-actions{padding:0}.wc-auth-content .wc-auth-login .wc-auth-actions .wc-auth-login-button{float:none;width:100%}.wc-auth-permissions{list-style:disc inside;padding:0}.wc-auth-permissions li{font-size:1em}.wc-auth-logged-in-as{background:#f5f5f5;border-bottom:2px solid #eee;line-height:70px;margin:0 0 24px;padding:0 0 0 1em}.wc-auth-logged-in-as p{margin:0;line-height:70px}.wc-auth-logged-in-as img{float:right;height:70px;margin:0 0 0 1em}.wc-auth-logged-in-as .wc-auth-logout{float:left}.wc-auth .wc-auth-actions{overflow:hidden;padding-right:24px}.wc-auth .wc-auth-actions .button{background:#f7f7f7;border-bottom-width:2px;border:1px solid #d7d7d7;box-sizing:border-box;color:#777;float:left;font-size:1.25em;height:auto;line-height:1em;padding:1em 2em;text-align:center;width:50%}.wc-auth .wc-auth-actions .button:focus,.wc-auth .wc-auth-actions .button:hover{background:#fcfcfc}.wc-auth .wc-auth-actions .button-primary{background:#ad6ea1;border-color:#a16696;box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 0 rgba(0,0,0,.15);color:#fff;float:left;opacity:1;text-shadow:0 -1px 1px #8a4f7f,-1px 0 1px #8a4f7f,0 1px 1px #8a4f7f,1px 0 1px #8a4f7f}.wc-auth .wc-auth-actions .button-primary:focus,.wc-auth .wc-auth-actions .button-primary:hover{background:#b472a8;color:#fff}.wc-auth .wc-auth-actions .wc-auth-approve{float:left}.wc-auth .wc-auth-actions .wc-auth-deny{float:right;margin-right:-24px}
+body{background:#f1f1f1;-webkit-box-shadow:none;box-shadow:none;margin:100px auto 24px;padding:0}#wc-logo{border:0;margin:0 0 24px;padding:0;text-align:center}#wc-logo img{max-width:50%}.wc-auth-content{background:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.13);box-shadow:0 1px 3px rgba(0,0,0,.13);overflow:hidden;padding:24px 24px 0;zoom:1}.wc-auth-content h1,.wc-auth-content h2,.wc-auth-content h3,.wc-auth-content table{border:0;clear:none;color:#666;margin:0 0 24px;padding:0}.wc-auth-content p,.wc-auth-content ul{color:#666;font-size:1em;line-height:1.75em;margin:0 0 24px}.wc-auth-content p{padding:0}.wc-auth-content a{color:#a16696}.wc-auth-content a:focus,.wc-auth-content a:hover{color:#111}.wc-auth-content .wc-auth-login label{color:#999;display:block;margin-bottom:.5em}.wc-auth-content .wc-auth-login input{-webkit-box-sizing:border-box;box-sizing:border-box;font-size:1.3em;padding:.5em;width:100%}.wc-auth-content .wc-auth-login .wc-auth-actions{padding:0}.wc-auth-content .wc-auth-login .wc-auth-actions .wc-auth-login-button{float:none;width:100%}.wc-auth-permissions{list-style:disc inside;padding:0}.wc-auth-permissions li{font-size:1em}.wc-auth-logged-in-as{background:#f5f5f5;border-bottom:2px solid #eee;line-height:70px;margin:0 0 24px;padding:0 0 0 1em}.wc-auth-logged-in-as p{margin:0;line-height:70px}.wc-auth-logged-in-as img{float:right;height:70px;margin:0 0 0 1em}.wc-auth-logged-in-as .wc-auth-logout{float:left}.wc-auth .wc-auth-actions{overflow:hidden;padding-right:24px}.wc-auth .wc-auth-actions .button{background:#f7f7f7;border-bottom-width:2px;border:1px solid #d7d7d7;-webkit-box-sizing:border-box;box-sizing:border-box;color:#777;float:left;font-size:1.25em;height:auto;line-height:1em;padding:1em 2em;text-align:center;width:50%}.wc-auth .wc-auth-actions .button:focus,.wc-auth .wc-auth-actions .button:hover{background:#fcfcfc}.wc-auth .wc-auth-actions .button-primary{background:#ad6ea1;border-color:#a16696;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 0 rgba(0,0,0,.15);color:#fff;float:left;opacity:1;text-shadow:0 -1px 1px #8a4f7f,-1px 0 1px #8a4f7f,0 1px 1px #8a4f7f,1px 0 1px #8a4f7f}.wc-auth .wc-auth-actions .button-primary:focus,.wc-auth .wc-auth-actions .button-primary:hover{background:#b472a8;color:#fff}.wc-auth .wc-auth-actions .wc-auth-approve{float:left}.wc-auth .wc-auth-actions .wc-auth-deny{float:right;margin-right:-24px}

assets/css/auth.css

@@ -1 +1 @@
-body{background:#f1f1f1;box-shadow:none;margin:100px auto 24px;padding:0}#wc-logo{border:0;margin:0 0 24px;padding:0;text-align:center}#wc-logo img{max-width:50%}.wc-auth-content{background:#fff;box-shadow:0 1px 3px rgba(0,0,0,.13);overflow:hidden;padding:24px 24px 0;zoom:1}.wc-auth-content h1,.wc-auth-content h2,.wc-auth-content h3,.wc-auth-content table{border:0;clear:none;color:#666;margin:0 0 24px;padding:0}.wc-auth-content p,.wc-auth-content ul{color:#666;font-size:1em;line-height:1.75em;margin:0 0 24px}.wc-auth-content p{padding:0}.wc-auth-content a{color:#a16696}.wc-auth-content a:focus,.wc-auth-content a:hover{color:#111}.wc-auth-content .wc-auth-login label{color:#999;display:block;margin-bottom:.5em}.wc-auth-content .wc-auth-login input{box-sizing:border-box;font-size:1.3em;padding:.5em;width:100%}.wc-auth-content .wc-auth-login .wc-auth-actions{padding:0}.wc-auth-content .wc-auth-login .wc-auth-actions .wc-auth-login-button{float:none;width:100%}.wc-auth-permissions{list-style:disc inside;padding:0}.wc-auth-permissions li{font-size:1em}.wc-auth-logged-in-as{background:#f5f5f5;border-bottom:2px solid #eee;line-height:70px;margin:0 0 24px;padding:0 1em 0 0}.wc-auth-logged-in-as p{margin:0;line-height:70px}.wc-auth-logged-in-as img{float:left;height:70px;margin:0 1em 0 0}.wc-auth-logged-in-as .wc-auth-logout{float:right}.wc-auth .wc-auth-actions{overflow:hidden;padding-left:24px}.wc-auth .wc-auth-actions .button{background:#f7f7f7;border-bottom-width:2px;border:1px solid #d7d7d7;box-sizing:border-box;color:#777;float:right;font-size:1.25em;height:auto;line-height:1em;padding:1em 2em;text-align:center;width:50%}.wc-auth .wc-auth-actions .button:focus,.wc-auth .wc-auth-actions .button:hover{background:#fcfcfc}.wc-auth .wc-auth-actions .button-primary{background:#ad6ea1;border-color:#a16696;box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 0 rgba(0,0,0,.15);color:#fff;float:right;opacity:1;text-shadow:0 -1px 1px #8a4f7f,1px 0 1px #8a4f7f,0 1px 1px #8a4f7f,-1px 0 1px #8a4f7f}.wc-auth .wc-auth-actions .button-primary:focus,.wc-auth .wc-auth-actions .button-primary:hover{background:#b472a8;color:#fff}.wc-auth .wc-auth-actions .wc-auth-approve{float:right}.wc-auth .wc-auth-actions .wc-auth-deny{float:left;margin-left:-24px}
+body{background:#f1f1f1;-webkit-box-shadow:none;box-shadow:none;margin:100px auto 24px;padding:0}#wc-logo{border:0;margin:0 0 24px;padding:0;text-align:center}#wc-logo img{max-width:50%}.wc-auth-content{background:#fff;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.13);box-shadow:0 1px 3px rgba(0,0,0,.13);overflow:hidden;padding:24px 24px 0;zoom:1}.wc-auth-content h1,.wc-auth-content h2,.wc-auth-content h3,.wc-auth-content table{border:0;clear:none;color:#666;margin:0 0 24px;padding:0}.wc-auth-content p,.wc-auth-content ul{color:#666;font-size:1em;line-height:1.75em;margin:0 0 24px}.wc-auth-content p{padding:0}.wc-auth-content a{color:#a16696}.wc-auth-content a:focus,.wc-auth-content a:hover{color:#111}.wc-auth-content .wc-auth-login label{color:#999;display:block;margin-bottom:.5em}.wc-auth-content .wc-auth-login input{-webkit-box-sizing:border-box;box-sizing:border-box;font-size:1.3em;padding:.5em;width:100%}.wc-auth-content .wc-auth-login .wc-auth-actions{padding:0}.wc-auth-content .wc-auth-login .wc-auth-actions .wc-auth-login-button{float:none;width:100%}.wc-auth-permissions{list-style:disc inside;padding:0}.wc-auth-permissions li{font-size:1em}.wc-auth-logged-in-as{background:#f5f5f5;border-bottom:2px solid #eee;line-height:70px;margin:0 0 24px;padding:0 1em 0 0}.wc-auth-logged-in-as p{margin:0;line-height:70px}.wc-auth-logged-in-as img{float:left;height:70px;margin:0 1em 0 0}.wc-auth-logged-in-as .wc-auth-logout{float:right}.wc-auth .wc-auth-actions{overflow:hidden;padding-left:24px}.wc-auth .wc-auth-actions .button{background:#f7f7f7;border-bottom-width:2px;border:1px solid #d7d7d7;-webkit-box-sizing:border-box;box-sizing:border-box;color:#777;float:right;font-size:1.25em;height:auto;line-height:1em;padding:1em 2em;text-align:center;width:50%}.wc-auth .wc-auth-actions .button:focus,.wc-auth .wc-auth-actions .button:hover{background:#fcfcfc}.wc-auth .wc-auth-actions .button-primary{background:#ad6ea1;border-color:#a16696;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 0 rgba(0,0,0,.15);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 0 rgba(0,0,0,.15);color:#fff;float:right;opacity:1;text-shadow:0 -1px 1px #8a4f7f,1px 0 1px #8a4f7f,0 1px 1px #8a4f7f,-1px 0 1px #8a4f7f}.wc-auth .wc-auth-actions .button-primary:focus,.wc-auth .wc-auth-actions .button-primary:hover{background:#b472a8;color:#fff}.wc-auth .wc-auth-actions .wc-auth-approve{float:right}.wc-auth .wc-auth-actions .wc-auth-deny{float:left;margin-left:-24px}

assets/css/dashboard-rtl.css

@@ -1 +1 @@
-@charset "UTF-8";@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}ul.woocommerce_stats{overflow:hidden;zoom:1}ul.woocommerce_stats li{width:25%;padding:0 1em;text-align:center;float:right;font-size:.8em;border-right:1px solid #fff;border-left:1px solid #ececec;box-sizing:border-box}ul.woocommerce_stats li:first-child{border-right:0}ul.woocommerce_stats li:last-child{border-left:0}ul.woocommerce_stats strong{font-family:Georgia,'Times New Roman','Bitstream Charter',Times,serif;font-size:4em;line-height:1.2em;font-weight:400;text-align:center;display:block}#woocommerce_dashboard_status .inside{padding:0;margin:0}#woocommerce_dashboard_status .wc_status_list{overflow:hidden;margin:0}#woocommerce_dashboard_status .wc_status_list li{width:50%;float:right;padding:0;box-sizing:border-box;margin:0;border-top:1px solid #ececec;color:#aaa}#woocommerce_dashboard_status .wc_status_list li a{display:block;color:#aaa;padding:9px 12px;transition:all ease .5s;position:relative;font-size:12px}#woocommerce_dashboard_status .wc_status_list li a .wc_sparkline{width:4em;height:2em;display:block;float:left;position:absolute;left:0;top:50%;margin-left:12px;margin-top:-1.25em}#woocommerce_dashboard_status .wc_status_list li a strong{font-size:18px;line-height:1.2em;font-weight:400;display:block;color:#21759b}#woocommerce_dashboard_status .wc_status_list li a:hover{color:#2ea2cc}#woocommerce_dashboard_status .wc_status_list li a:hover strong,#woocommerce_dashboard_status .wc_status_list li a:hover::before{color:#2ea2cc!important}#woocommerce_dashboard_status .wc_status_list li a::before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center;content:"";font-size:2em;position:relative;width:auto;line-height:1.2em;color:#464646;float:right;margin-left:12px;margin-bottom:12px}#woocommerce_dashboard_status .wc_status_list li:first-child{border-top:0}#woocommerce_dashboard_status .wc_status_list li.sales-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li.sales-this-month a::before{font-family:Dashicons;content:'\f185'}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month a::before{content:'\e006'}#woocommerce_dashboard_status .wc_status_list li.processing-orders{border-left:1px solid #ececec}#woocommerce_dashboard_status .wc_status_list li.processing-orders a::before{content:'\e011';color:#7ad03a}#woocommerce_dashboard_status .wc_status_list li.on-hold-orders a::before{content:'\e033';color:#999}#woocommerce_dashboard_status .wc_status_list li.low-in-stock{border-left:1px solid #ececec}#woocommerce_dashboard_status .wc_status_list li.low-in-stock a::before{content:'\e016';color:#ffba00}#woocommerce_dashboard_status .wc_status_list li.out-of-stock a::before{content:'\e013';color:#a00}#woocommerce_dashboard_recent_reviews li{line-height:1.5em;margin-bottom:12px}#woocommerce_dashboard_recent_reviews h4.meta{line-height:1.4;margin:-.2em 0 0 0;font-weight:400;color:#999}#woocommerce_dashboard_recent_reviews blockquote{padding:0;margin:0}#woocommerce_dashboard_recent_reviews .avatar{float:right;margin:0 0 5px 10px}#woocommerce_dashboard_recent_reviews .star-rating{float:left;overflow:hidden;position:relative;height:1.5em;line-height:1.5;margin-right:.5em;width:5.4em;font-family:WooCommerce!important}#woocommerce_dashboard_recent_reviews .star-rating::before{content:'\e021\e021\e021\e021\e021';color:#b3b2b2;float:right;top:0;right:0;position:absolute;letter-spacing:.1em}#woocommerce_dashboard_recent_reviews .star-rating span{overflow:hidden;float:right;top:0;right:0;position:absolute;padding-top:1.5em}#woocommerce_dashboard_recent_reviews .star-rating span::before{content:'\e020\e020\e020\e020\e020';top:0;position:absolute;right:0;letter-spacing:.1em;color:#9c5d90}#dash-right-now li.product-count a::before{font-family:WooCommerce;content:'\e01d'}
+@charset "UTF-8";@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}ul.woocommerce_stats{overflow:hidden;zoom:1}ul.woocommerce_stats li{width:25%;padding:0 1em;text-align:center;float:right;font-size:.8em;border-right:1px solid #fff;border-left:1px solid #ececec;-webkit-box-sizing:border-box;box-sizing:border-box}ul.woocommerce_stats li:first-child{border-right:0}ul.woocommerce_stats li:last-child{border-left:0}ul.woocommerce_stats strong{font-family:Georgia,'Times New Roman','Bitstream Charter',Times,serif;font-size:4em;line-height:1.2em;font-weight:400;text-align:center;display:block}#woocommerce_dashboard_status .inside{padding:0;margin:0}#woocommerce_dashboard_status .wc_status_list{overflow:hidden;margin:0}#woocommerce_dashboard_status .wc_status_list li{width:50%;float:right;padding:0;-webkit-box-sizing:border-box;box-sizing:border-box;margin:0;border-top:1px solid #ececec;color:#aaa}#woocommerce_dashboard_status .wc_status_list li a{display:block;color:#aaa;padding:9px 12px;-webkit-transition:all ease .5s;transition:all ease .5s;position:relative;font-size:12px}#woocommerce_dashboard_status .wc_status_list li a .wc_sparkline{width:4em;height:2em;display:block;float:left;position:absolute;left:0;top:50%;margin-left:12px;margin-top:-1.25em}#woocommerce_dashboard_status .wc_status_list li a strong{font-size:18px;line-height:1.2em;font-weight:400;display:block;color:#21759b}#woocommerce_dashboard_status .wc_status_list li a:hover{color:#2ea2cc}#woocommerce_dashboard_status .wc_status_list li a:hover strong,#woocommerce_dashboard_status .wc_status_list li a:hover::before{color:#2ea2cc!important}#woocommerce_dashboard_status .wc_status_list li a::before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;margin:0;text-indent:0;position:absolute;top:0;right:0;width:100%;height:100%;text-align:center;content:"";font-size:2em;position:relative;width:auto;line-height:1.2em;color:#464646;float:right;margin-left:12px;margin-bottom:12px}#woocommerce_dashboard_status .wc_status_list li:first-child{border-top:0}#woocommerce_dashboard_status .wc_status_list li.sales-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li.sales-this-month a::before{font-family:Dashicons;content:'\f185'}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month a::before{content:'\e006'}#woocommerce_dashboard_status .wc_status_list li.processing-orders{border-left:1px solid #ececec}#woocommerce_dashboard_status .wc_status_list li.processing-orders a::before{content:'\e011';color:#7ad03a}#woocommerce_dashboard_status .wc_status_list li.on-hold-orders a::before{content:'\e033';color:#999}#woocommerce_dashboard_status .wc_status_list li.low-in-stock{border-left:1px solid #ececec}#woocommerce_dashboard_status .wc_status_list li.low-in-stock a::before{content:'\e016';color:#ffba00}#woocommerce_dashboard_status .wc_status_list li.out-of-stock a::before{content:'\e013';color:#a00}#woocommerce_dashboard_recent_reviews li{line-height:1.5em;margin-bottom:12px}#woocommerce_dashboard_recent_reviews h4.meta{line-height:1.4;margin:-.2em 0 0 0;font-weight:400;color:#999}#woocommerce_dashboard_recent_reviews blockquote{padding:0;margin:0}#woocommerce_dashboard_recent_reviews .avatar{float:right;margin:0 0 5px 10px}#woocommerce_dashboard_recent_reviews .star-rating{float:left;overflow:hidden;position:relative;height:1.5em;line-height:1.5;margin-right:.5em;width:5.4em;font-family:WooCommerce!important}#woocommerce_dashboard_recent_reviews .star-rating::before{content:'\e021\e021\e021\e021\e021';color:#b3b2b2;float:right;top:0;right:0;position:absolute;letter-spacing:.1em}#woocommerce_dashboard_recent_reviews .star-rating span{overflow:hidden;float:right;top:0;right:0;position:absolute;padding-top:1.5em}#woocommerce_dashboard_recent_reviews .star-rating span::before{content:'\e020\e020\e020\e020\e020';top:0;position:absolute;right:0;letter-spacing:.1em;color:#9c5d90}#dash-right-now li.product-count a::before{font-family:WooCommerce;content:'\e01d'}

assets/css/dashboard.css

@@ -1 +1 @@
-@charset "UTF-8";@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}ul.woocommerce_stats{overflow:hidden;zoom:1}ul.woocommerce_stats li{width:25%;padding:0 1em;text-align:center;float:left;font-size:.8em;border-left:1px solid #fff;border-right:1px solid #ececec;box-sizing:border-box}ul.woocommerce_stats li:first-child{border-left:0}ul.woocommerce_stats li:last-child{border-right:0}ul.woocommerce_stats strong{font-family:Georgia,'Times New Roman','Bitstream Charter',Times,serif;font-size:4em;line-height:1.2em;font-weight:400;text-align:center;display:block}#woocommerce_dashboard_status .inside{padding:0;margin:0}#woocommerce_dashboard_status .wc_status_list{overflow:hidden;margin:0}#woocommerce_dashboard_status .wc_status_list li{width:50%;float:left;padding:0;box-sizing:border-box;margin:0;border-top:1px solid #ececec;color:#aaa}#woocommerce_dashboard_status .wc_status_list li a{display:block;color:#aaa;padding:9px 12px;transition:all ease .5s;position:relative;font-size:12px}#woocommerce_dashboard_status .wc_status_list li a .wc_sparkline{width:4em;height:2em;display:block;float:right;position:absolute;right:0;top:50%;margin-right:12px;margin-top:-1.25em}#woocommerce_dashboard_status .wc_status_list li a strong{font-size:18px;line-height:1.2em;font-weight:400;display:block;color:#21759b}#woocommerce_dashboard_status .wc_status_list li a:hover{color:#2ea2cc}#woocommerce_dashboard_status .wc_status_list li a:hover strong,#woocommerce_dashboard_status .wc_status_list li a:hover::before{color:#2ea2cc!important}#woocommerce_dashboard_status .wc_status_list li a::before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";font-size:2em;position:relative;width:auto;line-height:1.2em;color:#464646;float:left;margin-right:12px;margin-bottom:12px}#woocommerce_dashboard_status .wc_status_list li:first-child{border-top:0}#woocommerce_dashboard_status .wc_status_list li.sales-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li.sales-this-month a::before{font-family:Dashicons;content:'\f185'}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month a::before{content:'\e006'}#woocommerce_dashboard_status .wc_status_list li.processing-orders{border-right:1px solid #ececec}#woocommerce_dashboard_status .wc_status_list li.processing-orders a::before{content:'\e011';color:#7ad03a}#woocommerce_dashboard_status .wc_status_list li.on-hold-orders a::before{content:'\e033';color:#999}#woocommerce_dashboard_status .wc_status_list li.low-in-stock{border-right:1px solid #ececec}#woocommerce_dashboard_status .wc_status_list li.low-in-stock a::before{content:'\e016';color:#ffba00}#woocommerce_dashboard_status .wc_status_list li.out-of-stock a::before{content:'\e013';color:#a00}#woocommerce_dashboard_recent_reviews li{line-height:1.5em;margin-bottom:12px}#woocommerce_dashboard_recent_reviews h4.meta{line-height:1.4;margin:-.2em 0 0 0;font-weight:400;color:#999}#woocommerce_dashboard_recent_reviews blockquote{padding:0;margin:0}#woocommerce_dashboard_recent_reviews .avatar{float:left;margin:0 10px 5px 0}#woocommerce_dashboard_recent_reviews .star-rating{float:right;overflow:hidden;position:relative;height:1.5em;line-height:1.5;margin-left:.5em;width:5.4em;font-family:WooCommerce!important}#woocommerce_dashboard_recent_reviews .star-rating::before{content:'\e021\e021\e021\e021\e021';color:#b3b2b2;float:left;top:0;left:0;position:absolute;letter-spacing:.1em}#woocommerce_dashboard_recent_reviews .star-rating span{overflow:hidden;float:left;top:0;left:0;position:absolute;padding-top:1.5em}#woocommerce_dashboard_recent_reviews .star-rating span::before{content:'\e020\e020\e020\e020\e020';top:0;position:absolute;left:0;letter-spacing:.1em;color:#9c5d90}#dash-right-now li.product-count a::before{font-family:WooCommerce;content:'\e01d'}
+@charset "UTF-8";@font-face{font-family:star;src:url(../fonts/star.eot);src:url(../fonts/star.eot?#iefix) format("embedded-opentype"),url(../fonts/star.woff) format("woff"),url(../fonts/star.ttf) format("truetype"),url(../fonts/star.svg#star) format("svg");font-weight:400;font-style:normal}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}ul.woocommerce_stats{overflow:hidden;zoom:1}ul.woocommerce_stats li{width:25%;padding:0 1em;text-align:center;float:left;font-size:.8em;border-left:1px solid #fff;border-right:1px solid #ececec;-webkit-box-sizing:border-box;box-sizing:border-box}ul.woocommerce_stats li:first-child{border-left:0}ul.woocommerce_stats li:last-child{border-right:0}ul.woocommerce_stats strong{font-family:Georgia,'Times New Roman','Bitstream Charter',Times,serif;font-size:4em;line-height:1.2em;font-weight:400;text-align:center;display:block}#woocommerce_dashboard_status .inside{padding:0;margin:0}#woocommerce_dashboard_status .wc_status_list{overflow:hidden;margin:0}#woocommerce_dashboard_status .wc_status_list li{width:50%;float:left;padding:0;-webkit-box-sizing:border-box;box-sizing:border-box;margin:0;border-top:1px solid #ececec;color:#aaa}#woocommerce_dashboard_status .wc_status_list li a{display:block;color:#aaa;padding:9px 12px;-webkit-transition:all ease .5s;transition:all ease .5s;position:relative;font-size:12px}#woocommerce_dashboard_status .wc_status_list li a .wc_sparkline{width:4em;height:2em;display:block;float:right;position:absolute;right:0;top:50%;margin-right:12px;margin-top:-1.25em}#woocommerce_dashboard_status .wc_status_list li a strong{font-size:18px;line-height:1.2em;font-weight:400;display:block;color:#21759b}#woocommerce_dashboard_status .wc_status_list li a:hover{color:#2ea2cc}#woocommerce_dashboard_status .wc_status_list li a:hover strong,#woocommerce_dashboard_status .wc_status_list li a:hover::before{color:#2ea2cc!important}#woocommerce_dashboard_status .wc_status_list li a::before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;line-height:1;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";font-size:2em;position:relative;width:auto;line-height:1.2em;color:#464646;float:left;margin-right:12px;margin-bottom:12px}#woocommerce_dashboard_status .wc_status_list li:first-child{border-top:0}#woocommerce_dashboard_status .wc_status_list li.sales-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li.sales-this-month a::before{font-family:Dashicons;content:'\f185'}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month a::before{content:'\e006'}#woocommerce_dashboard_status .wc_status_list li.processing-orders{border-right:1px solid #ececec}#woocommerce_dashboard_status .wc_status_list li.processing-orders a::before{content:'\e011';color:#7ad03a}#woocommerce_dashboard_status .wc_status_list li.on-hold-orders a::before{content:'\e033';color:#999}#woocommerce_dashboard_status .wc_status_list li.low-in-stock{border-right:1px solid #ececec}#woocommerce_dashboard_status .wc_status_list li.low-in-stock a::before{content:'\e016';color:#ffba00}#woocommerce_dashboard_status .wc_status_list li.out-of-stock a::before{content:'\e013';color:#a00}#woocommerce_dashboard_recent_reviews li{line-height:1.5em;margin-bottom:12px}#woocommerce_dashboard_recent_reviews h4.meta{line-height:1.4;margin:-.2em 0 0 0;font-weight:400;color:#999}#woocommerce_dashboard_recent_reviews blockquote{padding:0;margin:0}#woocommerce_dashboard_recent_reviews .avatar{float:left;margin:0 10px 5px 0}#woocommerce_dashboard_recent_reviews .star-rating{float:right;overflow:hidden;position:relative;height:1.5em;line-height:1.5;margin-left:.5em;width:5.4em;font-family:WooCommerce!important}#woocommerce_dashboard_recent_reviews .star-rating::before{content:'\e021\e021\e021\e021\e021';color:#b3b2b2;float:left;top:0;left:0;position:absolute;letter-spacing:.1em}#woocommerce_dashboard_recent_reviews .star-rating span{overflow:hidden;float:left;top:0;left:0;position:absolute;padding-top:1.5em}#woocommerce_dashboard_recent_reviews .star-rating span::before{content:'\e020\e020\e020\e020\e020';top:0;position:absolute;left:0;letter-spacing:.1em;color:#9c5d90}#dash-right-now li.product-count a::before{font-family:WooCommerce;content:'\e01d'}

assets/css/network-order-widget-rtl.css

@@ -1 +1 @@
-#woocommerce_network_orders .inside{margin:0;padding:0}#woocommerce_network_orders .woocommerce-network-order-table,#woocommerce_network_orders .woocommerce-network-order-table-loading,#woocommerce_network_orders .woocommerce-network-orders-no-orders{width:100%;display:none}#woocommerce_network_orders .woocommerce-network-order-table-loading.is-active,#woocommerce_network_orders .woocommerce-network-order-table.is-active,#woocommerce_network_orders .woocommerce-network-orders-no-orders.is-active{display:block}#woocommerce_network_orders .woocommerce-network-order-table-loading p,#woocommerce_network_orders .woocommerce-network-orders-no-orders p{text-align:center}#woocommerce_network_orders .woocommerce-network-order-table{margin-top:0}#woocommerce_network_orders .woocommerce-network-order-table.is-active{display:table}#woocommerce_network_orders .woocommerce-network-order-table thead td{padding:.5em 1em}#woocommerce_network_orders .spinner{margin-top:0;float:none}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td,#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody th{border-top:1px solid #f5f5f5}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td{vertical-align:middle;padding:1em}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status{display:inline-flex;padding:0 1em;line-height:2.5em;color:#777;background:#e5e5e5;border-radius:4px;border-bottom:1px solid rgba(0,0,0,.05);margin:-.5em 0;cursor:inherit!important}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-completed{background:#c8d7e1;color:#2e4453}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-on-hold{background:#f8dda7;color:#94660c}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-failed{background:#eba3a3;color:#761919}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-processing{background:#c6e1c6;color:#5b841b}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-trash{background:#eba3a3;color:#761919}
+#woocommerce_network_orders .inside{margin:0;padding:0}#woocommerce_network_orders .woocommerce-network-order-table,#woocommerce_network_orders .woocommerce-network-order-table-loading,#woocommerce_network_orders .woocommerce-network-orders-no-orders{width:100%;display:none}#woocommerce_network_orders .woocommerce-network-order-table-loading.is-active,#woocommerce_network_orders .woocommerce-network-order-table.is-active,#woocommerce_network_orders .woocommerce-network-orders-no-orders.is-active{display:block}#woocommerce_network_orders .woocommerce-network-order-table-loading p,#woocommerce_network_orders .woocommerce-network-orders-no-orders p{text-align:center}#woocommerce_network_orders .woocommerce-network-order-table{margin-top:0}#woocommerce_network_orders .woocommerce-network-order-table.is-active{display:table}#woocommerce_network_orders .woocommerce-network-order-table thead td{padding:.5em 1em}#woocommerce_network_orders .spinner{margin-top:0;float:none}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td,#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody th{border-top:1px solid #f5f5f5}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td{vertical-align:middle;padding:1em}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;padding:0 1em;line-height:2.5em;color:#777;background:#e5e5e5;border-radius:4px;border-bottom:1px solid rgba(0,0,0,.05);margin:-.5em 0;cursor:inherit!important}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-completed{background:#c8d7e1;color:#2e4453}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-on-hold{background:#f8dda7;color:#94660c}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-failed{background:#eba3a3;color:#761919}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-processing{background:#c6e1c6;color:#5b841b}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-trash{background:#eba3a3;color:#761919}

assets/css/network-order-widget.css

@@ -1 +1 @@
-#woocommerce_network_orders .inside{margin:0;padding:0}#woocommerce_network_orders .woocommerce-network-order-table,#woocommerce_network_orders .woocommerce-network-order-table-loading,#woocommerce_network_orders .woocommerce-network-orders-no-orders{width:100%;display:none}#woocommerce_network_orders .woocommerce-network-order-table-loading.is-active,#woocommerce_network_orders .woocommerce-network-order-table.is-active,#woocommerce_network_orders .woocommerce-network-orders-no-orders.is-active{display:block}#woocommerce_network_orders .woocommerce-network-order-table-loading p,#woocommerce_network_orders .woocommerce-network-orders-no-orders p{text-align:center}#woocommerce_network_orders .woocommerce-network-order-table{margin-top:0}#woocommerce_network_orders .woocommerce-network-order-table.is-active{display:table}#woocommerce_network_orders .woocommerce-network-order-table thead td{padding:.5em 1em}#woocommerce_network_orders .spinner{margin-top:0;float:none}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td,#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody th{border-top:1px solid #f5f5f5}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td{vertical-align:middle;padding:1em}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status{display:inline-flex;padding:0 1em;line-height:2.5em;color:#777;background:#e5e5e5;border-radius:4px;border-bottom:1px solid rgba(0,0,0,.05);margin:-.5em 0;cursor:inherit!important}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-completed{background:#c8d7e1;color:#2e4453}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-on-hold{background:#f8dda7;color:#94660c}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-failed{background:#eba3a3;color:#761919}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-processing{background:#c6e1c6;color:#5b841b}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-trash{background:#eba3a3;color:#761919}
+#woocommerce_network_orders .inside{margin:0;padding:0}#woocommerce_network_orders .woocommerce-network-order-table,#woocommerce_network_orders .woocommerce-network-order-table-loading,#woocommerce_network_orders .woocommerce-network-orders-no-orders{width:100%;display:none}#woocommerce_network_orders .woocommerce-network-order-table-loading.is-active,#woocommerce_network_orders .woocommerce-network-order-table.is-active,#woocommerce_network_orders .woocommerce-network-orders-no-orders.is-active{display:block}#woocommerce_network_orders .woocommerce-network-order-table-loading p,#woocommerce_network_orders .woocommerce-network-orders-no-orders p{text-align:center}#woocommerce_network_orders .woocommerce-network-order-table{margin-top:0}#woocommerce_network_orders .woocommerce-network-order-table.is-active{display:table}#woocommerce_network_orders .woocommerce-network-order-table thead td{padding:.5em 1em}#woocommerce_network_orders .spinner{margin-top:0;float:none}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td,#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody th{border-top:1px solid #f5f5f5}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td{vertical-align:middle;padding:1em}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;padding:0 1em;line-height:2.5em;color:#777;background:#e5e5e5;border-radius:4px;border-bottom:1px solid rgba(0,0,0,.05);margin:-.5em 0;cursor:inherit!important}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-completed{background:#c8d7e1;color:#2e4453}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-on-hold{background:#f8dda7;color:#94660c}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-failed{background:#eba3a3;color:#761919}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-processing{background:#c6e1c6;color:#5b841b}#woocommerce_network_orders .post-type-shop_order .woocommerce-network-order-table tbody td .order-status.status-trash{background:#eba3a3;color:#761919}

assets/css/reports-print-rtl.css

@@ -1 +1 @@
-*{background:0 0!important;color:#000!important;text-shadow:none!important;filter:none!important;-ms-filter:none!important;font-size:9pt!important;opacity:1;transition:none!important}@page{margin:.5cm}#adminmenuback,#adminmenuwrap,#screen-meta-links,#wpadminbar,#wpfooter,.update-nag,.updated,.woo-nav-tab-wrapper,.woocommerce-reports-wide .button,.woocommerce-reports-wide .postbox h3.stats_range .export_csv,.woocommerce-reports-wrap .postbox h3.stats_range .export_csv{display:none}h2 .nav-tab{line-height:14px}.woocommerce-reports-wide .postbox h3.stats_range ul li a,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom,.woocommerce-reports-wrap .postbox h3.stats_range ul li a,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom{padding:5px;line-height:14px}#wpcontent{margin-right:0}.woocommerce-reports-wide .postbox .chart-with-sidebar .chart-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar .chart-sidebar{margin-right:-130px;width:130px;display:block}.woocommerce-reports-wide .postbox .chart-with-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar{padding-right:130px}.chart-legend{overflow:hidden;zoom:1}.chart-legend li{padding:.25em .5em!important;box-shadow:none!important;border-bottom:1px solid gray!important}
+*{background:0 0!important;color:#000!important;text-shadow:none!important;-webkit-filter:none!important;filter:none!important;-ms-filter:none!important;font-size:9pt!important;opacity:1;-webkit-transition:none!important;transition:none!important}@page{margin:.5cm}#adminmenuback,#adminmenuwrap,#screen-meta-links,#wpadminbar,#wpfooter,.update-nag,.updated,.woo-nav-tab-wrapper,.woocommerce-reports-wide .button,.woocommerce-reports-wide .postbox h3.stats_range .export_csv,.woocommerce-reports-wrap .postbox h3.stats_range .export_csv{display:none}h2 .nav-tab{line-height:14px}.woocommerce-reports-wide .postbox h3.stats_range ul li a,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom,.woocommerce-reports-wrap .postbox h3.stats_range ul li a,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom{padding:5px;line-height:14px}#wpcontent{margin-right:0}.woocommerce-reports-wide .postbox .chart-with-sidebar .chart-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar .chart-sidebar{margin-right:-130px;width:130px;display:block}.woocommerce-reports-wide .postbox .chart-with-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar{padding-right:130px}.chart-legend{overflow:hidden;zoom:1}.chart-legend li{padding:.25em .5em!important;-webkit-box-shadow:none!important;box-shadow:none!important;border-bottom:1px solid gray!important}

assets/css/reports-print.css

@@ -1 +1 @@
-*{background:0 0!important;color:#000!important;text-shadow:none!important;filter:none!important;-ms-filter:none!important;font-size:9pt!important;opacity:1;transition:none!important}@page{margin:.5cm}#adminmenuback,#adminmenuwrap,#screen-meta-links,#wpadminbar,#wpfooter,.update-nag,.updated,.woo-nav-tab-wrapper,.woocommerce-reports-wide .button,.woocommerce-reports-wide .postbox h3.stats_range .export_csv,.woocommerce-reports-wrap .postbox h3.stats_range .export_csv{display:none}h2 .nav-tab{line-height:14px}.woocommerce-reports-wide .postbox h3.stats_range ul li a,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom,.woocommerce-reports-wrap .postbox h3.stats_range ul li a,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom{padding:5px;line-height:14px}#wpcontent{margin-left:0}.woocommerce-reports-wide .postbox .chart-with-sidebar .chart-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar .chart-sidebar{margin-left:-130px;width:130px;display:block}.woocommerce-reports-wide .postbox .chart-with-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar{padding-left:130px}.chart-legend{overflow:hidden;zoom:1}.chart-legend li{padding:.25em .5em!important;box-shadow:none!important;border-bottom:1px solid gray!important}
+*{background:0 0!important;color:#000!important;text-shadow:none!important;-webkit-filter:none!important;filter:none!important;-ms-filter:none!important;font-size:9pt!important;opacity:1;-webkit-transition:none!important;transition:none!important}@page{margin:.5cm}#adminmenuback,#adminmenuwrap,#screen-meta-links,#wpadminbar,#wpfooter,.update-nag,.updated,.woo-nav-tab-wrapper,.woocommerce-reports-wide .button,.woocommerce-reports-wide .postbox h3.stats_range .export_csv,.woocommerce-reports-wrap .postbox h3.stats_range .export_csv{display:none}h2 .nav-tab{line-height:14px}.woocommerce-reports-wide .postbox h3.stats_range ul li a,.woocommerce-reports-wide .postbox h3.stats_range ul li.custom,.woocommerce-reports-wrap .postbox h3.stats_range ul li a,.woocommerce-reports-wrap .postbox h3.stats_range ul li.custom{padding:5px;line-height:14px}#wpcontent{margin-left:0}.woocommerce-reports-wide .postbox .chart-with-sidebar .chart-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar .chart-sidebar{margin-left:-130px;width:130px;display:block}.woocommerce-reports-wide .postbox .chart-with-sidebar,.woocommerce-reports-wrap .postbox .chart-with-sidebar{padding-left:130px}.chart-legend{overflow:hidden;zoom:1}.chart-legend li{padding:.25em .5em!important;-webkit-box-shadow:none!important;box-shadow:none!important;border-bottom:1px solid gray!important}

assets/css/twenty-seventeen.scss

@@ -139,12 +139,18 @@
 
 .required {
 	color: firebrick;
+	text-decoration: none;
+	visibility: hidden; // Only show optional by default.
 
 	&[title] {
-		border-bottom: none;
+		border: 0 !important;
 	}
 }
 
+.optional {
+	visibility: visible;
+ }
+
 .woocommerce-message,
 .woocommerce-error,
 .woocommerce-info {
@@ -394,6 +400,7 @@ table.variations {
 
 	.zoomImg {
 		background-color: #fff;
+		opacity: 0;
 	}
 
 	.woocommerce-product-gallery__image:nth-child(n+2) {
@@ -912,7 +919,59 @@ table.variations {
 	background: rgba(0,0,0,.05);
 }
 
+.woocommerce-terms-and-conditions-link {
+	display: inline-block;
+
+	&:after {
+		content: "";
+		display: inline-block;
+		border-style: solid;
+		margin-bottom: 2px;
+		margin-left: .25em;
+		border-width: 6px 6px 0 6px;
+		border-color: #111 transparent transparent transparent;
+	}
+	&.woocommerce-terms-and-conditions-link--open:after {
+		border-width: 0 6px 6px 6px;
+		border-color: transparent transparent #111 transparent;
+	}
+}
+
 .woocommerce-checkout {
+	.woocommerce-input-wrapper {
+		.description {
+			background: royalblue;
+			color: #fff;
+			border-radius: 3px;
+			padding: 1em;
+			margin: .5em 0 0;
+			clear: both;
+			display: none;
+			position: relative;
+
+			a {
+				color: #fff;
+				text-decoration: underline;
+				border: 0;
+				box-shadow: none;
+			}
+
+			&:before {
+				left: 50%;
+				top: 0%;
+				margin-top: -4px;
+				transform: translatex(-50%) rotate(180deg);
+				content: "";
+				position: absolute;
+				border-width: 4px 6px 0 6px;
+				border-style: solid;
+				border-color: royalblue transparent transparent transparent;
+				z-index: 100;
+				display: block;
+			}
+		}
+	}
+
 	.select2-choice,
 	.select2-choice:hover {
 		box-shadow: none !important;

assets/css/wc-setup.scss

@@ -339,57 +339,57 @@ body {
 			font-size: 1em;
 			margin-top: 0;
 			margin-bottom: 20px;
-
-			input[type="checkbox"] {
-				opacity: 0;
+		}
+	}
+	.checkbox {
+		input[type="checkbox"] {
+			opacity: 0;
+			position: absolute;
+			left: -9999px;
+		}
+		label {
+			position: relative;
+			display: inline-block;
+			padding-left: 28px;
+			&:before,
+			&:after {
 				position: absolute;
-				left: -9999px;
-			}
-			label {
-				position: relative;
-				display: inline-block;
-				padding-left: 28px;
-				&:before,
-				&:after {
-					position: absolute;
-					content: "";
-					display: inline-block;
-				}
-				&:before {
-					height: 16px;
-					width: 16px;
-					left: 0px;
-					top: 3px;
-					border: 1px solid #aaa;
-					background-color: #fff;
-					border-radius: 3px;
-				}
-				&:after {
-					height: 5px;
-					width: 9px;
-					border-left: 2px solid;
-					border-bottom: 2px solid;
-					transform: rotate(-45deg);
-					left: 4px;
-					top: 7px;
-					color: #fff;
-				}
-			}
-			input[type="checkbox"] + label::after {
-				content: none;
-			}
-			input[type="checkbox"]:checked + label::after {
 				content: "";
+				display: inline-block;
 			}
-			input[type="checkbox"]:focus + label::before {
-				outline: rgb(59, 153, 252) auto 5px;
+			&:before {
+				height: 16px;
+				width: 16px;
+				left: 0px;
+				top: 3px;
+				border: 1px solid #aaa;
+				background-color: #fff;
+				border-radius: 3px;
 			}
-			input[type="checkbox"]:checked + label::before {
-				background: #935687;
-				border-color: #935687;
-				outline: none;
+			&:after {
+				height: 5px;
+				width: 9px;
+				border-left: 2px solid;
+				border-bottom: 2px solid;
+				transform: rotate(-45deg);
+				left: 4px;
+				top: 7px;
+				color: #fff;
 			}
 		}
+		input[type="checkbox"] + label::after {
+			content: none;
+		}
+		input[type="checkbox"]:checked + label::after {
+			content: "";
+		}
+		input[type="checkbox"]:focus + label::before {
+			outline: rgb(59, 153, 252) auto 5px;
+		}
+		input[type="checkbox"]:checked + label::before {
+			background: #935687;
+			border-color: #935687;
+		}
 	}
 }
 .wc-setup-steps {
@@ -491,7 +491,7 @@ body {
 
 .wc-setup-footer-links {
 	font-size: 0.85em;
-	color: #b5b5b5;
+	color: #7b7b7b;
 	margin: 1.18em auto;
 	display: inline-block;
 	text-align: center;
@@ -634,6 +634,14 @@ body {
 		}
 	}
 
+	&.eway-logo .wc-wizard-service-name img {
+		max-width: 87px;
+	}
+
+	&.payfast-logo .wc-wizard-service-name img {
+		max-width: 140px;
+	}
+
 	.wc-wizard-service-description {
 		flex-grow: 1;
 		padding: 20px;
@@ -703,6 +711,7 @@ body {
 
 	.wc-wizard-service-settings {
 		display: none;
+		margin-top: 0.75em;
 		margin-bottom: 0;
 		cursor: default;
 
@@ -939,6 +948,40 @@ h3.jetpack-reasons {
 	}
 }
 
+.wc-setup .wc-setup-actions .plugin-install-info {
+	display: block;
+	font-style: italic;
+	color: #999;
+	font-size: 14px;
+	line-height: 1.5em;
+	margin: 5px 0;
+
+	& > * {
+		display: block;
+	}
+	
+	.plugin-install-info-list-item:not(:last-child)::after {
+		content: ', ';
+	}
+
+	a {
+		white-space: nowrap;
+
+		&:not(:hover):not(:focus) {
+			color: inherit;
+		}
+	}
+}
+
+.plugin-install-source {
+	$background: rgba( #bb77ae, 0.15 );
+	background: $background;
+
+	&:not(.wc-wizard-service-item) {
+		box-shadow: 0 0 0 10px $background;
+	}
+}
+
 .location-prompt {
 	color: #666;
 	font-size: 13px;
@@ -1160,7 +1203,6 @@ p.jetpack-terms {
 .wc-wizard-service-setting-stripe_create_account, .wc-wizard-service-setting-ppec_paypal_reroute_requests {
 	display: flex;
 	align-items: flex-start;
-	margin-top: 0.75em;
 
 	.payment-checkbox-input {
 		order: 1;
@@ -1178,6 +1220,7 @@ p.jetpack-terms {
 
 .wc-wizard-service-setting-stripe_email, .wc-wizard-service-setting-ppec_paypal_email {
 	margin-top: 0.75em;
+	margin-left: 1.5em;
 
 	label.stripe_email, label.ppec_paypal_email {
 		position: absolute;
@@ -1191,12 +1234,77 @@ p.jetpack-terms {
 	}
 
 	input.payment-email-input {
-		margin-left: 1.5em;
+		box-sizing: border-box;
 		margin-bottom: .5em;
 		width: 100%;
-	}
-
-	.wc-wizard-service-settings-description {
-		margin-left: 1.5em;
+		height: 32px;
+	}
+}
+
+.wc-setup-content .recommended-step {
+	border: 1px solid #ebebeb;
+	border-radius: 4px;
+	padding: 2.5em;
+
+	li {
+		list-style: none;
+
+		&:last-child label {
+			margin-bottom: 0; // Avoid extra space at the end of the list.
+		}
+	}
+
+	label {
+		display: flex;
+		align-items: center;
+		margin-bottom: 1.5em;
+
+		&:before, &:after {
+			top: auto;
+		}
+		&:after {
+			margin-top: -1.5px;
+		}
+	}
+
+	.recommended-item-icon {
+		border: 1px solid #fff;
+		border-radius: 7px;
+		height: 3.5em;
+		margin-right: 1em;
+		margin-left: 4px;
+
+		&.recommended-item-icon-storefront_theme {
+			background-color: #f4a224;
+			max-height: 3em;
+			max-width: 3em;
+			padding: ( 3.5em - 3em ) / 2;
+		}
+
+		&.recommended-item-icon-automated_taxes {
+			background-color: #d0011b;
+			max-height: 1.75em;
+			padding: ( 3.5em - 1.75em ) / 2;
+		}
+
+		&.recommended-item-icon-mailchimp {
+			background-color: #209bbb;
+			height: 2em;
+			padding: ( 3.5em - 2em ) / 2;
+		}
+	}
+
+	.recommended-item-description-container {
+		h3 {
+			font-size: 15px;
+			font-weight: bold;
+			letter-spacing: 0.5px;
+			margin-bottom: 0;
+		}
+
+		p {
+			margin-top: 0;
+			line-height: 1.5em;
+		}
 	}
 }

assets/css/woocommerce.scss

@@ -186,6 +186,7 @@ p.demo_store,
 
 			.woocommerce-product-gallery__wrapper .zoomImg {
 				background-color: #fff;
+				opacity: 0;
 			}
 
 			.woocommerce-product-gallery__image:nth-child(n+2) {
@@ -1276,6 +1277,40 @@ p.demo_store,
 			display: inline;
 		}
 
+		.woocommerce-input-wrapper {
+			.description {
+				background: #1e85be;
+				color: #fff;
+				border-radius: 3px;
+				padding: 1em;
+				margin: .5em 0 0;
+				clear: both;
+				display: none;
+				position: relative;
+
+				a {
+					color: #fff;
+					text-decoration: underline;
+					border: 0;
+					box-shadow: none;
+				}
+
+				&:before {
+					left: 50%;
+					top: 0%;
+					margin-top: -4px;
+					transform: translatex(-50%) rotate(180deg);
+					content: "";
+					position: absolute;
+					border-width: 4px 6px 0 6px;
+					border-style: solid;
+					border-color: #1e85be transparent transparent transparent;
+					z-index: 100;
+					display: block;
+				}
+			}
+		}
+
 		select {
 			cursor: pointer;
 			margin: 0;
@@ -1284,9 +1319,15 @@ p.demo_store,
 		.required {
 			color: red;
 			font-weight: 700;
-			border: 0;
+			border: 0 !important;
+			text-decoration: none;
+			visibility: hidden; // Only show optional by default.
 		}
 
+		.optional {
+			visibility: visible;
+ 		}
+
 		.input-checkbox {
 			display: inline;
 			margin: -2px 8px 0 0;

assets/images/obw-storefront-icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 367 300"><path fill="#FFF" d="M251 135.1c-6.4 4.9-14.4 7.8-23 7.8-8.9 0-17-3.1-23.5-8.1-6.5 5.1-14.6 8.1-23.5 8.1s-17.1-3.1-23.6-8.2c-6.5 5.1-14.7 8.2-23.6 8.2-8.9 0-17-3.1-23.5-8.1-6.5 5.1-14.6 8.1-23.5 8.1-2 0-4-.2-6-.5v73.4c0 6.3 5.7 12 12 12h54.8c6.3 0 10.9-5.7 10.9-12V185.1c6.9 2.2 14.1 3.5 22.8 3.5s17.1-1.3 22.8-3.5V215.8c0 6.3 5.7 12 12 12h54.8c6.3 0 10.9-5.7 10.9-12V142c-2.6.6-5.3.9-8 .9-8.4-.1-16.4-3-22.8-7.8zm-115.5 49.8c0 5-4.1 9.1-9.1 9.1h-14.1c-5 0-9.1-4.1-9.1-9.1v-14.1c0-5 4.1-9.1 9.1-9.1h14.1c5 0 9.1 4.1 9.1 9.1v14.1zm123.3 0c0 5-4.1 9.1-9.1 9.1h-14.1c-5 0-9.1-4.1-9.1-9.1v-14.1c0-5 4.1-9.1 9.1-9.1h14.1c5 0 9.1 4.1 9.1 9.1v14.1zM294.9 99.9l-30.1-30.1c-3.9-3.9-11.6-7.1-17.1-7.1H113.3c-5.5 0-13.2 3.2-17.1 7.1L66.1 99.9l-7 7c.9 12.5 10 22.7 21.9 25.3h.1c.4.1.9.2 1.3.3h.1c.4.1.8.1 1.3.2h.2c.4 0 .8.1 1.2.1H87c.7 0 1.4 0 2-.1.2 0 .4 0 .6-.1.5 0 .9-.1 1.4-.2.2 0 .5-.1.7-.1.4-.1.8-.1 1.2-.2.2-.1.5-.1.7-.2l1.2-.3c.2-.1.4-.1.6-.2.5-.2 1-.3 1.5-.5.1 0 .2-.1.4-.1.6-.2 1.2-.5 1.7-.8.2-.1.4-.2.5-.3.4-.2.8-.4 1.1-.6.2-.1.4-.3.7-.4l.9-.6c.1-.1.2-.1.3-.2 3.1-2.1 5.7-4.8 7.7-7.9 5 7.7 13.6 12.7 23.5 12.7s18.6-5.1 23.6-12.9c2 3.2 4.7 5.9 7.8 8.1.5.4 1.1.7 1.6 1 .1.1.2.1.3.2 1.1.6 2.2 1.2 3.4 1.6.1 0 .2.1.3.1l1.8.6c.6.2 1.2.3 1.8.5.1 0 .3.1.4.1.6.1 1.2.3 1.8.4.6.1 1.3.2 1.9.2h.5c.6 0 1.3.1 1.9.1s1.3 0 1.9-.1h.5c.6-.1 1.3-.1 1.9-.2.6-.1 1.2-.2 1.8-.4.1 0 .3-.1.4-.1.6-.1 1.2-.3 1.8-.5l1.8-.6c.1 0 .2-.1.3-.1 1.2-.5 2.3-1 3.4-1.6.1-.1.2-.1.3-.2.5-.3 1.1-.7 1.6-1 3.1-2.1 5.7-4.8 7.7-7.9 5 7.7 13.6 12.7 23.5 12.7 9.5 0 18-4.8 23-12.1 2 2.8 4.4 5.3 7.3 7.2.5.4 1.1.7 1.6 1 .1.1.2.1.3.2 1.1.6 2.2 1.2 3.4 1.6.1 0 .2.1.3.1l1.8.6c.6.2 1.2.3 1.8.5.1 0 .3.1.4.1.6.1 1.2.3 1.8.4.6.1 1.3.2 1.9.2h.5c.6 0 1.3.1 1.9.1.6 0 1.2 0 1.9-.1h.4c.6 0 1.2-.1 1.7-.2h.1c.6-.1 1.3-.2 1.9-.4h.1c11.9-2.7 20.9-12.8 21.8-25.3l-6.7-6.7zM150 107c-.1 8.8-7.3 15.9-16.1 15.9s-16-7.1-16.1-15.9l15-37h25l-7.8 37zm77.8 15.9c-8.8 0-16-7.1-16.1-15.9l-7.8-37h25l15 37c-.1 8.8-7.3 15.9-16.1 15.9z"/></svg>

assets/images/obw-taxes-icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="266 396.70001220703125 25.5 23.5999755859375"><path fill="#FFF" d="M266 402.5c0-3.5 2.2-5.8 5.5-5.8s5.5 2.3 5.5 5.8-2.2 5.8-5.5 5.8-5.5-2.3-5.5-5.8zm2.9 17.3l8.5-11.8 6.2-10.7h5.2l-8.6 11.9-6 10.7h-5.3zm4.1-17.3c0-1.6-.5-2.5-1.5-2.5s-1.5.9-1.5 2.5c0 1.5.6 2.5 1.5 2.5.9-.1 1.5-1 1.5-2.5zm7.5 12c0-3.5 2.2-5.8 5.5-5.8s5.5 2.3 5.5 5.8-2.2 5.8-5.5 5.8-5.5-2.3-5.5-5.8zm7 0c0-1.6-.6-2.5-1.5-2.5s-1.5.9-1.5 2.5c0 1.5.6 2.5 1.5 2.5.9-.1 1.5-1 1.5-2.5z"/></svg>

assets/js/admin/quick-edit.js

@@ -59,20 +59,31 @@ jQuery(function( $ ) {
 			$( 'input[name="_featured"]', '.inline-edit-row' ).removeAttr( 'checked' );
 		}
 
-		if ( 'yes' === manage_stock ) {
-			$( '.stock_qty_field, .backorder_field', '.inline-edit-row' ).show().removeAttr( 'style' );
-			$( '.stock_status_field' ).hide();
-			$( 'input[name="_manage_stock"]', '.inline-edit-row' ).attr( 'checked', 'checked' );
-		} else {
-			$( '.stock_qty_field, .backorder_field', '.inline-edit-row' ).hide();
-			$( '.stock_status_field' ).show().removeAttr( 'style' );
-			$( 'input[name="_manage_stock"]', '.inline-edit-row' ).removeAttr( 'checked' );
-		}
-
 		// Conditional display
 		var product_type       = $wc_inline_data.find( '.product_type' ).text(),
 			product_is_virtual = $wc_inline_data.find( '.product_is_virtual' ).text();
 
+		var product_supports_stock_status = 'external' !== product_type;
+		var product_supports_stock_fields = 'external' !== product_type && 'grouped' !== product_type;
+
+		$( '.stock_fields, .manage_stock_field, .stock_status_field, .backorder_field' ).show();
+
+		if ( product_supports_stock_fields ) {
+			if ( 'yes' === manage_stock ) {
+				$( '.stock_fields' ).show().removeAttr( 'style' );
+				$( '.stock_status_field' ).hide();
+				$( '.manage_stock_field input' ).prop( 'checked', true );
+			} else {
+				$( '.stock_qty_field', '.inline-edit-row' ).hide();
+				$( '.stock_status_field' ).show().removeAttr( 'style' );
+				$( '.manage_stock_field input' ).prop( 'checked', false );
+			}
+		} else if ( product_supports_stock_status ) {
+			$( '.stock_fields, .manage_stock_field, .backorder_field' ).hide();
+		} else {
+			$( '.stock_fields, .manage_stock_field, .stock_status_field, .backorder_field' ).hide();
+		}
+
 		if ( 'simple' === product_type || 'external' === product_type ) {
 			$( '.price_fields', '.inline-edit-row' ).show().removeAttr( 'style' );
 		} else {
@@ -85,12 +96,6 @@ jQuery(function( $ ) {
 			$( '.dimension_fields', '.inline-edit-row' ).show().removeAttr( 'style' );
 		}
 
-		if ( 'grouped' === product_type ) {
-			$( '.stock_fields', '.inline-edit-row' ).hide();
-		} else {
-			$( '.stock_fields', '.inline-edit-row' ).show().removeAttr( 'style' );
-		}
-
 		// Rename core strings
 		$( 'input[name="comment_status"]' ).parent().find( '.checkbox-title' ).text( woocommerce_quick_edit.strings.allow_reviews );
 	});
@@ -98,10 +103,10 @@ jQuery(function( $ ) {
 	$( '#the-list' ).on( 'change', '.inline-edit-row input[name="_manage_stock"]', function() {
 
 		if ( $( this ).is( ':checked' ) ) {
-			$( '.stock_qty_field, .backorder_field', '.inline-edit-row' ).show().removeAttr( 'style' );
+			$( '.stock_qty_field', '.inline-edit-row' ).show().removeAttr( 'style' );
 			$( '.stock_status_field' ).hide();
 		} else {
-			$( '.stock_qty_field, .backorder_field', '.inline-edit-row' ).hide();
+			$( '.stock_qty_field', '.inline-edit-row' ).hide();
 			$( '.stock_status_field' ).show().removeAttr( 'style' );
 		}
 

assets/js/admin/term-ordering.js

@@ -5,19 +5,33 @@ jQuery( function( $ ) {
 
 	var table_selector   = 'table.wp-list-table',
 		item_selector    = 'tbody tr:not(.inline-edit-row)',
-		term_id_selector = '.column-handle input[name="term_id"]';
+		term_id_selector = '.column-handle input[name="term_id"]',
+		column_handle    = '<td class="column-handle"></td>';
 
 	if ( 0 === $( table_selector ).find( '.column-handle' ).length ) {
-		$( table_selector ).find( 'tr:not(.inline-edit-row)' ).append( '<td class="column-handle"></td>' );
+		$( table_selector ).find( 'tr:not(.inline-edit-row)' ).append( column_handle );
 
 		term_id_selector = '.check-column input';
 	}
 
 	$( table_selector ).find( '.column-handle' ).show();
 
+	$.wc_add_missing_sort_handles = function() {
+		var all_table_rows = $( table_selector ).find('tbody > tr');
+		var rows_with_handle = $( table_selector ).find('tbody > tr > td.column-handle').parent();
+		if ( all_table_rows.length !== rows_with_handle.length ) {
+			all_table_rows.each(function(index, elem){
+				if ( ! rows_with_handle.is( elem ) ) {
+					$( elem ).append( column_handle );
+				}
+			});
+		}
+		$( table_selector ).find( '.column-handle' ).show();
+	};
+
 	$( document ).ajaxComplete( function( event, request, options ) {
-		if ( request && 4 === request.readyState && 200 === request.status && options.data && 0 <= options.data.indexOf( '_inline_edit' ) ) {
-			$( table_selector ).find( '.column-handle' ).show();
+		if ( request && 4 === request.readyState && 200 === request.status && options.data && ( 0 <= options.data.indexOf( '_inline_edit' ) || 0 <= options.data.indexOf( 'add-tag' ) ) ) {
+			$.wc_add_missing_sort_handles();
 			$( document.body ).trigger( 'init_tooltips' );
 		}
 	} );

assets/js/admin/term-ordering.min.js

@@ -1 +1 @@
-jQuery(function(e){var t="table.wp-list-table",n='.column-handle input[name="term_id"]';0===e(t).find(".column-handle").length&&(e(t).find("tr:not(.inline-edit-row)").append('<td class="column-handle"></td>'),n=".check-column input"),e(t).find(".column-handle").show(),e(document).ajaxComplete(function(n,i,d){i&&4===i.readyState&&200===i.status&&d.data&&0<=d.data.indexOf("_inline_edit")&&(e(t).find(".column-handle").show(),e(document.body).trigger("init_tooltips"))}),e(t).sortable({items:"tbody tr:not(.inline-edit-row)",cursor:"move",handle:".column-handle",axis:"y",forcePlaceholderSize:!0,helper:"clone",opacity:.65,placeholder:"product-cat-placeholder",scrollSensitivity:40,start:function(e,t){t.item.hasClass("alternate")||t.item.css("background-color","#ffffff"),t.item.children("td, th").css("border-bottom-width","0"),t.item.css("outline","1px solid #aaa")},stop:function(e,t){t.item.removeAttr("style"),t.item.children("td, th").css("border-bottom-width","1px")},update:function(i,d){var o,a,l=d.item.find(n).val(),r=d.item.find(".parent").html(),c=d.item.prev().find(n).val(),m=d.item.next().find(n).val();c!==undefined&&(o=d.item.prev().find(".parent").html())!==r&&(c=undefined),m!==undefined&&(a=d.item.next().find(".parent").html())!==r&&(m=undefined),c===undefined&&m===undefined||m===undefined&&a===c||m!==undefined&&o===l?e(t).sortable("cancel"):(d.item.find(".check-column input").hide(),d.item.find(".check-column").append('<img alt="processing" src="images/wpspin_light.gif" class="waiting" style="margin-left: 6px;" />'),e.post(ajaxurl,{action:"woocommerce_term_ordering",id:l,nextid:m,thetaxonomy:woocommerce_term_ordering_params.taxonomy},function(e){"children"===e?window.location.reload():(d.item.find(".check-column input").show(),d.item.find(".check-column").find("img").remove())}),e("table.widefat tbody tr").each(function(){jQuery("table.widefat tbody tr").index(this)%2==0?jQuery(this).addClass("alternate"):jQuery(this).removeClass("alternate")}))}})});
+jQuery(function(e){var t="table.wp-list-table",n='.column-handle input[name="term_id"]';0===e(t).find(".column-handle").length&&(e(t).find("tr:not(.inline-edit-row)").append('<td class="column-handle"></td>'),n=".check-column input"),e(t).find(".column-handle").show(),e.wc_add_missing_sort_handles=function(){var n=e(t).find("tbody > tr"),i=e(t).find("tbody > tr > td.column-handle").parent();n.length!==i.length&&n.each(function(t,n){i.is(n)||e(n).append('<td class="column-handle"></td>')}),e(t).find(".column-handle").show()},e(document).ajaxComplete(function(t,n,i){n&&4===n.readyState&&200===n.status&&i.data&&(0<=i.data.indexOf("_inline_edit")||0<=i.data.indexOf("add-tag"))&&(e.wc_add_missing_sort_handles(),e(document.body).trigger("init_tooltips"))}),e(t).sortable({items:"tbody tr:not(.inline-edit-row)",cursor:"move",handle:".column-handle",axis:"y",forcePlaceholderSize:!0,helper:"clone",opacity:.65,placeholder:"product-cat-placeholder",scrollSensitivity:40,start:function(e,t){t.item.hasClass("alternate")||t.item.css("background-color","#ffffff"),t.item.children("td, th").css("border-bottom-width","0"),t.item.css("outline","1px solid #aaa")},stop:function(e,t){t.item.removeAttr("style"),t.item.children("td, th").css("border-bottom-width","1px")},update:function(i,d){var a,o,l=d.item.find(n).val(),c=d.item.find(".parent").html(),r=d.item.prev().find(n).val(),m=d.item.next().find(n).val();r!==undefined&&(a=d.item.prev().find(".parent").html())!==c&&(r=undefined),m!==undefined&&(o=d.item.next().find(".parent").html())!==c&&(m=undefined),r===undefined&&m===undefined||m===undefined&&o===r||m!==undefined&&a===l?e(t).sortable("cancel"):(d.item.find(".check-column input").hide(),d.item.find(".check-column").append('<img alt="processing" src="images/wpspin_light.gif" class="waiting" style="margin-left: 6px;" />'),e.post(ajaxurl,{action:"woocommerce_term_ordering",id:l,nextid:m,thetaxonomy:woocommerce_term_ordering_params.taxonomy},function(e){"children"===e?window.location.reload():(d.item.find(".check-column input").show(),d.item.find(".check-column").find("img").remove())}),e("table.widefat tbody tr").each(function(){jQuery("table.widefat tbody tr").index(this)%2==0?jQuery(this).addClass("alternate"):jQuery(this).removeClass("alternate")}))}})});

assets/js/admin/wc-setup.js

@@ -47,6 +47,8 @@ jQuery( function( $ ) {
 			$( '.store-state-container' ).hide();
 			$state_select.empty().val( '' ).change().prop( 'required', false );
 		}
+
+		$( '#currency_code' ).val( wc_setup_currencies[ country ] ).change();
 	} );
 
 	$( '#store_country' ).change();
@@ -108,9 +110,11 @@ jQuery( function( $ ) {
 
 	$( '.wc-wizard-services' ).on( 'change', '.wc-wizard-shipping-method-enable', function() {
 		var checked = $( this ).is( ':checked' );
+		var selectedMethod = $( '.wc-wizard-shipping-method-select .method' ).val();
 
 		$( this )
 			.closest( '.wc-wizard-service-item' )
+			.find( '.' + selectedMethod )
 			.find( '.shipping-method-required-field' )
 			.prop( 'required', checked );
 	} );
@@ -172,8 +176,50 @@ jQuery( function( $ ) {
 		}
 	} ).find( 'input#stripe_create_account, input#ppec_paypal_reroute_requests' ).change();
 
-	$( 'select#store_country' ).on( 'change', function() {
-		var countryCode = $( this ).val();
-		$( 'select#currency_code' ).val( wc_setup_currencies[ countryCode ] ).change();
-	} );
+	function addPlugins( bySlug, $el, hover ) {
+		var plugins = $el.data( 'plugins' );
+		for ( var i in Array.isArray( plugins ) ? plugins : [] ) {
+			var slug = plugins[ i ].slug;
+			bySlug[ slug ] = bySlug[ slug ] ||
+				$( '<span class="plugin-install-info-list-item">' )
+					.append( '<a href="https://wordpress.org/plugins/' + slug + '/" target="_blank">' + plugins[ i ].name + '</a>' );
+
+			bySlug[ slug ].find( 'a' )
+				.on( 'mouseenter mouseleave', ( function( $hover, event ) {
+					$hover.toggleClass( 'plugin-install-source', 'mouseenter' === event.type );
+				} ).bind( null, hover ? $el.closest( hover ) : $el ) );
+		}
+	}
+
+	function updatePluginInfo() {
+		var pluginLinkBySlug = {};
+
+		$( '.wc-wizard-service-enable input:checked' ).each( function() {
+			addPlugins( pluginLinkBySlug, $( this ), '.wc-wizard-service-item' );
+
+			var $container = $( this ).closest( '.wc-wizard-service-item' );
+			$container.find( 'input.payment-checkbox-input:checked' ).each( function() {
+				addPlugins( pluginLinkBySlug, $( this ), '.wc-wizard-service-settings' );
+			} );
+			$container.find( '.wc-wizard-shipping-method-select .method' ).each( function() {
+				var $this = $( this );
+				if ( 'live_rates' === $this.val()  ) {
+					addPlugins( pluginLinkBySlug, $this, '.wc-wizard-service-item' );
+				}
+			} );
+		} );
+
+		$( '.recommended-item input:checked' ).each( function() {
+			addPlugins( pluginLinkBySlug, $( this ), '.recommended-item' );
+		} );
+
+		var $list = $( 'span.plugin-install-info-list' ).empty();
+		for ( var slug in pluginLinkBySlug ) {
+			$list.append( pluginLinkBySlug[ slug ] );
+		}
+		$( 'span.plugin-install-info' ).toggle( $list.children().length > 0 );
+	}
+
+	updatePluginInfo();
+	$( '.wc-setup-content' ).on( 'change', '[data-plugins]', updatePluginInfo );
 } );

assets/js/admin/wc-setup.min.js

@@ -1 +1 @@
-jQuery(function(e){function i(){e(".wc-setup-content").block({message:null,overlayCSS:{background:"#fff",opacity:.6}})}function s(){e("form.activate-jetpack").submit()}function t(){wp.ajax.post("setup_wizard_check_jetpack").then(function(e){if(!e||!e.is_active||"yes"===e.is_active)return s();setTimeout(t,3e3)}).fail(function(){s()})}e(".button-next").on("click",function(){var s=e(this).parents("form").get(0);return("function"!=typeof s.checkValidity||s.checkValidity())&&i(),!0}),e(".wc-wizard-services").on("change",".wc-wizard-service-enable input",function(){e(this).is(":checked")?(e(this).closest(".wc-wizard-service-toggle").removeClass("disabled"),e(this).closest(".wc-wizard-service-item").addClass("checked"),e(this).closest(".wc-wizard-service-item").find(".wc-wizard-service-settings").removeClass("hide")):(e(this).closest(".wc-wizard-service-toggle").addClass("disabled"),e(this).closest(".wc-wizard-service-item").removeClass("checked"),e(this).closest(".wc-wizard-service-item").find(".wc-wizard-service-settings").addClass("hide"))}),e(".wc-wizard-services").on("click",".wc-wizard-service-enable",function(i){if(e(i.target).is("input"))i.stopPropagation();else{var s=e(this).find('input[type="checkbox"]');s.prop("checked",!s.prop("checked")).change()}}),e(".wc-wizard-services-list-toggle").on("click",function(){e(this).closest(".wc-wizard-services-list-toggle").toggleClass("closed"),e(this).closest(".wc-wizard-services").find(".wc-wizard-service-item").slideToggle().css("display","flex")}),e(".wc-wizard-services").on("change",".wc-wizard-shipping-method-select .method",function(i){var s=e(this).closest(".wc-wizard-service-description"),t=i.target.value,c=s.find(".shipping-method-descriptions");c.find(".shipping-method-description").addClass("hide"),c.find("."+t).removeClass("hide");var r=s.find(".shipping-method-settings");r.find(".shipping-method-setting").addClass("hide").find(".shipping-method-required-field").prop("required",!1),r.find("."+t).removeClass("hide").find(".shipping-method-required-field").prop("required",!0)}).find(".wc-wizard-shipping-method-select .method").change(),e(".wc-wizard-services").on("change",".wc-wizard-shipping-method-enable",function(){var i=e(this).is(":checked");e(this).closest(".wc-wizard-service-item").find(".shipping-method-required-field").prop("required",i)}),e(".activate-jetpack").on("click",".button-primary",function(e){if(i(),"no"===wc_setup_params.pending_jetpack_install)return!0;e.preventDefault(),t()}),e(".wc-wizard-services").on("change","input#stripe_create_account, input#ppec_paypal_reroute_requests",function(){e(this).is(":checked")?(e(this).closest(".wc-wizard-service-settings").find("input.payment-email-input").prop("required",!0),e(this).closest(".wc-wizard-service-settings").find(".wc-wizard-service-setting-stripe_email, .wc-wizard-service-setting-ppec_paypal_email").show()):(e(this).closest(".wc-wizard-service-settings").find("input.payment-email-input").prop("required",!1),e(this).closest(".wc-wizard-service-settings").find(".wc-wizard-service-setting-stripe_email, .wc-wizard-service-setting-ppec_paypal_email").hide())}).find("input#stripe_create_account, input#ppec_paypal_reroute_requests").change(),e("select#store_country_state").on("change",function(){var i=this.value.split(":")[0];e("select#currency_code").val(wc_setup_currencies[i]).change()})});
+jQuery(function(e){function i(){e(".wc-setup-content").block({message:null,overlayCSS:{background:"#fff",opacity:.6}})}function t(){e("form.activate-jetpack").submit()}function s(){wp.ajax.post("setup_wizard_check_jetpack").then(function(e){if(!e||!e.is_active||"yes"===e.is_active)return t();setTimeout(s,3e3)}).fail(function(){t()})}function c(i,t,s){var c=t.data("plugins");for(var n in Array.isArray(c)?c:[]){var a=c[n].slug;i[a]=i[a]||e('<span class="plugin-install-info-list-item">').append('<a href="https://wordpress.org/plugins/'+a+'/" target="_blank">'+c[n].name+"</a>"),i[a].find("a").on("mouseenter mouseleave",function(e,i){e.toggleClass("plugin-install-source","mouseenter"===i.type)}.bind(null,s?t.closest(s):t))}}function n(){var i={};e(".wc-wizard-service-enable input:checked").each(function(){c(i,e(this),".wc-wizard-service-item");var t=e(this).closest(".wc-wizard-service-item");t.find("input.payment-checkbox-input:checked").each(function(){c(i,e(this),".wc-wizard-service-settings")}),t.find(".wc-wizard-shipping-method-select .method").each(function(){var t=e(this);"live_rates"===t.val()&&c(i,t,".wc-wizard-service-item")})}),e(".recommended-item input:checked").each(function(){c(i,e(this),".recommended-item")});var t=e("span.plugin-install-info-list").empty();for(var s in i)t.append(i[s]);e("span.plugin-install-info").toggle(t.children().length>0)}e(".button-next").on("click",function(){var t=e(this).parents("form").get(0);return("function"!=typeof t.checkValidity||t.checkValidity())&&i(),!0}),e("#store_country").on("change",function(){if(null!==wc_setup_params.states){var i=e(this).val(),t=e("#store_state");if(e.isEmptyObject(wc_setup_params.states[i]))e(".store-state-container").hide(),t.empty().val("").change().prop("required",!1);else{var s=wc_setup_params.states[i];t.empty(),e.each(s,function(i){t.append(e('<option value="'+i+'">'+s[i]+"</option>"))}),e(".store-state-container").show(),t.selectWoo().val(wc_base_state).change().prop("required",!0)}e("#currency_code").val(wc_setup_currencies[i]).change()}}),e("#store_country").change(),e(".wc-wizard-services").on("change",".wc-wizard-service-enable input",function(){e(this).is(":checked")?(e(this).closest(".wc-wizard-service-toggle").removeClass("disabled"),e(this).closest(".wc-wizard-service-item").addClass("checked"),e(this).closest(".wc-wizard-service-item").find(".wc-wizard-service-settings").removeClass("hide")):(e(this).closest(".wc-wizard-service-toggle").addClass("disabled"),e(this).closest(".wc-wizard-service-item").removeClass("checked"),e(this).closest(".wc-wizard-service-item").find(".wc-wizard-service-settings").addClass("hide"))}),e(".wc-wizard-services").on("click",".wc-wizard-service-enable",function(i){if(e(i.target).is("input"))i.stopPropagation();else{var t=e(this).find('input[type="checkbox"]');t.prop("checked",!t.prop("checked")).change()}}),e(".wc-wizard-services-list-toggle").on("click",function(){e(this).closest(".wc-wizard-services-list-toggle").toggleClass("closed"),e(this).closest(".wc-wizard-services").find(".wc-wizard-service-item").slideToggle().css("display","flex")}),e(".wc-wizard-services").on("change",".wc-wizard-shipping-method-select .method",function(i){var t=e(this).closest(".wc-wizard-service-description"),s=i.target.value,c=t.find(".shipping-method-descriptions");c.find(".shipping-method-description").addClass("hide"),c.find("."+s).removeClass("hide");var n=t.find(".shipping-method-settings");n.find(".shipping-method-setting").addClass("hide").find(".shipping-method-required-field").prop("required",!1),n.find("."+s).removeClass("hide").find(".shipping-method-required-field").prop("required",!0)}).find(".wc-wizard-shipping-method-select .method").change(),e(".wc-wizard-services").on("change",".wc-wizard-shipping-method-enable",function(){var i=e(this).is(":checked"),t=e(".wc-wizard-shipping-method-select .method").val();e(this).closest(".wc-wizard-service-item").find("."+t).find(".shipping-method-required-field").prop("required",i)}),e(".activate-jetpack").on("click",".button-primary",function(e){if(i(),"no"===wc_setup_params.pending_jetpack_install)return!0;e.preventDefault(),s()}),e(".wc-wizard-services").on("change","input#stripe_create_account, input#ppec_paypal_reroute_requests",function(){e(this).is(":checked")?(e(this).closest(".wc-wizard-service-settings").find("input.payment-email-input").prop("required",!0),e(this).closest(".wc-wizard-service-settings").find(".wc-wizard-service-setting-stripe_email, .wc-wizard-service-setting-ppec_paypal_email").show()):(e(this).closest(".wc-wizard-service-settings").find("input.payment-email-input").prop("required",!1),e(this).closest(".wc-wizard-service-settings").find(".wc-wizard-service-setting-stripe_email, .wc-wizard-service-setting-ppec_paypal_email").hide())}).find("input#stripe_create_account, input#ppec_paypal_reroute_requests").change(),n(),e(".wc-setup-content").on("change","[data-plugins]",n)});

assets/js/admin/woocommerce_admin.js

@@ -297,4 +297,42 @@ 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' ),
+			$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' )
+		};
+
+		$toggle.addClass( 'woocommerce-input-toggle--loading' );
+
+		$.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' );
+					$toggle.removeClass( 'woocommerce-input-toggle--loading' );
+				} else if ( false === response.data ) {
+					$toggle.removeClass( 'woocommerce-input-toggle--enabled, woocommerce-input-toggle--disabled' );
+					$toggle.addClass( 'woocommerce-input-toggle--disabled' );
+					$toggle.removeClass( 'woocommerce-input-toggle--loading' );
+				} else if ( 'needs_setup' === response.data ) {
+					window.location.href = $link.attr( 'href' );
+				}
+			}
+		} );
+
+		return false;
+	});
 });

assets/js/frontend/add-to-cart-variation.js

@@ -565,8 +565,9 @@
 			$product_link     = $product_img_wrap.find( 'a' ).eq( 0 );
 
 		if ( variation && variation.image && variation.image.src && variation.image.src.length > 1 ) {
+			$form.wc_variations_image_reset();
+
 			if ( $gallery_nav.find( 'li img[src="' + variation.image.gallery_thumbnail_src + '"]' ).length > 0 ) {
-				$form.wc_variations_image_reset();
 				$gallery_nav.find( 'li img[src="' + variation.image.gallery_thumbnail_src + '"]' ).trigger( 'click' );
 				$form.attr( 'current-image', variation.image_id );
 				return;

assets/js/frontend/address-i18n.js

@@ -9,17 +9,23 @@ jQuery( function( $ ) {
 		var locale_json = wc_address_i18n_params.locale.replace( /"/g, '"' ),
 			locale = $.parseJSON( locale_json );
 
-		function field_is_required( field, is_required ) {
-			if ( is_required ) {
-				if ( field.find( 'label abbr.required' ).length === 0 ) {
-					field.find( 'label' ).append( '&nbsp;<abbr class="required" title="' + wc_address_i18n_params.i18n_required_text + '">*</abbr>' );
+			function field_is_required( field, is_required ) {
+				if ( is_required ) {
+					field.find( 'label .optional' ).remove();
 					field.addClass( 'validate-required' );
+
+					if ( field.find( 'label .required' ).length === 0 ) {
+						field.find( 'label' ).append( '&nbsp;<abbr class="required" title="' + wc_address_i18n_params.i18n_required_text + '">*</abbr>' );
+					}
+				} else {
+					field.find( 'label .required' ).remove();
+					field.removeClass( 'validate-required' );
+
+					if ( field.find( 'label .required' ).length === 0 ) {
+						field.find( 'label' ).append( '&nbsp;<span class="optional">(' + wc_address_i18n_params.i18n_optional_text + ')</span>' );
+					}
 				}
-			} else {
-				field.find( 'label abbr' ).remove();
-				field.removeClass( 'validate-required' );
 			}
-		}
 
 		$( document.body )
 

assets/js/frontend/address-i18n.min.js

@@ -1 +1 @@
-jQuery(function(e){function a(e,a){a?0===e.find("label abbr.required").length&&(e.find("label").append('&nbsp;<abbr class="required" title="'+wc_address_i18n_params.i18n_required_text+'">*</abbr>'),e.addClass("validate-required")):(e.find("label abbr").remove(),e.removeClass("validate-required"))}if("undefined"==typeof wc_address_i18n_params)return!1;var i=wc_address_i18n_params.locale.replace(/&quot;/g,'"'),d=e.parseJSON(i);e(document.body).bind("country_to_state_changing",function(i,t,r){var l,n=r;l="undefined"!=typeof d[t]?d[t]:d["default"];var o=n.find("#billing_postcode_field, #shipping_postcode_field"),s=n.find("#billing_city_field, #shipping_city_field"),f=n.find("#billing_state_field, #shipping_state_field");o.attr("data-o_class")||(o.attr("data-o_class",o.attr("class")),s.attr("data-o_class",s.attr("class")),f.attr("data-o_class",f.attr("class")));var p=e.parseJSON(wc_address_i18n_params.locale_fields);e.each(p,function(i,t){var r=n.find(t),o=e.extend(!0,{},d["default"][i],l[i]);"undefined"!=typeof o.label&&r.find("label").html(o.label),"undefined"!=typeof o.placeholder&&(r.find("input").attr("placeholder",o.placeholder),r.find(".select2-selection__placeholder").text(o.placeholder)),"undefined"!=typeof o.placeholder||"undefined"==typeof o.label||r.find("label").length||(r.find("input").attr("placeholder",o.label),r.find(".select2-selection__placeholder").text(o.label)),"undefined"!=typeof o.required?a(r,o.required):a(r,!1),"undefined"!=typeof o.priority&&r.data("priority",o.priority),"state"!==i&&("undefined"!=typeof o.hidden&&!0===o.hidden?r.hide().find("input").val(""):r.show())}),e(".woocommerce-billing-fields__field-wrapper, .woocommerce-shipping-fields__field-wrapper, .woocommerce-address-fields__field-wrapper, .woocommerce-additional-fields__field-wrapper .woocommerce-account-fields").each(function(a,i){var d=e(i).find(".form-row"),t=d.first().parent(),r=0;d.each(function(){e(this).data("priority")||e(this).data("priority",r+1),r=e(this).data("priority")}),d.sort(function(a,i){var d=e(a).data("priority"),t=e(i).data("priority");return d>t?1:d<t?-1:0}),d.detach().appendTo(t)})})});
+jQuery(function(e){function a(e,a){a?(e.find("label .optional").remove(),e.addClass("validate-required"),0===e.find("label .required").length&&e.find("label").append('&nbsp;<abbr class="required" title="'+wc_address_i18n_params.i18n_required_text+'">*</abbr>')):(e.find("label .required").remove(),e.removeClass("validate-required"),0===e.find("label .required").length&&e.find("label").append('&nbsp;<span class="optional">('+wc_address_i18n_params.i18n_optional_text+")</span>"))}if("undefined"==typeof wc_address_i18n_params)return!1;var i=wc_address_i18n_params.locale.replace(/&quot;/g,'"'),d=e.parseJSON(i);e(document.body).bind("country_to_state_changing",function(i,t,r){var l,n=r;l="undefined"!=typeof d[t]?d[t]:d["default"];var o=n.find("#billing_postcode_field, #shipping_postcode_field"),s=n.find("#billing_city_field, #shipping_city_field"),p=n.find("#billing_state_field, #shipping_state_field");o.attr("data-o_class")||(o.attr("data-o_class",o.attr("class")),s.attr("data-o_class",s.attr("class")),p.attr("data-o_class",p.attr("class")));var f=e.parseJSON(wc_address_i18n_params.locale_fields);e.each(f,function(i,t){var r=n.find(t),o=e.extend(!0,{},d["default"][i],l[i]);"undefined"!=typeof o.label&&r.find("label").html(o.label),"undefined"!=typeof o.placeholder&&(r.find("input").attr("placeholder",o.placeholder),r.find(".select2-selection__placeholder").text(o.placeholder)),"undefined"!=typeof o.placeholder||"undefined"==typeof o.label||r.find("label").length||(r.find("input").attr("placeholder",o.label),r.find(".select2-selection__placeholder").text(o.label)),"undefined"!=typeof o.required?a(r,o.required):a(r,!1),"undefined"!=typeof o.priority&&r.data("priority",o.priority),"state"!==i&&("undefined"!=typeof o.hidden&&!0===o.hidden?r.hide().find("input").val(""):r.show())}),e(".woocommerce-billing-fields__field-wrapper, .woocommerce-shipping-fields__field-wrapper, .woocommerce-address-fields__field-wrapper, .woocommerce-additional-fields__field-wrapper .woocommerce-account-fields").each(function(a,i){var d=e(i).find(".form-row"),t=d.first().parent(),r=0;d.each(function(){e(this).data("priority")||e(this).data("priority",r+1),r=e(this).data("priority")}),d.sort(function(a,i){var d=e(a).data("priority"),t=e(i).data("priority");return d>t?1:d<t?-1:0}),d.detach().appendTo(t)})})});

assets/js/frontend/cart.js

@@ -329,6 +329,7 @@ jQuery( function( $ ) {
 				complete: function() {
 					unblock( $form );
 					unblock( $( 'div.cart_totals' ) );
+					$.scroll_to_notices( $( '[role="alert"]' ) );
 				}
 			} );
 		},
@@ -365,8 +366,18 @@ jQuery( function( $ ) {
 
 			// Catch the enter key and don't let it submit the form.
 			if ( 13 === evt.keyCode ) {
-				evt.preventDefault();
-				this.cart_submit( evt );
+				var $form = $( evt.currentTarget ).parents( 'form' );
+
+				try {
+					// If there are no validation errors, handle the submit.
+					if ( $form[0].checkValidity() ) {
+						evt.preventDefault();
+						this.cart_submit( evt );
+					}
+				} catch( err ) {
+					evt.preventDefault();
+					this.cart_submit( evt );
+				}
 			}
 		},
 
@@ -512,6 +523,7 @@ jQuery( function( $ ) {
 				complete: function() {
 					unblock( $form );
 					unblock( $( 'div.cart_totals' ) );
+					$.scroll_to_notices( $( '[role="alert"]' ) );
 				}
 			} );
 		},
@@ -540,6 +552,7 @@ jQuery( function( $ ) {
 				complete: function() {
 					unblock( $form );
 					unblock( $( 'div.cart_totals' ) );
+					$.scroll_to_notices( $( '[role="alert"]' ) );
 				}
 			} );
 		},

assets/js/frontend/checkout.js

@@ -333,7 +333,7 @@ jQuery( function( $ ) {
 
 					// Save payment details to a temporary object
 					var paymentDetails = {};
-					$( '.payment_box input' ).each( function() {
+					$( '.payment_box :input' ).each( function() {
 						var ID = $( this ).attr( 'id' );
 
 						if ( ID ) {
@@ -360,7 +360,7 @@ jQuery( function( $ ) {
 
 					// Fill in the payment details if possible without overwriting data if set.
 					if ( ! $.isEmptyObject( paymentDetails ) ) {
-						$( '.payment_box input' ).each( function() {
+						$( '.payment_box :input' ).each( function() {
 							var ID = $( this ).attr( 'id' );
 
 							if ( ID ) {
@@ -512,24 +512,12 @@ jQuery( function( $ ) {
 			$( document.body ).trigger( 'checkout_error' );
 		},
 		scroll_to_notices: function() {
-			var scrollElement           = $( '.woocommerce-NoticeGroup-updateOrderReview, .woocommerce-NoticeGroup-checkout' ),
-				isSmoothScrollSupported = 'scrollBehavior' in document.documentElement.style;
+			var scrollElement           = $( '.woocommerce-NoticeGroup-updateOrderReview, .woocommerce-NoticeGroup-checkout' );
 
 			if ( ! scrollElement.length ) {
 				scrollElement = $( '.form.checkout' );
 			}
-
-			if ( scrollElement.length ) {
-				if ( isSmoothScrollSupported ) {
-					scrollElement[0].scrollIntoView({
-						behavior: 'smooth'
-					});
-				} else {
-					$( 'html, body' ).animate( {
-						scrollTop: ( scrollElement.offset().top - 100 )
-					}, 1000 );
-				}
-			}
+			$.scroll_to_notices( scrollElement );
 		}
 	};
 
@@ -649,7 +637,18 @@ jQuery( function( $ ) {
 
 		toggle_terms: function() {
 			if ( $( '.woocommerce-terms-and-conditions' ).length ) {
-				$( '.woocommerce-terms-and-conditions' ).slideToggle();
+				$( '.woocommerce-terms-and-conditions' ).slideToggle( function() {
+					var link_toggle = $( '.woocommerce-terms-and-conditions-link' );
+
+					if ( $( '.woocommerce-terms-and-conditions' ).is( ':visible' ) ) {
+						link_toggle.addClass( 'woocommerce-terms-and-conditions-link--open' );
+						link_toggle.removeClass( 'woocommerce-terms-and-conditions-link--closed' );
+					} else {
+						link_toggle.removeClass( 'woocommerce-terms-and-conditions-link--open' );
+						link_toggle.addClass( 'woocommerce-terms-and-conditions-link--closed' );
+					}
+				} );
+
 				return false;
 			}
 		}

assets/js/frontend/country-select.js

@@ -89,7 +89,7 @@ jQuery( function( $ ) {
 
 		var country     = $( this ).val(),
 			$statebox   = $wrapper.find( '#billing_state, #shipping_state, #calc_shipping_state' ),
-			$parent     = $statebox.parent(),
+			$parent     = $statebox.closest( 'p.form-row' ),
 			input_name  = $statebox.attr( 'name' ),
 			input_id    = $statebox.attr( 'id' ),
 			value       = $statebox.val(),
@@ -98,7 +98,7 @@ jQuery( function( $ ) {
 		if ( states[ country ] ) {
 			if ( $.isEmptyObject( states[ country ] ) ) {
 
-				$statebox.parent().hide().find( '.select2-container' ).remove();
+				$statebox.closest( 'p.form-row' ).hide().find( '.select2-container' ).remove();
 				$statebox.replaceWith( '<input type="hidden" class="hidden" name="' + input_name + '" id="' + input_id + '" value="" placeholder="' + placeholder + '" />' );
 
 				$( document.body ).trigger( 'country_to_state_changed', [ country, $wrapper ] );
@@ -114,7 +114,7 @@ jQuery( function( $ ) {
 					}
 				}
 
-				$statebox.parent().show();
+				$statebox.closest( 'p.form-row' ).show();
 
 				if ( $statebox.is( 'input' ) ) {
 					// Change for select

assets/js/frontend/country-select.min.js

@@ -1 +1 @@
-jQuery(function(t){function e(){return{language:{errorLoading:function(){return wc_country_select_params.i18n_searching},inputTooLong:function(t){var e=t.input.length-t.maximum;return 1===e?wc_country_select_params.i18n_input_too_long_1:wc_country_select_params.i18n_input_too_long_n.replace("%qty%",e)},inputTooShort:function(t){var e=t.minimum-t.input.length;return 1===e?wc_country_select_params.i18n_input_too_short_1:wc_country_select_params.i18n_input_too_short_n.replace("%qty%",e)},loadingMore:function(){return wc_country_select_params.i18n_load_more},maximumSelected:function(t){return 1===t.maximum?wc_country_select_params.i18n_selection_too_long_1:wc_country_select_params.i18n_selection_too_long_n.replace("%qty%",t.maximum)},noResults:function(){return wc_country_select_params.i18n_no_matches},searching:function(){return wc_country_select_params.i18n_searching}}}}if("undefined"==typeof wc_country_select_params)return!1;if(t().selectWoo){var n=function(){t("select.country_select:visible, select.state_select:visible").each(function(){var n=t.extend({placeholderOption:"first",width:"100%"},e());t(this).selectWoo(n),t(this).on("select2:select",function(){t(this).focus()})})};n(),t(document.body).bind("country_to_state_changed",function(){n()})}var o=wc_country_select_params.countries.replace(/&quot;/g,'"'),c=t.parseJSON(o);t(document.body).on("change","select.country_to_state, input.country_to_state",function(){var e=t(this).closest(".woocommerce-billing-fields, .woocommerce-shipping-fields, .woocommerce-shipping-calculator");e.length||(e=t(this).closest(".form-row").parent());var n=t(this).val(),o=e.find("#billing_state, #shipping_state, #calc_shipping_state"),i=o.parent(),a=o.attr("name"),r=o.attr("id"),s=o.val(),_=o.attr("placeholder")||o.attr("data-placeholder")||"";if(c[n])if(t.isEmptyObject(c[n]))o.parent().hide().find(".select2-container").remove(),o.replaceWith('<input type="hidden" class="hidden" name="'+a+'" id="'+r+'" value="" placeholder="'+_+'" />'),t(document.body).trigger("country_to_state_changed",[n,e]);else{var l="",u=c[n];for(var p in u)u.hasOwnProperty(p)&&(l=l+'<option value="'+p+'">'+u[p]+"</option>");o.parent().show(),o.is("input")&&(o.replaceWith('<select name="'+a+'" id="'+r+'" class="state_select" data-placeholder="'+_+'"></select>'),o=e.find("#billing_state, #shipping_state, #calc_shipping_state")),o.html('<option value="">'+wc_country_select_params.i18n_select_state_text+"</option>"+l),o.val(s).change(),t(document.body).trigger("country_to_state_changed",[n,e])}else o.is("select")?(i.show().find(".select2-container").remove(),o.replaceWith('<input type="text" class="input-text" name="'+a+'" id="'+r+'" placeholder="'+_+'" />'),t(document.body).trigger("country_to_state_changed",[n,e])):o.is('input[type="hidden"]')&&(i.show().find(".select2-container").remove(),o.replaceWith('<input type="text" class="input-text" name="'+a+'" id="'+r+'" placeholder="'+_+'" />'),t(document.body).trigger("country_to_state_changed",[n,e]));t(document.body).trigger("country_to_state_changing",[n,e])}),t(function(){t(":input.country_to_state").change()})});
+jQuery(function(t){function e(){return{language:{errorLoading:function(){return wc_country_select_params.i18n_searching},inputTooLong:function(t){var e=t.input.length-t.maximum;return 1===e?wc_country_select_params.i18n_input_too_long_1:wc_country_select_params.i18n_input_too_long_n.replace("%qty%",e)},inputTooShort:function(t){var e=t.minimum-t.input.length;return 1===e?wc_country_select_params.i18n_input_too_short_1:wc_country_select_params.i18n_input_too_short_n.replace("%qty%",e)},loadingMore:function(){return wc_country_select_params.i18n_load_more},maximumSelected:function(t){return 1===t.maximum?wc_country_select_params.i18n_selection_too_long_1:wc_country_select_params.i18n_selection_too_long_n.replace("%qty%",t.maximum)},noResults:function(){return wc_country_select_params.i18n_no_matches},searching:function(){return wc_country_select_params.i18n_searching}}}}if("undefined"==typeof wc_country_select_params)return!1;if(t().selectWoo){var n=function(){t("select.country_select:visible, select.state_select:visible").each(function(){var n=t.extend({placeholderOption:"first",width:"100%"},e());t(this).selectWoo(n),t(this).on("select2:select",function(){t(this).focus()})})};n(),t(document.body).bind("country_to_state_changed",function(){n()})}var o=wc_country_select_params.countries.replace(/&quot;/g,'"'),c=t.parseJSON(o);t(document.body).on("change","select.country_to_state, input.country_to_state",function(){var e=t(this).closest(".woocommerce-billing-fields, .woocommerce-shipping-fields, .woocommerce-shipping-calculator");e.length||(e=t(this).closest(".form-row").parent());var n=t(this).val(),o=e.find("#billing_state, #shipping_state, #calc_shipping_state"),i=o.closest("p.form-row"),r=o.attr("name"),a=o.attr("id"),s=o.val(),_=o.attr("placeholder")||o.attr("data-placeholder")||"";if(c[n])if(t.isEmptyObject(c[n]))o.closest("p.form-row").hide().find(".select2-container").remove(),o.replaceWith('<input type="hidden" class="hidden" name="'+r+'" id="'+a+'" value="" placeholder="'+_+'" />'),t(document.body).trigger("country_to_state_changed",[n,e]);else{var l="",u=c[n];for(var p in u)u.hasOwnProperty(p)&&(l=l+'<option value="'+p+'">'+u[p]+"</option>");o.closest("p.form-row").show(),o.is("input")&&(o.replaceWith('<select name="'+r+'" id="'+a+'" class="state_select" data-placeholder="'+_+'"></select>'),o=e.find("#billing_state, #shipping_state, #calc_shipping_state")),o.html('<option value="">'+wc_country_select_params.i18n_select_state_text+"</option>"+l),o.val(s).change(),t(document.body).trigger("country_to_state_changed",[n,e])}else o.is("select")?(i.show().find(".select2-container").remove(),o.replaceWith('<input type="text" class="input-text" name="'+r+'" id="'+a+'" placeholder="'+_+'" />'),t(document.body).trigger("country_to_state_changed",[n,e])):o.is('input[type="hidden"]')&&(i.show().find(".select2-container").remove(),o.replaceWith('<input type="text" class="input-text" name="'+r+'" id="'+a+'" placeholder="'+_+'" />'),t(document.body).trigger("country_to_state_changed",[n,e]));t(document.body).trigger("country_to_state_changing",[n,e])}),t(function(){t(":input.country_to_state").change()})});

assets/js/frontend/single-product.js

@@ -204,7 +204,7 @@ jQuery( function( $ ) {
 				touch: false
 			}, wc_single_product_params.zoom_options );
 
-			if ( 'ontouchstart' in window ) {
+			if ( 'ontouchstart' in document.documentElement ) {
 				zoom_options.on = 'click';
 			}
 
@@ -220,8 +220,12 @@ jQuery( function( $ ) {
 		if ( this.zoom_enabled && this.$images.length > 0 ) {
 			this.$target.prepend( '<a href="#" class="woocommerce-product-gallery__trigger">🔍</a>' );
 			this.$target.on( 'click', '.woocommerce-product-gallery__trigger', this.openPhotoswipe );
+			this.$target.on( 'click', '.woocommerce-product-gallery__image a', function( e ) {
+				e.preventDefault();
+			});
+		} else {
+			this.$target.on( 'click', '.woocommerce-product-gallery__image a', this.openPhotoswipe );
 		}
-		this.$target.on( 'click', '.woocommerce-product-gallery__image a', this.openPhotoswipe );
 	};
 
 	/**

assets/js/frontend/woocommerce.js

@@ -15,15 +15,69 @@ jQuery( function( $ ) {
 	});
 
 	// Set a cookie and hide the store notice when the dismiss button is clicked
-	jQuery( '.woocommerce-store-notice__dismiss-link' ).click( function() {
+	$( '.woocommerce-store-notice__dismiss-link' ).click( function() {
 		Cookies.set( 'store_notice', 'hidden', { path: '/' } );
-		jQuery( '.woocommerce-store-notice' ).hide();
+		$( '.woocommerce-store-notice' ).hide();
 	});
 
 	// Check the value of that cookie and show/hide the notice accordingly
 	if ( 'hidden' === Cookies.get( 'store_notice' ) ) {
-		jQuery( '.woocommerce-store-notice' ).hide();
+		$( '.woocommerce-store-notice' ).hide();
 	} else {
-		jQuery( '.woocommerce-store-notice' ).show();
+		$( '.woocommerce-store-notice' ).show();
 	}
+
+	// Make form field descriptions toggle on focus.
+	$( document.body ).on( 'click', function() {
+		$( '.woocommerce-input-wrapper span.description:visible' ).prop( 'aria-hidden', true ).slideUp( 250 );
+	} );
+
+	$( '.woocommerce-input-wrapper' ).on( 'click', function( event ) {
+		event.stopPropagation();
+	} );
+
+	$( '.woocommerce-input-wrapper :input' )
+		.on( 'keydown', function( event ) {
+			var input       = $( this ),
+				parent      = input.parent(),
+				description = parent.find( 'span.description' );
+
+			if ( 27 === event.which && description.length && description.is( ':visible' ) ) {
+				description.prop( 'aria-hidden', true ).slideUp( 250 );
+				event.preventDefault();
+				return false;
+			}
+		} )
+		.on( 'focus', function() {
+			var input       = $( this ),
+				parent      = input.parent(),
+				description = parent.find( 'span.description' );
+
+			parent.addClass( 'currentTarget' );
+
+			$( '.woocommerce-input-wrapper:not(.currentTarget) span.description:visible' ).prop( 'aria-hidden', true ).slideUp( 250 );
+
+			if ( description.length && description.is( ':hidden' ) ) {
+				description.prop( 'aria-hidden', false ).slideDown( 250 );
+			}
+
+			parent.removeClass( 'currentTarget' );
+		} );
+
+	// Common scroll to element code.
+	$.scroll_to_notices = function( scrollElement ) {
+		var isSmoothScrollSupported = 'scrollBehavior' in document.documentElement.style;
+
+		if ( scrollElement.length ) {
+			if ( isSmoothScrollSupported ) {
+				scrollElement[0].scrollIntoView({
+					behavior: 'smooth'
+				});
+			} else {
+				$( 'html, body' ).animate( {
+					scrollTop: ( scrollElement.offset().top - 100 )
+				}, 1000 );
+			}
+		}
+	};
 });

assets/js/frontend/woocommerce.min.js

@@ -1 +1 @@
-jQuery(function(o){o(".woocommerce-ordering").on("change","select.orderby",function(){o(this).closest("form").submit()}),o("input.qty:not(.product-quantity input.qty)").each(function(){var e=parseFloat(o(this).attr("min"));e>=0&&parseFloat(o(this).val())<e&&o(this).val(e)}),jQuery(".woocommerce-store-notice__dismiss-link").click(function(){Cookies.set("store_notice","hidden",{path:"/"}),jQuery(".woocommerce-store-notice").hide()}),"hidden"===Cookies.get("store_notice")?jQuery(".woocommerce-store-notice").hide():jQuery(".woocommerce-store-notice").show()});
+jQuery(function(o){o(".woocommerce-ordering").on("change","select.orderby",function(){o(this).closest("form").submit()}),o("input.qty:not(.product-quantity input.qty)").each(function(){var e=parseFloat(o(this).attr("min"));e>=0&&parseFloat(o(this).val())<e&&o(this).val(e)}),o(".woocommerce-store-notice__dismiss-link").click(function(){Cookies.set("store_notice","hidden",{path:"/"}),o(".woocommerce-store-notice").hide()}),"hidden"===Cookies.get("store_notice")?o(".woocommerce-store-notice").hide():o(".woocommerce-store-notice").show(),o(document.body).on("click",function(){o(".woocommerce-input-wrapper span.description:visible").prop("aria-hidden",!0).slideUp(250)}),o(".woocommerce-input-wrapper").on("click",function(o){o.stopPropagation()}),o(".woocommerce-input-wrapper :input").on("keydown",function(e){var i=o(this).parent().find("span.description");if(27===e.which&&i.length&&i.is(":visible"))return i.prop("aria-hidden",!0).slideUp(250),e.preventDefault(),!1}).on("focus",function(){var e=o(this).parent(),i=e.find("span.description");e.addClass("currentTarget"),o(".woocommerce-input-wrapper:not(.currentTarget) span.description:visible").prop("aria-hidden",!0).slideUp(250),i.length&&i.is(":hidden")&&i.prop("aria-hidden",!1).slideDown(250),e.removeClass("currentTarget")}),o.scroll_to_notices=function(e){var i="scrollBehavior"in document.documentElement.style;e.length&&(i?e[0].scrollIntoView({behavior:"smooth"}):o("html, body").animate({scrollTop:e.offset().top-100},1e3))}});

assets/js/zoom/jquery.zoom.js

@@ -1,5 +1,5 @@
 /*!
-	Zoom 1.7.18
+	Zoom 1.7.21
 	license: MIT
 	http://www.jacklmoore.com/zoom
 */
@@ -220,12 +220,14 @@
 							}
 						});
 				}
-
+				
 				if ($.isFunction(settings.callback)) {
 					settings.callback.call(img);
 				}
 			};
 
+			img.setAttribute('role', 'presentation');
+			img.alt = '';
 			img.src = settings.url;
 		});
 	};

assets/js/zoom/jquery.zoom.min.js

@@ -1,6 +1,6 @@
 /*!
-	Zoom 1.7.18
+	Zoom 1.7.21
 	license: MIT
 	http://www.jacklmoore.com/zoom
 */
-!function(o){var t={url:!1,callback:!1,target:!1,duration:120,on:"mouseover",touch:!0,onZoomIn:!1,onZoomOut:!1,magnify:1};o.zoom=function(t,n,e,i){var u,c,a,r,m,l,s,f=o(t),h=f.css("position"),d=o(n);return t.style.position=/(absolute|fixed)/.test(h)?h:"relative",t.style.overflow="hidden",e.style.width=e.style.height="",o(e).addClass("zoomImg").css({position:"absolute",top:0,left:0,opacity:0,width:e.width*i,height:e.height*i,border:"none",maxWidth:"none",maxHeight:"none"}).appendTo(t),{init:function(){c=f.outerWidth(),u=f.outerHeight(),n===t?(r=c,a=u):(r=d.outerWidth(),a=d.outerHeight()),m=(e.width-c)/r,l=(e.height-u)/a,s=d.offset()},move:function(o){var t=o.pageX-s.left,n=o.pageY-s.top;n=Math.max(Math.min(n,a),0),t=Math.max(Math.min(t,r),0),e.style.left=t*-m+"px",e.style.top=n*-l+"px"}}},o.fn.zoom=function(n){return this.each(function(){var e=o.extend({},t,n||{}),i=e.target&&o(e.target)[0]||this,u=this,c=o(u),a=document.createElement("img"),r=o(a),m="mousemove.zoom",l=!1,s=!1;if(!e.url){var f=u.querySelector("img");if(f&&(e.url=f.getAttribute("data-src")||f.currentSrc||f.src),!e.url)return}c.one("zoom.destroy",function(o,t){c.off(".zoom"),i.style.position=o,i.style.overflow=t,a.onload=null,r.remove()}.bind(this,i.style.position,i.style.overflow)),a.onload=function(){function t(t){f.init(),f.move(t),r.stop().fadeTo(o.support.opacity?e.duration:0,1,!!o.isFunction(e.onZoomIn)&&e.onZoomIn.call(a))}function n(){r.stop().fadeTo(e.duration,0,!!o.isFunction(e.onZoomOut)&&e.onZoomOut.call(a))}var f=o.zoom(i,u,a,e.magnify);"grab"===e.on?c.on("mousedown.zoom",function(e){1===e.which&&(o(document).one("mouseup.zoom",function(){n(),o(document).off(m,f.move)}),t(e),o(document).on(m,f.move),e.preventDefault())}):"click"===e.on?c.on("click.zoom",function(e){return l?void 0:(l=!0,t(e),o(document).on(m,f.move),o(document).one("click.zoom",function(){n(),l=!1,o(document).off(m,f.move)}),!1)}):"toggle"===e.on?c.on("click.zoom",function(o){l?n():t(o),l=!l}):"mouseover"===e.on&&(f.init(),c.on("mouseenter.zoom",t).on("mouseleave.zoom",n).on(m,f.move)),e.touch&&c.on("touchstart.zoom",function(o){o.preventDefault(),s?(s=!1,n()):(s=!0,t(o.originalEvent.touches[0]||o.originalEvent.changedTouches[0]))}).on("touchmove.zoom",function(o){o.preventDefault(),f.move(o.originalEvent.touches[0]||o.originalEvent.changedTouches[0])}).on("touchend.zoom",function(o){o.preventDefault(),s&&(s=!1,n())}),o.isFunction(e.callback)&&e.callback.call(a)},a.src=e.url})},o.fn.zoom.defaults=t}(window.jQuery);
+(function(o){var t={url:!1,callback:!1,target:!1,duration:120,on:"mouseover",touch:!0,onZoomIn:!1,onZoomOut:!1,magnify:1};o.zoom=function(t,n,e,i){var u,c,a,r,m,l,s,f=o(t),h=f.css("position"),d=o(n);return t.style.position=/(absolute|fixed)/.test(h)?h:"relative",t.style.overflow="hidden",e.style.width=e.style.height="",o(e).addClass("zoomImg").css({position:"absolute",top:0,left:0,opacity:0,width:e.width*i,height:e.height*i,border:"none",maxWidth:"none",maxHeight:"none"}).appendTo(t),{init:function(){c=f.outerWidth(),u=f.outerHeight(),n===t?(r=c,a=u):(r=d.outerWidth(),a=d.outerHeight()),m=(e.width-c)/r,l=(e.height-u)/a,s=d.offset()},move:function(o){var t=o.pageX-s.left,n=o.pageY-s.top;n=Math.max(Math.min(n,a),0),t=Math.max(Math.min(t,r),0),e.style.left=t*-m+"px",e.style.top=n*-l+"px"}}},o.fn.zoom=function(n){return this.each(function(){var e=o.extend({},t,n||{}),i=e.target&&o(e.target)[0]||this,u=this,c=o(u),a=document.createElement("img"),r=o(a),m="mousemove.zoom",l=!1,s=!1;if(!e.url){var f=u.querySelector("img");if(f&&(e.url=f.getAttribute("data-src")||f.currentSrc||f.src),!e.url)return}c.one("zoom.destroy",function(o,t){c.off(".zoom"),i.style.position=o,i.style.overflow=t,a.onload=null,r.remove()}.bind(this,i.style.position,i.style.overflow)),a.onload=function(){function t(t){f.init(),f.move(t),r.stop().fadeTo(o.support.opacity?e.duration:0,1,o.isFunction(e.onZoomIn)?e.onZoomIn.call(a):!1)}function n(){r.stop().fadeTo(e.duration,0,o.isFunction(e.onZoomOut)?e.onZoomOut.call(a):!1)}var f=o.zoom(i,u,a,e.magnify);"grab"===e.on?c.on("mousedown.zoom",function(e){1===e.which&&(o(document).one("mouseup.zoom",function(){n(),o(document).off(m,f.move)}),t(e),o(document).on(m,f.move),e.preventDefault())}):"click"===e.on?c.on("click.zoom",function(e){return l?void 0:(l=!0,t(e),o(document).on(m,f.move),o(document).one("click.zoom",function(){n(),l=!1,o(document).off(m,f.move)}),!1)}):"toggle"===e.on?c.on("click.zoom",function(o){l?n():t(o),l=!l}):"mouseover"===e.on&&(f.init(),c.on("mouseenter.zoom",t).on("mouseleave.zoom",n).on(m,f.move)),e.touch&&c.on("touchstart.zoom",function(o){o.preventDefault(),s?(s=!1,n()):(s=!0,t(o.originalEvent.touches[0]||o.originalEvent.changedTouches[0]))}).on("touchmove.zoom",function(o){o.preventDefault(),f.move(o.originalEvent.touches[0]||o.originalEvent.changedTouches[0])}).on("touchend.zoom",function(o){o.preventDefault(),s&&(s=!1,n())}),o.isFunction(e.callback)&&e.callback.call(a)},a.setAttribute("role","presentation"),a.alt="",a.src=e.url})},o.fn.zoom.defaults=t})(window.jQuery);

i18n/locale-info.php

@@ -999,7 +999,7 @@ return array(
 				array(
 					'country'  => 'ZA',
 					'state'    => '',
-					'rate'     => '14.0000',
+					'rate'     => '15.0000',
 					'name'     => 'VAT',
 					'shipping' => true,
 				),

i18n/states/BD.php

@@ -3,7 +3,6 @@
  * Bangladeshi states (districts)
  *
  * @package WooCommerce/i18n
- * @version 2.0.0
  */
 
 global $states;
@@ -11,68 +10,68 @@ global $states;
 defined( 'ABSPATH' ) || exit;
 
 $states['BD'] = array(
-	'BAG'  => __( 'Bagerhat', 'woocommerce' ),
-	'BAN'  => __( 'Bandarban', 'woocommerce' ),
-	'BAR'  => __( 'Barguna', 'woocommerce' ),
-	'BARI' => __( 'Barisal', 'woocommerce' ),
-	'BHO'  => __( 'Bhola', 'woocommerce' ),
-	'BOG'  => __( 'Bogra', 'woocommerce' ),
-	'BRA'  => __( 'Brahmanbaria', 'woocommerce' ),
-	'CHA'  => __( 'Chandpur', 'woocommerce' ),
-	'CHI'  => __( 'Chittagong', 'woocommerce' ),
-	'CHU'  => __( 'Chuadanga', 'woocommerce' ),
-	'COM'  => __( 'Comilla', 'woocommerce' ),
-	'COX'  => __( "Cox's Bazar", 'woocommerce' ),
-	'DHA'  => __( 'Dhaka', 'woocommerce' ),
-	'DIN'  => __( 'Dinajpur', 'woocommerce' ),
-	'FAR'  => __( 'Faridpur ', 'woocommerce' ),
-	'FEN'  => __( 'Feni', 'woocommerce' ),
-	'GAI'  => __( 'Gaibandha', 'woocommerce' ),
-	'GAZI' => __( 'Gazipur', 'woocommerce' ),
-	'GOP'  => __( 'Gopalganj', 'woocommerce' ),
-	'HAB'  => __( 'Habiganj', 'woocommerce' ),
-	'JAM'  => __( 'Jamalpur', 'woocommerce' ),
-	'JES'  => __( 'Jessore', 'woocommerce' ),
-	'JHA'  => __( 'Jhalokati', 'woocommerce' ),
-	'JHE'  => __( 'Jhenaidah', 'woocommerce' ),
-	'JOY'  => __( 'Joypurhat', 'woocommerce' ),
-	'KHA'  => __( 'Khagrachhari', 'woocommerce' ),
-	'KHU'  => __( 'Khulna', 'woocommerce' ),
-	'KIS'  => __( 'Kishoreganj', 'woocommerce' ),
-	'KUR'  => __( 'Kurigram', 'woocommerce' ),
-	'KUS'  => __( 'Kushtia', 'woocommerce' ),
-	'LAK'  => __( 'Lakshmipur', 'woocommerce' ),
-	'LAL'  => __( 'Lalmonirhat', 'woocommerce' ),
-	'MAD'  => __( 'Madaripur', 'woocommerce' ),
-	'MAG'  => __( 'Magura', 'woocommerce' ),
-	'MAN'  => __( 'Manikganj ', 'woocommerce' ),
-	'MEH'  => __( 'Meherpur', 'woocommerce' ),
-	'MOU'  => __( 'Moulvibazar', 'woocommerce' ),
-	'MUN'  => __( 'Munshiganj', 'woocommerce' ),
-	'MYM'  => __( 'Mymensingh', 'woocommerce' ),
-	'NAO'  => __( 'Naogaon', 'woocommerce' ),
-	'NAR'  => __( 'Narail', 'woocommerce' ),
-	'NARG' => __( 'Narayanganj', 'woocommerce' ),
-	'NARD' => __( 'Narsingdi', 'woocommerce' ),
-	'NAT'  => __( 'Natore', 'woocommerce' ),
-	'NAW'  => __( 'Nawabganj', 'woocommerce' ),
-	'NET'  => __( 'Netrakona', 'woocommerce' ),
-	'NIL'  => __( 'Nilphamari', 'woocommerce' ),
-	'NOA'  => __( 'Noakhali', 'woocommerce' ),
-	'PAB'  => __( 'Pabna', 'woocommerce' ),
-	'PAN'  => __( 'Panchagarh', 'woocommerce' ),
-	'PAT'  => __( 'Patuakhali', 'woocommerce' ),
-	'PIR'  => __( 'Pirojpur', 'woocommerce' ),
-	'RAJB' => __( 'Rajbari', 'woocommerce' ),
-	'RAJ'  => __( 'Rajshahi', 'woocommerce' ),
-	'RAN'  => __( 'Rangamati', 'woocommerce' ),
-	'RANP' => __( 'Rangpur', 'woocommerce' ),
-	'SAT'  => __( 'Satkhira', 'woocommerce' ),
-	'SHA'  => __( 'Shariatpur', 'woocommerce' ),
-	'SHE'  => __( 'Sherpur', 'woocommerce' ),
-	'SIR'  => __( 'Sirajganj', 'woocommerce' ),
-	'SUN'  => __( 'Sunamganj', 'woocommerce' ),
-	'SYL'  => __( 'Sylhet', 'woocommerce' ),
-	'TAN'  => __( 'Tangail', 'woocommerce' ),
-	'THA'  => __( 'Thakurgaon', 'woocommerce' ),
+	'BD-05' => __( 'Bagerhat', 'woocommerce' ),
+	'BD-01' => __( 'Bandarban', 'woocommerce' ),
+	'BD-02' => __( 'Barguna', 'woocommerce' ),
+	'BD-06' => __( 'Barishal', 'woocommerce' ),
+	'BD-07' => __( 'Bhola', 'woocommerce' ),
+	'BD-03' => __( 'Bogura', 'woocommerce' ),
+	'BD-04' => __( 'Brahmanbaria', 'woocommerce' ),
+	'BD-09' => __( 'Chandpur', 'woocommerce' ),
+	'BD-10' => __( 'Chattogram', 'woocommerce' ),
+	'BD-12' => __( 'Chuadanga', 'woocommerce' ),
+	'BD-11' => __( "Cox's Bazar", 'woocommerce' ),
+	'BD-08' => __( 'Cumilla', 'woocommerce' ),
+	'BD-13' => __( 'Dhaka', 'woocommerce' ),
+	'BD-14' => __( 'Dinajpur', 'woocommerce' ),
+	'BD-15' => __( 'Faridpur ', 'woocommerce' ),
+	'BD-16' => __( 'Feni', 'woocommerce' ),
+	'BD-19' => __( 'Gaibandha', 'woocommerce' ),
+	'BD-18' => __( 'Gazipur', 'woocommerce' ),
+	'BD-17' => __( 'Gopalganj', 'woocommerce' ),
+	'BD-20' => __( 'Habiganj', 'woocommerce' ),
+	'BD-21' => __( 'Jamalpur', 'woocommerce' ),
+	'BD-22' => __( 'Jashore', 'woocommerce' ),
+	'BD-25' => __( 'Jhalokati', 'woocommerce' ),
+	'BD-23' => __( 'Jhenaidah', 'woocommerce' ),
+	'BD-24' => __( 'Joypurhat', 'woocommerce' ),
+	'BD-29' => __( 'Khagrachhari', 'woocommerce' ),
+	'BD-27' => __( 'Khulna', 'woocommerce' ),
+	'BD-26' => __( 'Kishoreganj', 'woocommerce' ),
+	'BD-28' => __( 'Kurigram', 'woocommerce' ),
+	'BD-30' => __( 'Kushtia', 'woocommerce' ),
+	'BD-31' => __( 'Lakshmipur', 'woocommerce' ),
+	'BD-32' => __( 'Lalmonirhat', 'woocommerce' ),
+	'BD-36' => __( 'Madaripur', 'woocommerce' ),
+	'BD-37' => __( 'Magura', 'woocommerce' ),
+	'BD-33' => __( 'Manikganj ', 'woocommerce' ),
+	'BD-39' => __( 'Meherpur', 'woocommerce' ),
+	'BD-38' => __( 'Moulvibazar', 'woocommerce' ),
+	'BD-35' => __( 'Munshiganj', 'woocommerce' ),
+	'BD-34' => __( 'Mymensingh', 'woocommerce' ),
+	'BD-48' => __( 'Naogaon', 'woocommerce' ),
+	'BD-43' => __( 'Narail', 'woocommerce' ),
+	'BD-40' => __( 'Narayanganj', 'woocommerce' ),
+	'BD-42' => __( 'Narsingdi', 'woocommerce' ),
+	'BD-44' => __( 'Natore', 'woocommerce' ),
+	'BD-45' => __( 'Nawabganj', 'woocommerce' ),
+	'BD-41' => __( 'Netrakona', 'woocommerce' ),
+	'BD-46' => __( 'Nilphamari', 'woocommerce' ),
+	'BD-47' => __( 'Noakhali', 'woocommerce' ),
+	'BD-49' => __( 'Pabna', 'woocommerce' ),
+	'BD-52' => __( 'Panchagarh', 'woocommerce' ),
+	'BD-51' => __( 'Patuakhali', 'woocommerce' ),
+	'BD-50' => __( 'Pirojpur', 'woocommerce' ),
+	'BD-53' => __( 'Rajbari', 'woocommerce' ),
+	'BD-54' => __( 'Rajshahi', 'woocommerce' ),
+	'BD-56' => __( 'Rangamati', 'woocommerce' ),
+	'BD-55' => __( 'Rangpur', 'woocommerce' ),
+	'BD-58' => __( 'Satkhira', 'woocommerce' ),
+	'BD-62' => __( 'Shariatpur', 'woocommerce' ),
+	'BD-57' => __( 'Sherpur', 'woocommerce' ),
+	'BD-59' => __( 'Sirajganj', 'woocommerce' ),
+	'BD-61' => __( 'Sunamganj', 'woocommerce' ),
+	'BD-60' => __( 'Sylhet', 'woocommerce' ),
+	'BD-63' => __( 'Tangail', 'woocommerce' ),
+	'BD-64' => __( 'Thakurgaon', 'woocommerce' ),
 );

i18n/states/LR.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Liberia provinces
+ *
+ * @package WooCommerce/i18n
+ * @version 3.0.0
+ */
+
+global $states;
+
+defined( 'ABSPATH' ) || exit;
+
+$states['LR'] = array(
+	'BM' => __( 'Bomi', 'woocommerce' ),
+	'BN' => __( 'Bong', 'woocommerce' ),
+	'GA' => __( 'Gbarpolu', 'woocommerce' ),
+	'GB' => __( 'Grand Bassa', 'woocommerce' ),
+	'GC' => __( 'Grand Cape Mount', 'woocommerce' ),
+	'GG' => __( 'Grand Gedeh', 'woocommerce' ),
+	'GK' => __( 'Grand Kru', 'woocommerce' ),
+	'LO' => __( 'Lofa ', 'woocommerce' ),
+	'MA' => __( 'Margibi', 'woocommerce' ),
+	'MY' => __( 'Maryland', 'woocommerce' ),
+	'MO' => __( 'Montserrado', 'woocommerce' ),
+	'NM' => __( 'Nimba', 'woocommerce' ),
+	'RV' => __( 'Rivercess', 'woocommerce' ),
+	'RG' => __( 'River Gee', 'woocommerce' ),
+	'SN' => __( 'Sinoe', 'woocommerce' ),
+);

includes/abstracts/abstract-wc-order.php

@@ -706,7 +706,7 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
 	 * Return an array of items/products within this order.
 	 *
 	 * @param string|array $types Types of line items to get (array or string).
-	 * @return Array of WC_Order_item
+	 * @return WC_Order_Item[]
 	 */
 	public function get_items( $types = 'line_item' ) {
 		$items = array();
@@ -730,7 +730,7 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
 	/**
 	 * Return an array of fees within this order.
 	 *
-	 * @return array
+	 * @return WC_Order_item_Fee[]
 	 */
 	public function get_fees() {
 		return $this->get_items( 'fee' );
@@ -739,7 +739,7 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
 	/**
 	 * Return an array of taxes within this order.
 	 *
-	 * @return array
+	 * @return WC_Order_Item_Tax[]
 	 */
 	public function get_taxes() {
 		return $this->get_items( 'tax' );
@@ -748,7 +748,7 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
 	/**
 	 * Return an array of shipping costs within this order.
 	 *
-	 * @return array
+	 * @return WC_Order_Item_Shipping[]
 	 */
 	public function get_shipping_methods() {
 		return $this->get_items( 'shipping' );
@@ -788,7 +788,7 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
 	 * Gets the count of order items of a certain type.
 	 *
 	 * @param string $item_type Item type to lookup.
-	 * @return string
+	 * @return int|string
 	 */
 	public function get_item_count( $item_type = '' ) {
 		$items = $this->get_items( empty( $item_type ) ? 'line_item' : $item_type );
@@ -1062,7 +1062,7 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
 	}
 
 	/**
-	 * After applying coupons via the WC_Disounts class, update line items.
+	 * After applying coupons via the WC_Discounts class, update line items.
 	 *
 	 * @since 3.2.0
 	 * @param WC_Discounts $discounts Discounts class.
@@ -1087,7 +1087,7 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
 	}
 
 	/**
-	 * After applying coupons via the WC_Disounts class, update or create coupon items.
+	 * After applying coupons via the WC_Discounts class, update or create coupon items.
 	 *
 	 * @since 3.2.0
 	 * @param WC_Discounts $discounts Discounts class.

includes/abstracts/abstract-wc-payment-gateway.php

@@ -178,7 +178,9 @@ abstract class WC_Payment_Gateway extends WC_Settings_API {
 	 * Output the gateway settings screen.
 	 */
 	public function admin_options() {
-		echo '<h2>' . esc_html( $this->get_method_title() ) . '</h2>';
+		echo '<h2>' . esc_html( $this->get_method_title() );
+		wc_back_link( __( 'Return to payments', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=checkout' ) );
+		echo '</h2>';
 		echo wp_kses_post( wpautop( $this->get_method_description() ) );
 		parent::admin_options();
 	}
@@ -191,6 +193,19 @@ abstract class WC_Payment_Gateway extends WC_Settings_API {
 		$this->enabled  = ! empty( $this->settings['enabled'] ) && 'yes' === $this->settings['enabled'] ? 'yes' : 'no';
 	}
 
+	/**
+	 * Return whether or not this gateway still requires setup to function.
+	 *
+	 * When this gateway is toggled on via AJAX, if this returns true a
+	 * redirect will occur to the settings page instead.
+	 *
+	 * @since 3.4.0
+	 * @return bool
+	 */
+	public function needs_setup() {
+		return false;
+	}
+
 	/**
 	 * Get the return url (thank you page).
 	 *

includes/abstracts/abstract-wc-privacy.php

@@ -0,0 +1,140 @@
+<?php
+/**
+ * WooCommerce abstract privacy class.
+ *
+ * @since 3.4.0
+ * @package WooCommerce/Abstracts
+ */
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Abstract class that is intended to be extended by
+ * specific privacy class. It handles the display
+ * of the privacy message of the privacy id to the admin,
+ * privacy data to be exported and privacy data to be deleted.
+ *
+ * @version  3.4.0
+ * @package  WooCommerce/Abstracts
+ */
+abstract class WC_Abstract_Privacy {
+	/**
+	 * This is the name of this object type.
+	 *
+	 * @var string
+	 */
+	public $name;
+
+	/**
+	 * This is a list of exporters.
+	 *
+	 * @var array
+	 */
+	protected $exporters = array();
+
+	/**
+	 * This is a list of erasers.
+	 *
+	 * @var array
+	 */
+	protected $erasers = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $name Plugin identifier.
+	 */
+	public function __construct( $name = '' ) {
+		$this->name = $name;
+		$this->init();
+	}
+
+	/**
+	 * Hook in events.
+	 */
+	protected function init() {
+		add_action( 'admin_init', array( $this, 'add_privacy_message' ) );
+		// We set priority to 5 to help WooCommerce's findings appear before those from extensions in exported items.
+		add_filter( 'wp_privacy_personal_data_exporters', array( $this, 'register_exporters' ), 5 );
+		add_filter( 'wp_privacy_personal_data_erasers', array( $this, 'register_erasers' ) );
+	}
+
+	/**
+	 * Adds the privacy message on WC privacy page.
+	 */
+	public function add_privacy_message() {
+		if ( function_exists( 'wp_add_privacy_policy_content' ) ) {
+			$content = $this->get_privacy_message();
+
+			if ( $content ) {
+				wp_add_privacy_policy_content( $this->name, $this->get_privacy_message() );
+			}
+		}
+	}
+
+	/**
+	 * Gets the message of the privacy to display.
+	 * To be overloaded by the implementor.
+	 *
+	 * @return string
+	 */
+	public function get_privacy_message() {
+		return '';
+	}
+
+	/**
+	 * Integrate this exporter implementation within the WordPress core exporters.
+	 *
+	 * @param array $exporters List of exporter callbacks.
+	 * @return array
+	 */
+	public function register_exporters( $exporters = array() ) {
+		foreach ( $this->exporters as $id => $exporter ) {
+			$exporters[ $id ] = $exporter;
+		}
+		return $exporters;
+	}
+
+	/**
+	 * Integrate this eraser implementation within the WordPress core erasers.
+	 *
+	 * @param array $erasers List of eraser callbacks.
+	 * @return array
+	 */
+	public function register_erasers( $erasers = array() ) {
+		foreach ( $this->erasers as $id => $eraser ) {
+			$erasers[ $id ] = $eraser;
+		}
+		return $erasers;
+	}
+
+	/**
+	 * Add exporter to list of exporters.
+	 *
+	 * @param string $id       ID of the Exporter.
+	 * @param string $name     Exporter name.
+	 * @param string $callback Exporter callback.
+	 */
+	public function add_exporter( $id, $name, $callback ) {
+		$this->exporters[ $id ] = array(
+			'exporter_friendly_name' => $name,
+			'callback'               => $callback,
+		);
+		return $this->exporters;
+	}
+
+	/**
+	 * Add eraser to list of erasers.
+	 *
+	 * @param string $id       ID of the Eraser.
+	 * @param string $name     Exporter name.
+	 * @param string $callback Exporter callback.
+	 */
+	public function add_eraser( $id, $name, $callback ) {
+		$this->erasers[ $id ] = array(
+			'eraser_friendly_name' => $name,
+			'callback'             => $callback,
+		);
+		return $this->erasers;
+	}
+}

includes/abstracts/abstract-wc-rest-terms-controller.php

@@ -380,20 +380,11 @@ abstract class WC_REST_Terms_Controller extends WC_REST_Controller {
 		if ( isset( $request['slug'] ) ) {
 			$args['slug'] = $request['slug'];
 		}
-
 		if ( isset( $request['parent'] ) ) {
 			if ( ! is_taxonomy_hierarchical( $taxonomy ) ) {
 				return new WP_Error( 'woocommerce_rest_taxonomy_not_hierarchical', __( 'Can not set resource parent, taxonomy is not hierarchical.', 'woocommerce' ), array( 'status' => 400 ) );
 			}
-
-			$parent = get_term( (int) $request['parent'], $taxonomy );
-
-			// If is null or WP_Error is invalid parent term.
-			if ( ! $parent || is_wp_error( $parent ) ) {
-				return new WP_Error( 'woocommerce_rest_term_invalid', __( 'Parent resource does not exist.', 'woocommerce' ), array( 'status' => 404 ) );
-			}
-
-			$args['parent'] = $parent->term_id;
+			$args['parent'] = $request['parent'];
 		}
 
 		$term = wp_insert_term( $name, $taxonomy, $args );
@@ -486,25 +477,11 @@ abstract class WC_REST_Terms_Controller extends WC_REST_Controller {
 		if ( isset( $request['slug'] ) ) {
 			$prepared_args['slug'] = $request['slug'];
 		}
-
 		if ( isset( $request['parent'] ) ) {
 			if ( ! is_taxonomy_hierarchical( $taxonomy ) ) {
 				return new WP_Error( 'woocommerce_rest_taxonomy_not_hierarchical', __( 'Can not set resource parent, taxonomy is not hierarchical.', 'woocommerce' ), array( 'status' => 400 ) );
 			}
-
-			$parent_id = (int) $request['parent'];
-
-			if ( 0 === $parent_id ) {
-				$prepared_args['parent'] = $parent_id;
-			} else {
-				$parent = get_term( $parent_id, $taxonomy );
-
-				if ( ! $parent ) {
-					return new WP_Error( 'woocommerce_rest_term_invalid', __( 'Parent resource does not exist.', 'woocommerce' ), array( 'status' => 400 ) );
-				}
-
-				$prepared_args['parent'] = $parent->term_id;
-			}
+			$prepared_args['parent'] = $request['parent'];
 		}
 
 		// Only update the term if we haz something to update.

includes/abstracts/abstract-wc-settings-api.php

@@ -177,6 +177,24 @@ abstract class WC_Settings_API {
 		return $_POST; // WPCS: CSRF ok, input var ok.
 	}
 
+	/**
+	 * Update a single option.
+	 *
+	 * @since 3.4.0
+	 * @param string $key Option key.
+	 * @param mixed  $value Value to set.
+	 * @return bool was anything saved?
+	 */
+	public function update_option( $key, $value = '' ) {
+		if ( empty( $this->settings ) ) {
+			$this->init_settings();
+		}
+
+		$this->settings[ $key ] = $value;
+
+		return update_option( $this->get_option_key(), apply_filters( 'woocommerce_settings_api_sanitized_fields_' . $this->id, $this->settings ), 'yes' );
+	}
+
 	/**
 	 * Processes and saves options.
 	 * If there is an error thrown, will continue to save and validate fields, but will leave the erroring field out.
@@ -198,7 +216,7 @@ abstract class WC_Settings_API {
 			}
 		}
 
-		return update_option( $this->get_option_key(), apply_filters( 'woocommerce_settings_api_sanitized_fields_' . $this->id, $this->settings ) );
+		return update_option( $this->get_option_key(), apply_filters( 'woocommerce_settings_api_sanitized_fields_' . $this->id, $this->settings ), 'yes' );
 	}
 
 	/**
@@ -405,8 +423,7 @@ abstract class WC_Settings_API {
 		?>
 		<tr valign="top">
 			<th scope="row" class="titledesc">
-				<?php echo $this->get_tooltip_html( $data ); // WPCS: XSS ok. ?>
-				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
+				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?> <?php echo $this->get_tooltip_html( $data ); // WPCS: XSS ok. ?></label>
 			</th>
 			<td class="forminp">
 				<fieldset>
@@ -449,8 +466,7 @@ abstract class WC_Settings_API {
 		?>
 		<tr valign="top">
 			<th scope="row" class="titledesc">
-				<?php echo $this->get_tooltip_html( $data ); // WPCS: XSS ok. ?>
-				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
+				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?> <?php echo $this->get_tooltip_html( $data ); // WPCS: XSS ok. ?></label>
 			</th>
 			<td class="forminp">
 				<fieldset>
@@ -493,8 +509,7 @@ abstract class WC_Settings_API {
 		?>
 		<tr valign="top">
 			<th scope="row" class="titledesc">
-				<?php echo $this->get_tooltip_html( $data ); // WPCS: XSS ok. ?>
-				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
+				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?> <?php echo $this->get_tooltip_html( $data ); // WPCS: XSS ok. ?></label>
 			</th>
 			<td class="forminp">
 				<fieldset>
@@ -549,13 +564,12 @@ abstract class WC_Settings_API {
 		?>
 		<tr valign="top">
 			<th scope="row" class="titledesc">
-				<?php echo $this->get_tooltip_html( $data ); // WPCS: XSS ok. ?>
-				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
+				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?> <?php echo $this->get_tooltip_html( $data ); // WPCS: XSS ok. ?></label>
 			</th>
 			<td class="forminp">
 				<fieldset>
 					<legend class="screen-reader-text"><span><?php echo wp_kses_post( $data['title'] ); ?></span></legend>
-					<span class="colorpickpreview" style="background:<?php echo esc_attr( $this->get_option( $key ) ); ?>;"></span>
+					<span class="colorpickpreview" style="background:<?php echo esc_attr( $this->get_option( $key ) ); ?>;">&nbsp;</span>
 					<input class="colorpick <?php echo esc_attr( $data['class'] ); ?>" type="text" name="<?php echo esc_attr( $field_key ); ?>" id="<?php echo esc_attr( $field_key ); ?>" style="<?php echo esc_attr( $data['css'] ); ?>" value="<?php echo esc_attr( $this->get_option( $key ) ); ?>" placeholder="<?php echo esc_attr( $data['placeholder'] ); ?>" <?php disabled( $data['disabled'], true ); ?> <?php echo $this->get_custom_attribute_html( $data ); // WPCS: XSS ok. ?> />
 					<div id="colorPickerDiv_<?php echo esc_attr( $field_key ); ?>" class="colorpickdiv" style="z-index: 100; background: #eee; border: 1px solid #ccc; position: absolute; display: none;"></div>
 					<?php echo $this->get_description_html( $data ); // WPCS: XSS ok. ?>
@@ -595,8 +609,7 @@ abstract class WC_Settings_API {
 		?>
 		<tr valign="top">
 			<th scope="row" class="titledesc">
-				<?php echo $this->get_tooltip_html( $data ); // WPCS: XSS ok. ?>
-				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
+				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?> <?php echo $this->get_tooltip_html( $data ); // WPCS: XSS ok. ?></label>
 			</th>
 			<td class="forminp">
 				<fieldset>
@@ -643,8 +656,7 @@ abstract class WC_Settings_API {
 		?>
 		<tr valign="top">
 			<th scope="row" class="titledesc">
-				<?php echo $this->get_tooltip_html( $data ); // WPCS: XSS ok. ?>
-				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
+				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?> <?php echo $this->get_tooltip_html( $data ); // WPCS: XSS ok. ?></label>
 			</th>
 			<td class="forminp">
 				<fieldset>
@@ -689,8 +701,7 @@ abstract class WC_Settings_API {
 		?>
 		<tr valign="top">
 			<th scope="row" class="titledesc">
-				<?php echo $this->get_tooltip_html( $data ); // WPCS: XSS ok. ?>
-				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
+				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?> <?php echo $this->get_tooltip_html( $data ); // WPCS: XSS ok. ?></label>
 			</th>
 			<td class="forminp">
 				<fieldset>
@@ -740,8 +751,7 @@ abstract class WC_Settings_API {
 		?>
 		<tr valign="top">
 			<th scope="row" class="titledesc">
-				<?php echo $this->get_tooltip_html( $data ); // WPCS: XSS ok. ?>
-				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?></label>
+				<label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?> <?php echo $this->get_tooltip_html( $data ); // WPCS: XSS ok. ?></label>
 			</th>
 			<td class="forminp">
 				<fieldset>

includes/abstracts/class-wc-background-process.php

@@ -162,7 +162,7 @@ abstract class WC_Background_Process extends WP_Background_Process {
 		$interval = apply_filters( $this->identifier . '_cron_interval', 5 );
 
 		if ( property_exists( $this, 'cron_interval' ) ) {
-			$interval = apply_filters( $this->identifier . '_cron_interval', $this->cron_interval_identifier );
+			$interval = apply_filters( $this->identifier . '_cron_interval', $this->cron_interval );
 		}
 
 		// Adds every 5 minutes to the existing schedules.

includes/admin/class-wc-admin-api-keys-table-list.php

@@ -70,7 +70,7 @@ class WC_Admin_API_Keys_Table_List extends WP_List_Table {
 	 * @return string
 	 */
 	public function column_title( $key ) {
-		$url = admin_url( 'admin.php?page=wc-settings&tab=api&section=keys&edit-key=' . $key['key_id'] );
+		$url = admin_url( 'admin.php?page=wc-settings&tab=advanced&section=keys&edit-key=' . $key['key_id'] );
 
 		$output  = '<strong>';
 		$output .= '<a href="' . esc_url( $url ) . '" class="row-title">';
@@ -92,7 +92,7 @@ class WC_Admin_API_Keys_Table_List extends WP_List_Table {
 					add_query_arg(
 						array(
 							'revoke-key' => $key['key_id'],
-						), admin_url( 'admin.php?page=wc-settings&tab=api&section=keys' )
+						), admin_url( 'admin.php?page=wc-settings&tab=advanced&section=keys' )
 					), 'revoke'
 				)
 			) . '">' . esc_html__( 'Revoke', 'woocommerce' ) . '</a>',

includes/admin/class-wc-admin-api-keys.php

@@ -27,7 +27,7 @@ class WC_Admin_API_Keys {
 	 * @return bool
 	 */
 	private function is_api_keys_settings_page() {
-		return isset( $_GET['page'], $_GET['tab'], $_GET['section'] ) && 'wc-settings' === $_GET['page'] && 'api' === $_GET['tab'] && 'keys' === $_GET['section']; // WPCS: input var okay, CSRF ok.
+		return isset( $_GET['page'], $_GET['tab'], $_GET['section'] ) && 'wc-settings' === $_GET['page'] && 'advanced' === $_GET['tab'] && 'keys' === $_GET['section']; // WPCS: input var okay, CSRF ok.
 	}
 
 	/**
@@ -72,7 +72,7 @@ class WC_Admin_API_Keys {
 	private static function table_list_output() {
 		global $wpdb, $keys_table_list;
 
-		echo '<h2>' . esc_html__( 'Keys/Apps', 'woocommerce' ) . ' <a href="' . esc_url( admin_url( 'admin.php?page=wc-settings&tab=api&section=keys&create-key=1' ) ) . '" class="add-new-h2">' . esc_html__( 'Add key', 'woocommerce' ) . '</a></h2>';
+		echo '<h2>' . esc_html__( 'REST API', 'woocommerce' ) . ' <a href="' . esc_url( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=keys&create-key=1' ) ) . '" class="add-new-h2">' . esc_html__( 'Add key', 'woocommerce' ) . '</a></h2>';
 
 		// Get the API keys count.
 		$count = $wpdb->get_var( "SELECT COUNT(key_id) FROM {$wpdb->prefix}woocommerce_api_keys WHERE 1 = 1;" );
@@ -91,7 +91,7 @@ class WC_Admin_API_Keys {
 			echo '<div class="woocommerce-BlankState woocommerce-BlankState--api">';
 			?>
 			<h2 class="woocommerce-BlankState-message"><?php esc_html_e( 'The WooCommerce REST API allows external apps to view and manage store data. Access is granted only to those with valid API keys.', 'woocommerce' ); ?></h2>
-			<a class="woocommerce-BlankState-cta button-primary button" href="<?php echo esc_url( admin_url( 'admin.php?page=wc-settings&tab=api&section=keys&create-key=1' ) ); ?>"><?php esc_html_e( 'Create an API key', 'woocommerce' ); ?></a>
+			<a class="woocommerce-BlankState-cta button-primary button" href="<?php echo esc_url( admin_url( 'admin.php?page=wc-settings&tab=advanced&section=keys&create-key=1' ) ); ?>"><?php esc_html_e( 'Create an API key', 'woocommerce' ); ?></a>
 			<style type="text/css">#posts-filter .wp-list-table, #posts-filter .tablenav.top, .tablenav.bottom .actions { display: none; }</style>
 			<?php
 		}
@@ -175,7 +175,7 @@ class WC_Admin_API_Keys {
 			}
 		}
 
-		wp_redirect( esc_url_raw( add_query_arg( array( 'revoked' => 1 ), admin_url( 'admin.php?page=wc-settings&tab=api&section=keys' ) ) ) );
+		wp_redirect( esc_url_raw( add_query_arg( array( 'revoked' => 1 ), admin_url( 'admin.php?page=wc-settings&tab=advanced&section=keys' ) ) ) );
 		exit();
 	}
 

includes/admin/class-wc-admin-assets.php

@@ -31,13 +31,13 @@ if ( ! class_exists( 'WC_Admin_Assets', false ) ) :
 		public function admin_styles() {
 			global $wp_scripts;
 
-			$screen         = get_current_screen();
-			$screen_id      = $screen ? $screen->id : '';
+			$screen    = get_current_screen();
+			$screen_id = $screen ? $screen->id: '';
 
 			// Register admin styles.
 			wp_register_style( 'woocommerce_admin_menu_styles', WC()->plugin_url() . '/assets/css/menu.css', array(), WC_VERSION );
 			wp_register_style( 'woocommerce_admin_styles', WC()->plugin_url() . '/assets/css/admin.css', array(), WC_VERSION );
-			wp_register_style( 'jquery-ui-style', WC()->plugin_url() . '/assets/css/jquery-ui.min.css', array(), WC_VERSION );
+			wp_register_style( 'jquery-ui-style', WC()->plugin_url() . '/assets/css/jquery-ui/jquery-ui.min.css', array(), WC_VERSION );
 			wp_register_style( 'woocommerce_admin_dashboard_styles', WC()->plugin_url() . '/assets/css/dashboard.css', array(), WC_VERSION );
 			wp_register_style( 'woocommerce_admin_print_reports_styles', WC()->plugin_url() . '/assets/css/reports-print.css', array(), WC_VERSION, 'print' );
 
@@ -169,10 +169,14 @@ if ( ! class_exists( 'WC_Admin_Assets', false ) ) :
 					'i18_delete_product_notice'        => __( 'This product has produced sales and may be linked to existing orders. Are you sure you want to delete it?', 'woocommerce' ),
 					'decimal_point'                    => $decimal,
 					'mon_decimal_point'                => wc_get_price_decimal_separator(),
+					'ajax_url'                         => admin_url( 'admin-ajax.php' ),
 					'strings'                          => array(
 						'import_products' => __( 'Import', 'woocommerce' ),
 						'export_products' => __( 'Export', 'woocommerce' ),
 					),
+					'nonces'                           => array(
+						'gateway_toggle' => wp_create_nonce( 'woocommerce-toggle-payment-gateway-enabled' ),
+					),
 					'urls'                             => array(
 						'import_products' => current_user_can( 'import' ) ? esc_url_raw( admin_url( 'edit.php?post_type=product&page=product_importer' ) ) : null,
 						'export_products' => current_user_can( 'export' ) ? esc_url_raw( admin_url( 'edit.php?post_type=product&page=product_exporter' ) ) : null,

includes/admin/class-wc-admin-attributes.php

@@ -2,17 +2,13 @@
 /**
  * Attributes Page
  *
- * The attributes section lets users add custom attributes to assign to products - they can also be used in the layered nav widget.
+ * The attributes section lets users add custom attributes to assign to products - they can also be used in the "Filter Products by Attribute" widget.
  *
- * @author      WooThemes
- * @category    Admin
- * @package     WooCommerce/Admin
- * @version     2.3.0
+ * @package WooCommerce/Admin
+ * @version 2.3.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
-}
+defined( 'ABSPATH' ) || exit;
 
 /**
  * WC_Admin_Attributes Class.

includes/admin/class-wc-admin-help.php

@@ -77,8 +77,8 @@ class WC_Admin_Help {
 				'title'   => __( 'Education', 'woocommerce' ),
 				'content' =>
 					'<h2>' . __( 'Education', 'woocommerce' ) . '</h2>' .
-					'<p>' . __( 'If you would like to learn about using WooCommerce from an expert, consider following a WooCommerce course offered by one of our educational partners.', 'woocommerce' ) . '</p>' .
-					'<p><a href="https://woocommerce.com/educational-partners/?utm_source=helptab&utm_medium=product&utm_content=edupartners&utm_campaign=woocommerceplugin" class="button button-primary">' . __( 'View education partners', 'woocommerce' ) . '</a></p>',
+					'<p>' . __( 'If you would like to learn about using WooCommerce from an expert, consider a WooCommerce course to further your education.', 'woocommerce' ) . '</p>' .
+					'<p><a href="https://docs.woocommerce.com/document/further-education/?utm_source=helptab&utm_medium=product&utm_content=edupartners&utm_campaign=woocommerceplugin" class="button button-primary">' . __( 'Further education', 'woocommerce' ) . '</a></p>',
 			)
 		);
 
@@ -98,7 +98,7 @@ class WC_Admin_Help {
 			'<p><strong>' . __( 'For more information:', 'woocommerce' ) . '</strong></p>' .
 			'<p><a href="https://woocommerce.com/?utm_source=helptab&utm_medium=product&utm_content=about&utm_campaign=woocommerceplugin" target="_blank">' . __( 'About WooCommerce', 'woocommerce' ) . '</a></p>' .
 			'<p><a href="https://wordpress.org/plugins/woocommerce/" target="_blank">' . __( 'WordPress.org project', 'woocommerce' ) . '</a></p>' .
-			'<p><a href="https://github.com/woocommerce/woocommerce" target="_blank">' . __( 'Github project', 'woocommerce' ) . '</a></p>' .
+			'<p><a href="https://github.com/woocommerce/woocommerce/" target="_blank">' . __( 'Github project', 'woocommerce' ) . '</a></p>' .
 			'<p><a href="https://woocommerce.com/storefront/?utm_source=helptab&utm_medium=product&utm_content=wcthemes&utm_campaign=woocommerceplugin" target="_blank">' . __( 'Official theme', 'woocommerce' ) . '</a></p>' .
 			'<p><a href="https://woocommerce.com/product-category/woocommerce-extensions/?utm_source=helptab&utm_medium=product&utm_content=wcextensions&utm_campaign=woocommerceplugin" target="_blank">' . __( 'Official extensions', 'woocommerce' ) . '</a></p>'
 		);

includes/admin/class-wc-admin-importers.php

@@ -235,26 +235,34 @@ class WC_Admin_Importers {
 		update_user_option( get_current_user_id(), 'product_import_error_log', $error_log );
 
 		if ( 100 === $percent_complete ) {
-			// Clear temp meta.
-			$wpdb->delete( $wpdb->postmeta, array( 'meta_key' => '_original_id' ) ); // @codingStandardsIgnoreLine.
-			$wpdb->query(
-				"DELETE {$wpdb->posts}, {$wpdb->postmeta}, {$wpdb->term_relationships}
-				FROM {$wpdb->posts}
-				LEFT JOIN {$wpdb->term_relationships} ON ( {$wpdb->posts}.ID = {$wpdb->term_relationships}.object_id )
-				LEFT JOIN {$wpdb->postmeta} ON ( {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id )
-				LEFT JOIN {$wpdb->term_taxonomy} ON ( {$wpdb->term_taxonomy}.term_taxonomy_id = {$wpdb->term_relationships}.term_taxonomy_id )
-				LEFT JOIN {$wpdb->terms} ON ( {$wpdb->terms}.term_id = {$wpdb->term_taxonomy}.term_id )
-				WHERE {$wpdb->posts}.post_type IN ( 'product', 'product_variation' )
-				AND {$wpdb->posts}.post_status = 'importing'"
-			);
+			// @codingStandardsIgnoreStart.
+			$wpdb->delete( $wpdb->postmeta, array( 'meta_key' => '_original_id' ) );
+			$wpdb->delete( $wpdb->posts, array(
+				'post_type'   => 'product',
+				'post_status' => 'importing',
+			) );
+			$wpdb->delete( $wpdb->posts, array(
+				'post_type'   => 'product_variation',
+				'post_status' => 'importing',
+			) );
+			// @codingStandardsIgnoreEnd.
 
-			// Clear orphan variations.
-			$wpdb->query(
-				"DELETE products
-				FROM {$wpdb->posts} products
-				LEFT JOIN {$wpdb->posts} wp ON wp.ID = products.post_parent
-				WHERE wp.ID IS NULL AND products.post_type = 'product_variation';"
-			);
+			// Clean up orphaned data.
+			$wpdb->query( "
+				DELETE {$wpdb->posts}.* FROM {$wpdb->posts}
+				LEFT JOIN {$wpdb->posts} wp ON wp.ID = {$wpdb->posts}.post_parent
+				WHERE wp.ID IS NULL AND {$wpdb->posts}.post_type = 'product_variation'
+			" );
+			$wpdb->query( "
+				DELETE {$wpdb->postmeta}.* FROM {$wpdb->postmeta}
+				LEFT JOIN {$wpdb->posts} wp ON wp.ID = {$wpdb->postmeta}.post_id
+				WHERE wp.ID IS NULL
+			" );
+			$wpdb->query( "
+				DELETE {$wpdb->term_relationships}.* FROM {$wpdb->term_relationships}
+				LEFT JOIN {$wpdb->posts} wp ON wp.ID = {$wpdb->term_relationships}.object_id
+				WHERE wp.ID IS NULL
+			" );
 
 			// Send success.
 			wp_send_json_success(

includes/admin/class-wc-admin-log-table-list.php

@@ -151,13 +151,13 @@ class WC_Admin_Log_Table_List extends WP_List_Table {
 			'debug'     => __( 'Debug', 'woocommerce' ),
 		);
 
-		if ( isset( $levels[ $level_key ] ) ) {
-			$level       = $levels[ $level_key ];
-			$level_class = sanitize_html_class( 'log-level--' . $level_key );
-			return '<span class="log-level ' . $level_class . '">' . esc_html( $level ) . '</span>';
-		} else {
+		if ( ! isset( $levels[ $level_key ] ) ) {
 			return '';
 		}
+
+		$level       = $levels[ $level_key ];
+		$level_class = sanitize_html_class( 'log-level--' . $level_key );
+		return '<span class="log-level ' . $level_class . '">' . esc_html( $level ) . '</span>';
 	}
 
 	/**

includes/admin/class-wc-admin-menus.php

@@ -98,7 +98,9 @@ class WC_Admin_Menus {
 		$current_section = empty( $_REQUEST['section'] ) ? '' : sanitize_title( wp_unslash( $_REQUEST['section'] ) ); // WPCS: input var okay, CSRF ok.
 
 		// Save settings if data has been posted.
-		if ( apply_filters( '' !== $current_section ? "woocommerce_save_settings_{$current_tab}_{$current_section}" : "woocommerce_save_settings_{$current_tab}", ! empty( $_POST ) ) ) { // WPCS: input var okay, CSRF ok.
+		if ( '' !== $current_section && apply_filters( "woocommerce_save_settings_{$current_tab}_{$current_section}", ! empty( $_POST ) ) ) { // WPCS: input var okay, CSRF ok.
+			WC_Admin_Settings::save();
+		} elseif ( apply_filters( "woocommerce_save_settings_{$current_tab}", ! empty( $_POST ) ) ) { // WPCS: input var okay, CSRF ok.
 			WC_Admin_Settings::save();
 		}
 

includes/admin/class-wc-admin-notices.php

@@ -2,15 +2,11 @@
 /**
  * Display notices in admin
  *
- * @author      WooThemes
- * @category    Admin
- * @package     WooCommerce/Admin
- * @version     2.3.0
+ * @package WooCommerce\Admin
+ * @version 3.4.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
-}
+defined( 'ABSPATH' ) || exit;
 
 /**
  * WC_Admin_Notices Class.
@@ -37,6 +33,7 @@ class WC_Admin_Notices {
 		'no_shipping_methods'     => 'no_shipping_methods_notice',
 		'simplify_commerce'       => 'simplify_commerce_notice',
 		'regenerating_thumbnails' => 'regenerating_thumbnails_notice',
+		'no_secure_connection'    => 'secure_connection_notice',
 	);
 
 	/**
@@ -84,18 +81,23 @@ class WC_Admin_Notices {
 	public static function reset_admin_notices() {
 		$simplify_options = get_option( 'woocommerce_simplify_commerce_settings', array() );
 		$location         = wc_get_base_location();
+		$shop_page        = 0 < wc_get_page_id( 'shop' ) ? get_permalink( wc_get_page_id( 'shop' ) ) : get_home_url();
 
-		if ( ! class_exists( 'WC_Gateway_Simplify_Commerce_Loader' ) && ! empty( $simplify_options['enabled'] ) && 'yes' === $simplify_options['enabled'] && in_array( $location['country'], apply_filters( 'woocommerce_gateway_simplify_commerce_supported_countries', array( 'US', 'IE' ) ) ) ) {
+		if ( ! class_exists( 'WC_Gateway_Simplify_Commerce_Loader' ) && ! empty( $simplify_options['enabled'] ) && 'yes' === $simplify_options['enabled'] && in_array( $location['country'], apply_filters( 'woocommerce_gateway_simplify_commerce_supported_countries', array( 'US', 'IE' ) ), true ) ) {
 			WC_Admin_Notices::add_notice( 'simplify_commerce' );
 		}
 
+		if ( ! is_ssl() || 'https' !== substr( $shop_page, 0, 5 ) ) {
+			WC_Admin_Notices::add_notice( 'no_secure_connection' );
+		}
+
 		self::add_notice( 'template_files' );
 	}
 
 	/**
 	 * Show a notice.
 	 *
-	 * @param string $name
+	 * @param string $name Notice name.
 	 */
 	public static function add_notice( $name ) {
 		self::$notices = array_unique( array_merge( self::get_notices(), array( $name ) ) );
@@ -104,7 +106,7 @@ class WC_Admin_Notices {
 	/**
 	 * Remove a notice from being displayed.
 	 *
-	 * @param  string $name
+	 * @param string $name Notice name.
 	 */
 	public static function remove_notice( $name ) {
 		self::$notices = array_diff( self::get_notices(), array( $name ) );
@@ -114,27 +116,27 @@ class WC_Admin_Notices {
 	/**
 	 * See if a notice is being shown.
 	 *
-	 * @param  string $name
+	 * @param  string $name Notice name.
 	 * @return boolean
 	 */
 	public static function has_notice( $name ) {
-		return in_array( $name, self::get_notices() );
+		return in_array( $name, self::get_notices(), true );
 	}
 
 	/**
 	 * Hide a notice if the GET variable is set.
 	 */
 	public static function hide_notices() {
-		if ( isset( $_GET['wc-hide-notice'] ) && isset( $_GET['_wc_notice_nonce'] ) ) {
-			if ( ! wp_verify_nonce( $_GET['_wc_notice_nonce'], 'woocommerce_hide_notices_nonce' ) ) {
-				wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) );
+		if ( isset( $_GET['wc-hide-notice'] ) && isset( $_GET['_wc_notice_nonce'] ) ) { // WPCS: input var ok, CSRF ok.
+			if ( ! wp_verify_nonce( sanitize_key( wp_unslash( $_GET['_wc_notice_nonce'] ) ), 'woocommerce_hide_notices_nonce' ) ) { // WPCS: input var ok, CSRF ok.
+				wp_die( esc_html__( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) );
 			}
 
 			if ( ! current_user_can( 'manage_woocommerce' ) ) {
-				wp_die( __( 'You don&#8217;t have permission to do this.', 'woocommerce' ) );
+				wp_die( esc_html__( 'You don&#8217;t have permission to do this.', 'woocommerce' ) );
 			}
 
-			$hide_notice = sanitize_text_field( $_GET['wc-hide-notice'] );
+			$hide_notice = sanitize_text_field( wp_unslash( $_GET['wc-hide-notice'] ) ); // WPCS: input var ok, CSRF ok.
 
 			self::remove_notice( $hide_notice );
 
@@ -150,18 +152,32 @@ class WC_Admin_Notices {
 	public static function add_notices() {
 		$notices = self::get_notices();
 
-		if ( ! empty( $notices ) ) {
-			wp_enqueue_style( 'woocommerce-activation', plugins_url( '/assets/css/activation.css', WC_PLUGIN_FILE ), array(), WC_VERSION );
+		if ( empty( $notices ) ) {
+			return;
+		}
 
-			// Add RTL support
-			wp_style_add_data( 'woocommerce-activation', 'rtl', 'replace' );
+		$screen          = get_current_screen();
+		$screen_id       = $screen ? $screen->id : '';
+		$show_on_screens = array(
+			'dashboard',
+			'plugins',
+		);
 
-			foreach ( $notices as $notice ) {
-				if ( ! empty( self::$core_notices[ $notice ] ) && apply_filters( 'woocommerce_show_admin_notice', true, $notice ) ) {
-					add_action( 'admin_notices', array( __CLASS__, self::$core_notices[ $notice ] ) );
-				} else {
-					add_action( 'admin_notices', array( __CLASS__, 'output_custom_notices' ) );
-				}
+		// Notices should only show on WooCommerce screens, the main dashboard, and on the plugins screen.
+		if ( ! in_array( $screen_id, wc_get_screen_ids(), true ) && ! in_array( $screen_id, $show_on_screens, true ) ) {
+			return;
+		}
+
+		wp_enqueue_style( 'woocommerce-activation', plugins_url( '/assets/css/activation.css', WC_PLUGIN_FILE ), array(), WC_VERSION );
+
+		// Add RTL support.
+		wp_style_add_data( 'woocommerce-activation', 'rtl', 'replace' );
+
+		foreach ( $notices as $notice ) {
+			if ( ! empty( self::$core_notices[ $notice ] ) && apply_filters( 'woocommerce_show_admin_notice', true, $notice ) ) {
+				add_action( 'admin_notices', array( __CLASS__, self::$core_notices[ $notice ] ) );
+			} else {
+				add_action( 'admin_notices', array( __CLASS__, 'output_custom_notices' ) );
 			}
 		}
 	}
@@ -169,8 +185,8 @@ class WC_Admin_Notices {
 	/**
 	 * Add a custom notice.
 	 *
-	 * @param string $name
-	 * @param string $notice_html
+	 * @param string $name        Notice name.
+	 * @param string $notice_html Notice HTML.
 	 */
 	public static function add_custom_notice( $name, $notice_html ) {
 		self::add_notice( $name );
@@ -189,7 +205,7 @@ class WC_Admin_Notices {
 					$notice_html = get_option( 'woocommerce_admin_notice_' . $notice );
 
 					if ( $notice_html ) {
-						include 'views/html-notice-custom.php';
+						include dirname( __FILE__ ) . '/views/html-notice-custom.php';
 					}
 				}
 			}
@@ -202,13 +218,13 @@ class WC_Admin_Notices {
 	public static function update_notice() {
 		if ( version_compare( get_option( 'woocommerce_db_version' ), WC_VERSION, '<' ) ) {
 			$updater = new WC_Background_Updater();
-			if ( $updater->is_updating() || ! empty( $_GET['do_update_woocommerce'] ) ) {
-				include 'views/html-notice-updating.php';
+			if ( $updater->is_updating() || ! empty( $_GET['do_update_woocommerce'] ) ) { // WPCS: input var ok, CSRF ok.
+				include dirname( __FILE__ ) . '/views/html-notice-updating.php';
 			} else {
-				include 'views/html-notice-update.php';
+				include dirname( __FILE__ ) . '/views/html-notice-update.php';
 			}
 		} else {
-			include 'views/html-notice-updated.php';
+			include dirname( __FILE__ ) . '/views/html-notice-updated.php';
 		}
 	}
 
@@ -216,7 +232,7 @@ class WC_Admin_Notices {
 	 * If we have just installed, show a message with the install pages button.
 	 */
 	public static function install_notice() {
-		include 'views/html-notice-install.php';
+		include dirname( __FILE__ ) . '/views/html-notice-install.php';
 	}
 
 	/**
@@ -228,7 +244,7 @@ class WC_Admin_Notices {
 		wc_deprecated_function( 'WC_Admin_Notices::theme_check_notice', '3.3.0' );
 
 		if ( ! current_theme_supports( 'woocommerce' ) ) {
-			include 'views/html-notice-theme-support.php';
+			include dirname( __FILE__ ) . '/views/html-notice-theme-support.php';
 		}
 	}
 
@@ -264,7 +280,7 @@ class WC_Admin_Notices {
 		}
 
 		if ( $outdated ) {
-			include 'views/html-notice-template-check.php';
+			include dirname( __FILE__ ) . '/views/html-notice-template-check.php';
 		} else {
 			self::remove_notice( 'template_files' );
 		}
@@ -285,7 +301,7 @@ class WC_Admin_Notices {
 		}
 
 		if ( $enabled ) {
-			include 'views/html-notice-legacy-shipping.php';
+			include dirname( __FILE__ ) . '/views/html-notice-legacy-shipping.php';
 		} else {
 			self::remove_notice( 'template_files' );
 		}
@@ -295,12 +311,12 @@ class WC_Admin_Notices {
 	 * No shipping methods.
 	 */
 	public static function no_shipping_methods_notice() {
-		if ( wc_shipping_enabled() && ( empty( $_GET['page'] ) || empty( $_GET['tab'] ) || 'wc-settings' !== $_GET['page'] || 'shipping' !== $_GET['tab'] ) ) {
+		if ( wc_shipping_enabled() && ( empty( $_GET['page'] ) || empty( $_GET['tab'] ) || 'wc-settings' !== $_GET['page'] || 'shipping' !== $_GET['tab'] ) ) { // WPCS: input var ok, CSRF ok.
 			$product_count = wp_count_posts( 'product' );
 			$method_count  = wc_get_shipping_method_count();
 
 			if ( $product_count->publish > 0 && 0 === $method_count ) {
-				include 'views/html-notice-no-shipping-methods.php';
+				include dirname( __FILE__ ) . '/views/html-notice-no-shipping-methods.php';
 			}
 
 			if ( $method_count > 0 ) {
@@ -315,12 +331,12 @@ class WC_Admin_Notices {
 	public static function simplify_commerce_notice() {
 		$location = wc_get_base_location();
 
-		if ( class_exists( 'WC_Gateway_Simplify_Commerce_Loader' ) || ! in_array( $location['country'], apply_filters( 'woocommerce_gateway_simplify_commerce_supported_countries', array( 'US', 'IE' ) ) ) ) {
+		if ( class_exists( 'WC_Gateway_Simplify_Commerce_Loader' ) || ! in_array( $location['country'], apply_filters( 'woocommerce_gateway_simplify_commerce_supported_countries', array( 'US', 'IE' ) ), true ) ) {
 			self::remove_notice( 'simplify_commerce' );
 			return;
 		}
-		if ( empty( $_GET['action'] ) ) {
-			include 'views/html-notice-simplify-commerce.php';
+		if ( empty( $_GET['action'] ) ) { // WPCS: input var ok, CSRF ok.
+			include dirname( __FILE__ ) . '/views/html-notice-simplify-commerce.php';
 		}
 	}
 
@@ -328,7 +344,18 @@ class WC_Admin_Notices {
 	 * Notice shown when regenerating thumbnails background process is running.
 	 */
 	public static function regenerating_thumbnails_notice() {
-		include 'views/html-notice-regenerating-thumbnails.php';
+		include dirname( __FILE__ ) . '/views/html-notice-regenerating-thumbnails.php';
+	}
+
+	/**
+	 * Notice about secure connection.
+	 */
+	public static function secure_connection_notice() {
+		if ( get_user_meta( get_current_user_id(), 'dismissed_no_secure_connection_notice', true ) ) {
+			return;
+		}
+
+		include dirname( __FILE__ ) . '/views/html-notice-secure-connection.php';
 	}
 }