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

Merge branch 'dev-latest' into feature/bugfix

Browse Source
This commit is contained in:
anshul
2026-09-28 12:51:26 +05:30
parent a5ed3fde21 6cbb31b5c6
commit f451672ce7
2 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.html
+16 -8
View File
@@ -61,7 +61,7 @@
} @else { } @else {
<div class="pmt__preview"> <div class="pmt__preview">
<div class="pmt__preview-row"> <div class="pmt__preview-row">
<span class="pmt__preview-label">Current Balance</span> <span class="pmt__preview-label">FD Maturity Balance (renews as-is below)</span>
<span class="pmt__preview-value">{{ renewalPreview.currentBalance | formatNumber }}</span> <span class="pmt__preview-value">{{ renewalPreview.currentBalance | formatNumber }}</span>
</div> </div>
<div class="pmt__preview-row"> <div class="pmt__preview-row">
@@ -69,18 +69,26 @@
<span class="pmt__preview-value">{{ renewalPreview.gapDays }}</span> <span class="pmt__preview-value">{{ renewalPreview.gapDays }}</span>
</div> </div>
<div class="pmt__preview-row"> <div class="pmt__preview-row">
<span class="pmt__preview-label">Savings Account Interest Rate</span> <span class="pmt__preview-label">Deposit Account Link</span>
<span class="pmt__preview-value">{{ renewalPreview.linkedAccountNo }}</span>
</div>
<div class="pmt__preview-row">
<span class="pmt__preview-label">Its Interest Rate</span>
<span class="pmt__preview-value">{{ renewalPreview.linkedAccountRate }}%</span> <span class="pmt__preview-value">{{ renewalPreview.linkedAccountRate }}%</span>
</div> </div>
<div class="pmt__preview-row pmt__preview-row--highlight"> <div class="pmt__preview-row pmt__preview-row--highlight pmt__preview-row--total">
<span class="pmt__preview-label">Gap-Period Interest to be Credited</span> <span class="pmt__preview-label"
>Gap-Period Interest &rarr; paid to {{ renewalPreview.linkedAccountNo }}</span
>
<span class="pmt__preview-value">+ {{ renewalPreview.gapInterestAmount | formatNumber }}</span> <span class="pmt__preview-value">+ {{ renewalPreview.gapInterestAmount | formatNumber }}</span>
</div> </div>
<div class="pmt__preview-row pmt__preview-row--total">
<span class="pmt__preview-label">New Balance for the Renewed Term</span>
<span class="pmt__preview-value">{{ renewalPreview.projectedBalance | formatNumber }}</span>
</div>
</div> </div>
<p class="pmt__hint">
<fa-icon icon="info-circle" class="m-r-5"></fa-icon>
This gap interest was earned at the linked account's own rate, not the FD's -- it is credited straight
to account {{ renewalPreview.linkedAccountNo }} (the FD's Deposit Account Link), separately from
whatever you choose below. The FD itself renews from its own maturity balance, unchanged.
</p>
} }
} }
} }
src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-terms-step/fixed-deposit-product-terms-step.component.ts
+11 -6
View File
@@ -74,6 +74,7 @@ export class FixedDepositProductTermsStepComponent implements OnInit, OnChanges
this.periodFrequencyData = this.fixedDepositProductsTemplate.periodFrequencyTypeOptions || []; this.periodFrequencyData = this.fixedDepositProductsTemplate.periodFrequencyTypeOptions || [];
const isEditing = !!this.fixedDepositProductsTemplate.id; const isEditing = !!this.fixedDepositProductsTemplate.id;
const defaultPeriodTypeId = this.periodFrequencyData[0]?.id ?? null;
const defaultAveragePeriod = this.averagePeriodData[0]?.value || 'Monthly'; const defaultAveragePeriod = this.averagePeriodData[0]?.value || 'Monthly';
const savedEnumTypeId = const savedEnumTypeId =
this.fixedDepositProductsTemplate.interestCalculationType?.id || this.interestCalculationTypeData?.[0]?.id || 1; this.fixedDepositProductsTemplate.interestCalculationType?.id || this.interestCalculationTypeData?.[0]?.id || 1;
@@ -84,12 +85,16 @@ export class FixedDepositProductTermsStepComponent implements OnInit, OnChanges
: (this.interestCalculationTypeOptionData?.[0]?.id ?? null); : (this.interestCalculationTypeOptionData?.[0]?.id ?? null);
this.fixedDepositProductTermsForm.patchValue({ this.fixedDepositProductTermsForm.patchValue({
// Hidden, unedited-by-anyone fields -- left blank (like their max-/in-multiples-of- siblings // Hidden, unedited-by-anyone fields. On EDIT, left as the product's own saved value with no
// already correctly are) rather than forced to a real default, or every single product edit // forced fallback (like their max-/in-multiples-of- siblings already correctly are), or a
// submitted a "real" value against a product that had none, and a checker's "Proposed changes" // checker's "Proposed changes" review showed these as changed on every unrelated edit, never
// review showed these two as "changed" on every unrelated edit, never anything a maker touched. // anything a maker touched. On CREATE there is no saved value yet, and the backend requires
minDepositTerm: this.fixedDepositProductsTemplate.minDepositTerm ?? '', // minDepositTerm -- default it (and its unit) here same as before, since the field is hidden
minDepositTermTypeId: this.fixedDepositProductsTemplate.minDepositTermType?.id ?? '', // and no one gets a chance to fill it in themselves.
minDepositTerm: isEditing ? (this.fixedDepositProductsTemplate.minDepositTerm ?? '') : 1,
minDepositTermTypeId: isEditing
? (this.fixedDepositProductsTemplate.minDepositTermType?.id ?? '')
: defaultPeriodTypeId,
maxDepositTerm: this.fixedDepositProductsTemplate.maxDepositTerm ?? '', maxDepositTerm: this.fixedDepositProductsTemplate.maxDepositTerm ?? '',
maxDepositTermTypeId: this.fixedDepositProductsTemplate.maxDepositTermType?.id ?? '', maxDepositTermTypeId: this.fixedDepositProductsTemplate.maxDepositTermType?.id ?? '',
inMultiplesOfDepositTerm: this.fixedDepositProductsTemplate.inMultiplesOfDepositTerm ?? '', inMultiplesOfDepositTerm: this.fixedDepositProductsTemplate.inMultiplesOfDepositTerm ?? '',