+
+
\ No newline at end of file
diff --git a/ng8-seed/src/app/components/payment-status/success/success.component.scss b/ng8-seed/src/app/components/payment-status/success/success.component.scss
new file mode 100644
index 0000000..2ee3dbf
--- /dev/null
+++ b/ng8-seed/src/app/components/payment-status/success/success.component.scss
@@ -0,0 +1,35 @@
+.success_icon{
+ font-size: 35px;
+ color:rgb(136, 211, 25)
+}
+.success_text{
+ font-size:35px;
+ color:rgb(136, 211, 25);
+ text-transform: capitalize
+}
+.div_over{
+ margin-top:8%;
+ text-align: center;
+ border: 2px solid rgb(25, 183, 211);
+ width: 40%;
+ padding: 5px;
+ border-radius: 10px;
+}
+.failure_text{
+ font-size:35px;
+ color:red;
+ text-transform: capitalize
+}
+.failure_icon{
+ font-size: 35px;
+ color:red
+}
+.awaited_text{
+ font-size:35px;
+ color:rgb(255, 145, 2);
+ text-transform: capitalize
+}
+.awaited_icon{
+ font-size: 35px;
+ color:rgb(255, 145, 2);
+}
\ No newline at end of file
diff --git a/ng8-seed/src/app/components/payment-status/success/success.component.spec.ts b/ng8-seed/src/app/components/payment-status/success/success.component.spec.ts
new file mode 100644
index 0000000..b28e98a
--- /dev/null
+++ b/ng8-seed/src/app/components/payment-status/success/success.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SuccessComponent } from './success.component';
+
+describe('SuccessComponent', () => {
+ let component: SuccessComponent;
+ let fixture: ComponentFixture
+ {{status_text == 'success' ? 'check_circle_outline' : 'warning'}}
+
+ Payment {{status_text}}
+
+
+
+ Thank You for your Support
+
Sorry there has been a problem in getting payment approval
+ +
+
+
+ +
+ Redirecting to Home Page Please Wait..
+ +
+
+
+Do not Refresh this Page
+Choose a Payment Option
Choose a Payment Option
+Delivery Details
@@ -48,7 +49,7 @@
- Online
+ Online
Offline
@@ -87,7 +88,7 @@
- ₹ {{grand_tot_value}}
+
-
+
{{ menuitem.icon }}
- {{ menuitem.name | translate }}
+ {{ menuitem.name == 'Login' ? user_name == '' ? menuitem.name : 'Log Out' : menuitem.name | translate }}
diff --git a/ng8-seed/src/app/layouts/admin/admin-layout.component.ts b/ng8-seed/src/app/layouts/admin/admin-layout.component.ts
index b909931..9ff678d 100644
--- a/ng8-seed/src/app/layouts/admin/admin-layout.component.ts
+++ b/ng8-seed/src/app/layouts/admin/admin-layout.component.ts
@@ -265,4 +265,21 @@ export class AdminLayoutComponent implements OnInit, OnDestroy {
})
}
+ navRedirectionHorizontal(menuitem){
+ if(menuitem.state == 'authentication'){
+ if(this.user_name != ''){
+ // return
+ // this.router.navigateByUrl('/user-profile')
+ this.signOut()
+
+ }
+ else{
+ // this.router.navigateByUrl('/'+menuitem.state)
+ this.loginScreen()
+ }
+ }
+ else{
+ this.router.navigateByUrl('/'+menuitem.state)
+ }
+ }
}
diff --git a/ng8-seed/src/app/shared/api.service.ts b/ng8-seed/src/app/shared/api.service.ts
index 6f9fa1c..cbcf860 100644
--- a/ng8-seed/src/app/shared/api.service.ts
+++ b/ng8-seed/src/app/shared/api.service.ts
@@ -164,5 +164,16 @@ export class ApiService {
)
}
+ generateIOBPayToken(data){
+ let token_decode=this.jwtDecode(localStorage.getItem('token'))
+ data.user_id=token_decode['payload'].userid
+ data.udf1=token_decode['payload'].userid
+ return this.http.post(apiUrl+'generateIOBPayToken',{records:data})
+
+ }
+ checkTxnStatus(param){
+ return this.http.post(apiUrl+'checkTxnStatus',param).pipe(catchError(err=>this.handleError(err)))
+ }
+
}
diff --git a/ng8-seed/src/app/shared/guards/auth-guard.service.ts b/ng8-seed/src/app/shared/guards/auth-guard.service.ts
index af85dca..5e15380 100644
--- a/ng8-seed/src/app/shared/guards/auth-guard.service.ts
+++ b/ng8-seed/src/app/shared/guards/auth-guard.service.ts
@@ -19,11 +19,13 @@ export class AuthGuardService implements CanActivate{
canActivate(): boolean {
console.log("can activate",this.api.isToken())
+ console.log("authguard",this.router.url)
if(this.api.isToken()){
return this.api.isToken();
}
- else{
+ else if(this.router.url == '/home/project-detail' || this.router.url == '/contribute'){
+
const dialogConfig = new MatDialogConfig();
dialogConfig.disableClose = true;
@@ -36,5 +38,8 @@ export class AuthGuardService implements CanActivate{
// this.router.navigate(['/authentication'])
return false
}
+ else{
+ return false
+ }
}
}
A/c Name : Tamil Nadu State Parent Teacher
Association : CSR Funds
A/C Number : 142301000022944
@@ -97,7 +98,7 @@Branch : College Road, Chennai
-
-
- Government of Tamil Nadu accepts online voluntary contributions using Net Banking or VISA-Debit/Credit Cards in Indian Rupees (INR) from Individuals, Organizations, Trusts,Companies and Institutions etc. +
- Government of Tamil Nadu accepts online voluntary contributions using Net Banking or VISA-Debit/Credit Cards in Indian Rupees (INR) from Individuals, Organizations, Trusts,Companies and Institutions etc.
- All contributions towards Tamil Nadu State Parent Teacher Association (TNPTA) are exempt from Income Tax under section 80 (G).
- The PAN Number of Tamil Nadu State Tamil Nadu Parent Teacher Association (TNPTA) is AACAT2920R.
-
+
+
-
-->
+
+
+
+
\ No newline at end of file
diff --git a/ng8-seed/src/app/components/payment/payment.component.scss b/ng8-seed/src/app/components/payment/payment.component.scss
index 01b1877..d227908 100644
--- a/ng8-seed/src/app/components/payment/payment.component.scss
+++ b/ng8-seed/src/app/components/payment/payment.component.scss
@@ -196,3 +196,8 @@ $product-bg-color-hover: rgba(103, 58, 183, 0.7);
// background-color: #A6CDDE;
}
+.nocontent{
+ text-align: center;
+ margin-bottom: 4%;
+ font-size: 15px;
+}
diff --git a/ng8-seed/src/app/components/payment/payment.component.ts b/ng8-seed/src/app/components/payment/payment.component.ts
index 4dff566..ae8e5a1 100644
--- a/ng8-seed/src/app/components/payment/payment.component.ts
+++ b/ng8-seed/src/app/components/payment/payment.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild, ElementRef } from '@angular/core';
import { Router } from '@angular/router';
import { FormBuilder, FormGroup } from '@angular/forms';
import { ApiService } from 'app/shared/api.service';
@@ -10,6 +10,7 @@ import { ApiService } from 'app/shared/api.service';
})
export class PaymentComponent implements OnInit {
+ @ViewChild('form',{static:false}) form: ElementRef;
isRequired = false;
isDisabled = false;
currentDrink: string;
@@ -49,6 +50,9 @@ export class PaymentComponent implements OnInit {
contribute_params: any;
payment_mode:any="2"; //1-online 2-offline
maxDate=new Date()
+ reqjson=''
+ action_url=''
+ loader_control:boolean=false
constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,private apiService:ApiService) {
this.isToken();
@@ -111,7 +115,41 @@ export class PaymentComponent implements OnInit {
params.records.payment_mode=this.payment_mode
this.apiService.csrContribute(params).subscribe(result=>{
if(result['dataStatus']){
- this.router.navigate(['paymentconfirmation'],{replaceUrl:true})
+ // this.router.navigate(['paymentconfirmation'],{replaceUrl:true})
+ if(this.payment_mode == "1"){
+ this.loader_control=true
+ let params={"total_amount":this.grand_tot_value,"udf1":"","udf2":"","udf3":"","user_id":"","con_id":this.contribute_params.records.id}
+ this.apiService.generateIOBPayToken(params).subscribe(res=>{
+ if(res['dataStatus']){
+ localStorage.setItem('merchanttxnid',res['records'].merchanttxnid)
+ let url=res['records'].url
+ let url_param=res['records'].txn_ini_string;
+
+ url_param=url_param.replace(/"/g,'"')
+ this.reqjson=url_param;
+ this.action_url=url;
+ setTimeout(()=>{
+ this.form.nativeElement.submit()
+ // this.loader_control=false
+ })
+
+ }
+ // this.loader_control=false
+ },err=>{
+ console.log(err)
+ })
+ }
+ else{
+ this.router.navigate(['paymentconfirmation'],{replaceUrl:true})
+ }
+ // setTimeout(_ => );
+ // let send_param={reqjson:''}
+ // send_param.reqjson=url_param
+ // console.log("url_param",url,send_param)
+ // this.apiService.post(url,send_param).subscribe(redirect_res=>{
+ // console.log("redirect success",redirect_res);
+ // })
+
}
else{
console.log("something went wrong")
diff --git a/ng8-seed/src/app/components/user-profile/user-profile.component.html b/ng8-seed/src/app/components/user-profile/user-profile.component.html
index 1e0663c..642d560 100644
--- a/ng8-seed/src/app/components/user-profile/user-profile.component.html
+++ b/ng8-seed/src/app/components/user-profile/user-profile.component.html
@@ -138,7 +138,7 @@
-->
+
+ Processing Payment Please Wait....
+
+
Contributions
- Payment Status
-
-
+
+
+
@@ -212,4 +214,49 @@
\ No newline at end of file
+
-->
+ Contributions
@@ -167,9 +167,11 @@{{data.txnstatus}}
+ -
+ Failed
+
+
+
+
+Page Title
+
+
+
\ No newline at end of file
diff --git a/ng8-seed/src/app/components/user-profile/user-profile.component.ts b/ng8-seed/src/app/components/user-profile/user-profile.component.ts
index cc7d8a7..406735c 100644
--- a/ng8-seed/src/app/components/user-profile/user-profile.component.ts
+++ b/ng8-seed/src/app/components/user-profile/user-profile.component.ts
@@ -2,7 +2,10 @@ import { Component, OnInit } from '@angular/core';
import { ApiService } from 'app/shared/api.service';
import { FormGroup, FormBuilder } from '@angular/forms';
import {animate, state, style, transition, trigger} from '@angular/animations';
-import { MatTableDataSource } from '@angular/material';
+import { MatTableDataSource, MatSnackBar } from '@angular/material';
+import * as jspdf from 'jspdf';
+
+import html2canvas from 'html2canvas';
@Component({
selector: 'app-user-profile',
@@ -17,15 +20,18 @@ import { MatTableDataSource } from '@angular/material';
],
})
export class UserProfileComponent implements OnInit {
+ modal_hide:boolean=true
profile_form:FormGroup;
user_data:any;
contribution_data:any=[];
- displayedColumns=['Date','contribute_type','payment_mode','payment_ref','tot_amount']
+ displayedColumns=['Date','contribute_type','payment_mode','tot_amount','payment_ref']
public dataSource = new MatTableDataSource();
isExpansionDetailRow = (i: number, row: Object) => row.hasOwnProperty('detailRow');
expandedElement: any
+ pdf_data_source: any={amount:'',name:'',org_pan:''};
+
- constructor(private apiService:ApiService,private _fb:FormBuilder) { }
+ constructor(private apiService:ApiService,private _fb:FormBuilder,private matSnackBar:MatSnackBar) { }
ngOnInit() {
this.getProfile()
@@ -36,6 +42,7 @@ export class UserProfileComponent implements OnInit {
profile_share:['',{disabled:true}],
notify_pref:['',{disable:true}]
})
+ //this.generatePDF()
}
getProfile(){
this.apiService.getMyProfile().subscribe(res=>{
@@ -55,5 +62,57 @@ export class UserProfileComponent implements OnInit {
console.log(value);
}
+ performOperation(data){
+
+ console.log(data)
+ let param={ "merchant_txn_id":data.merchant_txn_id,"flag":""}
+ if(data.txnstatus == 'SUCCESS'){
+ param.flag="PDF"
+ }
+ else if(data.txnstatus == null){
+ param.flag="STATUS_CHECK"
+
+ }
+ this.apiService.checkTxnStatus(param).subscribe(result=>{
+ if(result['dataStatus']){
+ if(param.flag == 'STATUS_CHECK'){
+ this.matSnackBar.open("Payment"+' '+result['records'].txnstatus,'', {
+ duration: 6000,
+ })
+ this.getProfile();
+ }
+ else{
+ this.modal_hide=false
+ this.pdf_data_source=result['records'][0]
+ setTimeout(()=>{
+ this.generatePDF()
+ })
+ }
+ }
+ })
+ }
+ generatePDF(){
+ console.log("pd")
+ // var doc = new DOMParser().parseFromString(html_source, "text/html");
+ // var doc=$(html_source)
+ var data=document.getElementById('content_data')
+ console.log(data);
+ html2canvas(data).then(canvas => {
+ // Few necessary setting options
+ var imgWidth = 208;
+ var pageHeight = 265;
+ var imgHeight = canvas.height * imgWidth / canvas.width;
+ var heightLeft = imgHeight;
+
+ const contentDataURL = canvas.toDataURL('image/png')
+ console.log("ima",contentDataURL)
+ let pdf = new jspdf('p', 'mm', 'a4'); // A4 size page of PDF
+ var position = 30;
+ pdf.addImage(contentDataURL, 'PNG', 0, position, imgWidth, imgHeight)
+
+ pdf.save('MYPdf.pdf'); // Generated PDF
+ });
+ this.modal_hide=true
+ }
}
diff --git a/ng8-seed/src/app/layouts/admin/admin-layout.component.html b/ng8-seed/src/app/layouts/admin/admin-layout.component.html
index c14ddd7..267fae7 100644
--- a/ng8-seed/src/app/layouts/admin/admin-layout.component.html
+++ b/ng8-seed/src/app/layouts/admin/admin-layout.component.html
@@ -29,9 +29,9 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+TAMIL NADU STATE PARENT TEACHER ASSOCIATION
+
+
+Ack No. : {{pdf_data_source.trackid}}
+
+
+Received with thanks, the sum of Rs. {{pdf_data_source.amount}} /- ({{pdf_data_source.numtowords}}) from Mr/Ms. {{pdf_data_source.name}} (PAN : {{pdf_data_source.org_pan}}) as donation towards improvement of Government Schools in Tamil Nadu through the online portal https://contribute.tnschools.gov.in
++Contribution to Tamil Nadu State Parent Teacher Association – CSR Fund is tax exempt under section 80G of the Income Tax Act, 1961 vide PAN: AACAT2920R. +
+
+ 
+
+Yours faithfully
+
+ Treasurer
+Tamil Nadu State Parent Teacher Association
+
+
+Chennai
+{{pdf_data_source.txn_date}}
+