diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index 42521f3..800cdf8 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -61,8 +61,9 @@ export const routes: Routes = [ loadChildren: './views/courier/courier.module#CourierModule' }, { - path: 'receivefees', - loadChildren: './views/fees-details/fees-details.module#FeesDetailsModule', + path: 'paymentdetails', + loadChildren: './views/payment-details/payment-details.module#PaymentDetailsModule', + } ] }, diff --git a/src/app/components/app-sidebar/app-sidebar.component.ts b/src/app/components/app-sidebar/app-sidebar.component.ts index 0e74865..cd5cc75 100644 --- a/src/app/components/app-sidebar/app-sidebar.component.ts +++ b/src/app/components/app-sidebar/app-sidebar.component.ts @@ -66,7 +66,7 @@ export class AppSidebar { icon: 'fa fa-book' }, { - name: 'Allocate Fees', + name: 'Fees Share', url: '/masters/shareallotmentmaster', icon: 'fa fa-adjust' }, @@ -90,17 +90,17 @@ export class AppSidebar { name: 'Fees', url: '/masters/FeesMaster', icon: 'fa fa-money' - }, - { - name: 'Document', - url: '/masters/DocumentMaster', - icon: 'fa fa-file' - }, - { - name: 'Exam Timetable', - url: '/masters/ExamTimetable', - icon: 'fa fa-calendar-minus-o' } + // { + // name: 'Document', + // url: '/masters/DocumentMaster', + // icon: 'fa fa-file' + // }, + // { + // name: 'Exam Timetable', + // url: '/masters/ExamTimetable', + // icon: 'fa fa-calendar-minus-o' + // } ] },{ name: 'Student Enrolment', @@ -118,11 +118,6 @@ export class AppSidebar { name: 'Documents', url: '/status/documents', icon: 'fa fa-file-pdf-o' - }, - { - name: 'PaymentDetails', - url: '/status/paymentdetails', - icon: 'fa fa-credit-card-alt' } ] },{ @@ -146,9 +141,20 @@ export class AppSidebar { url : '/courier', }, { - name: 'Fees Receive/Refund ', + name: 'Payment Details', icon: 'fa fa-money', - url: '/receivefees', + children: [ + { + name: 'Fees Receive/Transfer', + icon: 'fa fa-money', + url: '/paymentdetails/receivefees', + }, + { + name: 'Account Statement', + url: '/paymentdetails/accountstatement', + icon: 'fa fa-credit-card-alt' + } + ] } ]; } diff --git a/src/app/views/fees-details/fees-details-routing.module.ts b/src/app/views/fees-details/fees-details-routing.module.ts deleted file mode 100644 index 0276e2a..0000000 --- a/src/app/views/fees-details/fees-details-routing.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import { FeesDetailsComponent } from './fees-details.component'; - -const routes: Routes = [ - { - path: '', - component: FeesDetailsComponent, - data: { - title: "Fees Receive/Transfer" - } - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class FeesDetailsRoutingModule { } diff --git a/src/app/views/fees-details/fees-details.module.spec.ts b/src/app/views/fees-details/fees-details.module.spec.ts deleted file mode 100644 index db02933..0000000 --- a/src/app/views/fees-details/fees-details.module.spec.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { FeesDetailsModule } from './fees-details.module'; - -describe('FeesDetailsModule', () => { - let feesDetailsModule: FeesDetailsModule; - - beforeEach(() => { - feesDetailsModule = new FeesDetailsModule(); - }); - - it('should create an instance', () => { - expect(feesDetailsModule).toBeTruthy(); - }); -}); diff --git a/src/app/views/fees-details/fees-details.module.ts b/src/app/views/fees-details/fees-details.module.ts deleted file mode 100644 index ceba56c..0000000 --- a/src/app/views/fees-details/fees-details.module.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -// Modal Component -import { ModalModule } from 'ngx-bootstrap/modal'; -// Tabs Component -import { TabsModule } from 'ngx-bootstrap/tabs'; -import { FeesDetailsRoutingModule } from './fees-details-routing.module'; -import { FeesDetailsComponent } from './fees-details.component'; -import { EditReceiveFeesComponent } from './edit-receive-fees/edit-receive-fees.component'; -import { TransferFeesDetailsComponent } from './transfer-fees-details/transfer-fees-details.component'; -@NgModule({ - imports: [ - CommonModule, - FeesDetailsRoutingModule, TabsModule, ModalModule.forRoot() - ], - declarations: [FeesDetailsComponent, EditReceiveFeesComponent, TransferFeesDetailsComponent] -}) -export class FeesDetailsModule { } diff --git a/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.html b/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.html index 572e21c..a6925d5 100644 --- a/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.html +++ b/src/app/views/masters/course-master/add-semyear-fees/add-semyear-fees.component.html @@ -30,10 +30,11 @@