feat: recurring deposit enhancements, dashboard, chart, and account view updates
This commit is contained in:
@@ -5196,7 +5196,8 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
|
||||
this.showAlert('error', 'Invalid Account Type', [
|
||||
`Account type(s) not allowed in Bank Transfer: ${invalidAccounts.map((r) => r.acTyp + ' (' + r.acNo + ')').join(', ')}`,
|
||||
'Only Savings (SD) and Current (CA) accounts are permitted.',
|
||||
'GL, FD, RD, SHR accounts are not allowed — use Disbursement/Collection instead.'
|
||||
'GL, FD and SHR accounts are not allowed — use Disbursement/Collection instead.',
|
||||
'RD installments are paid through a cashier Receipt or Auto Debit.'
|
||||
]);
|
||||
return;
|
||||
}
|
||||
@@ -5250,6 +5251,19 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
|
||||
this.rows.length >= 2 &&
|
||||
this.rows.every((r) => r.typ === 'Disbursement' || r.typ === 'Fund Transfer')
|
||||
) {
|
||||
// A Recurring Deposit is never paid this way: these requests post straight into the account, so the
|
||||
// installment schedule never hears of the money -- installments stay unpaid, Auto Debit collects them
|
||||
// again and the maturity amount comes out wrong. RD installments come in through the cashier's
|
||||
// Receipt or the RD's own Auto Debit.
|
||||
const rdRows = this.rows.filter((r) => r.acTyp === 'RD');
|
||||
if (rdRows.length > 0) {
|
||||
this.showAlert('error', 'Recurring Deposit Not Allowed', [
|
||||
`RD account(s) ${rdRows.map((r) => r.acNo).join(', ')} cannot be used in a Disbursement, Collection or Fund Transfer.`,
|
||||
'Pay RD installments through a cashier Receipt, or by Auto Debit from the linked savings account.'
|
||||
]);
|
||||
return;
|
||||
}
|
||||
|
||||
const drRows = this.rows.filter((r) => r.dbCr === 'Dr');
|
||||
const crRows = this.rows.filter((r) => r.dbCr === 'Cr');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user