diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index 859efbb4..b4cd1c28 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -62,6 +62,9 @@ class Calltracking_model extends CI_Model { $result_array['existLeadDetails'] = $leadDet; } } + + + // store lead,university and course details in comman array //$result_array['universityDetails']=$this->getUniversityDetails($branchID); $result_array['activityDetails']=$this->getActivityDetails($mobileNumber,$branchID); diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index 726e9962..fe82c8d6 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -356,6 +356,8 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.loading=false; $scope.getLead = function (form,mobile) { + + //call form success if(form.mobilenumber.$valid){ $scope.loading=true; diff --git a/Apollo/assets/views/status-update/setFeesForStudent.html b/Apollo/assets/views/status-update/setFeesForStudent.html index c7733a9a..54f6f369 100755 --- a/Apollo/assets/views/status-update/setFeesForStudent.html +++ b/Apollo/assets/views/status-update/setFeesForStudent.html @@ -185,7 +185,7 @@ + ng-model="setModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2',{{setModel.feesType}},'2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/> + ng-model="setModel.feesType.Others" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2',{{setModel.feesType}},'2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/> Others amount is required