taxtank-core 2.1.57 → 2.1.60

package/index.d.ts

@@ -1511,13 +1511,14 @@ declare class Loan$1 extends ObservableModel {
 
 declare abstract class TransactionBase extends ObservableModel {
     amount?: number;
-    foreignAmount?: number;
     file: AppFile;
     property?: Property;
     business?: SoleBusiness$1;
     date?: Date;
     chartAccounts?: ChartAccounts$1;
     description?: string;
+    currency?: string;
+    exchangeRate?: number;
     /**
      * gst applies to sole trader expense/income, if he is registered and chartAccounts is eligible
      */
@@ -1545,6 +1546,8 @@ declare abstract class TransactionBase extends ObservableModel {
      */
     get grossAmount(): number;
     get grossClaimAmount(): number;
+    get isForeign(): boolean;
+    get foreignAmount(): number;
 }
 
 declare enum DepreciationTypeEnum {
@@ -1667,9 +1670,6 @@ declare class Transaction$1 extends TransactionBase {
     business?: SoleBusiness$1;
     isGST?: boolean;
     invoiceItem?: SoleInvoiceItem$1;
-    currency?: string;
-    foreignAmount?: number;
-    exchangeRate?: number;
 }
 
 declare class SoleInvoiceItem$1 extends AbstractModel {
@@ -4087,11 +4087,13 @@ declare class BankAccount$1 extends BankAccount {
     bankAccountProperties: BankAccountProperty[];
     businessAllocations: SoleBusinessAllocation[];
     balances: BankAccountBalance[];
+    currentBalance: number;
     loan: Loan;
     bankConnection: BankConnection$1;
     migrateFrom: Date;
     migrateTo: Date;
     currency: string;
+    exchangeRate: number;
     get bank(): Bank;
     get bsb(): string;
     get number(): string;
@@ -4099,12 +4101,15 @@ declare class BankAccount$1 extends BankAccount {
      * Get last digits of account number
      */
     get partialAccountNumber(): string;
+    /**
+     * @TODO remove after tests
+     */
     get balance(): number;
     getBadge(): Badge | null;
     /**
      * Get the current opening balance amount
      */
-    getOpeningBalance(year?: number): number;
+    getOpeningBalance(year?: number, convertToAud?: boolean): number;
     /**
      * Get bank account balance for current financial year
      */
@@ -4177,6 +4182,7 @@ declare class BankAccount$1 extends BankAccount {
     isLoanPaid(taxTankBalance: number): boolean;
     isManual(): boolean;
     get isForeign(): boolean;
+    get convertedBalance(): number;
 }
 
 declare class SoleBusinessAllocation extends SoleBusinessAllocation$1 {
@@ -8967,17 +8973,15 @@ declare class AssetsService {
     static ɵprov: i0.ɵɵInjectableDeclaration<AssetsService>;
 }
 
+/**
+ * @TODO move to BankAccountCollection
+ */
 declare class BankAccountCalculationService {
     /**
      * Sum of bank accounts opening balances and their bank transactions allocated amounts
      */
-    getTaxTankBalance(bankAccounts: BankAccountCollection, bankTransactions: BankTransactionCollection, allocations: TransactionAllocationCollection, exchangeRateByCurrency?: Dictionary<ExchangeRate>, excludeOpenBalance?: boolean): number;
-    getCashIn(bankAccounts: BankAccountCollection, bankTransactions: BankTransactionCollection, allocations: TransactionAllocationCollection, exchangeRateByCurrency: Dictionary<ExchangeRate>): number;
-    getCashOut(bankAccounts: BankAccountCollection, bankTransactions: BankTransactionCollection, allocations: TransactionAllocationCollection, exchangeRateByCurrency: Dictionary<ExchangeRate>): number;
-    /**
-     * get difference between total loans amount and total cash amount
-     */
-    getNetPosition(bankAccounts: BankAccountCollection, bankTransactions: BankTransactionCollection, allocations: TransactionAllocationCollection): number;
+    getTaxTankBalance(bankAccounts: BankAccountCollection, bankTransactions: BankTransactionCollection, allocations: TransactionAllocationCollection, convertToAud?: boolean): number;
+    getAllocatedAmount(bankAccounts: BankAccountCollection, bankTransactions: BankTransactionCollection, allocations: TransactionAllocationCollection, convertToAud?: boolean): number;
     static ɵfac: i0.ɵɵFactoryDeclaration<BankAccountCalculationService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<BankAccountCalculationService>;
 }
@@ -11332,6 +11336,7 @@ declare class BankAccount extends ObservableModel {
     bankTransactions?: BankTransaction$1[];
     balances?: BankAccountBalance[];
     loan?: Loan$1;
+    exchangeRate: number;
 }
 
 declare class BankAccountBalance extends AbstractModel {
@@ -11450,6 +11455,7 @@ declare class Collection<Model extends object> implements Iterable<Model> {
     getIds(): number[];
     map(callback: (item: Model) => any): any[];
     mapBy(path: string): any[];
+    uniqMapBy(path: string): any;
     sortBy(paths?: string | string[], order?: string | string[]): this;
     sort(callback: (a: Model, b: Model) => number): this;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "2.1.57",
+  "version": "2.1.60",
   "private": false,
   "peerDependencies": {
     "@angular/common": "^20.1.3",