diff --git a/categories.php b/categories.php index 6a93c13f..c48bd942 100644 --- a/categories.php +++ b/categories.php @@ -39,7 +39,12 @@ if(isset($_GET['o'])){ //Rebuild URL $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o))); -$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM categories WHERE (category_name LIKE '%$q%' OR category_type LIKE '%$q%') AND company_id = $session_company_id ORDER BY $sb $o LIMIT $record_from, $record_to"); +$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM categories + WHERE (category_name LIKE '%$q%' OR category_type LIKE '%$q%') + AND category_archived_at IS NULL + AND company_id = $session_company_id + ORDER BY $sb $o LIMIT $record_from, $record_to" +); $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); diff --git a/taxes.php b/taxes.php index 84435392..5de5b7b9 100644 --- a/taxes.php +++ b/taxes.php @@ -22,7 +22,11 @@ if(isset($_GET['o'])){ //Rebuild URL $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o))); -$sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session_company_id ORDER BY $sb $o"); +$sql = mysqli_query($mysqli,"SELECT * FROM taxes + WHERE tax_archived_at IS NULL + AND company_id = $session_company_id + ORDER BY $sb $o" +); $num_rows = mysqli_num_rows($sql); diff --git a/vendors.php b/vendors.php index 4e08a84a..ee9013ba 100644 --- a/vendors.php +++ b/vendors.php @@ -50,10 +50,12 @@ if(!empty($_GET['dtf'])){ //Rebuild URL $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o))); -$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM vendors WHERE client_id = 0 - AND company_id = $session_company_id +$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM vendors + WHERE client_id = 0 AND DATE(vendor_created_at) BETWEEN '$dtf' AND '$dtt' AND (vendor_name LIKE '%$q%' OR vendor_description LIKE '%$q%' OR vendor_account_number LIKE '%$q%') + AND vendor_archived_at IS NULL + AND company_id = $session_company_id ORDER BY $sb $o LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));