diff --git a/clients.php b/clients.php index 49dcce60..62e3779e 100644 --- a/clients.php +++ b/clients.php @@ -4,6 +4,7 @@ $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o))); +//Paging if(isset($_GET['p'])){ $p = intval($_GET['p']); $record_from = (($p)-1)*10; @@ -14,18 +15,21 @@ if(isset($_GET['p'])){ $p = 1; } +//Custom Query Filter if(isset($_GET['q'])){ $q = mysqli_real_escape_string($mysqli,$_GET['q']); }else{ $q = ""; } +//Column Filter if(!empty($_GET['sb'])){ $sb = mysqli_real_escape_string($mysqli,$_GET['sb']); }else{ $sb = "client_id"; } +//Column Order Filter if(isset($_GET['o'])){ if($_GET['o'] == 'ASC'){ $o = "ASC"; @@ -39,7 +43,16 @@ if(isset($_GET['o'])){ $disp = "ASC"; } -$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM clients WHERE (client_name LIKE '%$q%' OR client_email LIKE '%$q%' OR client_contact LIKE '%$q%') AND company_id = $session_company_id ORDER BY $sb $o LIMIT $record_from, $record_to"); +//Date From and Date To Filter +if(isset($_GET['dtf'])){ + $dtf = $_GET['dtf']; + $dtt = $_GET['dtt']; +}else{ + $dtf = "0000-00-00"; + $dtt = "9999-00-00"; +} + +$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM clients WHERE (client_name LIKE '%$q%' OR client_email LIKE '%$q%' OR client_contact LIKE '%$q%') AND DATE(client_created_at) BETWEEN '$dtf' AND '$dtt' 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/dashboard.php b/dashboard.php index 379336ad..27bb1959 100644 --- a/dashboard.php +++ b/dashboard.php @@ -103,7 +103,7 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
-
+

$

Total Incomes

@@ -113,13 +113,13 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
-
+
-
+

$

Total Expenses

@@ -127,7 +127,7 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
-
+
@@ -147,7 +147,7 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
-
+

Miles Driven

@@ -155,13 +155,13 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
-
+
-
+

New Clients

@@ -169,13 +169,13 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
-
+
-
+

New Vendors

@@ -183,7 +183,7 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
-
+
diff --git a/expenses.php b/expenses.php index e523d78a..15aefdd0 100644 --- a/expenses.php +++ b/expenses.php @@ -39,11 +39,21 @@ $disp = "ASC"; } + //Date From and Date To Filter + if(isset($_GET['dtf'])){ + $dtf = $_GET['dtf']; + $dtt = $_GET['dtt']; + }else{ + $dtf = "0000-00-00"; + $dtt = "9999-00-00"; + } + $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM expenses, categories, vendors, accounts WHERE expenses.category_id = categories.category_id AND expenses.vendor_id = vendors.vendor_id AND expenses.account_id = accounts.account_id AND expenses.company_id = $session_company_id + AND DATE(expense_date) BETWEEN '$dtf' AND '$dtt' AND (vendor_name LIKE '%$q%' OR category_name LIKE '%$q%' OR account_name LIKE '%$q%' OR expense_description LIKE '%$q%') ORDER BY $sb $o LIMIT $record_from, $record_to"); diff --git a/payments.php b/payments.php index ca004d03..e935ef59 100644 --- a/payments.php +++ b/payments.php @@ -39,12 +39,22 @@ $disp = "ASC"; } + //Date From and Date To Filter + if(isset($_GET['dtf'])){ + $dtf = $_GET['dtf']; + $dtt = $_GET['dtt']; + }else{ + $dtf = "0000-00-00"; + $dtt = "9999-00-00"; + } + $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM payments, invoices, clients, accounts WHERE invoices.client_id = clients.client_id AND payments.invoice_id = invoices.invoice_id AND payments.account_id = accounts.account_id AND payments.company_id = $session_company_id - AND (invoice_number LIKE '%$q%' OR client_name LIKE '%$q%' OR account_name LIKE '%$q%' OR payment_method LIKE '%$q%') + AND DATE(payment_date) BETWEEN '$dtf' AND '$dtt' + AND (invoice_number LIKE '%$q%' OR client_name LIKE '%$q%' OR account_name LIKE '%$q%' OR payment_method LIKE '%$q%' OR payment_reference LIKE '%$q%') ORDER BY $sb $o LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); @@ -77,6 +87,7 @@ Amount Account Method + Reference @@ -89,6 +100,7 @@ $payment_date = $row['payment_date']; $payment_method = $row['payment_method']; $payment_amount = $row['payment_amount']; + $payment_reference = $row['payment_reference']; $client_id = $row['client_id']; $client_name = $row['client_name']; $account_name = $row['account_name']; @@ -103,6 +115,7 @@ +
- +
@@ -74,7 +74,7 @@ $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_ ?> - + - + - + - +
Category$-01&dtt=-31">$ $$
$-01&dtt=-31">$ $$
diff --git a/trips.php b/trips.php index 54dce2ef..a5fad4a1 100644 --- a/trips.php +++ b/trips.php @@ -39,8 +39,18 @@ $disp = "ASC"; } + //Date From and Date To Filter + if(isset($_GET['dtf'])){ + $dtf = $_GET['dtf']; + $dtt = $_GET['dtt']; + }else{ + $dtf = "0000-00-00"; + $dtt = "9999-00-00"; + } + $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM trips WHERE (trip_purpose LIKE '%$q%' OR trip_starting_location LIKE '%$q%' OR trip_destination LIKE '%$q%') + AND DATE(trip_date) BETWEEN '$dtf' AND '$dtt' AND company_id = $session_company_id ORDER BY $sb $o LIMIT $record_from, $record_to"); diff --git a/vendors.php b/vendors.php index 7400be77..13b71c79 100644 --- a/vendors.php +++ b/vendors.php @@ -34,7 +34,20 @@ $o = "DESC"; $disp = "ASC"; } - $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM vendors WHERE client_id = 0 AND company_id = $session_company_id AND (vendor_name LIKE '%$q%' OR vendor_description LIKE '%$q%' OR vendor_account_number LIKE '%$q%') + + //Date From and Date To Filter + if(isset($_GET['dtf'])){ + $dtf = $_GET['dtf']; + $dtt = $_GET['dtt']; + }else{ + $dtf = "0000-00-00"; + $dtt = "9999-00-00"; + } + + $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM vendors WHERE client_id = 0 + AND company_id = $session_company_id + 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%') ORDER BY $sb $o LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $total_found_rows = $num_rows[0];