taxtank-core 0.27.4 → 0.27.5

package/bundles/taxtank-core.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/common/http'), require('rxjs'), require('rxjs/operators'), require('class-transformer'), require('@auth0/angular-jwt'), require('lodash/get'), require('lodash/last'), require('lodash/flatten'), require('lodash/hasIn'), require('lodash/first'), require('moment'), require('moment-range'), require('lodash/uniqBy'), require('lodash/concat'), require('rxjs/internal/observable/throwError'), require('lodash/cloneDeep'), require('lodash/compact'), require('@angular/forms'), require('lodash/isEqual'), require('lodash/fromPairs'), require('lodash'), require('event-source-polyfill/src/eventsource.min.js'), require('@angular/router'), require('lodash/clone'), require('html2pdf.js'), require('jspdf'), require('jspdf-autotable'), require('@stripe/stripe-js'), require('xlsx'), require('file-saver')) :
     typeof define === 'function' && define.amd ? define('taxtank-core', ['exports', '@angular/core', '@angular/common', '@angular/common/http', 'rxjs', 'rxjs/operators', 'class-transformer', '@auth0/angular-jwt', 'lodash/get', 'lodash/last', 'lodash/flatten', 'lodash/hasIn', 'lodash/first', 'moment', 'moment-range', 'lodash/uniqBy', 'lodash/concat', 'rxjs/internal/observable/throwError', 'lodash/cloneDeep', 'lodash/compact', '@angular/forms', 'lodash/isEqual', 'lodash/fromPairs', 'lodash', 'event-source-polyfill/src/eventsource.min.js', '@angular/router', 'lodash/clone', 'html2pdf.js', 'jspdf', 'jspdf-autotable', '@stripe/stripe-js', 'xlsx', 'file-saver'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["taxtank-core"] = {}, global.ng.core, global.ng.common, global.ng.common.http, global.rxjs, global.rxjs.operators, global.classTransformer, global.angularJwt, global.get, global.last, global.flatten, global.hasIn, global.first, global.moment, global.momentRange, global.uniqBy, global.concat, global.rxjs["internal/observable/throwError"], global.cloneDeep$1, global.compact, global.ng.forms, global.isEqual, global.fromPairs, global._, global.eventsource_min_js, global.ng.router, global.clone, global.html2pdf, global.jsPDF, global.autoTable, global.stripeJs, global.xlsx, global.FileSaver));
-})(this, (function (exports, i0, i1$1, i1, rxjs, operators, classTransformer, angularJwt, get, last, flatten, hasIn, first, moment, momentRange, uniqBy, concat, throwError, cloneDeep$1, compact, forms, isEqual, fromPairs, _, eventsource_min_js, i1$2, clone, html2pdf, jsPDF, autoTable, stripeJs, xlsx, FileSaver) { 'use strict';
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["taxtank-core"] = {}, global.ng.core, global.ng.common, global.ng.common.http, global.rxjs, global.rxjs.operators, global.classTransformer, global.angularJwt, global.get, global.last, global.flatten, global.hasIn, global.first, global.moment$1, global.momentRange, global.uniqBy, global.concat, global.rxjs["internal/observable/throwError"], global.cloneDeep$1, global.compact, global.ng.forms, global.isEqual, global.fromPairs, global._, global.eventsource_min_js, global.ng.router, global.clone, global.html2pdf, global.jsPDF, global.autoTable, global.stripeJs, global.xlsx, global.FileSaver));
+})(this, (function (exports, i0, i1$1, i1, rxjs, operators, classTransformer, angularJwt, get, last, flatten, hasIn, first, moment$1, momentRange, uniqBy, concat, throwError, cloneDeep$1, compact, forms, isEqual, fromPairs, _, eventsource_min_js, i1$2, clone, html2pdf, jsPDF, autoTable, stripeJs, xlsx, FileSaver) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -32,7 +32,7 @@
     var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
     var hasIn__default = /*#__PURE__*/_interopDefaultLegacy(hasIn);
     var first__default = /*#__PURE__*/_interopDefaultLegacy(first);
-    var moment__namespace = /*#__PURE__*/_interopNamespace(moment);
+    var moment__namespace = /*#__PURE__*/_interopNamespace(moment$1);
     var uniqBy__default = /*#__PURE__*/_interopDefaultLegacy(uniqBy);
     var concat__default = /*#__PURE__*/_interopDefaultLegacy(concat);
     var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep$1);
@@ -1674,6 +1674,7 @@
         };
         return FinancialYear;
     }());
+    FinancialYear.weeksInYear = 52;
     FinancialYear.startMonthIndex = 6;
 
     /**
@@ -2983,26 +2984,26 @@
             return this.name;
         };
         /**
-         * Check if chart accounts id is related for 'Klms travelled for work' category
+         * Check if chart accounts id is related for 'Kms travelled for work' category
          */
-        ChartAccounts.prototype.isKlmsForWork = function () {
+        ChartAccounts.prototype.isKmsForWork = function () {
             return this.id === exports.ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK;
         };
         /**
-         * Check if chart accounts id is related for 'Klms travelled for sole' category
+         * Check if chart accounts id is related for 'Kms travelled for sole' category
          */
-        ChartAccounts.prototype.isKlmsForSole = function () {
+        ChartAccounts.prototype.isKmsForSole = function () {
             return this.id === exports.ChartAccountsListEnum.KLMS_TRAVELLED;
         };
         /**
-         * Check if accounts id is related for KLMs category related to passed tank type
+         * Check if accounts id is related for KMs category related to passed tank type
          */
-        ChartAccounts.prototype.isKLMsByTankType = function (tankType) {
+        ChartAccounts.prototype.isKMsByTankType = function (tankType) {
             switch (tankType) {
                 case exports.TankTypeEnum.WORK:
-                    return this.isKlmsForWork();
+                    return this.isKmsForWork();
                 case exports.TankTypeEnum.SOLE:
-                    return this.isKlmsForSole();
+                    return this.isKmsForSole();
                 default:
                     return false;
             }
@@ -3190,11 +3191,10 @@
     var SoleInvoiceTemplate = /** @class */ (function (_super) {
         __extends(SoleInvoiceTemplate, _super);
         function SoleInvoiceTemplate() {
-            return _super !== null && _super.apply(this, arguments) || this;
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
+            _this.isTaxIncluded = false;
+            return _this;
         }
-        SoleInvoiceTemplate.create = function (businessId) {
-            return classTransformer.plainToClass(SoleInvoiceTemplate, { business: { id: businessId }, isTaxIncluded: false });
-        };
         return SoleInvoiceTemplate;
     }(SoleInvoiceTemplate$1));
     __decorate([
@@ -3236,6 +3236,7 @@
     /**
      * Class contains traveled kilometers and work usage percent in 12 weeks date range
      * @TODO Vik: Best period: move this and related logic to backend
+     * @TODO Alex: check if we need this class when calculation refactored with backend
      */
     var LogbookPeriod = /** @class */ (function () {
         function LogbookPeriod() {
@@ -3272,6 +3273,7 @@
         return VehicleLogbook;
     }(AbstractModel));
 
+    var moment = momentRange.extendMoment(moment__namespace);
     var VehicleLogbook = /** @class */ (function (_super) {
         __extends(VehicleLogbook, _super);
         function VehicleLogbook() {
@@ -3297,14 +3299,19 @@
         VehicleLogbook.prototype.isSoleTank = function () {
             return !!this.business;
         };
+        /**
+         * Get logbook period date range from logbook date and weeksInPeriod duration
+         */
+        VehicleLogbook.prototype.getPeriod = function () {
+            return moment.rangeFromInterval('weeks', VehicleLogbook.bestPeriodWeeks, this.date);
+        };
         return VehicleLogbook;
     }(VehicleLogbook$1));
     /**
-     * 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
+     * Logbook period duration in weeks.
+     * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/211517441/Logbook+Vehicle
      */
-    VehicleLogbook.periodDuration = 7257600000;
+    VehicleLogbook.bestPeriodWeeks = 12;
     __decorate([
         classTransformer.Type(function () { return Date; })
     ], VehicleLogbook.prototype, "date", void 0);
@@ -3348,22 +3355,21 @@
     var VehicleClaimDetails = /** @class */ (function (_super) {
         __extends(VehicleClaimDetails, _super);
         function VehicleClaimDetails() {
-            return _super !== null && _super.apply(this, arguments) || this;
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
+            /**
+             * Init default values for the new instances
+             */
+            _this.isManual = true;
+            _this.method = exports.VehicleClaimDetailsMethodEnum.KMS;
+            _this.financialYear = new FinancialYear().year;
+            return _this;
         }
         VehicleClaimDetails.prototype.isLogbookMethod = function () {
             return this.method === exports.VehicleClaimDetailsMethodEnum.LOGBOOK;
         };
-        VehicleClaimDetails.prototype.isKlmsMethod = function () {
+        VehicleClaimDetails.prototype.isKmsMethod = function () {
             return this.method === exports.VehicleClaimDetailsMethodEnum.KMS;
         };
-        // @TODO Alex: discuss with Vik and think about abstract method in AbstractModel
-        VehicleClaimDetails.create = function () {
-            return classTransformer.plainToClass(VehicleClaimDetails, {
-                isManual: true,
-                method: exports.VehicleClaimDetailsMethodEnum.KMS,
-                financialYear: new FinancialYear().year
-            });
-        };
         return VehicleClaimDetails;
     }(VehicleClaimDetails$1));
     __decorate([
@@ -3373,7 +3379,10 @@
     var VehicleClaim = /** @class */ (function (_super) {
         __extends(VehicleClaim, _super);
         function VehicleClaim() {
-            return _super !== null && _super.apply(this, arguments) || this;
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
+            _this.kilometers = 0;
+            _this.workUsage = 0;
+            return _this;
         }
         VehicleClaim.prototype.isWorkTank = function () {
             return !this.business;
@@ -3389,9 +3398,9 @@
             configurable: true
         });
         /**
-         * Claim amount for KLMs method. Exists only for KLMs method.
+         * Claim amount for KMs method. Exists only for KMs method.
          */
-        VehicleClaim.prototype.getKLMsClaimAmount = function (vehicleClaimRate) {
+        VehicleClaim.prototype.getKMSClaimAmount = function (vehicleClaimRate) {
             return +(this.kilometers * vehicleClaimRate).toFixed(2);
         };
         /**
@@ -3406,20 +3415,14 @@
             // 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;
         };
-        VehicleClaim.prototype.getKlmsChartAccountsIdByTankType = function (tankType) {
-            if (tankType === void 0) { tankType = this.tankType; }
+        VehicleClaim.prototype.getAverageWeeklyKMS = function () {
+            return this.kilometers / FinancialYear.weeksInYear;
+        };
+        VehicleClaim.getKMSChartAccountsIdByTankType = function (tankType) {
             return tankType === exports.TankTypeEnum.WORK
                 ? exports.ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK
                 : exports.ChartAccountsListEnum.KLMS_TRAVELLED;
         };
-        VehicleClaim.create = function (details, business) {
-            return classTransformer.plainToClass(VehicleClaim, {
-                kilometers: 0,
-                workUsage: 0,
-                details: details,
-                business: business
-            });
-        };
         return VehicleClaim;
     }(VehicleClaim$1));
     /**
@@ -3521,6 +3524,7 @@
     (function (DepreciationCalculationEnum) {
         DepreciationCalculationEnum[DepreciationCalculationEnum["PRIME_COST"] = 1] = "PRIME_COST";
         DepreciationCalculationEnum[DepreciationCalculationEnum["DIMINISHING"] = 2] = "DIMINISHING";
+        DepreciationCalculationEnum[DepreciationCalculationEnum["CAPITAL"] = 3] = "CAPITAL";
         DepreciationCalculationEnum[DepreciationCalculationEnum["LVP"] = 4] = "LVP";
         DepreciationCalculationEnum[DepreciationCalculationEnum["AMORTISATION"] = 5] = "AMORTISATION";
         DepreciationCalculationEnum[DepreciationCalculationEnum["SBP"] = 6] = "SBP";
@@ -4057,9 +4061,9 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(Transaction.prototype, "isKlmsChartAccountsCategory", {
+        Object.defineProperty(Transaction.prototype, "isKmsChartAccountsCategory", {
             /**
-             * Check if transaction has 'Klms travelled for work' chart accounts category
+             * Check if transaction has 'Kms travelled for work' chart accounts category
              */
             get: function () {
                 return this.chartAccounts.id === exports.ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK;
@@ -5474,6 +5478,13 @@
         function BankAccount() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
+        Object.defineProperty(BankAccount.prototype, "bank", {
+            get: function () {
+                return this.bankConnection.bank;
+            },
+            enumerable: false,
+            configurable: true
+        });
         /**
          * Get current opening balance amount
          */
@@ -6150,9 +6161,8 @@
         }
         /**
          * Get remaining kilometers limit. Total limit ({@link VehicleClaim.totalKmsLimit}) - claimed kilometers from other vehicle claims
-         * @param claim may not exist when user come to vehicle claim page 1st time and not created claim yet
          */
-        VehicleClaimCollection.prototype.getKlmsLimitForClaim = function (claim) {
+        VehicleClaimCollection.prototype.getKmsLimitForClaim = function (claim) {
             var collection = this;
             if (claim) {
                 collection = collection.removeBy('id', claim.id);
@@ -6161,7 +6171,6 @@
         };
         /**
          * Get remaining work usage limit. Total limit ({@link VehicleClaim.totalWorkUsagePercent}) - claimed percent from other vehicle claims
-         * @param claim may not exist when user come to vehicle claim page 1st time and not created claim yet
          */
         VehicleClaimCollection.prototype.getWorkUsageLimitForClaim = function (claim) {
             var collection = this;
@@ -6179,14 +6188,14 @@
             return _super !== null && _super.apply(this, arguments) || this;
         }
         /**
-         * Best period may be calculated only when user has logbooks minimum for {@link VehicleLogbook.periodDuration}
+         * Best period may be calculated only when user has logbooks minimum for VehicleLogbook.bestPeriodWeeks
          * @TODO Vik: Best period: move this and related logic to backend
          */
         VehicleLogbookCollection.prototype.isBestPeriodExist = function () {
             if (this.items.length < 2) {
                 return false;
             }
-            return VehicleLogbook.periodDuration < (this.last.date.getTime() - this.first.date.getTime());
+            return VehicleLogbook.bestPeriodWeeks < (this.last.date.getTime() - this.first.date.getTime());
         };
         /**
          * Get collection of non-personal logbooks (work-related, sole-related).
@@ -6196,15 +6205,14 @@
             return this.filterBy('isPersonal', false);
         };
         /**
-         * Logbook Period is the best when it has the biggest work usage percent
-         * Best period duration is defined as {@link VehicleLogbook.periodDuration} by the ATO
+         * Get Logbook Period with the biggest work usage percent
+         * Best period duration is defined as VehicleLogbook.bestPeriodWeeks by the ATO
          * @TODO Vik: Best period: move this and related logic to backend
          */
         VehicleLogbookCollection.prototype.getBestPeriod = function () {
             if (!this.isBestPeriodExist()) {
                 return null;
             }
-            // declare best period variable
             var bestPeriod;
             // get list of all logbooks available for best period calculation
             var claimableLogbooks = this.getClaimableLogbooks().toArray();
@@ -6214,12 +6222,12 @@
                     break;
                 }
                 // get date range started from current handling logbook date
-                var dateRange = this.getPeriodRange(claimableLogbooks[i].date);
+                var dateRange = claimableLogbooks[i].getPeriod();
                 // get all logbooks included in current logbook period
-                var logbooksInRange = this.filterByRange('date', dateRange.from, dateRange.to);
+                var logbooksInRange = this.filterByRange('date', dateRange.start, dateRange.end);
                 var currentPeriod = classTransformer.plainToClass(LogbookPeriod, {
-                    from: dateRange.from,
-                    to: dateRange.to,
+                    from: dateRange.start,
+                    to: dateRange.end,
                     kilometers: logbooksInRange.getClaimableLogbooks().kilometers,
                     workUsage: logbooksInRange.getWorkUsage(),
                     logbooks: logbooksInRange
@@ -6257,28 +6265,15 @@
             var workKilometers = this.getClaimableLogbooks().kilometers;
             return Math.round(workKilometers / this.kilometers * 100);
         };
-        /**
-         * Get LOGBOOK_PERIOD_DURATION date range from passed start date
-         * @TODO Vik: Best period: move this and related logic to backend
-         */
-        VehicleLogbookCollection.prototype.getPeriodRange = function (from) {
-            // set end date as VehicleLogbook.periodDuration after start date
-            var to = new Date(from.getTime() + VehicleLogbook.periodDuration);
-            var financialYear = new FinancialYear();
-            // set as period last VehicleLogbook.periodDuration of current year if period end date after end of current year
-            if (to > financialYear.endDate) {
-                to = financialYear.endDate;
-                from = new Date(to.getTime() - VehicleLogbook.periodDuration);
-            }
-            return { from: from, to: to };
-        };
         /**
          * Get list of logbooks related to passed vehicle claim
          */
-        VehicleLogbookCollection.prototype.getByVehicleClaim = function (claim) {
-            return claim.isWorkTank()
-                ? this.filterBy('tankType', exports.TankTypeEnum.WORK)
-                : this.filterBy('business.id', claim.business.id);
+        VehicleLogbookCollection.prototype.getByVehicleClaim = function (vehicleClaim) {
+            return vehicleClaim.isSoleTank()
+                // sole tank may have multiple vehicle claims, so we need to filter by business.id
+                ? this.filterBy('business.id', vehicleClaim.business.id)
+                // work tank may have only one vehicle claim, so we need to filter by tank type
+                : this.filterBy('tankType', exports.TankTypeEnum.WORK);
         };
         return VehicleLogbookCollection;
     }(Collection));
@@ -6438,9 +6433,9 @@
             return _super !== null && _super.apply(this, arguments) || this;
         }
         /**
-         * Get 'Klms travelled for work' related chart account value
+         * Get 'Kms travelled for work' related chart account value
          */
-        ChartAccountsCollection.prototype.getVehicleKlmsRate = function (year) {
+        ChartAccountsCollection.prototype.getVehicleKmsRate = function (year) {
             if (year === void 0) { year = new FinancialYear().year; }
             return this.findBy('id', exports.ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK).getValueByYear(year).value;
         };
@@ -6801,6 +6796,9 @@
          * Get list of vehicle transactions filtered by vehicle claim
          */
         TransactionCollection.prototype.getByVehicleClaim = function (vehicleClaim) {
+            if (!vehicleClaim) {
+                return this.create([]);
+            }
             return vehicleClaim.isSoleTank()
                 // sole tank may have multiple vehicle claims, so we need to filter by business.id
                 ? this.getVehicleTransactions().filterBy('business.id', vehicleClaim.business.id)
@@ -6808,7 +6806,7 @@
                 : this.getVehicleTransactions().filterBy('tankType', exports.TankTypeEnum.WORK);
         };
         /**
-         * Get list of vehicle transactions except KLMS transactions
+         * Get list of vehicle transactions except KMS transactions
          */
         TransactionCollection.prototype.getLogbookTransactions = function () {
             return this
@@ -10176,7 +10174,7 @@
             return 0;
         };
         MyTaxDeductions.prototype.setVehicleClaimData = function () {
-            this.klmsMethodClaimAmount = this.vehicleClaim.getKLMsClaimAmount(this.vehicleClaimRate);
+            this.klmsMethodClaimAmount = this.vehicleClaim.getKMSClaimAmount(this.vehicleClaimRate);
             this.totalExpensesAmount = this.vehicleClaim.getLogbookClaimAmount(new TransactionCollection(__spreadArray(__spreadArray([], __read(this.transactions.getByTankType(this.vehicleClaim.tankType))), __read(this.depreciations.getByTankType(this.vehicleClaim.tankType).toTransactions().toArray()))));
         };
         /**
@@ -11248,10 +11246,7 @@
          */
         VehicleClaimService.prototype.listenVehicleClaimDetailsChanges = function () {
             var _this = this;
-            this.eventDispatcherService.on([
-                exports.AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_CREATED,
-                exports.AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_UPDATED
-            ])
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_UPDATED)
                 .subscribe(function () {
                 _this.resetCache();
             });
@@ -11278,14 +11273,17 @@
          */
         VehicleClaimService.prototype.updateWorkUsage = function (bestPeriod) {
             var _this = this;
-            // We are sure this.cache exist here because logbook best period calculation is based on vehicle claims,
-            // so before we can get logbook best period changes, we must get vehicle claims
+            // no need to update if cache not exist
+            if (!this.cache) {
+                return;
+            }
+            // @TODO Vik (TT-2210): need batch endpoint for this update
+            // @TODO Alex (TT-2210): fix frontend when endpoint ready
             var batch$ = this.cache.map(function (claim) {
                 var claimToUpdate = classTransformer.plainToClass(VehicleClaim, Object.assign({}, claim, { workUsage: bestPeriod === null || bestPeriod === void 0 ? void 0 : bestPeriod.getWorkUsageByClaim(claim) }));
                 return _this.update(claimToUpdate);
             });
-            // take(1) is using to avoid unnecessary callback calling whe user updated details directly
-            rxjs.combineLatest(batch$).pipe(operators.take(1)).subscribe();
+            rxjs.combineLatest(batch$).subscribe();
         };
         return VehicleClaimService;
     }(RestService));
@@ -11364,11 +11362,12 @@
          * @TODO Vik: Best period move this and related logic to backend
          */
         VehicleClaimDetailsService.prototype.updateToManual = function () {
-            // We are sure this.cache exist here because logbook best period calculation is based on vehicle claim details,
-            // so before we can get logbook best period changes, we must get vehicle claim details
+            // no need to update if cache not exist
+            if (!this.cache) {
+                return;
+            }
             var vehicleClaimDetails = classTransformer.plainToClass(VehicleClaimDetails, Object.assign({}, this.cache, { isManual: true }));
-            // take(1) is using to avoid unnecessary callback calling whe user updated details directly
-            this.update(vehicleClaimDetails).pipe(operators.take(1)).subscribe();
+            this.update(vehicleClaimDetails).subscribe();
         };
         return VehicleClaimDetailsService;
     }());
@@ -11688,7 +11687,7 @@
         }),
         _a[AccountSetupItemsEnum.WORK_LOGBOOK] = classTransformer.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.',
+            description: 'Do you use your vehicle for work? Select your method and the kms or logbook % to automate accurately all vehicle expenses throughout the year.',
             url: '/client/work-tank/logbook',
             urlFragment: 'productTour'
         }),
@@ -12630,7 +12629,6 @@
             this.eventDispatcherService.on([
                 exports.AppEventTypeEnum.VEHICLE_CLAIM_CREATED,
                 exports.AppEventTypeEnum.VEHICLE_CLAIM_UPDATED,
-                exports.AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_CREATED,
                 exports.AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_UPDATED
             ]).subscribe(function () {
                 _this.resetCache();
@@ -12738,7 +12736,7 @@
             }
             // 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)
+            // Logbook item is completed when user has at least one vehicle claim with any method (kms or logbook)
             batch.push(this.getLogbookItem());
             // @TODO waiting for sole tank forecast page
             // Sole item is completed when user added at least one sole income source
@@ -13974,7 +13972,6 @@
             this.eventDispatcherService.on([
                 exports.AppEventTypeEnum.VEHICLE_CLAIM_CREATED,
                 exports.AppEventTypeEnum.VEHICLE_CLAIM_UPDATED,
-                exports.AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_CREATED,
                 exports.AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_UPDATED
             ]).subscribe(function () {
                 _this.resetCache();
@@ -16465,7 +16462,7 @@
     /**
      * Abstract form class
      * @TODO rename to AbstractFormGroup
-     * @TODO Alex: refactor: check and improve logic
+     * @TODO Alex TT-2190: refactor: check and improve logic
      */
     var AbstractForm = /** @class */ (function (_super) {
         __extends(AbstractForm, _super);
@@ -16482,9 +16479,7 @@
             if (model && !model['id']) {
                 _this.markAsUnsaved();
             }
-            _this.valueChanges.subscribe(function () {
-                !!model && !!model['id'] && isEqual__default["default"](_this.value, _this.initialValue) ? _this.markAsSaved() : _this.markAsUnsaved();
-            });
+            _this.listenValueChanges();
             return _this;
         }
         Object.defineProperty(AbstractForm.prototype, "saved", {
@@ -16494,6 +16489,13 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(AbstractForm.prototype, "currentValue", {
+            get: function () {
+                return this.createModelInstance(Object.assign({}, this.model, this.getRawValue()));
+            },
+            enumerable: false,
+            configurable: true
+        });
         /**
          * Check validation and return a new instance of generic model.
          * Merge form value to initial object
@@ -16524,6 +16526,12 @@
             if (data === void 0) { data = {}; }
             return classTransformer.plainToClass(this.modelClass, data);
         };
+        AbstractForm.prototype.listenValueChanges = function () {
+            var _this = this;
+            this.valueChanges.subscribe(function () {
+                !!_this.model && !!_this.model['id'] && isEqual__default["default"](_this.value, _this.initialValue) ? _this.markAsSaved() : _this.markAsUnsaved();
+            });
+        };
         return AbstractForm;
     }(forms.FormGroup));
 
@@ -16818,6 +16826,7 @@
     /**
      * Form array with bank account business allocations
      * @TODO create AbstractFormArray
+     * @TODO Alex/Vik (TT-2184): copypasted from bank-account-properties.form, improve logic and create common parent class maybe
      */
     var SoleBusinessAllocationsForm = /** @class */ (function (_super) {
         __extends(SoleBusinessAllocationsForm, _super);
@@ -16924,7 +16933,7 @@
                 name: new forms.FormControl(invoiceTemplate.name, forms.Validators.required),
                 isTaxIncluded: new forms.FormControl(invoiceTemplate.isTaxIncluded),
                 term: new forms.FormControl(invoiceTemplate.term, [forms.Validators.required, forms.Validators.min(0)]),
-                bankAccount: new forms.FormControl(invoiceTemplate.bankAccount)
+                bankAccount: new forms.FormControl(invoiceTemplate.bankAccount, [forms.Validators.required])
             }, invoiceTemplate) || this;
         }
         return SoleInvoiceTemplateForm;
@@ -16943,10 +16952,13 @@
             if (bankAccount === null || bankAccount === void 0 ? void 0 : bankAccount.isSoleTank()) {
                 _this.addControl('businessAllocations', new SoleBusinessAllocationsForm(bankAccount.businessAllocations));
             }
-            _this.watchTankType();
+            _this.listenEvents();
             return _this;
         }
-        BankAccountAllocationForm.prototype.watchTankType = function () {
+        BankAccountAllocationForm.prototype.listenEvents = function () {
+            this.listenTankTypeChanges();
+        };
+        BankAccountAllocationForm.prototype.listenTankTypeChanges = function () {
             var _this = this;
             this.get('tankType').valueChanges.subscribe(function (tankType) {
                 var _a, _b;
@@ -17684,17 +17696,23 @@
          * @param details required for form controls disabled state management
          */
         function VehicleClaimForm(vehicleClaim, details) {
-            return _super.call(this, {
+            var _this = _super.call(this, {
                 kilometers: new forms.FormControl({
                     value: vehicleClaim.kilometers,
                     disabled: !details.isManual || details.isLogbookMethod()
                 }),
                 workUsage: new forms.FormControl({
                     value: vehicleClaim.workUsage,
-                    disabled: !details.isManual || details.isKlmsMethod()
+                    disabled: !details.isManual || details.isKmsMethod()
                 })
             }, vehicleClaim) || this;
+            _this.vehicleClaim = vehicleClaim;
+            _this.details = details;
+            return _this;
         }
+        VehicleClaimForm.prototype.getAverageWeeklyKMS = function () {
+            return this.get('kilometers').value / FinancialYear.weeksInYear;
+        };
         return VehicleClaimForm;
     }(AbstractForm));
 
@@ -17703,16 +17721,12 @@
      */
     var VehicleClaimDetailsForm = /** @class */ (function (_super) {
         __extends(VehicleClaimDetailsForm, _super);
-        /**
-         * @param vehicleClaimDetails required because we create a new details with prefilled data (like Financial year)
-         * @param logbooks required for isManual field disabled state management
-         */
-        function VehicleClaimDetailsForm(vehicleClaimDetails, logbooks) {
+        function VehicleClaimDetailsForm(vehicleClaimDetails, isBestPeriodExist) {
             return _super.call(this, {
                 method: new forms.FormControl(vehicleClaimDetails.method, forms.Validators.required),
                 isManual: new forms.FormControl({
                     value: vehicleClaimDetails.isManual,
-                    disabled: !logbooks.isBestPeriodExist()
+                    disabled: !isBestPeriodExist
                 }),
             }, vehicleClaimDetails) || this;
         }
@@ -17739,36 +17753,44 @@
                 date: new forms.FormControl(logbook.date, forms.Validators.required),
                 odometerStart: new forms.FormControl(logbook.odometerStart, forms.Validators.required),
                 odometerEnd: new forms.FormControl(logbook.odometerEnd, forms.Validators.required),
-                business: new forms.FormControl(logbook.business),
-                // @TODO Alex: remove when backend fixed
-                purpose: new forms.FormControl(exports.VehicleLogbookPurposeEnum.BUSINESS)
+                business: new forms.FormControl(logbook.business)
             }, logbook) || this;
             _this.logbook = logbook;
             _this.logbooks = logbooks;
+            _this.updateStateAndValidators();
+            return _this;
+        }
+        /**
+         * Set logbook validators and disable state depends of initial logbook and its place in the whole list
+         */
+        VehicleLogbookForm.prototype.updateStateAndValidators = function () {
             switch (true) {
                 // Create the first or edit the single logbook
-                case !logbook.id && !logbooks.length:
-                case !!logbook.id && logbooks.length === 1:
-                    _this.get('odometerStart').setValidators(forms.Validators.min(0));
-                    _this.get('date').setValidators(dateRangeValidator(new FinancialYear().startDate, new FinancialYear().endDate));
+                case !this.logbook.id && !this.logbooks.length:
+                case !!this.logbook.id && this.logbooks.length === 1:
+                    this.get('odometerStart').setValidators(forms.Validators.min(0));
+                    this.get('date').setValidators(dateRangeValidator(new FinancialYear().startDate, new FinancialYear().endDate));
                     break;
-                // Create the non-first or edit the last logbook
-                case !logbook.id && !!logbooks.length:
-                case !!logbook.id && logbook.id === logbooks.last.id && logbooks.length > 1:
-                    _this.get('odometerStart').disable();
-                    _this.get('odometerEnd').setValidators(forms.Validators.min(logbooks.last.odometerEnd));
-                    if (!!logbook.id) {
-                    }
-                    _this.get('date').setValidators(dateRangeValidator(logbooks.last.date, new FinancialYear().endDate));
+                // Create the non-first
+                case !this.logbook.id && !!this.logbooks.length:
+                    this.get('odometerStart').disable();
+                    this.get('odometerEnd').setValidators(forms.Validators.min(this.logbooks.last.odometerEnd));
+                    this.get('date').setValidators(dateRangeValidator(this.logbooks.last.date, new FinancialYear().endDate));
+                    break;
+                // Edit the last logbook
+                case !!this.logbook.id && this.logbook.id === this.logbooks.last.id && this.logbooks.length > 1:
+                    this.get('odometerStart').disable();
+                    this.get('odometerEnd').setValidators(forms.Validators.min(this.logbooks.last.odometerEnd));
+                    var preLastDate = this.logbooks.toArray()[this.logbooks.length - 1].date;
+                    this.get('date').setValidators(dateRangeValidator(preLastDate, new FinancialYear().endDate));
                     break;
                 // Edit the non-last logbook
-                case !!logbook.id && logbook.id !== logbooks.last.id && logbooks.length > 1:
-                    _this.get('odometerStart').disable();
-                    _this.get('odometerEnd').disable();
-                    _this.get('date').disable();
+                case !!this.logbook.id && this.logbook.id !== this.logbooks.last.id && this.logbooks.length > 1:
+                    this.get('odometerStart').disable();
+                    this.get('odometerEnd').disable();
+                    this.get('date').disable();
             }
-            return _this;
-        }
+        };
         return VehicleLogbookForm;
     }(AbstractForm));
     VehicleLogbookForm.maxDescriptionLength = 60;