diff --git a/src/api/menu.js b/src/api/menu.js index f437996..6295d68 100644 --- a/src/api/menu.js +++ b/src/api/menu.js @@ -77,19 +77,19 @@ const Menu = [ path: '/timeTable', icon: '/static/schoolIcons/Time_table.png', }, - // { - // 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: '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: 'Notification', path: '/notification', diff --git a/src/pages/Account/invoice.vue b/src/pages/Account/invoice.vue index 0622907..be140bb 100644 --- a/src/pages/Account/invoice.vue +++ b/src/pages/Account/invoice.vue @@ -639,7 +639,7 @@ export default { this.invoiceList = response.data.data; this.showLoader = false; }) - .catch(err => { + .catch(error => { // console.log("err====>", err); this.showLoader = false; if (error.response.status === 401) { @@ -720,11 +720,12 @@ export default { paidAmount: "" }; for (let i = 0; i < this.feeTypeData.length; i++) { + // *********** AMOUNT *********** feeType.amount = Number(feeType.amount) + Number(this.feeTypeData[i].amount); - console.log("feeType.amount ", feeType.amount); + // console.log("feeType.amount ", feeType.amount); this.feeType.amount = feeType.amount; this.feeType.subTotal = feeType.amount; this.feeTypeData[i].subTotal = this.feeTypeData[i].amount; @@ -734,12 +735,12 @@ export default { if (this.feeTypeData[i].discount) { feeType.discount = Number(feeType.discount) + Number(this.feeTypeData[i].discount); - console.log("feeType.discount", feeType.discount); + // console.log("feeType.discount", feeType.discount); this.feeType.discount = feeType.discount; feeType.subParticularTotal = this.feeTypeData[i].amount - (this.feeTypeData[i].amount * this.feeTypeData[i].discount) / 100; - console.log("feeType.subTotal", feeType.subTotal); + // console.log("feeType.subTotal", feeType.subTotal); this.feeTypeData[i].subTotal = feeType.subParticularTotal.toFixed(2); } diff --git a/src/pages/Account/paymentHistory.vue b/src/pages/Account/paymentHistory.vue index 3537497..6eab36c 100644 --- a/src/pages/Account/paymentHistory.vue +++ b/src/pages/Account/paymentHistory.vue @@ -26,18 +26,26 @@