From 769180f577e25c74f613ae7e3e6d7d52a37ddb83 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 18 Aug 2018 12:39:35 +0530 Subject: [PATCH 1/5] sms group reload- nidhila --- Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js index 0d7cd4f8..6b66c459 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,7 @@ if(group == '') 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 { swal(" ", response.data.message, "error"); From 3141046a5a827ebed68f7605114d9525ead392f7 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 18 Aug 2018 12:46:13 +0530 Subject: [PATCH 2/5] group sms reload- nidhila --- Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js index 6b66c459..c6e7df12 100755 --- a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js +++ b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js @@ -897,6 +897,7 @@ if(group == '') swal(" ", response.data.message, "success"); // swal(" ", "Status added successfully.", "success"); $scope.initgroup() + myModel.GroupName = ''; // $state.go($state.current, {}, { reload: true }); } else { From 575b372dd8460a31e83ea9a9c65521b35e5ed89f Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Sat, 18 Aug 2018 13:03:54 +0530 Subject: [PATCH 3/5] mail credential changes: kdk --- Apollo/api/application/models/StatusUpdation_model.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index e5fddb90..577808b2 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -590,11 +590,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' ); From 13e1b672b47cca6c0ccb9f0d9f4639e839004028 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Sat, 18 Aug 2018 13:05:40 +0530 Subject: [PATCH 4/5] sms trigger msg changes : kdk --- Apollo/api/application/models/StatusUpdation_model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index 577808b2..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; From 43ccde14c6a5c92b80f1280a793dbc0d8513678c Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 18 Aug 2018 13:20:20 +0530 Subject: [PATCH 5/5] phone number min length --- Apollo/assets/views/addcontact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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