diff --git a/src/pages/pd-question/pd-question-address/pd-question-address.html b/src/pages/pd-question/pd-question-address/pd-question-address.html
index 244ad2f6..0168f29f 100755
--- a/src/pages/pd-question/pd-question-address/pd-question-address.html
+++ b/src/pages/pd-question/pd-question-address/pd-question-address.html
@@ -350,13 +350,13 @@
-
-
-
+
+
-
+
+
Select
{{uom.name}}
@@ -367,7 +367,7 @@
-
+
-
+
@@ -376,7 +377,7 @@
-->
-
+
Is there a Loan Existing Against this Assets?
diff --git a/src/pages/pd-question/pd-question-assests/pd-question-assests.ts b/src/pages/pd-question/pd-question-assests/pd-question-assests.ts
index 7d6ef645..bfdc31af 100755
--- a/src/pages/pd-question/pd-question-assests/pd-question-assests.ts
+++ b/src/pages/pd-question/pd-question-assests/pd-question-assests.ts
@@ -66,6 +66,7 @@ export class PdQuestionAssestsPage {
complete_status: boolean = false;
spinner_access:boolean=false
lender_short_name: any;
+ product_abbr: any;
// data:Observable ;
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
public aws:AwsServiceProvider,public qustCat:QuestionCategoryProvider,public toast:ToastProvider,
@@ -77,6 +78,7 @@ export class PdQuestionAssestsPage {
this.pdDetails = this.navParams.get('pdDetails');
this.lender_short_name=this.pdDetails.lender_short_name
+ this.product_abbr=this.pdDetails.product_abbr
this.pdid=this.pdDetails.pd_id;
this.users = this.aws.getlocale();
this.applicants = this.pdDetails.applicat_details;
diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.html b/src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.html
index 12fd9438..4db1f20a 100755
--- a/src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.html
+++ b/src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.html
@@ -211,7 +211,7 @@
-
+
Age of Asset in Years
-->
-
+
Is There a Loan Existing Against This Asset?
Yes
@@ -422,7 +422,7 @@
-
+
Age of Asset in Years
@@ -445,7 +445,7 @@
+ *ngIf="(lender_short_name !== 'CLIX' && lender_short_name !== 'SMC' || product_abbr === 'LFMP') && (sup.get('business_assets_mode').value != '') && sup.get('business_ownership_type').value == 'owned'">
Is There a Loan Existing Against This Asset?
diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.ts b/src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.ts
index 8a4e13ef..95aa254f 100755
--- a/src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.ts
+++ b/src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.ts
@@ -72,6 +72,7 @@ export class PdQuestionBusinessAssetsPage {
addressList: any=[];
spinner_access;boolean=false;
lender_short_name: any;
+ product_abbr: any;
constructor(public navCtrl: NavController, public navParams: NavParams,
public aws:AwsServiceProvider,public fb:FormBuilder,public qustcat:QuestionCategoryProvider,
@@ -81,6 +82,7 @@ export class PdQuestionBusinessAssetsPage {
this.pdDetails=this.navParams.get('pdDetails');
this.lender_short_name=this.pdDetails.lender_short_name
+ this.product_abbr=this.pdDetails.product_abbr
this.formDetails=this.navParams.get('formDetails');
this.users=this.aws.getlocale();
this.company_id=this.pdDetails.company_id;
diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.html b/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.html
index d33c8f53..4f96c7ac 100755
--- a/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.html
+++ b/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.html
@@ -1806,8 +1806,7 @@
-
+
Digital Payments
@@ -1936,7 +1935,7 @@
-
+
diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts b/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts
index 26ceccb9..504007e2 100755
--- a/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts
+++ b/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts
@@ -585,7 +585,7 @@ export class PdQuestionBusinessInfoPage {
});
if (selectedRetail.length > 0) {
selectedRetail.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert');
- if(this.lender_short_name != 'CLIX'){
+ if(!(this.lender_short_name == 'CLIX' && this.product_abbr == 'BL') && !(this.lender_short_name == 'SMC' && this.product_abbr == 'BL')){
selectedRetail.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets');
selectedRetail.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines');
selectedRetail.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines');
@@ -666,7 +666,7 @@ export class PdQuestionBusinessInfoPage {
});
if (selectedWholesale.length > 0) {
selectedWholesale.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert');
- if(this.lender_short_name != 'CLIX'){
+ if(!(this.lender_short_name == 'CLIX' && this.product_abbr == 'BL') && !(this.lender_short_name == 'SMC' && this.product_abbr == 'BL')){
selectedWholesale.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets');
selectedWholesale.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines');
selectedWholesale.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines');
@@ -748,7 +748,7 @@ export class PdQuestionBusinessInfoPage {
})
if (selectedService.length > 0) {
selectedService.length > 0 ? this.businessForm.addControl('practice_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('practice_cert');
- if(this.lender_short_name != 'CLIX'){
+ if(!(this.lender_short_name == 'CLIX' && this.product_abbr == 'BL') && !(this.lender_short_name == 'SMC' && this.product_abbr == 'BL')){
selectedService.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets');
selectedService.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines');
selectedService.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines');
@@ -1182,7 +1182,7 @@ export class PdQuestionBusinessInfoPage {
this.businessForm.value.service_provider_activity_details.length > 0 ? this.businessForm.addControl('practice_cert', new FormControl(this.businessForm.value.practice_cert, Validators.required)) : this.businessForm.removeControl('practice_cert');
// check activity for extra question make dynamic
- if(this.lender_short_name != 'CLIX'){
+ if(!(this.lender_short_name == 'CLIX' && this.product_abbr == 'BL') && !(this.lender_short_name == 'SMC' && this.product_abbr == 'BL')){
this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl(this.businessForm.value.applicant_use_mobile_wallets)) : this.businessForm.removeControl('applicant_use_mobile_wallets');
this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl(this.businessForm.value.applicant_use_pos_machines)) : this.businessForm.removeControl('applicant_use_pos_machines');
diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info.html b/src/pages/pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info.html
index 94115bc4..9cc38fd6 100755
--- a/src/pages/pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info.html
+++ b/src/pages/pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info.html
@@ -115,7 +115,7 @@
-
+
Select
@@ -194,6 +194,13 @@
+
+
+
+
+
@@ -254,7 +261,7 @@
-
+
Select
@@ -337,6 +344,13 @@
+
+
+
+
+
@@ -398,7 +412,7 @@
-
+
Select
@@ -479,6 +493,13 @@
+
+
+
+
+
diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info.ts b/src/pages/pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info.ts
index 74ac44a3..348f8772 100755
--- a/src/pages/pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info.ts
+++ b/src/pages/pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info.ts
@@ -446,7 +446,8 @@ console.log("form values",this.clientInfoForm);
person_landline: ['',Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
other_person_designation: [''],
manufacturing_credit_days_from: [''],
- manufacturing_credit_days_to: ['']
+ manufacturing_credit_days_to: [''],
+ manufacturing_contribution_total_turnover: [''],
})
} else {
return this.fb.group({
@@ -463,7 +464,8 @@ console.log("form values",this.clientInfoForm);
person_landline: [records.person_landline || null,Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
other_person_designation: [records.other_person_designation || null],
manufacturing_credit_days_from: [records.manufacturing_credit_days_from || null],
- manufacturing_credit_days_to: [records.manufacturing_credit_days_to || null]
+ manufacturing_credit_days_to: [records.manufacturing_credit_days_to || null],
+ manufacturing_contribution_total_turnover: [records.manufacturing_contribution_total_turnover || null],
})
}
}
@@ -495,6 +497,7 @@ console.log("form values",this.clientInfoForm);
trade_product_frequency_of_purchase: [''],
trade_product_credit_days_from: [''],
trade_product_credit_days_to: [''],
+ trade_product_contribution_total_turnover: [''],
person_title_name: [''],
person_designation: [''],
person_stdcode: ['',Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
@@ -512,6 +515,7 @@ console.log("form values",this.clientInfoForm);
trade_product_frequency_of_purchase: [records.trade_product_frequency_of_purchase],
trade_product_credit_days_from: [records.trade_product_credit_days_from],
trade_product_credit_days_to: [records.trade_product_credit_days_to],
+ trade_product_contribution_total_turnover: [records.trade_product_contribution_total_turnover || null],
person_title_name: [records.person_title_name || null],
person_designation: [records.person_designation || null],
person_stdcode: [records.person_stdcode || null,Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
@@ -548,6 +552,7 @@ console.log("form values",this.clientInfoForm);
service_provider_product_frequency_of_purchase: [''],
service_provider_product_credit_days_from: [''],
service_provider_product_credit_days_to: [''],
+ service_provider_contribution_total_turnover: [''],
person_title_name: [''],
person_designation: [''],
person_stdcode: ['',Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])], //Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
@@ -565,6 +570,7 @@ console.log("form values",this.clientInfoForm);
service_provider_product_frequency_of_purchase: [records.service_provider_product_frequency_of_purchase],
service_provider_product_credit_days_from: [records.service_provider_product_credit_days_from],
service_provider_product_credit_days_to: [records.service_provider_product_credit_days_to],
+ service_provider_contribution_total_turnover: [records.service_provider_contribution_total_turnover || null],
person_title_name: [records.person_title_name || null],
person_designation: [records.person_designation || null],
person_stdcode: [records.person_stdcode || null,Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
@@ -1122,5 +1128,33 @@ else{
}
+ onBlurMethod(v,items,option) {
+
+ if(v >= 101){
+ // alert('Only 100% is limit');
+ let alert= this.toast.setAlertwithOKButton("Only 100% is limit","")
+ alert.present();
+ if(option == 1){
+ items.controls['manufacturing_contribution_total_turnover'].setValue('');
+ }
+ if(option == 2){
+ items.controls['trade_product_contribution_total_turnover'].setValue('');
+ }
+ if(option == 3){
+ items.controls['service_provider_contribution_total_turnover'].setValue('');
+ }
+ // this.toast.setAlertwithOKButton("Only 100% is limit","");
+
+ }
+ // const charCode = (event.which) ? event.which : event.keyCode;
+ // console.log(charCode);
+ // if (charCode > 31 && (charCode < 48 || charCode > 57)) {
+ // return false;
+ // }
+ // return true;
+
+ }
+
+
}
\ No newline at end of file
diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.html b/src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.html
index 4f684a75..551d9c22 100755
--- a/src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.html
+++ b/src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.html
@@ -357,7 +357,7 @@
-
+
Were the Kuccha records shown to the PD officer
diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-stock-info/pd-question-stock-info.html b/src/pages/pd-question/pd-question-business-group/pd-question-stock-info/pd-question-stock-info.html
index 8e2ddb54..fc755b81 100755
--- a/src/pages/pd-question/pd-question-business-group/pd-question-stock-info/pd-question-stock-info.html
+++ b/src/pages/pd-question/pd-question-business-group/pd-question-stock-info/pd-question-stock-info.html
@@ -102,7 +102,7 @@
-
+
@@ -196,7 +196,7 @@
-
+
@@ -290,7 +290,7 @@
-
+
@@ -388,7 +388,7 @@
-
+
+
@@ -585,6 +586,16 @@
Service Provider Details
Service Provider Details Not applicable here !!
-->
+
+
+
+
+
+
+
+
Remarks
diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-stock-info/pd-question-stock-info.ts b/src/pages/pd-question/pd-question-business-group/pd-question-stock-info/pd-question-stock-info.ts
index 1774f22f..c77e8e72 100755
--- a/src/pages/pd-question/pd-question-business-group/pd-question-stock-info/pd-question-stock-info.ts
+++ b/src/pages/pd-question/pd-question-business-group/pd-question-stock-info/pd-question-stock-info.ts
@@ -67,6 +67,7 @@ export class PdQuestionStockInfoPage {
complete_status: boolean = false;
spinner_access:boolean=false;
lender_short_name: any;
+ product_abbr: any;
constructor(public navCtrl: NavController, public navParams: NavParams, public qustCat: QuestionCategoryProvider,
public aws: AwsServiceProvider, public toast: ToastProvider, public fb: FormBuilder,
@@ -76,6 +77,7 @@ export class PdQuestionStockInfoPage {
this.loading.dataLoader();
this.pdDetails = this.navParams.get('pdDetails');
this.lender_short_name=this.pdDetails.lender_short_name
+ this.product_abbr=this.pdDetails.product_abbr
this.formDetails = this.navParams.get('formDetails');
this.users = this.aws.getlocale();
this.company_id = this.pdDetails.company_id;
@@ -226,6 +228,7 @@ this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
company_id: [this.company_id],
fk_createdby: [this.users],
stock_remarks: [dataForm.stock_remarks],
+ stock_validated: [dataForm.stock_validated || null],
// is_sufficiant_raw:[dataForm.is_sufficiant_raw],
// rawmaterial_remarks:[dataForm.rawmaterial_remarks],
@@ -296,6 +299,7 @@ this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
company_id: [this.company_id],
fk_createdby: [this.users],
stock_remarks: [''],
+ stock_validated: [''],
// is_sufficiant_raw:[''],
// rawmaterial_remarks:[''],
is_sufficiant_finished_and_traded_goods: [''],
@@ -354,6 +358,7 @@ this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
company_id: [this.company_id],
fk_createdby: [this.users],
stock_remarks: [''],
+ stock_validated: [''],
// is_sufficiant_raw:[''],
// rawmaterial_remarks:[''],
diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-supplier-info/pd-question-supplier-info.html b/src/pages/pd-question/pd-question-business-group/pd-question-supplier-info/pd-question-supplier-info.html
index 0228ff5a..2be19f9c 100755
--- a/src/pages/pd-question/pd-question-business-group/pd-question-supplier-info/pd-question-supplier-info.html
+++ b/src/pages/pd-question/pd-question-business-group/pd-question-supplier-info/pd-question-supplier-info.html
@@ -112,7 +112,7 @@
-
+
Select
@@ -181,6 +181,13 @@
+
+
+
+
+
@@ -243,7 +250,7 @@
-
+
Select
@@ -314,6 +321,13 @@
+
+
+
+
+
@@ -383,7 +397,7 @@
-
+
Select
@@ -454,6 +468,13 @@
+
+
+
+
+
diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-supplier-info/pd-question-supplier-info.ts b/src/pages/pd-question/pd-question-business-group/pd-question-supplier-info/pd-question-supplier-info.ts
index 731877cf..89c026de 100755
--- a/src/pages/pd-question/pd-question-business-group/pd-question-supplier-info/pd-question-supplier-info.ts
+++ b/src/pages/pd-question/pd-question-business-group/pd-question-supplier-info/pd-question-supplier-info.ts
@@ -413,6 +413,7 @@ export class PdQuestionSupplierInfoPage {
manufacturing_payment_mode: [''],
manufacturing_credit_days_from: [''],
manufacturing_credit_days_to: [''],
+ manufacturing_contribution_total_purchase: [''],
manufacturing_frequency_of_purchase: [''],
person_stdcode: ['', Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
//, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])
@@ -434,6 +435,7 @@ export class PdQuestionSupplierInfoPage {
manufacturing_payment_mode: [records.manufacturing_payment_mode],
manufacturing_credit_days_from: [records.manufacturing_credit_days_from || null],
manufacturing_credit_days_to: [records.manufacturing_credit_days_to || null],
+ manufacturing_contribution_total_purchase: [records.manufacturing_contribution_total_purchase || null],
manufacturing_frequency_of_purchase: [records.manufacturing_frequency_of_purchase || null],
person_stdcode: [records.person_stdcode || null, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
//, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])
@@ -476,6 +478,7 @@ export class PdQuestionSupplierInfoPage {
trade_product_frequency_of_purchase: [''],
trade_product_credit_days_from: [''],
trade_product_credit_days_to: [''],
+ trade_product_contribution_total_purchase: [''],
})
} else {
return this.fb.group({
@@ -496,6 +499,7 @@ export class PdQuestionSupplierInfoPage {
trade_product_frequency_of_purchase: [records.trade_product_frequency_of_purchase],
trade_product_credit_days_from: [records.trade_product_credit_days_from],
trade_product_credit_days_to: [records.trade_product_credit_days_to],
+ trade_product_contribution_total_purchase: [records.trade_product_contribution_total_purchase || null],
})
}
}
@@ -535,6 +539,7 @@ export class PdQuestionSupplierInfoPage {
service_provider_frequency_of_purchase: [''],
service_provider_credit_days_from: [''],
service_provider_credit_days_to: [''],
+ service_provider_contribution_total_purchase: [],
})
} else {
console.log('else');
@@ -553,6 +558,7 @@ export class PdQuestionSupplierInfoPage {
service_provider_frequency_of_purchase: [records.service_provider_frequency_of_purchase],
service_provider_credit_days_from: [records.service_provider_credit_days_from],
service_provider_credit_days_to: [records.service_provider_credit_days_to],
+ service_provider_contribution_total_purchase: [records.service_provider_contribution_total_purchase || null],
})
}
}
@@ -1101,4 +1107,30 @@ export class PdQuestionSupplierInfoPage {
}
+ onBlurMethod(v,items,option) {
+ // console.log('eeeeeeeee',option);
+ // alert('Only 100% is limit');
+ if(v >= 101){
+ let alert= this.toast.setAlertwithOKButton("Only 100% is limit","")
+ alert.present();
+ if(option == 1){
+ items.controls['manufacturing_contribution_total_purchase'].setValue('');
+ }
+ if(option == 2){
+ items.controls['trade_product_contribution_total_purchase'].setValue('');
+ }
+ if(option == 3){
+ items.controls['service_provider_contribution_total_purchase'].setValue('');
+ }
+
+ }
+ // const charCode = (event.which) ? event.which : event.keyCode;
+ // console.log(charCode);
+ // if (charCode > 31 && (charCode < 48 || charCode > 57)) {
+ // return false;
+ // }
+ // return true;
+
+ }
+
}
\ No newline at end of file
diff --git a/src/pages/pd-question/pd-question-family/pd-question-family.html b/src/pages/pd-question/pd-question-family/pd-question-family.html
index b20b8006..59cfcce0 100755
--- a/src/pages/pd-question/pd-question-family/pd-question-family.html
+++ b/src/pages/pd-question/pd-question-family/pd-question-family.html
@@ -197,7 +197,7 @@
-
+
@@ -298,7 +298,7 @@
-
+
Family Details Of {{FamilyMemberAsLabel[i]}}
diff --git a/src/pages/pd-question/pd-question-family/pd-question-family.ts b/src/pages/pd-question/pd-question-family/pd-question-family.ts
index b9eba7d0..39c4b7e5 100755
--- a/src/pages/pd-question/pd-question-family/pd-question-family.ts
+++ b/src/pages/pd-question/pd-question-family/pd-question-family.ts
@@ -74,6 +74,7 @@ data:any;
complete_status: boolean = false;
spinner_access:boolean=false;
lender_short_name: any;
+ product_abbr: any;
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
public qustCat:QuestionCategoryProvider,public aws:AwsServiceProvider,
@@ -85,6 +86,7 @@ data:any;
this.FormId = this.navParams.get('FormId');
this.pdDetails = this.navParams.get('pdDetails');
this.lender_short_name=this.pdDetails.lender_short_name
+ this.product_abbr=this.pdDetails.product_abbr
this.selected_person=this.pdDetails.pdapplicants_details;
this.selectPerson=this.pdDetails.applicat_details
this.users = this.aws.getlocale();
diff --git a/src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.html b/src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.html
index 494e830a..98953cad 100755
--- a/src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.html
+++ b/src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.html
@@ -205,9 +205,10 @@
-->
-
+
CLIX
+ SMC