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

merging code

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Nitesh Yadav
2026-04-20 14:26:25 +05:30
co-authored by Claude Sonnet 4.6
parent e212bf7d79 d72e969dc3
commit d367e76104
322 changed files with 28779 additions and 4976 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/clients/clients-view/form60-tab/form60-tab.component.html
+20 -7
View File
@@ -61,13 +61,17 @@
}
@if (form60Data.dateOfBirth) {
<div class="f60-detail">
<span class="f60-detail__label"><mat-icon class="f60-detail__icon">calendar_today</mat-icon> Date of Birth</span>
<span class="f60-detail__label"
><mat-icon class="f60-detail__icon">calendar_today</mat-icon> Date of Birth</span
>
<span class="f60-detail__value">{{ form60Data.dateOfBirth | dateFormat }}</span>
</div>
}
@if (form60Data.fatherName) {
<div class="f60-detail">
<span class="f60-detail__label"><mat-icon class="f60-detail__icon">family_restroom</mat-icon> Father's Name</span>
<span class="f60-detail__label"
><mat-icon class="f60-detail__icon">family_restroom</mat-icon> Father's Name</span
>
<span class="f60-detail__value">{{ form60Data.fatherName }}</span>
</div>
}
@@ -79,25 +83,33 @@
}
@if (form60Data.transactionType) {
<div class="f60-detail">
<span class="f60-detail__label"><mat-icon class="f60-detail__icon">receipt_long</mat-icon> Transaction Type</span>
<span class="f60-detail__label"
><mat-icon class="f60-detail__icon">receipt_long</mat-icon> Transaction Type</span
>
<span class="f60-detail__value">{{ form60Data.transactionType }}</span>
</div>
}
@if (form60Data.transactionAmount) {
<div class="f60-detail">
<span class="f60-detail__label"><mat-icon class="f60-detail__icon">currency_rupee</mat-icon> Transaction Amount</span>
<span class="f60-detail__label"
><mat-icon class="f60-detail__icon">currency_rupee</mat-icon> Transaction Amount</span
>
<span class="f60-detail__value">&#8377; {{ form60Data.transactionAmount }}</span>
</div>
}
@if (form60Data.estimatedTotalIncome) {
<div class="f60-detail">
<span class="f60-detail__label"><mat-icon class="f60-detail__icon">account_balance_wallet</mat-icon> Estimated Total Income</span>
<span class="f60-detail__label"
><mat-icon class="f60-detail__icon">account_balance_wallet</mat-icon> Estimated Total Income</span
>
<span class="f60-detail__value">&#8377; {{ form60Data.estimatedTotalIncome }}</span>
</div>
}
@if (form60Data.reasonForNoPan) {
<div class="f60-detail">
<span class="f60-detail__label"><mat-icon class="f60-detail__icon">help_outline</mat-icon> Reason for No PAN</span>
<span class="f60-detail__label"
><mat-icon class="f60-detail__icon">help_outline</mat-icon> Reason for No PAN</span
>
<span class="f60-detail__value">{{ form60Data.reasonForNoPan }}</span>
</div>
}
@@ -181,7 +193,8 @@
<!-- Declaration -->
<div class="f60-declaration">
<mat-checkbox formControlName="declaration">
I hereby declare that I do not have a Permanent Account Number (PAN) and the information provided above is true and correct to the best of my knowledge and belief.
I hereby declare that I do not have a Permanent Account Number (PAN) and the information provided above
is true and correct to the best of my knowledge and belief.
</mat-checkbox>
</div>
src/app/clients/clients-view/form60-tab/form60-tab.component.scss
+227 -56
View File
@@ -6,19 +6,26 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
$primary: #1E6BB8;
$primary-light: #EBF3FF;
$primary: #1e6bb8;
$primary-light: #ebf3ff;
$green: #16a34a;
$green-light: #dcfce7;
$amber: #f59e0b;
$amber-light: #fef3c7;
$border: #E2E8F0;
$text: #1A2332;
$muted: #64748B;
$bg: #F0F4F8;
$border: #e2e8f0;
$text: #1a2332;
$muted: #64748b;
$bg: #f0f4f8;
.f60-container { padding: 20px 24px; }
.f60-loading { display: flex; justify-content: center; padding: 40px; }
.f60-container {
padding: 20px 24px;
}
.f60-loading {
display: flex;
justify-content: center;
padding: 40px;
}
/* ── PAN OK — Not Required ── */
.f60-pan-ok {
@@ -29,96 +36,260 @@ $bg: #F0F4F8;
border-radius: 12px;
&__icon-wrap {
width: 72px; height: 72px; border-radius: 50%;
background: #fff; display: inline-flex; align-items: center;
justify-content: center; margin-bottom: 16px;
width: 72px;
height: 72px;
border-radius: 50%;
background: #fff;
display: inline-flex;
align-items: center;
justify-content: center;
margin-bottom: 16px;
box-shadow: 0 2px 8px rgba($green, 0.15);
}
&__icon { font-size: 40px; width: 40px; height: 40px; color: $green; }
&__title { font-size: 20px; font-weight: 700; color: $text; margin: 0 0 8px; }
&__icon {
font-size: 40px;
width: 40px;
height: 40px;
color: $green;
}
&__title {
font-size: 20px;
font-weight: 700;
color: $text;
margin: 0 0 8px;
}
&__desc {
font-size: 15px; color: $text; margin: 0 0 6px;
display: flex; align-items: center; justify-content: center; gap: 6px; flex-wrap: wrap;
strong { font-family: 'JetBrains Mono', monospace; letter-spacing: 0.5px; }
font-size: 15px;
color: $text;
margin: 0 0 6px;
display: flex;
align-items: center;
justify-content: center;
gap: 6px;
flex-wrap: wrap;
strong {
font-family: 'JetBrains Mono', monospace;
letter-spacing: 0.5px;
}
}
&__tick {
font-size: 18px !important;
width: 18px !important;
height: 18px !important;
color: $green;
}
&__verified {
font-size: 13px;
font-weight: 600;
color: $green;
}
&__rule {
font-size: 12px;
color: $muted;
margin: 12px 0 0;
}
&__tick { font-size: 18px !important; width: 18px !important; height: 18px !important; color: $green; }
&__verified { font-size: 13px; font-weight: 600; color: $green; }
&__rule { font-size: 12px; color: $muted; margin: 12px 0 0; }
}
/* ── Warning Banner ── */
.f60-warning {
display: flex; align-items: center; gap: 12px;
background: $amber-light; padding: 14px 20px;
border-left: 4px solid $amber; border-radius: 8px;
display: flex;
align-items: center;
gap: 12px;
background: $amber-light;
padding: 14px 20px;
border-left: 4px solid $amber;
border-radius: 8px;
margin-bottom: 20px;
&__icon { color: $amber; font-size: 24px; flex-shrink: 0; }
&__text { font-size: 13px; color: #92400e; line-height: 1.5; strong { font-weight: 700; } }
&__icon {
color: $amber;
font-size: 24px;
flex-shrink: 0;
}
&__text {
font-size: 13px;
color: #92400e;
line-height: 1.5;
strong {
font-weight: 700;
}
}
}
/* ── Card ── */
.f60-card {
background: #fff; border: 1px solid $border; border-radius: 12px; overflow: hidden;
background: #fff;
border: 1px solid $border;
border-radius: 12px;
overflow: hidden;
&__header {
display: flex; align-items: center; gap: 10px;
padding: 14px 20px; background: $bg; border-bottom: 1px solid $border;
h3 { margin: 0; font-size: 15px; font-weight: 600; color: $text; flex: 1; }
display: flex;
align-items: center;
gap: 10px;
padding: 14px 20px;
background: $bg;
border-bottom: 1px solid $border;
h3 {
margin: 0;
font-size: 15px;
font-weight: 600;
color: $text;
flex: 1;
}
}
&__header-icon { color: $primary; font-size: 22px; }
&__header-icon {
color: $primary;
font-size: 22px;
}
&__status {
font-size: 11px; font-weight: 600; color: $green; background: $green-light;
padding: 3px 10px; border-radius: 12px;
font-size: 11px;
font-weight: 600;
color: $green;
background: $green-light;
padding: 3px 10px;
border-radius: 12px;
}
&__edit {
font-size: 12px !important; height: 30px !important; border-radius: 6px !important;
mat-icon { font-size: 16px; width: 16px; height: 16px; margin-right: 4px; }
font-size: 12px !important;
height: 30px !important;
border-radius: 6px !important;
mat-icon {
font-size: 16px;
width: 16px;
height: 16px;
margin-right: 4px;
}
}
&__body {
padding: 20px;
}
&__body { padding: 20px; }
}
/* ── Detail Grid (read-only) ── */
.f60-detail-grid {
display: grid; grid-template-columns: 1fr 1fr; gap: 16px 24px;
@media (max-width: 600px) { grid-template-columns: 1fr; }
display: grid;
grid-template-columns: 1fr 1fr;
gap: 16px 24px;
@media (width <= 600px) {
grid-template-columns: 1fr;
}
}
.f60-detail {
display: flex; flex-direction: column;
&--full { grid-column: 1 / -1; }
display: flex;
flex-direction: column;
&--full {
grid-column: 1 / -1;
}
&__label {
font-size: 11px; font-weight: 600; text-transform: uppercase;
color: $muted; letter-spacing: 0.5px; margin-bottom: 4px;
display: flex; align-items: center; gap: 4px;
font-size: 11px;
font-weight: 600;
text-transform: uppercase;
color: $muted;
letter-spacing: 0.5px;
margin-bottom: 4px;
display: flex;
align-items: center;
gap: 4px;
}
&__icon {
font-size: 15px !important;
width: 15px !important;
height: 15px !important;
color: $primary;
}
&__value {
font-size: 15px;
font-weight: 600;
color: $text;
}
&__icon { font-size: 15px !important; width: 15px !important; height: 15px !important; color: $primary; }
&__value { font-size: 15px; font-weight: 600; color: $text; }
}
/* ── Form Grid ── */
.f60-form-grid {
display: grid; grid-template-columns: 1fr 1fr; gap: 4px 16px;
@media (max-width: 600px) { grid-template-columns: 1fr; }
display: grid;
grid-template-columns: 1fr 1fr;
gap: 4px 16px;
@media (width <= 600px) {
grid-template-columns: 1fr;
}
}
.f60-ff {
width: 100%;
&--full {
grid-column: 1 / -1;
}
}
.f60-ff { width: 100%; &--full { grid-column: 1 / -1; } }
.f60-prefix {
display: inline-flex; align-items: center;
padding-left: 4px; padding-right: 8px; margin-right: 8px;
border-right: 1.5px solid #cbd5e1; line-height: 1;
mat-icon { font-size: 20px; width: 20px; height: 20px; color: $primary; }
display: inline-flex;
align-items: center;
padding-left: 4px;
padding-right: 8px;
margin-right: 8px;
border-right: 1.5px solid #cbd5e1;
line-height: 1;
mat-icon {
font-size: 20px;
width: 20px;
height: 20px;
color: $primary;
}
}
/* ── Declaration ── */
.f60-declaration {
margin: 12px 0 20px; padding: 14px 16px;
background: $bg; border-radius: 8px; border: 1px solid $border;
font-size: 13px; line-height: 1.5; color: $muted;
margin: 12px 0 20px;
padding: 14px 16px;
background: $bg;
border-radius: 8px;
border: 1px solid $border;
font-size: 13px;
line-height: 1.5;
color: $muted;
}
/* ── Actions ── */
.f60-actions {
display: flex; justify-content: flex-end; gap: 10px;
button { border-radius: 8px !important; font-weight: 600 !important; }
mat-icon { font-size: 18px; width: 18px; height: 18px; margin-right: 4px; vertical-align: middle; }
display: flex;
justify-content: flex-end;
gap: 10px;
button {
border-radius: 8px !important;
font-weight: 600 !important;
}
mat-icon {
font-size: 18px;
width: 18px;
height: 18px;
margin-right: 4px;
vertical-align: middle;
}
}
src/app/clients/clients-view/form60-tab/form60-tab.component.ts
+27 -23
View File
@@ -90,33 +90,37 @@ export class Form60TabComponent implements OnInit, OnDestroy {
private loadForm60Purposes(): void {
this.loadingPurposes = true;
this.clientsService.getCodeValuesByName('FORM_60_PURPOSE').pipe(
takeUntil(this.destroy$)
).subscribe((values: any[]) => {
this.transactionTypes = (values || [])
.sort((a: any, b: any) => (a.position || 0) - (b.position || 0))
.map((v: any) => ({ value: v.name, label: v.name }));
this.loadingPurposes = false;
});
this.clientsService
.getCodeValuesByName('FORM_60_PURPOSE')
.pipe(takeUntil(this.destroy$))
.subscribe((values: any[]) => {
this.transactionTypes = (values || [])
.sort((a: any, b: any) => (a.position || 0) - (b.position || 0))
.map((v: any) => ({ value: v.name, label: v.name }));
this.loadingPurposes = false;
});
}
private checkPanStatus(): void {
this.checkingPan = true;
this.clientsService.getClientKyc(this.clientId).pipe(
takeUntil(this.destroy$),
catchError(() => of(null))
).subscribe((kyc: any) => {
this.checkingPan = false;
if (kyc?.panNumber) {
this.hasPan = true;
this.panNumber = kyc.panNumber;
this.panVerified = kyc.panVerified || false;
this.loading = false;
} else {
this.hasPan = false;
this.loadForm60Data();
}
});
this.clientsService
.getClientKyc(this.clientId)
.pipe(
takeUntil(this.destroy$),
catchError(() => of(null))
)
.subscribe((kyc: any) => {
this.checkingPan = false;
if (kyc?.panNumber) {
this.hasPan = true;
this.panNumber = kyc.panNumber;
this.panVerified = kyc.panVerified || false;
this.loading = false;
} else {
this.hasPan = false;
this.loadForm60Data();
}
});
}
private createForm(): void {