Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

daybook production

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-09-08 12:16:24 +05:30
parent c599643ac2
commit 2078b8e849
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Apollo/api/application/config/database.php
View File

@ -79,6 +79,7 @@ $db['default'] = array(
'username' => 'apollod4_DEV', 'username' => 'apollod4_DEV',
'password' => 'apollo1234', 'password' => 'apollo1234',
'database' => 'apollod4_ApolloDECDev', 'database' => 'apollod4_ApolloDECDev',
'dbdriver' => 'mysqli', 'dbdriver' => 'mysqli',
'dbprefix' => '', 'dbprefix' => '',
'pconnect' => FALSE, 'pconnect' => FALSE,

2
Apollo/api/application/models/DayBook_model.php
View File

@ -74,7 +74,7 @@ class DayBook_model extends CI_Model
LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID 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 ".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 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"; AND '$toDate' AND t1.BranchCode = '$reqpayType' ORDER BY ORDER_ID DESC";
// echo $querys;exit(); // echo $querys;exit();
// $this->db->where(' STR_TO_DATE(t1.Date, %d-%m-%Y) >=', $fromDate); // $this->db->where(' STR_TO_DATE(t1.Date, %d-%m-%Y) >=', $fromDate);