diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index 68e94998..ce6ae1c8 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -708,7 +708,6 @@ $upperresult=strtoupper($getlastansbookstatus); $result = $this->email->send(); - $time = date('Y-m-d H:i:s'); diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index fe854e16..a1d399c6 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -707,9 +707,12 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $scope.submitFeesForStudent = function (myModel,form,updateModel,loading) { //alert('set fee page');return false; - + + var firstError = null; if (form.$invalid) { + + var field = null, firstError = null; for (field in form) { if (field[0] != '$') { @@ -726,6 +729,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n swal("", "Please check session details/installment details", "warning"); } else { + /* if(isNaN(installment.date)){ $scope.pushDueDate1= $rootScope.lastInstallemtDate; } @@ -751,7 +755,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n }); }*/ - if(updateModel.Sem_Year!='TC' && updateModel.Sem_Year!='PC' && updateModel.Sem_Year!='DC' && updateModel.Sem_Year!='MC' && updateModel.Sem_Year!='OTHER'){ + if(updateModel.Sem_Year!='TC' && updateModel.Sem_Year!='PPC' && updateModel.Sem_Year!='DC' && updateModel.Sem_Year!='MC' && updateModel.Sem_Year!='OTHER'){ var checkTotamt=0; angular.forEach($rootScope.updateMoreItems, function (value, key) {