From a4fce59de4ccf0fb2b85671a72301343c2262b91 Mon Sep 17 00:00:00 2001
From: Neeraj Sharma <neeraj.sharma@viithiisys.com>
Date: Mon, 11 May 2020 14:30:57 +0530
Subject: [PATCH] complete solve bugs of invoice

---
 src/pages/Account/editInvoice.vue     |  10 +++
 src/pages/Account/invoice.vue         |   3 -
 src/pages/Account/paymentTemplate.vue | 124 +---------------------------------
 3 files changed, 13 insertions(+), 124 deletions(-)

diff --git a/src/pages/Account/editInvoice.vue b/src/pages/Account/editInvoice.vue
index 2b95441..814e538 100644
--- a/src/pages/Account/editInvoice.vue
+++ b/src/pages/Account/editInvoice.vue
@@ -362,6 +362,16 @@ export default {
       if (editInvoiceData.paymentStatus == "NOT_PAID") {
         delete editInvoiceData.paymentMethod;
       }
+      if (this.feeType.subTotal == this.feeType.paidAmount) {
+        editInvoiceData.paymentStatus = "FULLY_PAID";
+        // console.log("FULLY_PAID");
+      }
+      if (editInvoiceData.totalPaidAmount) {
+        if (this.feeType.subTotal != this.feeType.paidAmount) {
+          editInvoiceData.paymentStatus = "PARTIALLY_PAID";
+          // console.log("PARTIALLY_PAID");
+        }
+      }
       http()
         .put("/updateInvoice", editInvoiceData)
         .then(response => {
diff --git a/src/pages/Account/invoice.vue b/src/pages/Account/invoice.vue
index d9ce2e1..355704f 100644
--- a/src/pages/Account/invoice.vue
+++ b/src/pages/Account/invoice.vue
@@ -1158,10 +1158,7 @@ export default {
         if (this.feeTypeData[i].discount) {
           feeType.discount =
             Number(feeType.discount) + Number(this.feeTypeData[i].discount);
-          // console.log("feeType.discount", feeType.discount);
           this.feeType.discount = feeType.discount;
-          console.log("feeType.discount", this.feeType.discount);
-
           feeType.subParticularTotal =
             this.feeTypeData[i].amount -
             (this.feeTypeData[i].amount * this.feeTypeData[i].discount) / 100;
diff --git a/src/pages/Account/paymentTemplate.vue b/src/pages/Account/paymentTemplate.vue
index 02c4546..2eb2743 100644
--- a/src/pages/Account/paymentTemplate.vue
+++ b/src/pages/Account/paymentTemplate.vue
@@ -20,6 +20,7 @@
                 <h3>Profile</h3>
                 <v-spacer></v-spacer>
               </v-toolbar>
+              <!-- Profile User-->
               <v-card-text>
                 <v-container>
                   <v-layout wrap>
@@ -71,6 +72,7 @@
                 </v-container>
               </v-card-text>
             </v-card>
+            <!-- Account Fee Type List User-->
             <v-card flat>
               <v-toolbar dark class="card-styles" flat>
                 <v-spacer></v-spacer>
@@ -80,82 +82,6 @@
                 <v-spacer></v-spacer>
               </v-toolbar>
               <v-form ref="form" v-model="valid" lazy-validation class="py-4">
-                <!-- <v-layout>
-                  <v-flex xs4 class="pt-4 subheading">
-                    <label class="right hidden-xs-only hidden-sm-only">Select Class:</label>
-                    <label class="right hidden-lg-only hidden-md-only hidden-xl-only">Class:</label>
-                  </v-flex>
-                  <v-flex xs6 class="ml-3">
-                    <v-select
-                      :items="addclass"
-                      label="Select Class"
-                      v-model="editPayment.classId"
-                      item-text="classNum"
-                      item-value="_id"
-                      @change="getAllStudents()"
-                    ></v-select>
-                  </v-flex>
-                </v-layout>
-                <v-layout>
-                  <v-flex xs4 class="pt-4 subheading">
-                    <label class="right hidden-xs-only hidden-sm-only">Select Student:</label>
-                    <label class="right hidden-lg-only hidden-md-only hidden-xl-only">Student:</label>
-                  </v-flex>
-                  <v-flex xs6 class="ml-3">
-                    <v-select
-                      :items="studentList"
-                      label="Select Incharge"
-                      v-model="editPayment.studentId"
-                      item-text="name"
-                      item-value="_id"
-                    ></v-select>
-                  </v-flex>
-                </v-layout>
-                <v-layout>
-                  <v-flex xs4 class="pt-4 subheading">
-                    <label class="right">Date:</label>
-                  </v-flex>
-                  <v-flex xs6 class="ml-3">
-                    <v-menu
-                      ref="menu1"
-                      :close-on-content-click="false"
-                      v-model="menu1"
-                      :nudge-right="40"
-                      lazy
-                      :return-value.sync="editPayment.date"
-                      transition="scale-transition"
-                      offset-y
-                      full-width
-                      min-width="290px"
-                    >
-                      <v-text-field
-                        slot="activator"
-                        v-model="editPayment.date"
-                        placeholder="Select date"
-                      ></v-text-field>
-                      <v-date-picker
-                        v-model="editPayment.date"
-                        @input="$refs.menu1.save(editPayment.date)"
-                      ></v-date-picker>
-                    </v-menu>
-                  </v-flex>
-                </v-layout>
-                <v-layout>
-                  <v-flex xs4 class="pt-4 subheading">
-                    <label class="right hidden-xs-only hidden-sm-only">Payment Status:</label>
-                    <label class="right hidden-lg-only hidden-md-only hidden-xl-only">Payment:</label>
-                  </v-flex>
-                  <v-flex xs6 class="ml-3">
-                    <v-select
-                      :items="paymentStatus"
-                      v-model="editPayment.paymentStatus"
-                      item-text="name"
-                      item-value="value"
-                      label="Select Payment Status"
-                      @change="getPayMethodList"
-                    ></v-select>
-                  </v-flex>
-                </v-layout>-->
                 <v-layout>
                   <v-flex xs4 class="pt-4 subheading">
                     <label class="right">Payment Method:</label>
@@ -189,42 +115,6 @@
                 </v-toolbar-title>
                 <v-spacer></v-spacer>
               </v-toolbar>
-              <!-- <v-layout wrap>
-                <v-flex xs12>
-                  <v-layout wrap>
-                    <v-flex xs12 sm2 class="mt-3">
-                      <label class="right title hidden-sm-only hidden-xs-only">Fee Type:</label>
-                      <label
-                        class="left pl-2 title hidden-xl-only hidden-lg-only hidden-md-only"
-                      >Fee Type:</label>
-                    </v-flex>
-                    <v-flex xs12 sm4>
-                      <v-select
-                        :items="feeTypes"
-                        v-model="feeType.feeTypeName"
-                        item-text="feeType"
-                        item-value="feeType"
-                        label="Select Fee Type"
-                        class="px-2"
-                      ></v-select>
-                    </v-flex>
-                    <v-flex xs12 sm6>
-                      <v-btn
-                        dark
-                        class="right mt-3 hidden-sm-only hidden-xs-only"
-                        color="open-dialog-button"
-                        @click="selectFeeType"
-                      >ADD</v-btn>
-                      <v-btn
-                        dark
-                        class="mt-3 hidden-xl-only hidden-lg-only hidden-md-only"
-                        color="open-dialog-button"
-                        @click="selectFeeType"
-                      >ADD</v-btn>
-                    </v-flex>
-                  </v-layout>
-                </v-flex>
-              </v-layout>-->
               <table class="feeTypeTable tableRsponsive">
                 <tr class="info white--text">
                   <th>#</th>
@@ -257,15 +147,7 @@
                     ></v-text-field>
                   </td>
                   <td>{{ feeType.subTotal }}</td>
-                  <td v-if="editPayment.paymentStatus === 'NOT_PAID'">
-                    <v-text-field
-                      placeholder="fill your Paid Amount"
-                      v-model="feeType.paidAmount"
-                      type="number"
-                      :disabled="disabled"
-                    ></v-text-field>
-                  </td>
-                  <td v-if="editPayment.paymentStatus != 'NOT_PAID'">
+                  <td>
                     <v-text-field
                       placeholder="fill your Paid Amount"
                       v-model="feeType.paidAmount"
-- 
2.0.0