From acb6c9e2b20d8a920e0a8ccc2ea29d23c1125152 Mon Sep 17 00:00:00 2001
From: shikha <shikha.mishra@viithiisys.com>
Date: Tue, 5 May 2020 16:01:47 +0530
Subject: [PATCH] issues solved related to bugs

---
 src/api/menu.js                         |  62 +++++----
 src/components/pageHeader/AppDrawer.vue | 203 ++++++++++++++++++++++++++++-
 src/event.js                            |  14 ++
 src/pages/Account/feeTypes.vue          |   1 +
 src/pages/Account/paymentHistory.vue    | 218 +++++++++++++++++++++++---------
 src/pages/Dashboard/dashboard.vue       |  24 ++--
 src/pages/Report/studentReport.vue      |   6 +-
 src/router/paths.js                     |  22 ++++
 8 files changed, 454 insertions(+), 96 deletions(-)

diff --git a/src/api/menu.js b/src/api/menu.js
index b18e108..3b43d1e 100644
--- a/src/api/menu.js
+++ b/src/api/menu.js
@@ -116,6 +116,7 @@ const adminMenu = [
             { name: 'salaryTemplate', title: 'Salary Template', component: 'Salary Template', action: '', },
             { name: 'hourlyTemplate', title: 'Hourly Template', component: 'Hourly Template', action: '', },
             { name: 'manageSalary', title: 'Manage Salary', component: 'Manage Salary', action: '', },
+            { name: 'makePayment', title: 'Make Payment', component: 'Make Payment', action: '', },
         ]
     },
     {
@@ -210,33 +211,46 @@ const adminMenu = [
 ];
 
 const libraryMenu = [{
-    title: 'Library',
-    group: 'Library',
-    component: 'Library',
-    icon: '/static/schoolIcons/Library.png',
-    items: [
-        { name: 'libraryMember', title: ' Library Member', component: 'libraryMember', action: '', },
-        { name: 'Books', title: 'Books', component: 'Books', action: '', },
-        { name: 'Issue', title: ' Issue', component: 'Issue', action: '', },
-        { name: 'eBooks', title: 'E-Books', component: 'eBooks', action: '', }
+        title: 'Dashboard',
+        name: 'Dashboard',
+        icon: '/static/icon/dashboard.png',
+    },
+    {
+        title: 'Library',
+        group: 'Library',
+        component: 'Library',
+        icon: '/static/icon/library.png',
+        items: [
+            { name: 'LibraryMember', title: ' Library Member', component: 'Library Member', action: '', },
+            { name: 'Books', title: 'Books', component: 'Books', action: '', },
+            { name: 'Issue', title: ' Issue', component: 'Issue', action: '', },
+            { name: 'E-Books', title: 'E-Books', component: 'E-Books', action: '', }
 
-    ]
-}];
+        ]
+    },
+];
 
 const accountMenu = [{
-    title: 'Account',
-    group: 'Account',
-    component: 'Account',
-    icon: '/static/schoolIcons/Account.png',
-    items: [
-        { name: 'feeTypes', title: 'Fee Types', component: 'feeTypes', action: '', },
-        { name: 'Invoice', title: 'Invoice', component: 'Invoice', action: '', },
-        { name: 'paymentHistory', title: 'Payment History', component: 'paymentHistory', action: '', },
-        { name: 'Expense', title: 'Expense', component: 'Expense', action: '', },
-        { name: 'Income', title: 'Income', component: 'Income', action: '', },
-        { name: 'GlobalPayment', title: 'Global Payment', component: 'GlobalPayment', action: '', }
-    ]
-}];
+        title: 'Dashboard',
+        name: 'Dashboard',
+        icon: '/static/icon/dashboard.png',
+    },
+
+    {
+        title: 'Account',
+        group: 'Account',
+        component: 'Account',
+        icon: '/static/icon/accounts.png',
+        items: [
+            { name: 'feeTypes', title: 'Fee Types', component: 'Fee Types', action: '', },
+            { name: 'Invoice', title: 'Invoice', component: 'Invoice', action: '', },
+            { name: 'PaymentHistory', title: 'Payment History', component: 'Payment History', action: '', },
+            { name: 'Expense', title: 'Expense', component: 'Expense', action: '', },
+            { name: 'Income', title: 'Income', component: 'Income', action: '', },
+            { name: 'GlobalPayment', title: 'Global Payment', component: 'Global Payment', action: '', }
+        ]
+    },
+];
 
 const schoolMenu = [
     //  { header: 'Apps' },
diff --git a/src/components/pageHeader/AppDrawer.vue b/src/components/pageHeader/AppDrawer.vue
index 6b78f51..dd6ba8c 100644
--- a/src/components/pageHeader/AppDrawer.vue
+++ b/src/components/pageHeader/AppDrawer.vue
@@ -130,6 +130,200 @@
             <!-- </a> -->
           </v-list-tile>
         </template>
+        <template v-for="(item, i) in menuAccount" v-if="role === 'ACCOUNTANT'">
+          <!-- {{menus}} -->
+          <!--group with subitems-->
+          <v-list-group
+            v-if="item.items"
+            :key="item.name"
+            :group="item.group"
+            no-action="no-action"
+          >
+            <v-list-tile slot="activator" ripple="ripple">
+              <v-list-tile-action v-if="item.icon">
+                <img :src="item.icon" width="22" alt="icons" />
+              </v-list-tile-action>
+              <v-list-tile-content>
+                <v-list-tile-title>{{ item.title }}</v-list-tile-title>
+              </v-list-tile-content>
+            </v-list-tile>
+            <template v-for="(subItem, i) in item.items">
+              <!--sub group-->
+              <v-list-group
+                v-if="subItem.items"
+                :key="subItem.name"
+                :group="subItem.group"
+                sub-group="sub-group"
+              >
+                <v-list-tile slot="activator" ripple="ripple">
+                  <v-list-tile-content>
+                    <v-list-tile-title>{{ subItem.title }}</v-list-tile-title>
+                  </v-list-tile-content>
+                </v-list-tile>
+                <v-list-tile
+                  v-for="(grand, i) in subItem.children"
+                  :key="i"
+                  :to="genChildTarget(item, grand)"
+                  :href="grand.href"
+                  ripple="ripple"
+                >
+                  <v-list-tile-content>
+                    <v-list-tile-title>{{ grand.title }}</v-list-tile-title>
+                  </v-list-tile-content>
+                </v-list-tile>
+              </v-list-group>
+              <!--child item-->
+              <v-list-tile
+                v-else
+                :key="i"
+                :to="genChildTarget(item, subItem)"
+                :href="subItem.href"
+                :disabled="subItem.disabled"
+                :target="subItem.target"
+                ripple="ripple"
+              >
+                <v-list-tile-action v-if="subItem.action">
+                  <img
+                    width="30"
+                    :src="subItem.action"
+                    :class="[subItem.actionClass || 'success--text']"
+                  />
+                </v-list-tile-action>
+                <v-list-tile-content>
+                  <v-list-tile-title class="body-2">
+                    <span>{{ subItem.title }}</span>
+                  </v-list-tile-title>
+                </v-list-tile-content>
+                <!-- <v-circle class="white--text pa-0 circle-pill" v-if="subItem.badge" color="red" disabled="disabled">{{ subItem.badge }}</v-circle> -->
+              </v-list-tile>
+            </template>
+          </v-list-group>
+          <v-subheader v-else-if="item.header" :key="i">{{ item.header }}</v-subheader>
+          <v-divider v-else-if="item.divider" :key="i"></v-divider>
+          <!--top-level link-->
+          <v-list-tile
+            v-else
+            ripple="ripple"
+            :disabled="item.disabled"
+            :target="item.target"
+            rel="noopener"
+            :key="item.name"
+            :to="!item.href ? { name: item.name } : null"
+            :href="item.href"
+          >
+            <!-- <a :href="item.path"> -->
+            <v-list-tile-action v-if="item.icon">
+              <img :src="item.icon" width="22" alt="icons" />
+            </v-list-tile-action>
+            <v-list-tile-content class="pt-2">
+              <v-list-tile-title>{{ item.title }}</v-list-tile-title>
+            </v-list-tile-content>
+            <!-- <v-circle class="white--text pa-0 chip--x-small" v-if="item.badge" :color="item.color || 'primary'" disabled="disabled">{{ item.badge }}</v-circle> -->
+            <v-list-tile-action v-if="item.subAction">
+              <!-- <v-icon class="success--text">{{ item.subAction }}</v-icon> -->
+              <!-- <img :src="item.icon" width="40" alt="icons" /> -->
+            </v-list-tile-action>
+            <!-- <v-circle class="caption blue lighten-2 white--text mx-0" v-else-if="item.chip" label="label" small="small">{{ item.chip }}</v-circle> -->
+            <!-- </a> -->
+          </v-list-tile>
+        </template>
+        <template v-for="(item, i) in menuLibrarian" v-if="role === 'LIBRARIAN'">
+          <!-- {{menus}} -->
+          <!--group with subitems-->
+          <v-list-group
+            v-if="item.items"
+            :key="item.name"
+            :group="item.group"
+            no-action="no-action"
+          >
+            <v-list-tile slot="activator" ripple="ripple">
+              <v-list-tile-action v-if="item.icon">
+                <img :src="item.icon" width="22" alt="icons" />
+              </v-list-tile-action>
+              <v-list-tile-content>
+                <v-list-tile-title>{{ item.title }}</v-list-tile-title>
+              </v-list-tile-content>
+            </v-list-tile>
+            <template v-for="(subItem, i) in item.items">
+              <!--sub group-->
+              <v-list-group
+                v-if="subItem.items"
+                :key="subItem.name"
+                :group="subItem.group"
+                sub-group="sub-group"
+              >
+                <v-list-tile slot="activator" ripple="ripple">
+                  <v-list-tile-content>
+                    <v-list-tile-title>{{ subItem.title }}</v-list-tile-title>
+                  </v-list-tile-content>
+                </v-list-tile>
+                <v-list-tile
+                  v-for="(grand, i) in subItem.children"
+                  :key="i"
+                  :to="genChildTarget(item, grand)"
+                  :href="grand.href"
+                  ripple="ripple"
+                >
+                  <v-list-tile-content>
+                    <v-list-tile-title>{{ grand.title }}</v-list-tile-title>
+                  </v-list-tile-content>
+                </v-list-tile>
+              </v-list-group>
+              <!--child item-->
+              <v-list-tile
+                v-else
+                :key="i"
+                :to="genChildTarget(item, subItem)"
+                :href="subItem.href"
+                :disabled="subItem.disabled"
+                :target="subItem.target"
+                ripple="ripple"
+              >
+                <v-list-tile-action v-if="subItem.action">
+                  <img
+                    width="30"
+                    :src="subItem.action"
+                    :class="[subItem.actionClass || 'success--text']"
+                  />
+                </v-list-tile-action>
+                <v-list-tile-content>
+                  <v-list-tile-title class="body-2">
+                    <span>{{ subItem.title }}</span>
+                  </v-list-tile-title>
+                </v-list-tile-content>
+                <!-- <v-circle class="white--text pa-0 circle-pill" v-if="subItem.badge" color="red" disabled="disabled">{{ subItem.badge }}</v-circle> -->
+              </v-list-tile>
+            </template>
+          </v-list-group>
+          <v-subheader v-else-if="item.header" :key="i">{{ item.header }}</v-subheader>
+          <v-divider v-else-if="item.divider" :key="i"></v-divider>
+          <!--top-level link-->
+          <v-list-tile
+            v-else
+            ripple="ripple"
+            :disabled="item.disabled"
+            :target="item.target"
+            rel="noopener"
+            :key="item.name"
+            :to="!item.href ? { name: item.name } : null"
+            :href="item.href"
+          >
+            <!-- <a :href="item.path"> -->
+            <v-list-tile-action v-if="item.icon">
+              <img :src="item.icon" width="22" alt="icons" />
+            </v-list-tile-action>
+            <v-list-tile-content class="pt-2">
+              <v-list-tile-title>{{ item.title }}</v-list-tile-title>
+            </v-list-tile-content>
+            <!-- <v-circle class="white--text pa-0 chip--x-small" v-if="item.badge" :color="item.color || 'primary'" disabled="disabled">{{ item.badge }}</v-circle> -->
+            <v-list-tile-action v-if="item.subAction">
+              <!-- <v-icon class="success--text">{{ item.subAction }}</v-icon> -->
+              <!-- <img :src="item.icon" width="40" alt="icons" /> -->
+            </v-list-tile-action>
+            <!-- <v-circle class="caption blue lighten-2 white--text mx-0" v-else-if="item.chip" label="label" small="small">{{ item.chip }}</v-circle> -->
+            <!-- </a> -->
+          </v-list-tile>
+        </template>
         <template v-for="(item, i) in menuSchool" v-if="schoolRole === 'SUPERADMIN'">
           <!-- {{menus}} -->
           <!--group with subitems-->
@@ -348,6 +542,8 @@ export default {
     menus: [],
     menuSchool: [],
     menuTeacher: [],
+    menuAccount: [],
+    menuLibrarian: [],
     schoolRole: "",
     role: "",
     scrollSettings: {
@@ -372,6 +568,8 @@ export default {
     this.menus = menu.adminMenu;
     this.menuSchool = menu.schoolMenu;
     this.menuTeacher = menu.teacherMenu;
+    this.menuAccount = menu.accountMenu;
+    this.menuLibrarian = menu.libraryMenu
     // console.log("this.$route.name", this.$route.name);
     // if (this.$route.name === "School") {
     //   localStorage.setItem("SchoolName", this.$route.name);
@@ -424,7 +622,10 @@ export default {
      this.token = this.$store.schoolToken;
    } if (this.$store.state.role === "TEACHER") {
      this.token = this.$store.state.token;
-    //  console.log("token",this.token);
+   }if (this.$store.state.role === "ACCOUNTANT") {
+      this.token = this.$store.state.token;
+   }if (this.$store.state.role === "LIBRARIAN") {
+      this.token = this.$store.state.token;
    }
   }
 };
diff --git a/src/event.js b/src/event.js
index d1aac0d..9634f6f 100644
--- a/src/event.js
+++ b/src/event.js
@@ -31,6 +31,20 @@ export default [{
                 this.$store.dispatch('setSchoolToken', null)
                 this.$store.dispatch('setSchoolRole', null)
                 this.$router.replace({ path: '/' });
+            } else if (this.$store.state.role === "ACCOUNTANT") {
+                this.$store.dispatch('setToken', null)
+                this.$store.dispatch('Id', null)
+                this.$store.dispatch('Role', null)
+                this.$store.dispatch('setSchoolToken', null)
+                this.$store.dispatch('setSchoolRole', null)
+                this.$router.replace({ path: '/' });
+            } else if (this.$store.state.role === "LIBRARIAN") {
+                this.$store.dispatch('setToken', null)
+                this.$store.dispatch('Id', null)
+                this.$store.dispatch('Role', null)
+                this.$store.dispatch('setSchoolToken', null)
+                this.$store.dispatch('setSchoolRole', null)
+                this.$router.replace({ path: '/' });
             }
         }
     },
diff --git a/src/pages/Account/feeTypes.vue b/src/pages/Account/feeTypes.vue
index 4c00c11..ac46ed7 100644
--- a/src/pages/Account/feeTypes.vue
+++ b/src/pages/Account/feeTypes.vue
@@ -421,6 +421,7 @@ export default {
           this.text = response.data.message;
           this.color = "green";
           this.getFeeTypeList();
+          this.editFeeTypeDialog = false;
           this.close();
         })
         .catch(error => {
diff --git a/src/pages/Account/paymentHistory.vue b/src/pages/Account/paymentHistory.vue
index 83918bf..3562099 100644
--- a/src/pages/Account/paymentHistory.vue
+++ b/src/pages/Account/paymentHistory.vue
@@ -1,6 +1,59 @@
 <template>
   <v-container fluid class="body-color">
-    <!-- ****** PAYMENT HOISTORY TABLE ****** -->
+    <!-- ****** Edit  Payment History  ****** -->
+    <v-dialog v-model="editPaymentDialog" max-width="400px">
+      <v-card flat class="card-style pa-2" dark>
+        <v-layout>
+          <v-flex xs12>
+            <label class="title text-xs-center">Edit Payment History</label>
+            <v-icon size="24" class="right" @click="editPaymentDialog = false">cancel</v-icon>
+          </v-flex>
+        </v-layout>
+        <v-form ref="form">
+          <v-container fluid>
+            <v-flex xs12 sm12>
+              <v-layout>
+                <v-flex xs3 class="pt-4 subheading">
+                  <label class="right">Amount:</label>
+                </v-flex>
+                <v-flex xs8 sm7 class="ml-3">
+                  <v-text-field
+                    v-model="editedItem.totalPaidAmount"
+                    placeholder="please fill this field"
+                  ></v-text-field>
+                </v-flex>
+              </v-layout>
+            </v-flex>
+            <v-flex xs12 sm12>
+              <v-layout>
+                <v-flex xs3 class="pt-4 subheading">
+                  <label class="right">Method:</label>
+                </v-flex>
+                <v-flex xs8 sm7 class="ml-3">
+                  <v-select
+                    :items="paymentMethod"
+                    v-model="editedItem.paymentMethod"
+                    label="please fill this field"
+                    required
+                  ></v-select>
+                </v-flex>
+              </v-layout>
+            </v-flex>
+            <v-layout>
+              <v-flex xs12>
+                <v-layout>
+                  <v-spacer></v-spacer>
+                  <v-btn round dark @click="save" class="add-button">Update Payment History</v-btn>
+                  <v-spacer></v-spacer>
+                </v-layout>
+              </v-flex>
+            </v-layout>
+          </v-container>
+        </v-form>
+      </v-card>
+    </v-dialog>
+
+    <!-- ****** PAYMENT HISTORY TABLE ****** -->
     <v-toolbar color="transparent" flat>
       <v-spacer></v-spacer>
       <v-card-title class="body-1" v-show="show">
@@ -25,37 +78,37 @@
     >
       <template slot="items" slot-scope="props">
         <tr class="tr">
-          <td class="td td-row ">{{ props.index + 1 }}</td>
-          <!-- <td class="td td-row text-xs-center">{{ props.item.studentId.name }}</td> -->
+          <td class="td td-row">{{ props.index + 1 }}</td>
+          <td class="td td-row text-xs-center">{{ props.item.studentId.name }}</td>
           <td class="td td-row text-xs-center">{{ props.item.classId.classNum }}</td>
-          <td class="td td-row text-xs-center">{{ props.item.feeType[0].feeTypeName }}</td>
+          <td class="td td-row text-xs-center">{{ props.item.feeType.feeTypeName }}</td>
           <td class="td td-row text-xs-center">{{ props.item.paymentMethod }}</td>
           <td class="td td-row text-xs-center">{{ props.item.totalPaidAmount }}</td>
           <td class="td td-row text-xs-center">{{ dates(props.item.date) }}</td>
-          <!-- <td class="text-xs-center">
-          <span>
-            <v-tooltip top>
-              <img
-                slot="activator"
-                style="cursor:pointer; width:20px; height:18px; "
-                class="mr-5"
-                @click="editItem(props.item)"
-                src="/static/icon/edit1.png"
-              />
-              <span>Edit</span>
-            </v-tooltip>
-            <v-tooltip top>
-              <img
-                slot="activator"
-                style="cursor:pointer;width:20px; height:20px; "
-                class="mr-5"
-                @click="deleteItem(props.item)"
-                src="/static/icon/delete1.png"
-              />
-              <span>Delete</span>
-            </v-tooltip>
-          </span>
-          </td>-->
+          <td class="td td-row text-xs-center">
+            <span>
+              <v-tooltip top>
+                <img
+                  slot="activator"
+                  style="cursor:pointer; width:20px; height:18px; "
+                  class="mr-5"
+                  @click="editItem(props.item)"
+                  src="/static/icon/edit1.png"
+                />
+                <span>Edit</span>
+              </v-tooltip>
+              <v-tooltip top>
+                <img
+                  slot="activator"
+                  style="cursor:pointer;width:20px; height:20px; "
+                  class="mr-5"
+                  @click="deleteItem(props.item)"
+                  src="/static/icon/delete1.png"
+                />
+                <span>Delete</span>
+              </v-tooltip>
+            </span>
+          </td>
         </tr>
       </template>
       <v-alert
@@ -77,6 +130,7 @@ import moment from "moment";
 
 export default {
   data: () => ({
+    snackbar: false,
     showLoader: false,
     search: "",
     show: true,
@@ -84,6 +138,7 @@ export default {
     pagination: {
       rowsPerPage: 10
     },
+    paymentMethod: ["Cash", "Cheque"],
     headers: [
       {
         text: "No",
@@ -91,12 +146,12 @@ export default {
         sortable: false,
         value: "No"
       },
-      // {
-      //   text: "Student",
-      //   value: "student",
-      //   sortable: false,
-      //   align: "center"
-      // },
+      {
+        text: "Student",
+        value: "name",
+        sortable: false,
+        align: "center"
+      },
       { text: "Class", value: "class", sortable: false, align: "center" },
       {
         text: "Fee Type",
@@ -121,13 +176,51 @@ export default {
         value: "date",
         sortable: false,
         align: "center"
-      }
-      // { text: "Action", value: "", sortable: false, align: "center" }
+      },
+      { text: "Action", value: "", sortable: false, align: "center" }
     ],
     paymentHistory: [],
-    addPaymentHistoryDialog: ""
+    addPaymentHistoryDialog: "",
+    editPaymentDialog: false,
+    editedItem: {}
   }),
   methods: {
+    editItem(item) {
+      this.editedIndex = this.paymentHistory.indexOf(item);
+      this.editedItem = Object.assign({}, item);
+      this.editPaymentDialog = true;
+    },
+    deleteItem(item) {
+      let deleteGrade = {
+        invoiceId: item._id,
+        feeTypeId: item.feeType._id,
+      };
+      http()
+        .put(
+          "/deleteFeeType", 
+          confirm("Are you sure you want to delete this?") && 
+             deleteGrade,
+          {
+            headers: {
+              Authorization: "Bearer " + this.token
+            }
+          }
+        )
+        .then(response => {
+          this.snackbar = true;
+          //   this.text = "Successfully Delete Salary ";
+          this.text = response.data.message;
+          this.color = "green";
+          this.getPaymentHistory();
+        })
+        .catch(error => {
+          console.log("error", error);
+          this.snackbar = true;
+          this.text = error.response.data.message;
+          this.color = "red";
+        });
+    },
+
     dates: function(date) {
       return moment(date).format("MMMM DD, YYYY");
     },
@@ -135,7 +228,7 @@ export default {
       this.showLoader = true;
       var token = this.$store.state.token;
       http()
-        .get("/getInvoicesList", {
+        .get("/getPaymentHistory", {
           params: {
             paymentStatus: "FULLY_PAID",
             schoolId: this.$store.state.schoolId
@@ -156,6 +249,32 @@ export default {
           }
         });
     },
+    save() {
+      var updatePayment = {
+        invoiceId: this.editedItem._id,
+        feeTypeId: this.editedItem.feeType._id,
+        paidAmount: this.editedItem.totalPaidAmount,
+        paymentMethod: this.editedItem.paymentMethod
+      };
+      http()
+        .put("/updateFeeType", updatePayment, {
+          headers: {
+            Authorization: "Bearer " + this.token
+          }
+        })
+        .then(response => {
+          this.getPaymentHistory();
+          this.snackbar = true;
+          this.text = response.data.message;
+          this.color = "green";
+          this.editPaymentDialog = false;
+        })
+        .catch(error => {
+          console.log("error", error);
+          this.snackbar = true;
+          this.color = "red";
+        });
+    },
     displaySearch() {
       (this.show = false), (this.showSearch = true);
     },
@@ -164,31 +283,10 @@ export default {
       this.show = true;
       this.search = "";
     }
-    // getRole() {
-    //   this.showLoader = true;
-    //   var token = this.$store.state.token;
-    //   http()
-    //     .get("/getRolesList", {
-    //       headers: { Authorization: "Bearer " + token }
-    //     })
-    //     .then(response => {
-    //       this.userRole = response.data.data;
-    //       this.showLoader = false;
-    //       // console.log("UserList=====>",this.desserts)
-    //     })
-    //     .catch(error => {
-    //       this.showLoader = false;
-    //       if (error.response.status === 401) {
-    //         this.$router.replace({ path: "/" });
-    //         this.$store.dispatch("setToken", null);
-    //         this.$store.dispatch("Id", null);
-    //       }
-    //     });
-    // }
   },
   mounted() {
+    this.token = this.$store.state.token;
     this.getPaymentHistory();
-    // this.getRole();
   }
 };
 </script>
\ No newline at end of file
diff --git a/src/pages/Dashboard/dashboard.vue b/src/pages/Dashboard/dashboard.vue
index adea4d2..09b0cb3 100644
--- a/src/pages/Dashboard/dashboard.vue
+++ b/src/pages/Dashboard/dashboard.vue
@@ -146,16 +146,16 @@
                       </v-flex>
                       <v-flex xs12 sm12 md9 lg9>
                         <div id="chart">
-                        <div v-if="this.series">
-                          <apexchart
-                            type="bar"
-                            height="250"
-                            style="max-width: 800px !important"
-                            :options="chartOptions"
-                            :series="series"
-                            v-show="true"
-                          ></apexchart>
-                        </div>
+                          <div v-if="this.series">
+                            <apexchart
+                              type="bar"
+                              height="250"
+                              style="max-width: 800px !important"
+                              :options="chartOptions"
+                              :series="series"
+                              v-show="true"
+                            ></apexchart>
+                          </div>
                         </div>
                       </v-flex>
                     </v-layout>
@@ -448,6 +448,10 @@ export default {
       this.token = this.$store.state.schoolToken;
     } else if (this.$store.state.role === "TEACHER") {
       this.token = this.$store.state.token;
+    } else if (this.$store.state.role === "ACCOUNTANT") {
+      this.token = this.$store.state.token;
+    } else if (this.$store.state.role === "LIBRARIAN") {
+      this.token = this.$store.state.token;
     }
     // console.log("role", this.$store.state.schoolRole,"tt",this.$store.state.schoolToken);
     // this.getData();
diff --git a/src/pages/Report/studentReport.vue b/src/pages/Report/studentReport.vue
index f4255c7..9eb6adc 100644
--- a/src/pages/Report/studentReport.vue
+++ b/src/pages/Report/studentReport.vue
@@ -193,7 +193,11 @@
           </v-layout>
           <v-layout>
             <v-flex xs12 sm12 md12 class="text-xs-center">
-              <img :src="userData.schoolLogoUrl" width="140" alt="logo" />
+              <!-- <img :src="userData.schoolLogoUrl" width="140" alt="logo" /> -->
+              <v-avatar>
+                <img :src="userData.schoolLogoUrl" v-if="userData.schoolLogoUrl" />
+                <img src="/static/schoolIcons/INTRACK_White.png" v-else-if="!userData.schoolLogoUrl" />
+              </v-avatar>
               <p class="title">{{ userData.name }}</p>
               <p>{{ userData.address }}</p>
             </v-flex>
diff --git a/src/router/paths.js b/src/router/paths.js
index c3855df..7603f74 100644
--- a/src/router/paths.js
+++ b/src/router/paths.js
@@ -340,6 +340,16 @@ export default [{
             )
     },
     {
+        path: '/makePayment',
+        meta: {},
+        name: 'Make Payment',
+        props: (route) => ({ type: route.query.type }),
+        component: () =>
+            import (
+                `@/pages/Payroll/makePayment.vue`
+            )
+    },
+    {
         path: '/AttendenceUser',
         meta: {},
         name: 'User Attendence',
@@ -508,6 +518,18 @@ export default [{
             )
     },
     {
+        path: '/viewPaymentInvoice/:viewPaymentInvoiceId',
+        meta: {},
+        name: 'View Payment Invoice',
+        props: (route) => ({ type: route.query.type }),
+        component: () =>
+            import (
+                /* webpackChunkName: "routes" */
+                /* webpackMode: "lazy-once" */
+                `@/pages/Account/viewPaymentInvoice.vue`
+            )
+    },
+    {
         path: '/globalPayment',
         meta: {},
         name: 'Global Payment',
-- 
2.0.0