taxtank-core 0.16.7 → 0.16.8

package/bundles/taxtank-core.umd.js

@@ -4371,10 +4371,10 @@
         return IncomeSourceType;
     }(AbstractModel));
 
-    exports.IncomeSourceTypeListSalaryEnum = void 0;
+    var IncomeSourceTypeListSalaryEnum;
     (function (IncomeSourceTypeListSalaryEnum) {
         IncomeSourceTypeListSalaryEnum[IncomeSourceTypeListSalaryEnum["BONUSES"] = 1] = "BONUSES";
-    })(exports.IncomeSourceTypeListSalaryEnum || (exports.IncomeSourceTypeListSalaryEnum = {}));
+    })(IncomeSourceTypeListSalaryEnum || (IncomeSourceTypeListSalaryEnum = {}));
 
     exports.IncomeSourceTypeListWorkEnum = void 0;
     (function (IncomeSourceTypeListWorkEnum) {
@@ -4400,7 +4400,7 @@
             return _super !== null && _super.apply(this, arguments) || this;
         }
         IncomeSourceType.prototype.isSalary = function () {
-            return !!exports.IncomeSourceTypeListSalaryEnum[this.id];
+            return !!IncomeSourceTypeListSalaryEnum[this.id];
         };
         IncomeSourceType.prototype.isWork = function () {
             return !!exports.IncomeSourceTypeListWorkEnum[this.id];
@@ -6089,6 +6089,11 @@
         DepreciationWriteOffAmountEnum[DepreciationWriteOffAmountEnum["BORROWING_EXPENSES"] = 100] = "BORROWING_EXPENSES";
     })(exports.DepreciationWriteOffAmountEnum || (exports.DepreciationWriteOffAmountEnum = {}));
 
+    exports.IncomeSourceTypeListSoleEnum = void 0;
+    (function (IncomeSourceTypeListSoleEnum) {
+        IncomeSourceTypeListSoleEnum[IncomeSourceTypeListSoleEnum["SOLE_TRADER"] = 7] = "SOLE_TRADER";
+    })(exports.IncomeSourceTypeListSoleEnum || (exports.IncomeSourceTypeListSoleEnum = {}));
+
     exports.InviteStatusEnum = void 0;
     (function (InviteStatusEnum) {
         InviteStatusEnum[InviteStatusEnum["PENDING"] = 1] = "PENDING";
@@ -8896,7 +8901,7 @@
             clientIncomeTypes: ['sole']
         }),
         _a[AccountSetupItemsEnum.TRANSACTION] = classTransformer.plainToClass(AccountSetupItem, {
-            title: 'Allocation transactions',
+            title: 'Allocate 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',
             urlFragment: 'allocationProductTour',
@@ -8915,6 +8920,8 @@
         ClientIncomeTypesService.prototype.get = function () {
             var _this = this;
             if (!this.cache) {
+                // @TODO alex fix everywhere, start with rest service
+                this.cache = classTransformer.plainToClass(ClientIncomeTypes, {});
                 this.http.get(this.environment.apiV2 + "/client-income-types")
                     .pipe(operators.map(function (response) {
                     return classTransformer.plainToClass(ClientIncomeTypes, response['hydra:member'][0], { excludePrefixes: ['@'] });
@@ -9053,6 +9060,7 @@
          */
         RestService.prototype.get = function () {
             if (!this.cache) {
+                this.cache = [];
                 this.fetch().subscribe();
             }
             return this.cacheSubject.asObservable();
@@ -10042,12 +10050,22 @@
         AccountSetupService.prototype.get = function () {
             var _this = this;
             if (!this.cache) {
-                this.clientIncomeTypesService.get().subscribe(function (incomeTypes) {
+                this.cache = new AccountSetupItemCollection([]);
+                this.clientIncomeTypesService.get()
+                    .pipe(
+                // we need account setup only when user selected at least one income type
+                operators.filter(function (incomeTypes) { return !!incomeTypes.length; }), operators.mergeMap(function (incomeTypes) {
                     _this.clientIncomeTypesId = incomeTypes.id;
-                    rxjs.combineLatest(_this.createBatch(incomeTypes)).subscribe(function (items) {
-                        _this.cache = new AccountSetupItemCollection(items);
-                        _this.cacheSubject.next(_this.cache);
-                    });
+                    return _this.createBatch(incomeTypes);
+                }))
+                    .subscribe(function (items) {
+                    switch (true) {
+                        case !_this.cache:
+                        case _this.cache.getBy('isCompleted', true).length !== items.getBy('isCompleted', true).length:
+                        case _this.cache.length !== items.length:
+                            _this.cache = cloneDeep__default["default"](items);
+                            _this.cacheSubject.next(_this.cache);
+                    }
                 });
             }
             return this.cacheSubject.asObservable();
@@ -10067,6 +10085,9 @@
                 if (result.length) {
                     item.isCompleted = true;
                 }
+                else {
+                    item.isCompleted = false;
+                }
                 return item;
             }));
         };
@@ -10078,7 +10099,7 @@
             var batch = [];
             // Salary item is completed when user added salary income source
             if (incomeTypes.salary) {
-                batch.push(this.create(AccountSetupItemsEnum.SALARY, this.getIncomeSourcesByType(exports.IncomeSourceTypeEnum.SALARY)));
+                batch.push(this.create(AccountSetupItemsEnum.SALARY, this.getIncomeSourcesByType(exports.IncomeSourceTypeEnum.WORK)));
             }
             // Other income item is completed when user added at least one other income source
             if (incomeTypes.dividends || incomeTypes.other) {
@@ -10104,7 +10125,7 @@
             // }
             // Allocation item is completed when user added at least one transaction allocation
             batch.push(this.create(AccountSetupItemsEnum.TRANSACTION, this.transactionAllocationService.get()));
-            return batch;
+            return rxjs.combineLatest(batch).pipe(operators.map(function (items) { return new AccountSetupItemCollection(items); }));
         };
         /**
          * @TODO work with collection when services refactored
@@ -10118,15 +10139,15 @@
          * Show logbook item when user has at least 1 vehicle transaction
          */
         AccountSetupService.prototype.getLogbookItem = function () {
-            return rxjs.combineLatest([
-                this.transactionService.get(),
-                this.create(AccountSetupItemsEnum.WORK_LOGBOOK, this.vehicleClaimService.get())
-            ]).pipe(operators.map(function (_a) {
-                var _b = __read(_a, 2), transactions = _b[0], item = _b[1];
-                if (new TransactionCollection(transactions).getVehicleTransactions().length) {
-                    return item;
+            var _this = this;
+            return this.transactionService.get()
+                .pipe(
+            // @TODO Alex: remove map when services start work with collections
+            operators.map(function (transactions) { return new TransactionCollection(transactions); }), operators.mergeMap(function (transactions) {
+                if (transactions.getVehicleTransactions().length) {
+                    return _this.create(AccountSetupItemsEnum.WORK_LOGBOOK, _this.vehicleClaimService.get());
                 }
-                return null;
+                return rxjs.of(null);
             }));
         };
         return AccountSetupService;