taxtank-core 0.12.1 → 0.12.4

package/bundles/taxtank-core.umd.js

@@ -1340,10 +1340,10 @@
         /**
          * Sort collection items by provided field
          */
-        Collection.prototype.sortBy = function (filed, isDesc) {
-            if (filed === void 0) { filed = 'id'; }
+        Collection.prototype.sortBy = function (field, isDesc) {
+            if (field === void 0) { field = 'id'; }
             if (isDesc === void 0) { isDesc = true; }
-            sort(this.items, filed, isDesc);
+            sort(this.items, field, isDesc);
         };
         Object.defineProperty(Collection.prototype, "first", {
             get: function () {
@@ -2999,6 +2999,7 @@
         UserRolesEnum["SUBSCRIPTION"] = "ROLE_USER_SUBSCRIPTION";
         UserRolesEnum["WORK_TANK"] = "ROLE_USER_WORK";
         UserRolesEnum["PROPERTY_TANK"] = "ROLE_USER_PROPERTY";
+        UserRolesEnum["SOLE_TANK"] = "ROLE_USER_SOLE";
         UserRolesEnum["SWITCH_USER"] = "ROLE_PREVIOUS_ADMIN";
     })(exports.UserRolesEnum || (exports.UserRolesEnum = {}));
 
@@ -5222,6 +5223,42 @@
         return PropertyReportItemDepreciationCollection;
     }(PropertyReportItemCollection));
 
+    /**
+     * Vehicle expense for logbook section
+     */
+    var VehicleExpense = /** @class */ (function () {
+        function VehicleExpense(amount, claimPercent, description) {
+            this.amount = amount;
+            this.claimPercent = claimPercent;
+            this.description = description;
+        }
+        VehicleExpense.prototype.getClaimAmount = function () {
+            return +(this.amount * (this.claimPercent / 100)).toFixed(2);
+        };
+        return VehicleExpense;
+    }());
+
+    var VehicleExpenseCollection = /** @class */ (function (_super) {
+        __extends(VehicleExpenseCollection, _super);
+        function VehicleExpenseCollection(transactions, depreciations, vehicleClaim) {
+            var _this = _super.call(this) || this;
+            _this.setItems(transactions, depreciations, vehicleClaim);
+            return _this;
+        }
+        VehicleExpenseCollection.prototype.setItems = function (transactions, depreciations, vehicleClaim) {
+            var _a;
+            this.items = [];
+            var transactionsByChartAccounts = new CollectionDictionary(transactions, 'chartAccounts.name');
+            var transactionExpenses = transactionsByChartAccounts.keys.map(function (chartAccountsName) {
+                return new VehicleExpense(transactionsByChartAccounts.get(chartAccountsName).amount, vehicleClaim.workUsage, chartAccountsName);
+            });
+            // group all depreciations into one expense item
+            var depreciationExpense = new VehicleExpense(depreciations.getCurrentYearForecastAmount(), vehicleClaim.workUsage, 'Depreciation');
+            (_a = this.items).push.apply(_a, __spreadArray([depreciationExpense], __read(transactionExpenses)));
+        };
+        return VehicleExpenseCollection;
+    }(Collection));
+
     var ServicePriceCollection = /** @class */ (function (_super) {
         __extends(ServicePriceCollection, _super);
         function ServicePriceCollection() {
@@ -8457,6 +8494,7 @@
         ROLE_USER_SUBSCRIPTION: [exports.UserRolesEnum.SUBSCRIPTION],
         ROLE_USER_WORK: [exports.UserRolesEnum.WORK_TANK],
         ROLE_USER_PROPERTY: [exports.UserRolesEnum.PROPERTY_TANK],
+        ROLE_USER_SOLE: [exports.UserRolesEnum.SOLE_TANK],
         ROLE_PREVIOUS_ADMIN: [exports.UserRolesEnum.SWITCH_USER]
     };
 
@@ -9309,7 +9347,11 @@
          */
         TransactionAllocationService.prototype.onTransactionsCreated = function () {
             var _this = this;
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.TRANSACTIONS_CREATED).subscribe(function () {
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.TRANSACTIONS_CREATED).subscribe(function (transactions) {
+                // @TODO Alex hack: research and refactor cache update logic, dont reset cache each time transactions changed
+                if (transactions[0].isTransfer) {
+                    return;
+                }
                 // Update allocations cache to synchronize data and fire subscriptions
                 _this.resetCache();
             });
@@ -9320,6 +9362,7 @@
         TransactionAllocationService.prototype.onDepreciationCreated = function () {
             var _this = this;
             this.eventDispatcherService.on(exports.AppEventTypeEnum.DEPRECIATIONS_CREATED).subscribe(function () {
+                // @TODO Alex hack: research and refactor cache update logic, dont reset cache each time depreciations changed
                 // Update allocations cache to synchronize data and fire subscriptions
                 _this.resetCache();
             });
@@ -9330,6 +9373,7 @@
         TransactionAllocationService.prototype.onTransactionDeleted = function () {
             var _this = this;
             this.eventDispatcherService.on(exports.AppEventTypeEnum.TRANSACTION_DELETED).subscribe(function () {
+                // @TODO Alex hack: research and refactor cache update logic, dont reset cache each time transactions changed
                 // Update allocations cache to synchronize data and fire subscriptions
                 _this.resetCache();
             });
@@ -9436,7 +9480,7 @@
                 batch.push(this.create(AccountSetupItemsEnum.OTHER_INCOME, this.getIncomeSourcesByType(exports.IncomeSourceTypeEnum.OTHER)));
             }
             // Rental income item is completed when user added at least one property
-            if (incomeTypes.rental) {
+            if (incomeTypes.property) {
                 batch.push(this.create(AccountSetupItemsEnum.PROPERTY, this.propertyService.get()));
             }
             // Bank feeds item is completed when user added at least one bank account (basiq or manual)
@@ -13427,8 +13471,8 @@
         function ClientIncomeTypesForm(clientIncomeTypes) {
             var _this = _super.call(this, {
                 salary: new forms.FormControl(clientIncomeTypes.salary),
-                rental: new forms.FormControl(clientIncomeTypes.rental),
-                soleTrader: new forms.FormControl(clientIncomeTypes.soleTrader),
+                property: new forms.FormControl(clientIncomeTypes.property),
+                sole: new forms.FormControl(clientIncomeTypes.sole),
                 dividends: new forms.FormControl(clientIncomeTypes.dividends),
                 other: new forms.FormControl(clientIncomeTypes.other)
             }, atLeastOneCheckedValidator()) || this;
@@ -13894,6 +13938,8 @@
     exports.VehicleClaimForm = VehicleClaimForm;
     exports.VehicleClaimService = VehicleClaimService;
     exports.VehicleCollection = VehicleCollection;
+    exports.VehicleExpense = VehicleExpense;
+    exports.VehicleExpenseCollection = VehicleExpenseCollection;
     exports.VehicleForm = VehicleForm;
     exports.VehicleLogbook = VehicleLogbook;
     exports.VehicleLogbookCollection = VehicleLogbookCollection;