fix: tenant-config fixes, cashier/share/savings UI bugs, and menu-access hardcoding
- Add Balance Sheet report and disabled-features accounting config - Point menu-access tenant header and env.js/environment.ts tenant identifier at env config instead of hardcoded 'default'/'lincpay' literals - Surface the real backend error (not a generic "no reference id") when an OTP send fails in contact-otp-block - Fix branch-day "₹null" display bug (null vs undefined) and add a guard blocking a branch's first-ever day open before cash denomination migration - Dynamically size the denomination count input and block re-opening an already-open business day from Migrate Cash Denomination - Lock the denomination-managed cash GL row in Migrate Opening Balances (read-only, with a link back to Migrate Cash Denomination) - Remove duplicate Cancel/Submit action bars on the Share Product and Savings Account creation preview steps; align Previous into the same row - Hide "Apply Collection" on a share account once its advance collection is already settled (further purchases go through Apply Additional Shares) Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
+12
-1
@@ -162,7 +162,18 @@
|
||||
<div class="mob-grid mob-grid--data" formArrayName="glAccountEntries">
|
||||
<div class="mob-grid__row" [formGroupName]="i">
|
||||
<div class="mob-grid__code">{{ openingBalancesData.glAccounts[i].glAccountCode }}</div>
|
||||
<div class="mob-grid__name">{{ openingBalancesData.glAccounts[i].glAccountName }}</div>
|
||||
<div class="mob-grid__name">
|
||||
{{ openingBalancesData.glAccounts[i].glAccountName }}
|
||||
@if (isDenominationManaged(openingBalancesData.glAccounts[i].glAccountId)) {
|
||||
<span
|
||||
class="mob-grid__lock"
|
||||
matTooltip="Set by Migrate Cash Denomination — use that screen to change it"
|
||||
>
|
||||
<mat-icon inline="true">lock</mat-icon>
|
||||
<a [routerLink]="['/accounting/migrate-cash-denomination']">Migrate Cash Denomination</a>
|
||||
</span>
|
||||
}
|
||||
</div>
|
||||
<div class="mob-grid__amt">
|
||||
<mat-form-field class="mob-grid__input">
|
||||
<input matInput type="number" min="0" formControlName="debit" placeholder="0.00" />
|
||||
|
||||
@@ -219,6 +219,33 @@
|
||||
word-break: break-word;
|
||||
}
|
||||
|
||||
/* Cash at Vault / Cash at Teller — locked, see MigrateOpeningBalancesComponent.isDenominationManaged. */
|
||||
&__lock {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
margin-left: 8px;
|
||||
padding: 1px 8px 1px 6px;
|
||||
border-radius: 999px;
|
||||
background: #fff7ed;
|
||||
color: #9a3412;
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
white-space: nowrap;
|
||||
vertical-align: middle;
|
||||
|
||||
mat-icon {
|
||||
font-size: 13px;
|
||||
width: 13px;
|
||||
height: 13px;
|
||||
}
|
||||
|
||||
a {
|
||||
color: inherit;
|
||||
text-decoration: underline;
|
||||
}
|
||||
}
|
||||
|
||||
&__amt {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
@@ -17,6 +17,7 @@ import {
|
||||
} from '@angular/forms';
|
||||
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
|
||||
import { MatIconModule } from '@angular/material/icon';
|
||||
import { MatTooltipModule } from '@angular/material/tooltip';
|
||||
|
||||
/** Custom Services */
|
||||
import { AccountingService } from '../accounting.service';
|
||||
@@ -43,7 +44,8 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
|
||||
...STANDALONE_SHARED_IMPORTS,
|
||||
GlAccountDisplayComponent,
|
||||
CurrencyPipe,
|
||||
MatIconModule
|
||||
MatIconModule,
|
||||
MatTooltipModule
|
||||
]
|
||||
})
|
||||
export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
|
||||
@@ -74,6 +76,13 @@ export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
|
||||
debitsSum = 0;
|
||||
/** Sum total of credits. */
|
||||
creditsSum = 0;
|
||||
/** GL account ids mapped to Financial Activity 101 (Cash at Vault) / 102 (Cash at Teller) — the
|
||||
* account(s) Migrate Cash Denomination owns. Their opening balance is shown here for visibility
|
||||
* but locked against editing: redefining it as a bare number here, instead of through a counted
|
||||
* denomination breakdown, would let the GL figure drift away from what is physically in the till.
|
||||
* The backend enforces the same rule independently (see defineOpeningBalance's
|
||||
* validateNoDenominationManagedCashAccounts) — this is a convenience, not the source of truth. */
|
||||
denominationManagedGlAccountIds: number[] = [];
|
||||
|
||||
/* Reference of search form */
|
||||
@ViewChild('searchFormRef') searchFormRef: ElementRef<any>;
|
||||
@@ -95,6 +104,22 @@ export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
|
||||
this.officeData = data.offices;
|
||||
this.currencyData = data.currencies.selectedCurrencyOptions;
|
||||
});
|
||||
// Office-independent: which GL account(s) this tenant has mapped to Cash at Vault / Cash at
|
||||
// Teller, so their row can be locked the moment the office's accounts are drawn.
|
||||
this.accountingService.getFinancialActivityAccounts().subscribe((mappings: any[]) => {
|
||||
this.denominationManagedGlAccountIds = (mappings || [])
|
||||
.filter((mapping) => mapping.financialActivityData?.id === 101 || mapping.financialActivityData?.id === 102)
|
||||
.map((mapping) => mapping.glAccountData?.id)
|
||||
.filter((id) => id != null);
|
||||
// Retrieve may already have run before this (fast) request came back — lock any row it
|
||||
// missed rather than leaving it editable for the rest of this visit.
|
||||
this.glAccountEntries?.controls.forEach((control) => {
|
||||
const glAccountId = control.get('glAccountId')?.value;
|
||||
if (this.isDenominationManaged(glAccountId) && control.enabled) {
|
||||
control.disable();
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -136,14 +161,31 @@ export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
|
||||
* @returns {FormGroup} GL Account entry form.
|
||||
*/
|
||||
createGLAccountEntryForm(glAccount: any): UntypedFormGroup {
|
||||
return this.formBuilder.group(
|
||||
// A never-touched account arrives as a placeholder row (amount/entryType both null); one that
|
||||
// already carries an opening balance arrives with its real, committed figure — show that
|
||||
// instead of leaving the field looking blank.
|
||||
const existingDebit = glAccount.entryType?.value === 'DEBIT' ? glAccount.amount : null;
|
||||
const existingCredit = glAccount.entryType?.value === 'CREDIT' ? glAccount.amount : null;
|
||||
const group = this.formBuilder.group(
|
||||
{
|
||||
glAccountId: [glAccount.glAccountId],
|
||||
debit: [null],
|
||||
credit: [null]
|
||||
debit: [existingDebit],
|
||||
credit: [existingCredit]
|
||||
},
|
||||
{ validator: onlyOneOfTheFieldsIsRequiredValidator }
|
||||
);
|
||||
if (this.isDenominationManaged(glAccount.glAccountId)) {
|
||||
// Disabling excludes this row from the form's own .value, so it is never resubmitted here —
|
||||
// the account keeps whatever Migrate Cash Denomination last set it to.
|
||||
group.disable();
|
||||
}
|
||||
return group;
|
||||
}
|
||||
|
||||
/** Whether this GL account is Cash at Vault / Cash at Teller — locked here, see
|
||||
* denominationManagedGlAccountIds. */
|
||||
isDenominationManaged(glAccountId: number): boolean {
|
||||
return this.denominationManagedGlAccountIds.includes(glAccountId);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -176,17 +218,30 @@ export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
|
||||
|
||||
this.openingBalancesData = openingBalancesData;
|
||||
|
||||
entry.valueChanges.subscribe(() => {
|
||||
this.debitsSum = 0;
|
||||
this.creditsSum = 0;
|
||||
entry.controls.forEach((value) => {
|
||||
this.debitsSum += value.value.debit;
|
||||
this.creditsSum += value.value.credit;
|
||||
});
|
||||
});
|
||||
entry.valueChanges.subscribe(() => this.recomputeSums());
|
||||
// Runs once immediately too: valueChanges only fires on a later edit, and the locked cash
|
||||
// row's own prefilled figure (set once, above, never through a further value change) would
|
||||
// otherwise never be reflected in the banner at all.
|
||||
this.recomputeSums();
|
||||
});
|
||||
}
|
||||
|
||||
/** Total Debit / Total Credit shown in the balance banner. A locked (denomination-managed) row is
|
||||
* excluded here exactly as it is excluded from the form's own .value used at submit time — this
|
||||
* screen only needs to balance the accounts it is itself about to (re)define, not the one
|
||||
* Migrate Cash Denomination already settled and this form can never touch. */
|
||||
private recomputeSums(): void {
|
||||
this.debitsSum = 0;
|
||||
this.creditsSum = 0;
|
||||
this.glAccountEntries.controls.forEach((control) => {
|
||||
if (control.disabled) {
|
||||
return;
|
||||
}
|
||||
this.debitsSum += control.value.debit || 0;
|
||||
this.creditsSum += control.value.credit || 0;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Submits the opening balances form and defines opening balances,
|
||||
* if successful redirects to view created transaction.
|
||||
|
||||
Reference in New Issue
Block a user