merge payment details

src/app/app.routing.ts

@@ -61,8 +61,9 @@ export const routes: Routes = [
         loadChildren: './views/courier/courier.module#CourierModule'
      },
       {
-        path: 'receivefees',
+        path: 'paymentdetails',
-        loadChildren: './views/fees-details/fees-details.module#FeesDetailsModule',
+        loadChildren: './views/payment-details/payment-details.module#PaymentDetailsModule',
+
       }
     ]
   },

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'
+        }
+      ]
     }
   ];
 }

src/app/views/fees-details/fees-details-routing.module.ts

@@ -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 { }

src/app/views/fees-details/fees-details.module.spec.ts

@@ -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();
-  });
-});

src/app/views/fees-details/fees-details.module.ts

@@ -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 { }

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"
       }
     },
     {

src/app/views/payment-details/account-statement/account-statement.component.html

@@ -0,0 +1,187 @@
+<span *ngIf="show" class="backToList">
+
+  <a (click)="show = !show;" tooltip="Go to listing">Back to List</a>
+  
+  </span>
+<div class="col-lg-12" *ngIf="!show">
+
+<!--/.row-->
+<div class="row">
+<!--/.col-->
+<div class="col-md-12 mb-4">
+<!-- Nav tabs -->
+
+ 
+
+
+
+ 
+  <div class="card">
+      <div class="card-header">
+        <strong>PaymentDetails</strong>
+      </div>
+  <br>
+
+      
+  <div class="card-body">
+    <div class="row">
+                      <div class="col-md-2">
+                          <div class="input-prepend input-group">
+                              <select id="disabledSelect" class="form-control">
+                                  <option value="0">From Date</option>
+                                 
+                              </select>
+                          </div>
+                      </div>
+                      <div class="col-md-2">
+                          <div class="input-prepend input-group">
+                              <select id="disabledSelect" class="form-control">
+                                  <option value="0">To Date</option>
+                                  
+                              </select>
+                          </div>
+                      </div>
+                       <div class="col-md-2">
+                          <div class="input-prepend input-group">
+                              <select id="disabledSelect" class="form-control">
+                                  <option value="0">University</option>
+                                 
+                              </select>
+                          </div>
+                      </div>
+                      <div class="col-md-2">
+                          <div class="input-prepend input-group">
+                              <select id="disabledSelect" class="form-control">
+                                  <option value="0">StudyCenter</option>
+                                 
+                              </select>
+                          </div>
+                      </div>
+                      <div class="col-md-2">
+                          <div class="input-prepend input-group">
+                              <select id="disabledSelect" class="form-control">
+                                  <option value="0">Amount</option>
+                                 
+                              </select>
+                          </div>
+                      </div>
+                      <div class="col-md-2">
+                          <div class="input-prepend input-group">
+                              <button type="button" value="Submit" class="btn btn-primary"> <i class="fa fa-search"></i> Filter</button>
+                          </div>
+                      </div>
+                  </div>
+                  <br>
+  <div class="row">
+                      <div class="col-md-4">
+                          <div class="input-prepend input-group">
+                              <span class="input-group-addon">
+                                  <i class="fa fa-search"></i>
+                                  </span>
+                              <input id="search" class="form-control" type="text" placeholder="search">
+                          </div>
+                      </div>
+                  </div>
+      <br>
+        <div class="row">
+  <div class="col-lg-12 col-xs-12">
+    <table class="table table-bordered">
+  
+      <thead>
+        <tr>
+         
+      <th>Date</th>
+          <th>Description</th>
+          <th>University</th>
+          <th>Form</th>
+    <th>Debit</th>
+    <th>Credit</th>
+    <th>Balance</th>
+          <th>Remarks</th>
+    
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+           
+    <td>10/08/2018</td>
+        <td>Payment Received</td>
+        <td>Anna Uni</td>
+           <td><a href="page-link" href="#">FormID 1</a></td>
+    <td>0</td>
+    <td>10,000</td>
+    <td>10,000</td>
+          <td>Amount Received by studycenter A</td>
+     
+     
+        
+          
+        </tr>
+        <tr>
+           
+     <td>11/08/2018</td>
+          <td>Fees Adjust</td>
+        <td>Anna Uni</td>
+           <td><a href="page-link" href="#">FormID 2</a></td>
+    <td>0</td>
+    <td>15,000</td>
+    <td>25,000</td>
+           <td>Amount Adjust studycenter A</td>
+     
+          
+    
+          
+        </tr>
+        <tr>
+            
+     <td>12/08/2018</td>
+          <td>Refund</td>
+        <td>Anna Uni</td>
+          <td><a href="page-link" href="#">FormID 3</a></td>
+    <td>5000</td>
+    <td>0</td>
+    <td>20,000</td>
+     <td>Amount Refund</td>
+     
+         
+                                
+        </tr>
+       
+       
+      </tbody>
+    </table>
+    <ul class="pagination">
+      <li class="page-item"><a class="page-link" href="#">Prev</a></li>
+      <li class="page-item active">
+        <a class="page-link" href="#">1</a>
+      </li>
+      <li class="page-item"><a class="page-link" href="#">2</a></li>
+      <li class="page-item"><a class="page-link" href="#">3</a></li>
+      <li class="page-item"><a class="page-link" href="#">4</a></li>
+      <li class="page-item"><a class="page-link" href="#">Next</a></li>
+    </ul>
+  </div>
+  <!--/.col-->
+</div>
+    </div>
+    <br>
+      <!-- <div class="card-footer">
+        <div class="form-group row">
+          <div class=" col-md-12" align="right">
+    
+              <button type="button" class="btn btn-sm btn-success"><i class="fa fa-dot-circle-o"></i> Submit</button>
+      &nbsp;
+              <button type="reset" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
+          </div>
+        </div>
+      </div> -->		  
+      
+   
+</div>
+
+</div><!--/.col-->
+</div>
+</div>
+
+<!--/.row-->
+

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<AccountStatementComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AccountStatementComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AccountStatementComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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() {
+  }
+
+}

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.showFeesAllocateC= false;
-    this.hideFeesDetailsC= true;
+    this.hideFeesDetailsC= false;
   }
   editFees() {
     this.showFeesAllocateC= true;

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 { }

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();
+  });
+});

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 { }

src/app/views/status/paymentdetails/paymentdetails.component.html

@@ -1,188 +0,0 @@
-<span *ngIf="show" class="backToList">
-
-    <a (click)="show = !show;" tooltip="Go to listing">Back to List</a>
-    
-    </span>
-<div class="col-lg-12" *ngIf="!show">
-
-<!--/.row-->
-<div class="row">
- <!--/.col-->
- <div class="col-md-12 mb-4">
-  <!-- Nav tabs -->
- 
-	 
-
-
-  
-   
-	  <div class="card">
-        <div class="card-header">
-          <strong>PaymentDetails</strong>
-        </div>
-		<br>
-
-        
-		<div class="card-body">
-      <div class="row">
-                        <div class="col-md-2">
-                            <div class="input-prepend input-group">
-                                <select id="disabledSelect" class="form-control">
-                                    <option value="0">From Date</option>
-                                   
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="input-prepend input-group">
-                                <select id="disabledSelect" class="form-control">
-                                    <option value="0">To Date</option>
-                                    
-                                </select>
-                            </div>
-                        </div>
-                         <div class="col-md-2">
-                            <div class="input-prepend input-group">
-                                <select id="disabledSelect" class="form-control">
-                                    <option value="0">University</option>
-                                   
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="input-prepend input-group">
-                                <select id="disabledSelect" class="form-control">
-                                    <option value="0">StudyCenter</option>
-                                   
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="input-prepend input-group">
-                                <select id="disabledSelect" class="form-control">
-                                    <option value="0">Amount</option>
-                                   
-                                </select>
-                            </div>
-                        </div>
-                        <div class="col-md-2">
-                            <div class="input-prepend input-group">
-                                <button type="button" value="Submit" class="btn btn-primary"> <i class="fa fa-search"></i> Filter</button>
-                            </div>
-                        </div>
-                    </div>
-                    <br>
-		<div class="row">
-                        <div class="col-md-4">
-                            <div class="input-prepend input-group">
-                                <span class="input-group-addon">
-                                    <i class="fa fa-search"></i>
-                                    </span>
-                                <input id="search" class="form-control" type="text" placeholder="search">
-                            </div>
-                        </div>
-                    </div>
-			  <br>
-          <div class="row">
-    <div class="col-lg-12 col-xs-12">
-      <table class="table table-bordered">
-	  
-        <thead>
-          <tr>
-           
-		    <th>Date</th>
-            <th>Description</th>
-            <th>University</th>
-            <th>Form</th>
-			<th>Debit</th>
-			<th>Credit</th>
-			<th>Balance</th>
-            <th>Remarks</th>
-			
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-             
-		  <td>10/08/2018</td>
-          <td>Payment Received</td>
-          <td>Anna Uni</td>
-             <td><a href="page-link" href="#">FormID 1</a></td>
-			<td>0</td>
-			<td>10,000</td>
-			<td>10,000</td>
-            <td>Amount Received by studycenter A</td>
-			 
-			 
-          
-            
-          </tr>
-          <tr>
-             
-		   <td>11/08/2018</td>
-            <td>Fees Adjust</td>
-          <td>Anna Uni</td>
-             <td><a href="page-link" href="#">FormID 2</a></td>
-			<td>0</td>
-			<td>15,000</td>
-			<td>25,000</td>
-             <td>Amount Adjust studycenter A</td>
-			 
-            
-			
-            
-          </tr>
-          <tr>
-              
-		   <td>12/08/2018</td>
-            <td>Refund</td>
-          <td>Anna Uni</td>
-            <td><a href="page-link" href="#">FormID 3</a></td>
-			<td>5000</td>
-			<td>0</td>
-			<td>20,000</td>
-			 <td>Amount Refund</td>
-			 
-           
-                                  
-          </tr>
-         
-         
-        </tbody>
-      </table>
-      <ul class="pagination">
-        <li class="page-item"><a class="page-link" href="#">Prev</a></li>
-        <li class="page-item active">
-          <a class="page-link" href="#">1</a>
-        </li>
-        <li class="page-item"><a class="page-link" href="#">2</a></li>
-        <li class="page-item"><a class="page-link" href="#">3</a></li>
-        <li class="page-item"><a class="page-link" href="#">4</a></li>
-        <li class="page-item"><a class="page-link" href="#">Next</a></li>
-      </ul>
-    </div>
-    <!--/.col-->
-  </div>
-		  </div>
-		  <br>
-        <!-- <div class="card-footer">
-          <div class="form-group row">
-            <div class=" col-md-12" align="right">
-			
-                <button type="button" class="btn btn-sm btn-success"><i class="fa fa-dot-circle-o"></i> Submit</button>
-				&nbsp;
-                <button type="reset" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
-            </div>
-          </div>
-        </div> -->		  
-        
-     
-</div>
-
-</div><!--/.col-->
-</div>
-</div>
-
-<!--/.row-->
-
-

src/app/views/status/paymentdetails/paymentdetails.component.ts

@@ -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() {
-  }
-
-}

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'
-        }
       }
     ]
   }

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 { }