diff --git a/products.php b/products.php index cd1214da..9a8116fb 100644 --- a/products.php +++ b/products.php @@ -12,9 +12,11 @@ $url_query_strings_sort = http_build_query(array_merge($_GET, array('sort' => $s $sql = mysqli_query( $mysqli, - "SELECT SQL_CALC_FOUND_ROWS * FROM products LEFT JOIN categories ON product_category_id = category_id + "SELECT SQL_CALC_FOUND_ROWS * FROM products + LEFT JOIN categories ON product_category_id = category_id + LEFT JOIN taxes ON product_tax_id = tax_id WHERE product_archived_at IS NULL - AND (product_name LIKE '%$q%' OR product_description LIKE '%$q%' OR category_name LIKE '%$q%' OR product_price LIKE '%$q%') + AND (product_name LIKE '%$q%' OR product_description LIKE '%$q%' OR category_name LIKE '%$q%' OR product_price LIKE '%$q%' OR tax_name LIKE '%$q%' OR tax_percent LIKE '%$q%') ORDER BY $sort $order LIMIT $record_from, $record_to" ); @@ -51,7 +53,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Name Category Description + Tax Name + Tax Rate Price + Action @@ -73,13 +78,24 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $category_id = intval($row['category_id']); $category_name = nullable_htmlentities($row['category_name']); $product_tax_id = intval($row['product_tax_id']); + $tax_name = nullable_htmlentities($row['tax_name']); + if (empty($tax_name)) { + $tax_name_display = "-"; + } else { + $tax_name_display = $tax_name; + } + $tax_percent = intval($row['tax_percent']); + ?> + + % +