From 728b5d417ab010325fb8c94d66148ce14309bb8a Mon Sep 17 00:00:00 2001
From: Neeraj Sharma <neeraj.sharma@viithiisys.com>
Date: Tue, 12 May 2020 18:11:09 +0530
Subject: [PATCH] solve bugs in add invoice

---
 src/pages/Account/invoice.vue           |  6 ++++++
 src/pages/Report/progressCardReport.vue | 25 ++++++++++++-------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/pages/Account/invoice.vue b/src/pages/Account/invoice.vue
index 57748f1..eaac174 100644
--- a/src/pages/Account/invoice.vue
+++ b/src/pages/Account/invoice.vue
@@ -359,6 +359,7 @@
                         <v-select
                           :items="paymentMethods"
                           v-model="invoiceData.paymentMethod"
+                          :rules="paymentMethodRules"
                           label="Select Payment Method"
                           required
                         ></v-select>
@@ -589,6 +590,7 @@ export default {
     subtotalRules: [v => !!v || "Subtotal is required"],
     paymentRules: [v => !!v || "Payment is required"],
     paidAmountRules: [v => !!v || "Paid Amount is required"],
+    paymentMethodRules: [],
     headers: [
       {
         text: "No",
@@ -1017,13 +1019,17 @@ export default {
     getPayMethodList() {
       if (this.invoiceData.paymentStatus == "PARTIALLY_PAID") {
         this.showPayMethods = true;
+        this.paymentMethodRules = [v => !!v || "Payment Method is required"];
       } else if (this.invoiceData.paymentStatus == "FULLY_PAID") {
         this.showPayMethods = true;
+        this.paymentMethodRules = [v => !!v || "Payment Method is required"];
       } else if (this.invoiceData.paymentStatus == "NOT_PAID") {
         for (let i = 0; i < this.feeTypeData.length; i++) {
           this.feeTypeData[i].paidAmount = "0.00";
           this.feeType.paidAmount = "0.00";
         }
+        this.paymentMethodRules = "";
+        this.showPayMethods = false;
       } else {
         this.showPayMethods = false;
       }
diff --git a/src/pages/Report/progressCardReport.vue b/src/pages/Report/progressCardReport.vue
index 75c0529..2324c5a 100644
--- a/src/pages/Report/progressCardReport.vue
+++ b/src/pages/Report/progressCardReport.vue
@@ -177,7 +177,6 @@
                           </div>
                         </v-flex>
                       </v-layout>
-                      <!-- {{studentMark.examId.examName}} -->
                       <!-- Start Table Report Marks -->
                       <v-card class="student-table">
                         <table
@@ -250,36 +249,36 @@
                           </tbody>
                           <tfoot>
                             <tr style="border: 1px solid lightgrey !important;">
-                              <td colspan="5">
-                                <span class="subheding">Total Marks</span>
-                              </td>
+                              <td
+                                colspan="5"
+                                style="text-align:center"
+                                class="subheding"
+                              >Total Marks</td>
                               <td
                                 colspan="7"
                                 style="border: 1px solid lightgrey !important;padding: 10px;"
                               >{{ studentMark.totalMarks }}</td>
                             </tr>
                             <tr>
-                              <td colspan="5">
-                                <span class="subheding">Grade</span>
-                              </td>
+                              <td colspan="5" style="text-align:center" class="subheding">Grade</td>
                               <td
                                 colspan="7"
                                 style="border: 1px solid lightgrey !important;padding: 10px;"
                               >{{ studentMark.grade }}</td>
                             </tr>
                             <tr>
-                              <td colspan="5">
-                                <span class="subheding">Average Mark</span>
-                              </td>
+                              <td
+                                colspan="5"
+                                style="text-align:center"
+                                class="subheding"
+                              >Average Mark</td>
                               <td
                                 colspan="7"
                                 style="border: 1px solid lightgrey !important;padding: 10px;"
                               ></td>
                             </tr>
                             <tr>
-                              <td colspan="5">
-                                <span class="subheding">GPA</span>
-                              </td>
+                              <td colspan="5" style="text-align:center" class="subheding">GPA</td>
                               <td
                                 colspan="7"
                                 style="border: 1px solid lightgrey !important;padding: 10px;"
-- 
2.0.0