mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-19 15:02:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add group operator to giftcard query

Browse Source
This commit is contained in:
jekkos committed 2016-03-08 08:11:10 +01:00
1 parent dfbab194de
commit a6fa6c9cd6
1 file changed
+6 -3
Download Patch File Download Diff File Expand all files Collapse all files
application/models/Giftcard.php
+6 -3
View File
@@ -218,11 +218,13 @@ class Giftcard extends CI_Model
$this->db->from('giftcards');
$this->db->join('people', 'giftcards.person_id=people.person_id', 'left');
$this->db->like('first_name', $this->db->escape_like_str($search));
$this->db->or_group_start();
$this->db->or_like('last_name', $this->db->escape_like_str($search));
$this->db->or_like('CONCAT(first_name, " ", last_name)', $this->db->escape_like_str($search));
$this->db->or_like('giftcard_number', $this->db->escape_like_str($search));
$this->db->or_like('giftcards.person_id', $this->db->escape_like_str($search));
$this->db->where('deleted', 0);
$this->db->group_end();
$this->db->where('giftcards.deleted', 0);
$this->db->order_by('giftcard_number', 'asc');
if ($rows > 0)
@@ -238,12 +240,13 @@ class Giftcard extends CI_Model
$this->db->from('giftcards');
$this->db->join('people', 'giftcards.person_id=people.person_id', 'left');
$this->db->like('first_name', $this->db->escape_like_str($search));
$this->db->or_group_start();
$this->db->or_like('last_name', $this->db->escape_like_str($search));
$this->db->or_like('CONCAT(first_name, " ", last_name)', $this->db->escape_like_str($search));
$this->db->or_like('giftcard_number', $this->db->escape_like_str($search));
$this->db->or_like('giftcards.person_id', $this->db->escape_like_str($search));
$this->db->where('deleted', 0);
$this->db->group_end();
$this->db->where('giftcards.deleted', 0);
return $this->db->get()->num_rows();
}