taxtank-core 0.27.7 → 0.28.2

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$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';
+    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('event-source-polyfill/src/eventsource.min.js'), require('lodash/compact'), require('@angular/forms'), require('lodash/isEqual'), require('lodash/fromPairs'), require('lodash'), 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', 'event-source-polyfill/src/eventsource.min.js', 'lodash/compact', '@angular/forms', 'lodash/isEqual', 'lodash/fromPairs', 'lodash', '@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$1, global.momentRange, global.uniqBy, global.concat, global.rxjs["internal/observable/throwError"], global.cloneDeep$1, global.eventsource_min_js, global.compact, global.ng.forms, global.isEqual, global.fromPairs, global._, 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, eventsource_min_js, compact, forms, isEqual, fromPairs, _, 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 }; }
 
@@ -588,25 +588,28 @@
         AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SUBSCRIPTION_DELETED"] = 38] = "PROPERTY_SUBSCRIPTION_DELETED";
         AppEventTypeEnum[AppEventTypeEnum["PROPERTY_VALUATION_DOCUMENT_CREATED"] = 39] = "PROPERTY_VALUATION_DOCUMENT_CREATED";
         AppEventTypeEnum[AppEventTypeEnum["SERVICE_SUBSCRIPTION_UPDATED"] = 40] = "SERVICE_SUBSCRIPTION_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["SOLE_DEPRECIATION_METHOD_UPDATED"] = 41] = "SOLE_DEPRECIATION_METHOD_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["TAX_REVIEW_UPDATED"] = 42] = "TAX_REVIEW_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_CREATED"] = 43] = "TRANSACTION_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_DELETED"] = 44] = "TRANSACTION_DELETED";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED"] = 45] = "TRANSACTION_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_RECEIPT"] = 46] = "TRANSACTION_UPDATED_WITH_RECEIPT";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_DELETED_RECEIPT"] = 47] = "TRANSACTION_UPDATED_WITH_DELETED_RECEIPT";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_CREATED"] = 48] = "TRANSACTION_RECEIPT_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_DELETED"] = 49] = "TRANSACTION_RECEIPT_DELETED";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTIONS_CREATED"] = 50] = "TRANSACTIONS_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["USER_UPDATED"] = 51] = "USER_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_UPDATED"] = 52] = "VEHICLE_CLAIM_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_CREATED"] = 53] = "VEHICLE_CLAIM_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_UPDATED"] = 54] = "VEHICLE_CLAIM_DETAILS_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_CREATED"] = 55] = "VEHICLE_CLAIM_DETAILS_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_CREATED"] = 56] = "VEHICLE_LOGBOOK_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_UPDATED"] = 57] = "VEHICLE_LOGBOOK_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_DELETED"] = 58] = "VEHICLE_LOGBOOK_DELETED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED"] = 59] = "VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["SOLE_BUSINESS_CREATED"] = 41] = "SOLE_BUSINESS_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["SOLE_DEPRECIATION_METHOD_UPDATED"] = 42] = "SOLE_DEPRECIATION_METHOD_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["SOLE_DETAILS_CREATED"] = 43] = "SOLE_DETAILS_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["SOLE_DETAILS_UPDATED"] = 44] = "SOLE_DETAILS_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["TAX_REVIEW_UPDATED"] = 45] = "TAX_REVIEW_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_CREATED"] = 46] = "TRANSACTION_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_DELETED"] = 47] = "TRANSACTION_DELETED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED"] = 48] = "TRANSACTION_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_RECEIPT"] = 49] = "TRANSACTION_UPDATED_WITH_RECEIPT";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_DELETED_RECEIPT"] = 50] = "TRANSACTION_UPDATED_WITH_DELETED_RECEIPT";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_CREATED"] = 51] = "TRANSACTION_RECEIPT_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_DELETED"] = 52] = "TRANSACTION_RECEIPT_DELETED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTIONS_CREATED"] = 53] = "TRANSACTIONS_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["USER_UPDATED"] = 54] = "USER_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_UPDATED"] = 55] = "VEHICLE_CLAIM_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_CREATED"] = 56] = "VEHICLE_CLAIM_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_UPDATED"] = 57] = "VEHICLE_CLAIM_DETAILS_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_CREATED"] = 58] = "VEHICLE_CLAIM_DETAILS_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_CREATED"] = 59] = "VEHICLE_LOGBOOK_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_UPDATED"] = 60] = "VEHICLE_LOGBOOK_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_DELETED"] = 61] = "VEHICLE_LOGBOOK_DELETED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED"] = 62] = "VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED";
     })(exports.AppEventTypeEnum || (exports.AppEventTypeEnum = {}));
 
     var EventDispatcherService = /** @class */ (function () {
@@ -1057,6 +1060,7 @@
         SOLE_BUSINESSES_GET: new Endpoint('GET', '\\/sole-businesses'),
         SOLE_BUSINESSES_POST: new Endpoint('POST', '\\/sole-businesses'),
         SOLE_BUSINESSES_PUT: new Endpoint('PUT', '\\/sole-businesses\\/\\d+'),
+        BUSINESS_ACTIVITIES_GET: new Endpoint('GET', '\\/sole-business-activities'),
         SOLE_DEPRECIATION_METHODS_GET: new Endpoint('GET', '\\/sole-depreciation-methods'),
         SOLE_DEPRECIATION_METHODS_PUT: new Endpoint('PUT', '\\/sole-depreciation-methods\\/\\d+'),
         SOLE_INVOICES_GET: new Endpoint('GET', '\\/sole-invoices'),
@@ -3332,6 +3336,12 @@
         SoleInvoice.prototype.isPaid = function () {
             return this.status === exports.SoleInvoiceStatusesEnum.PAID;
         };
+        SoleInvoice.prototype.isOverdue = function () {
+            return this.isPending() && this.dateTo < new Date();
+        };
+        SoleInvoice.prototype.isUnpaid = function () {
+            return this.isPending() && this.dateTo >= new Date();
+        };
         return SoleInvoice;
     }(SoleInvoice$1));
     __decorate([
@@ -3426,15 +3436,15 @@
          * Get logbook period date range from logbook date and weeksInPeriod duration
          */
         VehicleLogbook.prototype.getPeriod = function () {
-            return moment.rangeFromInterval('weeks', VehicleLogbook.bestPeriodWeeks, this.date);
+            return moment.rangeFromInterval('milliseconds', VehicleLogbook.bestPeriodDuration, this.date);
         };
         return VehicleLogbook;
     }(VehicleLogbook$1));
     /**
-     * Logbook period duration in weeks.
+     * Logbook period duration in milliseconds.
      * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/211517441/Logbook+Vehicle
      */
-    VehicleLogbook.bestPeriodWeeks = 12;
+    VehicleLogbook.bestPeriodDuration = 12 * 7 * 24 * 3600 * 1000;
     __decorate([
         classTransformer.Type(function () { return Date; })
     ], VehicleLogbook.prototype, "date", void 0);
@@ -4673,6 +4683,9 @@
     __decorate([
         classTransformer.Type(function () { return SoleBusinessActivity$1; })
     ], SoleBusiness.prototype, "activity", void 0);
+    __decorate([
+        classTransformer.Type(function () { return IncomeSource; })
+    ], SoleBusiness.prototype, "incomeSource", void 0);
 
     var SoleBusinessActivity = /** @class */ (function (_super) {
         __extends(SoleBusinessActivity, _super);
@@ -6115,11 +6128,11 @@
     /**
      * Interceptor which adds user's basiq token to any http request to basiq api
      */
-    var BasiqInterceptor = /** @class */ (function () {
-        function BasiqInterceptor(basiqTokenService) {
+    var BasiqTokenInterceptor = /** @class */ (function () {
+        function BasiqTokenInterceptor(basiqTokenService) {
             this.basiqTokenService = basiqTokenService;
         }
-        BasiqInterceptor.prototype.intercept = function (request, next) {
+        BasiqTokenInterceptor.prototype.intercept = function (request, next) {
             var _this = this;
             // skip non-basiq requests
             if (!request.url.includes(BasiqService.basiqApiUrl)) {
@@ -6129,21 +6142,264 @@
                 return next.handle(_this.addToken(request, token));
             }));
         };
-        BasiqInterceptor.prototype.addToken = function (request, token) {
+        BasiqTokenInterceptor.prototype.addToken = function (request, token) {
             return request.clone({
                 setHeaders: {
                     Authorization: 'Bearer ' + token.value
                 }
             });
         };
-        return BasiqInterceptor;
+        return BasiqTokenInterceptor;
     }());
-    BasiqInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqInterceptor, deps: [{ token: BasiqTokenService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BasiqInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqInterceptor });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqInterceptor, decorators: [{
+    BasiqTokenInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqTokenInterceptor, deps: [{ token: BasiqTokenService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BasiqTokenInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqTokenInterceptor });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqTokenInterceptor, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: function () { return [{ type: BasiqTokenService }]; } });
 
+    /**
+     * server sent events service
+     * https://symfony.com/doc/current/mercure.html
+     */
+    var SseService = /** @class */ (function () {
+        function SseService(zone, jwtService, environment) {
+            this.zone = zone;
+            this.jwtService = jwtService;
+            this.environment = environment;
+        }
+        /**
+         * list to url for server events
+         */
+        SseService.prototype.on = function (topic) {
+            var _this = this;
+            var url = new URL(this.environment.mercureUrl);
+            url.searchParams.append('topic', this.environment.apiV2 + "/users/" + this.jwtService.decodeToken().username + "/" + topic);
+            // tslint:disable-next-line:typedef
+            return new rxjs.Observable(function (observer) {
+                var es = new eventsource_min_js.EventSourcePolyfill(url, {
+                    headers: {
+                        Authorization: 'Bearer ' + _this.jwtService.getToken(),
+                    }
+                });
+                es.onmessage = function (event) {
+                    _this.zone.run(function () { return observer.next(event); });
+                };
+            })
+                .pipe(operators.map(function (messageEvent) {
+                return JSON.parse(messageEvent.data);
+            }));
+        };
+        return SseService;
+    }());
+    SseService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SseService, deps: [{ token: i0__namespace.NgZone }, { token: JwtService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SseService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SseService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SseService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }], ctorParameters: function () {
+            return [{ type: i0__namespace.NgZone }, { type: JwtService }, { type: undefined, decorators: [{
+                            type: i0.Inject,
+                            args: ['environment']
+                        }] }];
+        } });
+
+    /**
+     * Service to work with user
+     */
+    var UserService = /** @class */ (function () {
+        function UserService(http, jwtService, eventDispatcherService, sseService, environment) {
+            this.http = http;
+            this.jwtService = jwtService;
+            this.eventDispatcherService = eventDispatcherService;
+            this.sseService = sseService;
+            this.environment = environment;
+            this.cacheSubject = new rxjs.ReplaySubject(1);
+            this.listenEvents();
+        }
+        UserService.prototype.listenEvents = function () {
+            this.listenServiceSubscriptionUpdated();
+        };
+        UserService.prototype.get = function () {
+            var _this = this;
+            if (!this.cache) {
+                this.fetch().subscribe(function () { }, function (error) {
+                    // force logout user (clear localStorage) when get current user return error
+                    if (error.status === 500) {
+                        _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.CURRENT_USER_GET_FAILED, null));
+                    }
+                });
+            }
+            return this.cacheSubject.asObservable();
+        };
+        /**
+         * Get current user
+         */
+        UserService.prototype.fetch = function () {
+            var _this = this;
+            return this.http.get(this.environment.apiV2 + "/users/current")
+                .pipe(operators.map(function (userBase) {
+                var user = classTransformer.plainToClass(User, userBase);
+                localStorage.setItem('userId', user.id.toString());
+                // @TODO remove
+                localStorage.setItem('financialYear', user.financialYear.toString());
+                _this.cache = user;
+                _this.cacheSubject.next(_this.cache);
+                return user;
+            }));
+        };
+        /**
+         * Register new user
+         */
+        UserService.prototype.register = function (data) {
+            return this.http.post(this.environment.apiV2 + "/users/registration", data);
+        };
+        /**
+         * Update user
+         */
+        UserService.prototype.update = function (user) {
+            var _this = this;
+            return this.http.put(this.environment.apiV2 + "/users/" + user.id, user)
+                .pipe(operators.map(function (userBase) {
+                _this.cache = classTransformer.plainToClass(User, userBase);
+                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.USER_UPDATED, null));
+                _this.cacheSubject.next(_this.cache);
+            }));
+        };
+        /**
+         * Change user password
+         */
+        UserService.prototype.changePassword = function (currentPassword, newPassword) {
+            return this.http.put(this.environment.apiV2 + "/users/password/change", { currentPassword: currentPassword, newPassword: newPassword });
+        };
+        /**
+         * Recovery user password
+         */
+        UserService.prototype.recoveryPassword = function (email) {
+            return this.http.put(this.environment.apiV2 + "/users/password/recovery", { email: email });
+        };
+        /**
+         * Reset user password
+         */
+        UserService.prototype.resetPassword = function (newPassword, resetToken) {
+            return this.http.put(this.environment.apiV2 + "/users/password/reset", { newPassword: newPassword, resetToken: resetToken });
+        };
+        UserService.prototype.resendConfirmationEmail = function (email) {
+            return this.http.post(this.environment.apiV2 + "/users/confirmation/resend", { email: email });
+        };
+        /**
+         * Confirm registered user
+         */
+        UserService.prototype.confirm = function (verificationCode) {
+            return this.http.post(this.environment.apiV2 + "/users/confirmation", { verificationCode: verificationCode });
+        };
+        /**
+         * Search existing user
+         */
+        UserService.prototype.search = function (email) {
+            return this.http.get(this.environment.apiV2 + "/users/search?email=" + email)
+                .pipe(operators.map(function (userBase) {
+                return classTransformer.plainToClass(User, userBase);
+            }));
+        };
+        /**
+         * Finish onboarding process
+         */
+        UserService.prototype.finishOnboarding = function (user) {
+            var _this = this;
+            return this.http.put(this.environment.apiV2 + "/users/status", user)
+                .pipe(operators.map(function () {
+                _this.cache = user;
+                _this.cacheSubject.next(_this.cache);
+            }));
+        };
+        /**
+         * Update user photo
+         */
+        UserService.prototype.updatePhoto = function (photo) {
+            var _this = this;
+            return this.http.post(this.environment.apiV2 + "/users/photo?_method=PUT", photo)
+                .pipe(operators.map(function (photoUrl) {
+                _this.cache = classTransformer.plainToClass(User, Object.assign(_this.cache, { photo: photoUrl }));
+                _this.cacheSubject.next(_this.cache);
+            }));
+        };
+        UserService.prototype.switchFinancialYear = function (year) {
+            return this.http.get(this.environment.apiV2 + "/financial-year/switch", { params: new i1.HttpParams({ fromString: "financialYear=" + year }) }).pipe(operators.map(function () {
+                localStorage.setItem('financialYear', year.toString());
+                window.location.reload();
+            }));
+        };
+        /**
+         * clear service cache
+         */
+        UserService.prototype.resetCache = function () {
+            this.fetch().subscribe();
+        };
+        /**
+         * Create basiq (if not exist yet) to provide access to basiq api
+         */
+        UserService.prototype.createBasiq = function () {
+            var _this = this;
+            return this.http.post(this.environment.apiV2 + "/basiq/user", {})
+                .pipe(operators.map(function (basiqId) {
+                _this.cache = classTransformer.plainToClass(User, Object.assign(_this.cache, { basiqId: basiqId }));
+                _this.cacheSubject.next(_this.cache);
+                return basiqId;
+            }));
+        };
+        /**
+         * Update cache when user's service subscription is updated
+         */
+        UserService.prototype.listenServiceSubscriptionUpdated = function () {
+            var _this = this;
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.SERVICE_SUBSCRIPTION_UPDATED).subscribe(function () { return _this.resetCache(); });
+        };
+        return UserService;
+    }());
+    UserService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserService, deps: [{ token: i1__namespace.HttpClient }, { token: JwtService }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    UserService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }], ctorParameters: function () {
+            return [{ type: i1__namespace.HttpClient }, { type: JwtService }, { type: EventDispatcherService }, { type: SseService }, { type: undefined, decorators: [{
+                            type: i0.Inject,
+                            args: ['environment']
+                        }] }];
+        } });
+
+    /**
+     * Interceptor which check if client's basiq id exist and request it if not
+     */
+    var BasiqClientIdInterceptor = /** @class */ (function () {
+        function BasiqClientIdInterceptor(userService) {
+            this.userService = userService;
+        }
+        BasiqClientIdInterceptor.prototype.intercept = function (request, next) {
+            var _this = this;
+            // Check if 'client id' URL segment contains null instead of id
+            if (!request.url.startsWith(BasiqService.basiqApiUrl + "/users/null")) {
+                return next.handle(request);
+            }
+            return this.userService.createBasiq().pipe(operators.mergeMap(function (basiqClientId) { return next.handle(_this.addId(request, basiqClientId)); }));
+        };
+        BasiqClientIdInterceptor.prototype.addId = function (request, basiqClientId) {
+            return request.clone({
+                url: request.url.replace('null', basiqClientId)
+            });
+        };
+        return BasiqClientIdInterceptor;
+    }());
+    BasiqClientIdInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqClientIdInterceptor, deps: [{ token: UserService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BasiqClientIdInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqClientIdInterceptor });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqClientIdInterceptor, decorators: [{
+                type: i0.Injectable
+            }], ctorParameters: function () { return [{ type: UserService }]; } });
+
     var InterceptorsModule = /** @class */ (function () {
         function InterceptorsModule() {
         }
@@ -6180,7 +6436,12 @@
             },
             {
                 provide: i1.HTTP_INTERCEPTORS,
-                useClass: BasiqInterceptor,
+                useClass: BasiqTokenInterceptor,
+                multi: true
+            },
+            {
+                provide: i1.HTTP_INTERCEPTORS,
+                useClass: BasiqClientIdInterceptor,
                 multi: true
             }
         ] });
@@ -6216,7 +6477,12 @@
                             },
                             {
                                 provide: i1.HTTP_INTERCEPTORS,
-                                useClass: BasiqInterceptor,
+                                useClass: BasiqTokenInterceptor,
+                                multi: true
+                            },
+                            {
+                                provide: i1.HTTP_INTERCEPTORS,
+                                useClass: BasiqClientIdInterceptor,
                                 multi: true
                             }
                         ]
@@ -6299,7 +6565,7 @@
             if (this.items.length < 2) {
                 return false;
             }
-            return VehicleLogbook.bestPeriodWeeks < (this.last.date.getTime() - this.first.date.getTime());
+            return VehicleLogbook.bestPeriodDuration < (this.last.date.getTime() - this.first.date.getTime());
         };
         /**
          * Get collection of non-personal logbooks (work-related, sole-related).
@@ -6382,6 +6648,23 @@
         return VehicleLogbookCollection;
     }(Collection));
 
+    var SoleInvoiceCollection = /** @class */ (function (_super) {
+        __extends(SoleInvoiceCollection, _super);
+        function SoleInvoiceCollection() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        SoleInvoiceCollection.prototype.getOverdue = function () {
+            return this.filter(function (invoice) { return invoice.isOverdue(); });
+        };
+        SoleInvoiceCollection.prototype.getUnpaid = function () {
+            return this.filter(function (invoice) { return invoice.isUnpaid(); });
+        };
+        SoleInvoiceCollection.prototype.getPaid = function () {
+            return this.filter(function (invoice) { return invoice.isPaid(); });
+        };
+        return SoleInvoiceCollection;
+    }(Collection));
+
     // @TODO Alex move here all collections
 
     var AccountSetupItemCollection = /** @class */ (function (_super) {
@@ -7114,6 +7397,9 @@
         IncomeSourceCollection.prototype.getSalary = function () {
             return this.items.filter(function (incomeSource) { return incomeSource.isSalaryIncome(); });
         };
+        IncomeSourceCollection.prototype.getOther = function () {
+            return this.items.filter(function (incomeSource) { return incomeSource.isOtherIncome(); });
+        };
         Object.defineProperty(IncomeSourceCollection.prototype, "forecasts", {
             /**
              * Get income sources list of forecasts
@@ -11111,6 +11397,13 @@
             _this.isHydra = true;
             return _this;
         }
+        SoleBusinessService.prototype.add = function (soleBusiness) {
+            var _this = this;
+            return _super.prototype.add.call(this, soleBusiness).pipe(operators.map(function (business) {
+                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.SOLE_BUSINESS_CREATED, business));
+                return business;
+            }));
+        };
         return SoleBusinessService;
     }(RestService));
     SoleBusinessService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleBusinessService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
@@ -11173,7 +11466,11 @@
             this.toastService = toastService;
             this.cacheSubject = new rxjs.ReplaySubject(1);
             this.url = 'sole-depreciation-methods';
+            this.listenEvents();
         }
+        SoleDepreciationMethodService.prototype.listenEvents = function () {
+            this.listenSoleDetailsChanges();
+        };
         SoleDepreciationMethodService.prototype.get = function () {
             var _this = this;
             if (!this.cache) {
@@ -11201,6 +11498,14 @@
                 return throwError.throwError(error);
             }));
         };
+        SoleDepreciationMethodService.prototype.listenSoleDetailsChanges = function () {
+            var _this = this;
+            this.eventDispatcherService.on([exports.AppEventTypeEnum.SOLE_DETAILS_CREATED, exports.AppEventTypeEnum.SOLE_DETAILS_UPDATED])
+                .subscribe(function () {
+                _this.cache = null;
+                _this.get().subscribe();
+            });
+        };
         return SoleDepreciationMethodService;
     }());
     SoleDepreciationMethodService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleDepreciationMethodService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }, { token: EventDispatcherService }, { token: ToastService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
@@ -11221,9 +11526,10 @@
      * @TODO TT-1777 Alex: extend from rest service when it refactored
      */
     var SoleDetailsService = /** @class */ (function () {
-        function SoleDetailsService(http, environment) {
+        function SoleDetailsService(http, environment, eventDispatcherService) {
             this.http = http;
             this.environment = environment;
+            this.eventDispatcherService = eventDispatcherService;
             this.cacheSubject = new rxjs.ReplaySubject(1);
         }
         SoleDetailsService.prototype.get = function () {
@@ -11248,6 +11554,7 @@
             return this.http.post(this.environment.apiV2 + "/sole-details", soleDetails).pipe(operators.map(function (soleDetailsBase) {
                 _this.cache = classTransformer.plainToClass(SoleDetails, soleDetailsBase);
                 _this.cacheSubject.next(_this.cache);
+                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.SOLE_DETAILS_CREATED, soleDetails));
                 return _this.cache;
             }));
         };
@@ -11256,12 +11563,13 @@
             return this.http.put(this.environment.apiV2 + "/sole-details/" + soleDetails.id, soleDetails).pipe(operators.map(function (soleDetailsBase) {
                 _this.cache = classTransformer.plainToClass(SoleDetails, soleDetailsBase);
                 _this.cacheSubject.next(_this.cache);
+                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.SOLE_DETAILS_UPDATED, soleDetails));
                 return _this.cache;
             }));
         };
         return SoleDetailsService;
     }());
-    SoleDetailsService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleDetailsService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SoleDetailsService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleDetailsService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }, { token: EventDispatcherService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
     SoleDetailsService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleDetailsService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleDetailsService, decorators: [{
                 type: i0.Injectable,
@@ -11272,7 +11580,7 @@
             return [{ type: i1__namespace.HttpClient }, { type: undefined, decorators: [{
                             type: i0.Inject,
                             args: ['environment']
-                        }] }];
+                        }] }, { type: EventDispatcherService }];
         } });
 
     var SoleInvoiceService = /** @class */ (function (_super) {
@@ -12033,6 +12341,9 @@
             _this.incomeSourceTypeSubject = new rxjs.ReplaySubject(1);
             return _this;
         }
+        IncomeSourceService.prototype.listenEvents = function () {
+            this.listenSoleBusinessCreated();
+        };
         /**
          * Get income sources tax calculation
          * @param salaryForecast for which tax should be calculated
@@ -12107,6 +12418,15 @@
             }
             return this.incomeSourceTypeSubject.asObservable();
         };
+        /**
+         * Sole businesses create together with income source
+         */
+        IncomeSourceService.prototype.listenSoleBusinessCreated = function () {
+            var _this = this;
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.SOLE_BUSINESS_CREATED).subscribe(function () {
+                _this.resetCache();
+            });
+        };
         return IncomeSourceService;
     }(RestService));
     IncomeSourceService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
@@ -13399,54 +13719,6 @@
                     }]
             }] });
 
-    /**
-     * server sent events service
-     * https://symfony.com/doc/current/mercure.html
-     */
-    var SseService = /** @class */ (function () {
-        function SseService(zone, jwtService, environment) {
-            this.zone = zone;
-            this.jwtService = jwtService;
-            this.environment = environment;
-        }
-        /**
-         * list to url for server events
-         */
-        SseService.prototype.on = function (topic) {
-            var _this = this;
-            var url = new URL(this.environment.mercureUrl);
-            url.searchParams.append('topic', this.environment.apiV2 + "/users/" + this.jwtService.decodeToken().username + "/" + topic);
-            // tslint:disable-next-line:typedef
-            return new rxjs.Observable(function (observer) {
-                var es = new eventsource_min_js.EventSourcePolyfill(url, {
-                    headers: {
-                        Authorization: 'Bearer ' + _this.jwtService.getToken(),
-                    }
-                });
-                es.onmessage = function (event) {
-                    _this.zone.run(function () { return observer.next(event); });
-                };
-            })
-                .pipe(operators.map(function (messageEvent) {
-                return JSON.parse(messageEvent.data);
-            }));
-        };
-        return SseService;
-    }());
-    SseService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SseService, deps: [{ token: i0__namespace.NgZone }, { token: JwtService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    SseService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SseService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SseService, decorators: [{
-                type: i0.Injectable,
-                args: [{
-                        providedIn: 'root'
-                    }]
-            }], ctorParameters: function () {
-            return [{ type: i0__namespace.NgZone }, { type: JwtService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
-
     /**
      * Service for work with chats
      */
@@ -16158,161 +16430,6 @@
                     }]
             }] });
 
-    /**
-     * Service to work with user
-     */
-    var UserService = /** @class */ (function () {
-        function UserService(http, jwtService, eventDispatcherService, sseService, environment) {
-            this.http = http;
-            this.jwtService = jwtService;
-            this.eventDispatcherService = eventDispatcherService;
-            this.sseService = sseService;
-            this.environment = environment;
-            this.cacheSubject = new rxjs.ReplaySubject(1);
-            this.listenEvents();
-        }
-        UserService.prototype.listenEvents = function () {
-            this.listenServiceSubscriptionUpdated();
-        };
-        UserService.prototype.get = function () {
-            var _this = this;
-            if (!this.cache) {
-                this.fetch().subscribe(function () { }, function (error) {
-                    // force logout user (clear localStorage) when get current user return error
-                    if (error.status === 500) {
-                        _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.CURRENT_USER_GET_FAILED, null));
-                    }
-                });
-            }
-            return this.cacheSubject.asObservable();
-        };
-        /**
-         * Get current user
-         */
-        UserService.prototype.fetch = function () {
-            var _this = this;
-            return this.http.get(this.environment.apiV2 + "/users/current")
-                .pipe(operators.map(function (userBase) {
-                var user = classTransformer.plainToClass(User, userBase);
-                localStorage.setItem('userId', user.id.toString());
-                // @TODO remove
-                localStorage.setItem('financialYear', user.financialYear.toString());
-                _this.cache = user;
-                _this.cacheSubject.next(_this.cache);
-                return user;
-            }));
-        };
-        /**
-         * Register new user
-         */
-        UserService.prototype.register = function (data) {
-            return this.http.post(this.environment.apiV2 + "/users/registration", data);
-        };
-        /**
-         * Update user
-         */
-        UserService.prototype.update = function (user) {
-            var _this = this;
-            return this.http.put(this.environment.apiV2 + "/users/" + user.id, user)
-                .pipe(operators.map(function (userBase) {
-                _this.cache = classTransformer.plainToClass(User, userBase);
-                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.USER_UPDATED, null));
-                _this.cacheSubject.next(_this.cache);
-            }));
-        };
-        /**
-         * Change user password
-         */
-        UserService.prototype.changePassword = function (currentPassword, newPassword) {
-            return this.http.put(this.environment.apiV2 + "/users/password/change", { currentPassword: currentPassword, newPassword: newPassword });
-        };
-        /**
-         * Recovery user password
-         */
-        UserService.prototype.recoveryPassword = function (email) {
-            return this.http.put(this.environment.apiV2 + "/users/password/recovery", { email: email });
-        };
-        /**
-         * Reset user password
-         */
-        UserService.prototype.resetPassword = function (newPassword, resetToken) {
-            return this.http.put(this.environment.apiV2 + "/users/password/reset", { newPassword: newPassword, resetToken: resetToken });
-        };
-        UserService.prototype.resendConfirmationEmail = function (email) {
-            return this.http.post(this.environment.apiV2 + "/users/confirmation/resend", { email: email });
-        };
-        /**
-         * Confirm registered user
-         */
-        UserService.prototype.confirm = function (verificationCode) {
-            return this.http.post(this.environment.apiV2 + "/users/confirmation", { verificationCode: verificationCode });
-        };
-        /**
-         * Search existing user
-         */
-        UserService.prototype.search = function (email) {
-            return this.http.get(this.environment.apiV2 + "/users/search?email=" + email)
-                .pipe(operators.map(function (userBase) {
-                return classTransformer.plainToClass(User, userBase);
-            }));
-        };
-        /**
-         * Finish onboarding process
-         */
-        UserService.prototype.finishOnboarding = function (user) {
-            var _this = this;
-            return this.http.put(this.environment.apiV2 + "/users/status", user)
-                .pipe(operators.map(function () {
-                _this.cache = user;
-                _this.cacheSubject.next(_this.cache);
-            }));
-        };
-        /**
-         * Update user photo
-         */
-        UserService.prototype.updatePhoto = function (photo) {
-            var _this = this;
-            return this.http.post(this.environment.apiV2 + "/users/photo?_method=PUT", photo)
-                .pipe(operators.map(function (photoUrl) {
-                _this.cache = classTransformer.plainToClass(User, Object.assign(_this.cache, { photo: photoUrl }));
-                _this.cacheSubject.next(_this.cache);
-            }));
-        };
-        UserService.prototype.switchFinancialYear = function (year) {
-            return this.http.get(this.environment.apiV2 + "/financial-year/switch", { params: new i1.HttpParams({ fromString: "financialYear=" + year }) }).pipe(operators.map(function () {
-                localStorage.setItem('financialYear', year.toString());
-                window.location.reload();
-            }));
-        };
-        /**
-         * clear service cache
-         */
-        UserService.prototype.resetCache = function () {
-            this.fetch().subscribe();
-        };
-        /**
-         * Update cache when user's service subscription is updated
-         */
-        UserService.prototype.listenServiceSubscriptionUpdated = function () {
-            var _this = this;
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.SERVICE_SUBSCRIPTION_UPDATED).subscribe(function () { return _this.resetCache(); });
-        };
-        return UserService;
-    }());
-    UserService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserService, deps: [{ token: i1__namespace.HttpClient }, { token: JwtService }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    UserService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserService, decorators: [{
-                type: i0.Injectable,
-                args: [{
-                        providedIn: 'root'
-                    }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: JwtService }, { type: EventDispatcherService }, { type: SseService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
-
     /**
      * Service to work with XLSX (generate, download, e.t.c.)
      */
@@ -16937,13 +17054,50 @@
         __extends(SoleBusinessForm, _super);
         function SoleBusinessForm(business) {
             if (business === void 0) { business = classTransformer.plainToClass(SoleBusiness, {}); }
-            return _super.call(this, {
+            var _this = _super.call(this, {
                 name: new forms.FormControl(business.name, forms.Validators.required),
                 activity: new forms.FormControl(business.activity, forms.Validators.required),
                 description: new forms.FormControl(business.description),
                 website: new forms.FormControl(business.website)
             }, business) || this;
+            // User have to create income source with new business.
+            // Income source is not able for edit business
+            if (!business.id) {
+                // @TODO Alex: move to separated form class
+                _this.addControl('incomeSource', new forms.FormGroup({
+                    type: new forms.FormControl(exports.IncomeSourceTypeEnum.SOLE, forms.Validators.required),
+                    name: new forms.FormControl(null, forms.Validators.required),
+                    soleForecasts: new forms.FormArray([
+                        new forms.FormGroup({
+                            financialYear: new forms.FormControl(new FinancialYear().year, forms.Validators.required),
+                            amount: new forms.FormControl(null, forms.Validators.required),
+                            taxInstalments: new forms.FormControl(null, forms.Validators.required)
+                        })
+                    ])
+                }));
+                _this.addControl('losses', new forms.FormArray([
+                    new forms.FormGroup({
+                        financialYear: new forms.FormControl(new FinancialYear().year),
+                        openBalance: new forms.FormControl(null, forms.Validators.required)
+                    })
+                ]));
+            }
+            return _this;
         }
+        Object.defineProperty(SoleBusinessForm.prototype, "forecastFormGroup", {
+            get: function () {
+                return this.get('incomeSource').get('soleForecasts').at(0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(SoleBusinessForm.prototype, "lossFormGroup", {
+            get: function () {
+                return this.get('losses').at(0);
+            },
+            enumerable: false,
+            configurable: true
+        });
         return SoleBusinessForm;
     }(AbstractForm));
 
@@ -17039,11 +17193,23 @@
         return SoleDepreciationMethodForm;
     }(AbstractForm));
 
+    /**
+     * Validator check if entered strong length is equal to passed length parameter
+     */
+    function requiredLengthValidator(length) {
+        return function (control) {
+            if (control.value && control.value.length !== length) {
+                return { requiredLength: length };
+            }
+            return null;
+        };
+    }
+
     var SoleDetailsForm = /** @class */ (function (_super) {
         __extends(SoleDetailsForm, _super);
         function SoleDetailsForm(soleDetails) {
             return _super.call(this, {
-                abn: new forms.FormControl(soleDetails.abn, [forms.Validators.required, forms.Validators.minLength(11), forms.Validators.maxLength(11)]),
+                abn: new forms.FormControl(soleDetails.abn, [forms.Validators.required, requiredLengthValidator(11)]),
                 isGST: new forms.FormControl(soleDetails.isGST || false)
             }, soleDetails) || this;
         }
@@ -18278,6 +18444,7 @@
     exports.SoleForecast = SoleForecast;
     exports.SoleForecastService = SoleForecastService;
     exports.SoleInvoice = SoleInvoice;
+    exports.SoleInvoiceCollection = SoleInvoiceCollection;
     exports.SoleInvoiceForm = SoleInvoiceForm;
     exports.SoleInvoiceItem = SoleInvoiceItem;
     exports.SoleInvoiceItemForm = SoleInvoiceItemForm;