mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-07-10 23:17:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allowed search box and filters to be contextual to selected date range (#667)

Browse Source
This commit is contained in:
FrancescoUK
2016-06-19 11:57:53 +01:00
parent 8c5decee34
commit ad1b3aeaac
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/models/Item.php
View File

@@ -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)
{

17
application/models/Sale.php
View File

@@ -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)
{