+ *ngIf="(sup.get('business_assets_mode').value != '') && sup.get('business_ownership_type').value == 'owned' && (lender_short_name != 'CLIX' && lender_short_name != 'SMC' || product_abbr === 'LFMP')">
appt.applicant_type != 2)
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts
index a8f8836d3..20ae9b662 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts
@@ -47,7 +47,9 @@ export class BusinessInfoGroupComponent implements OnInit {
this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr;
this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr;
this.lender_short_name = this.pd_all_details.pdmaster_details.lender_short_name;
+ console.log(this.lender_short_name);
this.product_abbr = this.pd_all_details.pdmaster_details.product_abbr;
+ console.log(this.product_abbr);
}
@@ -197,7 +199,7 @@ export class BusinessInfoGroupComponent implements OnInit {
this.getCompanyListForBusiness();
});
}else
- if((this.lender_short_name == 'CLIX' || this.product_abbr == 'LAEP') && details.form_id==23){
+ if((this.lender_short_name == 'CLIX' || this.product_abbr == 'LAEP' || (this.product_abbr == 'LFMP' && this.lender_short_name == 'SMC')) && details.form_id==23){
const dialogRef = this.dialog.open(FuturePlansAndBusinessEnvironmentComponent, {
data: this.pd_all_details,
maxWidth: '100vw',
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
index 6835041e3..7aa7b55cb 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
@@ -1577,7 +1577,7 @@
type="number" formControlName="employees_permanent" required>
Permanent Required
-
+
Temporary Required
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
index 6100500d4..bb5f646fd 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
@@ -130,7 +130,9 @@ export class BusinessInfoComponent implements OnInit {
this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr;
this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr;
this.lender_short_name = this.pd_all_details.pdmaster_details.lender_short_name;
+ console.log(this.lender_short_name);
this.product_abbr = this.pd_all_details.pdmaster_details.product_abbr;
+ console.log(this.product_abbr);
console.log("com",this.company_id)
this.image_doc_params={pdid:this.pdid,form_id:this.form_id,company_id:this.company_id}
}
@@ -258,7 +260,7 @@ export class BusinessInfoComponent implements OnInit {
//businessVal.designation = DesgnArray;
businessVal.partners = PartnrArray;
businessVal.documents = DocArray;
- if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE'){
+ if(this.lender_short_name != 'CLIX'){
if (data.records.persons_with_relationships) {
let selectedFamilyMember = Object.keys(data.records.persons_with_relationships).map(function (key) {
return data.records.persons_with_relationships[key];
@@ -394,12 +396,16 @@ export class BusinessInfoComponent implements OnInit {
});
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' && this.lender_short_name != 'MONEYWISE'){
+ if( !(this.lender_short_name == 'CLIX' && this.product_abbr == 'BL') && !(this.lender_short_name == 'SMC' && this.product_abbr == 'BL')){
+ console.log('###PAY');console.log(this.lender_short_name,this.product_abbr)
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');
selectedRetail.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('pos_machines_details', this.fb.array([])) : this.businessForm.removeControl('pos_machines_details');
}
+ else{
+ console.log('###ELSE');console.log(this.lender_short_name,this.product_abbr)
+ }
selectedRetail.forEach((element, index) => {
this.CheckExport(element.area_of_sale, 'RActivity', index);
@@ -461,7 +467,7 @@ export class BusinessInfoComponent implements OnInit {
});
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' && this.lender_short_name != 'MONEYWISE'){
+ 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');
@@ -530,7 +536,7 @@ export class BusinessInfoComponent implements OnInit {
});
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' && this.lender_short_name != 'MONEYWISE'){
+ 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');
@@ -657,7 +663,7 @@ export class BusinessInfoComponent implements OnInit {
this.product_abbr == 'LAEP' ? this.businessForm.addControl('fire_noc', new FormControl('', Validators.required)) : this.businessForm.removeControl('fire_noc');
- if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE'){
+ if(this.lender_short_name != 'CLIX'){
// change relation with businees update dat sorce table
this.businessForm.controls['persons_with_relationships'].valueChanges.subscribe(val => {
let relationControl = this.businessForm.controls['persons_with_relationships'];
@@ -719,7 +725,7 @@ export class BusinessInfoComponent implements OnInit {
service_provider_activity_details: this.fb.array([]),
// others_activity_details: this.fb.array([]),
});
- if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'MONEYWISE'){
+ if(this.lender_short_name == 'CLIX'){
this.businessForm.removeControl('persons_with_relationships');
}
}
@@ -800,7 +806,7 @@ export class BusinessInfoComponent implements OnInit {
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' && this.lender_short_name != 'MONEYWISE'){
+ 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');
if (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) {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
index bb5b28b9e..d0fbd22c1 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
@@ -56,7 +56,7 @@
-
+
Select
@@ -104,7 +104,7 @@
Enter Valid LandLine Number.
-
+
@@ -396,7 +396,7 @@
Enter Valid LandLine Number.
-
+
-
+
@@ -273,7 +273,7 @@
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
index 387b106b1..cd1f58984 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
@@ -67,6 +67,7 @@ export class FamilyDetailsComponent implements OnInit {
stateDataList: any = [];
cityDataList: any = [];
pincodeDataList: any = [];
+ product_abbr: any;
/** constructor Of the class */
constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
@@ -81,6 +82,7 @@ export class FamilyDetailsComponent implements OnInit {
this.selectPerson = this.pd_all_details.pdapplicants_detials.filter(item => item.applicant_type != '2');
this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id;
this.lender_short_name=this.pd_all_details.pdmaster_details.lender_short_name;
+ this.product_abbr = this.pd_all_details.pdmaster_details.product_abbr;
this.pdid = this.pd_all_details.pdmaster_details.pd_id;
this.main_applicant = this.pd_all_details.pdmaster_details.main_applicant;
this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
index 6d6d2ab7d..95a6a785f 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
@@ -147,10 +147,10 @@
Specify the Mode of Transport Used to Visit the PD address Required
-
+
CLIX
- MONEYWISE
+ SMC
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
index c379216e2..40b4c62dd 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
@@ -100,7 +100,7 @@ export class FinalRemarksComponent implements OnInit {
final_form_remarks: ['']
});
- if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'MONEYWISE' || this.product_abbr == 'LAEP'){
+ if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'SMC' || this.product_abbr == 'LAEP'){
this.product_abbr == 'LAEP' ? this._finalRemarkForm.addControl('outlet_location', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('outlet_location');
this._finalRemarkForm.addControl('is_competition', new FormControl(''));
this._finalRemarkForm.addControl('sealing_activity', new FormControl(''));
@@ -239,7 +239,7 @@ export class FinalRemarksComponent implements OnInit {
this._finalRemarkForm.controls.market_intelligence.setValue(data.records.market_intelligence || '');
- if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'MONEYWISE' || this.product_abbr == 'LAEP'){
+ if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'SMC' || this.product_abbr == 'LAEP'){
if(this.product_abbr == 'LAEP') {this._finalRemarkForm.controls.outlet_location.setValue(this.product_abbr == 'LAEP' ? data.records.outlet_location : ''); }
this._finalRemarkForm.controls.is_competition.setValue(data.records.is_competition);
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
index 2bf2b6808..a2e1960e7 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
@@ -397,7 +397,7 @@
{{AV_netProfitAmtInwords[i]}} Only -->
-
+
{{"₹"}}
@@ -486,7 +486,7 @@
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
index 64839cefb..ece26c11d 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
@@ -58,7 +58,7 @@
End Use Required
-
+
Select
@@ -76,7 +76,7 @@
-
+
@@ -119,7 +119,7 @@
-
0 && (lenderShortName != 'CLIX' && lenderShortName != 'MONEYWISE')">
+ 0 && (lenderShortName != 'CLIX' && lenderShortName != 'SMC' || productAbbr == 'LFMP')">
Select
@@ -166,7 +166,7 @@
-
+
{{"₹"}} {{ loanDetailsForm.controls['emi_level'].value | numberToWords }} Only
@@ -246,7 +246,7 @@
{{"₹"}} {{ loanDetailsForm.controls['emv_per_customer'].value | numberToWords }} Only
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
index 36a6dfebc..7056adae4 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
@@ -335,7 +335,7 @@ export class LoanDetailsComponent implements OnInit {
if (this.pd_all_details.pdmaster_details.fk_subproduct_id) {
this.loanDetailsForm.controls['sub_product'].setValue(this.pd_all_details.pdmaster_details.fk_subproduct_id);
}
- if(this.lenderShortName == 'CLIX' || this.lenderShortName == 'MONEYWISE'){
+ if(this.lenderShortName == 'CLIX' || this.lenderShortName == 'SMC'){
// console.log(this.lenderShortName);
this.loanDetailsForm.controls['is_transfer'].setValue("no");
this.selectedBalancesTransferChanges("no")
@@ -838,7 +838,7 @@ export class LoanDetailsComponent implements OnInit {
}
}
}
- if(this.lenderShortName == 'CLIX' || this.lenderShortName == 'MONEYWISE'){
+ if(this.lenderShortName == 'CLIX' || this.lenderShortName == 'SMC'){
this.loanDetailsForm.controls['own_contribution'].setValue('');
this.loanDetailsForm.controls['own_contribution'].clearValidators();
this.loanDetailsForm.controls['own_contribution'].updateValueAndValidity();
@@ -892,7 +892,7 @@ export class LoanDetailsComponent implements OnInit {
records.balance_transfer_amount = this.loanDetailsForm.controls['balance_transfer_amount'].value;
}
else if (this.loanDetailsForm.controls['is_transfer'].value == 'no') {
- if (this.isContribution || this.lenderShortName == 'CLIX' || this.lenderShortName == 'MONEYWISE') {
+ if (this.isContribution || this.lenderShortName == 'CLIX' || this.lenderShortName == 'SMC') {
records.own_contribution = '';
records.source_group = '';
records.other_source = '';
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.ts
index 882d6bd78..69fd6a9f0 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.ts
@@ -128,21 +128,23 @@ export class QueriesDocsComponent implements OnInit {
// geoCoords=retrieved_data.link
// }
- retrieved_data.docs_to_be_sighted.forEach((doc_value,index)=>{
- if(doc_value.hasOwnProperty('img')){
- this.docs_change_fun(index,'yes')
- }
- else if(doc_value.hasOwnProperty('reason')){
- this.docs_change_fun(index,'no');
- }
- // let data=doc_value.control_name
- // data=parseInt(data)
- // console.log("data",data);
- // data=doc_value.data
- // this.docs_change_fun(index,data)
- })
+ if(retrieved_data.docs_to_be_sighted != null){
+ retrieved_data.docs_to_be_sighted.forEach((doc_value,index)=>{
+ if(doc_value.hasOwnProperty('img')){
+ this.docs_change_fun(index,'yes')
+ }
+ else if(doc_value.hasOwnProperty('reason')){
+ this.docs_change_fun(index,'no');
+ }
+ // let data=doc_value.control_name
+ // data=parseInt(data)
+ // console.log("data",data);
+ // data=doc_value.data
+ // this.docs_change_fun(index,data)
+ })
+ }
// console.log("form123",this.docsCollectedForm.value);
- this.docsCollectedForm.setValue(retrieved_data)
+ this.docsCollectedForm.patchValue(retrieved_data)
}
},err=>{
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
index 42d21368b..45da5fed6 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
@@ -46,7 +46,7 @@
Stock Required
-