Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3f59cc6b91 | ||
|
|
b0777e9845 |
@@ -5804,13 +5804,21 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
|
||||
return;
|
||||
}
|
||||
|
||||
// Cashier deposit (savings/current/GL) → route through maker-checker (create PENDING request, no direct credit)
|
||||
// Cashier deposit (savings/current/FD/RD/GL) → route through maker-checker (create PENDING request,
|
||||
// no direct credit). FD and RD are their own account-type codes (see creditEntryAccountType()) and
|
||||
// belong here just as much as a plain savings deposit -- a cashier crediting an FD/RD must not be
|
||||
// able to move money in without a manager's approval either.
|
||||
// Use the dialog-confirmed amount — for cash that is the denomination total
|
||||
if (
|
||||
!this.isClerk &&
|
||||
!this.reviewMode &&
|
||||
isDeposit &&
|
||||
(row.acTyp === 'SD' || row.acTyp === 'CA' || row.acTyp === 'CB' || row.acTyp === 'GL')
|
||||
(row.acTyp === 'SD' ||
|
||||
row.acTyp === 'CA' ||
|
||||
row.acTyp === 'CB' ||
|
||||
row.acTyp === 'FD' ||
|
||||
row.acTyp === 'RD' ||
|
||||
row.acTyp === 'GL')
|
||||
) {
|
||||
this.submitCashierDepositRequest(row, this.confirmData?.amount ?? amount);
|
||||
return;
|
||||
|
||||
+10
-4
@@ -334,14 +334,18 @@ export class FixedDepositAccountInterestRateChartStepComponent implements OnChan
|
||||
const frequencyId = this.resolveFrequencyId(this.tenurePeriodUnit);
|
||||
|
||||
if (this.principalAmount && this.principalAmount > 0) {
|
||||
// Convert tenure to months for backend API
|
||||
let tenureInMonths = 0;
|
||||
// Convert tenure to months for backend API. A Days tenure under 30 days rounds down to 0
|
||||
// months, which the backend rejects -- send it as tenureInDays instead in that case.
|
||||
let tenureInMonths: number | undefined;
|
||||
let tenureInDays: number | undefined;
|
||||
if (this.tenurePeriodUnit === 'Years') {
|
||||
tenureInMonths = this.tenureValue * 12;
|
||||
} else if (this.tenurePeriodUnit === 'Months') {
|
||||
tenureInMonths = this.tenureValue;
|
||||
} else {
|
||||
} else if (enteredDays >= 30) {
|
||||
tenureInMonths = Math.floor(enteredDays / 30);
|
||||
} else {
|
||||
tenureInDays = enteredDays;
|
||||
}
|
||||
|
||||
// Map compounding period type id → months (0=Daily, 1=Daily, 4=Monthly, 5=Quarterly, 6=SemiAnnual, 7=Annual)
|
||||
@@ -395,6 +399,7 @@ export class FixedDepositAccountInterestRateChartStepComponent implements OnChan
|
||||
principalAmount: this.principalAmount,
|
||||
annualInterestRate: rate,
|
||||
tenureInMonths,
|
||||
tenureInDays,
|
||||
interestCompoundingPeriodInMonths: compMonths, // 0 = daily, now supported by backend
|
||||
interestPostingPeriodInMonths: postMonths,
|
||||
submittedOnDate: submittedOnDateStr,
|
||||
@@ -417,7 +422,8 @@ export class FixedDepositAccountInterestRateChartStepComponent implements OnChan
|
||||
Math.round(this.principalAmount * Math.pow(1 + r / daysInYearVal, enteredDays) * 100) / 100;
|
||||
} else {
|
||||
const n = 12 / compMonths;
|
||||
const totalCompoundings = Math.floor(tenureInMonths / compMonths);
|
||||
const effectiveMonths = tenureInMonths ?? enteredDays / 30;
|
||||
const totalCompoundings = Math.floor(effectiveMonths / compMonths);
|
||||
const rPerCompounding = rate / (n * 100);
|
||||
result.maturityAmount =
|
||||
Math.round(this.principalAmount * Math.pow(1 + rPerCompounding, totalCompoundings) * 100) / 100;
|
||||
|
||||
@@ -133,7 +133,8 @@ export class FixedDepositsService {
|
||||
calculateFixedDepositInterest(params: {
|
||||
principalAmount: number;
|
||||
annualInterestRate: number;
|
||||
tenureInMonths: number;
|
||||
tenureInMonths?: number;
|
||||
tenureInDays?: number; // alternative to tenureInMonths, for sub-month FD Single tenures
|
||||
interestCompoundingPeriodInMonths: number;
|
||||
interestPostingPeriodInMonths: number;
|
||||
submittedOnDate?: string; // yyyy-MM-dd — enables exact calendar calculation
|
||||
|
||||
Reference in New Issue
Block a user