Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22973 from woocommerce/update/22545 

Revised sale start/end date save logic
This commit is contained in:
Timmy Crawford 2019-03-14 17:53:40 -07:00 committed by GitHub
parent fc4f67eb3d d365497a66
commit e1c09b4609
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 151 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/abstracts/abstract-wc-product.php
View File

@ -1504,7 +1504,7 @@ class WC_Product extends WC_Abstract_Legacy_Product {
$on_sale = false; $on_sale = false;
} }
if ( $this->get_date_on_sale_to( $context ) && $this->get_date_on_sale_to( $context )->getTimestamp() + DAY_IN_SECONDS < current_time( 'timestamp', true ) ) { if ( $this->get_date_on_sale_to( $context ) && $this->get_date_on_sale_to( $context )->getTimestamp() < current_time( 'timestamp', true ) ) {
$on_sale = false; $on_sale = false;
} }
} else { } else {

133
includes/admin/meta-boxes/class-wc-meta-box-product-data.php
View File

@ -214,7 +214,7 @@ class WC_Meta_Box_Product_Data {
* @return array * @return array
*/ */
private static function prepare_children() { private static function prepare_children() {
return isset( $_POST['grouped_products'] ) ? array_filter( array_map( 'intval', (array) $_POST['grouped_products'] ) ) : array(); return isset( $_POST['grouped_products'] ) ? array_filter( array_map( 'intval', (array) $_POST['grouped_products'] ) ) : array(); // phpcs:ignore WordPress.Security.NonceVerification.NoNonceVerification
} }
/** /**
@ -228,7 +228,7 @@ class WC_Meta_Box_Product_Data {
$attributes = array(); $attributes = array();
if ( ! $data ) { if ( ! $data ) {
$data = stripslashes_deep( $_POST ); $data = stripslashes_deep( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.NoNonceVerification
} }
if ( isset( $data['attribute_names'], $data['attribute_values'] ) ) { if ( isset( $data['attribute_names'], $data['attribute_values'] ) ) {
@ -295,9 +295,9 @@ class WC_Meta_Box_Product_Data {
$attribute_key = sanitize_title( $attribute->get_name() ); $attribute_key = sanitize_title( $attribute->get_name() );
if ( ! is_null( $index ) ) { if ( ! is_null( $index ) ) {
$value = isset( $_POST[ $key_prefix . $attribute_key ][ $index ] ) ? wp_unslash( $_POST[ $key_prefix . $attribute_key ][ $index ] ) : ''; $value = isset( $_POST[ $key_prefix . $attribute_key ][ $index ] ) ? wp_unslash( $_POST[ $key_prefix . $attribute_key ][ $index ] ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.NoNonceVerification, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
} else { } else {
$value = isset( $_POST[ $key_prefix . $attribute_key ] ) ? wp_unslash( $_POST[ $key_prefix . $attribute_key ] ) : ''; $value = isset( $_POST[ $key_prefix . $attribute_key ] ) ? wp_unslash( $_POST[ $key_prefix . $attribute_key ] ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.NoNonceVerification, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
} }
if ( $attribute->is_taxonomy() ) { if ( $attribute->is_taxonomy() ) {
@ -322,6 +322,7 @@ class WC_Meta_Box_Product_Data {
* @param WP_Post $post Post object. * @param WP_Post $post Post object.
*/ */
public static function save( $post_id, $post ) { public static function save( $post_id, $post ) {
// phpcs:disable WordPress.Security.NonceVerification.NoNonceVerification
// Process product type first so we have the correct class to run setters. // Process product type first so we have the correct class to run setters.
$product_type = empty( $_POST['product-type'] ) ? WC_Product_Factory::get_product_type( $post_id ) : sanitize_title( wp_unslash( $_POST['product-type'] ) ); $product_type = empty( $_POST['product-type'] ) ? WC_Product_Factory::get_product_type( $post_id ) : sanitize_title( wp_unslash( $_POST['product-type'] ) );
$classname = WC_Product_Factory::get_product_classname( $post_id, $product_type ? $product_type : 'simple' ); $classname = WC_Product_Factory::get_product_classname( $post_id, $product_type ? $product_type : 'simple' );
@ -339,42 +340,65 @@ class WC_Meta_Box_Product_Data {
} }
} }
// Handle dates.
$date_on_sale_from = '';
$date_on_sale_to = '';
// Force date from to beginning of day.
if ( isset( $_POST['_sale_price_dates_from'] ) ) {
$date_on_sale_from = wc_clean( wp_unslash( $_POST['_sale_price_dates_from'] ) );
if ( ! empty( $date_on_sale_from ) ) {
$date_on_sale_from = date( 'Y-m-d 00:00:00', strtotime( $date_on_sale_from ) );
}
}
// Force date to to the end of the day.
if ( isset( $_POST['_sale_price_dates_to'] ) ) {
$date_on_sale_to = wc_clean( wp_unslash( $_POST['_sale_price_dates_to'] ) );
if ( ! empty( $date_on_sale_to ) ) {
$date_on_sale_to = date( 'Y-m-d 23:59:59', strtotime( $date_on_sale_to ) );
}
}
$errors = $product->set_props( $errors = $product->set_props(
array( array(
'sku' => isset( $_POST['_sku'] ) ? wc_clean( wp_unslash( $_POST['_sku'] ) ) : null, 'sku' => isset( $_POST['_sku'] ) ? wc_clean( wp_unslash( $_POST['_sku'] ) ) : null,
'purchase_note' => wp_kses_post( wp_unslash( $_POST['_purchase_note'] ) ), 'purchase_note' => isset( $_POST['_purchase_note'] ) ? wp_kses_post( wp_unslash( $_POST['_purchase_note'] ) ) : '',
'downloadable' => isset( $_POST['_downloadable'] ), 'downloadable' => isset( $_POST['_downloadable'] ),
'virtual' => isset( $_POST['_virtual'] ), 'virtual' => isset( $_POST['_virtual'] ),
'featured' => isset( $_POST['_featured'] ), 'featured' => isset( $_POST['_featured'] ),
'catalog_visibility' => wc_clean( wp_unslash( $_POST['_visibility'] ) ), 'catalog_visibility' => isset( $_POST['_visibility'] ) ? wc_clean( wp_unslash( $_POST['_visibility'] ) ) : null,
'tax_status' => isset( $_POST['_tax_status'] ) ? wc_clean( wp_unslash( $_POST['_tax_status'] ) ) : null, 'tax_status' => isset( $_POST['_tax_status'] ) ? wc_clean( wp_unslash( $_POST['_tax_status'] ) ) : null,
'tax_class' => isset( $_POST['_tax_class'] ) ? wc_clean( wp_unslash( $_POST['_tax_class'] ) ) : null, 'tax_class' => isset( $_POST['_tax_class'] ) ? wc_clean( wp_unslash( $_POST['_tax_class'] ) ) : null,
'weight' => wc_clean( wp_unslash( $_POST['_weight'] ) ), 'weight' => isset( $_POST['_weight'] ) ? wc_clean( wp_unslash( $_POST['_weight'] ) ) : null,
'length' => wc_clean( wp_unslash( $_POST['_length'] ) ), 'length' => isset( $_POST['_length'] ) ? wc_clean( wp_unslash( $_POST['_length'] ) ) : null,
'width' => wc_clean( wp_unslash( $_POST['_width'] ) ), 'width' => isset( $_POST['_width'] ) ? wc_clean( wp_unslash( $_POST['_width'] ) ) : null,
'height' => wc_clean( wp_unslash( $_POST['_height'] ) ), 'height' => isset( $_POST['_height'] ) ? wc_clean( wp_unslash( $_POST['_height'] ) ) : null,
'shipping_class_id' => absint( wp_unslash( $_POST['product_shipping_class'] ) ), 'shipping_class_id' => isset( $_POST['product_shipping_class'] ) ? absint( wp_unslash( $_POST['product_shipping_class'] ) ) : null,
'sold_individually' => ! empty( $_POST['_sold_individually'] ), 'sold_individually' => ! empty( $_POST['_sold_individually'] ),
'upsell_ids' => isset( $_POST['upsell_ids'] ) ? array_map( 'intval', (array) wp_unslash( $_POST['upsell_ids'] ) ) : array(), 'upsell_ids' => isset( $_POST['upsell_ids'] ) ? array_map( 'intval', (array) wp_unslash( $_POST['upsell_ids'] ) ) : array(),
'cross_sell_ids' => isset( $_POST['crosssell_ids'] ) ? array_map( 'intval', (array) wp_unslash( $_POST['crosssell_ids'] ) ) : array(), 'cross_sell_ids' => isset( $_POST['crosssell_ids'] ) ? array_map( 'intval', (array) wp_unslash( $_POST['crosssell_ids'] ) ) : array(),
'regular_price' => wc_clean( wp_unslash( $_POST['_regular_price'] ) ), 'regular_price' => isset( $_POST['_regular_price'] ) ? wc_clean( wp_unslash( $_POST['_regular_price'] ) ) : null,
'sale_price' => wc_clean( wp_unslash( $_POST['_sale_price'] ) ), 'sale_price' => isset( $_POST['_sale_price'] ) ? wc_clean( wp_unslash( $_POST['_sale_price'] ) ) : null,
'date_on_sale_from' => wc_clean( wp_unslash( $_POST['_sale_price_dates_from'] ) ), 'date_on_sale_from' => $date_on_sale_from,
'date_on_sale_to' => wc_clean( wp_unslash( $_POST['_sale_price_dates_to'] ) ), 'date_on_sale_to' => $date_on_sale_to,
'manage_stock' => ! empty( $_POST['_manage_stock'] ), 'manage_stock' => ! empty( $_POST['_manage_stock'] ),
'backorders' => isset( $_POST['_backorders'] ) ? wc_clean( wp_unslash( $_POST['_backorders'] ) ) : null, 'backorders' => isset( $_POST['_backorders'] ) ? wc_clean( wp_unslash( $_POST['_backorders'] ) ) : null,
'stock_status' => wc_clean( wp_unslash( $_POST['_stock_status'] ) ), 'stock_status' => isset( $_POST['_stock_status'] ) ? wc_clean( wp_unslash( $_POST['_stock_status'] ) ) : null,
'stock_quantity' => $stock, 'stock_quantity' => $stock,
'low_stock_amount' => isset( $_POST['_low_stock_amount'] ) && '' !== $_POST['_low_stock_amount'] ? wc_stock_amount( wp_unslash( $_POST['_low_stock_amount'] ) ) : '', 'low_stock_amount' => isset( $_POST['_low_stock_amount'] ) && '' !== $_POST['_low_stock_amount'] ? wc_stock_amount( wp_unslash( $_POST['_low_stock_amount'] ) ) : '',
'download_limit' => '' === $_POST['_download_limit'] ? '' : absint( wp_unslash( $_POST['_download_limit'] ) ), 'download_limit' => isset( $_POST['_download_limit'] ) && '' !== $_POST['_download_limit'] ? absint( wp_unslash( $_POST['_download_limit'] ) ) : '',
'download_expiry' => '' === $_POST['_download_expiry'] ? '' : absint( wp_unslash( $_POST['_download_expiry'] ) ), 'download_expiry' => isset( $_POST['_download_expiry'] ) && '' !== $_POST['_download_expiry'] ? absint( wp_unslash( $_POST['_download_expiry'] ) ) : '',
// Those are sanitized inside prepare_downloads.
'downloads' => self::prepare_downloads( 'downloads' => self::prepare_downloads(
isset( $_POST['_wc_file_names'] ) ? wp_unslash( $_POST['_wc_file_names'] ) : array(), isset( $_POST['_wc_file_names'] ) ? wp_unslash( $_POST['_wc_file_names'] ) : array(), // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
isset( $_POST['_wc_file_urls'] ) ? wp_unslash( $_POST['_wc_file_urls'] ) : array(), isset( $_POST['_wc_file_urls'] ) ? wp_unslash( $_POST['_wc_file_urls'] ) : array(), // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
isset( $_POST['_wc_file_hashes'] ) ? wp_unslash( $_POST['_wc_file_hashes'] ) : array() isset( $_POST['_wc_file_hashes'] ) ? wp_unslash( $_POST['_wc_file_hashes'] ) : array() // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
), ),
'product_url' => esc_url_raw( wp_unslash( $_POST['_product_url'] ) ), 'product_url' => isset( $_POST['_product_url'] ) ? esc_url_raw( wp_unslash( $_POST['_product_url'] ) ) : '',
'button_text' => wc_clean( wp_unslash( $_POST['_button_text'] ) ), 'button_text' => isset( $_POST['_button_text'] ) ? wc_clean( wp_unslash( $_POST['_button_text'] ) ) : '',
'children' => 'grouped' === $product_type ? self::prepare_children() : null, 'children' => 'grouped' === $product_type ? self::prepare_children() : null,
'reviews_allowed' => ! empty( $_POST['comment_status'] ) && 'open' === $_POST['comment_status'], 'reviews_allowed' => ! empty( $_POST['comment_status'] ) && 'open' === $_POST['comment_status'],
'attributes' => $attributes, 'attributes' => $attributes,
@ -396,10 +420,14 @@ class WC_Meta_Box_Product_Data {
$product->save(); $product->save();
if ( $product->is_type( 'variable' ) ) { if ( $product->is_type( 'variable' ) ) {
$product->get_data_store()->sync_variation_names( $product, wc_clean( wp_unslash( $_POST['original_post_title'] ) ), wc_clean( wp_unslash( $_POST['post_title'] ) ) ); $original_post_title = isset( $_POST['original_post_title'] ) ? wc_clean( wp_unslash( $_POST['original_post_title'] ) ) : '';
$post_title = isset( $_POST['post_title'] ) ? wc_clean( wp_unslash( $_POST['post_title'] ) ) : '';
$product->get_data_store()->sync_variation_names( $product, $original_post_title, $post_title );
} }
do_action( 'woocommerce_process_product_meta_' . $product_type, $post_id ); do_action( 'woocommerce_process_product_meta_' . $product_type, $post_id );
// phpcs:enable WordPress.Security.NonceVerification.NoNonceVerification
} }
/** /**
@ -409,16 +437,17 @@ class WC_Meta_Box_Product_Data {
* @param WP_Post $post Post object. * @param WP_Post $post Post object.
*/ */
public static function save_variations( $post_id, $post ) { public static function save_variations( $post_id, $post ) {
// phpcs:disable WordPress.Security.NonceVerification.NoNonceVerification
if ( isset( $_POST['variable_post_id'] ) ) { if ( isset( $_POST['variable_post_id'] ) ) {
$parent = wc_get_product( $post_id ); $parent = wc_get_product( $post_id );
$parent->set_default_attributes( self::prepare_set_attributes( $parent->get_attributes(), 'default_attribute_' ) ); $parent->set_default_attributes( self::prepare_set_attributes( $parent->get_attributes(), 'default_attribute_' ) );
$parent->save(); $parent->save();
$max_loop = max( array_keys( wp_unslash( $_POST['variable_post_id'] ) ) ); $max_loop = max( array_keys( wp_unslash( $_POST['variable_post_id'] ) ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
$data_store = $parent->get_data_store(); $data_store = $parent->get_data_store();
$data_store->sort_all_product_variations( $parent->get_id() ); $data_store->sort_all_product_variations( $parent->get_id() );
for ( $i = 0; $i <= $max_loop; $i ++ ) { for ( $i = 0; $i <= $max_loop; $i++ ) {
if ( ! isset( $_POST['variable_post_id'][ $i ] ) ) { if ( ! isset( $_POST['variable_post_id'][ $i ] ) ) {
continue; continue;
@ -437,36 +466,59 @@ class WC_Meta_Box_Product_Data {
} }
} }
// Handle dates.
$date_on_sale_from = '';
$date_on_sale_to = '';
// Force date from to beginning of day.
if ( isset( $_POST['variable_sale_price_dates_from'][ $i ] ) ) {
$date_on_sale_from = wc_clean( wp_unslash( $_POST['variable_sale_price_dates_from'][ $i ] ) );
if ( ! empty( $date_on_sale_from ) ) {
$date_on_sale_from = date( 'Y-m-d 00:00:00', strtotime( $date_on_sale_from ) );
}
}
// Force date to to the end of the day.
if ( isset( $_POST['variable_sale_price_dates_to'][ $i ] ) ) {
$date_on_sale_to = wc_clean( wp_unslash( $_POST['variable_sale_price_dates_to'][ $i ] ) );
if ( ! empty( $date_on_sale_to ) ) {
$date_on_sale_to = date( 'Y-m-d 23:59:59', strtotime( $date_on_sale_to ) );
}
}
$errors = $variation->set_props( $errors = $variation->set_props(
array( array(
'status' => isset( $_POST['variable_enabled'][ $i ] ) ? 'publish' : 'private', 'status' => isset( $_POST['variable_enabled'][ $i ] ) ? 'publish' : 'private',
'menu_order' => wc_clean( wp_unslash( $_POST['variation_menu_order'][ $i ] ) ), 'menu_order' => isset( $_POST['variation_menu_order'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variation_menu_order'][ $i ] ) ) : null,
'regular_price' => wc_clean( wp_unslash( $_POST['variable_regular_price'][ $i ] ) ), 'regular_price' => isset( $_POST['variable_regular_price'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_regular_price'][ $i ] ) ) : null,
'sale_price' => wc_clean( wp_unslash( $_POST['variable_sale_price'][ $i ] ) ), 'sale_price' => isset( $_POST['variable_sale_price'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_sale_price'][ $i ] ) ) : null,
'virtual' => isset( $_POST['variable_is_virtual'][ $i ] ), 'virtual' => isset( $_POST['variable_is_virtual'][ $i ] ),
'downloadable' => isset( $_POST['variable_is_downloadable'][ $i ] ), 'downloadable' => isset( $_POST['variable_is_downloadable'][ $i ] ),
'date_on_sale_from' => wc_clean( wp_unslash( $_POST['variable_sale_price_dates_from'][ $i ] ) ), 'date_on_sale_from' => $date_on_sale_from,
'date_on_sale_to' => wc_clean( wp_unslash( $_POST['variable_sale_price_dates_to'][ $i ] ) ), 'date_on_sale_to' => $date_on_sale_to,
'description' => wp_kses_post( wp_unslash( $_POST['variable_description'][ $i ] ) ), 'description' => isset( $_POST['variable_description'][ $i ] ) ? wp_kses_post( wp_unslash( $_POST['variable_description'][ $i ] ) ) : null,
'download_limit' => wc_clean( wp_unslash( $_POST['variable_download_limit'][ $i ] ) ), 'download_limit' => isset( $_POST['variable_download_limit'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_download_limit'][ $i ] ) ) : null,
'download_expiry' => wc_clean( wp_unslash( $_POST['variable_download_expiry'][ $i ] ) ), 'download_expiry' => isset( $_POST['variable_download_expiry'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_download_expiry'][ $i ] ) ) : null,
// Those are sanitized inside prepare_downloads.
'downloads' => self::prepare_downloads( 'downloads' => self::prepare_downloads(
isset( $_POST['_wc_variation_file_names'][ $variation_id ] ) ? wp_unslash( $_POST['_wc_variation_file_names'][ $variation_id ] ) : array(), isset( $_POST['_wc_variation_file_names'][ $variation_id ] ) ? wp_unslash( $_POST['_wc_variation_file_names'][ $variation_id ] ) : array(), // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
isset( $_POST['_wc_variation_file_urls'][ $variation_id ] ) ? wp_unslash( $_POST['_wc_variation_file_urls'][ $variation_id ] ) : array(), isset( $_POST['_wc_variation_file_urls'][ $variation_id ] ) ? wp_unslash( $_POST['_wc_variation_file_urls'][ $variation_id ] ) : array(), // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
isset( $_POST['_wc_variation_file_hashes'][ $variation_id ] ) ? wp_unslash( $_POST['_wc_variation_file_hashes'][ $variation_id ] ) : array() isset( $_POST['_wc_variation_file_hashes'][ $variation_id ] ) ? wp_unslash( $_POST['_wc_variation_file_hashes'][ $variation_id ] ) : array() // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
), ),
'manage_stock' => isset( $_POST['variable_manage_stock'][ $i ] ), 'manage_stock' => isset( $_POST['variable_manage_stock'][ $i ] ),
'stock_quantity' => $stock, 'stock_quantity' => $stock,
'backorders' => isset( $_POST['variable_backorders'], $_POST['variable_backorders'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_backorders'][ $i ] ) ) : null, 'backorders' => isset( $_POST['variable_backorders'], $_POST['variable_backorders'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_backorders'][ $i ] ) ) : null,
'stock_status' => wc_clean( wp_unslash( $_POST['variable_stock_status'][ $i ] ) ), 'stock_status' => isset( $_POST['variable_stock_status'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_stock_status'][ $i ] ) ) : null,
'image_id' => wc_clean( wp_unslash( $_POST['upload_image_id'][ $i ] ) ), 'image_id' => isset( $_POST['upload_image_id'][ $i ] ) ? wc_clean( wp_unslash( $_POST['upload_image_id'][ $i ] ) ) : null,
'attributes' => self::prepare_set_attributes( $parent->get_attributes(), 'attribute_', $i ), 'attributes' => self::prepare_set_attributes( $parent->get_attributes(), 'attribute_', $i ),
'sku' => isset( $_POST['variable_sku'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_sku'][ $i ] ) ) : '', 'sku' => isset( $_POST['variable_sku'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_sku'][ $i ] ) ) : '',
'weight' => isset( $_POST['variable_weight'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_weight'][ $i ] ) ) : '', 'weight' => isset( $_POST['variable_weight'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_weight'][ $i ] ) ) : '',
'length' => isset( $_POST['variable_length'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_length'][ $i ] ) ) : '', 'length' => isset( $_POST['variable_length'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_length'][ $i ] ) ) : '',
'width' => isset( $_POST['variable_width'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_width'][ $i ] ) ) : '', 'width' => isset( $_POST['variable_width'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_width'][ $i ] ) ) : '',
'height' => isset( $_POST['variable_height'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_height'][ $i ] ) ) : '', 'height' => isset( $_POST['variable_height'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_height'][ $i ] ) ) : '',
'shipping_class_id' => wc_clean( wp_unslash( $_POST['variable_shipping_class'][ $i ] ) ), 'shipping_class_id' => isset( $_POST['variable_shipping_class'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_shipping_class'][ $i ] ) ) : null,
'tax_class' => isset( $_POST['variable_tax_class'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_tax_class'][ $i ] ) ) : null, 'tax_class' => isset( $_POST['variable_tax_class'][ $i ] ) ? wc_clean( wp_unslash( $_POST['variable_tax_class'][ $i ] ) ) : null,
) )
); );
@ -480,5 +532,6 @@ class WC_Meta_Box_Product_Data {
do_action( 'woocommerce_save_product_variation', $variation_id, $i ); do_action( 'woocommerce_save_product_variation', $variation_id, $i );
} }
} }
// phpcs:enable WordPress.Security.NonceVerification.NoNonceVerification
} }
} }

20
includes/admin/meta-boxes/views/html-product-data-general.php
View File

@ -1,7 +1,12 @@
<?php <?php
if ( ! defined( 'ABSPATH' ) ) { /**
exit; * Product general data panel.
} *
* @package WooCommerce/Admin
*/
defined( 'ABSPATH' ) || exit;
?> ?>
<div id="general_product_data" class="panel woocommerce_options_panel"> <div id="general_product_data" class="panel woocommerce_options_panel">
@ -50,8 +55,11 @@ if ( ! defined( 'ABSPATH' ) ) {
) )
); );
$sale_price_dates_from = $product_object->get_date_on_sale_from( 'edit' ) && ( $date = $product_object->get_date_on_sale_from( 'edit' )->getOffsetTimestamp() ) ? date_i18n( 'Y-m-d', $date ) : ''; $sale_price_dates_from_timestamp = $product_object->get_date_on_sale_from( 'edit' ) ? $product_object->get_date_on_sale_from( 'edit' )->getOffsetTimestamp() : false;
$sale_price_dates_to = $product_object->get_date_on_sale_to( 'edit' ) && ( $date = $product_object->get_date_on_sale_to( 'edit' )->getOffsetTimestamp() ) ? date_i18n( 'Y-m-d', $date ) : ''; $sale_price_dates_to_timestamp = $product_object->get_date_on_sale_to( 'edit' ) ? $product_object->get_date_on_sale_to( 'edit' )->getOffsetTimestamp() : false;
$sale_price_dates_from = $sale_price_dates_from_timestamp ? date_i18n( 'Y-m-d', $sale_price_dates_from_timestamp ) : '';
$sale_price_dates_to = $sale_price_dates_to_timestamp ? date_i18n( 'Y-m-d', $sale_price_dates_to_timestamp ) : '';
echo '<p class="form-field sale_price_dates_fields"> echo '<p class="form-field sale_price_dates_fields">
<label for="_sale_price_dates_from">' . esc_html__( 'Sale price dates', 'woocommerce' ) . '</label> <label for="_sale_price_dates_from">' . esc_html__( 'Sale price dates', 'woocommerce' ) . '</label>
@ -99,7 +107,7 @@ if ( ! defined( 'ABSPATH' ) ) {
ob_start(); ob_start();
require 'html-product-download.php'; require 'html-product-download.php';
echo esc_attr( ob_get_clean() ); echo esc_attr( ob_get_clean() );
?> ?>
"><?php esc_html_e( 'Add File', 'woocommerce' ); ?></a> "><?php esc_html_e( 'Add File', 'woocommerce' ); ?></a>
</th> </th>
</tr> </tr>

78
includes/admin/meta-boxes/views/html-variation-admin.php
View File

@ -2,14 +2,15 @@
/** /**
* Outputs a variation for editing. * Outputs a variation for editing.
* *
* @package WooCommerce\Admin
* @var int $variation_id * @var int $variation_id
* @var WP_POST $variation * @var WP_POST $variation
* @var WC_Product_Variation $variation_object * @var WC_Product_Variation $variation_object
* @var array $variation_data array of variation data @deprecated. * @var array $variation_data array of variation data @deprecated.
*/ */
if ( ! defined( 'ABSPATH' ) ) {
exit; defined( 'ABSPATH' ) || exit;
}
?> ?>
<div class="woocommerce_variation wc-metabox closed"> <div class="woocommerce_variation wc-metabox closed">
<h3> <h3>
@ -26,11 +27,11 @@ if ( ! defined( 'ABSPATH' ) ) {
} }
$selected_value = isset( $attribute_values[ sanitize_title( $attribute->get_name() ) ] ) ? $attribute_values[ sanitize_title( $attribute->get_name() ) ] : ''; $selected_value = isset( $attribute_values[ sanitize_title( $attribute->get_name() ) ] ) ? $attribute_values[ sanitize_title( $attribute->get_name() ) ] : '';
?> ?>
<select name="attribute_<?php echo sanitize_title( $attribute->get_name() ) . "[{$loop}]"; ?>"> <select name="attribute_<?php echo esc_attr( sanitize_title( $attribute->get_name() ) . "[{$loop}]" ); ?>">
<option value=""> <option value="">
<?php <?php
/* translators: %s: attribute label */ /* translators: %s: attribute label */
printf( esc_html__( 'Any %s&hellip;', 'woocommerce' ), wc_attribute_label( $attribute->get_name() ) ); printf( esc_html__( 'Any %s&hellip;', 'woocommerce' ), wc_attribute_label( $attribute->get_name() ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
?> ?>
</option> </option>
<?php if ( $attribute->is_taxonomy() ) : ?> <?php if ( $attribute->is_taxonomy() ) : ?>
@ -51,11 +52,11 @@ if ( ! defined( 'ABSPATH' ) ) {
<?php <?php
/** /**
* woocommerce_variation_header action. * Variations header action.
* *
* @since 3.6.0 * @since 3.6.0
* *
* @param WP_Post $variation . * @param WP_Post $variation Post data.
*/ */
do_action( 'woocommerce_variation_header', $variation ); do_action( 'woocommerce_variation_header', $variation );
?> ?>
@ -86,7 +87,7 @@ if ( ! defined( 'ABSPATH' ) ) {
<p class="form-row form-row-full options"> <p class="form-row form-row-full options">
<label> <label>
<?php esc_html_e( 'Enabled', 'woocommerce' ); ?>: <?php esc_html_e( 'Enabled', 'woocommerce' ); ?>:
<input type="checkbox" class="checkbox" name="variable_enabled[<?php echo $loop; ?>]" <?php checked( in_array( $variation_object->get_status( 'edit' ), array( 'publish', false ), true ), true ); ?> /> <input type="checkbox" class="checkbox" name="variable_enabled[<?php echo esc_attr( $loop ); ?>]" <?php checked( in_array( $variation_object->get_status( 'edit' ), array( 'publish', false ), true ), true ); ?> />
</label> </label>
<label class="tips" data-tip="<?php esc_html_e( 'Enable this option if access is given to a downloadable file upon purchase of a product', 'woocommerce' ); ?>"> <label class="tips" data-tip="<?php esc_html_e( 'Enable this option if access is given to a downloadable file upon purchase of a product', 'woocommerce' ); ?>">
<?php esc_html_e( 'Downloadable', 'woocommerce' ); ?>: <?php esc_html_e( 'Downloadable', 'woocommerce' ); ?>:
@ -144,28 +145,31 @@ if ( ! defined( 'ABSPATH' ) ) {
) )
); );
$sale_price_dates_from = $variation_object->get_date_on_sale_from( 'edit' ) && ( $date = $variation_object->get_date_on_sale_from( 'edit' )->getOffsetTimestamp() ) ? date_i18n( 'Y-m-d', $date ) : ''; $sale_price_dates_from_timestamp = $variation_object->get_date_on_sale_from( 'edit' ) ? $variation_object->get_date_on_sale_from( 'edit' )->getOffsetTimestamp() : false;
$sale_price_dates_to = $variation_object->get_date_on_sale_to( 'edit' ) && ( $date = $variation_object->get_date_on_sale_to( 'edit' )->getOffsetTimestamp() ) ? date_i18n( 'Y-m-d', $date ) : ''; $sale_price_dates_to_timestamp = $variation_object->get_date_on_sale_to( 'edit' ) ? $variation_object->get_date_on_sale_to( 'edit' )->getOffsetTimestamp() : false;
$sale_price_dates_from = $sale_price_dates_from_timestamp ? date_i18n( 'Y-m-d', $sale_price_dates_from_timestamp ) : '';
$sale_price_dates_to = $sale_price_dates_to_timestamp ? date_i18n( 'Y-m-d', $sale_price_dates_to_timestamp ) : '';
echo '<div class="form-field sale_price_dates_fields hidden"> echo '<div class="form-field sale_price_dates_fields hidden">
<p class="form-row form-row-first"> <p class="form-row form-row-first">
<label>' . __( 'Sale start date', 'woocommerce' ) . '</label> <label>' . esc_html__( 'Sale start date', 'woocommerce' ) . '</label>
<input type="text" class="sale_price_dates_from" name="variable_sale_price_dates_from[' . $loop . ']" value="' . esc_attr( $sale_price_dates_from ) . '" placeholder="' . _x( 'From&hellip;', 'placeholder', 'woocommerce' ) . ' YYYY-MM-DD" maxlength="10" pattern="' . esc_attr( apply_filters( 'woocommerce_date_input_html_pattern', '[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])' ) ) . '" /> <input type="text" class="sale_price_dates_from" name="variable_sale_price_dates_from[' . esc_attr( $loop ) . ']" value="' . esc_attr( $sale_price_dates_from ) . '" placeholder="' . esc_attr_x( 'From&hellip;', 'placeholder', 'woocommerce' ) . ' YYYY-MM-DD" maxlength="10" pattern="' . esc_attr( apply_filters( 'woocommerce_date_input_html_pattern', '[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])' ) ) . '" />
</p> </p>
<p class="form-row form-row-last"> <p class="form-row form-row-last">
<label>' . __( 'Sale end date', 'woocommerce' ) . '</label> <label>' . esc_html__( 'Sale end date', 'woocommerce' ) . '</label>
<input type="text" class="sale_price_dates_to" name="variable_sale_price_dates_to[' . esc_attr( $loop ) . ']" value="' . esc_attr( $sale_price_dates_to ) . '" placeholder="' . esc_html_x( 'To&hellip;', 'placeholder', 'woocommerce' ) . ' YYYY-MM-DD" maxlength="10" pattern="' . esc_attr( apply_filters( 'woocommerce_date_input_html_pattern', '[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])' ) ) . '" /> <input type="text" class="sale_price_dates_to" name="variable_sale_price_dates_to[' . esc_attr( $loop ) . ']" value="' . esc_attr( $sale_price_dates_to ) . '" placeholder="' . esc_attr_x( 'To&hellip;', 'placeholder', 'woocommerce' ) . ' YYYY-MM-DD" maxlength="10" pattern="' . esc_attr( apply_filters( 'woocommerce_date_input_html_pattern', '[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])' ) ) . '" />
</p> </p>
</div>'; </div>';
/** /**
* woocommerce_variation_options_pricing action. * Variation options pricing action.
* *
* @since 2.5.0 * @since 2.5.0
* *
* @param int $loop * @param int $loop Position in the loop.
* @param array $variation_data * @param array $variation_data Variation data.
* @param WP_Post $variation * @param WP_Post $variation Post data.
*/ */
do_action( 'woocommerce_variation_options_pricing', $loop, $variation_data, $variation ); do_action( 'woocommerce_variation_options_pricing', $loop, $variation_data, $variation );
?> ?>
@ -207,13 +211,13 @@ if ( ! defined( 'ABSPATH' ) ) {
); );
/** /**
* woocommerce_variation_options_inventory action. * Variation options inventory action.
* *
* @since 2.5.0 * @since 2.5.0
* *
* @param int $loop * @param int $loop Position in the loop.
* @param array $variation_data * @param array $variation_data Variation data.
* @param WP_Post $variation * @param WP_Post $variation Post data.
*/ */
do_action( 'woocommerce_variation_options_inventory', $loop, $variation_data, $variation ); do_action( 'woocommerce_variation_options_inventory', $loop, $variation_data, $variation );
?> ?>
@ -270,7 +274,7 @@ if ( ! defined( 'ABSPATH' ) ) {
printf( printf(
/* translators: %s: dimension unit */ /* translators: %s: dimension unit */
esc_html__( 'Dimensions (L&times;W&times;H) (%s)', 'woocommerce' ), esc_html__( 'Dimensions (L&times;W&times;H) (%s)', 'woocommerce' ),
get_option( 'woocommerce_dimension_unit' ) esc_html( get_option( 'woocommerce_dimension_unit' ) )
); );
?> ?>
</label> </label>
@ -285,13 +289,13 @@ if ( ! defined( 'ABSPATH' ) ) {
} }
/** /**
* woocommerce_variation_options_dimensions action. * Variation options dimensions action.
* *
* @since 2.5.0 * @since 2.5.0
* *
* @param int $loop * @param int $loop Position in the loop.
* @param array $variation_data * @param array $variation_data Variation data.
* @param WP_Post $variation * @param WP_Post $variation Post data.
*/ */
do_action( 'woocommerce_variation_options_dimensions', $loop, $variation_data, $variation ); do_action( 'woocommerce_variation_options_dimensions', $loop, $variation_data, $variation );
?> ?>
@ -330,13 +334,13 @@ if ( ! defined( 'ABSPATH' ) ) {
); );
/** /**
* woocommerce_variation_options_tax action. * Variation options tax action.
* *
* @since 2.5.0 * @since 2.5.0
* *
* @param int $loop * @param int $loop Position in the loop.
* @param array $variation_data * @param array $variation_data Variation data.
* @param WP_Post $variation * @param WP_Post $variation Post data.
*/ */
do_action( 'woocommerce_variation_options_tax', $loop, $variation_data, $variation ); do_action( 'woocommerce_variation_options_tax', $loop, $variation_data, $variation );
} }
@ -370,7 +374,9 @@ if ( ! defined( 'ABSPATH' ) ) {
</thead> </thead>
<tbody> <tbody>
<?php <?php
if ( $downloads = $variation_object->get_downloads( 'edit' ) ) { $downloads = $variation_object->get_downloads( 'edit' );
if ( $downloads ) {
foreach ( $downloads as $key => $file ) { foreach ( $downloads as $key => $file ) {
include 'html-product-variation-download.php'; include 'html-product-variation-download.php';
} }
@ -437,13 +443,13 @@ if ( ! defined( 'ABSPATH' ) ) {
); );
/** /**
* woocommerce_variation_options_download action. * Variation options download action.
* *
* @since 2.5.0 * @since 2.5.0
* *
* @param int $loop * @param int $loop Position in the loop.
* @param array $variation_data * @param array $variation_data Variation data.
* @param WP_Post $variation * @param WP_Post $variation Post data.
*/ */
do_action( 'woocommerce_variation_options_download', $loop, $variation_data, $variation ); do_action( 'woocommerce_variation_options_download', $loop, $variation_data, $variation );
?> ?>

2
includes/data-stores/class-wc-product-data-store-cpt.php
View File

@ -1038,7 +1038,7 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
AND postmeta.meta_value > 0 AND postmeta.meta_value > 0
AND postmeta.meta_value < %s AND postmeta.meta_value < %s
AND postmeta_2.meta_value != postmeta_3.meta_value", AND postmeta_2.meta_value != postmeta_3.meta_value",
current_time( 'timestamp', true ) - DAY_IN_SECONDS current_time( 'timestamp', true )
) )
); );
} }