diff --git a/ng8-seed/src/app/components/payment-status/success/success.component.html b/ng8-seed/src/app/components/payment-status/success/success.component.html index d73c818..b09f637 100644 --- a/ng8-seed/src/app/components/payment-status/success/success.component.html +++ b/ng8-seed/src/app/components/payment-status/success/success.component.html @@ -1,7 +1,7 @@
-
+
-->
-

Thank You for your Support


-

Sorry there has been a problem in getting payment approval

+

Thank You for your Support


+

Sorry there has been a problem in getting payment approval

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 index 2ee3dbf..ff6fa63 100644 --- a/ng8-seed/src/app/components/payment-status/success/success.component.scss +++ b/ng8-seed/src/app/components/payment-status/success/success.component.scss @@ -15,6 +15,16 @@ padding: 5px; border-radius: 10px; } +@media(max-width:580px){ + .div_over{ + margin-top:8%; + text-align: center; + border: 2px solid rgb(25, 183, 211); + width: 100%; + padding: 5px; + border-radius: 10px; + } +} .failure_text{ font-size:35px; color:red; diff --git a/ng8-seed/src/app/components/payment/payment.component.html b/ng8-seed/src/app/components/payment/payment.component.html index addcba9..08f47c1 100644 --- a/ng8-seed/src/app/components/payment/payment.component.html +++ b/ng8-seed/src/app/components/payment/payment.component.html @@ -48,10 +48,11 @@

₹ {{grand_tot_value}}


- + Online  Offline +
@@ -111,12 +112,14 @@ {{value.name}} + Please Choose the option
+ diff --git a/ng8-seed/src/app/components/payment/payment.component.ts b/ng8-seed/src/app/components/payment/payment.component.ts index 66e867a..9d94f35 100644 --- a/ng8-seed/src/app/components/payment/payment.component.ts +++ b/ng8-seed/src/app/components/payment/payment.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild, ElementRef } from '@angular/core'; import { Router } from '@angular/router'; -import { FormBuilder, FormGroup, FormControl } from '@angular/forms'; +import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms'; import { ApiService } from 'app/shared/api.service'; @Component({ @@ -48,7 +48,7 @@ export class PaymentComponent implements OnInit { contribute_type: any; contributeKind: FormGroup; contribute_params: any; - payment_mode:any; //1-online 2-offline + payment_mode:any=''; //1-online 2-offline maxDate=new Date() reqjson='' action_url='' @@ -118,6 +118,10 @@ export class PaymentComponent implements OnInit { } proceed_for_payment(){ + if(this.payment_mode == ''){ + alert('Please Choose the Payment Option') + return; + } let params=this.contribute_params if(this.contribute_type == '2'){ params.records.mat_delivery_point=this.contributeKind.value.delivery_point @@ -126,6 +130,10 @@ export class PaymentComponent implements OnInit { } if(this.payment_mode == '2'){ + if(this.offlineDetForm.invalid){ + alert('Please Choose the Payment Mode'); + return; + } 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 @@ -199,5 +207,14 @@ export class PaymentComponent implements OnInit { // } // } + changeValidation(value){ + if(value.target.innerText == 'Offline'){ + this.offlineDetForm.controls['payment_type'].setValidators(Validators.compose([Validators.required])) + } + else{ + this.offlineDetForm.controls['payment_type'].clearValidators(); + this.offlineDetForm.controls['payment_type'].updateValueAndValidity(); + } + } } 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 34d7d7c..86f66ab 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 @@ -147,8 +147,9 @@
-
- + +
diff --git a/ng8-seed/src/app/components/user-profile/user-profile.component.scss b/ng8-seed/src/app/components/user-profile/user-profile.component.scss index 55bf178..c125b31 100644 --- a/ng8-seed/src/app/components/user-profile/user-profile.component.scss +++ b/ng8-seed/src/app/components/user-profile/user-profile.component.scss @@ -98,7 +98,7 @@ width: 110px; display: inline-block; font-weight: bold; - // margin-right: 20px; + margin-right: 25px; } .mat-header-row { 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 623ab34..c79f546 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 @@ -33,7 +33,7 @@ export class UserProfileComponent implements OnInit { pdf_data_source: any={amount:'',name:'',org_pan:''}; slide1: boolean; slide2: boolean; - @ViewChild('table_element',{static:false}) table_element : ElementRef + @ViewChild('table_element',{static:true}) table_element clientWidth: any; constructor(private apiService:ApiService,private _fb:FormBuilder,private matSnackBar:MatSnackBar,public router:Router,private matDialog:MatDialog) { } @@ -56,10 +56,12 @@ export class UserProfileComponent implements OnInit { //this.generatePDF() } ngAfterViewInit(){ + setTimeout(()=>{ console.log("table elemnt",this.table_element); // this.table_element=this.table_element.nativeElement.clientWidth this.clientWidth=this.table_element.nativeElement.clientWidth console.log("table elemnt",this.clientWidth); + }) } getProfile(){ this.apiService.getMyProfile().subscribe(res=>{ diff --git a/ng8-seed/src/assets/images/2.jpg b/ng8-seed/src/assets/images/2.jpg deleted file mode 100644 index 433647b..0000000 Binary files a/ng8-seed/src/assets/images/2.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/3.jpg b/ng8-seed/src/assets/images/3.jpg deleted file mode 100644 index 48c73b3..0000000 Binary files a/ng8-seed/src/assets/images/3.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/4.jpg b/ng8-seed/src/assets/images/4.jpg deleted file mode 100644 index 8d3a243..0000000 Binary files a/ng8-seed/src/assets/images/4.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/about.jpg b/ng8-seed/src/assets/images/about.jpg deleted file mode 100644 index 5cb3dd5..0000000 Binary files a/ng8-seed/src/assets/images/about.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/avatar.jpg b/ng8-seed/src/assets/images/avatar.jpg deleted file mode 100644 index e9e1e63..0000000 Binary files a/ng8-seed/src/assets/images/avatar.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/blog-1.jpg b/ng8-seed/src/assets/images/blog-1.jpg deleted file mode 100644 index b2fc889..0000000 Binary files a/ng8-seed/src/assets/images/blog-1.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/blog-2.jpg b/ng8-seed/src/assets/images/blog-2.jpg deleted file mode 100644 index 02065ab..0000000 Binary files a/ng8-seed/src/assets/images/blog-2.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/contact.jpg b/ng8-seed/src/assets/images/contact.jpg deleted file mode 100644 index 5dd54bd..0000000 Binary files a/ng8-seed/src/assets/images/contact.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/coridoor.jpg b/ng8-seed/src/assets/images/coridoor.jpg deleted file mode 100644 index 09c6538..0000000 Binary files a/ng8-seed/src/assets/images/coridoor.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/curve.jpg b/ng8-seed/src/assets/images/curve.jpg deleted file mode 100644 index 2bba066..0000000 Binary files a/ng8-seed/src/assets/images/curve.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/face1.jpg b/ng8-seed/src/assets/images/face1.jpg deleted file mode 100644 index c8e94e0..0000000 Binary files a/ng8-seed/src/assets/images/face1.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/face2.jpg b/ng8-seed/src/assets/images/face2.jpg deleted file mode 100644 index f7df052..0000000 Binary files a/ng8-seed/src/assets/images/face2.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/face3.jpg b/ng8-seed/src/assets/images/face3.jpg deleted file mode 100644 index 150a5b2..0000000 Binary files a/ng8-seed/src/assets/images/face3.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/face4.jpg b/ng8-seed/src/assets/images/face4.jpg deleted file mode 100644 index 53cef59..0000000 Binary files a/ng8-seed/src/assets/images/face4.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/face5.jpg b/ng8-seed/src/assets/images/face5.jpg deleted file mode 100644 index c53c69b..0000000 Binary files a/ng8-seed/src/assets/images/face5.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/face6.jpg b/ng8-seed/src/assets/images/face6.jpg deleted file mode 100644 index 7ef4ad6..0000000 Binary files a/ng8-seed/src/assets/images/face6.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/face7.jpg b/ng8-seed/src/assets/images/face7.jpg deleted file mode 100644 index fac7503..0000000 Binary files a/ng8-seed/src/assets/images/face7.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/flower.jpg b/ng8-seed/src/assets/images/flower.jpg deleted file mode 100644 index f4b38bf..0000000 Binary files a/ng8-seed/src/assets/images/flower.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/flowers.jpg b/ng8-seed/src/assets/images/flowers.jpg deleted file mode 100644 index edb1411..0000000 Binary files a/ng8-seed/src/assets/images/flowers.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/img/5.jpg b/ng8-seed/src/assets/images/img/5.jpg deleted file mode 100644 index 1791fb5..0000000 Binary files a/ng8-seed/src/assets/images/img/5.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/layers-2x.png b/ng8-seed/src/assets/images/layers-2x.png deleted file mode 100644 index 200c333..0000000 Binary files a/ng8-seed/src/assets/images/layers-2x.png and /dev/null differ diff --git a/ng8-seed/src/assets/images/logo-dark.png b/ng8-seed/src/assets/images/logo-dark.png deleted file mode 100644 index a5e3d9e..0000000 Binary files a/ng8-seed/src/assets/images/logo-dark.png and /dev/null differ diff --git a/ng8-seed/src/assets/images/logo.png b/ng8-seed/src/assets/images/logo.png deleted file mode 100644 index 04a7d70..0000000 Binary files a/ng8-seed/src/assets/images/logo.png and /dev/null differ diff --git a/ng8-seed/src/assets/images/man.jpg b/ng8-seed/src/assets/images/man.jpg deleted file mode 100644 index 5413a22..0000000 Binary files a/ng8-seed/src/assets/images/man.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/marker-shadow.png b/ng8-seed/src/assets/images/marker-shadow.png deleted file mode 100644 index 9fd2979..0000000 Binary files a/ng8-seed/src/assets/images/marker-shadow.png and /dev/null differ diff --git a/ng8-seed/src/assets/images/nike.jpg b/ng8-seed/src/assets/images/nike.jpg deleted file mode 100644 index b4b477f..0000000 Binary files a/ng8-seed/src/assets/images/nike.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/notfound.jpg b/ng8-seed/src/assets/images/notfound.jpg deleted file mode 100644 index 2d9cd61..0000000 Binary files a/ng8-seed/src/assets/images/notfound.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/p-1.jpg b/ng8-seed/src/assets/images/p-1.jpg deleted file mode 100644 index cf1761e..0000000 Binary files a/ng8-seed/src/assets/images/p-1.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/p-2.jpg b/ng8-seed/src/assets/images/p-2.jpg deleted file mode 100644 index 9429a33..0000000 Binary files a/ng8-seed/src/assets/images/p-2.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/p-3.jpg b/ng8-seed/src/assets/images/p-3.jpg deleted file mode 100644 index 58d9a20..0000000 Binary files a/ng8-seed/src/assets/images/p-3.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/p-4.jpg b/ng8-seed/src/assets/images/p-4.jpg deleted file mode 100644 index 8d915bd..0000000 Binary files a/ng8-seed/src/assets/images/p-4.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/p-5.jpg b/ng8-seed/src/assets/images/p-5.jpg deleted file mode 100644 index 706fa70..0000000 Binary files a/ng8-seed/src/assets/images/p-5.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/p-6.jpg b/ng8-seed/src/assets/images/p-6.jpg deleted file mode 100644 index c4e8d41..0000000 Binary files a/ng8-seed/src/assets/images/p-6.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/p-7.jpg b/ng8-seed/src/assets/images/p-7.jpg deleted file mode 100644 index 96cfca5..0000000 Binary files a/ng8-seed/src/assets/images/p-7.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/p-8.jpg b/ng8-seed/src/assets/images/p-8.jpg deleted file mode 100644 index 581b8be..0000000 Binary files a/ng8-seed/src/assets/images/p-8.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/post1.jpg b/ng8-seed/src/assets/images/post1.jpg deleted file mode 100644 index 0122ed0..0000000 Binary files a/ng8-seed/src/assets/images/post1.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/post2.jpg b/ng8-seed/src/assets/images/post2.jpg deleted file mode 100644 index 84255af..0000000 Binary files a/ng8-seed/src/assets/images/post2.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/profile-img.png b/ng8-seed/src/assets/images/profile-img.png deleted file mode 100644 index c1bbb63..0000000 Binary files a/ng8-seed/src/assets/images/profile-img.png and /dev/null differ diff --git a/ng8-seed/src/assets/images/shutter.jpg b/ng8-seed/src/assets/images/shutter.jpg deleted file mode 100644 index 5d7d479..0000000 Binary files a/ng8-seed/src/assets/images/shutter.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/test2.jpg b/ng8-seed/src/assets/images/test2.jpg deleted file mode 100644 index c8e94e0..0000000 Binary files a/ng8-seed/src/assets/images/test2.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/test3.jpg b/ng8-seed/src/assets/images/test3.jpg deleted file mode 100644 index f7df052..0000000 Binary files a/ng8-seed/src/assets/images/test3.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/test4.jpg b/ng8-seed/src/assets/images/test4.jpg deleted file mode 100644 index 150a5b2..0000000 Binary files a/ng8-seed/src/assets/images/test4.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/test5.jpg b/ng8-seed/src/assets/images/test5.jpg deleted file mode 100644 index 2d24b2f..0000000 Binary files a/ng8-seed/src/assets/images/test5.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/user-1.jpg b/ng8-seed/src/assets/images/user-1.jpg deleted file mode 100644 index 2367aa5..0000000 Binary files a/ng8-seed/src/assets/images/user-1.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/user-2.jpg b/ng8-seed/src/assets/images/user-2.jpg deleted file mode 100644 index 775dffa..0000000 Binary files a/ng8-seed/src/assets/images/user-2.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/user-3.jpg b/ng8-seed/src/assets/images/user-3.jpg deleted file mode 100644 index 533423f..0000000 Binary files a/ng8-seed/src/assets/images/user-3.jpg and /dev/null differ diff --git a/ng8-seed/src/assets/images/user-4.jpg b/ng8-seed/src/assets/images/user-4.jpg deleted file mode 100644 index 5e359ec..0000000 Binary files a/ng8-seed/src/assets/images/user-4.jpg and /dev/null differ