From 35c5fa1e5e238da0875faedbb5e1ef094b45b6a3 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 10 Aug 2021 22:21:53 -0400 Subject: [PATCH] Added Canned Dates to the rest of listings --- client_side_nav.php | 2 +- expenses.php | 44 ++++++++++++++++++++++++++++++++++++++-- invoices.php | 44 ++++++++++++++++++++++++++++++++++++++-- payments.php | 44 ++++++++++++++++++++++++++++++++++++++-- quotes.php | 44 ++++++++++++++++++++++++++++++++++++++-- recurring.php | 46 +++++++++++++++++++++++++++++++++++++++--- revenues.php | 44 ++++++++++++++++++++++++++++++++++++++-- tickets.php | 44 ++++++++++++++++++++++++++++++++++++++-- transfers.php | 49 ++++++++++++++++++++++++++++++++++++++++++--- trips.php | 44 ++++++++++++++++++++++++++++++++++++++-- 10 files changed, 384 insertions(+), 21 deletions(-) diff --git a/client_side_nav.php b/client_side_nav.php index 74df2537..e32f5377 100644 --- a/client_side_nav.php +++ b/client_side_nav.php @@ -45,7 +45,7 @@ -
  • ASSETS
    • +
  • ASSETS
  • "> diff --git a/expenses.php b/expenses.php index bbe59557..d221cd96 100644 --- a/expenses.php +++ b/expenses.php @@ -36,10 +36,34 @@ if(isset($_GET['o'])){ $disp = "ASC"; } -//Date From and Date To Filter -if(!empty($_GET['dtf'])){ +//Date Filter +if($_GET['canned_date'] =="custom"){ $dtf = $_GET['dtf']; $dtt = $_GET['dtt']; +}elseif($_GET['canned_date'] == "today"){ + $dtf = date('Y-m-d'); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "yesterday"){ + $dtf = date('Y-m-d',strtotime("yesterday")); + $dtt = date('Y-m-d',strtotime("yesterday")); +}elseif($_GET['canned_date'] == "thisweek"){ + $dtf = date('Y-m-d',strtotime("monday this week")); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "lastweek"){ + $dtf = date('Y-m-d',strtotime("monday last week")); + $dtt = date('Y-m-d',strtotime("sunday last week")); +}elseif($_GET['canned_date'] == "thismonth"){ + $dtf = date('Y-m-01'); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "lastmonth"){ + $dtf = date('Y-m-d',strtotime("first day of last month")); + $dtt = date('Y-m-d',strtotime("last day of last month")); +}elseif($_GET['canned_date'] == "thisyear"){ + $dtf = date('Y-01-01'); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "lastyear"){ + $dtf = date('Y-m-d',strtotime("first day of january last year")); + $dtt = date('Y-m-d',strtotime("last day of december last year")); }else{ $dtf = "0000-00-00"; $dtt = "9999-00-00"; @@ -84,6 +108,22 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    " id="advancedFilter">
    +
    +
    + + +
    +
    diff --git a/invoices.php b/invoices.php index 4e134ba6..51473e08 100644 --- a/invoices.php +++ b/invoices.php @@ -87,10 +87,34 @@ $disp = "ASC"; } - //Date From and Date To Filter - if(!empty($_GET['dtf'])){ + //Date Filter + if($_GET['canned_date'] =="custom"){ $dtf = $_GET['dtf']; $dtt = $_GET['dtt']; + }elseif($_GET['canned_date'] == "today"){ + $dtf = date('Y-m-d'); + $dtt = date('Y-m-d'); + }elseif($_GET['canned_date'] == "yesterday"){ + $dtf = date('Y-m-d',strtotime("yesterday")); + $dtt = date('Y-m-d',strtotime("yesterday")); + }elseif($_GET['canned_date'] == "thisweek"){ + $dtf = date('Y-m-d',strtotime("monday this week")); + $dtt = date('Y-m-d'); + }elseif($_GET['canned_date'] == "lastweek"){ + $dtf = date('Y-m-d',strtotime("monday last week")); + $dtt = date('Y-m-d',strtotime("sunday last week")); + }elseif($_GET['canned_date'] == "thismonth"){ + $dtf = date('Y-m-01'); + $dtt = date('Y-m-d'); + }elseif($_GET['canned_date'] == "lastmonth"){ + $dtf = date('Y-m-d',strtotime("first day of last month")); + $dtt = date('Y-m-d',strtotime("last day of last month")); + }elseif($_GET['canned_date'] == "thisyear"){ + $dtf = date('Y-01-01'); + $dtt = date('Y-m-d'); + }elseif($_GET['canned_date'] == "lastyear"){ + $dtf = date('Y-m-d',strtotime("first day of january last year")); + $dtt = date('Y-m-d',strtotime("last day of december last year")); }else{ $dtf = "0000-00-00"; $dtt = "9999-00-00"; @@ -193,6 +217,22 @@
    " id="advancedFilter">
    +
    +
    + + +
    +
    diff --git a/payments.php b/payments.php index 4e587ecb..b7d1cce3 100644 --- a/payments.php +++ b/payments.php @@ -36,10 +36,34 @@ if(isset($_GET['o'])){ $disp = "ASC"; } -//Date From and Date To Filter -if(!empty($_GET['dtf'])){ +//Date Filter +if($_GET['canned_date'] =="custom"){ $dtf = $_GET['dtf']; $dtt = $_GET['dtt']; +}elseif($_GET['canned_date'] == "today"){ + $dtf = date('Y-m-d'); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "yesterday"){ + $dtf = date('Y-m-d',strtotime("yesterday")); + $dtt = date('Y-m-d',strtotime("yesterday")); +}elseif($_GET['canned_date'] == "thisweek"){ + $dtf = date('Y-m-d',strtotime("monday this week")); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "lastweek"){ + $dtf = date('Y-m-d',strtotime("monday last week")); + $dtt = date('Y-m-d',strtotime("sunday last week")); +}elseif($_GET['canned_date'] == "thismonth"){ + $dtf = date('Y-m-01'); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "lastmonth"){ + $dtf = date('Y-m-d',strtotime("first day of last month")); + $dtt = date('Y-m-d',strtotime("last day of last month")); +}elseif($_GET['canned_date'] == "thisyear"){ + $dtf = date('Y-01-01'); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "lastyear"){ + $dtf = date('Y-m-d',strtotime("first day of january last year")); + $dtt = date('Y-m-d',strtotime("last day of december last year")); }else{ $dtf = "0000-00-00"; $dtt = "9999-00-00"; @@ -82,6 +106,22 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    " id="advancedFilter">
    +
    +
    + + +
    +
    diff --git a/quotes.php b/quotes.php index fa62eac5..92518fee 100644 --- a/quotes.php +++ b/quotes.php @@ -38,10 +38,34 @@ if(isset($_GET['o'])){ $disp = "ASC"; } -//Date From and Date To Filter -if(!empty($_GET['dtf'])){ +//Date Filter +if($_GET['canned_date'] =="custom"){ $dtf = $_GET['dtf']; $dtt = $_GET['dtt']; +}elseif($_GET['canned_date'] == "today"){ + $dtf = date('Y-m-d'); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "yesterday"){ + $dtf = date('Y-m-d',strtotime("yesterday")); + $dtt = date('Y-m-d',strtotime("yesterday")); +}elseif($_GET['canned_date'] == "thisweek"){ + $dtf = date('Y-m-d',strtotime("monday this week")); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "lastweek"){ + $dtf = date('Y-m-d',strtotime("monday last week")); + $dtt = date('Y-m-d',strtotime("sunday last week")); +}elseif($_GET['canned_date'] == "thismonth"){ + $dtf = date('Y-m-01'); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "lastmonth"){ + $dtf = date('Y-m-d',strtotime("first day of last month")); + $dtt = date('Y-m-d',strtotime("last day of last month")); +}elseif($_GET['canned_date'] == "thisyear"){ + $dtf = date('Y-01-01'); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "lastyear"){ + $dtf = date('Y-m-d',strtotime("first day of january last year")); + $dtt = date('Y-m-d',strtotime("last day of december last year")); }else{ $dtf = "0000-00-00"; $dtt = "9999-00-00"; @@ -85,6 +109,22 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    " id="advancedFilter">
    +
    +
    + + +
    +
    diff --git a/recurring.php b/recurring.php index bf1f7581..366ac187 100644 --- a/recurring.php +++ b/recurring.php @@ -36,10 +36,34 @@ if(isset($_GET['o'])){ $disp = "DESC"; } -//Date From and Date To Filter -if(!empty($_GET['dtf'])){ +//Date Filter +if($_GET['canned_date'] =="custom"){ $dtf = $_GET['dtf']; $dtt = $_GET['dtt']; +}elseif($_GET['canned_date'] == "today"){ + $dtf = date('Y-m-d'); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "yesterday"){ + $dtf = date('Y-m-d',strtotime("yesterday")); + $dtt = date('Y-m-d',strtotime("yesterday")); +}elseif($_GET['canned_date'] == "thisweek"){ + $dtf = date('Y-m-d',strtotime("monday this week")); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "lastweek"){ + $dtf = date('Y-m-d',strtotime("monday last week")); + $dtt = date('Y-m-d',strtotime("sunday last week")); +}elseif($_GET['canned_date'] == "thismonth"){ + $dtf = date('Y-m-01'); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "lastmonth"){ + $dtf = date('Y-m-d',strtotime("first day of last month")); + $dtt = date('Y-m-d',strtotime("last day of last month")); +}elseif($_GET['canned_date'] == "thisyear"){ + $dtf = date('Y-01-01'); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "lastyear"){ + $dtf = date('Y-m-d',strtotime("first day of january last year")); + $dtt = date('Y-m-d',strtotime("last day of december last year")); }else{ $dtf = "0000-00-00"; $dtt = "9999-00-00"; @@ -53,7 +77,7 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM recurring, client AND recurring.category_id = categories.category_id AND recurring.company_id = $session_company_id AND (CONCAT(recurring_prefix,recurring_number) LIKE '%$q%' OR recurring_frequency LIKE '%$q%' OR recurring_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR category_name LIKE '%$q%') - AND DATE(recurring_next_date) BETWEEN '$dtf' AND '$dtt' + AND DATE(recurring_last_sent) BETWEEN '$dtf' AND '$dtt' ORDER BY $sb $o LIMIT $record_from, $record_to"); $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); @@ -83,6 +107,22 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    " id="advancedFilter">
    +
    +
    + + +
    +
    diff --git a/revenues.php b/revenues.php index e2c863fb..ea53e1bf 100644 --- a/revenues.php +++ b/revenues.php @@ -36,10 +36,34 @@ if(isset($_GET['o'])){ $disp = "ASC"; } -//Date From and Date To Filter -if(!empty($_GET['dtf'])){ +//Date Filter +if($_GET['canned_date'] =="custom"){ $dtf = $_GET['dtf']; $dtt = $_GET['dtt']; +}elseif($_GET['canned_date'] == "today"){ + $dtf = date('Y-m-d'); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "yesterday"){ + $dtf = date('Y-m-d',strtotime("yesterday")); + $dtt = date('Y-m-d',strtotime("yesterday")); +}elseif($_GET['canned_date'] == "thisweek"){ + $dtf = date('Y-m-d',strtotime("monday this week")); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "lastweek"){ + $dtf = date('Y-m-d',strtotime("monday last week")); + $dtt = date('Y-m-d',strtotime("sunday last week")); +}elseif($_GET['canned_date'] == "thismonth"){ + $dtf = date('Y-m-01'); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "lastmonth"){ + $dtf = date('Y-m-d',strtotime("first day of last month")); + $dtt = date('Y-m-d',strtotime("last day of last month")); +}elseif($_GET['canned_date'] == "thisyear"){ + $dtf = date('Y-01-01'); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "lastyear"){ + $dtf = date('Y-m-d',strtotime("first day of january last year")); + $dtt = date('Y-m-d',strtotime("last day of december last year")); }else{ $dtf = "0000-00-00"; $dtt = "9999-00-00"; @@ -83,6 +107,22 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    " id="advancedFilter">
    +
    +
    + + +
    +
    diff --git a/tickets.php b/tickets.php index 703042f0..16afdb6b 100644 --- a/tickets.php +++ b/tickets.php @@ -42,10 +42,34 @@ $disp = "ASC"; } - //Date From and Date To Filter - if(!empty($_GET['dtf'])){ + //Date Filter + if($_GET['canned_date'] =="custom"){ $dtf = $_GET['dtf']; $dtt = $_GET['dtt']; + }elseif($_GET['canned_date'] == "today"){ + $dtf = date('Y-m-d'); + $dtt = date('Y-m-d'); + }elseif($_GET['canned_date'] == "yesterday"){ + $dtf = date('Y-m-d',strtotime("yesterday")); + $dtt = date('Y-m-d',strtotime("yesterday")); + }elseif($_GET['canned_date'] == "thisweek"){ + $dtf = date('Y-m-d',strtotime("monday this week")); + $dtt = date('Y-m-d'); + }elseif($_GET['canned_date'] == "lastweek"){ + $dtf = date('Y-m-d',strtotime("monday last week")); + $dtt = date('Y-m-d',strtotime("sunday last week")); + }elseif($_GET['canned_date'] == "thismonth"){ + $dtf = date('Y-m-01'); + $dtt = date('Y-m-d'); + }elseif($_GET['canned_date'] == "lastmonth"){ + $dtf = date('Y-m-d',strtotime("first day of last month")); + $dtt = date('Y-m-d',strtotime("last day of last month")); + }elseif($_GET['canned_date'] == "thisyear"){ + $dtf = date('Y-01-01'); + $dtt = date('Y-m-d'); + }elseif($_GET['canned_date'] == "lastyear"){ + $dtf = date('Y-m-d',strtotime("first day of january last year")); + $dtt = date('Y-m-d',strtotime("last day of december last year")); }else{ $dtf = "0000-00-00"; $dtt = "9999-00-00"; @@ -100,6 +124,22 @@
    " id="advancedFilter">
    +
    +
    + + +
    +
    diff --git a/transfers.php b/transfers.php index 3aaee9d3..999032e0 100644 --- a/transfers.php +++ b/transfers.php @@ -10,19 +10,22 @@ if(isset($_GET['p'])){ $record_to = $_SESSION['records_per_page']; $p = 1; } - + +//Search Query Filter if(isset($_GET['q'])){ $q = mysqli_real_escape_string($mysqli,$_GET['q']); }else{ $q = ""; } +//Column Sortby Filter if(!empty($_GET['sb'])){ $sb = mysqli_real_escape_string($mysqli,$_GET['sb']); }else{ $sb = "transfer_date"; } +//Order Filter if(isset($_GET['o'])){ if($_GET['o'] == 'ASC'){ $o = "ASC"; @@ -36,10 +39,34 @@ if(isset($_GET['o'])){ $disp = "ASC"; } -//Date From and Date To Filter -if(!empty($_GET['dtf'])){ +//Date Filter +if($_GET['canned_date'] =="custom"){ $dtf = $_GET['dtf']; $dtt = $_GET['dtt']; +}elseif($_GET['canned_date'] == "today"){ + $dtf = date('Y-m-d'); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "yesterday"){ + $dtf = date('Y-m-d',strtotime("yesterday")); + $dtt = date('Y-m-d',strtotime("yesterday")); +}elseif($_GET['canned_date'] == "thisweek"){ + $dtf = date('Y-m-d',strtotime("monday this week")); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "lastweek"){ + $dtf = date('Y-m-d',strtotime("monday last week")); + $dtt = date('Y-m-d',strtotime("sunday last week")); +}elseif($_GET['canned_date'] == "thismonth"){ + $dtf = date('Y-m-01'); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "lastmonth"){ + $dtf = date('Y-m-d',strtotime("first day of last month")); + $dtt = date('Y-m-d',strtotime("last day of last month")); +}elseif($_GET['canned_date'] == "thisyear"){ + $dtf = date('Y-01-01'); + $dtt = date('Y-m-d'); +}elseif($_GET['canned_date'] == "lastyear"){ + $dtf = date('Y-m-d',strtotime("first day of january last year")); + $dtt = date('Y-m-d',strtotime("last day of december last year")); }else{ $dtf = "0000-00-00"; $dtt = "9999-00-00"; @@ -83,6 +110,22 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    " id="advancedFilter">
    +
    +
    + + +
    +
    diff --git a/trips.php b/trips.php index 478d571d..040e7976 100644 --- a/trips.php +++ b/trips.php @@ -36,10 +36,34 @@ $disp = "ASC"; } - //Date From and Date To Filter - if(!empty($_GET['dtf'])){ + //Date Filter + if($_GET['canned_date'] =="custom"){ $dtf = $_GET['dtf']; $dtt = $_GET['dtt']; + }elseif($_GET['canned_date'] == "today"){ + $dtf = date('Y-m-d'); + $dtt = date('Y-m-d'); + }elseif($_GET['canned_date'] == "yesterday"){ + $dtf = date('Y-m-d',strtotime("yesterday")); + $dtt = date('Y-m-d',strtotime("yesterday")); + }elseif($_GET['canned_date'] == "thisweek"){ + $dtf = date('Y-m-d',strtotime("monday this week")); + $dtt = date('Y-m-d'); + }elseif($_GET['canned_date'] == "lastweek"){ + $dtf = date('Y-m-d',strtotime("monday last week")); + $dtt = date('Y-m-d',strtotime("sunday last week")); + }elseif($_GET['canned_date'] == "thismonth"){ + $dtf = date('Y-m-01'); + $dtt = date('Y-m-d'); + }elseif($_GET['canned_date'] == "lastmonth"){ + $dtf = date('Y-m-d',strtotime("first day of last month")); + $dtt = date('Y-m-d',strtotime("last day of last month")); + }elseif($_GET['canned_date'] == "thisyear"){ + $dtf = date('Y-01-01'); + $dtt = date('Y-m-d'); + }elseif($_GET['canned_date'] == "lastyear"){ + $dtf = date('Y-m-d',strtotime("first day of january last year")); + $dtt = date('Y-m-d',strtotime("last day of december last year")); }else{ $dtf = "0000-00-00"; $dtt = "9999-00-00"; @@ -90,6 +114,22 @@
    " id="advancedFilter">
    +
    +
    + + +
    +