Skip to content

Simplify count of products and subcategories using the dedicated functio... #207

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

Open
acidvertigo wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Simplify count of products and subcategories using the dedicated functio... #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9be7d00
Simplify count of products and subcategories using the dedicated func…
acidvertigo Aug 25, 2014
6fa6fdc
remove implicit true check
acidvertigo Aug 25, 2014
7460ee7
fix to not count also subcategories
acidvertigo Aug 25, 2014
e2c106e
Fix tep_count_products_in_category to check if the current category h…
acidvertigo Aug 25, 2014
23ec5a8
Merge pull request #43 from osCommerce/master
acidvertigo Aug 25, 2014
819883f
Merge pull request #46 from osCommerce/master
acidvertigo Aug 26, 2014
dacc46f
Merge pull request #57 from osCommerce/master
acidvertigo Aug 27, 2014
6f9ea8c
Merge pull request #65 from osCommerce/master
acidvertigo Sep 2, 2014
d32c19c
Merge pull request #81 from osCommerce/master
acidvertigo Oct 6, 2014
5891b9b
Merge pull request #101 from osCommerce/master
acidvertigo Oct 7, 2014
270a350
Merge pull request #126 from osCommerce/master
acidvertigo Nov 3, 2014
4113bda
Merge pull request #152 from osCommerce/master
acidvertigo Nov 7, 2014
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
14 changes: 8 additions & 6 deletions catalog/includes/functions/general.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ function tep_calculate_tax($price, $tax) {
////
// Return the number of products in a category
// TABLES: products, products_to_categories, categories
function tep_count_products_in_category($category_id, $include_inactive = false) {
function tep_count_products_in_category($category_id, $include_inactive = false, $count_subs = true) {
$products_count = 0;
if ($include_inactive == true) {
$products_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c where p.products_id = p2c.products_id and p2c.categories_id = '" . (int)$category_id . "'");
Expand All @@ -404,11 +404,13 @@ function tep_count_products_in_category($category_id, $include_inactive = false)
$products = tep_db_fetch_array($products_query);
$products_count += $products['total'];

$child_categories_query = tep_db_query("select categories_id from " . TABLE_CATEGORIES . " where parent_id = '" . (int)$category_id . "'");
if (tep_db_num_rows($child_categories_query)) {
while ($child_categories = tep_db_fetch_array($child_categories_query)) {
$products_count += tep_count_products_in_category($child_categories['categories_id'], $include_inactive);
}
if ($count_subs == true) {
$child_categories_query = tep_db_query("select categories_id from " . TABLE_CATEGORIES . " where parent_id = '" . (int)$category_id . "'");
if (tep_db_num_rows($child_categories_query)) {
while ($child_categories = tep_db_fetch_array($child_categories_query)) {
$products_count += tep_count_products_in_category($child_categories['categories_id'], $include_inactive, $count_subs);
}
}
}

return $products_count;
Expand Down
14 changes: 6 additions & 8 deletions catalog/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,17 @@

// the following cPath references come from application_top.php
$category_depth = 'top';

if (isset($cPath) && tep_not_null($cPath)) {
$categories_products_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_TO_CATEGORIES . " where categories_id = '" . (int)$current_category_id . "'");
$categories_products = tep_db_fetch_array($categories_products_query);
if ($categories_products['total'] > 0) {

if (tep_count_products_in_category($current_category_id, false, false) > 0) {
$category_depth = 'products'; // display products
} else {
$category_parent_query = tep_db_query("select count(*) as total from " . TABLE_CATEGORIES . " where parent_id = '" . (int)$current_category_id . "'");
$category_parent = tep_db_fetch_array($category_parent_query);
if ($category_parent['total'] > 0) {
}

if (tep_has_category_subcategories($current_category_id)) {
$category_depth = 'nested'; // navigate through the categories
} else {
$category_depth = 'products'; // category has no products, but display the 'no products' message
}
}
}

Expand Down