taxtank-core 0.31.55 → 0.31.59
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/models/bank/bank-account.mjs +8 -6
- package/esm2020/lib/models/financial-year/financial-year.mjs +6 -2
- package/esm2020/lib/services/http/income-source/sole-forecast/sole-forecast.service.mjs +3 -2
- package/fesm2015/taxtank-core.mjs +14 -7
- package/fesm2015/taxtank-core.mjs.map +1 -1
- package/fesm2020/taxtank-core.mjs +14 -7
- package/fesm2020/taxtank-core.mjs.map +1 -1
- package/lib/models/bank/bank-account.d.ts +3 -2
- package/lib/models/financial-year/financial-year.d.ts +2 -0
- package/package.json +1 -1
|
@@ -25,18 +25,20 @@ export class BankAccount extends BankAccountBase {
|
|
|
25
25
|
get partialAccountNumber() {
|
|
26
26
|
return `xxxx${this.accountNumber.slice(-4)}`;
|
|
27
27
|
}
|
|
28
|
+
get balance() {
|
|
29
|
+
return FinancialYear.isCurrent() ? this.currentBalance : this.getOpeningBalance(FinancialYear.year + 1);
|
|
30
|
+
}
|
|
28
31
|
/**
|
|
29
32
|
* Get current opening balance amount
|
|
30
33
|
*/
|
|
31
|
-
getOpeningBalance() {
|
|
32
|
-
return this.
|
|
34
|
+
getOpeningBalance(year = FinancialYear.year) {
|
|
35
|
+
return this.getBalanceByYear(year)?.openingBalance || 0;
|
|
33
36
|
}
|
|
34
37
|
/**
|
|
35
38
|
* Get bank account balance for current financial year
|
|
36
39
|
*/
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
return this.balances.find((balance) => balance.financialYear === currentFinYear);
|
|
40
|
+
getBalanceByYear(year) {
|
|
41
|
+
return this.balances.find((balance) => balance.financialYear === year);
|
|
40
42
|
}
|
|
41
43
|
/**
|
|
42
44
|
* check if bank account type is one of savings accounts
|
|
@@ -169,4 +171,4 @@ __decorate([
|
|
|
169
171
|
__decorate([
|
|
170
172
|
Transform(({ value }) => value === 4 ? BankAccountTypeEnum.LOAN : value)
|
|
171
173
|
], BankAccount.prototype, "type", void 0);
|
|
172
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bank-account.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/models/bank/bank-account.ts"],"names":[],"mappings":"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","sourcesContent":["import { BankAccount as BankAccountBase } from '../../db/Models/bank/bank-account';\nimport { BankAccountStatusEnum, BankAccountTypeEnum } from '../../db/Enums';\nimport { Loan } from '../loan';\nimport { TankTypeEnum } from '../../db/Enums/tank-type.enum';\nimport { BankAccountBalance } from '../../db/Models';\nimport { FinancialYear } from '../financial-year';\nimport { BankAccountProperty } from './bank-account-property';\nimport { BankConnection } from './bank-connection';\nimport { Transform, Type } from 'class-transformer';\nimport { SoleBusinessAllocation } from '../sole';\nimport { Bank } from './bank';\n\nexport class BankAccount extends BankAccountBase {\n  // list of properties related with this bank account\n  @Type(() => BankAccountProperty)\n  bankAccountProperties: BankAccountProperty[];\n\n  @Type(() => SoleBusinessAllocation)\n  businessAllocations: SoleBusinessAllocation[]\n\n  @Type(() => BankAccountBalance)\n  balances: BankAccountBalance[];\n\n  // bank account's loan\n  @Type(() => Loan)\n  loan: Loan;\n\n  @Type(() => BankConnection)\n  bankConnection: BankConnection;\n\n  // @TODO Alex: temp hack: remove when TT-2107 ready. Backend shoud return Mortgage type as Loan type\n  @Transform(({ value }) => value === 4 ? BankAccountTypeEnum.LOAN : value)\n  type: BankAccountTypeEnum;\n\n  get bank(): Bank {\n    return this.bankConnection.bank;\n  }\n\n  get bsb(): string {\n    return this.accountNumber.slice(0, 6);\n  }\n\n  get number(): string {\n    return this.accountNumber.trim().slice(6);\n  }\n\n  /**\n   * Get last digits of account number\n   */\n  get partialAccountNumber(): string {\n    return `xxxx${this.accountNumber.slice(-4)}`;\n  }\n\n  /**\n   * Get current opening balance amount\n   */\n  getOpeningBalance(): number {\n    return this.getCurrentYearBalance()?.openingBalance || 0;\n  }\n\n  /**\n   * Get bank account balance for current financial year\n   */\n  getCurrentYearBalance(): BankAccountBalance {\n    const currentFinYear: number = new FinancialYear().year;\n    return this.balances.find((balance: BankAccountBalance): boolean => balance.financialYear === currentFinYear);\n  }\n\n  /**\n   * check if bank account type is one of savings accounts\n   */\n  isSavingsAccount(): boolean {\n    return this.type === BankAccountTypeEnum.INVESTMENT ||\n      this.type === BankAccountTypeEnum.TERM_DEPOSIT ||\n      this.type === BankAccountTypeEnum.SAVINGS;\n  }\n\n  /**\n   * check if bank account type is Loan\n   */\n  isLoan(): boolean {\n    return this.type === BankAccountTypeEnum.LOAN;\n  }\n\n  /**\n   * check if bank account type is Credit card\n   */\n  isCreditCard(): boolean {\n    return this.type === BankAccountTypeEnum.CREDIT_CARD;\n  }\n\n  /**\n   * check if bank account related to work tank\n   */\n  isWorkTank(): boolean {\n    return !this.isPropertyTank() && !this.isSoleTank();\n  }\n\n  /**\n   * check if bank account related to work tank\n   */\n  isPropertyTank(): boolean {\n    return !!this.bankAccountProperties.length;\n  }\n\n  /**\n   * check if bank account related to sole tank\n   */\n  isSoleTank(): boolean {\n    return !!this.businessAllocations.length;\n  }\n\n  get tankType(): TankTypeEnum {\n    switch (true) {\n      case this.isPropertyTank():\n        return TankTypeEnum.PROPERTY;\n      case this.isSoleTank():\n        return TankTypeEnum.SOLE;\n      default:\n        return TankTypeEnum.WORK;\n    }\n  }\n\n  /**\n   * Get Bank account property by id\n   * @param id Id of property\n   */\n  getPropertyById(id: number): BankAccountProperty {\n    return this.bankAccountProperties.find((bankAccountProperty: BankAccountProperty): boolean => bankAccountProperty.property.id === id);\n  }\n\n  /**\n   * check if bank account is related with passed property by id\n   * @param propertyId Property id for checking\n   */\n  hasProperty(propertyId: number): boolean {\n    return !!this.getPropertyById(propertyId);\n  }\n\n  /**\n   * Get decimal percentage for property\n   * @param propertyId Id of property\n   */\n  getPropertyPercentage(propertyId: number): number {\n    if (!this.hasProperty(propertyId)) {\n      return 0;\n    }\n\n    return this.getPropertyById(propertyId).percent / 100;\n  }\n\n  /**\n   * Get balance amount for property by id\n   * @param propertyId Id of property\n   */\n  getPropertyBalanceAmount(propertyId: number): number {\n    return this.currentBalance * this.getPropertyPercentage(propertyId);\n  }\n\n  getMonthlyRepaymentAmount(propertyId: number): number {\n    return this.loan ? this.loan.monthlyRepaymentAmount * this.getPropertyPercentage(propertyId): 0;\n  }\n\n  /**\n   * Check if bank account is active (has 'active' status or hasn't been paid out/refinanced)\n   */\n  isActive(): boolean {\n    return this.status === BankAccountStatusEnum.ACTIVE;\n  }\n\n  /**\n   * first import (transactions) of basiq accounts\n   */\n  isFirstImport(): boolean {\n    return !this.lastTransactionDate && !this.isManual;\n  }\n\n  /**\n   * Check if passed user id is owner of bank account\n   */\n  isOwner(userId: number): boolean {\n    return this.bankConnection.user.id === userId;\n  }\n\n  /**\n   * Loan is paid if it has no unallocated transactions and the bank balance is $0.\n   */\n  isLoanPaid(taxTankBalance: number): boolean {\n    const shouldPayoutLoanAccount: boolean = this.isActive() && this.isLoan() && taxTankBalance === 0;\n\n    // we don't check current balance for basiq accounts, because basiq doesn't provide us last transactions (can't do for closed accounts),\n    // that's why balance won't be 0 (updated by basiq)\n    if (shouldPayoutLoanAccount && this.isManual) {\n      return this.currentBalance === 0;\n    }\n\n    return shouldPayoutLoanAccount;\n  }\n}\n"]}
|
|
174
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bank-account.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/models/bank/bank-account.ts"],"names":[],"mappings":"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","sourcesContent":["import { BankAccount as BankAccountBase } from '../../db/Models/bank/bank-account';\nimport { BankAccountStatusEnum, BankAccountTypeEnum } from '../../db/Enums';\nimport { Loan } from '../loan';\nimport { TankTypeEnum } from '../../db/Enums/tank-type.enum';\nimport { BankAccountBalance } from '../../db/Models';\nimport { FinancialYear } from '../financial-year';\nimport { BankAccountProperty } from './bank-account-property';\nimport { BankConnection } from './bank-connection';\nimport { Transform, Type } from 'class-transformer';\nimport { SoleBusinessAllocation } from '../sole';\nimport { Bank } from './bank';\n\nexport class BankAccount extends BankAccountBase {\n  // list of properties related with this bank account\n  @Type(() => BankAccountProperty)\n  bankAccountProperties: BankAccountProperty[];\n\n  @Type(() => SoleBusinessAllocation)\n  businessAllocations: SoleBusinessAllocation[]\n\n  @Type(() => BankAccountBalance)\n  balances: BankAccountBalance[];\n\n  // bank account's loan\n  @Type(() => Loan)\n  loan: Loan;\n\n  @Type(() => BankConnection)\n  bankConnection: BankConnection;\n\n  // @TODO Alex: temp hack: remove when TT-2107 ready. Backend shoud return Mortgage type as Loan type\n  @Transform(({ value }) => value === 4 ? BankAccountTypeEnum.LOAN : value)\n  type: BankAccountTypeEnum;\n\n  get bank(): Bank {\n    return this.bankConnection.bank;\n  }\n\n  get bsb(): string {\n    return this.accountNumber.slice(0, 6);\n  }\n\n  get number(): string {\n    return this.accountNumber.trim().slice(6);\n  }\n\n  /**\n   * Get last digits of account number\n   */\n  get partialAccountNumber(): string {\n    return `xxxx${this.accountNumber.slice(-4)}`;\n  }\n\n  get balance(): number {\n    return FinancialYear.isCurrent() ? this.currentBalance : this.getOpeningBalance(FinancialYear.year + 1);\n  }\n\n  /**\n   * Get current opening balance amount\n   */\n  getOpeningBalance(year: number = FinancialYear.year): number {\n    return this.getBalanceByYear(year)?.openingBalance || 0;\n  }\n\n  /**\n   * Get bank account balance for current financial year\n   */\n  getBalanceByYear(year: number): BankAccountBalance {\n    return this.balances.find((balance: BankAccountBalance): boolean => balance.financialYear === year);\n  }\n\n  /**\n   * check if bank account type is one of savings accounts\n   */\n  isSavingsAccount(): boolean {\n    return this.type === BankAccountTypeEnum.INVESTMENT ||\n      this.type === BankAccountTypeEnum.TERM_DEPOSIT ||\n      this.type === BankAccountTypeEnum.SAVINGS;\n  }\n\n  /**\n   * check if bank account type is Loan\n   */\n  isLoan(): boolean {\n    return this.type === BankAccountTypeEnum.LOAN;\n  }\n\n  /**\n   * check if bank account type is Credit card\n   */\n  isCreditCard(): boolean {\n    return this.type === BankAccountTypeEnum.CREDIT_CARD;\n  }\n\n  /**\n   * check if bank account related to work tank\n   */\n  isWorkTank(): boolean {\n    return !this.isPropertyTank() && !this.isSoleTank();\n  }\n\n  /**\n   * check if bank account related to work tank\n   */\n  isPropertyTank(): boolean {\n    return !!this.bankAccountProperties.length;\n  }\n\n  /**\n   * check if bank account related to sole tank\n   */\n  isSoleTank(): boolean {\n    return !!this.businessAllocations.length;\n  }\n\n  get tankType(): TankTypeEnum {\n    switch (true) {\n      case this.isPropertyTank():\n        return TankTypeEnum.PROPERTY;\n      case this.isSoleTank():\n        return TankTypeEnum.SOLE;\n      default:\n        return TankTypeEnum.WORK;\n    }\n  }\n\n  /**\n   * Get Bank account property by id\n   * @param id Id of property\n   */\n  getPropertyById(id: number): BankAccountProperty {\n    return this.bankAccountProperties.find((bankAccountProperty: BankAccountProperty): boolean => bankAccountProperty.property.id === id);\n  }\n\n  /**\n   * check if bank account is related with passed property by id\n   * @param propertyId Property id for checking\n   */\n  hasProperty(propertyId: number): boolean {\n    return !!this.getPropertyById(propertyId);\n  }\n\n  /**\n   * Get decimal percentage for property\n   * @param propertyId Id of property\n   */\n  getPropertyPercentage(propertyId: number): number {\n    if (!this.hasProperty(propertyId)) {\n      return 0;\n    }\n\n    return this.getPropertyById(propertyId).percent / 100;\n  }\n\n  /**\n   * Get balance amount for property by id\n   * @param propertyId Id of property\n   */\n  getPropertyBalanceAmount(propertyId: number): number {\n    return this.currentBalance * this.getPropertyPercentage(propertyId);\n  }\n\n  getMonthlyRepaymentAmount(propertyId: number): number {\n    return this.loan ? this.loan.monthlyRepaymentAmount * this.getPropertyPercentage(propertyId): 0;\n  }\n\n  /**\n   * Check if bank account is active (has 'active' status or hasn't been paid out/refinanced)\n   */\n  isActive(): boolean {\n    return this.status === BankAccountStatusEnum.ACTIVE;\n  }\n\n  /**\n   * first import (transactions) of basiq accounts\n   */\n  isFirstImport(): boolean {\n    return !this.lastTransactionDate && !this.isManual;\n  }\n\n  /**\n   * Check if passed user id is owner of bank account\n   */\n  isOwner(userId: number): boolean {\n    return this.bankConnection.user.id === userId;\n  }\n\n  /**\n   * Loan is paid if it has no unallocated transactions and the bank balance is $0.\n   */\n  isLoanPaid(taxTankBalance: number): boolean {\n    const shouldPayoutLoanAccount: boolean = this.isActive() && this.isLoan() && taxTankBalance === 0;\n\n    // we don't check current balance for basiq accounts, because basiq doesn't provide us last transactions (can't do for closed accounts),\n    // that's why balance won't be 0 (updated by basiq)\n    if (shouldPayoutLoanAccount && this.isManual) {\n      return this.currentBalance === 0;\n    }\n\n    return shouldPayoutLoanAccount;\n  }\n}\n"]}
|
|
@@ -6,11 +6,14 @@ export class FinancialYear {
|
|
|
6
6
|
this.year = date instanceof Date ? FinancialYear.toFinYear(date) : date;
|
|
7
7
|
}
|
|
8
8
|
else {
|
|
9
|
-
this.year =
|
|
9
|
+
this.year = FinancialYear.year || FinancialYear.toFinYear(new Date());
|
|
10
10
|
}
|
|
11
11
|
this.setStartDate(this.year);
|
|
12
12
|
this.setEndDate(this.year);
|
|
13
13
|
}
|
|
14
|
+
static isCurrent(year = FinancialYear.year) {
|
|
15
|
+
return FinancialYear.toFinYear(new Date()) === year;
|
|
16
|
+
}
|
|
14
17
|
includes(date) {
|
|
15
18
|
return this.year === new FinancialYear(date).year;
|
|
16
19
|
}
|
|
@@ -48,4 +51,5 @@ export class FinancialYear {
|
|
|
48
51
|
FinancialYear.weeksInYear = 52;
|
|
49
52
|
FinancialYear.monthsInYear = 12;
|
|
50
53
|
FinancialYear.startMonthIndex = 6;
|
|
51
|
-
|
|
54
|
+
FinancialYear.year = +localStorage.getItem('financialYear');
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmluYW5jaWFsLXllYXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvbW9kZWxzL2ZpbmFuY2lhbC15ZWFyL2ZpbmFuY2lhbC15ZWFyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE1BQU0sT0FBTyxhQUFhO0lBWXhCLFlBQVksSUFBa0I7UUFIdEIsa0JBQWEsR0FBRyxRQUFRLENBQUM7UUFDekIsZ0JBQVcsR0FBRyxRQUFRLENBQUM7UUFHN0IsSUFBSSxJQUFJLEVBQUU7WUFDUixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksWUFBWSxJQUFJLENBQUMsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztTQUN6RTthQUFNO1lBQ0wsSUFBSSxDQUFDLElBQUksR0FBRyxhQUFhLENBQUMsSUFBSSxJQUFJLGFBQWEsQ0FBQyxTQUFTLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1NBQ3ZFO1FBRUQsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDN0IsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDN0IsQ0FBQztJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsT0FBZSxhQUFhLENBQUMsSUFBSTtRQUNoRCxPQUFPLGFBQWEsQ0FBQyxTQUFTLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQyxLQUFLLElBQUksQ0FBQztJQUN0RCxDQUFDO0lBRUQsUUFBUSxDQUFDLElBQVU7UUFDakIsT0FBTyxJQUFJLENBQUMsSUFBSSxLQUFLLElBQUksYUFBYSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQztJQUNwRCxDQUFDO0lBRUQsTUFBTSxDQUFDLFNBQVMsQ0FBQyxJQUFVO1FBQ3pCLE9BQU8sSUFBSSxDQUFDLFdBQVcsRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxJQUFJLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDaEYsQ0FBQztJQUVELElBQUksV0FBVztRQUNiLE9BQU8sSUFBSSxhQUFhLENBQUMsSUFBSSxJQUFJLENBQUMsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRSxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzdGLENBQUM7SUFFRDs7T0FFRztJQUNILFlBQVksQ0FBQyxVQUFrQjtRQUM3QixJQUFJLFVBQVUsSUFBSSxhQUFhLENBQUMsZUFBZSxFQUFFO1lBQy9DLE9BQU8sSUFBSSxJQUFJLENBQUMsR0FBRyxJQUFJLENBQUMsSUFBSSxHQUFHLENBQUMsSUFBSSxVQUFVLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQztTQUMxRDtRQUNELE9BQU8sSUFBSSxJQUFJLENBQUMsR0FBRyxJQUFJLENBQUMsSUFBSSxJQUFJLFVBQVUsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3ZELENBQUM7SUFFTyxZQUFZLENBQUMsSUFBWTtRQUMvQixJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksSUFBSSxDQUFDLEdBQUcsSUFBSSxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUMsQ0FBQztJQUNoRSxDQUFDO0lBRU8sVUFBVSxDQUFDLElBQVk7UUFDN0IsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLElBQUksQ0FBQyxHQUFHLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBRUQsYUFBYTtRQUNYLE1BQU0sTUFBTSxHQUFhLEVBQUUsQ0FBQztRQUM1QixNQUFNLEdBQUcsR0FBUyxJQUFJLElBQUksRUFBRSxDQUFDO1FBQzdCLE1BQU0sT0FBTyxHQUFTLElBQUksQ0FBQyxPQUFPLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUM7UUFDOUQsS0FBSyxNQUFNLENBQUMsR0FBUyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUMsSUFBSSxPQUFPLEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLEdBQUcsQ0FBQyxDQUFDLEVBQUU7WUFDL0UsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztTQUMzQjtRQUVELE9BQU8sTUFBTSxDQUFDO0lBQ2hCLENBQUM7O0FBakVNLHlCQUFXLEdBQUcsRUFBRSxDQUFDO0FBQ2pCLDBCQUFZLEdBQUcsRUFBRSxDQUFDO0FBQ2xCLDZCQUFlLEdBQUcsQ0FBQyxDQUFDO0FBQ3BCLGtCQUFJLEdBQVcsQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGNsYXNzIEZpbmFuY2lhbFllYXIge1xyXG4gIHN0YXRpYyB3ZWVrc0luWWVhciA9IDUyO1xyXG4gIHN0YXRpYyBtb250aHNJblllYXIgPSAxMjtcclxuICBzdGF0aWMgc3RhcnRNb250aEluZGV4ID0gNjtcclxuICBzdGF0aWMgeWVhcjogbnVtYmVyID0gK2xvY2FsU3RvcmFnZS5nZXRJdGVtKCdmaW5hbmNpYWxZZWFyJyk7XHJcbiAgeWVhcjogbnVtYmVyO1xyXG4gIHN0YXJ0RGF0ZTogRGF0ZTtcclxuICBlbmREYXRlOiBEYXRlO1xyXG5cclxuICBwcml2YXRlIHllYXJTdGFydERhdGUgPSAnLTA3LTAxJztcclxuICBwcml2YXRlIHllYXJFbmREYXRlID0gJy0wNi0zMCc7XHJcblxyXG4gIGNvbnN0cnVjdG9yKGRhdGU/OiBEYXRlfG51bWJlcikge1xyXG4gICAgaWYgKGRhdGUpIHtcclxuICAgICAgdGhpcy55ZWFyID0gZGF0ZSBpbnN0YW5jZW9mIERhdGUgPyBGaW5hbmNpYWxZZWFyLnRvRmluWWVhcihkYXRlKSA6IGRhdGU7XHJcbiAgICB9IGVsc2Uge1xyXG4gICAgICB0aGlzLnllYXIgPSBGaW5hbmNpYWxZZWFyLnllYXIgfHwgRmluYW5jaWFsWWVhci50b0ZpblllYXIobmV3IERhdGUoKSk7XHJcbiAgICB9XHJcblxyXG4gICAgdGhpcy5zZXRTdGFydERhdGUodGhpcy55ZWFyKTtcclxuICAgIHRoaXMuc2V0RW5kRGF0ZSh0aGlzLnllYXIpO1xyXG4gIH1cclxuXHJcbiAgc3RhdGljIGlzQ3VycmVudCh5ZWFyOiBudW1iZXIgPSBGaW5hbmNpYWxZZWFyLnllYXIpOiBib29sZWFuIHtcclxuICAgIHJldHVybiBGaW5hbmNpYWxZZWFyLnRvRmluWWVhcihuZXcgRGF0ZSgpKSA9PT0geWVhcjtcclxuICB9XHJcblxyXG4gIGluY2x1ZGVzKGRhdGU6IERhdGUpOiBib29sZWFuIHtcclxuICAgIHJldHVybiB0aGlzLnllYXIgPT09IG5ldyBGaW5hbmNpYWxZZWFyKGRhdGUpLnllYXI7XHJcbiAgfVxyXG5cclxuICBzdGF0aWMgdG9GaW5ZZWFyKGRhdGU6IERhdGUpOiBudW1iZXIge1xyXG4gICAgcmV0dXJuIGRhdGUuZ2V0RnVsbFllYXIoKSArIChkYXRlLmdldE1vbnRoKCkgPj0gdGhpcy5zdGFydE1vbnRoSW5kZXggPyAxIDogMCk7XHJcbiAgfVxyXG5cclxuICBnZXQgcHJldkZpblllYXIoKTogRmluYW5jaWFsWWVhciB7XHJcbiAgICByZXR1cm4gbmV3IEZpbmFuY2lhbFllYXIobmV3IERhdGUoYCR7bmV3IERhdGUoKS5nZXRGdWxsWWVhcigpIC0gMX0ke3RoaXMueWVhclN0YXJ0RGF0ZX1gKSk7XHJcbiAgfVxyXG5cclxuICAvKipcclxuICAgKiBHZXQgZGF0ZSBieSBkZXNpcmVkIG1vbnRoXHJcbiAgICovXHJcbiAgZ2V0TW9udGhEYXRlKG1vbnRoSW5kZXg6IG51bWJlcik6IERhdGUge1xyXG4gICAgaWYgKG1vbnRoSW5kZXggPj0gRmluYW5jaWFsWWVhci5zdGFydE1vbnRoSW5kZXgpIHtcclxuICAgICAgcmV0dXJuIG5ldyBEYXRlKGAke3RoaXMueWVhciAtIDF9LSR7bW9udGhJbmRleCArIDF9LTAxYCk7XHJcbiAgICB9XHJcbiAgICByZXR1cm4gbmV3IERhdGUoYCR7dGhpcy55ZWFyfS0ke21vbnRoSW5kZXggKyAxfS0wMWApO1xyXG4gIH1cclxuXHJcbiAgcHJpdmF0ZSBzZXRTdGFydERhdGUoeWVhcjogbnVtYmVyKTogdm9pZCB7XHJcbiAgICB0aGlzLnN0YXJ0RGF0ZSA9IG5ldyBEYXRlKGAke3llYXIgLSAxfSR7dGhpcy55ZWFyU3RhcnREYXRlfWApO1xyXG4gIH1cclxuXHJcbiAgcHJpdmF0ZSBzZXRFbmREYXRlKHllYXI6IG51bWJlcik6IHZvaWQge1xyXG4gICAgdGhpcy5lbmREYXRlID0gbmV3IERhdGUoYCR7eWVhcn0ke3RoaXMueWVhckVuZERhdGV9YCk7XHJcbiAgfVxyXG5cclxuICBnZXRQYXN0TW9udGhzKCk6IG51bWJlcltdIHtcclxuICAgIGNvbnN0IG1vbnRoczogbnVtYmVyW10gPSBbXTtcclxuICAgIGNvbnN0IG5vdzogRGF0ZSA9IG5ldyBEYXRlKCk7XHJcbiAgICBjb25zdCBlbmREYXRlOiBEYXRlID0gdGhpcy5lbmREYXRlIDwgbm93ID8gdGhpcy5lbmREYXRlIDogbm93O1xyXG4gICAgZm9yIChjb25zdCBkOiBEYXRlID0gdGhpcy5zdGFydERhdGU7IGQgPD0gZW5kRGF0ZTsgZC5zZXRNb250aChkLmdldE1vbnRoKCkgKyAxKSkge1xyXG4gICAgICBtb250aHMucHVzaChkLmdldE1vbnRoKCkpO1xyXG4gICAgfVxyXG5cclxuICAgIHJldHVybiBtb250aHM7XHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -46,7 +46,8 @@ export class SoleForecastService extends RestService {
|
|
|
46
46
|
.subscribe((incomeSources) => {
|
|
47
47
|
const soleForecasts = this.assignSoleForecasts(incomeSources);
|
|
48
48
|
if (soleForecasts.length) {
|
|
49
|
-
|
|
49
|
+
const method = soleForecasts[0].id ? 'updateBatch' : 'addBatch';
|
|
50
|
+
this[method](soleForecasts).subscribe((updatedSoleForecasts) => {
|
|
50
51
|
this.eventDispatcherService
|
|
51
52
|
.dispatch(new AppEvent(AppEventTypeEnum.INCOME_SOURCES_FORECASTS_UPDATED, updatedSoleForecasts));
|
|
52
53
|
});
|
|
@@ -84,4 +85,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImpor
|
|
|
84
85
|
providedIn: 'root'
|
|
85
86
|
}]
|
|
86
87
|
}] });
|
|
87
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sole-forecast.service.js","sourceRoot":"","sources":["../../../../../../../../projects/tt-core/src/lib/services/http/income-source/sole-forecast/sole-forecast.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { map } from 'rxjs/operators';\nimport { SoleForecast as SoleForecastBase } from '../../../../db/Models/sole/sole-forecast';\nimport { plainToClass } from 'class-transformer';\nimport { RestService } from '../../rest/rest-old.service';\nimport { SoleForecast } from '../../../../models/income-source/sole-forecast';\nimport { AppEventTypeEnum } from '../../../../models/event/app-event-type.enum';\nimport { IncomeSource } from '../../../../models/income-source/income-source';\nimport { AppEvent } from '../../../../models/event/app-event';\nimport { IEventListener } from '../../../../interfaces/event-listener.interface';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class SoleForecastService extends RestService<SoleForecastBase, SoleForecast> implements IEventListener {\n  modelClass: typeof SoleForecast = SoleForecast;\n  url = 'sole-forecasts';\n\n  /**\n   * Listen to Income Sources events\n   */\n  listenEvents(): void {\n    this.listenToAddedIncomeSources();\n    this.listenToUpdatedIncomeSources();\n    this.listenBusinessCreated();\n  }\n\n  /**\n   * Listen to EventDispatcherService event related to added Income Sources\n   */\n  private listenToAddedIncomeSources(): void {\n    this.eventDispatcherService.on(AppEventTypeEnum.INCOME_SOURCES_CREATED)\n      .pipe(\n        map((incomeSources: IncomeSource[]) => incomeSources\n          .filter((incomeSource: IncomeSource) => incomeSource.isSoleIncome()))\n      )\n      .subscribe((incomeSources: IncomeSource[]) => {\n\n        const soleForecasts: SoleForecast[] = this.assignSoleForecasts(incomeSources);\n        if (soleForecasts.length) {\n          this.addBatch(soleForecasts).subscribe((createdSoleForecasts: SoleForecast[]) => {\n            this.eventDispatcherService\n              .dispatch(new AppEvent(AppEventTypeEnum.INCOME_SOURCES_FORECASTS_CREATED, createdSoleForecasts));\n          });\n        }\n      });\n  }\n\n  /**\n   * Listen to EventDispatcherService event related to updated Income Sources\n   */\n  private listenToUpdatedIncomeSources(): void {\n    this.eventDispatcherService.on(AppEventTypeEnum.INCOME_SOURCES_UPDATED)\n      .subscribe((incomeSources: IncomeSource[]) => {\n        const soleForecasts: SoleForecast[] = this.assignSoleForecasts(incomeSources);\n        if (soleForecasts.length) {\n          const method = soleForecasts[0].id ? 'updateBatch' : 'addBatch';\n          this[method](soleForecasts).subscribe((updatedSoleForecasts: SoleForecast[]) => {\n            this.eventDispatcherService\n              .dispatch(new AppEvent(AppEventTypeEnum.INCOME_SOURCES_FORECASTS_UPDATED, updatedSoleForecasts));\n          });\n        }\n      });\n  }\n\n  /**\n   * Assign sole forecasts based on provided income sources\n   * @param incomeSources by which sole forecasts will be assigned\n   */\n  private assignSoleForecasts(incomeSources: IncomeSource[]): SoleForecast[] {\n    return incomeSources.map((incomeSource: IncomeSource) => {\n      incomeSource.soleForecasts = incomeSource.soleForecasts\n        .map((soleForecast: SoleForecast) => {\n          soleForecast.incomeSource = plainToClass(IncomeSource, { id: incomeSource.id });\n          return soleForecast;\n        });\n      return incomeSource.soleForecasts;\n    }).flat();\n  }\n\n  /**\n   * Listen business created because we create sole forests together with business\n   */\n  private listenBusinessCreated() {\n    this.eventDispatcherService.on(AppEventTypeEnum.SOLE_BUSINESS_CREATED).subscribe(() => {\n      this.refreshCache();\n    })\n  }\n}\n"]}
|
|
@@ -1571,11 +1571,14 @@ class FinancialYear {
|
|
|
1571
1571
|
this.year = date instanceof Date ? FinancialYear.toFinYear(date) : date;
|
|
1572
1572
|
}
|
|
1573
1573
|
else {
|
|
1574
|
-
this.year =
|
|
1574
|
+
this.year = FinancialYear.year || FinancialYear.toFinYear(new Date());
|
|
1575
1575
|
}
|
|
1576
1576
|
this.setStartDate(this.year);
|
|
1577
1577
|
this.setEndDate(this.year);
|
|
1578
1578
|
}
|
|
1579
|
+
static isCurrent(year = FinancialYear.year) {
|
|
1580
|
+
return FinancialYear.toFinYear(new Date()) === year;
|
|
1581
|
+
}
|
|
1579
1582
|
includes(date) {
|
|
1580
1583
|
return this.year === new FinancialYear(date).year;
|
|
1581
1584
|
}
|
|
@@ -1613,6 +1616,7 @@ class FinancialYear {
|
|
|
1613
1616
|
FinancialYear.weeksInYear = 52;
|
|
1614
1617
|
FinancialYear.monthsInYear = 12;
|
|
1615
1618
|
FinancialYear.startMonthIndex = 6;
|
|
1619
|
+
FinancialYear.year = +localStorage.getItem('financialYear');
|
|
1616
1620
|
|
|
1617
1621
|
/**
|
|
1618
1622
|
* @TODO move to pipe/translation
|
|
@@ -9584,19 +9588,21 @@ class BankAccount extends BankAccount$1 {
|
|
|
9584
9588
|
get partialAccountNumber() {
|
|
9585
9589
|
return `xxxx${this.accountNumber.slice(-4)}`;
|
|
9586
9590
|
}
|
|
9591
|
+
get balance() {
|
|
9592
|
+
return FinancialYear.isCurrent() ? this.currentBalance : this.getOpeningBalance(FinancialYear.year + 1);
|
|
9593
|
+
}
|
|
9587
9594
|
/**
|
|
9588
9595
|
* Get current opening balance amount
|
|
9589
9596
|
*/
|
|
9590
|
-
getOpeningBalance() {
|
|
9597
|
+
getOpeningBalance(year = FinancialYear.year) {
|
|
9591
9598
|
var _a;
|
|
9592
|
-
return ((_a = this.
|
|
9599
|
+
return ((_a = this.getBalanceByYear(year)) === null || _a === void 0 ? void 0 : _a.openingBalance) || 0;
|
|
9593
9600
|
}
|
|
9594
9601
|
/**
|
|
9595
9602
|
* Get bank account balance for current financial year
|
|
9596
9603
|
*/
|
|
9597
|
-
|
|
9598
|
-
|
|
9599
|
-
return this.balances.find((balance) => balance.financialYear === currentFinYear);
|
|
9604
|
+
getBalanceByYear(year) {
|
|
9605
|
+
return this.balances.find((balance) => balance.financialYear === year);
|
|
9600
9606
|
}
|
|
9601
9607
|
/**
|
|
9602
9608
|
* check if bank account type is one of savings accounts
|
|
@@ -13095,7 +13101,8 @@ class SoleForecastService extends RestService {
|
|
|
13095
13101
|
.subscribe((incomeSources) => {
|
|
13096
13102
|
const soleForecasts = this.assignSoleForecasts(incomeSources);
|
|
13097
13103
|
if (soleForecasts.length) {
|
|
13098
|
-
|
|
13104
|
+
const method = soleForecasts[0].id ? 'updateBatch' : 'addBatch';
|
|
13105
|
+
this[method](soleForecasts).subscribe((updatedSoleForecasts) => {
|
|
13099
13106
|
this.eventDispatcherService
|
|
13100
13107
|
.dispatch(new AppEvent(AppEventTypeEnum.INCOME_SOURCES_FORECASTS_UPDATED, updatedSoleForecasts));
|
|
13101
13108
|
});
|