Merge branch 'master' into pr/11797

# Conflicts:
#	includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php
#	includes/api/class-wc-rest-coupons-controller.php
#	includes/class-wc-coupon.php
#	tests/unit-tests/api/coupons.php
#	tests/unit-tests/coupon/crud.php

assets/js/frontend/cart.js

@@ -70,9 +70,10 @@ jQuery( function( $ ) {
 		// Error message collection
 		var $error = $( '.woocommerce-error', $html );
 		var $message = $( '.woocommerce-message', $html );
+		var $info = $( '.woocommerce-info', $html );
 
 		// Remove errors
-		$( '.woocommerce-error, .woocommerce-message' ).remove();
+		$( '.woocommerce-error, .woocommerce-message, .woocommerce-info' ).remove();
 
 		if ( $new_form.length === 0 ) {
 			// If the checkout is also displayed on this page, trigger reload instead.
@@ -88,9 +89,13 @@ jQuery( function( $ ) {
 			// Display errors
 			if ( $error.length > 0 ) {
 				show_notice( $error, $( '.cart-empty' ).closest( '.woocommerce' ) );
-			} else if ( $message.length > 0 ) {
+			}
+			if ( $message.length > 0 ) {
 				show_notice( $message, $( '.cart-empty' ).closest( '.woocommerce' ) );
 			}
+			if ( $info.length > 0 ) {
+				show_notice( $info, $( '.cart-empty' ).closest( '.woocommerce' ) );
+			}
 		} else {
 			// If the checkout is also displayed on this page, trigger update event.
 			if ( $( '.woocommerce-checkout' ).length ) {
@@ -102,9 +107,13 @@ jQuery( function( $ ) {
 
 			if ( $error.length > 0 ) {
 				show_notice( $error );
-			} else if ( $message.length > 0 ) {
+			}
+			if ( $message.length > 0 ) {
 				show_notice( $message );
 			}
+			if ( $info.length > 0 ) {
+				show_notice( $info );
+			}
 
 			update_cart_totals_div( $new_totals );
 		}
@@ -131,7 +140,7 @@ jQuery( function( $ ) {
 		if ( ! $target ) {
 			$target = $( '.shop_table.cart' ).closest( 'form' );
 		}
-		$( '.woocommerce-error, .woocommerce-message' ).remove();
+		$( '.woocommerce-error, .woocommerce-message, .woocommerce-info' ).remove();
 		$target.before( html_element );
 	};
 

includes/abstracts/abstract-wc-rest-shipping-zones-controller.php

@@ -105,4 +105,23 @@ public function update_items_permissions_check( $request ) {
 
 		return true;
 	}
+
+	/**
+	 * Check whether a given request has permission to delete Shipping Zones.
+	 *
+	 * @param  WP_REST_Request $request Full details about the request.
+	 * @return WP_Error|boolean
+	 */
+	public function delete_items_permissions_check( $request ) {
+		if ( ! wc_shipping_enabled() ) {
+			return new WP_Error( 'rest_no_route', __( 'Shipping is disabled.', 'woocommerce' ), array( 'status' => 404 ) );
+		}
+
+		if ( ! wc_rest_check_manager_permissions( 'settings', 'delete' ) ) {
+			return new WP_Error( 'woocommerce_rest_cannot_edit', __( 'Sorry, you are not allowed to delete this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
+		}
+
+		return true;
+	}
+
 }

includes/admin/class-wc-admin.php

@@ -206,7 +206,7 @@ public function preview_emails() {
 	 * @return string
 	 */
 	public function admin_footer_text( $footer_text ) {
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+		if ( ! current_user_can( 'manage_woocommerce' ) || ! function_exists( 'wc_get_screen_ids' ) ) {
 			return;
 		}
 		$current_screen = get_current_screen();