Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Limit WooCommerce integration with ability to allow it #2914

Closed
wants to merge 13 commits into from
Closed

Limit WooCommerce integration with ability to allow it #2914

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a235778
Limit WooCommerce integration with ability to allow it
Aug 1, 2022
b7c8f5b
Modify Test for WooCommerce Integration
Aug 3, 2022
49d0fbe
Allow WooCommerce integration for admins
Aug 3, 2022
26ceda6
Add check for ep_integrate
Aug 10, 2022
ed8e96e
Remove extra code
Aug 10, 2022
c3e41ea
Merge branch 'develop' into feature/2809
felipeelia Aug 15, 2022
34a8820
Paramater to allow the integration
Aug 22, 2022
bacbca6
Merge branch 'feature/2809' of github.com:10up/ElasticPress into feat…
Aug 22, 2022
f66b880
Code improvement
Sep 6, 2022
73b8a39
Merge branch 'develop' into feature/2809
oscarssanchez Sep 20, 2022
fc8818f
Merge branch 'develop' of github.com:10up/ElasticPress into feature/2809
MARQAS Dec 6, 2022
121abd0
No integration on single prod pages
MARQAS Dec 13, 2022
4922539
Add the Preview check
burhandodhy Jan 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add check for ep_integrate
  • Loading branch information
Mohammed Razzaq authored and Mohammed Razzaq committed Aug 10, 2022
commit 26ceda65c3ea82063b8e7cb1bd62e3b6ee2b9733
7 changes: 5 additions & 2 deletions includes/classes/Feature/WooCommerce/WooCommerce.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,11 +1117,14 @@ protected function should_integrate_with_query( $query ) {
* @param {WP_Query} $query WP Query to evaluate
* @return {bool} New skip value
*/
if ( apply_filters( 'ep_skip_query_integration', false, $query ) ||
( isset( $query->query_vars['ep_integrate'] ) && ! filter_var( $query->query_vars['ep_integrate'], FILTER_VALIDATE_BOOLEAN ) ) ) {
if ( apply_filters( 'ep_skip_query_integration', false, $query ) ) {
return false;
}

if ( isset( $query->query_vars['ep_integrate'] ) && filter_var( $query->query_vars['ep_integrate'], FILTER_VALIDATE_BOOLEAN ) ) {
return true;
}

if ( ! Utils\is_integrated_request( $this->slug ) ) {
return false;
}
Expand Down
6 changes: 0 additions & 6 deletions tests/php/features/TestWooCommerce.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@ public function testProductsPostTypeQueryOn() {

add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );

// Pretend that we've enabled the WooCommerce integration.
add_filter( 'ep_woocommerce_integration', '__return_true' );

$args = array(
'post_type' => 'product',
'ep_integrate' => true,
Expand Down Expand Up @@ -109,9 +106,6 @@ public function testProductsPostTypeQueryProductCatTax() {

add_action( 'ep_wp_query_search', array( $this, 'action_wp_query_search' ), 10, 0 );

// Pretend that we've enabled the WooCommerce integration.
add_filter( 'ep_woocommerce_integration', '__return_true' );

$args = array(
'ep_integrate' => true,
'tax_query' => array(
Expand Down