diff --git a/Apollo/api/application/config/constants.php b/Apollo/api/application/config/constants.php
index 0d3d8d62..9117a288 100755
--- a/Apollo/api/application/config/constants.php
+++ b/Apollo/api/application/config/constants.php
@@ -161,6 +161,8 @@ defined('STUDENTDOCUMENTTRACKDETAILS') OR define('STUDENTDOCUMENTTRACKDETAILS','
defined('REGISTRATIONDETAILS') OR define('REGISTRATIONDETAILS','T_Registration_Details');
defined('ENROLMENTRECEIVEDFROMUNIV') OR define('ENROLMENTRECEIVEDFROMUNIV','T_Enrolment_Received_From_University');
defined('FORMFEESRECEIVEDFROMUNIV') OR define('FORMFEESRECEIVEDFROMUNIV','T_FormId_FeeDetails_Received_From_University');
+defined('UNIVERSITYCREDITDEBIY') OR define('UNIVERSITYCREDITDEBIY','T_University_Credit_Debit');
+defined('UNIVERSITYPAYMENT') OR define('UNIVERSITYPAYMENT','T_University_Payment');
// define APPLICATION certificate type constant
diff --git a/Apollo/api/application/config/database.php b/Apollo/api/application/config/database.php
index f8df5be8..516a351c 100755
--- a/Apollo/api/application/config/database.php
+++ b/Apollo/api/application/config/database.php
@@ -76,8 +76,8 @@ $query_builder = TRUE;
$db['default'] = array(
'dsn' => '',
'hostname' => 'apollodec.com',
- 'username' => 'apollod4_DEV',
- 'password' => 'apollo1234',
+ 'username' => 'apollod4_DEV',
+ 'password' => 'apollo1234',
'database' => 'apollod4_ApolloDECDev',
'dbdriver' => 'mysqli',
'dbprefix' => '',
diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php
index aac78eed..f2032ecb 100755
--- a/Apollo/api/application/config/routes.php
+++ b/Apollo/api/application/config/routes.php
@@ -215,7 +215,7 @@ $route['setgrpstatus'] = 'Broadcast_Controller/setgrpstatus';
$route['getAllstudentcoursedetail'] = 'DataCorrection_Controller/getAllstudentcoursedetail';
$route['getAllfeedetail'] = 'DataCorrection_Controller/getAllfeedetail';
-$route['updateCourseDetails'] = 'DataCorrection_Controller/updateCourseDetails';
+$route['updateCourseDetailss'] = 'DataCorrection_Controller/updateCourseDetailss';
/*
@@ -371,6 +371,11 @@ $route['getForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/get
$route['addForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addForFormIdDraftDetails';
$route['draftMovetoList'] = 'Receive_Enrolment_Fees_Univ_Controller/draftMovetoList';
$route['editDraftFormIdFeesDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/editDraftFormIdFeesDetails';
+<<<<<<< HEAD
$route['getStudentUnivFormIdFeeDatailsList'] = 'Receive_Enrolment_Fees_Univ_Controller/getStudentUnivFormIdFeeDatailsList';
$route['getFormIdDetailsStatusUpdateList'] = 'Receive_Enrolment_Fees_Univ_Controller/getFormIdDetailsStatusUpdateList';
$route['insertStatusUpdateDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/insertStatusUpdateDetails';
+=======
+$route['paymentVerficationDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/paymentVerficationDetails';
+
+>>>>>>> 06530705d67f7b2031936171f856ae73f35dafbb
diff --git a/Apollo/api/application/controllers/Call_Tracking_Controller.php b/Apollo/api/application/controllers/Call_Tracking_Controller.php
index 412ed4d0..0e64a295 100755
--- a/Apollo/api/application/controllers/Call_Tracking_Controller.php
+++ b/Apollo/api/application/controllers/Call_Tracking_Controller.php
@@ -148,10 +148,14 @@ class Call_Tracking_Controller extends REST_Controller {
$search['requestedDept'] = $this->post('requestedDept');
// $search['branchID'] = $this->post('branchId');
$search['searchDate'] = $this->post('searchDate');
+ // print_r( $search['searchDate']);
$search['CreatedBranch'] = $this->post('branchId');
+
+ $status=$this->post('status');
+
// $search['searchMobileNumber'] = $this->post('searchMobileNumber');
// $search['searchName']= $this->post('searchName');
- $getTrackedDetails = $this->Calltracking_model->getTrackingDetails($search);
+ $getTrackedDetails = $this->Calltracking_model->getTrackingDetails($search,$status);
if ($getTrackedDetails)
{
diff --git a/Apollo/api/application/controllers/DataCorrection_Controller.php b/Apollo/api/application/controllers/DataCorrection_Controller.php
index e596b8f2..cf191812 100644
--- a/Apollo/api/application/controllers/DataCorrection_Controller.php
+++ b/Apollo/api/application/controllers/DataCorrection_Controller.php
@@ -140,7 +140,7 @@ class DataCorrection_Controller extends REST_Controller {
}
- public function updateCourseDetails_post()
+ public function updateCourseDetailss_post()
{
$search['University'] = $this->post('universityid');
$search['courseId'] = $this->post('courseId');
diff --git a/Apollo/api/application/controllers/HallTickets_Controller.php b/Apollo/api/application/controllers/HallTickets_Controller.php
index 511d6dda..4c8b7d13 100755
--- a/Apollo/api/application/controllers/HallTickets_Controller.php
+++ b/Apollo/api/application/controllers/HallTickets_Controller.php
@@ -212,7 +212,7 @@ class HallTickets_Controller extends REST_Controller {
$this->response([
'message' => 'No records found!',
- 'status' => REST_Controller::HTTP_NOT_FOUND
+ 'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND);
}
@@ -316,7 +316,7 @@ class HallTickets_Controller extends REST_Controller {
$Cdate = new DateTime('now',new DateTimeZone('Asia/Kolkata'));
$CreatedOn = $Cdate->format('Y-m-d H:i:s');
/////////check semcoursemapping////
- $data['subjectDetails'] = $this->Hallticket_model->getSubjectDetails($universityID,$tempCourseArray,$branchId);
+ // $data['subjectDetails'] = $this->Hallticket_model->getSubjectDetails($universityID,$tempCourseArray,$branchId);
$data['subjectDetails'] = $this->Hallticket_model->getExistDetailsfileupload($university,$courseArray,$branchId);
// print_r( $data['subjectDetails']);
if($data['subjectDetails'] == 1 )
diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php
index f71ad381..26432801 100755
--- a/Apollo/api/application/models/Calltracking_model.php
+++ b/Apollo/api/application/models/Calltracking_model.php
@@ -352,8 +352,9 @@ class Calltracking_model extends CI_Model {
* created by kms
* */
- public function getTrackingDetails($search=null)
+ public function getTrackingDetails($search=null,$status)
{
+
$this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName');
$this->db->from(LEAD_TRACKING_FOLLOWUP.' as LTF');
$this->db->join(LEAD_TRACKING.' as LT','LT.TrackingID=LTF.TrackingID');
@@ -437,7 +438,16 @@ class Calltracking_model extends CI_Model {
}
}
+ if($status!=true)
+ {
$result_array['pendingTrackingDetails'] = $this->getPrevPendingTrackingDetails($search);
+ // print_r( $result_array['pendingTrackingDetails']);
+ }
+ else
+ {
+ $result_array['pendingTrackingDetails']=1;
+ }
+
return $result_array;
diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php
index cb79bda7..de5b6bfd 100755
--- a/Apollo/api/application/models/Student_model.php
+++ b/Apollo/api/application/models/Student_model.php
@@ -354,6 +354,7 @@ class Student_model extends CI_Model {
$this->db->join('' . STUDENTS_FEES_PAID . ' as t6', 't6.FeesId = t5.FeesID', 'LEFT');
$this->db->where('t1.BranchID', $req['localBranchID']);
$this->db->where('t1.StudentID', $studentId);
+ $this->db->where('t1.IsActive', '1');
$this->db->group_by('t1.CourseID');
$courseDetails = $this->db->get();
$checkArr = $courseDetails->result();
diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js
index c878eaf4..29ba3e3c 100755
--- a/Apollo/assets/js/config.router.js
+++ b/Apollo/assets/js/config.router.js
@@ -337,7 +337,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
title: 'status',
ncyBreadcrumb: {
label: 'status'
- }
+ }
}).state('app.student.status.studymaterial', {
url: '/studymaterial',
templateUrl: "assets/views/status-update/study_material_status.html",
diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js
index fdad1233..c51c3fe4 100755
--- a/Apollo/assets/js/controllers/callTrackingCtrl.js
+++ b/Apollo/assets/js/controllers/callTrackingCtrl.js
@@ -60,6 +60,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
$scope.checkDate = function (value,type) {
+ // console.log(value.searchDate);
if(value.searchDate==null || value.searchDate==undefined){
$scope.myModel.search='';
@@ -68,33 +69,38 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
}
else{
if(type=='2'){
-
+
$scope.myModel.search = $filter('date')(value.searchDate, 'yyyy-MM-dd');
$scope.toMinDate = $filter('date')(value.searchDate, 'MM-dd-yyyy');
}
}
- $scope.searchDateArray(value);
+ $scope.searchDateArray(value,type);
}
/*
* check to date
* */
- $scope.checkToDate = function (value) {
-
+ $scope.status='';
+ $scope.checkToDate = function (value,status) {
+ $scope.status=status;
if(value.searchDate==null || value.searchDate==undefined){
swal("Failed!", 'Please Select From Date', "error");
$scope.myModel.dateTo='';
$scope.myModel.search='';
$scope.toMinDate = '';
}
- else{
- $scope.filterSearch=$filter('date')(value.searchDate, 'dd-MM-yyyy');
- $scope.search=$scope.filterSearch;
+ else{
+ if(value.searchDate!=null && value.dateTo!=null && status=='true')
+ {
+
+ $scope.filterSearch=$filter('date')(value.searchDate,value.dateTo);
+ $scope.search=$scope.filterSearch;
+ }
}
- $scope.searchDateArray(value);
+ $scope.searchDateArray(value,status);
}
@@ -102,8 +108,8 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
/*
* make a search date array
*/
- $scope.searchDateArray=function (dateValue) {
-
+ $scope.searchDateArray=function (dateValue,status) {
+
var listDate = [];
if((dateValue.search !=null && dateValue.search !=undefined) && (dateValue.dateTo !=null && dateValue.dateTo !=undefined && dateValue.dateTo !='')){
var startDate =dateValue.search;
@@ -117,6 +123,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
var strDate = startDate;
var arrayDate = $filter('date')(strDate, 'dd-MM-yyyy');
listDate.push(arrayDate);
+
}
else{
while (strDate < endDate){
@@ -404,19 +411,19 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
* */
$scope.init = function (myModel) {
-
+ // console.log(myModel);
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE=='R005')) {
- console.log("if");
+
}else {
if(logcheck != null && LOCALTYPE !='R001') {
- console.log("else if");
+
$state.go('app.dashboard');
} else {
- console.log("else else");
+
//ipCookie.remove('cookiechk');
window.localStorage.clear();
$state.go('login.signin');
@@ -432,6 +439,9 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
$scope.data = [];
if(myModel!='' && myModel!=undefined){
$scope.finalSearchArry=myModel;
+
+
+
}
else{
$scope.finalSearchArry="";
@@ -449,7 +459,8 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
requestedDept: JSON.parse(localStorage.getItem('localObj')).localType,
branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID,
- searchDate: $scope.finalSearchArry
+ searchDate: $scope.finalSearchArry,
+ status: $scope.status
}
};
$http(getTrackDetails).then(function (response) {
@@ -521,7 +532,11 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
});
localStorage.setItem('trackingList', JSON.stringify($scope.data));
}
-
+ else if(response.data.trackingStatus == 1)
+ {
+ console.log('hai');
+ }
+
else {
$scope.loader = false;
@@ -651,8 +666,7 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte
//from date change
$scope.checkDate = function (value) {
-
-
+
$scope.myModel.search = $filter('date')(value.leadDate, 'yyyy-MM-dd');
@@ -687,14 +701,14 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R005' || LOCALTYPE == 'R002')) {
- console.log("if");
+ // console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {
- console.log("else if");
+ // console.log("else if");
$state.go('app.dashboard');
} else {
- console.log("else else");
+ // console.log("else else");
//ipCookie.remove('cookiechk');
window.localStorage.clear();
$state.go('login.signin');
diff --git a/Apollo/assets/js/controllers/entrycorrectionCtrl.js b/Apollo/assets/js/controllers/entrycorrectionCtrl.js
index 828f44a0..5188cdec 100644
--- a/Apollo/assets/js/controllers/entrycorrectionCtrl.js
+++ b/Apollo/assets/js/controllers/entrycorrectionCtrl.js
@@ -229,7 +229,7 @@ $scope.universitySearchData = '';
var updatecourse = {
method: 'POST',
- url: apiPoint.url + 'updateCourseDetails/',
+ url: apiPoint.url + 'updateCourseDetailss/',
headers: {
'Content-Type': 'application/json'
},
@@ -249,6 +249,7 @@ $scope.universitySearchData = '';
$http(updatecourse).then(function (response) {
swal('Change Saved Successfully', response.data.message, "success");
$scope.close();
+ $scope.getStudentDetails(form,myModel);
});
diff --git a/Apollo/assets/js/controllers/schCtrl.js b/Apollo/assets/js/controllers/schCtrl.js
index c0fd1d9b..e84cd727 100755
--- a/Apollo/assets/js/controllers/schCtrl.js
+++ b/Apollo/assets/js/controllers/schCtrl.js
@@ -374,7 +374,7 @@ $scope.UploadFileData = function (FileDetails,myModel,courseDetails) {
}
- };
+ };
$http(updateUniversityEnrolment).then(function (response) {
console.log(response);
diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html
index a0e539a5..1cc54713 100755
--- a/Apollo/assets/views/callTrackingDetails.html
+++ b/Apollo/assets/views/callTrackingDetails.html
@@ -92,7 +92,7 @@
diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html
index e1ed2de3..83c52768 100755
--- a/Apollo/assets/views/partials/nav.html
+++ b/Apollo/assets/views/partials/nav.html
@@ -226,6 +226,11 @@
STUDENT FORMID FEE DETAILS
+
+
+ University Form Payment
+
+
diff --git a/Apollo/assets/views/status-update/application_status.html b/Apollo/assets/views/status-update/application_status.html
index 03d30682..91b6203c 100644
--- a/Apollo/assets/views/status-update/application_status.html
+++ b/Apollo/assets/views/status-update/application_status.html
@@ -5,7 +5,7 @@
{{ mainTitle }}
Update application status.
-
+
diff --git a/Apollo/assets/views/status-update/certificate_status.html b/Apollo/assets/views/status-update/certificate_status.html
index 90611b4f..955a56ef 100644
--- a/Apollo/assets/views/status-update/certificate_status.html
+++ b/Apollo/assets/views/status-update/certificate_status.html
@@ -5,7 +5,7 @@
{{ mainTitle }}
Update certificate status.
-
+
diff --git a/Apollo/assets/views/status-update/fees_status.html b/Apollo/assets/views/status-update/fees_status.html
index 416f8ab2..30a91493 100755
--- a/Apollo/assets/views/status-update/fees_status.html
+++ b/Apollo/assets/views/status-update/fees_status.html
@@ -30,7 +30,7 @@
Update fees status.
-
+
diff --git a/Apollo/assets/views/status-update/markcard_status.html b/Apollo/assets/views/status-update/markcard_status.html
index 17634fbd..894db4c4 100644
--- a/Apollo/assets/views/status-update/markcard_status.html
+++ b/Apollo/assets/views/status-update/markcard_status.html
@@ -5,7 +5,7 @@
{{ mainTitle }}
Update markcard status.
-
+
diff --git a/Apollo/assets/views/status-update/study_material_status.html b/Apollo/assets/views/status-update/study_material_status.html
index 2d6b5ea5..11a1bcb9 100755
--- a/Apollo/assets/views/status-update/study_material_status.html
+++ b/Apollo/assets/views/status-update/study_material_status.html
@@ -5,7 +5,7 @@
{{ mainTitle }}
Update study material status.
-
+
diff --git a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html
index 3e923b72..c62e4797 100644
--- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html
+++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html
@@ -5,7 +5,7 @@
{{ mainTitle }}
Student Form Enrolment Details.
-
+
diff --git a/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html b/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html
index 1f43e63c..c9e7d398 100644
--- a/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html
+++ b/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html
@@ -5,7 +5,7 @@
{{ mainTitle }}
Student University FormId Fees Details.
-
+
diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html
index 68afc662..09c9182f 100755
--- a/Apollo/assets/views/student/student_details.html
+++ b/Apollo/assets/views/student/student_details.html
@@ -5,7 +5,7 @@
{{ mainTitle }}
Add/Edit student details.
-
+
diff --git a/Apollo/assets/views/student/student_details_SuperAdmin.html b/Apollo/assets/views/student/student_details_SuperAdmin.html
index 3e263f49..87a2d1ab 100755
--- a/Apollo/assets/views/student/student_details_SuperAdmin.html
+++ b/Apollo/assets/views/student/student_details_SuperAdmin.html
@@ -5,7 +5,7 @@
{{ mainTitle }}
Add/Edit Student Details.
-
+