taxtank-core 0.33.6 → 0.33.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "0.33.6",
+  "version": "0.33.8",
   "private": false,
   "peerDependencies": {
     "@angular/common": "^17.0.0",

package/src/lib/collections/bank-account.collection.d.ts

@@ -1,5 +1,4 @@
 import { Collection } from './collection';
-import { BankAccountTypeEnum } from '../db/Enums';
 import { TankTypeEnum } from '../db/Enums/tank-type.enum';
 import { BankAccount, BankAccountProperty, Property } from '../models';
 import { CollectionDictionary } from './collection-dictionary';
@@ -8,14 +7,6 @@ import { LoanCollection } from './loan';
  * Collection of bank accounts.
  */
 export declare class BankAccountCollection extends Collection<BankAccount> {
-    /**
-     * get list of bank accounts with passed types
-     */
-    getByType(types: BankAccountTypeEnum | BankAccountTypeEnum[], isExclude?: boolean): BankAccount[];
-    /**
-     * get amount of current loans
-     */
-    getCurrentLoanAmount(): number;
     /**
      * get collection filtered by property id
      */
@@ -30,23 +21,12 @@ export declare class BankAccountCollection extends Collection<BankAccount> {
      * get collection of active bank accounts
      */
     getActive(): BankAccountCollection;
-    /**
-     * Get collection of loan bank accounts
-     */
     getLoanAccounts(): BankAccountCollection;
+    getDebitAccounts(): BankAccountCollection;
     get loans(): LoanCollection;
-    getSavingsAccounts(): BankAccountCollection;
     getOpeningBalance(): number;
     get currentBalance(): number;
     get bankShortNames(): string;
-    /**
-     * Get Collection of bank accounts with property tank type
-     */
-    getPropertyBankAccounts(): BankAccountCollection;
-    /**
-     * Get Collection of bank accounts with work tank type
-     */
-    getWorkBankAccounts(): BankAccountCollection;
     /**
      * Get Collection of bank accounts by tank type
      */

package/src/lib/collections/depreciation.collection.d.ts

@@ -1,13 +1,14 @@
 import { TankTypeEnum } from '../db/Enums/tank-type.enum';
-import { Collection } from './collection';
 import { Depreciation } from '../models';
 import { DepreciationCapitalProject } from '../models';
 import { TransactionCollection } from './transaction';
 import { ChartAccountsCategoryEnum } from '../db/Enums';
 import { VehicleClaim } from '../models';
-export declare class DepreciationCollection extends Collection<Depreciation> {
+import { TransactionBaseCollection } from './transaction';
+import { ExportCell } from '../models/export/export-cell';
+export declare class DepreciationCollection extends TransactionBaseCollection<Depreciation> {
     getSoleDepreciations(): this;
-    getNew(): this;
+    getCurrentYearBuy(): this;
     /**
      * Get total amount of all depreciations in the collection
      */
@@ -44,4 +45,6 @@ export declare class DepreciationCollection extends Collection<Depreciation> {
      * Get depreciations by vehicle claim. Only vehicle depreciations may be related to vehicle claim
      */
     getByVehicleClaim(vehicleClaim: VehicleClaim): this;
+    getExportBody(params: object): ExportCell[][];
+    getExportHeader(): string[];
 }

package/src/lib/collections/exportable.collection.d.ts

@@ -1,10 +1,10 @@
 import { Collection } from './collection';
 import { ExportDataTable } from '../models/export/export-data-table';
 import { ExportCell } from '../models/export/export-cell';
-import { AbstractModel } from '../db/Models/abstract-model';
+import { AbstractModel } from '../db/Models';
 export declare abstract class ExportableCollection<Model extends AbstractModel> extends Collection<Model> {
     abstract getExportHeader(): string[];
-    abstract getExportBody(params: {}): ExportCell[][];
+    abstract getExportBody(params: object): ExportCell[][];
     getExportFooter(): ExportCell[];
     getBodyAoa(exportData: any): any;
     export(params?: any): ExportDataTable;

package/src/lib/collections/property/property.collection.d.ts

@@ -20,7 +20,7 @@ export declare class PropertyCollection extends Collection<Property> {
     get purchasePrice(): number;
     get growthPercent(): number;
     get marketValue(): number;
-    get marketValueGrowth(): number;
+    get sharedMarketValue(): number;
     /**
      * Get list of unique property categories from collection
      */

package/src/lib/collections/transaction/index.d.ts

@@ -1,2 +1,3 @@
 export * from './transaction.collection';
 export * from './transaction-allocation.collection';
+export * from './transaction-base.collection';

package/src/lib/collections/transaction/transaction-base.collection.d.ts

@@ -0,0 +1,4 @@
+import { ExportableCollection } from '../exportable.collection';
+import { TransactionBase } from '../../db/Models';
+export declare abstract class TransactionBaseCollection<Model extends TransactionBase> extends ExportableCollection<Model> {
+}

package/src/lib/collections/transaction/transaction.collection.d.ts

@@ -2,16 +2,16 @@ import { Dictionary, Transaction, TransactionMetaField, VehicleClaim } from '../
 import { TransactionAllocationCollection } from './transaction-allocation.collection';
 import { ChartAccountsCategoryEnum } from '../../db/Enums';
 import { TankTypeEnum } from '../../db/Enums/tank-type.enum';
-import { ExportableCollection } from '../exportable.collection';
 import { ExportCell } from '../../models/export/export-cell';
 import { Collection } from '../collection';
 import { ChartData } from '../../models/chart/chart-data';
 import { Depreciation } from '../../models';
 import { SoleInvoiceCollection } from '../sole';
+import { TransactionBaseCollection } from './transaction-base.collection';
 /**
  * Collection of transactions
  */
-export declare class TransactionCollection extends ExportableCollection<Transaction> {
+export declare class TransactionCollection extends TransactionBaseCollection<Transaction> {
     /**
      * we use depreciations as expense transactions a lot
      */

package/src/lib/db/Enums/bank/bank-account-type.enum.d.ts

@@ -2,6 +2,7 @@ export declare enum BankAccountTypeEnum {
     TRANSACTION = 1,
     SAVINGS = 2,
     CREDIT_CARD = 3,
+    MORTGAGE = 4,
     LOAN = 5,
     INVESTMENT = 6,
     TERM_DEPOSIT = 7,

package/src/lib/db/Models/bank/bank-account.d.ts

@@ -16,7 +16,6 @@ export declare class BankAccount extends ObservableModel {
     accountNumber?: string;
     currentBalance?: number;
     currency?: string;
-    isManual?: boolean;
     migrateFrom?: Date;
     migrateTo?: Date;
     lastTransactionDate?: Date;

package/src/lib/db/Models/transaction/transaction-base.d.ts

@@ -25,17 +25,8 @@ export declare abstract class TransactionBase extends ObservableModel {
      * @TODO remove when AllocateForm is refactored and not merging with Transaction class which cause the issue
      */
     set tankType(tankType: TankTypeEnum);
-    /**
-     * Check if current tank is Property
-     */
     isPropertyTank(): boolean;
-    /**
-     * Check if current tank is Work
-     */
     isWorkTank(): boolean;
-    /**
-     * Check if current tank is Sole
-     */
     isSoleTank(): boolean;
     isHoldingTank(): boolean;
     isOtherTank(): boolean;

package/src/lib/forms/transaction/transaction-base-filter.form.d.ts

@@ -2,17 +2,18 @@ import { FormControl, FormGroup } from '@angular/forms';
 import { ControlsInterface } from '../abstract.form';
 import { Collection } from '../../collections';
 import { TankTypeEnum } from '../../db/Enums/tank-type.enum';
-import { SoleBusiness } from '../../models';
+import { Property, SoleBusiness } from '../../models';
 import { IEventListener } from '../../interfaces';
 import { TransactionBase } from '../../db/Models';
 interface ITransactionBaseFilterControls extends ControlsInterface {
     tankType: FormControl<TankTypeEnum>;
     business: FormControl<SoleBusiness>;
+    properties: FormControl<Property[]>;
     dateFrom: FormControl<Date>;
     dateTo: FormControl<Date>;
 }
 export declare class TransactionBaseFilterForm extends FormGroup<ITransactionBaseFilterControls> implements IEventListener {
-    constructor(tankType?: TankTypeEnum, business?: SoleBusiness);
+    constructor(tankType?: TankTypeEnum, business?: SoleBusiness, properties?: Property[]);
     listenEvents(): void;
     filter<ModelClass extends TransactionBase, CollectionClass extends Collection<ModelClass>>(collection: CollectionClass): CollectionClass;
 }

package/src/lib/models/bank/bank-account.d.ts

@@ -92,4 +92,5 @@ export declare class BankAccount extends BankAccountBase {
      * Loan is paid if it has no unallocated transactions and the bank balance is $0.
      */
     isLoanPaid(taxTankBalance: number): boolean;
+    isManual(): boolean;
 }

package/src/lib/models/bank/type-loan.const.d.ts

@@ -1,5 +1,2 @@
 import { BankAccountTypeEnum } from '../../db/Enums';
-/**
- * @TODO credit card has nothing to do with loan
- */
 export declare const TYPE_LOAN: BankAccountTypeEnum[];

package/src/lib/models/depreciation/depreciation.d.ts

@@ -10,8 +10,8 @@ import { Expense } from '../../interfaces';
  * @TODO Alex: clarify grouping rules and refactor
  */
 export declare class Depreciation extends DepreciationBase implements Expense {
-    static WRITTEN_OFF_THRESHOLD: number;
-    static LOW_VALUE_POOL_THRESHOLD: number;
+    static writtenOffThreshold: number;
+    static lowValuePoolThreshold: number;
     purchaseDate: Date;
     date: Date;
     lowValuePoolDate: Date;
@@ -22,9 +22,6 @@ export declare class Depreciation extends DepreciationBase implements Expense {
     chartAccounts: ChartAccounts;
     bankTransaction: BankTransaction;
     type: DepreciationTypeEnum;
-    /**
-     * @TODO remove after ? signs removed from db models
-     */
     amount: number;
     isCapital(): boolean;
     isBorrowingExpense(): boolean;
@@ -41,10 +38,6 @@ export declare class Depreciation extends DepreciationBase implements Expense {
      * Check if depreciation chart accounts heading related to vehicles category
      */
     isVehicleDepreciation(): boolean;
-    /**
-     * Get depreciation purchase date
-     */
-    getDate(): Date;
     /**
      * @TODO Vik: Research a problem with depreciations without current year forecast
      */
@@ -52,7 +45,6 @@ export declare class Depreciation extends DepreciationBase implements Expense {
     getForecastByYear(year: number): DepreciationForecast;
     getClaimAmountByYear(year: number): number;
     getCloseBalanceByYear(year: number): number;
-    isBuildingAtCost(): boolean;
     /**
      * Create a new transaction from current depreciation
      */
@@ -66,5 +58,5 @@ export declare class Depreciation extends DepreciationBase implements Expense {
     /**
      * assets purchased in the current financial year
      */
-    isNew(): boolean;
+    isCurrentYearBuy(): boolean;
 }

package/src/lib/models/property/property.d.ts

@@ -49,7 +49,6 @@ export declare class Property extends PropertyBase {
     get forecastedRentalReturn(): number;
     get forecastedTaxPosition(): number;
     get forecastedCashPosition(): number;
-    get marketValueGrowth(): number;
     get myShare(): PropertyShare;
     get claimPercent(): number;
     get claimCoefficient(): number;

package/src/lib/models/report/report.interface.d.ts

@@ -1,7 +1,8 @@
-import { UserRolesEnum } from 'taxtank-core/common';
 export interface IReport {
     title: string;
     description: string;
-    route: string;
-    roles: UserRolesEnum[];
+    routerLink: string;
+    queryParams?: {
+        [key: string]: number;
+    };
 }

package/src/lib/models/report/reports.const.d.ts

@@ -1,3 +1,3 @@
 import { IReport } from './report.interface';
-import { Collection } from '../../collections';
-export declare const REPORTS: Collection<IReport>;
+import { UserRolesEnum } from 'taxtank-core/common';
+export declare const REPORTS: Partial<Record<UserRolesEnum, IReport[]>>;

package/src/lib/models/transaction/transaction.d.ts

@@ -1,5 +1,5 @@
 import { Transaction as TransactionBase } from '../../db/Models/transaction/transaction';
-import { ChartAccountsCategoryEnum, ChartAccountsMetaFieldListEnum } from '../../db/Enums';
+import { ChartAccountsMetaFieldListEnum } from '../../db/Enums';
 import { TransactionOperationEnum } from '../../db/Enums/transaction-operation.enum';
 import { Property } from '../property';
 import { ChartAccounts } from '../chart-accounts';
@@ -43,11 +43,6 @@ export declare class Transaction extends TransactionBase implements Expense {
     isExpense(): boolean;
     isPersonal(): boolean;
     isInterest(): boolean;
-    get chartAccountsCategories(): ChartAccountsCategoryEnum[];
-    /**
-     * Get transaction date
-     */
-    getDate(): Date;
     /**
      * Check if transaction type is vehicle
      */

package/src/lib/models/user/user.d.ts

@@ -5,10 +5,10 @@ import { ClientDetails } from '../client';
 import { EmployeeDetails } from '../employee/employee-details';
 import { Phone } from '../phone/phone';
 import { ServiceSubscription } from '../service-subscription';
-import { ServiceSubscriptionItem } from '../service-subscription';
 import { SoleDetails } from '../sole';
 import { AppFile } from '../file';
 import { AccountSetupItem } from '../account-setup/account-setup-item';
+import { TankTypeEnum } from '../../db/Enums/tank-type.enum';
 export declare class User extends BaseUser {
     subscriptions: ServiceSubscription[];
     clientDetails: ClientDetails;
@@ -33,6 +33,7 @@ export declare class User extends BaseUser {
      * search roles including hierarchy
      */
     hasRoles(roles: UserRolesEnum | UserRolesEnum[]): boolean;
+    getTankTypes(): TankTypeEnum[];
     isOnboarding(): boolean;
     isInactive(): boolean;
     hasSubscription(): boolean;
@@ -48,19 +49,6 @@ export declare class User extends BaseUser {
     isFirmOwner(): boolean;
     isTopManager(): boolean;
     isManager(): boolean;
-    /**
-     * check if user has property tank access
-     */
-    hasPropertyTank(): boolean;
-    /**
-     * check if user has property tank access
-     */
-    hasWorkTank(): boolean;
-    /**
-     * Get user subscription role by provided role type
-     * @param roleType by which role should be returned
-     */
-    getSubscriptionRole(roleType: UserRolesEnum): ServiceSubscriptionItem;
     isCurrentFinancialYear(): boolean;
     /**
      * financial years available in the app for user

package/src/lib/services/http/holding/holding-sale.service.d.ts

@@ -2,12 +2,14 @@ import { HoldingSale as HoldingSaleBase } from '../../../db/Models';
 import { HoldingSale } from '../../../models';
 import { RestMethod, RestService } from '../rest';
 import { HoldingSaleCollection } from '../../../collections';
+import { UserRolesEnum } from 'taxtank-core/common';
 import * as i0 from "@angular/core";
 export declare class HoldingSaleService extends RestService<HoldingSaleBase, HoldingSale, HoldingSaleCollection> {
     modelClass: typeof HoldingSale;
     collectionClass: typeof HoldingSaleCollection;
     endpointUri: string;
     disabledMethods: RestMethod[];
+    roles: UserRolesEnum[];
     static ɵfac: i0.ɵɵFactoryDeclaration<HoldingSaleService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<HoldingSaleService>;
 }

package/src/lib/services/http/property/property-sale/property-sale.service.d.ts

@@ -2,12 +2,14 @@ import { PropertySale as PropertySaleBase } from '../../../../db/Models';
 import { PropertySale } from '../../../../models';
 import { RestMethod, RestService } from '../../rest';
 import { PropertySaleCollection } from '../../../../collections';
+import { UserRolesEnum } from 'taxtank-core/common';
 import * as i0 from "@angular/core";
 export declare class PropertySaleService extends RestService<PropertySaleBase, PropertySale, PropertySaleCollection> {
     modelClass: typeof PropertySale;
     collectionClass: typeof PropertySaleCollection;
     endpointUri: string;
     disabledMethods: RestMethod[];
+    roles: UserRolesEnum[];
     static ɵfac: i0.ɵɵFactoryDeclaration<PropertySaleService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<PropertySaleService>;
 }

package/src/lib/services/http/property/property.service.d.ts

@@ -4,6 +4,7 @@ import { Property } from '../../../models';
 import { IEventListener } from '../../../interfaces';
 import { RestMethod, RestService } from '../rest';
 import { PropertyCollection } from '../../../collections';
+import { UserRolesEnum } from 'taxtank-core/common';
 import * as i0 from "@angular/core";
 /**
  * @Todo Alex remove functionality related to PropertyShare
@@ -16,6 +17,7 @@ export declare class PropertyService extends RestService<PropertyBase, Property,
     collectionClass: typeof PropertyCollection;
     endpointUri: string;
     disabledMethods: RestMethod[];
+    roles: UserRolesEnum[];
     constructor(environment: any);
     /**
      * @TODO remove when forecast moved to separated api

package/src/lib/services/http/transaction/transaction.service.d.ts

@@ -69,12 +69,6 @@ export declare class TransactionService extends RestService<TransactionBase, Tra
      * @param model
      */
     delete(model: Transaction): Observable<void>;
-    /**
-     * @TODO Alex wrong place for this logic, move to model
-     * calculate gross income amount based on transaction amount and taxes (fees)
-     * @param transaction Transaction instance for calculation
-     */
-    calculateGrossAmount(transaction: Transaction): number;
     /**
      * Listen to EventDispatcherService event related to Depreciation changing
      */