auto-patch 638-dev-dev01-2024-05-14T20_44_36
This commit is contained in:
@@ -5,6 +5,8 @@
|
||||
* @package WooCommerce\Admin
|
||||
*/
|
||||
|
||||
use Automattic\WooCommerce\Admin\Features\Features;
|
||||
|
||||
defined( 'ABSPATH' ) || exit;
|
||||
|
||||
/**
|
||||
@@ -41,7 +43,7 @@ class WC_Settings_Advanced extends WC_Settings_Page {
|
||||
'keys' => __( 'REST API', 'woocommerce' ),
|
||||
'webhooks' => __( 'Webhooks', 'woocommerce' ),
|
||||
'legacy_api' => __( 'Legacy API', 'woocommerce' ),
|
||||
'woocommerce_com' => __( 'Woo.com', 'woocommerce' ),
|
||||
'woocommerce_com' => __( 'WooCommerce.com', 'woocommerce' ),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -153,7 +155,7 @@ class WC_Settings_Advanced extends WC_Settings_Page {
|
||||
'checkboxgroup' => 'start',
|
||||
'show_if_checked' => 'option',
|
||||
/* Translators: %s Docs URL. */
|
||||
'desc_tip' => sprintf( __( 'Force SSL (HTTPS) on the checkout pages (<a href="%s" target="_blank">an SSL Certificate is required</a>).', 'woocommerce' ), 'https://woo.com/document/ssl-and-https/#section-3' ),
|
||||
'desc_tip' => sprintf( __( 'Force SSL (HTTPS) on the checkout pages (<a href="%s" target="_blank">an SSL Certificate is required</a>).', 'woocommerce' ), 'https://woocommerce.com/document/ssl-and-https/#section-3' ),
|
||||
),
|
||||
|
||||
'unforce_ssl_checkout' => array(
|
||||
@@ -322,12 +324,12 @@ class WC_Settings_Advanced extends WC_Settings_Page {
|
||||
}
|
||||
|
||||
/**
|
||||
* Get settings for the Woo.com section.
|
||||
* Get settings for the WooCommerce.com section.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
protected function get_settings_for_woocommerce_com_section() {
|
||||
$tracking_info_text = sprintf( '<a href="%s" target="_blank">%s</a>', 'https://woo.com/usage-tracking', esc_html__( 'Woo.com Usage Tracking Documentation', 'woocommerce' ) );
|
||||
$tracking_info_text = sprintf( '<a href="%s" target="_blank">%s</a>', 'https://woocommerce.com/usage-tracking', esc_html__( 'WooCommerce.com Usage Tracking Documentation', 'woocommerce' ) );
|
||||
|
||||
$settings =
|
||||
array(
|
||||
@@ -335,7 +337,7 @@ class WC_Settings_Advanced extends WC_Settings_Page {
|
||||
'title' => esc_html__( 'Usage Tracking', 'woocommerce' ),
|
||||
'type' => 'title',
|
||||
'id' => 'tracking_options',
|
||||
'desc' => __( 'Gathering usage data allows us to make WooCommerce better — your store will be considered as we evaluate new features, judge the quality of an update, or determine if an improvement makes sense.', 'woocommerce' ),
|
||||
'desc' => __( 'Gathering usage data allows us to tailor your store setup experience, offer more relevant content, and help make WooCommerce better for everyone.', 'woocommerce' ),
|
||||
),
|
||||
array(
|
||||
'title' => __( 'Enable tracking', 'woocommerce' ),
|
||||
@@ -361,7 +363,7 @@ class WC_Settings_Advanced extends WC_Settings_Page {
|
||||
array(
|
||||
'title' => __( 'Show Suggestions', 'woocommerce' ),
|
||||
'desc' => __( 'Display suggestions within WooCommerce', 'woocommerce' ),
|
||||
'desc_tip' => esc_html__( 'Leave this box unchecked if you do not want to pull suggested extensions from Woo.com. You will see a static list of extensions instead.', 'woocommerce' ),
|
||||
'desc_tip' => esc_html__( 'Leave this box unchecked if you do not want to pull suggested extensions from WooCommerce.com. You will see a static list of extensions instead.', 'woocommerce' ),
|
||||
'id' => 'woocommerce_show_marketplace_suggestions',
|
||||
'type' => 'checkbox',
|
||||
'checkboxgroup' => 'start',
|
||||
@@ -400,7 +402,7 @@ class WC_Settings_Advanced extends WC_Settings_Page {
|
||||
),
|
||||
'https://wordpress.org/plugins/woocommerce-legacy-rest-api/',
|
||||
admin_url( 'admin.php?page=wc-status&tab=logs' ),
|
||||
'https://developer.woo.com/2023/10/03/the-legacy-rest-api-will-move-to-a-dedicated-extension-in-woocommerce-9-0/'
|
||||
'https://developer.woocommerce.com/2023/10/03/the-legacy-rest-api-will-move-to-a-dedicated-extension-in-woocommerce-9-0/'
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ class WC_Settings_Emails extends WC_Settings_Page {
|
||||
/* translators: %1$s: Link to WP Mail Logging plugin, %2$s: Link to Email FAQ support page. */
|
||||
__( 'To ensure your store’s notifications arrive in your and your customers’ inboxes, we recommend connecting your email address to your domain and setting up a dedicated SMTP server. If something doesn’t seem to be sending correctly, install the <a href="%1$s">WP Mail Logging Plugin</a> or check the <a href="%2$s">Email FAQ page</a>.', 'woocommerce' ),
|
||||
'https://wordpress.org/plugins/wp-mail-logging/',
|
||||
'https://woo.com/document/email-faq'
|
||||
'https://woocommerce.com/document/email-faq'
|
||||
);
|
||||
$settings =
|
||||
array(
|
||||
|
||||
@@ -36,7 +36,7 @@ class WC_Settings_General extends WC_Settings_Page {
|
||||
$currency_code_options = get_woocommerce_currencies();
|
||||
|
||||
foreach ( $currency_code_options as $code => $name ) {
|
||||
$currency_code_options[ $code ] = $name . ' (' . get_woocommerce_currency_symbol( $code ) . ')';
|
||||
$currency_code_options[ $code ] = $name . ' (' . get_woocommerce_currency_symbol( $code ) . ') — ' . esc_html( $code );
|
||||
}
|
||||
|
||||
$settings =
|
||||
|
||||
@@ -39,6 +39,7 @@ if ( ! class_exists( 'WC_Settings_Page', false ) ) :
|
||||
add_action( 'woocommerce_sections_' . $this->id, array( $this, 'output_sections' ) );
|
||||
add_action( 'woocommerce_settings_' . $this->id, array( $this, 'output' ) );
|
||||
add_action( 'woocommerce_settings_save_' . $this->id, array( $this, 'save' ) );
|
||||
add_action( 'woocommerce_admin_field_add_settings_slot', array( $this, 'add_settings_slot' ) );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -61,6 +62,15 @@ if ( ! class_exists( 'WC_Settings_Page', false ) ) :
|
||||
return $this->label;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates the React mount point for settings slot.
|
||||
*/
|
||||
public function add_settings_slot() {
|
||||
?>
|
||||
<div id="wc_settings_slotfill"> </div>
|
||||
<?php
|
||||
}
|
||||
|
||||
/**
|
||||
* Add this page to settings.
|
||||
*
|
||||
@@ -153,7 +163,13 @@ if ( ! class_exists( 'WC_Settings_Page', false ) ) :
|
||||
*/
|
||||
public function get_sections() {
|
||||
$sections = $this->get_own_sections();
|
||||
return apply_filters( 'woocommerce_get_sections_' . $this->id, $sections );
|
||||
/**
|
||||
* Filters the sections for this settings page.
|
||||
*
|
||||
* @since 2.2.0
|
||||
* @param array $sections The sections for this settings page.
|
||||
*/
|
||||
return (array) apply_filters( 'woocommerce_get_sections_' . $this->id, $sections );
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -112,7 +112,7 @@ class WC_Settings_Payment_Gateways extends WC_Settings_Page {
|
||||
*/
|
||||
public function payment_gateways_banner() {
|
||||
?>
|
||||
<div id="wc_payment_gateways_banner_slotfill"> </div>
|
||||
<div id="wc_payments_settings_slotfill"> </div>
|
||||
<?php
|
||||
}
|
||||
|
||||
@@ -258,7 +258,7 @@ class WC_Settings_Payment_Gateways extends WC_Settings_Page {
|
||||
echo '<tr>';
|
||||
// phpcs:ignore -- ignoring the error since the value is harded.
|
||||
echo "<td style='border-top: 1px solid #c3c4c7; background-color: #fff' colspan='{$columns_count}'>";
|
||||
echo "<a id='settings-other-payment-methods' href='https://woo.com/product-category/woocommerce-extensions/payment-gateways/?utm_source=payments_recommendations' target='_blank' class='components-button is-tertiary'>";
|
||||
echo "<a id='settings-other-payment-methods' href='https://woocommerce.com/product-category/woocommerce-extensions/payment-gateways/?utm_source=payments_recommendations' target='_blank' class='components-button is-tertiary'>";
|
||||
// phpcs:ignore
|
||||
echo $link_text;
|
||||
// phpcs:ignore
|
||||
|
||||
@@ -378,7 +378,7 @@ class WC_Settings_Products extends WC_Settings_Page {
|
||||
'desc' => sprintf(
|
||||
// translators: Link to WooCommerce Docs.
|
||||
__( "If you are using X-Accel-Redirect download method along with NGINX server, make sure that you have applied settings as described in <a href='%s'>Digital/Downloadable Product Handling</a> guide.", 'woocommerce' ),
|
||||
'https://woo.com/document/digital-downloadable-product-handling#nginx-setting'
|
||||
'https://woocommerce.com/document/digital-downloadable-product-handling#nginx-setting'
|
||||
),
|
||||
'options' => array(
|
||||
'force' => __( 'Force downloads', 'woocommerce' ),
|
||||
@@ -396,7 +396,7 @@ class WC_Settings_Products extends WC_Settings_Page {
|
||||
'desc_tip' => sprintf(
|
||||
/* translators: %1$s is a link to the WooCommerce documentation. */
|
||||
__( 'If the "Force Downloads" or "X-Accel-Redirect/X-Sendfile" download method is selected but does not work, the system will use the "Redirect" method as a last resort. <a href="%1$s">See this guide</a> for more details.', 'woocommerce' ),
|
||||
'https://woo.com/document/digital-downloadable-product-handling/'
|
||||
'https://woocommerce.com/document/digital-downloadable-product-handling/'
|
||||
),
|
||||
'checkboxgroup' => 'start',
|
||||
'autoload' => false,
|
||||
@@ -442,7 +442,7 @@ class WC_Settings_Products extends WC_Settings_Page {
|
||||
'desc_tip' => sprintf(
|
||||
// translators: Link to WooCommerce Docs.
|
||||
__( "Not required if your download directory is protected. <a href='%s'>See this guide</a> for more details. Files already uploaded will not be affected.", 'woocommerce' ),
|
||||
'https://woo.com/document/digital-downloadable-product-handling#unique-string'
|
||||
'https://woocommerce.com/document/digital-downloadable-product-handling#unique-string'
|
||||
),
|
||||
),
|
||||
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
<?php
|
||||
/**
|
||||
* WooCommerce site visibility settings
|
||||
*
|
||||
* @package WooCommerce\Admin
|
||||
*/
|
||||
|
||||
defined( 'ABSPATH' ) || exit;
|
||||
|
||||
/**
|
||||
* Settings for API.
|
||||
*/
|
||||
if ( class_exists( 'WC_Settings_Site_Visibility', false ) ) {
|
||||
return new WC_Settings_Site_Visibility();
|
||||
}
|
||||
|
||||
/**
|
||||
* WC_Settings_Advanced.
|
||||
*/
|
||||
class WC_Settings_Site_Visibility extends WC_Settings_Page {
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
*/
|
||||
public function __construct() {
|
||||
$this->id = 'site-visibility';
|
||||
$this->label = __( 'Site visibility', 'woocommerce' );
|
||||
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get settings for the default section.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
protected function get_settings_for_default_section() {
|
||||
$settings =
|
||||
array(
|
||||
array(
|
||||
'id' => 'wc_settings_site_visibility_slotfill',
|
||||
'type' => 'slotfill_placeholder',
|
||||
),
|
||||
);
|
||||
|
||||
return $settings;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return new WC_Settings_Site_Visibility();
|
||||
@@ -44,7 +44,7 @@ class WC_Settings_Tax extends WC_Settings_Page {
|
||||
<th scope="row" class="titledesc woocommerce_admin_tax_settings_slotfill_th">
|
||||
</th>
|
||||
<td class="forminp forminp-text woocommerce_admin_tax_settings_slotfill_td">
|
||||
<div id="wc_conflict_error_slotfill"> </div>
|
||||
<div id="wc_tax_settings_slotfill"> </div>
|
||||
</td>
|
||||
</tr>
|
||||
<?php
|
||||
|
||||
@@ -5,6 +5,9 @@
|
||||
* @package WooCommerce\Admin\Shipping
|
||||
*/
|
||||
|
||||
use Automattic\WooCommerce\Blocks\Utils\CartCheckoutUtils;
|
||||
use Automattic\WooCommerce\Blocks\Shipping\ShippingController;
|
||||
|
||||
if ( ! defined( 'ABSPATH' ) ) {
|
||||
exit;
|
||||
}
|
||||
@@ -15,7 +18,10 @@ if ( ! defined( 'ABSPATH' ) ) {
|
||||
<span class="wc-shipping-zone-name"><?php echo esc_html( $zone->get_zone_name() ? $zone->get_zone_name() : __( 'Zone', 'woocommerce' ) ); ?></span>
|
||||
</h2>
|
||||
|
||||
<?php do_action( 'woocommerce_shipping_zone_before_methods_table', $zone ); ?>
|
||||
<?php
|
||||
// phpcs:ignore WooCommerce.Commenting.CommentHooks.MissingHookComment
|
||||
do_action( 'woocommerce_shipping_zone_before_methods_table', $zone );
|
||||
?>
|
||||
|
||||
<table class="form-table wc-shipping-zone-settings">
|
||||
<tbody>
|
||||
@@ -52,7 +58,7 @@ if ( ! defined( 'ABSPATH' ) ) {
|
||||
<div class="wc-shipping-zone-postcodes">
|
||||
<textarea name="zone_postcodes" data-attribute="zone_postcodes" id="zone_postcodes" placeholder="<?php esc_attr_e( 'List 1 postcode per line', 'woocommerce' ); ?>" class="input-text large-text" cols="25" rows="5"><?php echo esc_textarea( implode( "\n", $postcodes ) ); ?></textarea>
|
||||
<?php /* translators: WooCommerce link to setting up shipping zones */ ?>
|
||||
<span class="description"><?php printf( __( 'Postcodes containing wildcards (e.g. CB23*) or fully numeric ranges (e.g. <code>90210...99000</code>) are also supported. Please see the shipping zones <a href="%s" target="_blank">documentation</a> for more information.', 'woocommerce' ), 'https://woo.com/document/setting-up-shipping-zones/#section-3' ); ?></span><?php // @codingStandardsIgnoreLine. ?>
|
||||
<span class="description"><?php printf( __( 'Postcodes containing wildcards (e.g. CB23*) or fully numeric ranges (e.g. <code>90210...99000</code>) are also supported. Please see the shipping zones <a href="%s" target="_blank">documentation</a> for more information.', 'woocommerce' ), 'https://woocommerce.com/document/setting-up-shipping-zones/#section-3' ); ?></span><?php // @codingStandardsIgnoreLine. ?>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -90,7 +96,10 @@ if ( ! defined( 'ABSPATH' ) ) {
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<?php do_action( 'woocommerce_shipping_zone_after_methods_table', $zone ); ?>
|
||||
<?php
|
||||
// phpcs:ignore WooCommerce.Commenting.CommentHooks.MissingHookComment
|
||||
do_action( 'woocommerce_shipping_zone_after_methods_table', $zone );
|
||||
?>
|
||||
|
||||
<p class="submit">
|
||||
<button type="submit" name="submit" id="submit" class="button button-primary button-large wc-shipping-zone-method-save" value="<?php esc_attr_e( 'Save changes', 'woocommerce' ); ?>" disabled><?php esc_html_e( 'Save changes', 'woocommerce' ); ?></button>
|
||||
@@ -198,6 +207,10 @@ if ( ! defined( 'ABSPATH' ) ) {
|
||||
$methods_placed_in_order = array_merge( $methods_placed_in_order, array_values( $methods ) );
|
||||
|
||||
foreach ( $methods_placed_in_order as $method ) {
|
||||
if ( CartCheckoutUtils::is_checkout_block_default() && ! ShippingController::is_legacy_local_pickup_active() && 'local_pickup' === $method->id ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( ! $method->supports( 'shipping-zones' ) ) {
|
||||
continue;
|
||||
}
|
||||
@@ -214,7 +227,36 @@ if ( ! defined( 'ABSPATH' ) ) {
|
||||
|
||||
echo '<div id=' . esc_attr( $method->id ) . '-description class="wc-shipping-zone-method-input-help-text"><span>' . wp_kses_post( wpautop( $method->get_method_description() ) ) . '</span></div>';
|
||||
}
|
||||
echo '</div>'
|
||||
|
||||
if ( CartCheckoutUtils::is_checkout_block_default() ) {
|
||||
echo '<p class="wc-shipping-legacy-local-pickup-help-text-container">';
|
||||
|
||||
if ( ShippingController::is_legacy_local_pickup_active() ) {
|
||||
printf(
|
||||
wp_kses(
|
||||
/* translators: %s: Local pickup settings page URL. */
|
||||
__( 'Explore a new enhanced delivery method that allows you to easily offer one or more pickup locations to your customers in the <a href="%s">Local pickup settings page</a>.', 'woocommerce' ),
|
||||
array( 'a' => array( 'href' => array() ) )
|
||||
),
|
||||
esc_url( admin_url( 'admin.php?page=wc-settings&tab=shipping§ion=pickup_location' ) )
|
||||
);
|
||||
|
||||
} else {
|
||||
printf(
|
||||
wp_kses(
|
||||
/* translators: %s: Local pickup settings page URL. */
|
||||
__( 'Local pickup: Set up pickup locations in the <a href="%s">Local pickup settings page</a>.', 'woocommerce' ),
|
||||
array( 'a' => array( 'href' => array() ) )
|
||||
),
|
||||
esc_url( admin_url( 'admin.php?page=wc-settings&tab=shipping§ion=pickup_location' ) )
|
||||
);
|
||||
}
|
||||
|
||||
echo '</p>';
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
|
||||
?>
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
@@ -98,6 +98,7 @@ $settings = array(
|
||||
),
|
||||
|
||||
array( 'type' => 'conflict_error' ), // React mount point for embedded banner slotfill.
|
||||
array( 'type' => 'add_settings_slot' ), // React mount point for settings slotfill.
|
||||
|
||||
array(
|
||||
'title' => __( 'Price display suffix', 'woocommerce' ),
|
||||
|
||||
Reference in New Issue
Block a user