From 3caee4451d1f9d0a1a457f9203bab1a37d439856 Mon Sep 17 00:00:00 2001 From: Peter Fabian Date: Thu, 2 May 2019 21:20:08 +0200 Subject: [PATCH 1/4] Fixed PHPCS. --- includes/admin/class-wc-admin-settings.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/includes/admin/class-wc-admin-settings.php b/includes/admin/class-wc-admin-settings.php index a14070723a1..0f54675d3cd 100644 --- a/includes/admin/class-wc-admin-settings.php +++ b/includes/admin/class-wc-admin-settings.php @@ -135,7 +135,9 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) : wp_enqueue_script( 'woocommerce_settings', WC()->plugin_url() . '/assets/js/admin/settings' . $suffix . '.js', array( 'jquery', 'wp-util', 'jquery-ui-datepicker', 'jquery-ui-sortable', 'iris', 'selectWoo' ), WC()->version, true ); wp_localize_script( - 'woocommerce_settings', 'woocommerce_settings_params', array( + 'woocommerce_settings', + 'woocommerce_settings_params', + array( 'i18n_nav_warning' => __( 'The changes you made will be lost if you navigate away from this page.', 'woocommerce' ), 'i18n_moved_up' => __( 'Item moved up', 'woocommerce' ), 'i18n_moved_down' => __( 'Item moved down', 'woocommerce' ), @@ -391,7 +393,7 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) : selected( $option_value, (string) $key ); } - ?> + ?> > + ?> From e647e4143a655da919d26cf66492680bc42285e1 Mon Sep 17 00:00:00 2001 From: Peter Fabian Date: Thu, 2 May 2019 21:22:36 +0200 Subject: [PATCH 2/4] Fixed linter problem. --- assets/js/admin/settings.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/assets/js/admin/settings.js b/assets/js/admin/settings.js index 87212f1de43..5dcf2315772 100644 --- a/assets/js/admin/settings.js +++ b/assets/js/admin/settings.js @@ -161,9 +161,12 @@ lastRow = $( this ).find( 'tbody tr:last' ), firstRow = $( this ).find( 'tbody tr:first' ); - table.find( '.wc-item-reorder-nav .wc-move-disabled' ).removeClass( 'wc-move-disabled' ).attr( { 'tabindex': '0', 'aria-hidden': 'false' } ); - firstRow.find( '.wc-item-reorder-nav .wc-move-up' ).addClass( 'wc-move-disabled' ).attr( { 'tabindex': '-1', 'aria-hidden': 'true' } ); - lastRow.find( '.wc-item-reorder-nav .wc-move-down' ).addClass( 'wc-move-disabled' ).attr( { 'tabindex': '-1', 'aria-hidden': 'true' } ); + table.find( '.wc-item-reorder-nav .wc-move-disabled' ).removeClass( 'wc-move-disabled' ) + .attr( { 'tabindex': '0', 'aria-hidden': 'false' } ); + firstRow.find( '.wc-item-reorder-nav .wc-move-up' ).addClass( 'wc-move-disabled' ) + .attr( { 'tabindex': '-1', 'aria-hidden': 'true' } ); + lastRow.find( '.wc-item-reorder-nav .wc-move-down' ).addClass( 'wc-move-disabled' ) + .attr( { 'tabindex': '-1', 'aria-hidden': 'true' } ); } ); $( '.wc-item-reorder-nav').closest( 'table' ).trigger( 'updateMoveButtons' ); From 98edbd2f787221b85e26f39e5e06dd0c38c21f93 Mon Sep 17 00:00:00 2001 From: Peter Fabian Date: Thu, 2 May 2019 21:26:29 +0200 Subject: [PATCH 3/4] Added confirmation before saving an empty list of countries to sell to in general WC settings. --- assets/js/admin/settings.js | 11 +++++++++++ includes/admin/class-wc-admin-settings.php | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/assets/js/admin/settings.js b/assets/js/admin/settings.js index 5dcf2315772..19edb67a63f 100644 --- a/assets/js/admin/settings.js +++ b/assets/js/admin/settings.js @@ -171,5 +171,16 @@ $( '.wc-item-reorder-nav').closest( 'table' ).trigger( 'updateMoveButtons' ); + + $( '.submit button' ).on( 'click', function() { + if ( $( 'select#woocommerce_allowed_countries' ).val() === 'specific' + && ! $("[name='woocommerce_specific_allowed_countries[]']").val() ) { + if ( window.confirm( woocommerce_settings_params.i18n_no_specific_countries_selected ) ) { + return true; + }; + return false; + } + } ); + }); })( jQuery, woocommerce_settings_params, wp ); diff --git a/includes/admin/class-wc-admin-settings.php b/includes/admin/class-wc-admin-settings.php index 0f54675d3cd..ce024c298f0 100644 --- a/includes/admin/class-wc-admin-settings.php +++ b/includes/admin/class-wc-admin-settings.php @@ -138,9 +138,10 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) : 'woocommerce_settings', 'woocommerce_settings_params', array( - 'i18n_nav_warning' => __( 'The changes you made will be lost if you navigate away from this page.', 'woocommerce' ), - 'i18n_moved_up' => __( 'Item moved up', 'woocommerce' ), - 'i18n_moved_down' => __( 'Item moved down', 'woocommerce' ), + 'i18n_nav_warning' => __( 'The changes you made will be lost if you navigate away from this page.', 'woocommerce' ), + 'i18n_moved_up' => __( 'Item moved up', 'woocommerce' ), + 'i18n_moved_down' => __( 'Item moved down', 'woocommerce' ), + 'i18n_no_specific_countries_selected' => __( 'Selecting no country to sell to prevents from completing the checkout. Continue anyway?', 'woocommerce' ), ) ); From eba794022823376fea0ba901ef28f977f4f1fdee Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Thu, 2 May 2019 19:20:33 -0300 Subject: [PATCH 4/4] Fixed jshint errors --- assets/js/admin/settings.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/assets/js/admin/settings.js b/assets/js/admin/settings.js index 19edb67a63f..ad008ff08fc 100644 --- a/assets/js/admin/settings.js +++ b/assets/js/admin/settings.js @@ -173,11 +173,13 @@ $( '.submit button' ).on( 'click', function() { - if ( $( 'select#woocommerce_allowed_countries' ).val() === 'specific' - && ! $("[name='woocommerce_specific_allowed_countries[]']").val() ) { + if ( + $( 'select#woocommerce_allowed_countries' ).val() === 'specific' && + ! $( '[name="woocommerce_specific_allowed_countries[]"]' ).val() + ) { if ( window.confirm( woocommerce_settings_params.i18n_no_specific_countries_selected ) ) { return true; - }; + } return false; } } );