From 012c77d81e1142042bc3d3c18b2160a2e337a37f Mon Sep 17 00:00:00 2001
From: johnnyq <pittpc@web01.pittpc.com>
Date: Wed, 11 Aug 2021 12:49:20 -0400
Subject: [PATCH] Fixed Canned Dates issue where seach queries would not work

---
 clients.php   | 2 +-
 expenses.php  | 4 ++--
 invoices.php  | 2 +-
 payments.php  | 2 +-
 quotes.php    | 2 +-
 recurring.php | 2 +-
 revenues.php  | 2 +-
 tickets.php   | 2 +-
 transfers.php | 2 +-
 trips.php     | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/clients.php b/clients.php
index 753d0ead..95aa2446 100644
--- a/clients.php
+++ b/clients.php
@@ -47,7 +47,7 @@ if(isset($_GET['o'])){
 }
 
 //Date Filter
-if($_GET['canned_date'] =="custom"){
+if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
   $dtf = $_GET['dtf'];
   $dtt = $_GET['dtt'];
 }elseif($_GET['canned_date'] == "today"){
diff --git a/expenses.php b/expenses.php
index d221cd96..fe07a86a 100644
--- a/expenses.php
+++ b/expenses.php
@@ -37,7 +37,7 @@ if(isset($_GET['o'])){
 }
 
 //Date Filter
-if($_GET['canned_date'] =="custom"){
+if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
   $dtf = $_GET['dtf'];
   $dtt = $_GET['dtt'];
 }elseif($_GET['canned_date'] == "today"){
@@ -112,7 +112,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <div class="form-group">
               <label>Canned Date</label>
               <select class="form-control select2" name="canned_date">
-                <option <?php if($_GET['canned_date'] == "custom"){ echo "selected"; } ?> value="custom">Custom</option>
+                <option <?php if($_GET['canned_date'] == "custom"){ echo "selected"; } ?> value="">Custom</option>
                 <option <?php if($_GET['canned_date'] == "today"){ echo "selected"; } ?> value="today">Today</option>
                 <option <?php if($_GET['canned_date'] == "yesterday"){ echo "selected"; } ?> value="yesterday">Yesterday</option>
                 <option <?php if($_GET['canned_date'] == "thisweek"){ echo "selected"; } ?> value="thisweek">This Week</option>
diff --git a/invoices.php b/invoices.php
index 51473e08..978d5e5a 100644
--- a/invoices.php
+++ b/invoices.php
@@ -88,7 +88,7 @@
   }
 
   //Date Filter
-  if($_GET['canned_date'] =="custom"){
+  if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
     $dtf = $_GET['dtf'];
     $dtt = $_GET['dtt'];
   }elseif($_GET['canned_date'] == "today"){
diff --git a/payments.php b/payments.php
index b7d1cce3..63dd63a0 100644
--- a/payments.php
+++ b/payments.php
@@ -37,7 +37,7 @@ if(isset($_GET['o'])){
 }
 
 //Date Filter
-if($_GET['canned_date'] =="custom"){
+if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
   $dtf = $_GET['dtf'];
   $dtt = $_GET['dtt'];
 }elseif($_GET['canned_date'] == "today"){
diff --git a/quotes.php b/quotes.php
index 92518fee..15190dc7 100644
--- a/quotes.php
+++ b/quotes.php
@@ -39,7 +39,7 @@ if(isset($_GET['o'])){
 }
 
 //Date Filter
-if($_GET['canned_date'] =="custom"){
+if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
   $dtf = $_GET['dtf'];
   $dtt = $_GET['dtt'];
 }elseif($_GET['canned_date'] == "today"){
diff --git a/recurring.php b/recurring.php
index 366ac187..815197ad 100644
--- a/recurring.php
+++ b/recurring.php
@@ -37,7 +37,7 @@ if(isset($_GET['o'])){
 }
 
 //Date Filter
-if($_GET['canned_date'] =="custom"){
+if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
   $dtf = $_GET['dtf'];
   $dtt = $_GET['dtt'];
 }elseif($_GET['canned_date'] == "today"){
diff --git a/revenues.php b/revenues.php
index ea53e1bf..f92d7640 100644
--- a/revenues.php
+++ b/revenues.php
@@ -37,7 +37,7 @@ if(isset($_GET['o'])){
 }
 
 //Date Filter
-if($_GET['canned_date'] =="custom"){
+if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
   $dtf = $_GET['dtf'];
   $dtt = $_GET['dtt'];
 }elseif($_GET['canned_date'] == "today"){
diff --git a/tickets.php b/tickets.php
index 16afdb6b..eec9539d 100644
--- a/tickets.php
+++ b/tickets.php
@@ -43,7 +43,7 @@
   }
 
   //Date Filter
-  if($_GET['canned_date'] =="custom"){
+  if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
     $dtf = $_GET['dtf'];
     $dtt = $_GET['dtt'];
   }elseif($_GET['canned_date'] == "today"){
diff --git a/transfers.php b/transfers.php
index 999032e0..0982457a 100644
--- a/transfers.php
+++ b/transfers.php
@@ -40,7 +40,7 @@ if(isset($_GET['o'])){
 }
 
 //Date Filter
-if($_GET['canned_date'] =="custom"){
+if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
   $dtf = $_GET['dtf'];
   $dtt = $_GET['dtt'];
 }elseif($_GET['canned_date'] == "today"){
diff --git a/trips.php b/trips.php
index 040e7976..14d46239 100644
--- a/trips.php
+++ b/trips.php
@@ -37,7 +37,7 @@
   }
 
   //Date Filter
-  if($_GET['canned_date'] =="custom"){
+  if($_GET['canned_date'] == "custom" AND !empty($_GET['dtf'])){
     $dtf = $_GET['dtf'];
     $dtt = $_GET['dtt'];
   }elseif($_GET['canned_date'] == "today"){