diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html index d8333e6fc..87e104fad 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -74,13 +74,13 @@ - + -
+
@@ -358,8 +358,7 @@ -->
- - + Age of Asset in Years @@ -386,7 +385,7 @@ -
+
Asset Owned by Required -
+
Age of Asset in Years - +
@@ -416,7 +416,7 @@ *ngIf="sup.controls['business_name_of_the_other_owner'].hasError('required')">Asset Owned by is Required -
+
Age of Asset in Years + *ngIf="(sup.get('business_assets_mode').value != '') && sup.get('business_ownership_type').value == 'owned' && (lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || product_abbr === 'LFMP')">
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 bb5f646fd..a82dd71cf 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 @@ -396,7 +396,7 @@ 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.product_abbr == 'BL') && !(this.lender_short_name == 'SMC' && this.product_abbr == 'BL')){ + if( !(this.lender_short_name == 'CLIX' && this.product_abbr == 'BL') && !(this.lender_short_name == 'MWISE' && 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'); @@ -467,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.product_abbr == 'BL') && !(this.lender_short_name == 'SMC' && this.product_abbr == 'BL')){ + if(!(this.lender_short_name == 'CLIX' && this.product_abbr == 'BL') && !(this.lender_short_name == 'MWISE' && 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'); @@ -536,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.product_abbr == 'BL') && !(this.lender_short_name == 'SMC' && this.product_abbr == 'BL')){ + if(!(this.lender_short_name == 'CLIX' && this.product_abbr == 'BL') && !(this.lender_short_name == 'MWISE' && 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'); @@ -806,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.product_abbr == 'BL') && !(this.lender_short_name == 'SMC' && this.product_abbr == 'BL')){ + if(!(this.lender_short_name == 'CLIX' && this.product_abbr == 'BL') && !(this.lender_short_name == 'MWISE' && 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 d0fbd22c1..6c77bf0db 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 @@ -140,7 +140,7 @@ type="number">
-
+
-
+
Select @@ -287,7 +287,7 @@ type="number">
-
+
-
+
@@ -433,7 +433,7 @@ type="number">
-
+
- + - + + {{"₹"}} {{currentLoanForm.value.tot_emi_paid | numberToWords}} Only - + + {{"₹"}} {{currentLoanForm.value.tot_outstanding_loans | numberToWords}} Only diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html index 84076b4db..fae0414c1 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html @@ -134,7 +134,7 @@
--> -
+
@@ -273,7 +273,7 @@
-
+
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 95a6a785f..59023b462 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 - SMC + MWISE 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 40b4c62dd..e5a9e7a58 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 == 'SMC' || this.product_abbr == 'LAEP'){ + if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'MWISE' || 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 == 'SMC' || this.product_abbr == 'LAEP'){ + if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'MWISE' || 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 a2e1960e7..7e707a428 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 ece26c11d..84ba327c8 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 @@ - + Select @@ -166,7 +166,7 @@ - + {{"₹"}} {{ loanDetailsForm.controls['emi_level'].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 ce9f0d8d5..8f6c9436c 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 == 'SMC'){ + if(this.lenderShortName == 'CLIX' || this.lenderShortName == 'MWISE'){ // 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 == 'SMC'){ + if(this.lenderShortName == 'CLIX' || this.lenderShortName == 'MWISE'){ 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 == 'SMC') { + if (this.isContribution || this.lenderShortName == 'CLIX' || this.lenderShortName == 'MWISE') { 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/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html index 45da5fed6..f2d0bdc25 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 -
+
@@ -141,7 +141,7 @@ -
+
-
+
-
+
-
+
-
+
-
+
@@ -157,7 +157,7 @@ type="number">
-
+
-
+
@@ -337,7 +337,7 @@ type="number">
-
+
-
+
@@ -520,7 +520,7 @@ type="number">
-
+