fix: remove duplicate declarations introduced by dev merge
Both dev and demo-backup independently added suppressMonthlyAnnualLink and isHeadOfficeUser() at different points in their respective history, so the merge's auto-resolve kept both copies instead of deduping, causing TS2300/TS2393 build failures.
This commit is contained in:
@@ -968,10 +968,6 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
|
|||||||
this.linkMonthlyAnnual('monthlyTurnover', 'annualTurnover');
|
this.linkMonthlyAnnual('monthlyTurnover', 'annualTurnover');
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Guards the Monthly/Annual and Income/Turnover auto-sync subscriptions below — set this to
|
|
||||||
* true while programmatically writing both fields of a pair to avoid a feedback loop. */
|
|
||||||
private suppressMonthlyAnnualLink = false;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Keeps a Monthly/Annual pair of amount fields in sync at a 12x ratio — typing into either
|
* Keeps a Monthly/Annual pair of amount fields in sync at a 12x ratio — typing into either
|
||||||
* one auto-fills the other. Uses { emitEvent: false } on the write side so the two
|
* one auto-fills the other. Uses { emitEvent: false } on the write side so the two
|
||||||
|
|||||||
@@ -384,14 +384,6 @@ export class AuthenticationService {
|
|||||||
return JSON.parse(this.storage.getItem(this.credentialsStorageKey));
|
return JSON.parse(this.storage.getItem(this.credentialsStorageKey));
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Returns true when the logged-in user is at Head Office rather than a branch login. */
|
|
||||||
isHeadOfficeUser(): boolean {
|
|
||||||
const creds = this.getCredentials();
|
|
||||||
if (!creds) return false;
|
|
||||||
if (creds.officeId === 1) return true;
|
|
||||||
return (creds.officeName || '').toLowerCase().includes('head office');
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Returns true when the logged-in user has the "Clerk" role. */
|
/** Returns true when the logged-in user has the "Clerk" role. */
|
||||||
isClerkUser(): boolean {
|
isClerkUser(): boolean {
|
||||||
const creds = this.getCredentials();
|
const creds = this.getCredentials();
|
||||||
|
|||||||
Reference in New Issue
Block a user