diff --git a/ng6-seed/package.json b/ng6-seed/package.json index 432f51afb..c566ba316 100755 --- a/ng6-seed/package.json +++ b/ng6-seed/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "license": "MIT", "scripts": { - "production": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --prod ", + "production": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build --prod ", "staging": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build --configuration=staging", "ng": "ng", "start": "ng serve", diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts index a27d9d2a3..a639a5362 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts @@ -587,9 +587,11 @@ export class AddPdComponent implements OnInit, OnDestroy { this._PDtriggerForm.controls['fk_customer_segment'].setValidators([Validators.required]); this._PDtriggerForm.controls['fk_customer_segment'].updateValueAndValidity(); - + + if(this.lenderShortName != 'CFPL') { this._PDtriggerForm.controls['loan_amount'].setValidators([Validators.required]); this._PDtriggerForm.controls['loan_amount'].updateValueAndValidity(); + } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html index 54e50baa3..50914e55e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html @@ -175,9 +175,9 @@ - {{lenderShortName == 'CFPL' ? 'Facility' :'Loan'}} Amount + {{lenderShortName == 'CFPL' ? 'Facility' :'Loan'}} Amount * {{"₹"}} {{pdMain.loan_amount.value | numberToWords}} Only diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts index 187df77ec..33fa85018 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts @@ -255,6 +255,15 @@ if(!option){ // this._EditPDtriggerForm.controls['fk_product_id'].setValue("3") // this._EditPDtriggerForm.controls['fk_pd_type'].setValue("1"); this.getSubproductList("3",2) + } + if(lender.short_name == 'CFPL'){ + this._EditPDtriggerForm.controls['loan_amount'].clearValidators(); + this._EditPDtriggerForm.controls['loan_amount'].setValidators([Validators.pattern('^[0-9]*$')]) + this._EditPDtriggerForm.controls['loan_amount'].updateValueAndValidity(); + } + else{ + this._EditPDtriggerForm.controls['loan_amount'].setValidators([Validators.required,Validators.pattern('^[0-9]*$')]); + this._EditPDtriggerForm.controls['loan_amount'].updateValueAndValidity(); } // console.log("len",lender) } @@ -378,7 +387,7 @@ if(!option){ fk_subproduct_id: [this.data.records.fk_subproduct_id], fk_pd_type: [this.data.records.fk_pd_type], fk_customer_segment: [this.data.records.fk_customer_segment], - loan_amount: [this.data.records.loan_amount,Validators.compose([Validators.pattern('^[0-9]*$')])], + loan_amount: [this.data.records.loan_amount,Validators.compose([Validators.required,Validators.pattern('^[0-9]*$')])], addresses: this._fb.array([]), //   addressline1: [this.data.records.addressline1.toUpperCase()], // fk_city: [this.data.records.fk_city], 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 9b97660f5..fa23addd0 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 @@ -392,7 +392,7 @@
- Is There a {{lender_short_name == 'CFPL' ? 'Facility' :'Loan'}} Against This Asset? + Is There a Loan Against This Asset? Select