CBSNexora/cbsnexora
4
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/uate' into uate

Browse Source
This commit is contained in:
nitesh
2026-07-28 10:53:26 +05:30
parent cb4260b7a3 349dc91951
commit 2e4187c3d2
23 changed files with 305 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/clients/clients-view/form60-tab/form60-tab.component.html
+6 -6
View File
@@ -19,14 +19,14 @@
<div class="f60-pan-ok__icon-wrap">
<mat-icon class="f60-pan-ok__icon">verified</mat-icon>
</div>
<h3 class="f60-pan-ok__title">Form 60 Not Required</h3>
<h3 class="f60-pan-ok__title">Form 97 Not Required</h3>
<p class="f60-pan-ok__desc">
PAN <strong>{{ panNumber }}</strong> is attached to this client.
@if (panVerified) {
<mat-icon class="f60-pan-ok__tick">check_circle</mat-icon> <span class="f60-pan-ok__verified">Verified</span>
}
</p>
<p class="f60-pan-ok__rule">As per Income Tax Rule 114B, Form 60 is only required when PAN is not available.</p>
<p class="f60-pan-ok__rule">As per Income Tax Rule 114B, Form 97 is only required when PAN is not available.</p>
</div>
}
@@ -36,7 +36,7 @@
<div class="f60-warning">
<mat-icon class="f60-warning__icon">warning_amber</mat-icon>
<div class="f60-warning__text">
<strong>PAN not provided</strong> — Form 60 declaration is mandatory as per Income Tax Rule 114B.
<strong>PAN not provided</strong> — Form 97 declaration is mandatory as per Income Tax Rule 114B.
</div>
</div>
@@ -45,7 +45,7 @@
<div class="f60-card">
<div class="f60-card__header">
<mat-icon class="f60-card__header-icon">description</mat-icon>
<h3>Form 60 Declaration</h3>
<h3>Form 97 Declaration</h3>
<span class="f60-card__status">Submitted</span>
<button mat-stroked-button color="primary" (click)="toggleEditMode()" class="f60-card__edit">
<mat-icon>edit</mat-icon> Edit
@@ -123,7 +123,7 @@
<div class="f60-card">
<div class="f60-card__header">
<mat-icon class="f60-card__header-icon">edit_note</mat-icon>
<h3>Form 60 Declaration</h3>
<h3>Form 97 Declaration</h3>
</div>
<div class="f60-card__body">
<form [formGroup]="form60Form" (ngSubmit)="submit()">
@@ -204,7 +204,7 @@
<button type="button" mat-stroked-button (click)="toggleEditMode()">Cancel</button>
}
<button type="submit" mat-flat-button color="primary" [disabled]="!form60Form.valid">
<mat-icon>check</mat-icon> Submit Form 60
<mat-icon>check</mat-icon> Submit Form 97
</button>
</div>
</form>
src/app/clients/clients-view/form60-tab/form60-tab.component.ts
+2 -2
View File
@@ -224,14 +224,14 @@ export class Form60TabComponent implements OnInit, OnDestroy {
this.isEditMode = false;
this.alertService.alert({
type: 'success',
message: 'Form 60 submitted successfully.'
message: 'Form 97 submitted successfully.'
});
this.loadForm60Data();
},
error: (err: any) => {
this.alertService.alert({
type: 'error',
message: err?.error?.developerMessage || err?.error?.defaultUserMessage || 'Failed to submit Form 60.'
message: err?.error?.developerMessage || err?.error?.defaultUserMessage || 'Failed to submit Form 97.'
});
}
});