changes by suren

This commit is contained in:
sriram-at-840620226347 2019-10-16 20:31:51 +05:30
parent 477867e1bd
commit e0346987f4
3 changed files with 117 additions and 74 deletions

View File

@ -91,59 +91,88 @@
</mat-card>
</div>
<div *ngIf="payment_mode == '2' && contribute_type != '2'" class="ac_det">
<div fxLayout="row" fxLayoutGap="20px">
<div fxLayout="column">
<p>A/c Name : Tamil Nadu State Parent Teacher Association - CSR Funds</p>
<!-- <p>Association : CSR Funds</p> -->
<p>A/C Number : 142301000022944</p>
<p>MICR : 600020076</p>
<p>IFSC : IOBA0001423</p>
<p>Bank : Indian Overseas Bank</p>
<p>Branch : College Road, Chennai</p>
</div>
<!-- <div fxLayout="column" fxLayoutGap="14px">
<mat-card style="width: 80%; height:100%">
<mat-card-header>
<mat-card-title>Payment Details</mat-card-title>
</mat-card-header>
<form [formGroup]="offlineDetForm">
<div fxLayout="column" style="padding:8px;" >
<mat-form-field style="width: 100%">
<mat-select placeholder="Payment Mode" formControlName="payment_mode">
<mat-option *ngFor="let value of payment_mode_data" [value]="value.id">{{value.name}}</mat-option>
</mat-select>
</mat-form-field>
<div *ngIf="offlineDetForm.value.payment_mode == '1'">
<div fxLayout="column" >
<div fxLayout="row" fxLayoutGap="20px">
<mat-form-field class="half-field">
<input matInput type="text" formControlName="check_no" placeholder="Cheque / DD Number">
</mat-form-field>
<mat-form-field class="half-field">
<input matInput [matDatepicker]="picker" placeholder="Date" formControlName="check_date">
<mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
<mat-datepicker #picker></mat-datepicker>
</mat-form-field>
<div fxLayout="row" fxLayoutGap.lg="0" class="p-2">
<div fxFlex="50" fxFlex.xs="100" fxFlex.sm="100" >
<mat-card class="p-2">
<p>A/C Name : Tamil Nadu State Parent Teacher Association - CSR Funds <br>
<!-- <p>Association : CSR Funds</p> -->
A/C Number : 142301000022944 <br>
MICR : 600020076<br>
IFSC : IOBA0001423<br>
Bank : Indian Overseas Bank<br>
Branch : College Road, Chennai
</mat-card>
</div>
<div fxLayout="row">
<mat-form-field class="half-field">
<input matInput type="text" formControlName="check_branch_bank" placeholder="Drawn on Bank and Branch">
</mat-form-field>
<mat-form-field class="half-field">
<mat-select placeholder="Mode of deposit" formControlName="check_deposit_mode">
<mat-option *ngFor="let value of deposit_mode_data" [value]="value.id">{{value.name}}</mat-option>
</mat-select>
</mat-form-field>
</div>
<div fxFlex="50" fxFlex.xs="100" fxFlex.sm="100" >
<mat-card class="p-2">
<mat-card-title>Payment Details</mat-card-title>
<form [formGroup]="offlineDetForm">
<mat-form-field style="width: 100%;">
<mat-select placeholder="Payment Mode" formControlName="payment_type">
<mat-option *ngFor="let value of payment_mode_data" [value]="value.id">{{value.name}}</mat-option>
</mat-select>
</mat-form-field>
<div *ngIf="offlineDetForm.value.payment_type == '1' && offlineDetForm.controls['check_branch_bank']">
<div fxLayout="row">
<mat-form-field style="width: 50%;" class="mr-1">
<input matInput type="text" formControlName="payment_ref" placeholder="Cheque / DD Number">
</mat-form-field>
<mat-form-field style="width: 50%;">
<input matInput [matDatepicker]="picker" placeholder="Date" formControlName="check_date">
<mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
<mat-datepicker #picker></mat-datepicker>
</mat-form-field>
</div>
<div fxLayout="row">
<mat-form-field style="width: 50%;" class="mr-1">
<input matInput type="text" formControlName="check_branch_bank" placeholder="Drawn on Bank and Branch">
</mat-form-field>
<mat-form-field style="width: 50%;">
<mat-select placeholder="Mode of deposit" formControlName="check_deposit_mode">
<mat-option *ngFor="let value of deposit_mode_data" [value]="value.id">{{value.name}}</mat-option>
</mat-select>
</mat-form-field>
</div>
<div fxLayout="row">
<div fxFlex="100" fxFlex.xs="100" fxFlex.sm="100" >
<div *ngIf="offlineDetForm.value.check_deposit_mode == '1' && offlineDetForm.controls['check_deposit_mode']">
<p>Please despatch your Cheque / DD to the below address :<br>
The Secretary,<br>
Tamil Nadu State Parent Teachers Association<br>
6, College Rd, Subba Road Avenue, <br>
Nungambakkam, Chennai 600006<br>
Tamil Nadu</p>
</div>
<div *ngIf="offlineDetForm.value.check_deposit_mode == '2' && offlineDetForm.controls['check_deposit_mode']">
<mat-form-field style="width: 100%;">
<input matInput type="text" formControlName="cheque_drop_address" placeholder="Cheque Drop Details">
</mat-form-field>
</div>
</div>
</div>
</div>
<div *ngIf="offlineDetForm.value.payment_type == '2' && offlineDetForm.controls['check_branch_bank']">
<div fxLayout="row">
<mat-form-field style="width: 50%;" class="mr-1">
<input matInput type="text" formControlName="payment_ref" placeholder="Transaction Reference">
</mat-form-field>
<mat-form-field style="width: 50%;">
<input matInput [matDatepicker]="picker" placeholder="Date" formControlName="check_date">
<mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
<mat-datepicker #picker></mat-datepicker>
</mat-form-field>
</div>
</div>
</form>
</mat-card>
</div>
</div>
</div>
</form>
</mat-card>
</div> -->
</div>
</div>
<ul>
<li *ngIf="payment_mode == '1'"><span>Tamil Nadu State Parent Teacher Association (TNPTA) accepts online voluntary contributions using Net Banking or VISA-Debit/Credit Cards in Indian Rupees (INR) from Individuals, Organizations, Trusts,Companies and Institutions etc.</span></li>

View File

@ -55,7 +55,7 @@ export class PaymentComponent implements OnInit {
loader_control:boolean=false
offlineDetForm:FormGroup;
payment_mode_data=[{id:1,name:"Cheque/DD"},{id:2,name:"Bank Transfer"}]
deposit_mode_data=[{id:1,name:"Despatch"},{id:2,name:"Check Drop"}]
deposit_mode_data=[{id:1,name:"Despatch"},{id:2,name:"Cheque Drop"}]
constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,private apiService:ApiService) {
this.isToken();
@ -116,7 +116,18 @@ export class PaymentComponent implements OnInit {
params.records.mat_delivery_date=this.contributeKind.value.do_delivery
params.records.gen_dev_fund_remarks=this.contributeKind.value.remarks
}
if(this.payment_mode == '2'){
params.records.payment_type=this.offlineDetForm.value.payment_type
params.records.payment_ref=this.offlineDetForm.value.payment_ref
params.records.payment_date=this.offlineDetForm.value.check_date
params.records.bank_branch=this.offlineDetForm.value.check_branch_bank
params.records.mode_of_deposit=this.offlineDetForm.value.check_deposit_mode
params.records.cheque_drop_address=this.offlineDetForm.value.cheque_drop_address
}
params.records.payment_mode=this.payment_mode
console.log(params);
this.apiService.csrContribute(params).subscribe(result=>{
if(result['dataStatus']){
// this.router.navigate(['paymentconfirmation'],{replaceUrl:true})
@ -166,11 +177,12 @@ export class PaymentComponent implements OnInit {
console.log(value)
if(value.target.innerText == 'Offline'){
this.offlineDetForm=this.fb.group({
payment_mode:[''],
check_no:[''],
payment_type:[''],
payment_ref:[''],
check_date:[''],
check_branch_bank:[''],
check_deposit_mode:['']
check_deposit_mode:[''],
cheque_drop_address:['']
})
}

File diff suppressed because one or more lines are too long