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

More query optimisations

This commit is contained in:
Mike Jolley 2011-09-01 09:33:22 +01:00
parent 9f66eafefb
commit fbfab77f22
4 changed files with 17 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classes/product.class.php
View File

@ -686,10 +686,10 @@ class woocommerce_product {
if ($variation->variation->post_status != 'publish') continue; // Disabled
$attributes = $variation->get_variation_attributes();
$vattributes = $variation->get_variation_attributes();
if (is_array($attributes)) {
foreach ($attributes as $name => $value) {
if (is_array($vattributes)) {
foreach ($vattributes as $name => $value) {
if ($name == $taxonomy) {
$values[] = $value;
}
@ -711,7 +711,7 @@ class woocommerce_product {
$available_attributes[$attribute['name']] = array_unique($values);
}
return $available_attributes;
}

2
templates/loop-shop.php
View File

@ -9,7 +9,7 @@ $loop = 0;
if (!isset($columns) || !$columns) $columns = apply_filters('loop_shop_columns', 4);
if (!isset($per_page) || !$per_page) $per_page = apply_filters('loop_shop_per_page', get_option('posts_per_page'));
if ($per_page !== get_option('posts_per_page')) query_posts( array_merge( $wp_query->query, array( 'posts_per_page' => $per_page ) ) );
//if ($per_page !== get_option('posts_per_page')) query_posts( array_merge( $wp_query->query, array( 'posts_per_page' => $per_page ) ) );
ob_start();

45
woocommerce_query.php
View File

@ -25,13 +25,11 @@ add_filter( 'parse_query', 'woocommerce_parse_query' );
function woocommerce_parse_query( $q ) {
global $woocommerce_query;
if (true == $q->query_vars['suppress_filters']) return;
// Only apply to product categories, the product post archive, the shop page, and product tags
if (!$q->is_tax( 'product_cat' ) && !$q->is_post_type_archive( 'product' ) && !$q->is_page( get_option('woocommerce_shop_page_id') ) && !$q->is_tax( 'product_tag' )) return;
if (true == $q->query_vars['suppress_filters'] || (!$q->is_tax( 'product_cat' ) && !$q->is_post_type_archive( 'product' ) && !$q->is_page( get_option('woocommerce_shop_page_id') ) && !$q->is_tax( 'product_tag' ))) return;
global $woocommerce_query;
$woocommerce_query['meta_query'] = (array) $q->get( 'meta_query' );
// Visibility
@ -53,8 +51,8 @@ function woocommerce_parse_query( $q ) {
endif;
// Ordering
if (isset($_POST['orderby']) && ($_POST['orderby'] != '') ) $_SESSION['orderby'] = $_POST['orderby'];
if (isset($_SESSION['orderby'])) $current_order = $_SESSION['orderby']; else $current_order = 'title';
if (isset($_POST['orderby']) && $_POST['orderby'] != '') $_SESSION['orderby'] = $_POST['orderby'];
$current_order = (isset($_SESSION['orderby'])) ? $_SESSION['orderby'] : 'title';
switch ($current_order) :
case 'date' :
@ -83,8 +81,8 @@ function woocommerce_parse_query( $q ) {
$q->set( 'meta_key', $meta_key );
// Query vars that affect posts shown
$q->set( 'meta_query', $woocommerce_query['meta_query'] );
$q->set( 'post_type', 'product' );
$q->set( 'meta_query', $woocommerce_query['meta_query'] );
$q->set( 'post__in', $woocommerce_query['post__in'] );
// Apply to main loop only
@ -136,6 +134,8 @@ function woocommerce_get_products_in_view() {
/**
* Layered Nav Init
*/
add_action('init', 'woocommerce_layered_nav_init', 1);
function woocommerce_layered_nav_init() {
global $_chosen_attributes, $wpdb;
@ -156,7 +156,6 @@ function woocommerce_layered_nav_init() {
endif;
}
add_action('init', 'woocommerce_layered_nav_init', 1);
/**
* Layered Nav
@ -232,42 +231,16 @@ function woocommerce_price_filter( $filtered_posts ) {
'type' => 'NUMERIC',
'compare' => 'BETWEEN'
)
),
'tax_query' => array(
array(
'taxonomy' => 'product_type',
'field' => 'slug',
'terms' => 'grouped',
'operator' => 'NOT IN'
)
)
));
if ($matched_products_query) :
foreach ($matched_products_query as $product) :
$matched_products[] = $product->ID;
if ($product->post_parent>0) $matched_products[] = $product->post_parent;
endforeach;
endif;
// Get grouped product ids
$grouped_products = get_objects_in_term( get_term_by('slug', 'grouped', 'product_type')->term_id, 'product_type' );
if ($grouped_products) foreach ($grouped_products as $grouped_product) :
if ($children = get_children( 'post_parent='.$grouped_product.'&post_type=product' )) foreach ($children as $product) :
$price = get_post_meta( $product->ID, 'price', true);
if ($price<=$_GET['max_price'] && $price>=$_GET['min_price']) :
$matched_products[] = $grouped_product;
break;
endif;
endforeach;
endforeach;
// Filter the id's
if (sizeof($filtered_posts)==0) :
$filtered_posts = $matched_products;

4
woocommerce_template_functions.php
View File

@ -344,7 +344,9 @@ if (!function_exists('woocommerce_variable_add_to_cart')) {
<td><select id="<?php echo sanitize_title($name); ?>" name="tax_<?php echo sanitize_title($name); ?>">
<option value=""><?php echo __('Choose an option', 'woothemes') ?>&hellip;</option>
<?php if(is_array($options)) : ?>
<option><?php echo implode('</option><option>', $options); ?></option>
<?php foreach ($options as $option) : $option_term = get_term_by('slug', $option, woocommerce::attribute_name($name)); ?>
<?php echo '<option value="'.$option.'">'.$option_term->name.'</option>'; ?>
<?php endforeach; ?>
<?php endif;?>
</td>
</tr>