Merge pull request #16094 from woocommerce/fix/15256

Check we have an object before using product props
This commit is contained in:
Claudiu Lodromanean 2017-07-12 08:25:04 -07:00 committed by GitHub
commit 14aaebd3f5
1 changed files with 19 additions and 17 deletions

View File

@ -416,18 +416,19 @@ function wc_scheduled_sales() {
$product_ids = $data_store->get_starting_sales();
if ( $product_ids ) {
foreach ( $product_ids as $product_id ) {
$product = wc_get_product( $product_id );
$sale_price = $product->get_sale_price();
if ( $product = wc_get_product( $product_id ) ) {
$sale_price = $product->get_sale_price();
if ( $sale_price ) {
$product->set_price( $sale_price );
$product->set_date_on_sale_from( '' );
} else {
$product->set_date_on_sale_to( '' );
$product->set_date_on_sale_from( '' );
if ( $sale_price ) {
$product->set_price( $sale_price );
$product->set_date_on_sale_from( '' );
} else {
$product->set_date_on_sale_to( '' );
$product->set_date_on_sale_from( '' );
}
$product->save();
}
$product->save();
}
delete_transient( 'wc_products_onsale' );
@ -437,13 +438,14 @@ function wc_scheduled_sales() {
$product_ids = $data_store->get_ending_sales();
if ( $product_ids ) {
foreach ( $product_ids as $product_id ) {
$product = wc_get_product( $product_id );
$regular_price = $product->get_regular_price();
$product->set_price( $regular_price );
$product->set_sale_price( '' );
$product->set_date_on_sale_to( '' );
$product->set_date_on_sale_from( '' );
$product->save();
if ( $product = wc_get_product( $product_id ) ) {
$regular_price = $product->get_regular_price();
$product->set_price( $regular_price );
$product->set_sale_price( '' );
$product->set_date_on_sale_to( '' );
$product->set_date_on_sale_from( '' );
$product->save();
}
}
WC_Cache_Helper::get_transient_version( 'product', true );