diff --git a/Apollo/api/application/controllers/Batch_Controller.php b/Apollo/api/application/controllers/Batch_Controller.php index 09156b66..e05fc83f 100644 --- a/Apollo/api/application/controllers/Batch_Controller.php +++ b/Apollo/api/application/controllers/Batch_Controller.php @@ -31,12 +31,15 @@ class Batch_Controller extends REST_Controller { public function addBatchDetails_post() { - + $now = new DateTime(); + $now->setTimezone(new DateTimezone('Asia/Kolkata')); $details['BatchCode'] = $this->post('batchcode'); $details['BatchName'] = $this->post('batcheName'); $details['UniversityID'] = $this->post('universityName'); $details['CreatedBy'] = $this->post('createdBy'); $details['IsActive'] = $this->post('status'); + $details['CreatedOn'] = $now->format('Y-m-d H:i:s'); + $batchDetails = $this->batch_model->addBatch($details);// Check if the users data store contains users (in case the database result returns NULL) if ($batchDetails) { @@ -86,11 +89,16 @@ class Batch_Controller extends REST_Controller { * */ public function updateBatchDetails_post() { + $now = new DateTime(); + $now->setTimezone(new DateTimezone('Asia/Kolkata')); $details['BatchCode'] = $this->post('batchCode'); $details['BatchName'] = $this->post('batchName'); $details['IsActive'] = $this->post('status'); $details['UpdatedBy'] = $this->post('updatedBy'); - $details['UpdatedOn'] = date("Y-m-d", time()); + $details['UpdatedOn'] = $now->format("Y-m-d H:i:s"); + + // print_r( $details['UpdatedOn']) + //exit(); $updateDetails = $this->batch_model->updateBatch($details);// Check if the users data store contains users (in case the database result returns NULL) if ($updateDetails) @@ -112,4 +120,4 @@ class Batch_Controller extends REST_Controller { } -} \ No newline at end of file +} diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index 508fe3d5..d3a02289 100644 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -409,7 +409,7 @@ class Calltracking_model extends CI_Model { $todayFollowupDate=$now->format('d-m-Y'); $todayDateTime=$now->format('Y-m-d'); - /* $follouwpDetails=$this->todayFollowupDetails($todayFollowupDate,CLOSE,'1'); + $follouwpDetails=$this->todayFollowupDetails($todayFollowupDate,CLOSE,'1'); if($follouwpDetails){ $result_array['todayStatus']=true; $result_array['todayFolloupDetails']=$follouwpDetails; @@ -418,7 +418,7 @@ class Calltracking_model extends CI_Model { $result_array['todayStatus']=false; $result_array['todayFolloupDetails']=""; - }*/ + } $follouwpPendingDetails=$this->todayFollowupDetails($todayFollowupDate,CLOSE,'2'); if($follouwpPendingDetails){ @@ -430,7 +430,7 @@ class Calltracking_model extends CI_Model { $result_array['PendingFolloupDetails']=""; } - /* $todayLeadDetails=$this->todayFollowupDetails($todayDateTime,OPEN,'3'); + $todayLeadDetails=$this->todayFollowupDetails($todayDateTime,OPEN,'3'); if($todayLeadDetails){ $result_array['todayLeadStatus']=true; $result_array['todayLeadDetails']=$todayLeadDetails; @@ -439,7 +439,7 @@ class Calltracking_model extends CI_Model { $result_array['todayLeadStatus']=false; $result_array['todayLeadDetails']=""; - }*/ + } return $result_array;