taxtank-core 0.28.8-1 → 0.28.8-2

package/bundles/taxtank-core.umd.js

@@ -4562,7 +4562,7 @@
          */
         Depreciation.prototype.toTransaction = function (params) {
             if (params === void 0) { params = {}; }
-            return classTransformer.plainToClass(Transaction, Object.assign(params, this, { amount: this.currentYearForecast.amount }));
+            return classTransformer.plainToClass(Transaction, Object.assign(params, this, { amount: -this.claimAmount, claimAmount: -this.amount * (this.claimPercent / 100) }));
         };
         Object.defineProperty(Depreciation.prototype, "claimAmount", {
             /**
@@ -7033,6 +7033,31 @@
         return ClientPortfolioReportCollection;
     }(Collection));
 
+    /**
+     * Chart serie class: chart data item
+     * @TODO consider rename to ChartSerieData
+     */
+    var ChartSerie = /** @class */ (function () {
+        function ChartSerie() {
+        }
+        return ChartSerie;
+    }());
+
+    /**
+     * Chart data class
+     * @TODO consider rename to ChartSerie
+     */
+    var ChartData = /** @class */ (function () {
+        function ChartData() {
+        }
+        return ChartData;
+    }());
+    __decorate([
+        classTransformer.Type(function () { return ChartSerie; })
+    ], ChartData.prototype, "data", void 0);
+
+    var MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'Jan'];
+
     /**
      * Collection of transactions
      */
@@ -7249,6 +7274,29 @@
                 .getVehicleTransactions()
                 .removeBy('chartAccounts.id', [exports.ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK, exports.ChartAccountsListEnum.KLMS_TRAVELLED]);
         };
+        /**
+         * Build chart data with transactions cash position.
+         * Cash position = Income - Expenses (include depreciations)
+         * Chart data for each month from fin year start till current month
+         */
+        TransactionCollection.prototype.getCashPositionChartData = function () {
+            var _this = this;
+            var chartData = [
+                classTransformer.plainToClass(ChartData, { name: 'Income', data: [] }),
+                classTransformer.plainToClass(ChartData, { name: 'Expense', data: [] })
+            ];
+            new FinancialYear().getPastMonths().forEach(function (month) {
+                chartData[0].data.push({
+                    label: MONTHS[month],
+                    value: _this.getIncomeTransactions().getByMonth(month).claimAmount
+                });
+                chartData[1].data.push({
+                    label: MONTHS[month],
+                    value: Math.abs(_this.getExpenseTransactions().getByMonth(month).claimAmount)
+                });
+            });
+            return chartData;
+        };
         return TransactionCollection;
     }(ExportableCollection));
 
@@ -7865,7 +7913,7 @@
         __extends(PropertyReportItemTransaction, _super);
         function PropertyReportItemTransaction(transactions, property, chartAccounts) {
             var _this = _super.call(this, property, chartAccounts) || this;
-            _this.amount = Math.abs(transactions.amount);
+            _this.amount = Math.abs(transactions.grossAmount);
             _this.description = chartAccounts.name;
             return _this;
         }
@@ -9165,29 +9213,6 @@
         return BorrowingExpenseLoan;
     }(BorrowingExpenseLoan$1));
 
-    /**
-     * Chart serie class: chart data item
-     * @TODO consider rename to ChartSerieData
-     */
-    var ChartSerie = /** @class */ (function () {
-        function ChartSerie() {
-        }
-        return ChartSerie;
-    }());
-
-    /**
-     * Chart data class
-     * @TODO consider rename to ChartSerie
-     */
-    var ChartData = /** @class */ (function () {
-        function ChartData() {
-        }
-        return ChartData;
-    }());
-    __decorate([
-        classTransformer.Type(function () { return ChartSerie; })
-    ], ChartData.prototype, "data", void 0);
-
     var ChartAccountsDepreciation$1 = /** @class */ (function (_super) {
         __extends(ChartAccountsDepreciation, _super);
         function ChartAccountsDepreciation() {
@@ -9860,8 +9885,6 @@
         IconsFileEnum["DOC"] = "icon-doc";
     })(exports.IconsFileEnum || (exports.IconsFileEnum = {}));
 
-    var MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'Jan'];
-
     // Todo extend from the base model when the backend is ready TT-555
     var IncomePosition = /** @class */ (function () {
         function IncomePosition() {
@@ -9916,8 +9939,7 @@
     }());
 
     /**
-     * Enum with maximum number of payments, depending on the frequency.
-     * Used only for vehicle loans
+     * Enum with maximum number of payments, depending on the frequency
      */
     exports.LoanMaxNumberOfPaymentsEnum = void 0;
     (function (LoanMaxNumberOfPaymentsEnum) {
@@ -16947,10 +16969,6 @@
          * For vehicle loans term has a maximum value depended of repayment frequency
          */
         LoanForm.prototype.updateTermValidation = function () {
-            // no need terms for bank loans
-            if (!!this.loan.bankAccount) {
-                return;
-            }
             var currentRepaymentFrequency = this.get('repaymentFrequency').value;
             // term validation depends on selected repayment frequency, so can not validate when frequency is empty
             // repaymentType is required field, so we don't need to clear validation
@@ -17493,7 +17511,7 @@
             if (bankAccount.isLoan()) {
                 // Attach bank account to loan for LoanForm's logic
                 // @TODO Alex/Vik: we should use separated API for bank accounts and loans
-                var loan = classTransformer.plainToClass(Loan, Object.assign(bankAccount.loan, { bankAccount: { accountId: bankAccount.accountId } }));
+                var loan = classTransformer.plainToClass(Loan, Object.assign(bankAccount.loan, { bankAccount: Object.assign(bankAccount, { loan: null }) }));
                 _this.addControl('loan', new LoanForm(loan));
             }
             // basiq account import form should be disabled (unchecked) by default