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

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
gayathri1990 2018-08-18 14:16:57 +05:30
commit 40a50d448a
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Apollo/api/application/models/StatusUpdation_model.php
View File

@ -318,7 +318,8 @@ class StatusUpdation_model extends CI_Model {
$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']); $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
$getSemYearANDType = "$getSemYearMsg $cerNamtToMsg"; $getSemYearANDType = "$getSemYearMsg $cerNamtToMsg";
// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg."; // $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->smssend($arr, $mesg);
$this->mailsend($arr, $mesg, $cerNamtToMsg); $this->mailsend($arr, $mesg, $cerNamtToMsg);
$result['addStatus'] = true; $result['addStatus'] = true;
@ -590,11 +591,11 @@ class StatusUpdation_model extends CI_Model {
$this->load->library('email'); $this->load->library('email');
//SMTP & mail configuration //SMTP & mail configuration
$config = array( $config = array(
'protocol' => 'ssmtp', 'protocol' => 'smtp',
'smtp_host' => 'ssl://smtp.example.com', 'smtp_host' => 'smtp.sendgrid.net',
'smtp_port' => 465, 'smtp_port' => 25,
'smtp_user' => 'noreply@apollodec.com', 'smtp_user' => 'apikey',
'smtp_pass' => 'Apollo@123', 'smtp_pass' => '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',
'mailtype' => 'html', 'mailtype' => 'html',
'charset' => 'utf-8' 'charset' => 'utf-8'
); );

5
Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js
View File

@ -540,7 +540,7 @@ $scope.disableSendButton = true;
swal(" ", response.data.message, "success"); swal(" ", response.data.message, "success");
// swal(" ", "Status added successfully.", "success"); // swal(" ", "Status added successfully.", "success");
$scope.initgroup() $scope.initgroup()
$state.go($state.current, {}, { reload: true }); //$state.go($state.current, {}, { reload: true });
} }
else else
{ {
@ -897,7 +897,8 @@ if(group == '')
swal(" ", response.data.message, "success"); swal(" ", response.data.message, "success");
// swal(" ", "Status added successfully.", "success"); // swal(" ", "Status added successfully.", "success");
$scope.initgroup() $scope.initgroup()
$state.go($state.current, {}, { reload: true }); myModel.GroupName = '';
// $state.go($state.current, {}, { reload: true });
} else { } else {
swal(" ", response.data.message, "error"); swal(" ", response.data.message, "error");

2
Apollo/assets/views/addcontact.html
View File

@ -26,7 +26,7 @@
Phone Number<span class="symbol required"></span> Phone Number<span class="symbol required"></span>
</label> </label>
<input type="text" placeholder="Enter Phone Number" tabindex="1" class="form-control" name="Phone" id="Phone" ng-model="p.ListName" ng-pattern="/^[0-9-+]*$/" minlength="6" maxlength="13"/> <input type="text" placeholder="Enter Phone Number" tabindex="1" class="form-control" name="Phone" id="Phone" ng-model="p.ListName" ng-pattern="/^[0-9-+]*$/" minlength="10" maxlength="13"/>
<!-- <span class="error text-small block" ng-if="Form.ListName.$dirty && Form.ListName.$error.required">Phone number required</span> --> <!-- <span class="error text-small block" ng-if="Form.ListName.$dirty && Form.ListName.$error.required">Phone number required</span> -->
<span class="error text-small block" ng-if="Form.ListName.$dirty && Form.ListName.$error.pattern && Form.ListName.$error.minlength && Form.ListName.$error.maxlength">Phone number required </span> <span class="error text-small block" ng-if="Form.ListName.$dirty && Form.ListName.$error.pattern && Form.ListName.$error.minlength && Form.ListName.$error.maxlength">Phone number required </span>