diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index e5fddb90..ac00c836 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -318,7 +318,8 @@ class StatusUpdation_model extends CI_Model { $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']); $getSemYearANDType = "$getSemYearMsg $cerNamtToMsg"; // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg."; - $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received."; + // $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received."; + $mesg = "Answer booklet Received - Dear $studentName, Your answer booklet for $getSemYearANDType has been received."; $this->smssend($arr, $mesg); $this->mailsend($arr, $mesg, $cerNamtToMsg); $result['addStatus'] = true; @@ -590,11 +591,11 @@ class StatusUpdation_model extends CI_Model { $this->load->library('email'); //SMTP & mail configuration $config = array( - 'protocol' => 'ssmtp', - 'smtp_host' => 'ssl://smtp.example.com', - 'smtp_port' => 465, - 'smtp_user' => 'noreply@apollodec.com', - 'smtp_pass' => 'Apollo@123', + 'protocol' => 'smtp', + 'smtp_host' => 'smtp.sendgrid.net', + 'smtp_port' => 25, + 'smtp_user' => 'apikey', + 'smtp_pass' => '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', 'mailtype' => 'html', 'charset' => 'utf-8' ); diff --git a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js index 0d7cd4f8..c6e7df12 100755 --- a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js +++ b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js @@ -540,7 +540,7 @@ $scope.disableSendButton = true; swal(" ", response.data.message, "success"); // swal(" ", "Status added successfully.", "success"); $scope.initgroup() - $state.go($state.current, {}, { reload: true }); + //$state.go($state.current, {}, { reload: true }); } else { @@ -897,7 +897,8 @@ if(group == '') swal(" ", response.data.message, "success"); // swal(" ", "Status added successfully.", "success"); $scope.initgroup() - $state.go($state.current, {}, { reload: true }); + myModel.GroupName = ''; + // $state.go($state.current, {}, { reload: true }); } else { swal(" ", response.data.message, "error"); diff --git a/Apollo/assets/views/addcontact.html b/Apollo/assets/views/addcontact.html index 3328eb80..f62c6603 100644 --- a/Apollo/assets/views/addcontact.html +++ b/Apollo/assets/views/addcontact.html @@ -26,7 +26,7 @@ Phone Number - + Phone number required