taxtank-core 0.28.22 → 0.28.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/taxtank-core.umd.js +112 -38
- package/bundles/taxtank-core.umd.js.map +1 -1
- package/esm2015/lib/collections/tax-summary/tax-return-categories.const.js +28 -4
- package/esm2015/lib/db/Enums/tax-return-category-list.enum.js +28 -10
- package/esm2015/lib/db/Enums/tax-return-category-section.enum.js +3 -2
- package/esm2015/lib/db/Enums/tax-summary-section.enum.js +4 -3
- package/esm2015/lib/models/property/property.js +4 -7
- package/esm2015/lib/models/report/my-tax/my-tax-rent/my-tax-rent.js +2 -2
- package/esm2015/lib/models/tax-summary/tax-summary-section.js +4 -2
- package/esm2015/lib/models/tax-summary/tax-summary.js +35 -12
- package/fesm2015/taxtank-core.js +100 -34
- package/fesm2015/taxtank-core.js.map +1 -1
- package/lib/db/Enums/tax-return-category-list.enum.d.ts +27 -9
- package/lib/db/Enums/tax-return-category-section.enum.d.ts +2 -1
- package/lib/db/Enums/tax-summary-section.enum.d.ts +3 -2
- package/lib/models/property/property.d.ts +1 -4
- package/lib/models/tax-summary/tax-summary.d.ts +14 -1
- package/package.json +1 -1
package/fesm2015/taxtank-core.js
CHANGED
|
@@ -4081,12 +4081,6 @@ class Property extends Property$1 {
|
|
|
4081
4081
|
get myShare() {
|
|
4082
4082
|
return this.shares.find((share) => share.user.id === +localStorage.getItem('userId'));
|
|
4083
4083
|
}
|
|
4084
|
-
/**
|
|
4085
|
-
* exact claim including share percent
|
|
4086
|
-
*/
|
|
4087
|
-
get shareClaimPercent() {
|
|
4088
|
-
return this.sharePercent * this.claimPercent / 100;
|
|
4089
|
-
}
|
|
4090
4084
|
get actualValuation() {
|
|
4091
4085
|
return this.valuations.reduce((maxDateValuation, valuation) => {
|
|
4092
4086
|
return maxDateValuation.date > valuation.date ? maxDateValuation : valuation;
|
|
@@ -4095,6 +4089,9 @@ class Property extends Property$1 {
|
|
|
4095
4089
|
get claimPercent() {
|
|
4096
4090
|
return this.currentYearForecast.claimPercent;
|
|
4097
4091
|
}
|
|
4092
|
+
get claimCoefficient() {
|
|
4093
|
+
return this.claimPercent / 100;
|
|
4094
|
+
}
|
|
4098
4095
|
get sharePercent() {
|
|
4099
4096
|
return this.myShare.percent;
|
|
4100
4097
|
}
|
|
@@ -6626,16 +6623,13 @@ var TaxReturnCategoryListEnum;
|
|
|
6626
6623
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ANNUITIES_SUPER_INCOME_STREAMS"] = 3] = "ANNUITIES_SUPER_INCOME_STREAMS";
|
|
6627
6624
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SUPERANNUATION_LUMP_SUM_PAYMENTS"] = 34] = "SUPERANNUATION_LUMP_SUM_PAYMENTS";
|
|
6628
6625
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ATTRIBUTED_PSI_INCOME"] = 4] = "ATTRIBUTED_PSI_INCOME";
|
|
6629
|
-
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["WORK_EXPENSES"] = 7] = "WORK_EXPENSES";
|
|
6630
|
-
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_RENT"] = 8] = "GROSS_RENT";
|
|
6631
|
-
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_RENTAL_DEDUCTIONS"] = 12] = "OTHER_RENTAL_DEDUCTIONS";
|
|
6632
|
-
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_DEDUCTIONS"] = 9] = "INTEREST_DEDUCTIONS";
|
|
6633
|
-
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CAPITAL_WORKS"] = 10] = "CAPITAL_WORKS";
|
|
6634
|
-
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DEPRECIATION"] = 11] = "DEPRECIATION";
|
|
6635
6626
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_INTEREST"] = 5] = "GROSS_INTEREST";
|
|
6636
6627
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DIVIDENDS"] = 6] = "DIVIDENDS";
|
|
6637
6628
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SHARE_SCHEMES"] = 35] = "SHARE_SCHEMES";
|
|
6629
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_RENT"] = 8] = "GROSS_RENT";
|
|
6638
6630
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PARTNERSHIPS_TRUSTS"] = 13] = "PARTNERSHIPS_TRUSTS";
|
|
6631
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PARTNERSHIPS"] = 36] = "PARTNERSHIPS";
|
|
6632
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TRUSTS"] = 37] = "TRUSTS";
|
|
6639
6633
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PSI_SBE_INCOME"] = 14] = "PSI_SBE_INCOME";
|
|
6640
6634
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SOLE_TRADER_BUSINESS_INCOME"] = 38] = "SOLE_TRADER_BUSINESS_INCOME";
|
|
6641
6635
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CAPITAL_GAINS"] = 15] = "CAPITAL_GAINS";
|
|
@@ -6643,17 +6637,38 @@ var TaxReturnCategoryListEnum;
|
|
|
6643
6637
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BONUSES_FROM_LIFE_INSURANCE"] = 17] = "BONUSES_FROM_LIFE_INSURANCE";
|
|
6644
6638
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["FORESTRY_MANAGED_INVESTMENT_SCHEMES"] = 39] = "FORESTRY_MANAGED_INVESTMENT_SCHEMES";
|
|
6645
6639
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_INCOME"] = 40] = "OTHER_INCOME";
|
|
6646
|
-
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["
|
|
6647
|
-
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["
|
|
6648
|
-
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["
|
|
6640
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_PAYMENTS_NO_ABN_GIVEN"] = 42] = "GROSS_PAYMENTS_NO_ABN_GIVEN";
|
|
6641
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_PAYMENTS_VOLUNTARY_AGREEMENT"] = 43] = "GROSS_PAYMENTS_VOLUNTARY_AGREEMENT";
|
|
6642
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER"] = 44] = "GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER";
|
|
6643
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ASSESSABLE_GOVERNMENT_PAYMENTS"] = 45] = "ASSESSABLE_GOVERNMENT_PAYMENTS";
|
|
6644
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_BUSINESS_INCOME"] = 46] = "OTHER_BUSINESS_INCOME";
|
|
6645
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["WORK_EXPENSES"] = 7] = "WORK_EXPENSES";
|
|
6646
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_DEDUCTIONS"] = 9] = "INTEREST_DEDUCTIONS";
|
|
6647
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CAPITAL_WORKS"] = 10] = "CAPITAL_WORKS";
|
|
6648
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PLANT_AND_EQUIPMENT"] = 11] = "PLANT_AND_EQUIPMENT";
|
|
6649
6649
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BORROWING_EXPENSES"] = 29] = "BORROWING_EXPENSES";
|
|
6650
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_RENTAL_DEDUCTIONS"] = 12] = "OTHER_RENTAL_DEDUCTIONS";
|
|
6651
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_DEDUCTIONS"] = 18] = "OTHER_DEDUCTIONS";
|
|
6652
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PURCHASES_AND_OTHER_COSTS"] = 48] = "PURCHASES_AND_OTHER_COSTS";
|
|
6653
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CONTRACTORS_SUBCONTRACTORS_COMMISSION_EXPENSES"] = 49] = "CONTRACTORS_SUBCONTRACTORS_COMMISSION_EXPENSES";
|
|
6654
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SUPERANNUATION_EXPENSES"] = 50] = "SUPERANNUATION_EXPENSES";
|
|
6655
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BAD_DEBTS"] = 51] = "BAD_DEBTS";
|
|
6656
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["LEASE_EXPENSES"] = 52] = "LEASE_EXPENSES";
|
|
6657
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["RENT_EXPENSES"] = 53] = "RENT_EXPENSES";
|
|
6658
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_EXPENSES_WITHIN_AUSTRALIA"] = 54] = "INTEREST_EXPENSES_WITHIN_AUSTRALIA";
|
|
6659
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_EXPENSES_OVERSEAS"] = 55] = "INTEREST_EXPENSES_OVERSEAS";
|
|
6660
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DEPRECIATION_EXPENSES"] = 56] = "DEPRECIATION_EXPENSES";
|
|
6661
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["MOTOR_VEHICLE_EXPENSES"] = 57] = "MOTOR_VEHICLE_EXPENSES";
|
|
6662
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ALL_OTHER_EXPENSES"] = 58] = "ALL_OTHER_EXPENSES";
|
|
6650
6663
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_TAX_PAYABLE"] = 19] = "GROSS_TAX_PAYABLE";
|
|
6651
6664
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_ON_TAXABLE_INCOME"] = 20] = "TAX_ON_TAXABLE_INCOME";
|
|
6652
6665
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["MEDICARE"] = 21] = "MEDICARE";
|
|
6653
6666
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["STUDENT_LOAN_REPAYMENT"] = 22] = "STUDENT_LOAN_REPAYMENT";
|
|
6667
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_CREDITS"] = 23] = "TAX_CREDITS";
|
|
6654
6668
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_WITHHELD"] = 24] = "TAX_WITHHELD";
|
|
6655
6669
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_INSTALMENTS"] = 25] = "TAX_INSTALMENTS";
|
|
6656
6670
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["FRANKING_CREDITS"] = 26] = "FRANKING_CREDITS";
|
|
6671
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_OFFSETS"] = 27] = "TAX_OFFSETS";
|
|
6657
6672
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_PAYABLE"] = 28] = "TAX_PAYABLE";
|
|
6658
6673
|
})(TaxReturnCategoryListEnum || (TaxReturnCategoryListEnum = {}));
|
|
6659
6674
|
|
|
@@ -6692,7 +6707,8 @@ const TAX_RETURN_CATEGORIES = {
|
|
|
6692
6707
|
],
|
|
6693
6708
|
depreciation: [
|
|
6694
6709
|
TaxReturnCategoryListEnum.CAPITAL_WORKS,
|
|
6695
|
-
TaxReturnCategoryListEnum.DEPRECIATION
|
|
6710
|
+
// @TODO Nik/Alex (it was TaxReturnCategoryListEnum.DEPRECIATION which doesn't exist)
|
|
6711
|
+
TaxReturnCategoryListEnum.PLANT_AND_EQUIPMENT
|
|
6696
6712
|
]
|
|
6697
6713
|
},
|
|
6698
6714
|
other: {
|
|
@@ -6700,7 +6716,8 @@ const TAX_RETURN_CATEGORIES = {
|
|
|
6700
6716
|
TaxReturnCategoryListEnum.GROSS_INTEREST,
|
|
6701
6717
|
TaxReturnCategoryListEnum.DIVIDENDS,
|
|
6702
6718
|
TaxReturnCategoryListEnum.SHARE_SCHEMES,
|
|
6703
|
-
TaxReturnCategoryListEnum.
|
|
6719
|
+
TaxReturnCategoryListEnum.PARTNERSHIPS,
|
|
6720
|
+
TaxReturnCategoryListEnum.TRUSTS,
|
|
6704
6721
|
TaxReturnCategoryListEnum.PSI_SBE_INCOME,
|
|
6705
6722
|
TaxReturnCategoryListEnum.SOLE_TRADER_BUSINESS_INCOME,
|
|
6706
6723
|
TaxReturnCategoryListEnum.CAPITAL_GAINS,
|
|
@@ -6718,7 +6735,29 @@ const TAX_RETURN_CATEGORIES = {
|
|
|
6718
6735
|
taxOffsets: [
|
|
6719
6736
|
TaxReturnCategoryListEnum.TAX_OFFSETS
|
|
6720
6737
|
]
|
|
6721
|
-
}
|
|
6738
|
+
},
|
|
6739
|
+
sole: {
|
|
6740
|
+
income: [
|
|
6741
|
+
TaxReturnCategoryListEnum.GROSS_PAYMENTS_NO_ABN_GIVEN,
|
|
6742
|
+
TaxReturnCategoryListEnum.GROSS_PAYMENTS_VOLUNTARY_AGREEMENT,
|
|
6743
|
+
TaxReturnCategoryListEnum.GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER,
|
|
6744
|
+
TaxReturnCategoryListEnum.ASSESSABLE_GOVERNMENT_PAYMENTS,
|
|
6745
|
+
TaxReturnCategoryListEnum.OTHER_BUSINESS_INCOME
|
|
6746
|
+
],
|
|
6747
|
+
expenses: [
|
|
6748
|
+
TaxReturnCategoryListEnum.PURCHASES_AND_OTHER_COSTS,
|
|
6749
|
+
TaxReturnCategoryListEnum.CONTRACTORS_SUBCONTRACTORS_COMMISSION_EXPENSES,
|
|
6750
|
+
TaxReturnCategoryListEnum.SUPERANNUATION_EXPENSES,
|
|
6751
|
+
TaxReturnCategoryListEnum.BAD_DEBTS,
|
|
6752
|
+
TaxReturnCategoryListEnum.LEASE_EXPENSES,
|
|
6753
|
+
TaxReturnCategoryListEnum.RENT_EXPENSES,
|
|
6754
|
+
TaxReturnCategoryListEnum.INTEREST_EXPENSES_WITHIN_AUSTRALIA,
|
|
6755
|
+
TaxReturnCategoryListEnum.INTEREST_EXPENSES_OVERSEAS,
|
|
6756
|
+
TaxReturnCategoryListEnum.DEPRECIATION_EXPENSES,
|
|
6757
|
+
TaxReturnCategoryListEnum.MOTOR_VEHICLE_EXPENSES,
|
|
6758
|
+
TaxReturnCategoryListEnum.ALL_OTHER_EXPENSES
|
|
6759
|
+
]
|
|
6760
|
+
},
|
|
6722
6761
|
};
|
|
6723
6762
|
|
|
6724
6763
|
/**
|
|
@@ -7160,7 +7199,8 @@ var TaxReturnCategorySectionEnum;
|
|
|
7160
7199
|
TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["WORK_TANK"] = 1] = "WORK_TANK";
|
|
7161
7200
|
TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["PROPERTY_TANK"] = 2] = "PROPERTY_TANK";
|
|
7162
7201
|
TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["OTHER_INCOME"] = 3] = "OTHER_INCOME";
|
|
7163
|
-
TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["
|
|
7202
|
+
TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["SOLE_TANK"] = 4] = "SOLE_TANK";
|
|
7203
|
+
TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["SUMMARY"] = 5] = "SUMMARY";
|
|
7164
7204
|
})(TaxReturnCategorySectionEnum || (TaxReturnCategorySectionEnum = {}));
|
|
7165
7205
|
|
|
7166
7206
|
var TaxReviewStatusEnum;
|
|
@@ -7197,8 +7237,9 @@ var TaxSummarySectionEnum;
|
|
|
7197
7237
|
(function (TaxSummarySectionEnum) {
|
|
7198
7238
|
TaxSummarySectionEnum[TaxSummarySectionEnum["WORK_TANK"] = 1] = "WORK_TANK";
|
|
7199
7239
|
TaxSummarySectionEnum[TaxSummarySectionEnum["PROPERTY_TANK"] = 2] = "PROPERTY_TANK";
|
|
7200
|
-
TaxSummarySectionEnum[TaxSummarySectionEnum["
|
|
7201
|
-
TaxSummarySectionEnum[TaxSummarySectionEnum["
|
|
7240
|
+
TaxSummarySectionEnum[TaxSummarySectionEnum["OTHER_TANK"] = 3] = "OTHER_TANK";
|
|
7241
|
+
TaxSummarySectionEnum[TaxSummarySectionEnum["SOLE_TANK"] = 4] = "SOLE_TANK";
|
|
7242
|
+
TaxSummarySectionEnum[TaxSummarySectionEnum["SUMMARY"] = 5] = "SUMMARY";
|
|
7202
7243
|
})(TaxSummarySectionEnum || (TaxSummarySectionEnum = {}));
|
|
7203
7244
|
|
|
7204
7245
|
var TaxSummaryTaxSummaryEnum;
|
|
@@ -9053,7 +9094,7 @@ class MyTaxRent {
|
|
|
9053
9094
|
calculateOtherRentalDeductionsAmount() {
|
|
9054
9095
|
var _a, _b, _c;
|
|
9055
9096
|
const plantAndEquipmentAmount = Math.abs(((_a = this.taxSummaryPropertySection.items
|
|
9056
|
-
.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.
|
|
9097
|
+
.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.PLANT_AND_EQUIPMENT)) === null || _a === void 0 ? void 0 : _a.amount) || 0);
|
|
9057
9098
|
const borrowingExpensesAmount = Math.abs(((_b = this.taxSummaryPropertySection.items
|
|
9058
9099
|
.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.BORROWING_EXPENSES)) === null || _b === void 0 ? void 0 : _b.amount) || 0);
|
|
9059
9100
|
const otherRentalDeductionsAmount = Math.abs(((_c = this.taxSummaryPropertySection.items
|
|
@@ -9249,8 +9290,10 @@ __decorate([
|
|
|
9249
9290
|
return 'taxSummaryWorkTank';
|
|
9250
9291
|
case TaxSummarySectionEnum.PROPERTY_TANK:
|
|
9251
9292
|
return 'taxSummaryPropertyTank';
|
|
9252
|
-
case TaxSummarySectionEnum.
|
|
9293
|
+
case TaxSummarySectionEnum.OTHER_TANK:
|
|
9253
9294
|
return 'taxSummaryOtherIncome';
|
|
9295
|
+
case TaxSummarySectionEnum.SOLE_TANK:
|
|
9296
|
+
return 'taxSummarySoleTank';
|
|
9254
9297
|
default:
|
|
9255
9298
|
return 'taxSummaryTotal';
|
|
9256
9299
|
}
|
|
@@ -9263,7 +9306,7 @@ __decorate([
|
|
|
9263
9306
|
*/
|
|
9264
9307
|
class TaxSummary {
|
|
9265
9308
|
get sections() {
|
|
9266
|
-
return [this.work, this.property, this.
|
|
9309
|
+
return [this.work, this.property, this.other, this.sole, this.summary];
|
|
9267
9310
|
}
|
|
9268
9311
|
get taxPercent() {
|
|
9269
9312
|
// Check if netAmount is not 0 to avoid division by zero
|
|
@@ -9286,7 +9329,7 @@ class TaxSummary {
|
|
|
9286
9329
|
*/
|
|
9287
9330
|
get workNetTotal() {
|
|
9288
9331
|
const income = this.work.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.income, TaxSummarySectionEnum.WORK_TANK);
|
|
9289
|
-
const expenses = this.
|
|
9332
|
+
const expenses = this.work.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.expenses, TaxSummarySectionEnum.WORK_TANK);
|
|
9290
9333
|
const interest = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.interest, TaxSummarySectionEnum.WORK_TANK);
|
|
9291
9334
|
return income - Math.abs(expenses) - Math.abs(interest);
|
|
9292
9335
|
}
|
|
@@ -9313,10 +9356,10 @@ class TaxSummary {
|
|
|
9313
9356
|
* https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
|
|
9314
9357
|
*/
|
|
9315
9358
|
get otherNetCash() {
|
|
9316
|
-
const income = this.
|
|
9317
|
-
const expenses = this.
|
|
9318
|
-
const taxWithheld = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_WITHHELD], TaxSummarySectionEnum.
|
|
9319
|
-
const taxInstalments = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_INSTALMENTS], TaxSummarySectionEnum.
|
|
9359
|
+
const income = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.income, TaxSummarySectionEnum.OTHER_TANK);
|
|
9360
|
+
const expenses = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.expenses, TaxSummarySectionEnum.OTHER_TANK);
|
|
9361
|
+
const taxWithheld = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_WITHHELD], TaxSummarySectionEnum.OTHER_TANK);
|
|
9362
|
+
const taxInstalments = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_INSTALMENTS], TaxSummarySectionEnum.OTHER_TANK);
|
|
9320
9363
|
return income - Math.abs(expenses) - Math.abs(taxWithheld) - Math.abs(taxInstalments);
|
|
9321
9364
|
}
|
|
9322
9365
|
/**
|
|
@@ -9324,13 +9367,33 @@ class TaxSummary {
|
|
|
9324
9367
|
* https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
|
|
9325
9368
|
*/
|
|
9326
9369
|
get otherNetTotal() {
|
|
9327
|
-
const income = this.
|
|
9328
|
-
const expenses = this.
|
|
9370
|
+
const income = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.income, TaxSummarySectionEnum.OTHER_TANK);
|
|
9371
|
+
const expenses = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.expenses, TaxSummarySectionEnum.OTHER_TANK);
|
|
9329
9372
|
const taxOffsets = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_OFFSETS], TaxSummarySectionEnum.SUMMARY);
|
|
9330
|
-
const taxInstallments = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_INSTALMENTS], TaxSummarySectionEnum.
|
|
9331
|
-
const frankingCredits = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.FRANKING_CREDITS], TaxSummarySectionEnum.
|
|
9373
|
+
const taxInstallments = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_INSTALMENTS], TaxSummarySectionEnum.OTHER_TANK);
|
|
9374
|
+
const frankingCredits = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.FRANKING_CREDITS], TaxSummarySectionEnum.OTHER_TANK);
|
|
9332
9375
|
return income - Math.abs(expenses) + Math.abs(taxOffsets) + Math.abs(taxInstallments) + Math.abs(frankingCredits);
|
|
9333
9376
|
}
|
|
9377
|
+
/**
|
|
9378
|
+
* @TODO Nicole update documentation + check calculations
|
|
9379
|
+
* Sole Net Cash = gross income – expenses
|
|
9380
|
+
* https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
|
|
9381
|
+
*/
|
|
9382
|
+
get soleNetCash() {
|
|
9383
|
+
const income = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.income, TaxSummarySectionEnum.SOLE_TANK);
|
|
9384
|
+
const expenses = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.expenses, TaxSummarySectionEnum.SOLE_TANK);
|
|
9385
|
+
return income - Math.abs(expenses);
|
|
9386
|
+
}
|
|
9387
|
+
/**
|
|
9388
|
+
* @TODO Nicole update documentation + check calculations
|
|
9389
|
+
* Sole Net Total = Gross income - expenses
|
|
9390
|
+
* https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
|
|
9391
|
+
*/
|
|
9392
|
+
get soleNetTotal() {
|
|
9393
|
+
const income = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.income, TaxSummarySectionEnum.SOLE_TANK);
|
|
9394
|
+
const expenses = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.expenses, TaxSummarySectionEnum.SOLE_TANK);
|
|
9395
|
+
return income - Math.abs(expenses);
|
|
9396
|
+
}
|
|
9334
9397
|
}
|
|
9335
9398
|
__decorate([
|
|
9336
9399
|
Type(() => TaxSummarySection)
|
|
@@ -9340,7 +9403,10 @@ __decorate([
|
|
|
9340
9403
|
], TaxSummary.prototype, "property", void 0);
|
|
9341
9404
|
__decorate([
|
|
9342
9405
|
Type(() => TaxSummarySection)
|
|
9343
|
-
], TaxSummary.prototype, "
|
|
9406
|
+
], TaxSummary.prototype, "other", void 0);
|
|
9407
|
+
__decorate([
|
|
9408
|
+
Type(() => TaxSummarySection)
|
|
9409
|
+
], TaxSummary.prototype, "sole", void 0);
|
|
9344
9410
|
__decorate([
|
|
9345
9411
|
Type(() => TaxSummarySection)
|
|
9346
9412
|
], TaxSummary.prototype, "summary", void 0);
|