mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-02-18 14:48:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Additional tidy up (#667)

Browse Source
This commit is contained in:
FrancescoUK
2016-06-19 12:35:52 +01:00
parent ad1b3aeaac
commit ac968e21e6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Items.php
View File

@@ -57,7 +57,7 @@ class Items extends Secure_Controller
$filters = array_merge($filters, $filledup);
$items = $this->Item->search($search, $filters, $limit, $offset, $sort, $order);
$total_rows = $this->xss_clean($this->Item->get_found_rows($search, $filters));
$total_rows = $this->Item->get_found_rows($search, $filters);
$data_rows = array();
foreach($items->result() as $item)

8
application/models/Sale.php
View File

@@ -51,10 +51,10 @@ class Sale extends CI_Model
else
{
$this->db->group_start();
$this->db->like('last_name', $search);
$this->db->or_like('first_name', $search);
$this->db->or_like('CONCAT(first_name, " ", last_name)', $search);
$this->db->or_like('company_name', $search);
$this->db->like('person.last_name', $search);
$this->db->or_like('person.first_name', $search);
$this->db->or_like('CONCAT(person.first_name, " ", person.last_name)', $search);
$this->db->or_like('customer.company_name', $search);
$this->db->group_end();
}
}