taxtank-core 0.10.6 → 0.12.0

package/fesm2015/taxtank-core.js

@@ -1,15 +1,16 @@
 import * as i0 from '@angular/core';
 import { Injectable, Inject, NgModule, EventEmitter } from '@angular/core';
+import * as i2 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import * as i1 from '@angular/common/http';
 import { HttpParams, HttpErrorResponse, HTTP_INTERCEPTORS } from '@angular/common/http';
-import { ReplaySubject, BehaviorSubject, throwError, Subject, Observable, combineLatest, forkJoin } from 'rxjs';
+import { ReplaySubject, BehaviorSubject, throwError, Subject, combineLatest, Observable, forkJoin } from 'rxjs';
 import { map, catchError, filter, take, switchMap, finalize, mergeMap } from 'rxjs/operators';
 import { plainToClass, Type, Exclude, Transform, Expose, classToPlain } from 'class-transformer';
 import { JwtHelperService } from '@auth0/angular-jwt';
-import has from 'lodash/has';
 import get from 'lodash/get';
 import flatten from 'lodash/flatten';
+import hasIn from 'lodash/hasIn';
 import first from 'lodash/first';
 import last from 'lodash/last';
 import uniqBy from 'lodash/uniqBy';
@@ -757,8 +758,8 @@ class CollectionDictionary {
         if (!collection.length) {
             return;
         }
-        // Check if the first collection item has property by path
-        if (!has(collection.items[0], path)) {
+        // Do nothing if provided path was not found in the 1st collection's item
+        if (!hasIn(collection.items[0], path.split('.')[0])) {
             return;
         }
         this.groupItems(collection, path);
@@ -945,6 +946,19 @@ class Collection {
     get last() {
         return last(this.items);
     }
+    getByDateRange(from, to, dateField = 'date') {
+        return this.create(this.items.filter((item) => item[dateField] >= from && item[dateField] <= to));
+    }
+}
+
+class AccountSetupItemCollection extends Collection {
+    constructor(items) {
+        super(items);
+        this.sortBy('isCompleted', false);
+    }
+    isCompleted() {
+        return this.getBy('isCompleted', true).length === this.length;
+    }
 }
 
 var BankAccountTypeEnum;
@@ -1183,7 +1197,7 @@ class BankTransactionCollection extends Collection {
      */
     groupByTransaction(allocations) {
         // Group allocations by transaction id
-        const allocationsByTransactions = new CollectionDictionary(allocations, 'transaction');
+        const allocationsByTransactions = new CollectionDictionary(allocations, 'transaction.id');
         // Init an empty dictionary we will fill below
         const bankTransactionsByTransactions = new CollectionDictionary(new BankTransactionCollection([]));
         // Fill dictionary with the same keys as at allocationsByTransactions
@@ -1425,6 +1439,32 @@ class TransactionCollection extends Collection {
     getByAllocations(allocations) {
         return new TransactionCollection(this.items.filter((transaction) => allocations.hasTransaction(transaction)));
     }
+    /**
+     * Get transactions related to Vehicle category
+     */
+    getVehicleTransactions() {
+        return this.create(this.items.filter((transaction) => {
+            return transaction.isVehicleTransaction();
+        }));
+    }
+    /**
+     * Get new transaction collection filtered by tank type
+     */
+    getByTankType(tankType) {
+        return this.create(this.items.filter((transaction) => {
+            switch (tankType) {
+                case TankTypeEnum.PROPERTY:
+                    return transaction.isPropertyTank();
+                case TankTypeEnum.WORK:
+                    return transaction.isWorkTank();
+                case TankTypeEnum.SOLE:
+                    return transaction.isSoleTank();
+                // Transaction may be not related to any tank type (personal)
+                default:
+                    return false;
+            }
+        }));
+    }
 }
 
 class DepreciationCollection extends Collection {
@@ -1457,15 +1497,6 @@ class DepreciationCollection extends Collection {
     get closeBalance() {
         return this.sumBy('currentYearForecast.closeBalance');
     }
-    /**
-     * Get new depreciations collections filtered by tank type
-     */
-    getByTankType(tankType) {
-        if (tankType === TankTypeEnum.PROPERTY) {
-            return new DepreciationCollection(this.items.filter((depreciation) => depreciation.isPropertyTank()));
-        }
-        return new DepreciationCollection(this.items.filter((depreciation) => depreciation.isWorkTank()));
-    }
     getByPropertiesIds(ids) {
         return new DepreciationCollection(this.items.filter((depreciation) => { var _a; return ids.includes((_a = depreciation.property) === null || _a === void 0 ? void 0 : _a.id); }));
     }
@@ -1501,6 +1532,29 @@ class DepreciationCollection extends Collection {
             return depreciation.depreciationCapitalProject;
         })), 'id');
     }
+    /**
+     * Get a new collection of depreciations related to vehicles
+     */
+    getVehicleDepreciations() {
+        return this.create(this.items.filter((depreciation) => {
+            return depreciation.isVehicleDepreciation();
+        }));
+    }
+    getByTankType(tankType) {
+        return this.create(this.items.filter((depreciation) => {
+            switch (tankType) {
+                case TankTypeEnum.PROPERTY:
+                    return depreciation.isPropertyTank();
+                case TankTypeEnum.WORK:
+                    return depreciation.isWorkTank();
+                case TankTypeEnum.SOLE:
+                    return depreciation.isSoleTank();
+                // case for other tank or some extra
+                default:
+                    return false;
+            }
+        }));
+    }
     /**
      * Create TransactionCollection from depreciation items
      */
@@ -1580,6 +1634,38 @@ class LoanCollection extends Collection {
     }
 }
 
+class MessageCollection extends Collection {
+    getFirstUnreadMessage(user) {
+        return this.items.find((message) => {
+            return !message.isRead() && message.isFromEmployee() !== user.isEmployee();
+        });
+    }
+    /**
+     * Get List of unread chats
+     */
+    getUnread() {
+        return this.items.filter((message) => !message.readAt);
+    }
+    /**
+     * Check if chat has unread chats
+     */
+    hasUnread() {
+        return !!this.getUnread().length;
+    }
+}
+
+/**
+ * Collection of MessageDocument instances
+ */
+class MessageDocumentCollection extends Collection {
+    /**
+     * get list of documents which are not attached to any message
+     */
+    getUnattached() {
+        return new MessageDocumentCollection(this.items.filter((doc) => !doc.message));
+    }
+}
+
 class FinancialYear {
     constructor(date) {
         this.yearStartDate = '-07-01';
@@ -1624,141 +1710,6 @@ class FinancialYear {
 }
 FinancialYear.startMonthIndex = 6;
 
-class LogbookPeriod {
-}
-__decorate([
-    Type(() => Date)
-], LogbookPeriod.prototype, "from", void 0);
-__decorate([
-    Type(() => Date)
-], LogbookPeriod.prototype, "to", void 0);
-
-// Class contain array of vehicle logbooks and calculate the best period for logbook claim method
-class LogbookCollection {
-    constructor(vehicles) {
-        // 12 weeks in milliseconds to check logbooks range
-        this.logbookClaimRange = 12 * 7 * 24 * 3600 * 1000;
-        this.trips = vehicles.map((vehicle) => vehicle.logbook).flat();
-        this.financialYear = new FinancialYear();
-        this.setInitialBestPeriod();
-    }
-    // check if summary logbooks date range less than 84 days (12 weeks)
-    get isAutomaticLogbookCalculationAllowed() {
-        // forbid automatic logbook calculation if no logbook trips exist
-        if (!this.trips.length) {
-            return false;
-        }
-        // forbid automatic logbook calculation if logbook trips summary date range less than 12 weeks
-        return this.trips.slice(-1)[0].date.getTime() - this.trips[0].date.getTime() >= this.logbookClaimRange;
-    }
-    get bestPeriod() {
-        // don't calculate if not allowed
-        if (!this.isAutomaticLogbookCalculationAllowed) {
-            return null;
-        }
-        this.calculateBestPeriod();
-        return this._bestPeriod;
-    }
-    get workTrips() {
-        return this.trips.filter((logbook) => logbook.isWork);
-    }
-    // calculate best period for logbook claim method
-    calculateBestPeriod() {
-        // set default best period values for real values comparison
-        this.setInitialBestPeriod();
-        // get best period with each trip date as start date
-        this.workTrips.forEach((logbook) => {
-            const dateRange = this.getDateRange(logbook.date);
-            // get all trips included in current 12 weeks period
-            const tripsInRange = this.trips.filter((l) => {
-                return l.date >= dateRange.from && l.date <= dateRange.to;
-            });
-            // get work trips included in current 12 weeks period
-            const workTripsInRange = tripsInRange.filter((l) => l.isWork);
-            // calculate sum of work kilometers in current 12 weeks range
-            const currentRangeKilometers = this.getKilometersAmount(workTripsInRange);
-            // overwrite best period with current 12 weeks range if amount of kilometers is bigger
-            if (currentRangeKilometers > this._bestPeriod.kilometers) {
-                this._bestPeriod = {
-                    from: dateRange.from,
-                    to: dateRange.to,
-                    kilometers: currentRangeKilometers,
-                    workUsage: this.getLogbooksWorkUsage(tripsInRange, workTripsInRange)
-                };
-            }
-        });
-    }
-    getDateRange(from) {
-        // set end date after 12 weeks after start date
-        let to = new Date(from.getTime() + this.logbookClaimRange);
-        // set as period last 12 weeks of current year if period end date after end of current year
-        if (to > this.financialYear.endDate) {
-            to = this.financialYear.endDate;
-            from = new Date(to.getTime() - this.logbookClaimRange);
-        }
-        return { from, to };
-    }
-    // calculate kilometers amount for passed trips
-    getKilometersAmount(logbooks) {
-        if (!logbooks.length) {
-            return 0;
-        }
-        return logbooks.map((logbook) => logbook.odometerEnd - logbook.odometerStart)
-            .reduce((prev, next) => prev + Number(next));
-    }
-    // calculate work usage for passed trips
-    getLogbooksWorkUsage(logbooks, workLogbooks) {
-        const kilometers = this.getKilometersAmount(logbooks);
-        const workKilometers = this.getKilometersAmount(workLogbooks);
-        return Math.round(workKilometers / kilometers * 100);
-    }
-    // set default best period with zero values and fin year start date for comparison in calculation
-    setInitialBestPeriod() {
-        // set 1st of July of current year as default start date for best period
-        const startDate = this.financialYear.startDate;
-        // set end custom-date after 12 weeks from start date
-        const endDate = new Date(startDate.getTime() + this.logbookClaimRange);
-        this._bestPeriod = plainToClass(LogbookPeriod, {
-            from: startDate,
-            to: endDate,
-            kilometers: 0,
-            workUsage: 0
-        });
-    }
-}
-
-class MessageCollection extends Collection {
-    getFirstUnreadMessage(user) {
-        return this.items.find((message) => {
-            return !message.isRead() && message.isFromEmployee() !== user.isEmployee();
-        });
-    }
-    /**
-     * Get List of unread chats
-     */
-    getUnread() {
-        return this.items.filter((message) => !message.readAt);
-    }
-    /**
-     * Check if chat has unread chats
-     */
-    hasUnread() {
-        return !!this.getUnread().length;
-    }
-}
-
-/**
- * Collection of MessageDocument instances
- */
-class MessageDocumentCollection extends Collection {
-    /**
-     * get list of documents which are not attached to any message
-     */
-    getUnattached() {
-        return new MessageDocumentCollection(this.items.filter((doc) => !doc.message));
-    }
-}
-
 class PropertyCollection extends Collection {
     /**
      * Get new property collection filtered by category id
@@ -2006,6 +1957,8 @@ var ChartAccountsHeadingVehicleListEnum;
 (function (ChartAccountsHeadingVehicleListEnum) {
     ChartAccountsHeadingVehicleListEnum[ChartAccountsHeadingVehicleListEnum["WORK_RELATED_CAR_EXPENSES"] = 8] = "WORK_RELATED_CAR_EXPENSES";
     ChartAccountsHeadingVehicleListEnum[ChartAccountsHeadingVehicleListEnum["DEPRECIATION_VEHICLES"] = 9] = "DEPRECIATION_VEHICLES";
+    ChartAccountsHeadingVehicleListEnum[ChartAccountsHeadingVehicleListEnum["KLMS"] = 60] = "KLMS";
+    ChartAccountsHeadingVehicleListEnum[ChartAccountsHeadingVehicleListEnum["FUEL_OIL"] = 61] = "FUEL_OIL";
 })(ChartAccountsHeadingVehicleListEnum || (ChartAccountsHeadingVehicleListEnum = {}));
 
 var ChartAccountsListEnum;
@@ -2017,16 +1970,17 @@ var ChartAccountsListEnum;
     ChartAccountsListEnum[ChartAccountsListEnum["BUILDING_AT_COST"] = 304] = "BUILDING_AT_COST";
     ChartAccountsListEnum[ChartAccountsListEnum["MANAGEMENT_FEES_PLATFORM_FEES"] = 656] = "MANAGEMENT_FEES_PLATFORM_FEES";
     ChartAccountsListEnum[ChartAccountsListEnum["KLMS_TRAVELLED_FOR_WORK"] = 24] = "KLMS_TRAVELLED_FOR_WORK";
+    ChartAccountsListEnum[ChartAccountsListEnum["KLMS_TRAVELLED"] = 683] = "KLMS_TRAVELLED";
     ChartAccountsListEnum[ChartAccountsListEnum["DIRECTOR_FEES"] = 6] = "DIRECTOR_FEES";
     ChartAccountsListEnum[ChartAccountsListEnum["SALARY_OR_WAGES"] = 2] = "SALARY_OR_WAGES";
     ChartAccountsListEnum[ChartAccountsListEnum["VEHICLES"] = 25] = "VEHICLES";
     ChartAccountsListEnum[ChartAccountsListEnum["COMMERCIAL_VEHICLES"] = 26] = "COMMERCIAL_VEHICLES";
+    ChartAccountsListEnum[ChartAccountsListEnum["VEHICLE_LOAN_INTEREST"] = 37] = "VEHICLE_LOAN_INTEREST";
+    ChartAccountsListEnum[ChartAccountsListEnum["VEHICLE_LOAN_PRINCIPAL"] = 38] = "VEHICLE_LOAN_PRINCIPAL";
     ChartAccountsListEnum[ChartAccountsListEnum["TAX_INSTALMENTS"] = 662] = "TAX_INSTALMENTS";
     ChartAccountsListEnum[ChartAccountsListEnum["INTEREST_EARNED"] = 22] = "INTEREST_EARNED";
     ChartAccountsListEnum[ChartAccountsListEnum["TRUST_INCOME"] = 567] = "TRUST_INCOME";
     ChartAccountsListEnum[ChartAccountsListEnum["TAX_OFFSETS_N_R_A_S"] = 571] = "TAX_OFFSETS_N_R_A_S";
-    ChartAccountsListEnum[ChartAccountsListEnum["VEHICLE_LOAN_INTEREST"] = 37] = "VEHICLE_LOAN_INTEREST";
-    ChartAccountsListEnum[ChartAccountsListEnum["VEHICLE_LOAN_PRINCIPAL"] = 38] = "VEHICLE_LOAN_PRINCIPAL";
 })(ChartAccountsListEnum || (ChartAccountsListEnum = {}));
 
 class DepreciationCapitalProject$1 {
@@ -2125,6 +2079,25 @@ class ChartAccounts extends ChartAccounts$1 {
     isKlmsForWork() {
         return this.id === ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK;
     }
+    /**
+     * Check if chart accounts id is related for 'Klms travelled for sole' category
+     */
+    isKlmsForSole() {
+        return this.id === ChartAccountsListEnum.KLMS_TRAVELLED;
+    }
+    /**
+     * Check if accounts id is related for KLMs category related to passed tank type
+     */
+    isKLMsByTankType(tankType) {
+        switch (tankType) {
+            case TankTypeEnum.WORK:
+                return this.isKlmsForWork();
+            case TankTypeEnum.SOLE:
+                return this.isKlmsForSole();
+            default:
+                return false;
+        }
+    }
     /**
      * Check if chart accounts id is related for 'NRAS Tax Offset' category
      */
@@ -2219,6 +2192,18 @@ class ChartAccounts extends ChartAccounts$1 {
     isVehicleLoanExpense() {
         return this.id === ChartAccountsListEnum.VEHICLE_LOAN_INTEREST || this.id === ChartAccountsListEnum.VEHICLE_LOAN_PRINCIPAL;
     }
+    /**
+     * Get chart accounts value for current financial year
+     */
+    getCurrentYearValue() {
+        return this.getValueByYear(new FinancialYear().year);
+    }
+    /**
+     * Get chart accounts value by financial year
+     */
+    getValueByYear(year) {
+        return this.values.find((value) => value.financialYear === year);
+    }
 }
 __decorate([
     Type(() => ChartAccountsHeading)
@@ -2265,7 +2250,6 @@ var UserStatusEnum;
     UserStatusEnum[UserStatusEnum["INACTIVE"] = 0] = "INACTIVE";
     UserStatusEnum[UserStatusEnum["ON_BOARDING"] = 1] = "ON_BOARDING";
     UserStatusEnum[UserStatusEnum["ACTIVE"] = 2] = "ACTIVE";
-    UserStatusEnum[UserStatusEnum["TRIAL"] = 3] = "TRIAL";
 })(UserStatusEnum || (UserStatusEnum = {}));
 
 var UserRolesEnum;
@@ -2868,6 +2852,7 @@ var TaxExemptionEnum;
 var PropertyCategoryListEnum;
 (function (PropertyCategoryListEnum) {
     PropertyCategoryListEnum[PropertyCategoryListEnum["OWNER_OCCUPIED"] = 3] = "OWNER_OCCUPIED";
+    PropertyCategoryListEnum[PropertyCategoryListEnum["VACANT_LAND"] = 5] = "VACANT_LAND";
 })(PropertyCategoryListEnum || (PropertyCategoryListEnum = {}));
 
 var TaxExemptionMetadataEnum;
@@ -3669,6 +3654,10 @@ class Depreciation extends Depreciation$1 {
         super(...arguments);
         this.forecasts = [];
         this.type = DepreciationTypeEnum.PLANT_EQUIPMENT;
+        /**
+         * @TODO remove after ? signs removed from db models
+         */
+        this.amount = 0;
     }
     isCapital() {
         return this.type === DepreciationTypeEnum.CAPITAL_WORKS;
@@ -4235,7 +4224,7 @@ class TransactionAllocationCollection extends Collection {
      */
     groupByBankAccount(bankTransactions) {
         // Group bank transactions by bank account id
-        const bankTransactionsByBankAccount = new CollectionDictionary(bankTransactions, 'bankAccount');
+        const bankTransactionsByBankAccount = new CollectionDictionary(bankTransactions, 'bankAccount.id');
         // Create empty dictionary of transaction allocations
         const allocationsByBankAccount = new CollectionDictionary(new TransactionAllocationCollection([]));
         // Fill allocations dictionary with bank transactions dictionary keys and allocations related with each bank transaction collection
@@ -4267,6 +4256,111 @@ class UserEventSettingCollection extends Collection {
     }
 }
 
+/**
+ * Class contains traveled kilometers and work usage percent in 12 weeks date range
+ */
+class LogbookPeriod {
+    isEndOfYear() {
+        return this.to === new FinancialYear().endDate;
+    }
+}
+__decorate([
+    Type(() => Date)
+], LogbookPeriod.prototype, "from", void 0);
+__decorate([
+    Type(() => Date)
+], LogbookPeriod.prototype, "to", void 0);
+
+/**
+ * 12 weeks in milliseconds
+ * "To work out your business-use percentage, you need to keep a logbook and the odometer readings for the logbook period.
+ * The logbook period is a minimum continuous period of 12 weeks." © Nicole Kelly
+ */
+const LOGBOOK_PERIOD_DURATION = 12 * 7 * 24 * 3600 * 1000;
+class VehicleLogbookCollection extends Collection {
+    /**
+     * Check if we can calculate the best period
+     */
+    isBestPeriodExist() {
+        if (this.items.length < 2) {
+            return false;
+        }
+        return LOGBOOK_PERIOD_DURATION < (this.last.date.getTime() - this.first.date.getTime());
+    }
+    /**
+     * Get collection of non-personal logbooks (work-related, sole-related).
+     */
+    getBusinessLogbooks() {
+        return this.create(this.items.filter((logbook) => logbook.isBusiness()));
+    }
+    /**
+     * Logbook Period is the best when it has the biggest amount of work kilometers
+     * Best period duration is defined as LOGBOOK_PERIOD_DURATION (12 weeks) by the ATO
+     */
+    getBestPeriod() {
+        if (!this.isBestPeriodExist()) {
+            return null;
+        }
+        let bestPeriod;
+        const businessLogbooks = this.getBusinessLogbooks().toArray();
+        for (let i = 0; i < businessLogbooks.length; i++) {
+            const logbook = businessLogbooks[i];
+            // no sense to check next logbooks because we already get the end of the year
+            if (bestPeriod && bestPeriod.isEndOfYear()) {
+                break;
+            }
+            const dateRange = this.getPeriodRange(logbook.date);
+            // get logbooks included in current logbook period
+            const logbooksInRange = this.getByDateRange(logbook.date, new Date(logbook.date.getTime() + LOGBOOK_PERIOD_DURATION));
+            const workUsage = logbooksInRange.getWorkUsage();
+            // compare with previous best period and overwrite if needs
+            if (!bestPeriod || workUsage > bestPeriod.workUsage) {
+                bestPeriod = plainToClass(LogbookPeriod, {
+                    from: dateRange.from,
+                    to: dateRange.to,
+                    kilometers: logbooksInRange.getBusinessLogbooks().getKlms(),
+                    workUsage: workUsage
+                });
+            }
+        }
+        return bestPeriod;
+    }
+    /**
+     * Calculate total kilometers traveled
+     */
+    getKlms() {
+        return this.items.reduce((sum, logbook) => sum + logbook.getKlms(), 0);
+    }
+    /**
+     * Calculate work usage (percent of business-related kilometers from total kilometers)
+     */
+    getWorkUsage() {
+        const totalKilometers = this.getKlms();
+        const workKilometers = this.getBusinessLogbooks().getKlms();
+        return Math.round(workKilometers / totalKilometers * 100);
+    }
+    /**
+     * Get LOGBOOK_PERIOD_DURATION date range from passed start date
+     */
+    getPeriodRange(from) {
+        // set end date after LOGBOOK_PERIOD_DURATION after start date
+        let to = new Date(from.getTime() + LOGBOOK_PERIOD_DURATION);
+        const financialYear = new FinancialYear();
+        // set as period last LOGBOOK_PERIOD_DURATION of current year if period end date after end of current year
+        if (to > financialYear.endDate) {
+            to = financialYear.endDate;
+            from = new Date(to.getTime() - LOGBOOK_PERIOD_DURATION);
+        }
+        return { from, to };
+    }
+}
+
+class VehicleCollection extends Collection {
+    getLogbooks() {
+        return new VehicleLogbookCollection(flatten(this.items.map((vehicle) => vehicle.logbook)));
+    }
+}
+
 var BankAccountStatusEnum;
 (function (BankAccountStatusEnum) {
     BankAccountStatusEnum[BankAccountStatusEnum["INACTIVE"] = 0] = "INACTIVE";
@@ -4703,6 +4797,12 @@ var VehicleLogbookPurposeEnum;
     VehicleLogbookPurposeEnum[VehicleLogbookPurposeEnum["PERSONAL"] = 2] = "PERSONAL";
 })(VehicleLogbookPurposeEnum || (VehicleLogbookPurposeEnum = {}));
 
+/**
+ * Account setup item instance is using for account setup checklist
+ */
+class AccountSetupItem {
+}
+
 class Bank$1 {
 }
 
@@ -5143,6 +5243,12 @@ var ChartAccountsTaxLabelsEnum;
     ChartAccountsTaxLabelsEnum["TAX_DEDUCTED"] = "Tax Deducted";
 })(ChartAccountsTaxLabelsEnum || (ChartAccountsTaxLabelsEnum = {}));
 
+class ChartAccountsValue$1 {
+}
+
+class ChartAccountsValue extends ChartAccountsValue$1 {
+}
+
 class Chat$1 {
 }
 
@@ -5224,6 +5330,18 @@ __decorate([
     Expose()
 ], Message.prototype, "documents", void 0);
 
+class ClientIncomeTypes$1 {
+}
+
+class ClientIncomeTypes extends ClientIncomeTypes$1 {
+    /**
+     * Get count of selected income types
+     */
+    get length() {
+        return Object.values(this).filter((value) => typeof value === 'boolean' && value).length;
+    }
+}
+
 class ClientInvite$1 {
 }
 
@@ -5615,8 +5733,17 @@ var AppEventTypeEnum;
     AppEventTypeEnum[AppEventTypeEnum["USER_UPDATED"] = 35] = "USER_UPDATED";
     AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_UPDATED"] = 36] = "VEHICLE_CLAIM_UPDATED";
     AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_CREATED"] = 37] = "VEHICLE_CLAIM_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_CREATED"] = 38] = "VEHICLE_LOGBOOK_CREATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_UPDATED"] = 39] = "VEHICLE_LOGBOOK_UPDATED";
+    AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_DELETED"] = 40] = "VEHICLE_LOGBOOK_DELETED";
 })(AppEventTypeEnum || (AppEventTypeEnum = {}));
 
+/**
+ * Data table structure suitable for export
+ */
+class ExportDataTable {
+}
+
 var ExportFormatEnum;
 (function (ExportFormatEnum) {
     ExportFormatEnum["PDF"] = "PDF";
@@ -5718,10 +5845,16 @@ class VehicleLogbook$1 {
 }
 
 class VehicleLogbook extends VehicleLogbook$1 {
-    get kilometres() {
+    /**
+     * Get amount of kilometers in this logbook
+     */
+    getKlms() {
         return this.odometerEnd - this.odometerStart;
     }
-    get isWork() {
+    /**
+     * Check if logbook is business-related
+     */
+    isBusiness() {
         return this.purpose === VehicleLogbookPurposeEnum.BUSINESS;
     }
 }
@@ -5730,33 +5863,11 @@ __decorate([
 ], VehicleLogbook.prototype, "date", void 0);
 
 class Vehicle extends Vehicle$1 {
-    get workKilometersPercentage() {
-        return this.workKilometres / this.totalKilometres * 100;
-    }
-    get totalKilometres() {
-        let kilometers = 0;
-        this.logbook.forEach((lb) => {
-            kilometers += lb.kilometres;
-        });
-        return kilometers;
-    }
-    get workKilometres() {
-        let kilometers = 0;
-        this.logbook.forEach((lb) => {
-            if (lb.purpose === VehicleLogbookPurposeEnum.BUSINESS) {
-                kilometers += lb.kilometres;
-            }
-        });
-        return kilometers;
-    }
-    get personalKilometres() {
-        return this.totalKilometres - this.workKilometres;
-    }
-    get lastLogbook() {
-        if (!this.logbook.length) {
-            return { odometerEnd: 0 };
-        }
-        return this.logbook.slice(-1)[0];
+    /**
+     * Get vehicle's logbooks as collection
+     */
+    getLogbooks() {
+        return new VehicleLogbookCollection(this.logbook);
     }
 }
 __decorate([
@@ -5784,15 +5895,68 @@ class VehicleClaim extends VehicleClaim$1 {
     get averageWeeklyTraveledKms() {
         return this.kilometers / WEEKS_IN_YEAR;
     }
-    get isLogbookMethod() {
+    isLogbookMethod() {
         return this.method === VehicleClaimMethodEnum.LOGBOOK;
     }
+    isKLMsMethod() {
+        return this.method === VehicleClaimMethodEnum.KMS;
+    }
+    isWorkTank() {
+        return this.tankType === TankTypeEnum.WORK;
+    }
+    isSoleTank() {
+        return this.tankType === TankTypeEnum.SOLE;
+    }
     /**
-     * Claim amount for Kms method
+     * Claim amount for KLMs method. Exists only for KLMs method.
      */
-    getKmsClaimAmount(vehicleClaimRate) {
+    getKLMsClaimAmount(vehicleClaimRate) {
+        if (!this.isKLMsMethod()) {
+            return 0;
+        }
         return +(this.kilometers * vehicleClaimRate).toFixed(2);
     }
+    /**
+     * Get logbook claim amount. Exists only for logbook method.
+     * ClaimAmount = WorkUsage * transaction/depreciation amount
+     */
+    getLogbookClaimAmount(transactions) {
+        if (!this.isLogbookMethod()) {
+            return 0;
+        }
+        const transactionsAmount = transactions
+            .getByTankType(this.tankType)
+            .getVehicleTransactions()
+            // except klms transactions because they needed only for klms method
+            .filter((transaction) => !transaction.chartAccounts.isKLMsByTankType(this.tankType))
+            .sumBy('amount');
+        // Math.abs because amount will be negative (because we sum expenses), but we don't want negative percent value
+        return Math.abs(transactionsAmount) * this.workUsage / 100;
+    }
+    /**
+     * Create KLMs transaction based on vehicle claim and vehicle claim rate
+     * @TODO handle on backend: Create klms transaction when vhicle claim created
+     */
+    toTransaction(vehicleClaimRate) {
+        return plainToClass(Transaction, {
+            amount: this.kilometers * vehicleClaimRate,
+            source: TransactionSourceEnum.CASH,
+            type: TransactionTypeEnum.DEBIT,
+            taxWithheld: 0,
+            description: 'Klm’s method',
+            date: new Date(`${new FinancialYear().year}-06-30`),
+            claimPercent: 100,
+            chartAccounts: {
+                id: this.getKlmsChartAccountsIdByTankType(this.tankType)
+            }
+        });
+    }
+    getKlmsChartAccountsIdByTankType(tankType = this.tankType) {
+        if (tankType === TankTypeEnum.WORK) {
+            return ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK;
+        }
+        return ChartAccountsListEnum.KLMS_TRAVELLED;
+    }
 }
 
 class ServiceNotification {
@@ -5833,6 +5997,12 @@ __decorate([
     })
 ], Notification.prototype, "redirectionLink", void 0);
 
+var PdfOrientationEnum;
+(function (PdfOrientationEnum) {
+    PdfOrientationEnum["PORTRAIT"] = "portrait";
+    PdfOrientationEnum["LANDSCAPE"] = "landscape";
+})(PdfOrientationEnum || (PdfOrientationEnum = {}));
+
 /**
  * Calculation form control types
  */
@@ -6524,81 +6694,100 @@ var UserEventSettingFieldEnum;
     UserEventSettingFieldEnum["FREQUENCY"] = "frequency";
 })(UserEventSettingFieldEnum || (UserEventSettingFieldEnum = {}));
 
-class AddressService {
-    constructor(http, environment) {
-        this.http = http;
-        this.environment = environment;
-        this.countriesSubject = new ReplaySubject(1);
-    }
-    getCountries() {
-        if (!this._countries) {
-            this.http.get(`${this.environment.apiV2}/countries`)
-                .pipe(map((response) => {
-                return response['hydra:member'].map((item) => plainToClass(Country, item));
-            }))
-                .subscribe((countries) => {
-                this._countries = countries;
-                this.countriesSubject.next(countries);
-            });
-        }
-        return this.countriesSubject.asObservable();
-    }
-}
-AddressService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AddressService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-AddressService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AddressService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AddressService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+/**
+ * Enum list of all possible account setup items. Using with [ACCOUNT_SETUP_ITEMS]{@link ACCOUNT_SETUP_ITEMS}
+ */
+var AccountSetupItemsEnum;
+(function (AccountSetupItemsEnum) {
+    AccountSetupItemsEnum[AccountSetupItemsEnum["SALARY"] = 0] = "SALARY";
+    AccountSetupItemsEnum[AccountSetupItemsEnum["OTHER_INCOME"] = 1] = "OTHER_INCOME";
+    AccountSetupItemsEnum[AccountSetupItemsEnum["PROPERTY"] = 2] = "PROPERTY";
+    AccountSetupItemsEnum[AccountSetupItemsEnum["BANK_FEEDS"] = 3] = "BANK_FEEDS";
+    AccountSetupItemsEnum[AccountSetupItemsEnum["WORK_LOGBOOK"] = 4] = "WORK_LOGBOOK";
+    AccountSetupItemsEnum[AccountSetupItemsEnum["SOLE_INCOME"] = 5] = "SOLE_INCOME";
+    AccountSetupItemsEnum[AccountSetupItemsEnum["TRANSACTION"] = 6] = "TRANSACTION";
+})(AccountSetupItemsEnum || (AccountSetupItemsEnum = {}));
 
 /**
- * Service to work with assets (documents, receipts, e.t.c.)
+ * List of all possible account setup steps
  */
-class AssetsService {
-    constructor(http, userSwitcherService, environment) {
+const ACCOUNT_SETUP_ITEMS = {
+    [AccountSetupItemsEnum.SALARY]: plainToClass(AccountSetupItem, {
+        title: 'Add your work income forecast',
+        description: 'One the most important steps is to add your salary or wage incomes so we can automatically calculate tax withheld and your forecasted tax position.',
+        url: '/client/work-tank/forecasting'
+    }),
+    [AccountSetupItemsEnum.OTHER_INCOME]: plainToClass(AccountSetupItem, {
+        title: 'Add any other expected incomes',
+        description: 'To ensure an accurate tax position forecast, add estimates for any other income types, like dividends, interest, trusts, annuities, director payments etc.',
+        url: '/client/work-tank/forecasting'
+    }),
+    [AccountSetupItemsEnum.PROPERTY]: plainToClass(AccountSetupItem, {
+        title: 'Add your properties',
+        description: 'Add your properties to seamlessly manage your rental incomes and expenses, whilst tracking your cash position, tax positions and equity forecasts in real time.',
+        url: '/client/property-tank'
+    }),
+    [AccountSetupItemsEnum.BANK_FEEDS]: plainToClass(AccountSetupItem, {
+        title: 'Link banks and select accounts',
+        description: 'Link banks to automatically feed your account transactions to save you time and money.  Allocating live transactions ensures nothing is missed, lost or forgotten!',
+        url: '/client/bank-feeds'
+    }),
+    [AccountSetupItemsEnum.WORK_LOGBOOK]: plainToClass(AccountSetupItem, {
+        title: 'Set up your logbook method',
+        description: 'Do you use your vehicle for work? Select your method and the klms or logbook % to automate accurately all vehicle expenses throughout the year.',
+        url: '/client/work-tank/logbook'
+    }),
+    [AccountSetupItemsEnum.SOLE_INCOME]: plainToClass(AccountSetupItem, {
+        title: 'Add your business details',
+        description: 'Add your business details, logo and payment terms to create invoice templates in minutes.',
+        url: '/client/sole-tank/forecasting'
+    }),
+    [AccountSetupItemsEnum.TRANSACTION]: plainToClass(AccountSetupItem, {
+        title: 'Allocation transactions',
+        description: 'Select one or multiple transactions, the category from the dropdown and attach your receipt. It’s that simple to capture every possible deduction, and keep organised all throughout the year.',
+        url: '/client/bank-feeds'
+    }),
+};
+
+/**
+ * @TODO extend rest service when it could work with single objects, not only arrays
+ */
+class ClientIncomeTypesService {
+    constructor(http, environment) {
         this.http = http;
-        this.userSwitcherService = userSwitcherService;
         this.environment = environment;
-        this.impersonatedClient = this.userSwitcherService.get();
-    }
-    /**
-     * Get asset link
-     * @param asset to get the link for
-     */
-    getLink(asset) {
-        return this.http.get(`${this.environment.apiV2}/assets/${asset.type}/${asset.id}`);
+        this.cacheSubject = new ReplaySubject(1);
     }
-    /**
-     * Download asset
-     * @param asset which should be downloaded
-     * @TODO refactor
-     */
-    download(asset) {
-        return `${this.environment.apiV2}/assets/${asset.type}/${asset.id}/download?bearer=${localStorage.getItem('token')}${this.impersonatedClient ? `&_switch_user=${this.impersonatedClient}` : ''}`;
+    get() {
+        if (!this.cache) {
+            this.http.get(`${this.environment.apiV2}/client-income-types`)
+                .pipe(map((response) => {
+                return plainToClass(ClientIncomeTypes, response['hydra:member'][0], { excludePrefixes: ['@'] });
+            }))
+                .subscribe((incomeTypes) => {
+                this.cache = incomeTypes;
+                this.cacheSubject.next(this.cache);
+            });
+        }
+        return this.cacheSubject.asObservable();
     }
-    // @Todo refactor to event dispatcher
-    /**
-     * Delete asset
-     * @param entityId: id of asset main entity (property, folder, transaction, e.t.c.)
-     * @param asset which should be deleted
-     */
-    delete(entityId, asset) {
-        return this.http.delete(`${this.environment.apiV2}/${asset.entityType}/${entityId}/${asset.type}/${asset.id}`);
+    update(incomeTypes) {
+        return this.http.put(`${this.environment.apiV2}/client-income-types/${incomeTypes.id}`, incomeTypes)
+            .pipe(map((incomeTypesBase) => {
+            this.cache = plainToClass(ClientIncomeTypes, incomeTypesBase);
+            this.cacheSubject.next(this.cache);
+            return this.cache;
+        }));
     }
 }
-AssetsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AssetsService, deps: [{ token: i1.HttpClient }, { token: UserSwitcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-AssetsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AssetsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AssetsService, decorators: [{
+ClientIncomeTypesService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientIncomeTypesService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+ClientIncomeTypesService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientIncomeTypesService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientIncomeTypesService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: UserSwitcherService }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
                 }] }]; } });
@@ -6629,19 +6818,74 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
                 }]
         }] });
 
+/**
+ * popup notifications service (toast, snackbar).
+ */
+class ToastService {
+    constructor() {
+        this.toast$ = new ReplaySubject(1);
+    }
+    get() {
+        return this.toast$.asObservable();
+    }
+    add(toast) {
+        this.toast$.next(toast);
+    }
+    success(message) {
+        this.add(plainToClass(Toast, {
+            type: ToastTypeEnum.SUCCESS,
+            title: 'Success!',
+            message,
+        }));
+    }
+    warning(message) {
+        this.add(plainToClass(Toast, {
+            type: ToastTypeEnum.WARNING,
+            title: 'Warning!',
+            message,
+        }));
+    }
+    error(message) {
+        this.add(plainToClass(Toast, {
+            type: ToastTypeEnum.ERROR,
+            title: 'Error!',
+            message,
+        }));
+    }
+    info(message) {
+        this.add(plainToClass(Toast, {
+            type: ToastTypeEnum.INFO,
+            title: 'Information',
+            message,
+        }));
+    }
+}
+ToastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ToastService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+ToastService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ToastService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ToastService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
 /**
  * Abstract base service that implements common services functionality
  * and describe abstract methods/properties that have to be implemented in child services
  * Model - entity service is working with
  * BaseModel - base entity model that extends by Model
+ * @TODO Alex: refactor all services for work with collections instead of arrays
+ * @TODO Alex: implement smart system of default toast messages
  */
 class RestService {
-    constructor(http, eventDispatcherService, environment) {
+    constructor(http, eventDispatcherService, environment, toastService) {
         this.http = http;
         this.eventDispatcherService = eventDispatcherService;
         this.environment = environment;
+        this.toastService = toastService;
         // subject for service cache
         this.cacheSubject = new ReplaySubject(1);
+        this.listenEvents();
     }
     /**
      * get cached list of all instances
@@ -6688,6 +6932,9 @@ class RestService {
                 this.cache.push(newInstance);
                 this.updateCache();
             }
+            if (this.messageCreated) {
+                this.toastService.success(this.messageCreated);
+            }
             return newInstance;
         }));
     }
@@ -6705,6 +6952,9 @@ class RestService {
                 this.cache.push(...newInstances);
                 this.updateCache();
             }
+            if (this.messageCreatedBatch) {
+                this.toastService.success(this.messageCreatedBatch);
+            }
             return newInstances;
         }));
     }
@@ -6720,6 +6970,9 @@ class RestService {
             const updatedInstance = this.createModelInstance(this.modelClass, updatedItem);
             replace(this.cache, updatedInstance);
             this.updateCache();
+            if (this.messageUpdated) {
+                this.toastService.success(this.messageUpdated);
+            }
             return updatedInstance;
         }));
     }
@@ -6736,6 +6989,9 @@ class RestService {
             updatedInstances.forEach((instance) => {
                 replace(this.cache, instance);
             });
+            if (this.messageUpdatedBatch) {
+                this.toastService.success(this.messageUpdatedBatch);
+            }
             this.updateCache();
             return updatedInstances;
         }));
@@ -6749,6 +7005,9 @@ class RestService {
             .pipe(map(() => {
             this.cache = this.cache.filter((item) => item['id'] !== model['id']);
             this.updateCache();
+            if (this.messageDeleted) {
+                this.toastService.success(this.messageDeleted);
+            }
         }));
     }
     /**
@@ -6761,6 +7020,9 @@ class RestService {
             const ids = models.map((model) => model['id']);
             this.cache = this.cache.filter((item) => !ids.includes(item['id']));
             this.updateCache();
+            if (this.messageDeletedBatch) {
+                this.toastService.success(this.messageDeletedBatch);
+            }
         }));
     }
     /**
@@ -6795,36 +7057,417 @@ class RestService {
      * @param model The class for which you want to create an instance
      * @param baseModel base model instance that we will use as constructor options
      */
-    createModelInstance(model, baseModel) {
-        return plainToClass(model, baseModel, { excludePrefixes: ['@'] });
+    createModelInstance(model, baseModel) {
+        return plainToClass(model, baseModel, { excludePrefixes: ['@'] });
+    }
+    /**
+     * Method that call all listeners. Empty by default. Should be redefined by child services if required
+     */
+    listenEvents() { }
+}
+RestService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: RestService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
+RestService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: RestService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: RestService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }, { type: ToastService }]; } });
+
+/**
+ * Service for work with Property
+ */
+class PropertyService extends RestService {
+    constructor() {
+        super(...arguments);
+        this.modelClass = Property;
+        this.url = 'properties';
+    }
+    listenEvents() {
+        this.listenShareInviteAccepted();
+        this.listenServiceSubscriptionUpdated();
+        // @TODO Alex: consider to refactor property movements logic similar to client-movements
+        this.listenMovementsChanged();
+    }
+    /**
+     * Update cache when share invitation accepted
+     */
+    listenShareInviteAccepted() {
+        this.eventDispatcherService.on(AppEventTypeEnum.PROPERTY_SHARE_UPDATED).subscribe(() => this.resetCache());
+    }
+    /**
+     * Update cache when user's service subscription is updated
+     */
+    listenServiceSubscriptionUpdated() {
+        this.eventDispatcherService.on(AppEventTypeEnum.SERVICE_SUBSCRIPTION_UPDATED).subscribe(() => this.resetCache());
+    }
+    /**
+     * Update cache when property category changed
+     */
+    listenMovementsChanged() {
+        // @TODO change dispatcher logic to work with multiple events
+        this.eventDispatcherService.on(AppEventTypeEnum.PROPERTY_MOVEMENT_CREATED).subscribe(() => this.resetCache());
+        this.eventDispatcherService.on(AppEventTypeEnum.PROPERTY_MOVEMENT_UPDATED).subscribe(() => this.resetCache());
+        this.eventDispatcherService.on(AppEventTypeEnum.PROPERTY_MOVEMENT_DELETED).subscribe(() => this.resetCache());
+    }
+    update(property) {
+        return super.update(property).pipe(map((updatedProperty) => {
+            if (property.documentFile) {
+                this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.PROPERTY_UPDATED_WITH_DOCUMENT, property));
+            }
+            return updatedProperty;
+        }));
+    }
+    getByCategoryId(id) {
+        return this.get().pipe(map((properties) => {
+            return properties.filter((property) => property.category.id === id);
+        }));
+    }
+    /**
+     * Activate deactivated property
+     */
+    activate(property) {
+        return this.http.post(`${this.environment.apiV2}/property-subscriptions`, { user: property.user, property })
+            .pipe(map((propertySubscriptionBase) => {
+            const newPropertySubscription = plainToClass(PropertySubscription, propertySubscriptionBase);
+            const activatedProperty = plainToClass(Property, Object.assign({}, property, { subscriptions: [newPropertySubscription] }));
+            replace(this.cache, activatedProperty);
+            this.updateCache();
+        }));
+    }
+    /**
+     * Deactivate activated property
+     */
+    deactivate(property) {
+        return this.http.delete(`${this.environment.apiV2}/property-subscriptions/${property.getCurrentSubscription().id}`)
+            .pipe(map(() => {
+            const deactivatedProperty = plainToClass(Property, Object.assign({}, property, { subscriptions: [] }));
+            replace(this.cache, deactivatedProperty);
+            this.updateCache();
+        }));
+    }
+    /**
+     * Update property photo
+     * @param property Property instance for photo update
+     * @param photoFormData FormData with property photo image
+     */
+    updatePhoto(property, photoFormData) {
+        return this.http.post(`${this.environment.apiV2}/properties/${property.id}/photo?_method=PUT`, photoFormData)
+            .pipe(map((photoLink) => {
+            property.photo = photoLink;
+            // update properties cache
+            replace(this.cache, property);
+            this.updateCache();
+        }));
+    }
+    getByShareId(id) {
+        return this.get().pipe(map((properties) => {
+            return properties.filter((property) => property.user.id === id);
+        }));
+    }
+    /**
+     * Get list of active user's properties
+     */
+    getActive() {
+        return this.get().pipe(map((properties) => properties.filter((property) => property.isActive)));
+    }
+}
+PropertyService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+PropertyService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+/**
+ * Service to work with income sources
+ */
+class IncomeSourceService extends RestService {
+    constructor() {
+        super(...arguments);
+        this.url = 'income-sources';
+        this.modelClass = IncomeSource;
+        this.incomeSourceTypeSubject = new ReplaySubject(1);
+    }
+    /**
+     * Get income sources tax calculation
+     * @param salaryForecast for which tax should be calculated
+     */
+    getTaxCalculation(salaryForecast) {
+        return this.http.post(`${this.environment.apiV2}/${this.url}/tax-calculation`, salaryForecast)
+            .pipe(map((response) => {
+            return plainToClass(SalaryForecast, response);
+        }));
+    }
+    /**
+     * Add batch of income sources
+     * @param incomeSources to add
+     */
+    addBatch(incomeSources) {
+        return this.http.post(`${this.environment.apiV2}/${this.url}`, incomeSources)
+            .pipe(map((addedIncomeSources) => {
+            // assign respond income sources to provided income sources
+            const assignedIncomeSources = addedIncomeSources
+                .map((incomeSource, index) => Object.assign(plainToClass(IncomeSource, {}), incomeSource, incomeSources[index]));
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.INCOME_SOURCES_CREATED, assignedIncomeSources));
+            this.cache.push(...assignedIncomeSources);
+            this.updateCache();
+            return assignedIncomeSources;
+        }));
+    }
+    /**
+     * Update batch of income sources
+     */
+    updateBatch(incomeSources, queryParams = {}) {
+        return this.http.put(`${this.environment.apiV2}/${this.url}`, incomeSources, queryParams)
+            .pipe(map((updatedItems) => {
+            const updatedInstances = updatedItems.map((item) => this.createModelInstance(this.modelClass, item));
+            updatedInstances.forEach((instance) => {
+                replace(this.cache, instance);
+            });
+            if (incomeSources[0].forecasts.length) {
+                this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.INCOME_SOURCES_UPDATED, incomeSources));
+            }
+            this.updateCache();
+            return updatedInstances;
+        }));
+    }
+    /**
+     * Get income sources by provided types
+     * @param types
+     */
+    getByTypes(types) {
+        return this.get()
+            .pipe(map((incomeSources) => incomeSources
+            .filter((incomeSource) => types.includes(incomeSource.type))));
+    }
+    /**
+     * Get other incomes types
+     */
+    getIncomeSourceTypes() {
+        if (!this.incomeSourceTypes) {
+            this.incomeSourceTypes = [];
+            this.http.get(`${this.environment.apiV2}/income-source-types`)
+                .pipe(map((response) => {
+                return response.map((item) => plainToClass(IncomeSourceType, item));
+            }))
+                .subscribe((otherIncomesTypes) => {
+                this.incomeSourceTypes = otherIncomesTypes;
+                this.incomeSourceTypeSubject.next(this.incomeSourceTypes);
+            });
+        }
+        return this.incomeSourceTypeSubject.asObservable();
+    }
+}
+IncomeSourceService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IncomeSourceService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+IncomeSourceService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IncomeSourceService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IncomeSourceService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+/**
+ * Service that handling user's bank accounts logic
+ */
+class BankAccountService extends RestService {
+    constructor() {
+        super(...arguments);
+        // api url parameter for bank accounts
+        this.url = 'bank-accounts';
+        this.modelClass = BankAccount;
+    }
+    /**
+     * Listen system notifications and update cache when got basiq notification received
+     */
+    listenEvents() {
+        this.listenToEventDispatcherChanges();
+    }
+    /**
+     * Created manual bank account
+     * @param bankAccounts
+     * @param queryParams
+     */
+    addBatch(bankAccounts, queryParams = {}) {
+        return this.http.post(`${this.environment.apiV2}/${this.url}`, bankAccounts)
+            .pipe(map((newBankAccountsBase) => {
+            const newBankAccounts = newBankAccountsBase.map((bankAccountBase) => plainToClass(BankAccount, bankAccountBase));
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.BANK_ACCOUNT_CREATED, newBankAccounts));
+            const tempCache = _.cloneDeep(this.cache);
+            tempCache.push(...newBankAccounts);
+            this.cache = tempCache;
+            this.updateCache();
+            return newBankAccounts;
+        }));
+    }
+    /**
+     * Update bank account and fire event
+     */
+    update(bankAccount) {
+        return super.update(bankAccount).pipe(map((updatedBankAccount) => {
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.BANK_ACCOUNT_UPDATED, updatedBankAccount));
+            return updatedBankAccount;
+        }));
+    }
+    /**
+     * Update bank account opening balance
+     * @param bankAccount Bank account for balance updating
+     */
+    updateOpeningBalance(bankAccount) {
+        return this.http.put(`${this.environment.apiV2}/${this.url}/${bankAccount.id}/opening-balances/${bankAccount.getCurrentYearBalance().id}`, bankAccount.getCurrentYearBalance())
+            .pipe(map((response) => {
+            const tempCache = _.cloneDeep(this.cache);
+            replace(tempCache[tempCache.findIndex((ba) => ba.id === bankAccount.id)].balances, response);
+            this.cache = tempCache;
+            this.updateCache();
+        }));
+    }
+    /**
+     * Update bank account current balance
+     */
+    updateCurrentBalance(bankAccount) {
+        return this.http.put(`${this.environment.apiV2}/${this.url}/${bankAccount.id}/balance`, bankAccount)
+            .pipe(map((response) => {
+            const updatedBankAccount = plainToClass(BankAccount, response);
+            replace(this.cache, updatedBankAccount);
+            this.updateCache();
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.BANK_ACCOUNT_UPDATED, updatedBankAccount));
+            return updatedBankAccount;
+        }));
+    }
+    getOwn() {
+        return this.get()
+            .pipe(map((bankAccounts) => {
+            return bankAccounts.filter((bankAccount) => bankAccount.isOwner(+localStorage.getItem('userId')));
+        }));
+    }
+    /**
+     * Listen to EventDispatcherService events
+     */
+    listenToEventDispatcherChanges() {
+        this.eventDispatcherService.on([
+            AppEventTypeEnum.PROPERTY_SHARE_UPDATED,
+            AppEventTypeEnum.LOAN_PAYOUT_UPDATED,
+            AppEventTypeEnum.BANK_CONNECTION_ADDED
+        ]).subscribe(() => {
+            this.fetch().subscribe((bankAccounts) => {
+                this.cache = bankAccounts;
+                this.updateCache();
+            });
+        });
+    }
+}
+BankAccountService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankAccountService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+BankAccountService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankAccountService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankAccountService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+// @TODO Don't look at the commented code. Will be refactored/removed during TT-1503
+/**
+ * Service for transaction allocations business logic
+ * @TODO alex refactor
+ */
+class TransactionAllocationService extends RestService {
+    constructor() {
+        super(...arguments);
+        // API URL param for transaction allocations
+        this.url = 'transactions-allocations';
+        this.modelClass = TransactionAllocation;
+    }
+    /**
+     * Add single transaction allocation
+     */
+    add(allocation) {
+        return this.addBatch([allocation]).pipe(map((newAllocations) => newAllocations[0]));
+    }
+    /**
+     * get list of transactions allocations related with passed bank transactions list
+     */
+    getByTransactions(transactions) {
+        const ids = transactions.map((transaction) => transaction.id);
+        return this.get()
+            .pipe(map((transactionAllocations) => {
+            return transactionAllocations.filter((allocation) => ids.includes(allocation.transaction.id));
+        }));
+    }
+    listenEvents() {
+        this.onTransactionsCreated();
+        this.onDepreciationCreated();
+        this.onTransactionDeleted();
+    }
+    /**
+     * Reset cache on transactions created
+     */
+    onTransactionsCreated() {
+        this.eventDispatcherService.on(AppEventTypeEnum.TRANSACTIONS_CREATED).subscribe(() => {
+            // Update allocations cache to synchronize data and fire subscriptions
+            this.resetCache();
+        });
+    }
+    /**
+     * Reset cache on depreciation created
+     */
+    onDepreciationCreated() {
+        this.eventDispatcherService.on(AppEventTypeEnum.DEPRECIATIONS_CREATED).subscribe(() => {
+            // Update allocations cache to synchronize data and fire subscriptions
+            this.resetCache();
+        });
+    }
+    /**
+     * Reset cache on transaction deleted
+     */
+    onTransactionDeleted() {
+        this.eventDispatcherService.on(AppEventTypeEnum.TRANSACTION_DELETED).subscribe(() => {
+            // Update allocations cache to synchronize data and fire subscriptions
+            this.resetCache();
+        });
     }
 }
-RestService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: RestService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-RestService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: RestService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: RestService, decorators: [{
+TransactionAllocationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionAllocationService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+TransactionAllocationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionAllocationService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionAllocationService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
-/**
- * Service that handling banks logic
- */
-class BankService extends RestService {
+var MessagesEnum$1;
+(function (MessagesEnum) {
+    MessagesEnum["VEHICLE_CREATED"] = "Vehicle created successfully";
+    MessagesEnum["VEHICLE_UPDATED"] = "Vehicle updated successfully";
+    MessagesEnum["VEHICLE_DELETED"] = "Vehicle deleted successfully";
+    MessagesEnum["VEHICLE_CLAIM_CREATED"] = "Vehicle claim created successfully";
+    MessagesEnum["VEHICLE_CLAIM_UPDATED"] = "Vehicle claim updated successfully";
+    MessagesEnum["VEHICLE_CLAIM_DELETED"] = "Vehicle claim deleted successfully";
+    MessagesEnum["VEHICLE_LOGBOOK_CREATED"] = "Vehicle logbook created successfully";
+    MessagesEnum["VEHICLE_LOGBOOK_UPDATED"] = "Vehicle logbook updated successfully";
+    MessagesEnum["VEHICLE_LOGBOOK_DELETED"] = "Vehicle logbook deleted successfully";
+})(MessagesEnum$1 || (MessagesEnum$1 = {}));
+
+class VehicleClaimService extends RestService {
     constructor() {
         super(...arguments);
-        this.modelClass = Bank;
-        this.url = 'banks';
-        this.isHydra = true;
+        this.modelClass = VehicleClaim;
+        this.url = 'vehicle-claims';
+        this.messageCreated = MessagesEnum$1.VEHICLE_CLAIM_CREATED;
+        this.messageUpdated = MessagesEnum$1.VEHICLE_CLAIM_UPDATED;
+        this.messageDeleted = MessagesEnum$1.VEHICLE_CLAIM_DELETED;
     }
 }
-BankService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BankService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankService, decorators: [{
+VehicleClaimService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+VehicleClaimService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -6832,111 +7475,198 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
         }] });
 
 /**
- * Service that handling user's bank accounts logic
+ * Service handling user's account setup process.
+ * Checks required steps and their completion
  */
-class BankAccountService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
-        // api url parameter for bank accounts
-        this.url = 'bank-accounts';
-        this.modelClass = BankAccount;
-        this.listenEvents();
+class AccountSetupService {
+    constructor(clientIncomeTypesService, propertyService, incomeSourceService, bankAccountsService, transactionAllocationService, vehicleClaimService) {
+        this.clientIncomeTypesService = clientIncomeTypesService;
+        this.propertyService = propertyService;
+        this.incomeSourceService = incomeSourceService;
+        this.bankAccountsService = bankAccountsService;
+        this.transactionAllocationService = transactionAllocationService;
+        this.vehicleClaimService = vehicleClaimService;
+        this.cacheSubject = new ReplaySubject(1);
     }
     /**
-     * Listen system notifications and update cache when got basiq notification received
+     * Get list of account setup items for current user
      */
-    listenEvents() {
-        this.listenToEventDispatcherChanges();
+    get() {
+        if (!this.cache) {
+            this.clientIncomeTypesService.get().subscribe((incomeTypes) => {
+                combineLatest(this.createBatch(incomeTypes)).subscribe((items) => {
+                    this.cache = new AccountSetupItemCollection(items);
+                    this.cacheSubject.next(this.cache);
+                });
+            });
+        }
+        return this.cacheSubject.asObservable();
     }
     /**
-     * Created manual bank account
-     * @param bankAccounts
-     * @param queryParams
+     * Get a single AccountSetupItem and check it's completion
      */
-    addBatch(bankAccounts, queryParams = {}) {
-        return this.http.post(`${this.environment.apiV2}/${this.url}`, bankAccounts)
-            .pipe(map((newBankAccountsBase) => {
-            const newBankAccounts = newBankAccountsBase.map((bankAccountBase) => plainToClass(BankAccount, bankAccountBase));
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.BANK_ACCOUNT_CREATED, newBankAccounts));
-            const tempCache = _.cloneDeep(this.cache);
-            tempCache.push(...newBankAccounts);
-            this.cache = tempCache;
-            this.updateCache();
-            return newBankAccounts;
+    create(itemType, request) {
+        return request.pipe(map((result) => {
+            const item = ACCOUNT_SETUP_ITEMS[itemType];
+            if (result.length) {
+                item.isCompleted = true;
+            }
+            return item;
         }));
     }
     /**
-     * Update bank account and fire event
+     * Get batch of requests to get list of required AccountSetupItem's.
+     * Some items are optional and depends of user's client income types
      */
-    update(bankAccount) {
-        return super.update(bankAccount).pipe(map((updatedBankAccount) => {
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.BANK_ACCOUNT_UPDATED, updatedBankAccount));
-            return updatedBankAccount;
-        }));
+    createBatch(incomeTypes) {
+        const batch = [];
+        // Salary item is completed when user added salary income source
+        if (incomeTypes.salary) {
+            batch.push(this.create(AccountSetupItemsEnum.SALARY, this.getIncomeSourcesByType(IncomeSourceTypeEnum.SALARY)));
+        }
+        // Other income item is completed when user added at least one other income source
+        if (incomeTypes.dividends || incomeTypes.other) {
+            batch.push(this.create(AccountSetupItemsEnum.OTHER_INCOME, this.getIncomeSourcesByType(IncomeSourceTypeEnum.OTHER)));
+        }
+        // Rental income item is completed when user added at least one property
+        if (incomeTypes.rental) {
+            batch.push(this.create(AccountSetupItemsEnum.PROPERTY, this.propertyService.get()));
+        }
+        // Bank feeds item is completed when user added at least one bank account (basiq or manual)
+        batch.push(this.create(AccountSetupItemsEnum.BANK_FEEDS, this.bankAccountsService.get()));
+        // Logbook item is completed when user has at least one vehicle claim with any method (klms or logbook)
+        batch.push(this.create(AccountSetupItemsEnum.WORK_LOGBOOK, this.vehicleClaimService.get()));
+        // @TODO waiting for sole tank forecast page
+        // Sole item is completed when user added at least one sole income source
+        // if (incomeTypes.soleTrader) {
+        //   batch.push(
+        //     this.prepareItem(
+        //       AccountSetupItemsEnum.SOLE_INCOME,
+        //       this.getIncomeSourcesByType(IncomeSourceTypeEnum.SOLE)
+        //     )
+        //   );
+        // }
+        // Allocation item is completed when user added at least one transaction allocation
+        batch.push(this.create(AccountSetupItemsEnum.TRANSACTION, this.transactionAllocationService.get()));
+        return batch;
+    }
+    /**
+     * @TODO work with collection when services refactored
+     */
+    getIncomeSourcesByType(type) {
+        return this.incomeSourceService.get().pipe(map((incomeSources) => {
+            return new IncomeSourceCollection(incomeSources).getBy('type', type).toArray();
+        }));
+    }
+}
+AccountSetupService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AccountSetupService, deps: [{ token: ClientIncomeTypesService }, { token: PropertyService }, { token: IncomeSourceService }, { token: BankAccountService }, { token: TransactionAllocationService }, { token: VehicleClaimService }], target: i0.ɵɵFactoryTarget.Injectable });
+AccountSetupService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AccountSetupService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AccountSetupService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: ClientIncomeTypesService }, { type: PropertyService }, { type: IncomeSourceService }, { type: BankAccountService }, { type: TransactionAllocationService }, { type: VehicleClaimService }]; } });
+
+class AddressService {
+    constructor(http, environment) {
+        this.http = http;
+        this.environment = environment;
+        this.countriesSubject = new ReplaySubject(1);
+    }
+    getCountries() {
+        if (!this._countries) {
+            this.http.get(`${this.environment.apiV2}/countries`)
+                .pipe(map((response) => {
+                return response['hydra:member'].map((item) => plainToClass(Country, item));
+            }))
+                .subscribe((countries) => {
+                this._countries = countries;
+                this.countriesSubject.next(countries);
+            });
+        }
+        return this.countriesSubject.asObservable();
+    }
+}
+AddressService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AddressService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+AddressService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AddressService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AddressService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }]; } });
+
+/**
+ * Service to work with assets (documents, receipts, e.t.c.)
+ */
+class AssetsService {
+    constructor(http, userSwitcherService, environment) {
+        this.http = http;
+        this.userSwitcherService = userSwitcherService;
+        this.environment = environment;
+        this.impersonatedClient = this.userSwitcherService.get();
     }
     /**
-     * Update bank account opening balance
-     * @param bankAccount Bank account for balance updating
+     * Get asset link
+     * @param asset to get the link for
      */
-    updateOpeningBalance(bankAccount) {
-        return this.http.put(`${this.environment.apiV2}/${this.url}/${bankAccount.id}/opening-balances/${bankAccount.getCurrentYearBalance().id}`, bankAccount.getCurrentYearBalance())
-            .pipe(map((response) => {
-            const tempCache = _.cloneDeep(this.cache);
-            replace(tempCache[tempCache.findIndex((ba) => ba.id === bankAccount.id)].balances, response);
-            this.cache = tempCache;
-            this.updateCache();
-        }));
+    getLink(asset) {
+        return this.http.get(`${this.environment.apiV2}/assets/${asset.type}/${asset.id}`);
     }
     /**
-     * Update bank account current balance
+     * Download asset
+     * @param asset which should be downloaded
+     * @TODO refactor
      */
-    updateCurrentBalance(bankAccount) {
-        return this.http.put(`${this.environment.apiV2}/${this.url}/${bankAccount.id}/balance`, bankAccount)
-            .pipe(map((response) => {
-            const updatedBankAccount = plainToClass(BankAccount, response);
-            replace(this.cache, updatedBankAccount);
-            this.updateCache();
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.BANK_ACCOUNT_UPDATED, updatedBankAccount));
-            return updatedBankAccount;
-        }));
-    }
-    getOwn() {
-        return this.get()
-            .pipe(map((bankAccounts) => {
-            return bankAccounts.filter((bankAccount) => bankAccount.isOwner(+localStorage.getItem('userId')));
-        }));
+    download(asset) {
+        return `${this.environment.apiV2}/assets/${asset.type}/${asset.id}/download?bearer=${localStorage.getItem('token')}${this.impersonatedClient ? `&_switch_user=${this.impersonatedClient}` : ''}`;
     }
+    // @Todo refactor to event dispatcher
     /**
-     * Listen to EventDispatcherService events
+     * Delete asset
+     * @param entityId: id of asset main entity (property, folder, transaction, e.t.c.)
+     * @param asset which should be deleted
      */
-    listenToEventDispatcherChanges() {
-        this.eventDispatcherService.on([
-            AppEventTypeEnum.PROPERTY_SHARE_UPDATED,
-            AppEventTypeEnum.LOAN_PAYOUT_UPDATED,
-            AppEventTypeEnum.BANK_CONNECTION_ADDED
-        ]).subscribe(() => {
-            this.fetch().subscribe((bankAccounts) => {
-                this.cache = bankAccounts;
-                this.updateCache();
-            });
-        });
+    delete(entityId, asset) {
+        return this.http.delete(`${this.environment.apiV2}/${asset.entityType}/${entityId}/${asset.type}/${asset.id}`);
     }
 }
-BankAccountService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankAccountService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-BankAccountService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankAccountService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankAccountService, decorators: [{
+AssetsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AssetsService, deps: [{ token: i1.HttpClient }, { token: UserSwitcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+AssetsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AssetsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AssetsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: UserSwitcherService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
                 }] }]; } });
 
+/**
+ * Service that handling banks logic
+ */
+class BankService extends RestService {
+    constructor() {
+        super(...arguments);
+        this.modelClass = Bank;
+        this.url = 'banks';
+        this.isHydra = true;
+    }
+}
+BankService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+BankService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
 /**
  * @TODO move to collection
  */
@@ -7031,14 +7761,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
  * service handles BankConnection management
  */
 class BankConnectionService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
+    constructor() {
+        super(...arguments);
         this.modelClass = BankConnection;
         this.url = 'bank-connections';
-        this.listenEvents();
     }
     listenEvents() {
         this.listenToAddedBankAccounts();
@@ -7056,31 +7782,24 @@ class BankConnectionService extends RestService {
         });
     }
 }
-BankConnectionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankConnectionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+BankConnectionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankConnectionService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 BankConnectionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankConnectionService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankConnectionService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
 /**
  * Service for bank transactions business logic
  */
 class BankTransactionService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
+    constructor() {
+        super(...arguments);
         // url part for BankTransaction API
         this.url = 'bank-transactions';
         this.modelClass = BankTransaction;
-        this.listenEvents();
     }
     listenEvents() {
         this.listenBankTransactionsImport();
@@ -7134,32 +7853,25 @@ class BankTransactionService extends RestService {
         });
     }
 }
-BankTransactionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankTransactionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+BankTransactionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankTransactionService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 BankTransactionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankTransactionService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankTransactionService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
 /**
  * basiq is a middleman between bank and user
  * service is responsible for fetching bank related information
  */
 class BasiqService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
+    constructor() {
+        super(...arguments);
         this.tokenSubject = new ReplaySubject();
         this.url = 'basiq/accounts';
         this.modelClass = BankAccount;
-        this.listenEvents();
     }
     /**
      * Listen events from Event Dispatcher service
@@ -7217,17 +7929,14 @@ class BasiqService extends RestService {
         });
     }
 }
-BasiqService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+BasiqService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 BasiqService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
 class BorrowingExpenseService {
     constructor(http, environment) {
@@ -7450,21 +8159,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
  * Service for work with chats
  */
 class ChatService extends RestService {
-    constructor(http, eventDispatcherService, environment, sseService) {
-        super(http, eventDispatcherService, environment);
+    constructor(http, eventDispatcherService, environment, toastService, sseService) {
+        super(http, eventDispatcherService, environment, toastService);
         this.http = http;
         this.eventDispatcherService = eventDispatcherService;
         this.environment = environment;
+        this.toastService = toastService;
         this.sseService = sseService;
         this.modelClass = Chat;
         this.url = 'chats';
         this.isHydra = true;
-        this.listenEvents();
-    }
-    /**
-     * SSE and Event Dispatcher Services listeners
-     */
-    listenEvents() {
         this.listenChats();
     }
     /**
@@ -7501,7 +8205,7 @@ class ChatService extends RestService {
         });
     }
 }
-ChatService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ChatService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable });
+ChatService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ChatService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable });
 ChatService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ChatService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ChatService, decorators: [{
             type: Injectable,
@@ -7511,27 +8215,22 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
         }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
-                }] }, { type: SseService }]; } });
+                }] }, { type: ToastService }, { type: SseService }]; } });
 
 /**
  * Service for work with messages
  */
 class MessageService extends RestService {
-    constructor(http, eventDispatcherService, environment, sseService) {
-        super(http, eventDispatcherService, environment);
+    constructor(http, eventDispatcherService, environment, toastService, sseService) {
+        super(http, eventDispatcherService, environment, toastService);
         this.http = http;
         this.eventDispatcherService = eventDispatcherService;
         this.environment = environment;
+        this.toastService = toastService;
         this.sseService = sseService;
         this.modelClass = Message;
         this.url = 'messages';
         this.isHydra = true;
-        this.listenEvents();
-    }
-    /**
-     * SSE and Event Dispatcher Services listeners
-     */
-    listenEvents() {
         this.listenMessages();
     }
     /**
@@ -7554,7 +8253,7 @@ class MessageService extends RestService {
         });
     }
 }
-MessageService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: MessageService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable });
+MessageService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: MessageService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable });
 MessageService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: MessageService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: MessageService, decorators: [{
             type: Injectable,
@@ -7564,7 +8263,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
         }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
-                }] }, { type: SseService }]; } });
+                }] }, { type: ToastService }, { type: SseService }]; } });
 
 // @TODO improve base rest service and extend it
 /**
@@ -7767,15 +8466,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
         }] });
 
 class ClientMovementService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
+    constructor() {
+        super(...arguments);
         this.modelClass = ClientMovement;
         this.url = 'client-movements';
         this.isHydra = true;
-        this.listenEvents();
     }
     /**
      * @TODO BaseRestService should return collection
@@ -7840,17 +8535,14 @@ class ClientMovementService extends RestService {
         });
     }
 }
-ClientMovementService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientMovementService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+ClientMovementService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientMovementService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 ClientMovementService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientMovementService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientMovementService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
 // @Todo refactor with BaseRest service
 /**
@@ -7937,14 +8629,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
                 }] }]; } });
 
 class DepreciationService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
+    constructor() {
+        super(...arguments);
         this.modelClass = Depreciation;
         this.url = 'depreciations';
-        this.listenEvents();
     }
     /**
      * Add a single depreciation
@@ -7975,14 +8663,6 @@ class DepreciationService extends RestService {
         this.listenToVehicleClaim();
         this.listenToUpdatedBankAccount();
     }
-    /**
-     * Get depreciations related to Vehicle category
-     */
-    getVehicleDepreciations() {
-        return this.get().pipe(map((depreciations) => {
-            return depreciations.filter((depreciation) => depreciation.isVehicleDepreciation());
-        }));
-    }
     getOpenBalance(depreciation) {
         return this.http.post(`${this.environment.apiV2}/${this.url}/opening-balance?financialYear=${new FinancialYear().year}`, depreciation)
             .pipe(map((response) => {
@@ -8057,27 +8737,21 @@ class DepreciationService extends RestService {
         });
     }
 }
-DepreciationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DepreciationService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+DepreciationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DepreciationService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 DepreciationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DepreciationService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DepreciationService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
 /**
  * Service to handle document-folders and depending documents logic
  */
 class DocumentFolderService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
+    constructor() {
+        super(...arguments);
         this.url = 'folders';
         this.modelClass = DocumentFolder;
     }
@@ -8131,17 +8805,14 @@ class DocumentFolderService extends RestService {
         }));
     }
 }
-DocumentFolderService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DocumentFolderService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+DocumentFolderService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DocumentFolderService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 DocumentFolderService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DocumentFolderService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DocumentFolderService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
 class EmployeeService extends RestService {
     constructor() {
@@ -8314,113 +8985,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
                 }]
         }], ctorParameters: function () { return [{ type: i1$1.Router }, { type: i1$1.ActivatedRoute }]; } });
 
-/**
- * Service to work with income sources
- */
-class IncomeSourceService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
-        this.url = 'income-sources';
-        this.modelClass = IncomeSource;
-        this.incomeSourceTypeSubject = new ReplaySubject(1);
-    }
-    /**
-     * Get income sources tax calculation
-     * @param salaryForecast for which tax should be calculated
-     */
-    getTaxCalculation(salaryForecast) {
-        return this.http.post(`${this.environment.apiV2}/${this.url}/tax-calculation`, salaryForecast)
-            .pipe(map((response) => {
-            return plainToClass(SalaryForecast, response);
-        }));
-    }
-    /**
-     * Add batch of income sources
-     * @param incomeSources to add
-     */
-    addBatch(incomeSources) {
-        return this.http.post(`${this.environment.apiV2}/${this.url}`, incomeSources)
-            .pipe(map((addedIncomeSources) => {
-            // assign respond income sources to provided income sources
-            const assignedIncomeSources = addedIncomeSources
-                .map((incomeSource, index) => Object.assign(plainToClass(IncomeSource, {}), incomeSource, incomeSources[index]));
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.INCOME_SOURCES_CREATED, assignedIncomeSources));
-            this.cache.push(...assignedIncomeSources);
-            this.updateCache();
-            return assignedIncomeSources;
-        }));
-    }
-    /**
-     * Update batch of income sources
-     */
-    updateBatch(incomeSources, queryParams = {}) {
-        return this.http.put(`${this.environment.apiV2}/${this.url}`, incomeSources, queryParams)
-            .pipe(map((updatedItems) => {
-            const updatedInstances = updatedItems.map((item) => this.createModelInstance(this.modelClass, item));
-            updatedInstances.forEach((instance) => {
-                replace(this.cache, instance);
-            });
-            if (incomeSources[0].forecasts.length) {
-                this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.INCOME_SOURCES_UPDATED, incomeSources));
-            }
-            this.updateCache();
-            return updatedInstances;
-        }));
-    }
-    /**
-     * Get income sources by provided types
-     * @param types
-     */
-    getByTypes(types) {
-        return this.get()
-            .pipe(map((incomeSources) => incomeSources
-            .filter((incomeSource) => types.includes(incomeSource.type))));
-    }
-    /**
-     * Get other incomes types
-     */
-    getIncomeSourceTypes() {
-        if (!this.incomeSourceTypes) {
-            this.incomeSourceTypes = [];
-            this.http.get(`${this.environment.apiV2}/income-source-types`)
-                .pipe(map((response) => {
-                return response.map((item) => plainToClass(IncomeSourceType, item));
-            }))
-                .subscribe((otherIncomesTypes) => {
-                this.incomeSourceTypes = otherIncomesTypes;
-                this.incomeSourceTypeSubject.next(this.incomeSourceTypes);
-            });
-        }
-        return this.incomeSourceTypeSubject.asObservable();
-    }
-}
-IncomeSourceService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IncomeSourceService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-IncomeSourceService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IncomeSourceService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IncomeSourceService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
-
 /**
  * Service to work with Other Income Forecasts
  */
 class IncomeSourceForecastService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
+    constructor() {
+        super(...arguments);
         this.modelClass = IncomeSourceForecast;
         this.url = 'income-source-forecasts';
-        this.listenEvents();
     }
     /**
      * Listen to Income Sources events
@@ -8476,30 +9048,23 @@ class IncomeSourceForecastService extends RestService {
         }).flat();
     }
 }
-IncomeSourceForecastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IncomeSourceForecastService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+IncomeSourceForecastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IncomeSourceForecastService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 IncomeSourceForecastService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IncomeSourceForecastService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IncomeSourceForecastService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
 /**
  * Service to work with Salary Forecasts
  */
 class SalaryForecastService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
+    constructor() {
+        super(...arguments);
         this.modelClass = SalaryForecast;
         this.url = 'salary-forecasts';
-        this.listenEvents();
     }
     /**
      * Listen to Income Sources events
@@ -8555,27 +9120,20 @@ class SalaryForecastService extends RestService {
         }).flat();
     }
 }
-SalaryForecastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SalaryForecastService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+SalaryForecastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SalaryForecastService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 SalaryForecastService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SalaryForecastService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SalaryForecastService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
 class SoleForecastService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
+    constructor() {
+        super(...arguments);
         this.modelClass = SoleForecast;
         this.url = 'sole-forecasts';
-        this.listenEvents();
     }
     /**
      * Listen to Income Sources events
@@ -8631,17 +9189,14 @@ class SoleForecastService extends RestService {
         }).flat();
     }
 }
-SoleForecastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleForecastService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+SoleForecastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleForecastService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 SoleForecastService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleForecastService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleForecastService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
 /**
  * Service to work with intercom
@@ -8713,14 +9268,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
  * Service that handling loans logic
  */
 class LoanService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
+    constructor() {
+        super(...arguments);
         this.url = 'bank-accounts/loans';
         this.modelClass = Loan;
-        this.listenEvents();
     }
     /**
      * Listen to Loans events
@@ -8830,37 +9381,29 @@ class LoanService extends RestService {
         }));
     }
 }
-LoanService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: LoanService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+LoanService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: LoanService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 LoanService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: LoanService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: LoanService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
 /**
  * Service to handle service notifications logic
  */
 class ServiceNotificationService extends RestService {
-    constructor(http, eventDispatcherService, environment, sseService) {
-        super(http, eventDispatcherService, environment);
+    constructor(http, eventDispatcherService, environment, toastService, sseService) {
+        super(http, eventDispatcherService, environment, toastService);
         this.http = http;
         this.eventDispatcherService = eventDispatcherService;
         this.environment = environment;
+        this.toastService = toastService;
         this.sseService = sseService;
         this.modelClass = Notification;
         this.url = 'service-notifications';
         this.isHydra = true;
-        this.listenEvents();
-    }
-    /**
-     * SSE and Event Dispatcher Services listeners
-     */
-    listenEvents() {
         this.listenNotifications();
     }
     /**
@@ -8883,7 +9426,7 @@ class ServiceNotificationService extends RestService {
         });
     }
 }
-ServiceNotificationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ServiceNotificationService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable });
+ServiceNotificationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ServiceNotificationService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable });
 ServiceNotificationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ServiceNotificationService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ServiceNotificationService, decorators: [{
             type: Injectable,
@@ -8893,7 +9436,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
         }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
-                }] }, { type: SseService }]; } });
+                }] }, { type: ToastService }, { type: SseService }]; } });
 
 /**
  * Configuration file with the settings to generate PDF file
@@ -8914,7 +9457,7 @@ const PDF_CONFIG = {
         src: '/assets/img/icons/logo.png',
         width: 30,
         height: 7,
-        positionX: 168,
+        positionX: 42,
         positionY: 6
     },
     // coords for file section title (group, table, e.t.c.)
@@ -8927,194 +9470,105 @@ const PDF_CONFIG = {
     },
     table: {
         headStyles: {
-            fillColor: '#00b7f0',
-            lineWidth: .2,
-            halign: 'center'
-        },
-        footStyles: {
-            fillColor: '#ffffff',
-            textColor: '#000000'
-        },
-    }
-};
-
-/**
- * Service to work with PDF (generate, download, e.t.c.)
- */
-class PdfService {
-    /**
-     * Export file form provided HTML tables
-     */
-    exportTables(tables, title, fileName) {
-        const document = this.generateFromTables(tables, title);
-        document.save(`${fileName}.pdf`);
-    }
-    generateFromTables(tables, title) {
-        const pdf = new jsPDF();
-        this.setDocumentTitle(pdf, title);
-        this.setDocumentLogo(pdf);
-        tables.forEach((table) => {
-            var _a;
-            // Add table caption if not provided
-            if (!table.caption) {
-                table.createCaption();
-                table.caption.innerText = '';
-            }
-            // coords of last table
-            const lastTableCoords = pdf['lastAutoTable'].finalY || PDF_CONFIG.contentCoords.marginTop;
-            pdf.text(table.caption.innerText, PDF_CONFIG.contentCoords.marginLeft, lastTableCoords + PDF_CONFIG.contentCoords.marginTop);
-            // get caption height based on caption content height
-            const captionHeight = pdf.getTextDimensions(pdf.splitTextToSize((_a = table.caption) === null || _a === void 0 ? void 0 : _a.innerText, pdf.internal.pageSize.width)).h;
-            // table options
-            const options = {
-                html: table,
-                startY: lastTableCoords + captionHeight + PDF_CONFIG.contentTitleCoords.marginTop,
-                headStyles: PDF_CONFIG.table.headStyles,
-                footStyles: PDF_CONFIG.table.footStyles,
-                didParseCell: (data) => {
-                    // Align last column content to right
-                    if (data.table.columns.length > 1 && (data.column.index === data.table.columns.length - 1)) {
-                        data.cell.styles.halign = 'right';
-                    }
-                }
-            };
-            autoTable(pdf, options);
-        });
-        return pdf;
-    }
-    setDocumentTitle(doc, title) {
-        doc.setFontSize(PDF_CONFIG.text.fontSize)
-            .setFont(PDF_CONFIG.text.fontName, PDF_CONFIG.text.fontStyle, PDF_CONFIG.text.fontWeight)
-            .text(title, PDF_CONFIG.text.positionX, PDF_CONFIG.text.positionY);
-    }
-    setDocumentLogo(doc) {
-        const logo = new Image();
-        logo.src = PDF_CONFIG.logo.src;
-        doc.addImage(logo, 'PNG', PDF_CONFIG.logo.positionX, PDF_CONFIG.logo.positionY, PDF_CONFIG.logo.width, PDF_CONFIG.logo.height);
-    }
-}
-PdfService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PdfService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-PdfService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PdfService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PdfService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
-/**
- * Service for work with Property
- */
-class PropertyService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
-        this.modelClass = Property;
-        this.url = 'properties';
-        this.listenEvents();
-    }
-    listenEvents() {
-        this.listenShareInviteAccepted();
-        this.listenServiceSubscriptionUpdated();
-        // @TODO Alex: consider to refactor property movements logic similar to client-movements
-        this.listenMovementsChanged();
+            fillColor: '#00b7f0',
+            lineWidth: .2,
+            halign: 'center'
+        },
+        footStyles: {
+            fillColor: '#ffffff',
+            textColor: '#000000'
+        },
     }
+};
+
+/**
+ * Service to work with PDF (generate, download, e.t.c.)
+ */
+class PdfService {
     /**
-     * Update cache when share invitation accepted
+     * Export file from provided HTML tables
      */
-    listenShareInviteAccepted() {
-        this.eventDispatcherService.on(AppEventTypeEnum.PROPERTY_SHARE_UPDATED).subscribe(() => this.resetCache());
+    exportTables(tables, title, fileName, orientation) {
+        const document = this.generateFromTables(orientation, tables, title);
+        document.save(`${fileName}.pdf`);
     }
     /**
-     * Update cache when user's service subscription is updated
+     * Export file from provided array-like table data
      */
-    listenServiceSubscriptionUpdated() {
-        this.eventDispatcherService.on(AppEventTypeEnum.SERVICE_SUBSCRIPTION_UPDATED).subscribe(() => this.resetCache());
+    exportFromDataTables(dataTables, title, fileName) {
+        const document = this.generateFromDataTables(title, dataTables);
+        document.save(`${fileName}.pdf`);
     }
     /**
-     * Update cache when property category changed
+     * Generate file from array-like table data
      */
-    listenMovementsChanged() {
-        // @TODO change dispatcher logic to work with multiple events
-        this.eventDispatcherService.on(AppEventTypeEnum.PROPERTY_MOVEMENT_CREATED).subscribe(() => this.resetCache());
-        this.eventDispatcherService.on(AppEventTypeEnum.PROPERTY_MOVEMENT_UPDATED).subscribe(() => this.resetCache());
-        this.eventDispatcherService.on(AppEventTypeEnum.PROPERTY_MOVEMENT_DELETED).subscribe(() => this.resetCache());
+    generateFromDataTables(title, dataTables) {
+        const pdf = new jsPDF();
+        this.setDocumentTitle(pdf, title);
+        this.setDocumentLogo(pdf);
+        dataTables.forEach((dataTable) => {
+            autoTable(pdf, Object.assign({ head: [dataTable.header], body: dataTable.rows, foot: [dataTable.footer] }, this.setTableOptions(pdf, dataTable.caption)));
+        });
+        return pdf;
     }
-    update(property) {
-        return super.update(property).pipe(map((updatedProperty) => {
-            if (property.documentFile) {
-                this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.PROPERTY_UPDATED_WITH_DOCUMENT, property));
+    generateFromTables(orientation, tables, title) {
+        const pdf = new jsPDF(orientation);
+        this.setDocumentTitle(pdf, title);
+        this.setDocumentLogo(pdf);
+        tables.forEach((table) => {
+            // Add table caption if not provided
+            if (!table.caption) {
+                table.createCaption();
+                table.caption.innerText = '';
             }
-            return updatedProperty;
-        }));
-    }
-    getByCategoryId(id) {
-        return this.get().pipe(map((properties) => {
-            return properties.filter((property) => property.category.id === id);
-        }));
-    }
-    /**
-     * Activate deactivated property
-     */
-    activate(property) {
-        return this.http.post(`${this.environment.apiV2}/property-subscriptions`, { user: property.user, property })
-            .pipe(map((propertySubscriptionBase) => {
-            const newPropertySubscription = plainToClass(PropertySubscription, propertySubscriptionBase);
-            const activatedProperty = plainToClass(Property, Object.assign({}, property, { subscriptions: [newPropertySubscription] }));
-            replace(this.cache, activatedProperty);
-            this.updateCache();
-        }));
-    }
-    /**
-     * Deactivate activated property
-     */
-    deactivate(property) {
-        return this.http.delete(`${this.environment.apiV2}/property-subscriptions/${property.getCurrentSubscription().id}`)
-            .pipe(map(() => {
-            const deactivatedProperty = plainToClass(Property, Object.assign({}, property, { subscriptions: [] }));
-            replace(this.cache, deactivatedProperty);
-            this.updateCache();
-        }));
+            autoTable(pdf, Object.assign({ html: table }, this.setTableOptions(pdf, table.caption.innerText)));
+        });
+        return pdf;
     }
     /**
-     * Update property photo
-     * @param property Property instance for photo update
-     * @param photoFormData FormData with property photo image
+     * Set basic options for PDF table
      */
-    updatePhoto(property, photoFormData) {
-        return this.http.post(`${this.environment.apiV2}/properties/${property.id}/photo?_method=PUT`, photoFormData)
-            .pipe(map((photoLink) => {
-            property.photo = photoLink;
-            // update properties cache
-            replace(this.cache, property);
-            this.updateCache();
-        }));
+    setTableOptions(pdf, tableCaption = '') {
+        const lastTableCoords = pdf['lastAutoTable'].finalY || PDF_CONFIG.contentCoords.marginTop;
+        // get caption height based on caption content height
+        const captionHeight = pdf.getTextDimensions(pdf.splitTextToSize(tableCaption, pdf.internal.pageSize.width)).h;
+        pdf.text(tableCaption, PDF_CONFIG.contentCoords.marginLeft, lastTableCoords + PDF_CONFIG.contentCoords.marginTop);
+        return {
+            headStyles: {
+                fillColor: PDF_CONFIG.text.colorPrimary,
+            },
+            footStyles: {
+                fillColor: PDF_CONFIG.text.colorWhite,
+                textColor: PDF_CONFIG.text.colorBlack
+            },
+            startY: lastTableCoords + captionHeight + PDF_CONFIG.contentTitleCoords.marginTop,
+            didParseCell: (data) => {
+                // Align last column content to right
+                if (data.table.columns.length > 1 && (data.column.index === data.table.columns.length - 1)) {
+                    data.cell.styles.halign = 'right';
+                }
+            }
+        };
     }
-    getByShareId(id) {
-        return this.get().pipe(map((properties) => {
-            return properties.filter((property) => property.user.id === id);
-        }));
+    setDocumentTitle(doc, title) {
+        doc.setFontSize(PDF_CONFIG.text.fontSize)
+            .setFont(PDF_CONFIG.text.fontName, PDF_CONFIG.text.fontStyle, PDF_CONFIG.text.fontWeight)
+            .text(title, PDF_CONFIG.text.positionX, PDF_CONFIG.text.positionY);
     }
-    /**
-     * Get list of active user's properties
-     */
-    getActive() {
-        return this.get().pipe(map((properties) => properties.filter((property) => property.isActive)));
+    setDocumentLogo(doc) {
+        const logo = new Image();
+        logo.src = PDF_CONFIG.logo.src;
+        doc.addImage(logo, 'PNG', doc.internal.pageSize.width - PDF_CONFIG.logo.positionX, PDF_CONFIG.logo.positionY, PDF_CONFIG.logo.width, PDF_CONFIG.logo.height);
     }
 }
-PropertyService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-PropertyService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyService, decorators: [{
+PdfService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PdfService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+PdfService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PdfService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PdfService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
 function enumToList(data) {
     const list = [];
@@ -9136,72 +9590,16 @@ var MessagesEnum;
     MessagesEnum["CREATED_MESSAGE"] = "Transaction(s) created";
 })(MessagesEnum || (MessagesEnum = {}));
 
-/**
- * popup notifications service (toast, snackbar).
- */
-class ToastService {
-    constructor() {
-        this.toast$ = new ReplaySubject(1);
-    }
-    get() {
-        return this.toast$.asObservable();
-    }
-    add(toast) {
-        this.toast$.next(toast);
-    }
-    success(message) {
-        this.add(plainToClass(Toast, {
-            type: ToastTypeEnum.SUCCESS,
-            title: 'Success!',
-            message,
-        }));
-    }
-    warning(message) {
-        this.add(plainToClass(Toast, {
-            type: ToastTypeEnum.WARNING,
-            title: 'Warning!',
-            message,
-        }));
-    }
-    error(message) {
-        this.add(plainToClass(Toast, {
-            type: ToastTypeEnum.ERROR,
-            title: 'Error!',
-            message,
-        }));
-    }
-    info(message) {
-        this.add(plainToClass(Toast, {
-            type: ToastTypeEnum.INFO,
-            title: 'Information',
-            message,
-        }));
-    }
-}
-ToastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ToastService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-ToastService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ToastService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ToastService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
 /**
  * Service for transactions business logic
  */
 class TransactionService extends RestService {
-    constructor(http, eventDispatcherService, environment, toastService) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
-        this.toastService = toastService;
+    constructor() {
+        super(...arguments);
         // url part for Transaction API
         this.url = 'transactions';
         this.modelClass = Transaction;
         this.transactionDeleted = new EventEmitter();
-        this.listenEvents();
     }
     /**
      * Listen events from Event Dispatcher services
@@ -9269,6 +9667,15 @@ class TransactionService extends RestService {
             return transactions.filter((transaction) => transaction.isWorkTank());
         }));
     }
+    /**
+     * Get list of property holding costs (transactions related to vacant land property)
+     */
+    getPropertyHoldingCosts(propertyId) {
+        return this.http.get(`${this.environment.apiV2}/${this.url}?propertyId=${propertyId}&propertyCategoryId=${PropertyCategoryListEnum.VACANT_LAND}`)
+            .pipe(map((transactionsBase) => {
+            return transactionsBase.map((transactionBase) => plainToClass(Transaction, transactionBase));
+        }));
+    }
     /**
      * get list of taxable transactions with tank type 'Work'
      */
@@ -9459,14 +9866,6 @@ class TransactionService extends RestService {
                 return null;
         }
     }
-    /**
-     * Get transactions related to Vehicle category
-     */
-    getVehicleTransactions() {
-        return this.get().pipe(map((transactions) => {
-            return transactions.filter((transaction) => transaction.isVehicleTransaction());
-        }));
-    }
     /**
      * Listen to EventDispatcherService event related to Depreciation changing
      */
@@ -9486,17 +9885,14 @@ class TransactionService extends RestService {
         this.eventDispatcherService.on(AppEventTypeEnum.PROPERTY_SHARE_UPDATED).subscribe(() => this.resetCache());
     }
 }
-TransactionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
+TransactionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 TransactionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }, { type: ToastService }]; } });
+        }] });
 
 /**
  * Service to handle Property transactions report items data (get income / expense report items, e.t.c.)
@@ -9674,6 +10070,52 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
                 }]
         }] });
 
+/**
+ * Service to work with holding costs (transactions related to vacant land property)
+ */
+class PropertyHoldingCostsService {
+    constructor(pdfService, currencyPipe, datePipe) {
+        this.pdfService = pdfService;
+        this.currencyPipe = currencyPipe;
+        this.datePipe = datePipe;
+        this.url = 'transactions';
+        this.modelClass = Transaction;
+    }
+    initDataTable(holdingCosts) {
+        return plainToClass(ExportDataTable, {
+            header: ['Date', 'Description', 'Debit', 'Credit'],
+            rows: this.getDataTableRows(holdingCosts),
+            footer: [
+                'Total',
+                '',
+                this.currencyPipe.transform(holdingCosts.sumBy('debit')).toString(),
+                this.currencyPipe.transform(holdingCosts.sumBy('credit')).toString(),
+            ]
+        });
+    }
+    /**
+     * Get data for the exporting table rows
+     */
+    getDataTableRows(holdingCosts) {
+        return holdingCosts.items.map((transaction) => {
+            return [
+                this.datePipe.transform(transaction.date, 'dd/MM/YYYY').toString(),
+                transaction.description,
+                this.currencyPipe.transform(transaction.debit).toString(),
+                this.currencyPipe.transform(transaction.credit).toString()
+            ];
+        });
+    }
+}
+PropertyHoldingCostsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyHoldingCostsService, deps: [{ token: PdfService }, { token: i2.CurrencyPipe }, { token: i2.DatePipe }], target: i0.ɵɵFactoryTarget.Injectable });
+PropertyHoldingCostsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyHoldingCostsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyHoldingCostsService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: PdfService }, { type: i2.CurrencyPipe }, { type: i2.DatePipe }]; } });
+
 /**
  * Service for work with Property Categories
  */
@@ -9697,14 +10139,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
  * Class for work with Property Documents
  */
 class PropertyDocumentService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
+    constructor() {
+        super(...arguments);
         this.modelClass = PropertyDocument;
         this.url = 'properties/documents';
-        this.listenEvents();
     }
     /**
      * Add new Property Document
@@ -9742,29 +10180,22 @@ class PropertyDocumentService extends RestService {
         });
     }
 }
-PropertyDocumentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyDocumentService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+PropertyDocumentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyDocumentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 PropertyDocumentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyDocumentService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyDocumentService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
 // @TODO check and improve logic during refactoring
 class PropertyShareService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
+    constructor() {
+        super(...arguments);
         // api url parameter for properties shares
         this.url = 'properties/shares';
         this.modelClass = PropertyShare;
-        this.listenEvents();
     }
     /**
      * Listen to Event Dispatcher events
@@ -9846,17 +10277,14 @@ class PropertyShareService extends RestService {
         });
     }
 }
-PropertyShareService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyShareService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+PropertyShareService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyShareService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 PropertyShareService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyShareService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyShareService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
 class PropertySaleService extends RestService {
     constructor() {
@@ -9962,9 +10390,6 @@ class SubscriptionService {
         this.serviceSubscriptionsSubject = new ReplaySubject(1);
         this.servicePaymentsSubject = new ReplaySubject(1);
         this.subscriptionChangeSubject = new BehaviorSubject(null);
-        this.listenEvents();
-    }
-    listenEvents() {
         this.listenSubscriptions();
     }
     getSubscription(force = false) {
@@ -10095,14 +10520,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
  * Service to work with tax review
  */
 class TaxReviewService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
+    constructor() {
+        super(...arguments);
         this.url = 'tax-reviews';
         this.modelClass = TaxReview;
-        this.listenEvents();
     }
     /**
      * Listen events from SSE and Event Dispatcher services
@@ -10170,31 +10591,32 @@ class TaxReviewService extends RestService {
         });
     }
 }
-TaxReviewService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxReviewService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+TaxReviewService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxReviewService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 TaxReviewService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxReviewService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxReviewService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
 /**
  * Service to work with tax review history
  */
 class TaxReviewHistoryService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
+    constructor() {
+        super(...arguments);
         this.url = 'tax-reviews/history';
         this.modelClass = TaxReview;
-        // subscribe on tax review updating
-        eventDispatcherService.on(AppEventTypeEnum.TAX_REVIEW_UPDATED).subscribe((taxReview) => {
+    }
+    listenEvents() {
+        this.listenTaxReviewUpdate();
+    }
+    /**
+     * Update tax review history cache when single tax review updated.
+     */
+    listenTaxReviewUpdate() {
+        this.eventDispatcherService.on(AppEventTypeEnum.TAX_REVIEW_UPDATED).subscribe((taxReview) => {
             const tempCache = _.cloneDeep(this.cache);
             // insert element at the beginning of the array
             tempCache.unshift(taxReview);
@@ -10203,17 +10625,14 @@ class TaxReviewHistoryService extends RestService {
         });
     }
 }
-TaxReviewHistoryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxReviewHistoryService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+TaxReviewHistoryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxReviewHistoryService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 TaxReviewHistoryService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxReviewHistoryService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxReviewHistoryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
 /**
  * Service to work with tax summary logic
@@ -10277,83 +10696,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
                     args: ['environment']
                 }] }]; } });
 
-// @TODO Don't look at the commented code. Will be refactored/removed during TT-1503
-/**
- * Service for transaction allocations business logic
- * @TODO alex refactor
- */
-class TransactionAllocationService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
-        // API URL param for transaction allocations
-        this.url = 'transactions-allocations';
-        this.modelClass = TransactionAllocation;
-        this.listenEvents();
-    }
-    /**
-     * Add single transaction allocation
-     */
-    add(allocation) {
-        return this.addBatch([allocation]).pipe(map((newAllocations) => newAllocations[0]));
-    }
-    /**
-     * get list of transactions allocations related with passed bank transactions list
-     */
-    getByTransactions(transactions) {
-        const ids = transactions.map((transaction) => transaction.id);
-        return this.get()
-            .pipe(map((transactionAllocations) => {
-            return transactionAllocations.filter((allocation) => ids.includes(allocation.transaction.id));
-        }));
-    }
-    listenEvents() {
-        this.onTransactionsCreated();
-        this.onDepreciationCreated();
-        this.onTransactionDeleted();
-    }
-    /**
-     * Reset cache on transactions created
-     */
-    onTransactionsCreated() {
-        this.eventDispatcherService.on(AppEventTypeEnum.TRANSACTIONS_CREATED).subscribe(() => {
-            // Update allocations cache to synchronize data and fire subscriptions
-            this.resetCache();
-        });
-    }
-    /**
-     * Reset cache on depreciation created
-     */
-    onDepreciationCreated() {
-        this.eventDispatcherService.on(AppEventTypeEnum.DEPRECIATIONS_CREATED).subscribe(() => {
-            // Update allocations cache to synchronize data and fire subscriptions
-            this.resetCache();
-        });
-    }
-    /**
-     * Reset cache on transaction deleted
-     */
-    onTransactionDeleted() {
-        this.eventDispatcherService.on(AppEventTypeEnum.TRANSACTION_DELETED).subscribe(() => {
-            // Update allocations cache to synchronize data and fire subscriptions
-            this.resetCache();
-        });
-    }
-}
-TransactionAllocationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionAllocationService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-TransactionAllocationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionAllocationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionAllocationService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
-
 /**
  * @TODO move to collection
  */
@@ -10550,11 +10892,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
                 }] }]; } });
 
 class UserEventSettingService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
+    constructor() {
+        super(...arguments);
         this.modelClass = UserEventSetting;
         this.url = 'user-event-settings';
         this.isHydra = true;
@@ -10586,257 +10925,144 @@ class UserEventSettingService extends RestService {
         }));
     }
 }
-UserEventSettingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserEventSettingService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+UserEventSettingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserEventSettingService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 UserEventSettingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserEventSettingService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserEventSettingService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
 class UserEventTypeService extends RestService {
-    constructor(http, eventDispatcherService, environment) {
-        super(http, eventDispatcherService, environment);
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
+    constructor() {
+        super(...arguments);
         this.modelClass = UserEventType;
         this.url = 'user-event-types';
         this.isHydra = true;
     }
 }
-UserEventTypeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserEventTypeService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+UserEventTypeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserEventTypeService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 UserEventTypeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserEventTypeService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserEventTypeService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['environment']
-                }] }]; } });
+        }] });
 
 /**
  * Service that allows to work with WorkTank operations
- * @TODO separate into multiple services, extend restService
+ * @TODO separate vehicles and logbooks to different api
  */
-class VehicleService {
-    constructor(http, transactionService, depreciationService, chartAccountsService, eventDispatcherService, environment) {
-        this.http = http;
-        this.transactionService = transactionService;
-        this.depreciationService = depreciationService;
-        this.chartAccountsService = chartAccountsService;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
-        this.vehiclesSubject = new ReplaySubject(1);
-        this.vehicleClaimSubject = new ReplaySubject(1);
-        this.vehicleClaimRateSubject = new ReplaySubject(1);
-        this.vehicleTaxReturnSubject = new ReplaySubject(1);
-        this.incomePositionsSubject = new ReplaySubject(1);
-    }
-    getVehicles() {
-        // @TODO create backend for get logbook
-        if (!this._vehicles) {
-            this.http.get(`${this.environment.apiV2}/vehicles`)
-                .pipe(map((response) => {
-                return response.map((item) => plainToClass(Vehicle, item));
-            }))
-                .subscribe((vehicles) => {
-                this._vehicles = vehicles;
-                this.vehiclesSubject.next(vehicles);
-            });
-        }
-        return this.vehiclesSubject.asObservable();
-    }
-    /**
-     * Get vehicles claim amount
-     */
-    getVehiclesClaim() {
-        if (!this._vehicleClaim) {
-            this.http.get(`${this.environment.apiV2}/vehicle-claims`)
-                .pipe(map((response) => {
-                // return Vehicle claim from backend or create new if it not exist
-                return response.length ? response.map((item) => plainToClass(VehicleClaim, item))[0] : plainToClass(VehicleClaim, {});
-            }))
-                .subscribe((vehicleClaim) => {
-                this._vehicleClaim = vehicleClaim;
-                this.vehicleClaimSubject.next(vehicleClaim);
-            });
-        }
-        return this.vehicleClaimSubject.asObservable();
-    }
-    /**
-     * Add new vehicle claim
-     * @param claim object which should be added
-     */
-    addVehicleClaim(claim) {
-        return this.http.post(`${this.environment.apiV2}/vehicle-claims`, claim).pipe(map((response) => {
-            this._vehicleClaim = plainToClass(VehicleClaim, response);
-            this.vehicleClaimSubject.next(this._vehicleClaim);
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.VEHICLE_CLAIM_CREATED, null));
-        }));
+class VehicleService extends RestService {
+    constructor() {
+        super(...arguments);
+        this.url = 'vehicles';
+        this.modelClass = Vehicle;
+        this.messageCreated = MessagesEnum$1.VEHICLE_CREATED;
+        this.messageUpdated = MessagesEnum$1.VEHICLE_UPDATED;
+        this.messageDeleted = MessagesEnum$1.VEHICLE_DELETED;
     }
-    /**
-     * Get vehicles claim rate for current financial year
-     */
-    getVehiclesClaimRate() {
-        if (!this._vehicleClaimRate) {
-            this.chartAccountsService.getChartAccountsById(ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK)
-                .pipe(map((response) => {
-                return response.values.find((chartAccount) => chartAccount.financialYear === new FinancialYear().year).value;
-            }))
-                .subscribe((claimRate) => {
-                this._vehicleClaimRate = claimRate;
-                this.vehicleClaimRateSubject.next(this._vehicleClaimRate);
-            });
-        }
-        return this.vehicleClaimRateSubject.asObservable();
-    }
-    /**
-     * Get vehicles tax return for vehicle transactions & depreciations
-     */
-    getVehiclesTaxReturn() {
-        if (!this._vehicleTaxReturn) {
-            combineLatest([
-                // @Todo refactor to avoid injection of another services
-                this.transactionService.get(),
-                this.depreciationService.get(),
-                this.getVehiclesClaim()
-            ]).pipe(map(([transactions, depreciations, vehicleClaim]) => {
-                const chartAccountsHeadingsIds = enumToList(ChartAccountsHeadingVehicleListEnum)
-                    .map((item) => item.value);
-                // get transactions & depreciations which chart accounts headings are belong to vehicle category
-                // but except KLMS transaction
-                const filteredItems = [...transactions, ...depreciations].filter((item) => {
-                    var _a;
-                    return chartAccountsHeadingsIds.includes((_a = item.chartAccounts.heading) === null || _a === void 0 ? void 0 : _a.id) && !item.chartAccounts.isKlmsForWork();
-                });
-                // get claim amount sum
-                return filteredItems.reduce((sum, item) => 
-                // @Todo remove item.amount negative sign when depreciations will be refactored and will have negative sign
-                sum + ((item instanceof Depreciation ? item.currentYearForecast.amount : -item.amount) * (vehicleClaim.workUsage / 100)), 0);
-            }))
-                .subscribe((taxReturn) => {
-                this._vehicleTaxReturn = taxReturn;
-                this.vehicleTaxReturnSubject.next(this._vehicleTaxReturn);
-            });
-        }
-        return this.vehicleTaxReturnSubject.asObservable();
+    listenEvents() {
+        this.listenLogbookAdded();
+        this.listenLogbookUpdated();
+        this.listenLogbookDeleted();
     }
     /**
-     * Update vehicle claim
-     * @param claim which should be updated
-     *
-     * @TODO alex refresh depreciation/transaction cache
+     * Add a new logbook items to the vehicle when a new one created
      */
-    updateVehicleClaim(claim) {
-        return this.http.put(`${this.environment.apiV2}/vehicle-claims/${claim.id}`, claim).pipe(map((response) => {
-            const updatedVehicleClaim = plainToClass(VehicleClaim, response);
-            this._vehicleClaim = updatedVehicleClaim;
-            this.vehicleClaimSubject.next(this._vehicleClaim);
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.VEHICLE_CLAIM_UPDATED, null));
-            return updatedVehicleClaim;
-        }));
+    listenLogbookAdded() {
+        this.eventDispatcherService.on(AppEventTypeEnum.VEHICLE_LOGBOOK_CREATED)
+            .subscribe((result) => {
+            const tempCache = cloneDeep$1(this.cache);
+            tempCache.find((vehicle) => vehicle.id === result.vehicleId).logbook.push(result.logbook);
+            this.cache = tempCache;
+            this.updateCache();
+        });
     }
     /**
-     * Add new logbook for desired vehicle
-     * @param logbook which should be added
-     * @param vehicle for which logbook object should be added
+     * Replace vehicle's logbook with updated instance when logbook item updated
      */
-    addLogbook(logbook, vehicle) {
-        return this.http.post(`${this.environment.apiV2}/vehicles/${vehicle.id}/logbooks`, logbook)
-            .pipe(map((response) => {
-            this._vehicles.find((v) => v.id === vehicle.id).logbook.push(response);
-            // we update nested logbook object inside vehicles list. So list is not changed and next not emit subscriptions updates.
-            // that is why we recreate vehicles array
-            this.vehiclesSubject.next(this._vehicles.map((item) => plainToClass(Vehicle, item)));
-        }));
+    listenLogbookUpdated() {
+        this.eventDispatcherService.on(AppEventTypeEnum.VEHICLE_LOGBOOK_UPDATED)
+            .subscribe((result) => {
+            const tempCache = cloneDeep$1(this.cache);
+            replace(tempCache.find((vehicle) => vehicle.id === result.vehicleId).logbook, result.logbook);
+            this.cache = tempCache;
+            this.updateCache();
+        });
     }
     /**
-     * Update logbook
-     * @param logbook which should be updated
-     * @param vehicle for which logbook object should be updated
+     * Remove logbook item from vehicle when logbook deleted
      */
-    updateLogbook(logbook, vehicle) {
-        return this.http.put(`${this.environment.apiV2}/vehicles/${vehicle.id}/logbooks/${logbook.id}`, logbook).pipe(map((response) => {
-            const editedVehicle = this._vehicles.find((v) => v.id === vehicle.id);
-            const editedLogbookIndex = editedVehicle.logbook.findIndex((l) => l.id === logbook.id);
-            editedVehicle.logbook.splice(editedLogbookIndex, 1, plainToClass(VehicleLogbook, response));
-            // we update nested logbook object inside vehicles list. So list is not changed and next not emit subscriptions updates.
-            // that is why we recreate vehicles array
-            this.vehiclesSubject.next(this._vehicles.map((item) => plainToClass(Vehicle, item)));
-        }));
+    listenLogbookDeleted() {
+        this.eventDispatcherService.on(AppEventTypeEnum.VEHICLE_LOGBOOK_DELETED)
+            .subscribe((result) => {
+            const tempCache = cloneDeep$1(this.cache);
+            const vehicle = tempCache.find((vehicle) => vehicle.id === result.vehicleId);
+            vehicle.logbook = vehicle.logbook.filter((logbook) => logbook.id !== result.logbook.id);
+            this.cache = tempCache;
+            this.updateCache();
+        });
     }
-    /**
-     * Delete trip
-     * @param logbook for which trip should be deleted
-     * @param vehicle for which trip should be deleted
-     */
-    deleteTrip(logbook, vehicle) {
-        return this.http.delete(`${this.environment.apiV2}/vehicles/${vehicle.id}/logbooks/${logbook.id}`)
-            .pipe(map(() => {
-            const editedVehicle = this._vehicles.find((v) => v.id === vehicle.id);
-            const deletedLogbookIndex = editedVehicle.logbook.findIndex((l) => l.id === logbook.id);
-            editedVehicle.logbook.splice(deletedLogbookIndex, 1);
-            // we update nested logbook object inside vehicles list. So list is not changed and next not emit subscriptions updates.
-            // that is why we recreate vehicles array
-            this.vehiclesSubject.next(this._vehicles.map((item) => plainToClass(Vehicle, item)));
-        }));
+}
+VehicleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+VehicleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+/**
+ * Vehicle logbook service. Allows user to add, update or delete vehicle trips
+ * @TODO extend rest service after it refactored
+ */
+class VehicleLogbookService {
+    constructor(http, eventDispatcherService, environment, toastService) {
+        this.http = http;
+        this.eventDispatcherService = eventDispatcherService;
+        this.environment = environment;
+        this.toastService = toastService;
     }
-    /**
-     * Add new vehicle
-     * @param vehicle which should be added
-     */
-    addVehicle(vehicle) {
-        return this.http.post(`${this.environment.apiV2}/vehicles`, { name: vehicle.name })
-            .pipe(map((response) => {
-            this._vehicles.push(plainToClass(Vehicle, response));
-            this.vehiclesSubject.next(this._vehicles);
+    add(logbook, vehicleId) {
+        return this.http.post(`${this.environment.apiV2}/vehicles/${vehicleId}/logbooks`, logbook)
+            .pipe(map((vehicleLogbookBase) => {
+            const newVehicleLogbook = plainToClass(VehicleLogbook, vehicleLogbookBase);
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.VEHICLE_LOGBOOK_CREATED, { logbook: newVehicleLogbook, vehicleId }));
+            this.toastService.success(MessagesEnum$1.VEHICLE_LOGBOOK_CREATED);
+            return newVehicleLogbook;
         }));
     }
-    /**
-     * Update vehicle
-     * @param vehicle which should be updated
-     */
-    updateVehicle(vehicle) {
-        return this.http.put(`${this.environment.apiV2}/vehicles/${vehicle.id}`, { name: vehicle.name })
-            .pipe(map((response) => {
-            const editedVehicleIndex = this._vehicles.findIndex((v) => v.id === vehicle.id);
-            this._vehicles.splice(editedVehicleIndex, 1, plainToClass(Vehicle, response));
-            this.vehiclesSubject.next(this._vehicles);
+    update(logbook, vehicleId) {
+        return this.http.put(`${this.environment.apiV2}/vehicles/${vehicleId}/logbooks/${logbook.id}`, logbook).pipe(map((vehicleLogbookBase) => {
+            const updatedVehicleLogbook = plainToClass(VehicleLogbook, vehicleLogbookBase);
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.VEHICLE_LOGBOOK_UPDATED, { logbook: updatedVehicleLogbook, vehicleId }));
+            this.toastService.success(MessagesEnum$1.VEHICLE_LOGBOOK_UPDATED);
+            return plainToClass(VehicleLogbook, updatedVehicleLogbook);
         }));
     }
-    /**
-     * Delete vehicle
-     * @param vehicle which should be deleted
-     */
-    deleteVehicle(vehicle) {
-        return this.http.delete(`${this.environment.apiV2}/vehicles/${vehicle.id}`)
+    delete(logbook, vehicleId) {
+        return this.http.delete(`${this.environment.apiV2}/vehicles/${vehicleId}/logbooks/${logbook.id}`)
             .pipe(map(() => {
-            const deletedVehicleIndex = this._vehicles.findIndex((v) => v.id === vehicle.id);
-            this._vehicles.splice(deletedVehicleIndex, 1);
-            // we update nested logbook object inside vehicles list. So list is not changed and next not emit subscriptions updates.
-            // that is why we recreate vehicles array
-            this.vehiclesSubject.next(this._vehicles.map((item) => plainToClass(Vehicle, item)));
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.VEHICLE_LOGBOOK_DELETED, { logbook, vehicleId }));
+            this.toastService.success(MessagesEnum$1.VEHICLE_LOGBOOK_DELETED);
         }));
     }
 }
-VehicleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleService, deps: [{ token: i1.HttpClient }, { token: TransactionService }, { token: DepreciationService }, { token: ChartAccountsService }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-VehicleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleService, decorators: [{
+VehicleLogbookService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleLogbookService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
+VehicleLogbookService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleLogbookService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleLogbookService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: TransactionService }, { type: DepreciationService }, { type: ChartAccountsService }, { type: EventDispatcherService }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
-                }] }]; } });
+                }] }, { type: ToastService }]; } });
 
 /**
  * Service to work with XLSX (generate, download, e.t.c.)
@@ -10978,6 +11204,36 @@ class AbstractForm extends FormGroup {
     }
 }
 
+/**
+ * Check if at least one form field is true, otherwise form is invalid.
+ * Use with groups of boolean form controls (checkbox, toggle, etc.)
+ */
+function atLeastOneCheckedValidator() {
+    return (formGroup) => {
+        return Object.values(formGroup.controls)
+            .find((control) => control.value) ? null : { nothingChecked: true };
+    };
+}
+
+class ClientIncomeTypesForm extends AbstractForm {
+    constructor(clientIncomeTypes) {
+        super({
+            salary: new FormControl(clientIncomeTypes.salary),
+            rental: new FormControl(clientIncomeTypes.rental),
+            soleTrader: new FormControl(clientIncomeTypes.soleTrader),
+            dividends: new FormControl(clientIncomeTypes.dividends),
+            other: new FormControl(clientIncomeTypes.other)
+        }, atLeastOneCheckedValidator());
+        this.clientIncomeTypes = clientIncomeTypes;
+    }
+    submit() {
+        if (!this.valid) {
+            return null;
+        }
+        return Object.assign({}, this.clientIncomeTypes, this.value);
+    }
+}
+
 class LoginForm extends AbstractForm {
     constructor() {
         super({
@@ -11050,6 +11306,131 @@ class ResetPasswordForm extends AbstractForm {
     }
 }
 
+const MAX_NAME_LENGTH = 60;
+class VehicleForm extends AbstractForm {
+    constructor(vehicle) {
+        super({
+            name: new FormControl(vehicle.name, [Validators.required, Validators.maxLength(MAX_NAME_LENGTH)])
+        });
+        this.vehicle = vehicle;
+    }
+    /**
+     * @TODO save model, add generics and handle it in AbstractForm
+     */
+    submit() {
+        return plainToClass(VehicleClaim, Object.assign({}, this.vehicle, this.getRawValue()));
+    }
+}
+
+class VehicleClaimForm extends AbstractForm {
+    constructor(vehicleClaim, logbooks) {
+        super({
+            method: new FormControl(vehicleClaim.method, Validators.required),
+            isManual: new FormControl(vehicleClaim.isManual),
+            kilometers: new FormControl({
+                value: vehicleClaim.kilometers,
+                disabled: !vehicleClaim.isManual
+            }),
+            workUsage: new FormControl({
+                value: vehicleClaim.workUsage,
+                disabled: !vehicleClaim.isManual
+            })
+        });
+        this.vehicleClaim = vehicleClaim;
+        this.logbooks = logbooks;
+        this.setIsManualState();
+        this.listenMethodChanges();
+        this.listenIsManualChanges();
+    }
+    /**
+     * Check if vehicle claim method changed
+     */
+    isMethodChanged() {
+        return this.vehicleClaim.method !== this.get('method').value;
+    }
+    /**
+     * Check if KLMs method selected
+     */
+    isKLMsMethod() {
+        return this.get('method').value === VehicleClaimMethodEnum.KMS;
+    }
+    /**
+     * Check if Logbook method selected
+     */
+    isLogbookMethod() {
+        return this.get('method').value === VehicleClaimMethodEnum.LOGBOOK;
+    }
+    /**
+     * Check if user selected manual calculation
+     */
+    isManual() {
+        return this.get('isManual').value;
+    }
+    /**
+     * @TODO save model, add generics and handle it in AbstractForm
+     */
+    submit() {
+        return plainToClass(VehicleClaim, Object.assign({}, this.vehicleClaim, this.getRawValue()));
+    }
+    setIsManualState() {
+        if (this.logbooks.isBestPeriodExist()) {
+            this.get('isManual').enable();
+        }
+        else {
+            this.get('isManual').disable();
+            this.get('isManual').setValue(true);
+        }
+    }
+    /**
+     * Handle method field value changes.
+     * Set work usage value depended of selected method.
+     */
+    listenMethodChanges() {
+        this.get('method').valueChanges.subscribe((method) => {
+            if (method === VehicleClaimMethodEnum.KMS) {
+                this.get('workUsage').setValue(0);
+            }
+            else if (method === VehicleClaimMethodEnum.LOGBOOK && !this.isManual()) {
+                this.get('workUsage').setValue(this.logbooks.getBestPeriod().workUsage);
+            }
+            this.setValues();
+        });
+    }
+    /**
+     * Handle isManual field value changes.
+     * Enable/disable fields depended of isManual value
+     */
+    listenIsManualChanges() {
+        this.get('isManual').valueChanges.subscribe((isManual) => {
+            if (isManual) {
+                this.get('kilometers').enable();
+                this.get('workUsage').enable();
+            }
+            else {
+                this.get('kilometers').disable();
+                this.get('workUsage').disable();
+            }
+            this.setValues();
+        });
+    }
+    /**
+     * Set automatic calculated values depended of current method for non-manual vehicle claim
+     */
+    setValues() {
+        if (this.isManual()) {
+            return;
+        }
+        switch (this.get('method').value) {
+            case VehicleClaimMethodEnum.LOGBOOK:
+                this.get('workUsage').setValue(this.logbooks.getBestPeriod().workUsage);
+                break;
+            case VehicleClaimMethodEnum.KMS:
+                const businessKms = this.logbooks.getBusinessLogbooks().getKlms();
+                this.get('kilometers').setValue(businessKms < this.vehicleClaim.kmsLimit ? businessKms : this.vehicleClaim.kmsLimit);
+        }
+    }
+}
+
 /**
  * Public API Surface of tt-core
  */
@@ -11058,5 +11439,5 @@ class ResetPasswordForm extends AbstractForm {
  * Generated bundle index. Do not edit.
  */
 
-export { AbstractForm, Address, AddressService, AddressTypeEnum, AlphabetColorsEnum, AppEvent, AppEventTypeEnum, AssetEntityTypeEnum, AssetTypeEnum, AssetsService, AuthService, BANK_ACCOUNT_TYPES, Bank, BankAccount, BankAccountCalculationService, BankAccountChartData, BankAccountCollection, BankAccountProperty, BankAccountService, BankAccountStatusEnum, BankAccountTypeEnum, BankConnection, BankConnectionService, BankConnectionStatusEnum, BankService, BankTransaction, BankTransactionCalculationService, BankTransactionChartData, BankTransactionCollection, BankTransactionService, BankTransactionSummaryFieldsEnum, BankTransactionTypeEnum, BasiqConfig, BasiqJob, BasiqService, BasiqToken, BorrowingExpense, BorrowingExpenseLoan, BorrowingExpenseService, CAPITAL_COSTS_ITEMS, CHART_ACCOUNTS_CATEGORIES, CalculationFormItem, CalculationFormTypeEnum, ChartAccounts, ChartAccountsCategoryEnum, ChartAccountsDepreciation, ChartAccountsDepreciationService, ChartAccountsEtpEnum, ChartAccountsHeading, ChartAccountsHeadingTaxDeductibleEnum, ChartAccountsHeadingTaxableEnum, ChartAccountsHeadingVehicleListEnum, ChartAccountsListEnum, ChartAccountsMetadata, ChartAccountsMetadataListEnum, ChartAccountsMetadataTypeEnum, ChartAccountsService, ChartAccountsTaxLabelsEnum, ChartAccountsTypeEnum, ChartData, ChartSerie, Chat, ChatService, ChatStatusEnum, ChatViewTypeEnum, ClientCollection, ClientDetails, ClientDetailsMedicareExemptionEnum, ClientDetailsWorkDepreciationCalculationEnum, ClientDetailsWorkingHolidayMakerEnum, ClientInvite, ClientInviteService, ClientInviteStatusEnum, ClientInviteTypeEnum, ClientMovement, ClientMovementCollection, ClientMovementService, ClientPortfolioChartData, ClientPortfolioReport, ClientPortfolioReportCollection, ClientPortfolioReportService, Collection, CollectionDictionary, CorelogicService, CorelogicSuggestion, Country, DEFAULT_VEHICLE_EXPENSE, DEPRECIATION_GROUPS, DOCUMENT_FILE_TYPES, Depreciation, DepreciationCalculationEnum, DepreciationCalculationPercentEnum, DepreciationCapitalProject, DepreciationCapitalProjectService, DepreciationCollection, DepreciationForecast, DepreciationForecastCollection, DepreciationGroup, DepreciationGroupEnum, DepreciationGroupItem, DepreciationLvpAssetTypeEnum, DepreciationLvpReportItem, DepreciationLvpReportItemCollection, DepreciationReceipt, DepreciationReportItem, DepreciationReportItemCollection, DepreciationService, DepreciationTypeEnum, DepreciationWriteOffAmountEnum, Document, DocumentApiUrlPrefixEnum, DocumentFolder, DocumentFolderService, ENDPOINTS, EmployeeCollection, EmployeeDetails, EmployeeInvite, EmployeeInviteService, EmployeeService, Endpoint, EquityPositionChartService, EventDispatcherService, ExportFormatEnum, FinancialYear, Firm, FirmService, FirmTypeEnum, HeaderTitleService, IconsFileEnum, IncomeAmountTypeEnum, IncomePosition, IncomeSource, IncomeSourceChartData, IncomeSourceCollection, IncomeSourceForecast, IncomeSourceForecastService, IncomeSourceService, IncomeSourceType, IncomeSourceTypeEnum, IncomeSourceTypeListOtherEnum, IncomeSourceTypeListSalaryEnum, IncomeSourceTypeListWorkEnum, InterceptorsModule, IntercomService, InviteStatusEnum, JwtService, KompassifyService, Loan, LoanBankTypeEnum, LoanCollection, LoanFrequencyEnum, LoanInterestTypeEnum, LoanMaxNumberOfPaymentsEnum, LoanPayment, LoanPayout, LoanPayoutTypeEnum, LoanRepaymentFrequencyEnum, LoanRepaymentTypeEnum, LoanService, LoanTypeEnum, LoanVehicleTypeEnum, LogbookCollection, LogbookPeriod, LoginForm, MODULE_URL_LIST, MONTHS, Message, MessageCollection, MessageDocument, MessageDocumentCollection, MessageDocumentService, MessageService, MonthNameShortEnum, MonthNumberEnum, MyAccountHistory, MyAccountHistoryInitiatedByEnum, MyAccountHistoryStatusEnum, MyAccountHistoryTypeEnum, Notification, Occupation, OccupationService, PasswordForm, PdfService, Phone, PhoneTypeEnum, PreloaderService, Property, PropertyCalculationService, PropertyCategory, PropertyCategoryMovement, PropertyCategoryMovementService, PropertyCategoryService, PropertyCollection, PropertyDepreciationCalculationEnum, PropertyDocument, PropertyDocumentService, PropertyEquityChartData, PropertyEquityChartItem, PropertyForecast, PropertyReportItem, PropertyReportItemCollection, PropertyReportItemDepreciationCollection, PropertyReportItemTransaction, PropertyReportItemTransactionCollection, PropertySale, PropertySaleService, PropertySaleTaxExemptionMetadata, PropertyService, PropertyShare, PropertyShareAccessEnum, PropertyShareService, PropertyShareStatusEnum, PropertySubscription, PropertyTransactionReportService, PropertyValuation, RegisterClientForm, RegisterFirmForm, RegistrationInvite, RegistrationInviteStatusEnum, ReportItem, ReportItemCollection, ReportItemDetails, ResetPasswordForm, SUBSCRIPTION_DESCRIPTION, SUBSCRIPTION_TITLE, SalaryForecast, SalaryForecastFrequencyEnum, SalaryForecastService, ServiceNotificationService, ServiceNotificationStatusEnum, ServiceNotificationTypeEnum, ServicePayment, ServicePaymentStatusEnum, ServicePrice, ServicePriceCollection, ServicePriceRecurringIntervalEnum, ServicePriceTypeEnum, ServiceProduct, ServiceSubscription, ServiceSubscriptionCollection, ServiceSubscriptionItem, ServiceSubscriptionStatusEnum, ShareFilterOptionsEnum, SoleForecast, SoleForecastService, SpareDocumentSpareTypeEnum, SseService, SubscriptionService, SubscriptionTypeEnum, TYPE_LOAN, TankTypeEnum, TaxCalculationMedicareExemptionEnum, TaxCalculationTypeEnum, TaxExemption, TaxExemptionEnum, TaxExemptionMetadata, TaxExemptionMetadataEnum, TaxExemptionService, TaxReturnCategoryListEnum, TaxReturnCategorySectionEnum, TaxReview, TaxReviewCollection, TaxReviewHistoryService, TaxReviewService, TaxReviewStatusEnum, TaxSummary, TaxSummaryListEnum, TaxSummarySection, TaxSummarySectionEnum, TaxSummaryService, TaxSummaryTaxSummaryEnum, TaxSummaryTypeEnum, TicketFeedbackEnum, TicketStatusEnum, TicketTypesEnum, Toast, ToastService, ToastTypeEnum, Transaction, TransactionAllocation, TransactionAllocationCollection, TransactionAllocationService, TransactionBase, TransactionCalculationService, TransactionCollection, TransactionMetadata, TransactionOperationEnum, TransactionReceipt, TransactionService, TransactionSourceEnum, TransactionTypeEnum, TtCoreModule, USER_ROLES, USER_WORK_POSITION, User, UserEventSetting, UserEventSettingCollection, UserEventSettingFieldEnum, UserEventSettingService, UserEventStatusEnum, UserEventType, UserEventTypeCategory, UserEventTypeClientTypeEnum, UserEventTypeEmployeeTypeEnum, UserEventTypeFrequencyEnum, UserEventTypeService, UserEventTypeUserTypeEnum, UserMedicareExemptionEnum, UserRolesEnum, UserService, UserStatusEnum, UserSwitcherService, UserTitleEnum, UserToRegister, UserWorkDepreciationCalculationEnum, UserWorkingHolidayMakerEnum, Vehicle, VehicleClaim, VehicleClaimMethodEnum, VehicleLogbook, VehicleLogbookPurposeEnum, VehicleService, WORK_TANK_LOGBOOK_PURPOSE_OPTIONS, XlsxService, cloneDeep, compare, compareMatOptions, createDate, displayMatOptions, enumToList, getDocIcon, replace, roundTo, sort, sortDeep, taxReviewFilterPredicate };
+export { AbstractForm, AccountSetupItem, AccountSetupItemCollection, AccountSetupService, Address, AddressService, AddressTypeEnum, AlphabetColorsEnum, AppEvent, AppEventTypeEnum, AssetEntityTypeEnum, AssetTypeEnum, AssetsService, AuthService, BANK_ACCOUNT_TYPES, Bank, BankAccount, BankAccountCalculationService, BankAccountChartData, BankAccountCollection, BankAccountProperty, BankAccountService, BankAccountStatusEnum, BankAccountTypeEnum, BankConnection, BankConnectionService, BankConnectionStatusEnum, BankService, BankTransaction, BankTransactionCalculationService, BankTransactionChartData, BankTransactionCollection, BankTransactionService, BankTransactionSummaryFieldsEnum, BankTransactionTypeEnum, BasiqConfig, BasiqJob, BasiqService, BasiqToken, BorrowingExpense, BorrowingExpenseLoan, BorrowingExpenseService, CAPITAL_COSTS_ITEMS, CHART_ACCOUNTS_CATEGORIES, CalculationFormItem, CalculationFormTypeEnum, ChartAccounts, ChartAccountsCategoryEnum, ChartAccountsDepreciation, ChartAccountsDepreciationService, ChartAccountsEtpEnum, ChartAccountsHeading, ChartAccountsHeadingTaxDeductibleEnum, ChartAccountsHeadingTaxableEnum, ChartAccountsHeadingVehicleListEnum, ChartAccountsListEnum, ChartAccountsMetadata, ChartAccountsMetadataListEnum, ChartAccountsMetadataTypeEnum, ChartAccountsService, ChartAccountsTaxLabelsEnum, ChartAccountsTypeEnum, ChartAccountsValue, ChartData, ChartSerie, Chat, ChatService, ChatStatusEnum, ChatViewTypeEnum, ClientCollection, ClientDetails, ClientDetailsMedicareExemptionEnum, ClientDetailsWorkDepreciationCalculationEnum, ClientDetailsWorkingHolidayMakerEnum, ClientIncomeTypes, ClientIncomeTypesForm, ClientIncomeTypesService, ClientInvite, ClientInviteService, ClientInviteStatusEnum, ClientInviteTypeEnum, ClientMovement, ClientMovementCollection, ClientMovementService, ClientPortfolioChartData, ClientPortfolioReport, ClientPortfolioReportCollection, ClientPortfolioReportService, Collection, CollectionDictionary, CorelogicService, CorelogicSuggestion, Country, DEFAULT_VEHICLE_EXPENSE, DEPRECIATION_GROUPS, DOCUMENT_FILE_TYPES, Depreciation, DepreciationCalculationEnum, DepreciationCalculationPercentEnum, DepreciationCapitalProject, DepreciationCapitalProjectService, DepreciationCollection, DepreciationForecast, DepreciationForecastCollection, DepreciationGroup, DepreciationGroupEnum, DepreciationGroupItem, DepreciationLvpAssetTypeEnum, DepreciationLvpReportItem, DepreciationLvpReportItemCollection, DepreciationReceipt, DepreciationReportItem, DepreciationReportItemCollection, DepreciationService, DepreciationTypeEnum, DepreciationWriteOffAmountEnum, Document, DocumentApiUrlPrefixEnum, DocumentFolder, DocumentFolderService, ENDPOINTS, EmployeeCollection, EmployeeDetails, EmployeeInvite, EmployeeInviteService, EmployeeService, Endpoint, EquityPositionChartService, EventDispatcherService, ExportDataTable, ExportFormatEnum, FinancialYear, Firm, FirmService, FirmTypeEnum, HeaderTitleService, IconsFileEnum, IncomeAmountTypeEnum, IncomePosition, IncomeSource, IncomeSourceChartData, IncomeSourceCollection, IncomeSourceForecast, IncomeSourceForecastService, IncomeSourceService, IncomeSourceType, IncomeSourceTypeEnum, IncomeSourceTypeListOtherEnum, IncomeSourceTypeListSalaryEnum, IncomeSourceTypeListWorkEnum, InterceptorsModule, IntercomService, InviteStatusEnum, JwtService, KompassifyService, Loan, LoanBankTypeEnum, LoanCollection, LoanFrequencyEnum, LoanInterestTypeEnum, LoanMaxNumberOfPaymentsEnum, LoanPayment, LoanPayout, LoanPayoutTypeEnum, LoanRepaymentFrequencyEnum, LoanRepaymentTypeEnum, LoanService, LoanTypeEnum, LoanVehicleTypeEnum, LogbookPeriod, LoginForm, MODULE_URL_LIST, MONTHS, Message, MessageCollection, MessageDocument, MessageDocumentCollection, MessageDocumentService, MessageService, MonthNameShortEnum, MonthNumberEnum, MyAccountHistory, MyAccountHistoryInitiatedByEnum, MyAccountHistoryStatusEnum, MyAccountHistoryTypeEnum, Notification, Occupation, OccupationService, PasswordForm, PdfOrientationEnum, PdfService, Phone, PhoneTypeEnum, PreloaderService, Property, PropertyCalculationService, PropertyCategory, PropertyCategoryListEnum, PropertyCategoryMovement, PropertyCategoryMovementService, PropertyCategoryService, PropertyCollection, PropertyDepreciationCalculationEnum, PropertyDocument, PropertyDocumentService, PropertyEquityChartData, PropertyEquityChartItem, PropertyForecast, PropertyHoldingCostsService, PropertyReportItem, PropertyReportItemCollection, PropertyReportItemDepreciationCollection, PropertyReportItemTransaction, PropertyReportItemTransactionCollection, PropertySale, PropertySaleService, PropertySaleTaxExemptionMetadata, PropertyService, PropertyShare, PropertyShareAccessEnum, PropertyShareService, PropertyShareStatusEnum, PropertySubscription, PropertyTransactionReportService, PropertyValuation, RegisterClientForm, RegisterFirmForm, RegistrationInvite, RegistrationInviteStatusEnum, ReportItem, ReportItemCollection, ReportItemDetails, ResetPasswordForm, SUBSCRIPTION_DESCRIPTION, SUBSCRIPTION_TITLE, SalaryForecast, SalaryForecastFrequencyEnum, SalaryForecastService, ServiceNotificationService, ServiceNotificationStatusEnum, ServiceNotificationTypeEnum, ServicePayment, ServicePaymentStatusEnum, ServicePrice, ServicePriceCollection, ServicePriceRecurringIntervalEnum, ServicePriceTypeEnum, ServiceProduct, ServiceSubscription, ServiceSubscriptionCollection, ServiceSubscriptionItem, ServiceSubscriptionStatusEnum, ShareFilterOptionsEnum, SoleForecast, SoleForecastService, SpareDocumentSpareTypeEnum, SseService, SubscriptionService, SubscriptionTypeEnum, TYPE_LOAN, TankTypeEnum, TaxCalculationMedicareExemptionEnum, TaxCalculationTypeEnum, TaxExemption, TaxExemptionEnum, TaxExemptionMetadata, TaxExemptionMetadataEnum, TaxExemptionService, TaxReturnCategoryListEnum, TaxReturnCategorySectionEnum, TaxReview, TaxReviewCollection, TaxReviewHistoryService, TaxReviewService, TaxReviewStatusEnum, TaxSummary, TaxSummaryListEnum, TaxSummarySection, TaxSummarySectionEnum, TaxSummaryService, TaxSummaryTaxSummaryEnum, TaxSummaryTypeEnum, TicketFeedbackEnum, TicketStatusEnum, TicketTypesEnum, Toast, ToastService, ToastTypeEnum, Transaction, TransactionAllocation, TransactionAllocationCollection, TransactionAllocationService, TransactionBase, TransactionCalculationService, TransactionCollection, TransactionMetadata, TransactionOperationEnum, TransactionReceipt, TransactionService, TransactionSourceEnum, TransactionTypeEnum, TtCoreModule, USER_ROLES, USER_WORK_POSITION, User, UserEventSetting, UserEventSettingCollection, UserEventSettingFieldEnum, UserEventSettingService, UserEventStatusEnum, UserEventType, UserEventTypeCategory, UserEventTypeClientTypeEnum, UserEventTypeEmployeeTypeEnum, UserEventTypeFrequencyEnum, UserEventTypeService, UserEventTypeUserTypeEnum, UserMedicareExemptionEnum, UserRolesEnum, UserService, UserStatusEnum, UserSwitcherService, UserTitleEnum, UserToRegister, UserWorkDepreciationCalculationEnum, UserWorkingHolidayMakerEnum, Vehicle, VehicleClaim, VehicleClaimForm, VehicleClaimMethodEnum, VehicleClaimService, VehicleCollection, VehicleForm, VehicleLogbook, VehicleLogbookCollection, VehicleLogbookPurposeEnum, VehicleLogbookService, VehicleService, WORK_TANK_LOGBOOK_PURPOSE_OPTIONS, XlsxService, cloneDeep, compare, compareMatOptions, createDate, displayMatOptions, enumToList, getDocIcon, replace, roundTo, sort, sortDeep, taxReviewFilterPredicate };
 //# sourceMappingURL=taxtank-core.js.map