This repository has been archived by the owner on Feb 23, 2024. It is now read-only.
Products block: tax_query should be calculated only if __woocommerceAttributes is valid #9049
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…s valid This commit refactors the update_rest_query method in the ProductQuery.php file to improve code readability. It simplifies conditional expressions by introducing variables for clarity, and uses ternary operators to streamline the logic.
|
The release ZIP for this PR is accessible via: Script Dependencies ReportThere is no changed script dependency between this branch and trunk. This comment was automatically generated by the TypeScript Errors Report
🎉 🎉 This PR does not introduce new TS errors. |
|
Size Change: 0 B Total Size: 1.11 MB ℹ️ View Unchanged
|
imanish003
changed the title
imanish003
added
type: bug
woocommercebot
requested review from
a team and
Aljullu
and removed request for
a team
Aljullu
approved these changes
Apr 14, 2023
There was a problem hiding this comment.
Code looks good and it's testing as described, so approving. 🚀 I only left one comment inline about returning early. Besides that, I see there is no changelog entry in the PR, is that intentional? I think this change might be worth mentioning in the changelog.
| $tax_query = $this->merge_tax_queries( $attributes_query, $visibility_query ); | ||
| public function update_rest_query( $args, $request ): array { | ||
| $woo_attributes = $request->get_param( '__woocommerceAttributes' ); | ||
| $is_valid_attributes = is_array( $woo_attributes ); |
There was a problem hiding this comment.
Could we return early at this point? Ie:
if ( ! is_array( $woo_attributes ) ) {
return $args;
}There was a problem hiding this comment.
Besides that, I see there is no changelog entry in the PR, is that intentional? I think this change might be worth mentioning in the changelog.
To be honest, I wasn't completely certain if this needed a changelog entry. However, I've now added one just in case. 🙂
There was a problem hiding this comment.
Could we return early at this point? Ie:
I considered adding an early return, but I realized we are using three attributes:
- __woocommerceStockStatus
- __woocommerceAttributes
- __woocommerceStockStatus
What if __woocommerceAttributes is null, but the other attributes have correct values? I wanted to avoid this corner case. However, I'm not certain if this situation will ever occur. 🤷🏻♂️
There was a problem hiding this comment.
Oh, right, I didn't think that __woocommerceAttributes could be undefined while the other could be defined. 😅
There was a problem hiding this comment.
@Aljullu In my opinion, let's maintain the current implementation for now so we can release the fix. If necessary, I can revisit and make adjustments later. Does that sounds good to you? 🙂
gigitux
pushed a commit
that referenced
this pull request
Apr 18, 2023
…s valid (#9049) This commit refactors the update_rest_query method in the ProductQuery.php file to improve code readability. It simplifies conditional expressions by introducing variables for clarity, and uses ternary operators to streamline the logic.
gigitux
added a commit
that referenced
this pull request
Apr 18, 2023
* Single Product Template - Compatibility Layer: don't skip custom HTML (#9075) * Fix: tax_query should be calculated only if __woocommerceAttributes is valid (#9049) This commit refactors the update_rest_query method in the ProductQuery.php file to improve code readability. It simplifies conditional expressions by introducing variables for clarity, and uses ternary operators to streamline the logic. * Blockfied Single Product Template: Add support for template for specific product (#9069) * Product Price Block: remove ProductSelector (#8980) * Empty commit for release pull request * Make Woo_Directive_Store PHP 7.3 compatible (#9033) * update version * add changelog * add testing instructions * update zip link file testing * Update docs/internal-developers/testing/releases/1001.md Co-authored-by: Albert Juhé Lluveras <[email protected]> --------- Co-authored-by: Luigi Teschio <[email protected]> Co-authored-by: Manish Menaria <[email protected]> Co-authored-by: github-actions <[email protected]> Co-authored-by: Viktor Szépe <[email protected]> Co-authored-by: Albert Juhé Lluveras <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I've added a check to calculate
$tax_queryonly if a valid__woocommerceAttributesattribute is present, which resolves issue #8765.Additionally, I've refactored the update_rest_query method in the ProductQuery.php file to enhance code readability. This involves simplifying conditional expressions with variables and using ternary operators to streamline logic.
Fixes #8765
Testing
20in the code above. If you don't have any products withproduct_cat=20, feel free to change the category ID.trunkbranch and repeat steps 4 and 5. Due to the bug, you will observe that both array items contain all products, meaning thatproduct_cat=20won't work for the second query path ("/wp/v2/product?per_page=100&product_cat=20").WooCommerce Visibility
Changelog