Fixed Takings filters bug (#1286)

This commit is contained in:
FrancescoUK committed 2017-05-01 13:12:25 +01:00
1 parent 8d1bc4cf17
commit c4a76ad01c
1 file changed
+4 -4
+4 -4
View File
@@ -252,14 +252,14 @@ class Sale extends CI_Model
if($filters['only_cash'] != FALSE)
{
$this->db->group_start();
$this->db->like('payments.payment_type', $this->lang->line('sales_cash'), 'after');
$this->db->like('payments.payment_type', $this->lang->line('sales_cash'));
$this->db->or_where('payments.payment_type IS NULL');
$this->db->group_end();
}
if($filters['only_check'] != FALSE)
{
$this->db->like('payments.payment_type', $this->lang->line('sales_check'), 'after');
$this->db->like('payments.payment_type', $this->lang->line('sales_check'));
}
$this->db->group_by('sale_id');
@@ -332,12 +332,12 @@ class Sale extends CI_Model
if($filters['only_cash'] != FALSE)
{
$this->db->like('payment_type', $this->lang->line('sales_cash'), 'after');
$this->db->like('payment_type', $this->lang->line('sales_cash'));
}
if($filters['only_check'] != FALSE)
{
$this->db->like('payment_type', $this->lang->line('sales_check'), 'after');
$this->db->like('payment_type', $this->lang->line('sales_check'));
}
$this->db->group_by('payment_type');