taxtank-core 0.21.4 → 0.21.7

package/bundles/taxtank-core.umd.js

@@ -3618,15 +3618,17 @@
                 var connection = classTransformer.plainToClass(BankConnection, bankConnectionBase);
                 // We use this endpoint for create and reconnect bank connections because of basiq logic.
                 // So we try to replace bank connection in cache for reconnection case.
-                if (bankConnection.id) {
-                    var tempCache = cloneDeep__default["default"](_this.cache);
-                    replace(tempCache, connection);
-                    _this.cache = cloneDeep__default["default"](tempCache);
-                    _this.cacheSubject.next(tempCache);
-                }
-                else {
-                    _this.cache.push(connection);
-                    _this.cacheSubject.next(cloneDeep__default["default"](_this.cache));
+                if (_this.cache) {
+                    if (bankConnection.id) {
+                        var tempCache = cloneDeep__default["default"](_this.cache);
+                        replace(tempCache, connection);
+                        _this.cache = tempCache;
+                        _this.cacheSubject.next(_this.cache);
+                    }
+                    else {
+                        _this.cache.push(connection);
+                        _this.cacheSubject.next(cloneDeep__default["default"](_this.cache));
+                    }
                 }
                 return classTransformer.plainToClass(BankConnection, connection);
             }));
@@ -3711,12 +3713,11 @@
          */
         BasiqService.prototype.updateConnection = function (data, userId, connection) {
             var _this = this;
-            // Send login data to basiq API to create a basiq job
+            // Send login data and connection id to basiq API to create a basiq job
             return this.http.post(BasiqService.basiqApiUrl + "/users/" + userId + "/connections", Object.assign(data, { id: connection.externalId }))
-                .pipe(
-            // Create bank connection based on basiq job
-            operators.mergeMap(function (response) {
-                return _this.bankConnectionService.add(classTransformer.plainToClass(BankConnection, Object.assign({ id: connection.id, basiqJob: { externalId: response.id } })));
+                .pipe(operators.mergeMap(function (response) {
+                // Create bank connection based on basiq job
+                return _this.bankConnectionService.add(classTransformer.plainToClass(BankConnection, { id: connection.id, basiqJob: { externalId: response.id } }));
             }), operators.catchError(function (error) {
                 // Show error when user provided wrong login data
                 if (error.status === 401) {
@@ -4121,6 +4122,79 @@
         return BankTransactionCollection;
     }(Collection));
 
+    exports.ChartAccountsListEnum = void 0;
+    (function (ChartAccountsListEnum) {
+        ChartAccountsListEnum[ChartAccountsListEnum["PARTNERSHIP_EXPENSES"] = 156] = "PARTNERSHIP_EXPENSES";
+        ChartAccountsListEnum[ChartAccountsListEnum["TRUST_EXPENSES"] = 157] = "TRUST_EXPENSES";
+        ChartAccountsListEnum[ChartAccountsListEnum["INTEREST_CHARGED_BY_ATO"] = 278] = "INTEREST_CHARGED_BY_ATO";
+        ChartAccountsListEnum[ChartAccountsListEnum["LITIGATION_COSTS"] = 280] = "LITIGATION_COSTS";
+        ChartAccountsListEnum[ChartAccountsListEnum["ACCOUNTANT_TAX_AGENT_FEES"] = 282] = "ACCOUNTANT_TAX_AGENT_FEES";
+        ChartAccountsListEnum[ChartAccountsListEnum["TRAVEL_COSTS_TO_SEE_YOUR_ACCOUNTANT_ADVISOR"] = 284] = "TRAVEL_COSTS_TO_SEE_YOUR_ACCOUNTANT_ADVISOR";
+        ChartAccountsListEnum[ChartAccountsListEnum["ACCOUNTING_SOFTWARE_FEES"] = 285] = "ACCOUNTING_SOFTWARE_FEES";
+        ChartAccountsListEnum[ChartAccountsListEnum["ADVISOR_FEES"] = 286] = "ADVISOR_FEES";
+        ChartAccountsListEnum[ChartAccountsListEnum["INCOME_TAX_VARIATION"] = 292] = "INCOME_TAX_VARIATION";
+        ChartAccountsListEnum[ChartAccountsListEnum["PSI_ABN_NOT_QUOTED"] = 294] = "PSI_ABN_NOT_QUOTED";
+        ChartAccountsListEnum[ChartAccountsListEnum["PSI_VOLUNTARY_AGREEMENT"] = 296] = "PSI_VOLUNTARY_AGREEMENT";
+        ChartAccountsListEnum[ChartAccountsListEnum["RENTAL_INCOME"] = 298] = "RENTAL_INCOME";
+        ChartAccountsListEnum[ChartAccountsListEnum["OTHER_RENTAL_INCOME"] = 300] = "OTHER_RENTAL_INCOME";
+        ChartAccountsListEnum[ChartAccountsListEnum["INTEREST_ON_LOAN"] = 302] = "INTEREST_ON_LOAN";
+        ChartAccountsListEnum[ChartAccountsListEnum["BORROWING_EXPENSES"] = 315] = "BORROWING_EXPENSES";
+        ChartAccountsListEnum[ChartAccountsListEnum["DIVIDENDS"] = 542] = "DIVIDENDS";
+        ChartAccountsListEnum[ChartAccountsListEnum["TRANSFER"] = 615] = "TRANSFER";
+        ChartAccountsListEnum[ChartAccountsListEnum["BUILDING_AT_COST"] = 304] = "BUILDING_AT_COST";
+        ChartAccountsListEnum[ChartAccountsListEnum["MANAGEMENT_FEES_PLATFORM_FEES"] = 656] = "MANAGEMENT_FEES_PLATFORM_FEES";
+        ChartAccountsListEnum[ChartAccountsListEnum["KLMS_TRAVELLED_FOR_WORK"] = 24] = "KLMS_TRAVELLED_FOR_WORK";
+        ChartAccountsListEnum[ChartAccountsListEnum["KLMS_TRAVELLED"] = 683] = "KLMS_TRAVELLED";
+        ChartAccountsListEnum[ChartAccountsListEnum["DIRECTOR_FEES"] = 6] = "DIRECTOR_FEES";
+        ChartAccountsListEnum[ChartAccountsListEnum["SALARY_OR_WAGES"] = 2] = "SALARY_OR_WAGES";
+        ChartAccountsListEnum[ChartAccountsListEnum["VEHICLES"] = 25] = "VEHICLES";
+        ChartAccountsListEnum[ChartAccountsListEnum["COMMERCIAL_VEHICLES"] = 26] = "COMMERCIAL_VEHICLES";
+        ChartAccountsListEnum[ChartAccountsListEnum["VEHICLE_LOAN_INTEREST"] = 37] = "VEHICLE_LOAN_INTEREST";
+        ChartAccountsListEnum[ChartAccountsListEnum["VEHICLE_LOAN_PRINCIPAL"] = 38] = "VEHICLE_LOAN_PRINCIPAL";
+        ChartAccountsListEnum[ChartAccountsListEnum["TAX_INSTALMENTS"] = 662] = "TAX_INSTALMENTS";
+        ChartAccountsListEnum[ChartAccountsListEnum["INTEREST_EARNED"] = 22] = "INTEREST_EARNED";
+        ChartAccountsListEnum[ChartAccountsListEnum["PARTNERSHIP_INCOME"] = 566] = "PARTNERSHIP_INCOME";
+        ChartAccountsListEnum[ChartAccountsListEnum["TRUST_INCOME"] = 567] = "TRUST_INCOME";
+        ChartAccountsListEnum[ChartAccountsListEnum["TAX_OFFSETS_N_R_A_S"] = 571] = "TAX_OFFSETS_N_R_A_S";
+        ChartAccountsListEnum[ChartAccountsListEnum["LUMP_SUM_A_GENUINE_REDUNDANCY"] = 9] = "LUMP_SUM_A_GENUINE_REDUNDANCY";
+        ChartAccountsListEnum[ChartAccountsListEnum["LUMP_SUM_A_ALL_OTHER_PAYMENTS"] = 10] = "LUMP_SUM_A_ALL_OTHER_PAYMENTS";
+        ChartAccountsListEnum[ChartAccountsListEnum["LUMP_SUM_B"] = 11] = "LUMP_SUM_B";
+        ChartAccountsListEnum[ChartAccountsListEnum["ATTRIBUTABLE_PSI"] = 20] = "ATTRIBUTABLE_PSI";
+        ChartAccountsListEnum[ChartAccountsListEnum["LUMP_SUM_PAYMENTS_IN_ARREARS"] = 519] = "LUMP_SUM_PAYMENTS_IN_ARREARS";
+        ChartAccountsListEnum[ChartAccountsListEnum["JURY_ATTENDANCE_FEES"] = 519] = "JURY_ATTENDANCE_FEES";
+        ChartAccountsListEnum[ChartAccountsListEnum["FOREIGN_EXCHANGE_GAINS_NON_BUSINESS"] = 523] = "FOREIGN_EXCHANGE_GAINS_NON_BUSINESS";
+        ChartAccountsListEnum[ChartAccountsListEnum["ROYALTIES"] = 525] = "ROYALTIES";
+        ChartAccountsListEnum[ChartAccountsListEnum["TAXABLE_SCHOLARSHIPS_BURSARIES_GRANTS"] = 527] = "TAXABLE_SCHOLARSHIPS_BURSARIES_GRANTS";
+        ChartAccountsListEnum[ChartAccountsListEnum["SPECIAL_PROFESSION_INCOME"] = 529] = "SPECIAL_PROFESSION_INCOME";
+        ChartAccountsListEnum[ChartAccountsListEnum["GAIN_ON_SALE_OF_VEHICLE_PREVIOUSLY_DEPRECIATED"] = 531] = "GAIN_ON_SALE_OF_VEHICLE_PREVIOUSLY_DEPRECIATED";
+        ChartAccountsListEnum[ChartAccountsListEnum["ATO_INTEREST_PAID"] = 533] = "ATO_INTEREST_PAID";
+        ChartAccountsListEnum[ChartAccountsListEnum["PERSONAL_SUPER_CONTRIBUTIONS_DEDUCTIBLE"] = 536] = "PERSONAL_SUPER_CONTRIBUTIONS_DEDUCTIBLE";
+        ChartAccountsListEnum[ChartAccountsListEnum["SOFTWARE_FEES_TAXTANK"] = 541] = "SOFTWARE_FEES_TAXTANK";
+        ChartAccountsListEnum[ChartAccountsListEnum["AUSTRALIAN_ANNUITY_PAYMENTS"] = 559] = "AUSTRALIAN_ANNUITY_PAYMENTS";
+        ChartAccountsListEnum[ChartAccountsListEnum["CODE_M_SUPERANNUATION_LUMP_SUM"] = 561] = "CODE_M_SUPERANNUATION_LUMP_SUM";
+        ChartAccountsListEnum[ChartAccountsListEnum["EMPLOYEE_SHARE_SCHEME_INCOME"] = 564] = "EMPLOYEE_SHARE_SCHEME_INCOME";
+        ChartAccountsListEnum[ChartAccountsListEnum["FORESTRY_MANAGED_INVESTMENT_SCHEMES_INCOME"] = 590] = "FORESTRY_MANAGED_INVESTMENT_SCHEMES_INCOME";
+        ChartAccountsListEnum[ChartAccountsListEnum["FORESTRY_MANAGED_INVESTMENT_SCHEMES_DEDUCTION"] = 593] = "FORESTRY_MANAGED_INVESTMENT_SCHEMES_DEDUCTION";
+        ChartAccountsListEnum[ChartAccountsListEnum["ASSESSABLE_AMOUNT_CAPPED_DEFINED_BENEFIT"] = 639] = "ASSESSABLE_AMOUNT_CAPPED_DEFINED_BENEFIT";
+        ChartAccountsListEnum[ChartAccountsListEnum["CODE_B_SUPERANNUATION_INCOME_STREAMS_DISABILITY"] = 558] = "CODE_B_SUPERANNUATION_INCOME_STREAMS_DISABILITY";
+        ChartAccountsListEnum[ChartAccountsListEnum["CODE_A_SUPERANNUATION_INCOME_STREAMS_DEATH"] = 640] = "CODE_A_SUPERANNUATION_INCOME_STREAMS_DEATH";
+    })(exports.ChartAccountsListEnum || (exports.ChartAccountsListEnum = {}));
+
+    var ChartAccountsCollection = /** @class */ (function (_super) {
+        __extends(ChartAccountsCollection, _super);
+        function ChartAccountsCollection() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        /**
+         * Get 'Klms travelled for work' related chart account value
+         */
+        ChartAccountsCollection.prototype.getVehicleKlmsRate = function (year) {
+            if (year === void 0) { year = new FinancialYear().year; }
+            return this.findBy('id', exports.ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK).getValueByYear(year).value;
+        };
+        return ChartAccountsCollection;
+    }(Collection));
+
     var ClientCollection = /** @class */ (function (_super) {
         __extends(ClientCollection, _super);
         function ClientCollection() {
@@ -4544,9 +4618,9 @@
         });
         DepreciationCollection.prototype.getClaimAmountByYear = function (year) {
             if (year === void 0) { year = +localStorage.getItem('financialYear'); }
-            return this.amount - this.items.reduce(function (sum, depreciation) {
+            return +Math.round(this.amount - this.items.reduce(function (sum, depreciation) {
                 return sum + depreciation.getCloseBalanceByYear(year);
-            }, 0);
+            }, 0)).toFixed(2);
         };
         DepreciationCollection.prototype.getCloseBalanceByYear = function (year) {
             if (year === void 0) { year = +localStorage.getItem('financialYear'); }
@@ -5148,64 +5222,6 @@
         ChartAccountsHeadingVehicleListEnum[ChartAccountsHeadingVehicleListEnum["FUEL_OIL"] = 61] = "FUEL_OIL";
     })(exports.ChartAccountsHeadingVehicleListEnum || (exports.ChartAccountsHeadingVehicleListEnum = {}));
 
-    exports.ChartAccountsListEnum = void 0;
-    (function (ChartAccountsListEnum) {
-        ChartAccountsListEnum[ChartAccountsListEnum["PARTNERSHIP_EXPENSES"] = 156] = "PARTNERSHIP_EXPENSES";
-        ChartAccountsListEnum[ChartAccountsListEnum["TRUST_EXPENSES"] = 157] = "TRUST_EXPENSES";
-        ChartAccountsListEnum[ChartAccountsListEnum["INTEREST_CHARGED_BY_ATO"] = 278] = "INTEREST_CHARGED_BY_ATO";
-        ChartAccountsListEnum[ChartAccountsListEnum["LITIGATION_COSTS"] = 280] = "LITIGATION_COSTS";
-        ChartAccountsListEnum[ChartAccountsListEnum["ACCOUNTANT_TAX_AGENT_FEES"] = 282] = "ACCOUNTANT_TAX_AGENT_FEES";
-        ChartAccountsListEnum[ChartAccountsListEnum["TRAVEL_COSTS_TO_SEE_YOUR_ACCOUNTANT_ADVISOR"] = 284] = "TRAVEL_COSTS_TO_SEE_YOUR_ACCOUNTANT_ADVISOR";
-        ChartAccountsListEnum[ChartAccountsListEnum["ACCOUNTING_SOFTWARE_FEES"] = 285] = "ACCOUNTING_SOFTWARE_FEES";
-        ChartAccountsListEnum[ChartAccountsListEnum["ADVISOR_FEES"] = 286] = "ADVISOR_FEES";
-        ChartAccountsListEnum[ChartAccountsListEnum["INCOME_TAX_VARIATION"] = 292] = "INCOME_TAX_VARIATION";
-        ChartAccountsListEnum[ChartAccountsListEnum["PSI_ABN_NOT_QUOTED"] = 294] = "PSI_ABN_NOT_QUOTED";
-        ChartAccountsListEnum[ChartAccountsListEnum["PSI_VOLUNTARY_AGREEMENT"] = 296] = "PSI_VOLUNTARY_AGREEMENT";
-        ChartAccountsListEnum[ChartAccountsListEnum["RENTAL_INCOME"] = 298] = "RENTAL_INCOME";
-        ChartAccountsListEnum[ChartAccountsListEnum["OTHER_RENTAL_INCOME"] = 300] = "OTHER_RENTAL_INCOME";
-        ChartAccountsListEnum[ChartAccountsListEnum["INTEREST_ON_LOAN"] = 302] = "INTEREST_ON_LOAN";
-        ChartAccountsListEnum[ChartAccountsListEnum["BORROWING_EXPENSES"] = 315] = "BORROWING_EXPENSES";
-        ChartAccountsListEnum[ChartAccountsListEnum["DIVIDENDS"] = 542] = "DIVIDENDS";
-        ChartAccountsListEnum[ChartAccountsListEnum["TRANSFER"] = 615] = "TRANSFER";
-        ChartAccountsListEnum[ChartAccountsListEnum["BUILDING_AT_COST"] = 304] = "BUILDING_AT_COST";
-        ChartAccountsListEnum[ChartAccountsListEnum["MANAGEMENT_FEES_PLATFORM_FEES"] = 656] = "MANAGEMENT_FEES_PLATFORM_FEES";
-        ChartAccountsListEnum[ChartAccountsListEnum["KLMS_TRAVELLED_FOR_WORK"] = 24] = "KLMS_TRAVELLED_FOR_WORK";
-        ChartAccountsListEnum[ChartAccountsListEnum["KLMS_TRAVELLED"] = 683] = "KLMS_TRAVELLED";
-        ChartAccountsListEnum[ChartAccountsListEnum["DIRECTOR_FEES"] = 6] = "DIRECTOR_FEES";
-        ChartAccountsListEnum[ChartAccountsListEnum["SALARY_OR_WAGES"] = 2] = "SALARY_OR_WAGES";
-        ChartAccountsListEnum[ChartAccountsListEnum["VEHICLES"] = 25] = "VEHICLES";
-        ChartAccountsListEnum[ChartAccountsListEnum["COMMERCIAL_VEHICLES"] = 26] = "COMMERCIAL_VEHICLES";
-        ChartAccountsListEnum[ChartAccountsListEnum["VEHICLE_LOAN_INTEREST"] = 37] = "VEHICLE_LOAN_INTEREST";
-        ChartAccountsListEnum[ChartAccountsListEnum["VEHICLE_LOAN_PRINCIPAL"] = 38] = "VEHICLE_LOAN_PRINCIPAL";
-        ChartAccountsListEnum[ChartAccountsListEnum["TAX_INSTALMENTS"] = 662] = "TAX_INSTALMENTS";
-        ChartAccountsListEnum[ChartAccountsListEnum["INTEREST_EARNED"] = 22] = "INTEREST_EARNED";
-        ChartAccountsListEnum[ChartAccountsListEnum["PARTNERSHIP_INCOME"] = 566] = "PARTNERSHIP_INCOME";
-        ChartAccountsListEnum[ChartAccountsListEnum["TRUST_INCOME"] = 567] = "TRUST_INCOME";
-        ChartAccountsListEnum[ChartAccountsListEnum["TAX_OFFSETS_N_R_A_S"] = 571] = "TAX_OFFSETS_N_R_A_S";
-        ChartAccountsListEnum[ChartAccountsListEnum["LUMP_SUM_A_GENUINE_REDUNDANCY"] = 9] = "LUMP_SUM_A_GENUINE_REDUNDANCY";
-        ChartAccountsListEnum[ChartAccountsListEnum["LUMP_SUM_A_ALL_OTHER_PAYMENTS"] = 10] = "LUMP_SUM_A_ALL_OTHER_PAYMENTS";
-        ChartAccountsListEnum[ChartAccountsListEnum["LUMP_SUM_B"] = 11] = "LUMP_SUM_B";
-        ChartAccountsListEnum[ChartAccountsListEnum["ATTRIBUTABLE_PSI"] = 20] = "ATTRIBUTABLE_PSI";
-        ChartAccountsListEnum[ChartAccountsListEnum["LUMP_SUM_PAYMENTS_IN_ARREARS"] = 519] = "LUMP_SUM_PAYMENTS_IN_ARREARS";
-        ChartAccountsListEnum[ChartAccountsListEnum["JURY_ATTENDANCE_FEES"] = 519] = "JURY_ATTENDANCE_FEES";
-        ChartAccountsListEnum[ChartAccountsListEnum["FOREIGN_EXCHANGE_GAINS_NON_BUSINESS"] = 523] = "FOREIGN_EXCHANGE_GAINS_NON_BUSINESS";
-        ChartAccountsListEnum[ChartAccountsListEnum["ROYALTIES"] = 525] = "ROYALTIES";
-        ChartAccountsListEnum[ChartAccountsListEnum["TAXABLE_SCHOLARSHIPS_BURSARIES_GRANTS"] = 527] = "TAXABLE_SCHOLARSHIPS_BURSARIES_GRANTS";
-        ChartAccountsListEnum[ChartAccountsListEnum["SPECIAL_PROFESSION_INCOME"] = 529] = "SPECIAL_PROFESSION_INCOME";
-        ChartAccountsListEnum[ChartAccountsListEnum["GAIN_ON_SALE_OF_VEHICLE_PREVIOUSLY_DEPRECIATED"] = 531] = "GAIN_ON_SALE_OF_VEHICLE_PREVIOUSLY_DEPRECIATED";
-        ChartAccountsListEnum[ChartAccountsListEnum["ATO_INTEREST_PAID"] = 533] = "ATO_INTEREST_PAID";
-        ChartAccountsListEnum[ChartAccountsListEnum["PERSONAL_SUPER_CONTRIBUTIONS_DEDUCTIBLE"] = 536] = "PERSONAL_SUPER_CONTRIBUTIONS_DEDUCTIBLE";
-        ChartAccountsListEnum[ChartAccountsListEnum["SOFTWARE_FEES_TAXTANK"] = 541] = "SOFTWARE_FEES_TAXTANK";
-        ChartAccountsListEnum[ChartAccountsListEnum["AUSTRALIAN_ANNUITY_PAYMENTS"] = 559] = "AUSTRALIAN_ANNUITY_PAYMENTS";
-        ChartAccountsListEnum[ChartAccountsListEnum["CODE_M_SUPERANNUATION_LUMP_SUM"] = 561] = "CODE_M_SUPERANNUATION_LUMP_SUM";
-        ChartAccountsListEnum[ChartAccountsListEnum["EMPLOYEE_SHARE_SCHEME_INCOME"] = 564] = "EMPLOYEE_SHARE_SCHEME_INCOME";
-        ChartAccountsListEnum[ChartAccountsListEnum["FORESTRY_MANAGED_INVESTMENT_SCHEMES_INCOME"] = 590] = "FORESTRY_MANAGED_INVESTMENT_SCHEMES_INCOME";
-        ChartAccountsListEnum[ChartAccountsListEnum["FORESTRY_MANAGED_INVESTMENT_SCHEMES_DEDUCTION"] = 593] = "FORESTRY_MANAGED_INVESTMENT_SCHEMES_DEDUCTION";
-        ChartAccountsListEnum[ChartAccountsListEnum["ASSESSABLE_AMOUNT_CAPPED_DEFINED_BENEFIT"] = 639] = "ASSESSABLE_AMOUNT_CAPPED_DEFINED_BENEFIT";
-        ChartAccountsListEnum[ChartAccountsListEnum["CODE_B_SUPERANNUATION_INCOME_STREAMS_DISABILITY"] = 558] = "CODE_B_SUPERANNUATION_INCOME_STREAMS_DISABILITY";
-        ChartAccountsListEnum[ChartAccountsListEnum["CODE_A_SUPERANNUATION_INCOME_STREAMS_DEATH"] = 640] = "CODE_A_SUPERANNUATION_INCOME_STREAMS_DEATH";
-    })(exports.ChartAccountsListEnum || (exports.ChartAccountsListEnum = {}));
-
     var DepreciationCapitalProject$1 = /** @class */ (function (_super) {
         __extends(DepreciationCapitalProject, _super);
         function DepreciationCapitalProject() {
@@ -9282,17 +9298,6 @@
         return PropertySaleTaxExemptionMetadata;
     }(PropertySaleTaxExemptionMetadata$1));
 
-    /**
-     * Australian Taxation Office (ATO) website links
-     */
-    var atoLinks = {
-        medicareLevy: 'https://www.ato.gov.au/Individuals/Medicare-and-private-health-insurance/Medicare-levy/',
-        medicalExemption: 'https://www.ato.gov.au/Individuals/Medicare-and-private-health-insurance/Medicare-levy/Medicare-levy-exemption/Medical-exemption-from-Medicare-levy/',
-        foreignResidentsExemption: 'https://www.ato.gov.au/Individuals/Medicare-and-private-health-insurance/Medicare-levy/Medicare-levy-exemption/Foreign-residents-Medicare-levy-exemption/',
-        notEntitledToMedicareBenefits: 'https://www.ato.gov.au/Individuals/Medicare-and-private-health-insurance/Medicare-levy/Medicare-levy-exemption/Not-entitled-to-Medicare-benefits/#:~:text=If%20you%20were%20not%20entitled,an%20exemption%20under%20category%203.&text=are%20a%20member%20of%20a,Australia%20and%20meet%20other%20conditions',
-        privateHealthInsuranceRebate: 'https://www.ato.gov.au/Individuals/Medicare-and-private-health-insurance/Private-health-insurance-rebate/#Appropriatelevelofprivatehospitalinsuran'
-    };
-
     /**
      * @Todo waiting for the Sole tank implementation
      */
@@ -9386,7 +9391,10 @@
             this.depreciations = depreciations;
             this.vehicleClaim = vehicleClaim;
             this.vehicleClaimRate = vehicleClaimRate;
-            this.setVehicleClaimData();
+            // user can have no selected vehicle claim
+            if (this.vehicleClaim) {
+                this.setVehicleClaimData();
+            }
             this.setOtherWorkRelatedExpensesTotalAmount();
             this.workRelatedClothingExpenses = this.transactions
                 .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.workRelatedClothingExpenses);
@@ -9394,7 +9402,7 @@
                 .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.personalSuperContributions);
             this.workRelatedSelfEducationExpenses = this.transactions
                 .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.workRelatedSelfEducationExpenses);
-            this.vehicleExpensesTotalAmount = this.vehicleClaim.isLogbookMethod() ? this.totalExpensesAmount : this.klmsMethodClaimAmount;
+            this.vehicleExpensesTotalAmount = this.getVehicleExpensesTotalAmount();
             this.workRelatedTravelExpensesTotalAmount = this.transactions
                 .filterBy('chartAccounts.heading.id', exports.ChartAccountsHeadingListEnum.WORK_RELATED_TRAVEL_EXPENSES)
                 .sumBy('amount');
@@ -9431,6 +9439,13 @@
                 .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.otherDeductions)
                 .sumBy('amount');
         }
+        MyTaxDeductions.prototype.getVehicleExpensesTotalAmount = function () {
+            var _a;
+            if (this.vehicleClaim) {
+                return ((_a = this.vehicleClaim) === null || _a === void 0 ? void 0 : _a.isLogbookMethod()) ? this.totalExpensesAmount : this.klmsMethodClaimAmount;
+            }
+            return 0;
+        };
         MyTaxDeductions.prototype.setVehicleClaimData = function () {
             this.klmsMethodClaimAmount = this.vehicleClaim.getKLMsClaimAmount(this.vehicleClaimRate);
             this.totalExpensesAmount = new VehicleExpenseCollection(this.transactions.getByTankType(this.vehicleClaim.tankType), this.depreciations.getByTankType(this.vehicleClaim.tankType), this.vehicleClaim).sumBy('amount');
@@ -9487,6 +9502,47 @@
         return MyTaxEmployeeShareSchemes;
     }());
 
+    /**
+     * @Todo add link to documentation about related fields, add comments to methods
+     */
+    var MyTaxEstimate = /** @class */ (function () {
+        function MyTaxEstimate() {
+        }
+        MyTaxEstimate.fromTaxSummary = function (taxSummary) {
+            var summarySection = taxSummary.summary;
+            var grossTaxPayableReportItem = summarySection.items.findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.GROSS_TAX_PAYABLE);
+            var medicareReportItem = grossTaxPayableReportItem.items.findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.MEDICARE);
+            var taxOffsetsReportItem = summarySection.items.findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.TAX_OFFSETS);
+            var lowMiddleIncomeTaxOffsets = this.getLowMiddleIncomeTaxOffsets(taxOffsetsReportItem);
+            var taxPayable = grossTaxPayableReportItem.items.findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.TAX_ON_TAXABLE_INCOME).amount;
+            var medicareLevy = medicareReportItem.details.findBy('name', 'Medicare Levy Surcharge').amount;
+            var medicareLevySurcharge = medicareReportItem.details.findBy('name', 'Medicare Levy (based on single)').amount;
+            var taxCredits = summarySection.items.findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.TAX_CREDITS).amount;
+            var taxOffsets = this.getTaxOffsets(taxOffsetsReportItem.amount, lowMiddleIncomeTaxOffsets);
+            return classTransformer.plainToClass(MyTaxEstimate, {
+                taxableIncome: summarySection.netAmount,
+                grossTaxPayable: grossTaxPayableReportItem.amount,
+                lowMiddleIncomeTaxOffsets: lowMiddleIncomeTaxOffsets,
+                taxPayable: taxPayable,
+                medicareLevy: medicareLevy,
+                medicareLevySurcharge: medicareLevySurcharge,
+                taxCredits: taxCredits,
+                taxOffsets: taxOffsets,
+                netRefund: taxSummary.projectedTaxPosition,
+                percentageOfTaxPaid: taxSummary.taxPercent
+            });
+        };
+        MyTaxEstimate.getLowMiddleIncomeTaxOffsets = function (taxOffsetsReportItem) {
+            var taxOffsetLowIncome = taxOffsetsReportItem.details.findBy('name', 'Tax Offset Low Income');
+            var taxOffsetLowMiddleIncome = taxOffsetsReportItem.details.findBy('name', 'Tax Offset Low and Middle Income');
+            return taxOffsetLowIncome.amount + taxOffsetLowMiddleIncome.amount;
+        };
+        MyTaxEstimate.getTaxOffsets = function (taxOffsetsReportItemAmount, lowMiddleIncomeTaxOffsets) {
+            return taxOffsetsReportItemAmount - lowMiddleIncomeTaxOffsets;
+        };
+        return MyTaxEstimate;
+    }());
+
     var MyTaxIncomeStatements = /** @class */ (function () {
         function MyTaxIncomeStatements(transactions) {
             this.transactionsByChartAccounts = transactions.groupBy('chartAccounts.id');
@@ -9672,6 +9728,21 @@
         return MyTaxRent;
     }());
 
+    /**
+     * Australian Taxation Office (ATO) website links
+     */
+    var atoLinks = {
+        medicareLevy: 'https://www.ato.gov.au/Individuals/Medicare-and-private-health-insurance/Medicare-levy/',
+        medicalExemption: 'https://www.ato.gov.au/Individuals/Medicare-and-private-health-insurance/Medicare-levy/Medicare-levy-exemption/Medical-exemption-from-Medicare-levy/',
+        foreignResidentsExemption: 'https://www.ato.gov.au/Individuals/Medicare-and-private-health-insurance/Medicare-levy/Medicare-levy-exemption/Foreign-residents-Medicare-levy-exemption/',
+        notEntitledToMedicareBenefits: 'https://www.ato.gov.au/Individuals/Medicare-and-private-health-insurance/Medicare-levy/Medicare-levy-exemption/Not-entitled-to-Medicare-benefits/#:~:text=If%20you%20were%20not%20entitled,an%20exemption%20under%20category%203.&text=are%20a%20member%20of%20a,Australia%20and%20meet%20other%20conditions',
+        privateHealthInsuranceRebate: 'https://www.ato.gov.au/Individuals/Medicare-and-private-health-insurance/Private-health-insurance-rebate/#Appropriatelevelofprivatehospitalinsuran'
+    };
+
+    /**
+     * 'My Tax' report related data (classes, enums, const, e.t.c)
+     */
+
     /**
      * Constant with list of URLs
      */
@@ -9798,6 +9869,21 @@
     ], TaxReview.prototype, "employee", void 0);
 
     /**
+     * Used in tax summary reports to show specific details relating to an amount in the report.
+     * See structure in ReportItem class.
+     * Example an amount of $550 for property income could be comprised of 2 different property amounts of $300 and $250.
+     * This is useful in providing drill-down information for the tax summary report.
+     */
+    var ReportItemDetails = /** @class */ (function (_super) {
+        __extends(ReportItemDetails, _super);
+        function ReportItemDetails() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return ReportItemDetails;
+    }(AbstractModel));
+
+    /**
+     * @Todo no base model - should be generated on backend side
      * Used in tax summary reports to show amounts relating to a tax return category entity and details of what this
      * amount is comprised of. Example here shows an amount of $951.96 and also details of what this amount is comprised of:
      */
@@ -9823,20 +9909,13 @@
             return new ReportItemCollection(value);
         })
     ], ReportItem.prototype, "items", void 0);
-
-    /**
-     * Used in tax summary reports to show specific details relating to an amount in the report.
-     * See structure in ReportItem class.
-     * Example an amount of $550 for property income could be comprised of 2 different property amounts of $300 and $250.
-     * This is useful in providing drill-down information for the tax summary report.
-     */
-    var ReportItemDetails = /** @class */ (function (_super) {
-        __extends(ReportItemDetails, _super);
-        function ReportItemDetails() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return ReportItemDetails;
-    }(AbstractModel));
+    __decorate([
+        classTransformer.Type(function () { return ReportItemDetails; }),
+        classTransformer.Transform(function (_b) {
+            var value = _b.value;
+            return new Collection(value);
+        })
+    ], ReportItem.prototype, "details", void 0);
 
     /**
      * Base class for each sections of Tax Summary report, contains common properties/methods
@@ -11549,6 +11628,13 @@
                     return response.map(function (item) { return classTransformer.plainToClass(ChartAccounts, item); });
                 }))
                     .subscribe(function (chartAccounts) {
+                    // Sort personal chart accounts by name (TT-1950)
+                    chartAccounts.sort(function (a, b) {
+                        if (a.isPersonal() && b.isPersonal()) {
+                            return a.name > b.name ? 1 : -1;
+                        }
+                        return 0;
+                    });
                     _this._chartAccounts = chartAccounts;
                     _this.chartAccountsSubject.next(_this._chartAccounts);
                 });
@@ -14861,7 +14947,7 @@
             if (data === void 0) { data = {}; }
             this.submitted = true;
             this.markAllAsTouched();
-            if (!this.valid) {
+            if (!this.disabled && !this.valid) {
                 return null;
             }
             var model = this.createModelInstance(Object.assign({}, this.model, this.value, data));
@@ -15452,9 +15538,11 @@
     var MyTaxDeductionsForm = /** @class */ (function (_super) {
         __extends(MyTaxDeductionsForm, _super);
         function MyTaxDeductionsForm(deductions) {
-            return _super.call(this, {
+            var _this = this;
+            var _a;
+            _this = _super.call(this, {
                 vehicleClaimMethod: new forms.FormControl({
-                    value: deductions.vehicleClaim.method,
+                    value: (_a = deductions.vehicleClaim) === null || _a === void 0 ? void 0 : _a.method,
                     disabled: true
                 }),
                 vehicleExpensesTotalAmount: new forms.FormControl({
@@ -15520,6 +15608,7 @@
                     disabled: true
                 })
             }) || this;
+            return _this;
         }
         return MyTaxDeductionsForm;
     }(AbstractForm));
@@ -15870,6 +15959,7 @@
     exports.CHART_ACCOUNTS_CATEGORIES = CHART_ACCOUNTS_CATEGORIES;
     exports.CalculationFormItem = CalculationFormItem;
     exports.ChartAccounts = ChartAccounts;
+    exports.ChartAccountsCollection = ChartAccountsCollection;
     exports.ChartAccountsDepreciation = ChartAccountsDepreciation;
     exports.ChartAccountsDepreciationService = ChartAccountsDepreciationService;
     exports.ChartAccountsHeading = ChartAccountsHeading;
@@ -15975,6 +16065,7 @@
     exports.MyTaxDividendsForm = MyTaxDividendsForm;
     exports.MyTaxEmployeeShareSchemes = MyTaxEmployeeShareSchemes;
     exports.MyTaxEmployeeShareSchemesForm = MyTaxEmployeeShareSchemesForm;
+    exports.MyTaxEstimate = MyTaxEstimate;
     exports.MyTaxIncomeStatements = MyTaxIncomeStatements;
     exports.MyTaxIncomeStatementsForm = MyTaxIncomeStatementsForm;
     exports.MyTaxIncomeTests = MyTaxIncomeTests;