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

Fixes after rebasing. 

- Fix a call to get_available_variations with incorrect optional arguments.
- Add code that has been removed in WC_Product_Variable::get_available_variations.
This commit is contained in:
Nestor Soriano 2020-07-28 09:15:17 +02:00
parent 2283a4c7fd
commit bc7085b3c4
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
includes/class-wc-product-variable.php
View File

@ -299,18 +299,20 @@ class WC_Product_Variable extends WC_Product {
$variation = wc_get_product( $variation_id );
// Hide out of stock variations if 'Hide out of stock items from the catalog' is checked.
if ( ! $variation || ! $variation->exists() || ( 'yes' === get_option( 'woocommerce_hide_out_of_stock_items' ) && ! $variation->is_in_stock() ) ) {
continue;
}
// Filter 'woocommerce_hide_invisible_variations' to optionally hide invisible variations (disabled variations and variations with empty price).
if ( apply_filters( 'woocommerce_hide_invisible_variations', true, $this->get_id(), $variation ) && ! $variation->variation_is_visible() ) {
continue;
}
if ( ! $render_variations ) {
$available_variations[] = $variation;
continue;
}
if ( $this->variation_is_available( $variation ) ) {
if ( $render_variations ) {
$available_variations[] = $return_array_of_data ? $this->get_available_variation( $variation ) : $variation;
} else {
$available_variations[] = $variation;
}
}
@ -620,7 +622,7 @@ class WC_Product_Variable extends WC_Product {
}
);
$variations = $this->get_available_variations( false );
$variations = $this->get_available_variations( true, false );
foreach ( $variations as $variation ) {
if ( $this->variation_matches_filters( $variation, $attributes_with_terms ) ) {
return true;