taxtank-core 0.28.100 → 0.28.102

package/bundles/taxtank-core.umd.js

@@ -11739,7 +11739,7 @@
             this.workRelatedClothingTotalAmount = this.workRelatedClothingExpenses.sumBy('claimAmount');
             this.workRelatedSelfEducationType = this.workRelatedSelfEducationExpenses.length ?
                 exports.DeductionSelfEducationTypeEnum.IMPROVE_SKILLS_FOR_CURRENT_EARNINGS_K : null;
-            this.workRelatedSelfEducationTotalAmount = this.workRelatedSelfEducationExpenses.sumBy('claimAmount');
+            this.workRelatedSelfEducationTotalAmount = this.calculateWorkRelatedSelfEducationTotalAmount();
             this.lowValuePoolDeductionTotalAmount = this.depreciations.getByTankType(exports.TankTypeEnum.WORK)
                 .getLVPDepreciations().sumBy('claimAmount');
             this.interestExpensesTotalAmount = this.transactions
@@ -11765,7 +11765,7 @@
                 .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.forestryManagedInvestmentSchemesDeductions)
                 .sumBy('claimAmount');
             this.otherDeductionsTotalAmount = this.transactions
-                .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.otherDeductions)
+                .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherDeductions)
                 .sumBy('claimAmount');
         }
         MyTaxDeductions.prototype.getVehicleExpensesTotalAmount = function () {
@@ -11787,8 +11787,16 @@
             this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) +
                 this.depreciations.filterBy('chartAccounts.heading.id', exports.ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');
         };
+        MyTaxDeductions.prototype.calculateWorkRelatedSelfEducationTotalAmount = function () {
+            return !this.workRelatedSelfEducationExpenses ? 0 :
+                this.workRelatedSelfEducationExpenses.sumBy('claimAmount') - MyTaxDeductions.selfEducationNotDeductibleAmount;
+        };
         return MyTaxDeductions;
     }());
+    /**
+     * can't claim the first $250 of self-education expenses (Item code D4)
+     */
+    MyTaxDeductions.selfEducationNotDeductibleAmount = -250;
 
     var MyTaxDividends = /** @class */ (function () {
         function MyTaxDividends(transactions) {
@@ -11807,29 +11815,6 @@
         return MyTaxDividends;
     }());
 
-    var MyTaxEmployeeShareSchemes = /** @class */ (function () {
-        function MyTaxEmployeeShareSchemes(transactions) {
-            this.transactions = transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.EMPLOYEE_SHARE_SCHEME_INCOME);
-            this.eligibleForReductionAmount = this.transactions.getTransactionsMetadata()
-                .filterBy('chartAccountsMetadata.id', exports.ChartAccountsMetadataListEnum.ELIGIBLE_FOR_REDUCTION)
-                .sumBy('value');
-            this.notEligibleForReductionAmount = this.transactions.getTransactionsMetadata()
-                .filterBy('chartAccountsMetadata.id', exports.ChartAccountsMetadataListEnum.NOT_ELIGIBLE_FOR_DEDUCTION)
-                .sumBy('value');
-            this.discountFromDeferredSchemeAmount = this.transactions.getTransactionsMetadata()
-                .filterBy('chartAccountsMetadata.id', exports.ChartAccountsMetadataListEnum.DISCOUNT_FROM_DEFERRED_SCHEMES)
-                .sumBy('value');
-            this.totalAssessableDiscountAmount = this.transactions.getTransactionsMetadata()
-                .filterBy('chartAccountsMetadata.id', exports.ChartAccountsMetadataListEnum.NOT_ELIGIBLE_FOR_DEDUCTION)
-                .sumBy('value') +
-                this.transactions.getTransactionsMetadata()
-                    .filterBy('chartAccountsMetadata.id', exports.ChartAccountsMetadataListEnum.DISCOUNT_FROM_DEFERRED_SCHEMES)
-                    .sumBy('value');
-            this.shareSchemesTotalTax = this.transactions.sumBy('tax');
-        }
-        return MyTaxEmployeeShareSchemes;
-    }());
-
     /**
      * @Todo add link to documentation about related fields, add comments to methods
      */
@@ -11983,6 +11968,26 @@
     var MyTaxOtherIncome = /** @class */ (function () {
         function MyTaxOtherIncome(transactions) {
             this.transactions = transactions;
+            this.employeeShareSchemesTransactions = transactions
+                .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.EMPLOYEE_SHARE_SCHEME_INCOME);
+            // Employee Share Schemes data
+            this.eligibleForReductionAmount = this.employeeShareSchemesTransactions.getTransactionsMetadata()
+                .filterBy('chartAccountsMetadata.id', exports.ChartAccountsMetadataListEnum.ELIGIBLE_FOR_REDUCTION)
+                .sumBy('value');
+            this.notEligibleForReductionAmount = this.employeeShareSchemesTransactions.getTransactionsMetadata()
+                .filterBy('chartAccountsMetadata.id', exports.ChartAccountsMetadataListEnum.NOT_ELIGIBLE_FOR_DEDUCTION)
+                .sumBy('value');
+            this.discountFromDeferredSchemeAmount = this.employeeShareSchemesTransactions.getTransactionsMetadata()
+                .filterBy('chartAccountsMetadata.id', exports.ChartAccountsMetadataListEnum.DISCOUNT_FROM_DEFERRED_SCHEMES)
+                .sumBy('value');
+            this.totalAssessableDiscountAmount = this.employeeShareSchemesTransactions.getTransactionsMetadata()
+                .filterBy('chartAccountsMetadata.id', exports.ChartAccountsMetadataListEnum.NOT_ELIGIBLE_FOR_DEDUCTION)
+                .sumBy('value') +
+                this.employeeShareSchemesTransactions.getTransactionsMetadata()
+                    .filterBy('chartAccountsMetadata.id', exports.ChartAccountsMetadataListEnum.DISCOUNT_FROM_DEFERRED_SCHEMES)
+                    .sumBy('value');
+            this.shareSchemesTotalTax = this.employeeShareSchemesTransactions.sumBy('tax');
+            // Other income data
             this.lumpSumPaymentsInArrearsTransactions = this.transactions
                 .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.LUMP_SUM_PAYMENTS_IN_ARREARS);
             this.bonusesTotalAmount = this.transactions
@@ -20402,20 +20407,6 @@
         return MyTaxDividendsForm;
     }(AbstractForm));
 
-    var MyTaxEmployeeShareSchemesForm = /** @class */ (function (_super) {
-        __extends(MyTaxEmployeeShareSchemesForm, _super);
-        function MyTaxEmployeeShareSchemesForm(shareSchemes) {
-            return _super.call(this, {
-                eligibleForReductionAmount: new forms.FormControl(shareSchemes.eligibleForReductionAmount),
-                notEligibleForReductionAmount: new forms.FormControl(shareSchemes.notEligibleForReductionAmount),
-                discountFromDeferredSchemeAmount: new forms.FormControl(shareSchemes.discountFromDeferredSchemeAmount),
-                totalAssessableDiscountAmount: new forms.FormControl(shareSchemes.totalAssessableDiscountAmount),
-                shareSchemesTotalTax: new forms.FormControl(shareSchemes.shareSchemesTotalTax)
-            }) || this;
-        }
-        return MyTaxEmployeeShareSchemesForm;
-    }(AbstractForm));
-
     var MyTaxIncomeStatementsForm = /** @class */ (function (_super) {
         __extends(MyTaxIncomeStatementsForm, _super);
         function MyTaxIncomeStatementsForm(incomeStatements, user) {
@@ -20593,6 +20584,11 @@
         __extends(MyTaxOtherIncomeForm, _super);
         function MyTaxOtherIncomeForm(otherIncome) {
             return _super.call(this, {
+                eligibleForReductionAmount: new forms.FormControl(otherIncome.eligibleForReductionAmount),
+                notEligibleForReductionAmount: new forms.FormControl(otherIncome.notEligibleForReductionAmount),
+                discountFromDeferredSchemeAmount: new forms.FormControl(otherIncome.discountFromDeferredSchemeAmount),
+                totalAssessableDiscountAmount: new forms.FormControl(otherIncome.totalAssessableDiscountAmount),
+                shareSchemesTotalTax: new forms.FormControl(otherIncome.shareSchemesTotalTax),
                 bonusesTotalAmount: new forms.FormControl({
                     value: otherIncome.bonusesTotalAmount,
                     disabled: true
@@ -20976,8 +20972,6 @@
     exports.MyTaxDeductionsForm = MyTaxDeductionsForm;
     exports.MyTaxDividends = MyTaxDividends;
     exports.MyTaxDividendsForm = MyTaxDividendsForm;
-    exports.MyTaxEmployeeShareSchemes = MyTaxEmployeeShareSchemes;
-    exports.MyTaxEmployeeShareSchemesForm = MyTaxEmployeeShareSchemesForm;
     exports.MyTaxEstimate = MyTaxEstimate;
     exports.MyTaxIncomeStatements = MyTaxIncomeStatements;
     exports.MyTaxIncomeStatementsForm = MyTaxIncomeStatementsForm;