mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-26 01:58:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

select transaction in Takings inclusive of time, fix Sale edit form to use bootstrap-datetimepicker (#116)

Browse Source
This commit is contained in:
FrancescoUK committed 2016-02-14 22:41:10 +00:00
1 parent d788320a9d
commit fc3aac58b5
4 files changed
+35 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

application/models/Sale.php
+3 -3
View File
@@ -41,7 +41,7 @@ class Sale extends CI_Model
if (empty($search))
{
$this->db->where('sale_date BETWEEN '. $this->db->escape($filters['start_date']). ' AND '. $this->db->escape($filters['end_date']));
$this->db->where('sale_time BETWEEN ' . $this->db->escape($filters['start_date']) . ' AND ' . $this->db->escape($filters['end_date']));
}
else
{
@@ -107,11 +107,11 @@ class Sale extends CI_Model
if (empty($search))
{
$this->db->where('DATE(sale_time) BETWEEN '. $this->db->escape($filters['start_date']). ' AND '. $this->db->escape($filters['end_date']));
$this->db->where('sale_time BETWEEN '. $this->db->escape($filters['start_date']). ' AND '. $this->db->escape($filters['end_date']));
}
else
{
if ($filters['is_valid_receipt'])
if ($filters['is_valid_receipt'] != FALSE)
{
$pieces = explode(' ',$search);
$this->db->where('sales.sale_id', $pieces[1]);