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 #20482 from woocommerce/fix/20452 

Avoid price setting when synced with children
This commit is contained in:
Claudiu Lodromanean 2018-06-15 09:05:13 -07:00 committed by GitHub
parent fc02687545 9a550c4a35
commit c203ff16d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -594,19 +594,24 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
* @param WC_Product $product Product Object. * @param WC_Product $product Product Object.
*/ */
protected function handle_updated_props( &$product ) { protected function handle_updated_props( &$product ) {
if ( in_array( 'regular_price', $this->updated_props, true ) || in_array( 'sale_price', $this->updated_props, true ) ) { $price_is_synced = $product->is_type( array( 'variable', 'grouped' ) );
if ( $product->get_sale_price( 'edit' ) >= $product->get_regular_price( 'edit' ) ) {
update_post_meta( $product->get_id(), '_sale_price', '' ); if ( ! $price_is_synced ) {
$product->set_sale_price( '' ); if ( in_array( 'regular_price', $this->updated_props, true ) || in_array( 'sale_price', $this->updated_props, true ) ) {
if ( $product->get_sale_price( 'edit' ) >= $product->get_regular_price( 'edit' ) ) {
update_post_meta( $product->get_id(), '_sale_price', '' );
$product->set_sale_price( '' );
}
} }
}
if ( in_array( 'date_on_sale_from', $this->updated_props, true ) || in_array( 'date_on_sale_to', $this->updated_props, true ) || in_array( 'regular_price', $this->updated_props, true ) || in_array( 'sale_price', $this->updated_props, true ) || in_array( 'product_type', $this->updated_props, true ) ) { if ( in_array( 'date_on_sale_from', $this->updated_props, true ) || in_array( 'date_on_sale_to', $this->updated_props, true ) || in_array( 'regular_price', $this->updated_props, true ) || in_array( 'sale_price', $this->updated_props, true ) || in_array( 'product_type', $this->updated_props, true ) ) {
if ( $product->is_on_sale( 'edit' ) ) { if ( $product->is_on_sale( 'edit' ) ) {
update_post_meta( $product->get_id(), '_price', $product->get_sale_price( 'edit' ) ); update_post_meta( $product->get_id(), '_price', $product->get_sale_price( 'edit' ) );
$product->set_price( $product->get_sale_price( 'edit' ) ); $product->set_price( $product->get_sale_price( 'edit' ) );
} else { } else {
update_post_meta( $product->get_id(), '_price', $product->get_regular_price( 'edit' ) ); update_post_meta( $product->get_id(), '_price', $product->get_regular_price( 'edit' ) );
$product->set_price( $product->get_regular_price( 'edit' ) ); $product->set_price( $product->get_regular_price( 'edit' ) );
}
} }
} }

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

@ -74,11 +74,13 @@ class WC_Product_Grouped_Data_Store_CPT extends WC_Product_Data_Store_CPT implem
foreach ( $product->get_children( 'edit' ) as $child_id ) { foreach ( $product->get_children( 'edit' ) as $child_id ) {
$child = wc_get_product( $child_id ); $child = wc_get_product( $child_id );
if ( $child ) { if ( $child ) {
$child_prices[] = $child->get_price(); $child_prices[] = $child->get_price( 'edit' );
} }
} }
$child_prices = array_filter( $child_prices ); $child_prices = array_filter( $child_prices );
delete_post_meta( $product->get_id(), '_price' ); delete_post_meta( $product->get_id(), '_price' );
delete_post_meta( $product->get_id(), '_sale_price' );
delete_post_meta( $product->get_id(), '_regular_price' );
if ( ! empty( $child_prices ) ) { if ( ! empty( $child_prices ) ) {
add_post_meta( $product->get_id(), '_price', min( $child_prices ) ); add_post_meta( $product->get_id(), '_price', min( $child_prices ) );

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

@ -515,6 +515,8 @@ class WC_Product_Variable_Data_Store_CPT extends WC_Product_Data_Store_CPT imple
$prices = $children ? array_unique( $wpdb->get_col( "SELECT meta_value FROM $wpdb->postmeta WHERE meta_key = '_price' AND post_id IN ( " . implode( ',', array_map( 'absint', $children ) ) . ' )' ) ) : array(); // phpcs:ignore WordPress.WP.PreparedSQL.NotPrepared $prices = $children ? array_unique( $wpdb->get_col( "SELECT meta_value FROM $wpdb->postmeta WHERE meta_key = '_price' AND post_id IN ( " . implode( ',', array_map( 'absint', $children ) ) . ' )' ) ) : array(); // phpcs:ignore WordPress.WP.PreparedSQL.NotPrepared
delete_post_meta( $product->get_id(), '_price' ); delete_post_meta( $product->get_id(), '_price' );
delete_post_meta( $product->get_id(), '_sale_price' );
delete_post_meta( $product->get_id(), '_regular_price' );
if ( $prices ) { if ( $prices ) {
sort( $prices ); sort( $prices );

2
tests/unit-tests/product/query.php
View File

@ -31,7 +31,7 @@ class WC_Tests_WC_Product_Query extends WC_Unit_Test_Case {
$product1->set_sale_price( '5.00' ); $product1->set_sale_price( '5.00' );
$product1->save(); $product1->save();
$product2 = new WC_Product_Grouped(); $product2 = new WC_Product_Simple();
$product2->set_sku( 'sku2' ); $product2->set_sku( 'sku2' );
$product2->set_regular_price( '12.50' ); $product2->set_regular_price( '12.50' );
$product2->set_sale_price( '5.00' ); $product2->set_sale_price( '5.00' );