diff --git a/Apollo/assets/views/status-update/setFeesForStudent.html b/Apollo/assets/views/status-update/setFeesForStudent.html
index b95eb66e..1ffcc637 100755
--- a/Apollo/assets/views/status-update/setFeesForStudent.html
+++ b/Apollo/assets/views/status-update/setFeesForStudent.html
@@ -167,7 +167,7 @@
 
                                     <input type="text"  placeholder="Enter STF/WR Amount"
                                            autofocus tabindex="12" class="form-control" name="STF" id="STF" ng-maxlength="9"
-                                           ng-model="setModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2','2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
+                                           ng-model="setModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2','2','2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
                                     <span class="error text-small block"
                                           ng-if="Form.STF.$dirty && Form.STF.$invalid"
                                           ng-hide="Form.STF.$error.maxlength || Form.STF.$error.pattern">STF/WR amount is required</span>
@@ -183,7 +183,7 @@
 
                                     <input type="text"  placeholder="Enter Other Amount"
                                            autofocus tabindex="13" class="form-control" name="others" id="others" ng-maxlength="9"
-                                           ng-model="setModel.feesType.Others" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2','1');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" readonly/>
+                                           ng-model="setModel.feesType.Others" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2','1','2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" readonly/>
                                     <span class="error text-small block"
                                           ng-if="Form.others.$dirty && Form.others.$invalid"
                                           ng-hide="Form.others.$error.maxlength || Form.others.$error.pattern">Others amount is required</span>
@@ -207,7 +207,7 @@
                                           ng-if="Form.paid.$error.maxlength || Form.paid.$error.pattern">Enter a valid amount</span>
 
                                 </div>-->
-                                <div class="col-md-3 form-group" ng-if="setModel.feesType.ProgramType!='P001' && setModel.feesType.ProgramType!='P002'"
+                               <!-- <div class="col-md-3 form-group" ng-if="setModel.feesType.ProgramType!='P001' && setModel.feesType.ProgramType!='P002'"
                                      ng-class="{'has-error':Form.waiver.$dirty && Form.waiver.$invalid}">
                                     <label>
                                         Waiver</span>
@@ -222,11 +222,27 @@
                                     <span class="error text-small block"
                                           ng-if="Form.waiver.$error.maxlength || Form.waiver.$error.pattern">Enter a valid amount</span>
 
+                                </div>-->
+                                <div class="col-md-3 form-group" ng-if="setModel.feesType.ProgramType!='P001' && setModel.feesType.ProgramType!='P002'"
+                                     ng-class="{'has-error':Form.total.$dirty && Form.total.$invalid}">
+                                    <label>
+                                        Total Fees</span>
+                                    </label>
+
+                                    <input type="text"  placeholder="Enter Total Amount"
+                                           autofocus tabindex="15" class="form-control" name="total" id="total" ng-maxlength="9"
+                                           ng-model="setTotalAmount" ng-pattern="/^[0-9]*$/" readonly/>
+                                    <span class="error text-small block"
+                                          ng-if="Form.total.$dirty && Form.total.$invalid"
+                                          ng-hide="Form.total.$error.maxlength || Form.total.$error.pattern">Total amount is required</span>
+                                    <span class="error text-small block"
+                                          ng-if="Form.total.$error.maxlength || Form.total.$error.pattern">Enter a valid amount</span>
+
                                 </div>
 
                             </div>
                             <div class="row">
-                                <div class="col-md-3 form-group" ng-if="setModel.feesType.ProgramType=='P001' || setModel.feesType.ProgramType=='P002'"
+                                <!--<div class="col-md-3 form-group" ng-if="setModel.feesType.ProgramType=='P001' || setModel.feesType.ProgramType=='P002'"
                                      ng-class="{'has-error':Form.waiver.$dirty && Form.waiver.$invalid}">
                                     <label>
                                         Waiver</span>
@@ -241,8 +257,8 @@
                                     <span class="error text-small block"
                                           ng-if="Form.waiver.$error.maxlength || Form.waiver.$error.pattern">Enter a valid amount</span>
 
-                                </div>
-                                <div class="col-md-3 form-group"
+                                </div>-->
+                                <div class="col-md-3 form-group" ng-if="setModel.feesType.ProgramType=='P001' || setModel.feesType.ProgramType=='P002'"
                                      ng-class="{'has-error':Form.total.$dirty && Form.total.$invalid}">
                                     <label>
                                         Total Fees</span>
@@ -334,7 +350,7 @@
                                                                    placeholder="Select Date"
                                                                    min-date="getDateArray[$index].Date"
                                                                    max-date="getDateArray[$index+2].Date"
-                                                                   close-text="Close" ng-change="setFeesTotalAmount(setModel.feesType,'2','2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-readonly="true"  required="required"/>
+                                                                   close-text="Close" ng-change="setFeesTotalAmount(setModel.feesType,'2','2','1');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-readonly="true"  required="required"/>
                                                             <span class="error text-small block"
                                                                   ng-if="n.DueDate==undefined">Date is required.</span>
                                                             <!--<span class="success text-small block"-->
@@ -351,70 +367,6 @@
 
 
                                                 </div>
-                                                <!--<div class="row">
-                                                    &lt;!&ndash;<div class="col-md-3 form-group"
-                                                         ng-class="{'has-error':Form.insName.$dirty && Form.insName.$invalid,'has-success':Form.insName.$valid}">
-                                                        <label>
-                                                            Installment <span
-                                                                class="symbol required"></span>
-                                                        </label>
-
-                                                        <input type="text"  placeholder="Enter Installment"
-                                                               tabindex="14" class="form-control" name="insName"
-                                                               ng-model="myModelInstallemt.name" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
-                                                        <span class="error text-small block"
-                                                              ng-if="Form.insName.$dirty && Form.insName.$error.required">Installment is required</span>
-                                                        <span class="error text-small block"
-                                                              ng-if="Form.insName.$dirty && Form.insName.$error.pattern">Enter a valid installment</span>
-                                                    </div>
-                                                    <div class="col-md-3 form-group"
-                                                         ng-class="{'has-error':Form.instfeesAmount.$dirty && Form.instfeesAmount.$invalid, 'has-success':Form.instfeesAmount.$valid}">
-                                                        <label>
-                                                            Amount <span
-                                                                class="symbol required"></span>
-                                                        </label>
-
-                                                        <input type="text"  placeholder="Enter Amount"
-                                                               autofocus tabindex="15" class="form-control" name="instfeesAmount" id="instfeesAmount" ng-maxlength="8"
-                                                               ng-model="myModelInstallemt.amount" ng-pattern="/^[0-9]*$/" required="" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
-                                                        <span class="error text-small block"
-                                                              ng-if="Form.instfeesAmount.$dirty && Form.instfeesAmount.$invalid"
-                                                              ng-hide="Form.instfeesAmount.$error.maxlength || Form.instfeesAmount.$error.pattern">Amount is required</span>
-                                                        <span class="error text-small block"
-                                                              ng-if="Form.instfeesAmount.$error.maxlength || Form.instfeesAmount.$error.pattern">Enter a valid amount</span>
-
-                                                    </div>
-                                                    <div data-ng-controller="DatepickerDemoCtrl">
-                                                        <div class="col-md-3 form-group"
-                                                             ng-class="{'has-error':Form.date.$dirty && Form.date.$invalid, 'has-success':Form.date.$valid}">
-                                                            <label>
-                                                                Due Date <span
-                                                                    class="symbol required"></span>
-                                                            </label>
-                                                            <input type="text"
-                                                                   class="form-control " tabindex="16"
-                                                                   ng-click="startOpen = !startOpen"
-                                                                   datepicker-popup="dd-MM-yyyy"
-                                                                   ng-model="myModelInstallemt.date"
-                                                                   is-open="startOpen"
-                                                                   ng-init="startOpen = false"
-                                                                   name="date"
-                                                                   datepicker-options="dateOptions"
-                                                                   placeholder="Select Date"
-
-                                                                   max-date="futureDate"
-                                                                   close-text="Close" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" required="required"/>
-                                                            <span class="error text-small block"
-                                                                  ng-if="Form.date.$dirty && Form.date.$error.required">Date is required.</span>
-                                                            &lt;!&ndash;<span class="success text-small block"&ndash;&gt;
-                                                            &lt;!&ndash;ng-if="Form.date.$valid ">Thank You</span>&ndash;&gt;
-                                                        </div>
-
-                                                    </div>&ndash;&gt;
-                                                    <div class="col-md-3">
-                                                        <input type="button" class="btn btn-sm btn-info" title="Click to add one more items" value="Add More" ng-click="clickMoreItems(Form,setModel.feesType);" style="margin-top:16%;" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
-                                                    </div>
-                                                </div>-->
 
 
                                             </div>
@@ -459,7 +411,7 @@
                                         <th>Course Fees</th>
                                         <th>STF/WR</th>
                                         <th>Others</th>
-                                        <th>Waiver</th>
+                                       <!-- <th>Waiver</th>-->
                                         <th>Payable Fees</th>
 
                                     </tr>
@@ -473,7 +425,7 @@
                                         <td>{{p.ActualFees}}</td>
                                         <td>{{p.STFOrWR}}</td>
                                         <td>{{p.Others}}</td>
-                                        <td>{{p.Waiver}}</td>
+                                       <!-- <td>{{p.Waiver}}</td>-->
                                         <td>{{p.PayableFees}}</td>
 
                                     </tr>