diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.ts
index 16dddb5cc..78d0875c9 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.ts
@@ -14,9 +14,12 @@ export class InitiateAdditionalPdComponent implements OnInit {
private notifier: NotifierService;
additionalPDForm:FormGroup;
customerSegmentList: any=[];
+ applicantList: any =[];
constructor(notifier: NotifierService,private _fb: FormBuilder, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef) {
this.notifier = notifier;
this.pageTitle="Choose customer segment For this PD address"
+ this.applicantList = this.data.applicants_details;
+ this.applicantList = this.applicantList.filter(appt => appt.applicant_type != 2);
}
ngOnInit() {
@@ -29,12 +32,22 @@ export class InitiateAdditionalPdComponent implements OnInit {
});
this.data.type===false ? this.additionalPDForm.controls['fk_customer_segment'].disable():this.additionalPDForm.controls['fk_customer_segment'].enable();
+ if(this.data.applicant_id){ this.additionalPDForm.controls['pd_co_applicant_id'].setValue(this.data.applicant_id);
+ // this.additionalPDForm.controls['pd_co_applicant_id'].disable();
+ }
+ // else { this.additionalPDForm.controls['pd_co_applicant_id'].enable(); }
+
+ let mobile = this.applicantList.filter(val=>val.pd_co_applicant_id == this.data.applicant_id).map(val=>val.mobile_no)[0]
+ if(mobile != '' && mobile != null){ this.additionalPDForm.controls['mobile_no'].setValue(mobile); }
+
}
initForm(){
return this.additionalPDForm = this._fb.group({
pd_id:[this.data.type===false ? this.data.pd_id : ''],
parent_pd_id: [this.data.type===true ? this.data.pd_id : ''],
fk_customer_segment: [this.data.type===false ? this.data.fk_customer_segment :'',Validators.required],
+ pd_co_applicant_id:[this.data.type===false ? '' : '',Validators.required],
+ mobile_no:[this.data.type===false ? '' : '',Validators.required],
fk_address_id:[this.data.pd_address_id,Validators.required],
pd_status:[this.data.pd_status,Validators.required],
});
@@ -48,10 +61,10 @@ submitDetails(values: any) {
}
let update_details: any;
if(this.data.type){
- update_details= {"pd_id":values.pd_id,"parent_pd_id":values.parent_pd_id,"fk_customer_segment":values.fk_customer_segment , "fk_address_id":values.fk_address_id,"pd_status":"TRIGGERED"};
+ update_details= {"pd_id":values.pd_id,"parent_pd_id":values.parent_pd_id,"fk_customer_segment":values.fk_customer_segment , "fk_address_id":values.fk_address_id,"pd_status":"TRIGGERED","pd_co_applicant_id":values.pd_co_applicant_id,"mobile_no":values.mobile_no};
}
else{
- update_details={"pd_id":values.pd_id,"parent_pd_id":values.parent_pd_id,"fk_customer_segment":values.fk_customer_segment , "fk_primary_address_id":values.fk_address_id};
+ update_details={"pd_id":values.pd_id,"parent_pd_id":values.parent_pd_id,"fk_customer_segment":values.fk_customer_segment , "fk_primary_address_id":values.fk_address_id,"pd_co_applicant_id":values.pd_co_applicant_id,"mobile_no":values.mobile_no};
}
this._pd.initiateAddressPdProcess(update_details).subscribe(data => {
@@ -61,6 +74,7 @@ submitDetails(values: any) {
},3000);
}, error => {
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
+ // alert(error);
});
}
// validate all form group and form array fields
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
index d965986e4..d87a9e23d 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
@@ -182,7 +182,7 @@
+ [value]="items.get('trade_product_contact_person_name').value | titlecase">
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
index 59b0612d6..48a279450 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
@@ -428,8 +428,11 @@ export class ViewPdComponent implements OnInit, OnDestroy {
// this is for initiate additional pd
initiateAddtionalPD(parentData: any, childData: any, type: boolean){
+ let masterApplicantID = ''
+ if(parentData.main_applicant){
+ masterApplicantID = this.pdApplicantData.filter(appt => appt.applicant_name == parentData.main_applicant)[0].pd_co_applicant_id;}
const dialogRef = this.dialog.open(InitiateAdditionalPdComponent, {
- data: { "type":type,"pd_id":parentData.pd_id,"fk_customer_segment":parentData.fk_customer_segment, "pd_status":parentData.pd_status, "pd_address_id": childData.pd_address_id},
+ data: { "type":type,"pd_id":parentData.pd_id,"fk_customer_segment":parentData.fk_customer_segment, "pd_status":parentData.pd_status, "pd_address_id": childData.pd_address_id,"applicant_id":masterApplicantID,"applicants_details":this.pdApplicantData},
disableClose: true,
// position: { right: '0' },
minWidth: '40%',
diff --git a/ng6-seed/src/environments/environment.ts b/ng6-seed/src/environments/environment.ts
index af7a9fb85..67aab72f9 100755
--- a/ng6-seed/src/environments/environment.ts
+++ b/ng6-seed/src/environments/environment.ts
@@ -25,5 +25,5 @@ export const environment = {
s3_endpoint: '',
accessToken:'',
//apiUrl:'http://localhost/sparqapi/api/'
- apiEndpoint: 'https://ssa.sineedge.com/sparqtest/api/'
+ apiEndpoint: 'https://ssa.sineedge.com/sparqapi/api/'
};