From ad1b3aeaac2b6c76a4b7ff4bfc6f51910ea9e446 Mon Sep 17 00:00:00 2001
From: FrancescoUK <francesco.lodolo.uk@gmail.com>
Date: Sun, 19 Jun 2016 11:57:53 +0100
Subject: [PATCH] Allowed search box and filters to be contextual to selected
 date range (#667)

---
 application/models/Item.php |  8 +++-----
 application/models/Sale.php | 17 ++++++-----------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/application/models/Item.php b/application/models/Item.php
index d97d077e0..439ebd126 100644
--- a/application/models/Item.php
+++ b/application/models/Item.php
@@ -62,11 +62,9 @@ class Item extends CI_Model
 			$this->db->where('location_id', $filters['stock_location_id']);
 		}
 
-		if(empty($search))
-		{
-			$this->db->where('DATE_FORMAT(trans_date, "%Y-%m-%d") BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
-		}
-		else
+		$this->db->where('DATE_FORMAT(trans_date, "%Y-%m-%d") BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
+
+		if(!empty($search))
 		{
 			if($filters['search_custom'] == FALSE)
 			{
diff --git a/application/models/Sale.php b/application/models/Sale.php
index 85c35f497..76d3d8a5c 100644
--- a/application/models/Sale.php
+++ b/application/models/Sale.php
@@ -39,18 +39,15 @@ class Sale extends CI_Model
 		$this->db->join('people AS person', 'sales_items_temp.customer_id = person.person_id', 'left');
 		$this->db->join('customers AS customer', 'sales_items_temp.customer_id = customer.person_id', 'left');
 
-		if(empty($search))
-		{
-			$this->db->where('DATE(sale_time) BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
-		}
-		else
+		$this->db->where('DATE(sale_time) BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
+
+		if(!empty($search))
 		{
 			if($filters['is_valid_receipt'] != FALSE)
 			{
 				$pieces = explode(' ', $search);
 				$this->db->where('sales_items_temp.sale_id', $pieces[1]);
 			}
-
 			else
 			{
 				$this->db->group_start();
@@ -108,11 +105,9 @@ class Sale extends CI_Model
 		$this->db->join('sales_payments', 'sales_payments.sale_id = sales.sale_id');
 		$this->db->join('people', 'people.person_id = sales.customer_id', 'left');
 
-		if(empty($search))
-		{
-			$this->db->where('DATE(sale_time) BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
-		}
-		else
+		$this->db->where('DATE(sale_time) BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
+
+		if(!empty($search))
 		{
 			if($filters['is_valid_receipt'] != FALSE)
 			{