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..2398887 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'
},
@@ -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/accountstaement',
+ 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/masters-routing.module.ts b/src/app/views/masters/masters-routing.module.ts
index f9b69f5..d5c1ee4 100644
--- a/src/app/views/masters/masters-routing.module.ts
+++ b/src/app/views/masters/masters-routing.module.ts
@@ -97,7 +97,7 @@ const routes: Routes = [
path: "shareallotmentmaster",
component: FeesShareAllotmentMasterComponent,
data: {
- title: "Share Allocate"
+ title: "Fees Share"
}
},
{
diff --git a/src/app/views/payment-details/account-statement/account-statement.component.html b/src/app/views/payment-details/account-statement/account-statement.component.html
new file mode 100644
index 0000000..f25470d
--- /dev/null
+++ b/src/app/views/payment-details/account-statement/account-statement.component.html
@@ -0,0 +1,187 @@
+
+
+ Back to List
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Date |
+ Description |
+ University |
+ Form |
+ Debit |
+ Credit |
+ Balance |
+ Remarks |
+
+
+
+
+
+
+ | 10/08/2018 |
+ Payment Received |
+ Anna Uni |
+ FormID 1 |
+ 0 |
+ 10,000 |
+ 10,000 |
+ Amount Received by studycenter A |
+
+
+
+
+
+
+
+ | 11/08/2018 |
+ Fees Adjust |
+ Anna Uni |
+ FormID 2 |
+ 0 |
+ 15,000 |
+ 25,000 |
+ Amount Adjust studycenter A |
+
+
+
+
+
+
+
+ | 12/08/2018 |
+ Refund |
+ Anna Uni |
+ FormID 3 |
+ 5000 |
+ 0 |
+ 20,000 |
+ Amount Refund |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/views/status/paymentdetails/paymentdetails.component.scss b/src/app/views/payment-details/account-statement/account-statement.component.scss
similarity index 100%
rename from src/app/views/status/paymentdetails/paymentdetails.component.scss
rename to src/app/views/payment-details/account-statement/account-statement.component.scss
diff --git a/src/app/views/payment-details/account-statement/account-statement.component.spec.ts b/src/app/views/payment-details/account-statement/account-statement.component.spec.ts
new file mode 100644
index 0000000..0cf7be1
--- /dev/null
+++ b/src/app/views/payment-details/account-statement/account-statement.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AccountStatementComponent } from './account-statement.component';
+
+describe('AccountStatementComponent', () => {
+ let component: AccountStatementComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ AccountStatementComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(AccountStatementComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/views/payment-details/account-statement/account-statement.component.ts b/src/app/views/payment-details/account-statement/account-statement.component.ts
new file mode 100644
index 0000000..6efa36b
--- /dev/null
+++ b/src/app/views/payment-details/account-statement/account-statement.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-account-statement',
+ templateUrl: './account-statement.component.html',
+ styleUrls: ['./account-statement.component.scss']
+})
+export class AccountStatementComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.html b/src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.html
similarity index 100%
rename from src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.html
rename to src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.html
diff --git a/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.scss b/src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.scss
similarity index 100%
rename from src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.scss
rename to src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.scss
diff --git a/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.spec.ts b/src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.spec.ts
similarity index 100%
rename from src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.spec.ts
rename to src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.spec.ts
diff --git a/src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.ts b/src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.ts
similarity index 100%
rename from src/app/views/fees-details/edit-receive-fees/edit-receive-fees.component.ts
rename to src/app/views/payment-details/fees-details/edit-receive-fees/edit-receive-fees.component.ts
diff --git a/src/app/views/fees-details/fees-details.component.html b/src/app/views/payment-details/fees-details/fees-details.component.html
similarity index 100%
rename from src/app/views/fees-details/fees-details.component.html
rename to src/app/views/payment-details/fees-details/fees-details.component.html
diff --git a/src/app/views/fees-details/fees-details.component.scss b/src/app/views/payment-details/fees-details/fees-details.component.scss
similarity index 100%
rename from src/app/views/fees-details/fees-details.component.scss
rename to src/app/views/payment-details/fees-details/fees-details.component.scss
diff --git a/src/app/views/fees-details/fees-details.component.spec.ts b/src/app/views/payment-details/fees-details/fees-details.component.spec.ts
similarity index 100%
rename from src/app/views/fees-details/fees-details.component.spec.ts
rename to src/app/views/payment-details/fees-details/fees-details.component.spec.ts
diff --git a/src/app/views/fees-details/fees-details.component.ts b/src/app/views/payment-details/fees-details/fees-details.component.ts
similarity index 90%
rename from src/app/views/fees-details/fees-details.component.ts
rename to src/app/views/payment-details/fees-details/fees-details.component.ts
index 3abb9bd..8420771 100644
--- a/src/app/views/fees-details/fees-details.component.ts
+++ b/src/app/views/payment-details/fees-details/fees-details.component.ts
@@ -18,8 +18,8 @@ export class FeesDetailsComponent implements OnInit {
ngOnInit() {
}
saveFees() {
- this.showFeesAllocateC= true;
- this.hideFeesDetailsC= true;
+ this.showFeesAllocateC= false;
+ this.hideFeesDetailsC= false;
}
editFees() {
this.showFeesAllocateC= true;
diff --git a/src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.html b/src/app/views/payment-details/fees-details/transfer-fees-details/transfer-fees-details.component.html
similarity index 100%
rename from src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.html
rename to src/app/views/payment-details/fees-details/transfer-fees-details/transfer-fees-details.component.html
diff --git a/src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.scss b/src/app/views/payment-details/fees-details/transfer-fees-details/transfer-fees-details.component.scss
similarity index 100%
rename from src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.scss
rename to src/app/views/payment-details/fees-details/transfer-fees-details/transfer-fees-details.component.scss
diff --git a/src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.spec.ts b/src/app/views/payment-details/fees-details/transfer-fees-details/transfer-fees-details.component.spec.ts
similarity index 100%
rename from src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.spec.ts
rename to src/app/views/payment-details/fees-details/transfer-fees-details/transfer-fees-details.component.spec.ts
diff --git a/src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.ts b/src/app/views/payment-details/fees-details/transfer-fees-details/transfer-fees-details.component.ts
similarity index 100%
rename from src/app/views/fees-details/transfer-fees-details/transfer-fees-details.component.ts
rename to src/app/views/payment-details/fees-details/transfer-fees-details/transfer-fees-details.component.ts
diff --git a/src/app/views/payment-details/payment-details-routing.module.ts b/src/app/views/payment-details/payment-details-routing.module.ts
new file mode 100644
index 0000000..c45df57
--- /dev/null
+++ b/src/app/views/payment-details/payment-details-routing.module.ts
@@ -0,0 +1,36 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { FeesDetailsComponent } from './fees-details/fees-details.component';
+import { AccountStatementComponent } from './account-statement/account-statement.component';
+
+const routes: Routes = [
+ {
+ path: '',
+ data: {
+ title: 'Payment Details'
+ },
+ children: [
+ {
+ path: 'receivefees',
+ component: FeesDetailsComponent,
+ data: {
+ title: 'Fees Receive/Transfer'
+ }
+ },
+ {
+ path: 'accountstaement',
+ component: AccountStatementComponent,
+ data: {
+ title: 'Account Statement'
+ }
+ },
+ ]
+ }
+
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule]
+})
+export class PaymentDetailsRoutingModule { }
diff --git a/src/app/views/payment-details/payment-details.module.spec.ts b/src/app/views/payment-details/payment-details.module.spec.ts
new file mode 100644
index 0000000..63572d3
--- /dev/null
+++ b/src/app/views/payment-details/payment-details.module.spec.ts
@@ -0,0 +1,13 @@
+import { PaymentDetailsModule } from './payment-details.module';
+
+describe('PaymentDetailsModule', () => {
+ let paymentDetailsModule: PaymentDetailsModule;
+
+ beforeEach(() => {
+ paymentDetailsModule = new PaymentDetailsModule();
+ });
+
+ it('should create an instance', () => {
+ expect(paymentDetailsModule).toBeTruthy();
+ });
+});
diff --git a/src/app/views/payment-details/payment-details.module.ts b/src/app/views/payment-details/payment-details.module.ts
new file mode 100644
index 0000000..1f31c50
--- /dev/null
+++ b/src/app/views/payment-details/payment-details.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+// Tabs Component
+import { TabsModule } from 'ngx-bootstrap/tabs';
+import { TooltipModule } from 'ngx-bootstrap/tooltip';
+import { ModalModule } from 'ngx-bootstrap/modal';
+import { PaymentDetailsRoutingModule } from './payment-details-routing.module';
+import { FeesDetailsComponent } from './fees-details/fees-details.component';
+import { EditReceiveFeesComponent } from './fees-details/edit-receive-fees/edit-receive-fees.component';
+import { TransferFeesDetailsComponent } from './fees-details/transfer-fees-details/transfer-fees-details.component';
+import { AccountStatementComponent } from './account-statement/account-statement.component';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ PaymentDetailsRoutingModule, TabsModule,
+ ModalModule.forRoot(),
+ TooltipModule,
+ ],
+ declarations: [FeesDetailsComponent, EditReceiveFeesComponent, TransferFeesDetailsComponent, AccountStatementComponent]
+})
+export class PaymentDetailsModule { }
diff --git a/src/app/views/status/paymentdetails/paymentdetails.component.html b/src/app/views/status/paymentdetails/paymentdetails.component.html
deleted file mode 100644
index 760e475..0000000
--- a/src/app/views/status/paymentdetails/paymentdetails.component.html
+++ /dev/null
@@ -1,188 +0,0 @@
-
-
- Back to List
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- | Date |
- Description |
- University |
- Form |
- Debit |
- Credit |
- Balance |
- Remarks |
-
-
-
-
-
-
- | 10/08/2018 |
- Payment Received |
- Anna Uni |
- FormID 1 |
- 0 |
- 10,000 |
- 10,000 |
- Amount Received by studycenter A |
-
-
-
-
-
-
-
- | 11/08/2018 |
- Fees Adjust |
- Anna Uni |
- FormID 2 |
- 0 |
- 15,000 |
- 25,000 |
- Amount Adjust studycenter A |
-
-
-
-
-
-
-
- | 12/08/2018 |
- Refund |
- Anna Uni |
- FormID 3 |
- 5000 |
- 0 |
- 20,000 |
- Amount Refund |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/views/status/paymentdetails/paymentdetails.component.ts b/src/app/views/status/paymentdetails/paymentdetails.component.ts
deleted file mode 100644
index 567a639..0000000
--- a/src/app/views/status/paymentdetails/paymentdetails.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
- selector: 'app-paymentdetails',
- templateUrl: './paymentdetails.component.html',
- styleUrls: ['./paymentdetails.component.scss']
-})
-export class PaymentdetailsComponent implements OnInit {
-
- constructor() { }
-
- ngOnInit() {
- }
-
-}
diff --git a/src/app/views/status/status-routing.module.ts b/src/app/views/status/status-routing.module.ts
index e397809..a9f3403 100644
--- a/src/app/views/status/status-routing.module.ts
+++ b/src/app/views/status/status-routing.module.ts
@@ -3,8 +3,6 @@ import { Routes, RouterModule } from '@angular/router';
import { DocumentsComponent } from './documents/documents.component';
import { AnswerBookletComponent } from './answer-booklet/answer-booklet.component';
-import { PaymentdetailsComponent } from './paymentdetails/paymentdetails.component';
-
const routes: Routes = [
{
path: '',
@@ -23,12 +21,6 @@ const routes: Routes = [
data: {
title: 'Documents'
}
- },{
- path: 'paymentdetails',
- component: PaymentdetailsComponent,
- data: {
- title: 'Paymentdetails'
- }
}
]
}
diff --git a/src/app/views/status/status.module.ts b/src/app/views/status/status.module.ts
index 34c8ca5..b28db12 100644
--- a/src/app/views/status/status.module.ts
+++ b/src/app/views/status/status.module.ts
@@ -16,8 +16,6 @@ import { EditDocumentsComponent } from './documents/edit-documents/edit-document
//answer-booklet
import { AnswerBookletComponent } from './answer-booklet/answer-booklet.component';
import { EditAnswerBookletComponent } from './answer-booklet/edit-answer-booklet/edit-answer-booklet.component';
-//paymentdetails
-import { PaymentdetailsComponent } from './paymentdetails/paymentdetails.component';
@NgModule({
imports: [
@@ -33,7 +31,6 @@ import { PaymentdetailsComponent } from './paymentdetails/paymentdetails.compone
EditDocumentsComponent,
AnswerBookletComponent,
EditAnswerBookletComponent,
- PaymentdetailsComponent
]
})
export class StatusModule { }