diff --git a/Apollo/api/application/config/database.php b/Apollo/api/application/config/database.php index 516a351c..31a6d4f0 100755 --- a/Apollo/api/application/config/database.php +++ b/Apollo/api/application/config/database.php @@ -79,6 +79,7 @@ $db['default'] = array( 'username' => 'apollod4_DEV', 'password' => 'apollo1234', 'database' => 'apollod4_ApolloDECDev', + 'dbdriver' => 'mysqli', 'dbprefix' => '', 'pconnect' => FALSE, diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index 418324c6..fee0ab28 100755 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -74,7 +74,7 @@ class DayBook_model extends CI_Model LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID AND t6.BranchCode = t1.BranchCode LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID AND t7.BranchCode = t1.BranchCode - WHERE STR_TO_DATE(t1.Date, '%d-%m-%Y') BETWEEN '$fromDate' + WHERE date_format(t1.CreatedOn,'%Y-%m-%d') BETWEEN '$fromDate' AND '$toDate' AND t1.BranchCode = '$reqpayType' ORDER BY ORDER_ID DESC"; // echo $querys;exit(); // $this->db->where(' STR_TO_DATE(t1.Date, %d-%m-%Y) >=', $fromDate);