taxtank-core 0.16.10 → 0.16.11

package/bundles/taxtank-core.umd.js

@@ -2205,6 +2205,9 @@
         IncomeSourceCollection.prototype.filterByTypes = function (types) {
             return this.items.filter(function (incomeSource) { return types.includes(incomeSource.type); });
         };
+        IncomeSourceCollection.prototype.getSalary = function () {
+            return this.items.filter(function (incomeSource) { return incomeSource.isSalaryIncome(); });
+        };
         Object.defineProperty(IncomeSourceCollection.prototype, "forecasts", {
             /**
              * Get income sources list of forecasts
@@ -4288,10 +4291,9 @@
 
     exports.IncomeSourceTypeEnum = void 0;
     (function (IncomeSourceTypeEnum) {
-        IncomeSourceTypeEnum[IncomeSourceTypeEnum["SALARY"] = 1] = "SALARY";
-        IncomeSourceTypeEnum[IncomeSourceTypeEnum["WORK"] = 2] = "WORK";
+        IncomeSourceTypeEnum[IncomeSourceTypeEnum["WORK"] = 1] = "WORK";
+        IncomeSourceTypeEnum[IncomeSourceTypeEnum["SOLE"] = 2] = "SOLE";
         IncomeSourceTypeEnum[IncomeSourceTypeEnum["OTHER"] = 3] = "OTHER";
-        IncomeSourceTypeEnum[IncomeSourceTypeEnum["SOLE"] = 4] = "SOLE";
     })(exports.IncomeSourceTypeEnum || (exports.IncomeSourceTypeEnum = {}));
 
     var SalaryForecast$1 = /** @class */ (function (_super) {
@@ -4371,13 +4373,9 @@
         return IncomeSourceType;
     }(AbstractModel));
 
-    var IncomeSourceTypeListSalaryEnum;
-    (function (IncomeSourceTypeListSalaryEnum) {
-        IncomeSourceTypeListSalaryEnum[IncomeSourceTypeListSalaryEnum["BONUSES"] = 1] = "BONUSES";
-    })(IncomeSourceTypeListSalaryEnum || (IncomeSourceTypeListSalaryEnum = {}));
-
     exports.IncomeSourceTypeListWorkEnum = void 0;
     (function (IncomeSourceTypeListWorkEnum) {
+        IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["BONUSES"] = 1] = "BONUSES";
         IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["DIRECTOR_FEES"] = 2] = "DIRECTOR_FEES";
         IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["DIVIDENDS"] = 3] = "DIVIDENDS";
         IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["INTEREST"] = 4] = "INTEREST";
@@ -4399,8 +4397,8 @@
         function IncomeSourceType() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        IncomeSourceType.prototype.isSalary = function () {
-            return !!IncomeSourceTypeListSalaryEnum[this.id];
+        IncomeSourceType.prototype.isBonuses = function () {
+            return this.id === exports.IncomeSourceTypeListWorkEnum.BONUSES;
         };
         IncomeSourceType.prototype.isWork = function () {
             return !!exports.IncomeSourceTypeListWorkEnum[this.id];
@@ -4409,13 +4407,12 @@
             return !!exports.IncomeSourceTypeListOtherEnum[this.id];
         };
         IncomeSourceType.prototype.isSole = function () {
+            // @TODO use IncomeSourceTypeListSoleEnum when sole tank ready
             return !!exports.IncomeSourceTypeListOtherEnum[this.id];
         };
         Object.defineProperty(IncomeSourceType.prototype, "type", {
             get: function () {
                 switch (true) {
-                    case this.isSalary():
-                        return exports.IncomeSourceTypeEnum.SALARY;
                     case this.isWork():
                         return exports.IncomeSourceTypeEnum.WORK;
                     case this.isSole():
@@ -4472,7 +4469,9 @@
             return _super !== null && _super.apply(this, arguments) || this;
         }
         IncomeSource.prototype.isSalaryIncome = function () {
-            return this.type === exports.IncomeSourceTypeEnum.SALARY;
+            return !!this.salaryForecasts.length;
+            // @TODO Vik: old code
+            // return this.type === IncomeSourceTypeEnum.SALARY;
         };
         IncomeSource.prototype.isSoleIncome = function () {
             return this.type === exports.IncomeSourceTypeEnum.SOLE;
@@ -10101,11 +10100,11 @@
             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.WORK)));
+                batch.push(this.create(AccountSetupItemsEnum.SALARY, this.getIncomeSources(true)));
             }
             // Other income item is completed when user added at least one other income source
             if (incomeTypes.dividends || incomeTypes.other) {
-                batch.push(this.create(AccountSetupItemsEnum.OTHER_INCOME, this.getIncomeSourcesByType(exports.IncomeSourceTypeEnum.OTHER)));
+                batch.push(this.create(AccountSetupItemsEnum.OTHER_INCOME, this.getIncomeSources()));
             }
             // Rental income item is completed when user added at least one property
             if (incomeTypes.property) {
@@ -10130,11 +10129,17 @@
             return rxjs.combineLatest(batch).pipe(operators.map(function (items) { return new AccountSetupItemCollection(items); }));
         };
         /**
-         * @TODO work with collection when services refactored
+         * @TODO Alex: work with collection when services refactored
+         * @TODO Vik: waiting for income sources refactoring
          */
-        AccountSetupService.prototype.getIncomeSourcesByType = function (type) {
+        AccountSetupService.prototype.getIncomeSources = function (isSalary) {
+            if (isSalary === void 0) { isSalary = false; }
             return this.incomeSourceService.get().pipe(operators.map(function (incomeSources) {
-                return new IncomeSourceCollection(incomeSources).getBy('type', type).toArray();
+                var collection = new IncomeSourceCollection(incomeSources);
+                if (isSalary) {
+                    return collection.getSalary();
+                }
+                return collection.items.filter(function (incomeSource) { return !incomeSource.isSalaryIncome() && !incomeSource.isSoleIncome(); });
             }));
         };
         /**