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
|
@@ -5389,16 +5389,6 @@
|
|
|
5389
5389
|
enumerable: false,
|
|
5390
5390
|
configurable: true
|
|
5391
5391
|
});
|
|
5392
|
-
Object.defineProperty(Property.prototype, "shareClaimPercent", {
|
|
5393
|
-
/**
|
|
5394
|
-
* exact claim including share percent
|
|
5395
|
-
*/
|
|
5396
|
-
get: function () {
|
|
5397
|
-
return this.sharePercent * this.claimPercent / 100;
|
|
5398
|
-
},
|
|
5399
|
-
enumerable: false,
|
|
5400
|
-
configurable: true
|
|
5401
|
-
});
|
|
5402
5392
|
Object.defineProperty(Property.prototype, "actualValuation", {
|
|
5403
5393
|
get: function () {
|
|
5404
5394
|
return this.valuations.reduce(function (maxDateValuation, valuation) {
|
|
@@ -5415,6 +5405,13 @@
|
|
|
5415
5405
|
enumerable: false,
|
|
5416
5406
|
configurable: true
|
|
5417
5407
|
});
|
|
5408
|
+
Object.defineProperty(Property.prototype, "claimCoefficient", {
|
|
5409
|
+
get: function () {
|
|
5410
|
+
return this.claimPercent / 100;
|
|
5411
|
+
},
|
|
5412
|
+
enumerable: false,
|
|
5413
|
+
configurable: true
|
|
5414
|
+
});
|
|
5418
5415
|
Object.defineProperty(Property.prototype, "sharePercent", {
|
|
5419
5416
|
get: function () {
|
|
5420
5417
|
return this.myShare.percent;
|
|
@@ -8491,16 +8488,13 @@
|
|
|
8491
8488
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ANNUITIES_SUPER_INCOME_STREAMS"] = 3] = "ANNUITIES_SUPER_INCOME_STREAMS";
|
|
8492
8489
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SUPERANNUATION_LUMP_SUM_PAYMENTS"] = 34] = "SUPERANNUATION_LUMP_SUM_PAYMENTS";
|
|
8493
8490
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ATTRIBUTED_PSI_INCOME"] = 4] = "ATTRIBUTED_PSI_INCOME";
|
|
8494
|
-
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["WORK_EXPENSES"] = 7] = "WORK_EXPENSES";
|
|
8495
|
-
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_RENT"] = 8] = "GROSS_RENT";
|
|
8496
|
-
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_RENTAL_DEDUCTIONS"] = 12] = "OTHER_RENTAL_DEDUCTIONS";
|
|
8497
|
-
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_DEDUCTIONS"] = 9] = "INTEREST_DEDUCTIONS";
|
|
8498
|
-
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CAPITAL_WORKS"] = 10] = "CAPITAL_WORKS";
|
|
8499
|
-
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DEPRECIATION"] = 11] = "DEPRECIATION";
|
|
8500
8491
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_INTEREST"] = 5] = "GROSS_INTEREST";
|
|
8501
8492
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DIVIDENDS"] = 6] = "DIVIDENDS";
|
|
8502
8493
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SHARE_SCHEMES"] = 35] = "SHARE_SCHEMES";
|
|
8494
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_RENT"] = 8] = "GROSS_RENT";
|
|
8503
8495
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PARTNERSHIPS_TRUSTS"] = 13] = "PARTNERSHIPS_TRUSTS";
|
|
8496
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PARTNERSHIPS"] = 36] = "PARTNERSHIPS";
|
|
8497
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TRUSTS"] = 37] = "TRUSTS";
|
|
8504
8498
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PSI_SBE_INCOME"] = 14] = "PSI_SBE_INCOME";
|
|
8505
8499
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SOLE_TRADER_BUSINESS_INCOME"] = 38] = "SOLE_TRADER_BUSINESS_INCOME";
|
|
8506
8500
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CAPITAL_GAINS"] = 15] = "CAPITAL_GAINS";
|
|
@@ -8508,17 +8502,38 @@
|
|
|
8508
8502
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BONUSES_FROM_LIFE_INSURANCE"] = 17] = "BONUSES_FROM_LIFE_INSURANCE";
|
|
8509
8503
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["FORESTRY_MANAGED_INVESTMENT_SCHEMES"] = 39] = "FORESTRY_MANAGED_INVESTMENT_SCHEMES";
|
|
8510
8504
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_INCOME"] = 40] = "OTHER_INCOME";
|
|
8511
|
-
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["
|
|
8512
|
-
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["
|
|
8513
|
-
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["
|
|
8505
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_PAYMENTS_NO_ABN_GIVEN"] = 42] = "GROSS_PAYMENTS_NO_ABN_GIVEN";
|
|
8506
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_PAYMENTS_VOLUNTARY_AGREEMENT"] = 43] = "GROSS_PAYMENTS_VOLUNTARY_AGREEMENT";
|
|
8507
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER"] = 44] = "GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER";
|
|
8508
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ASSESSABLE_GOVERNMENT_PAYMENTS"] = 45] = "ASSESSABLE_GOVERNMENT_PAYMENTS";
|
|
8509
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_BUSINESS_INCOME"] = 46] = "OTHER_BUSINESS_INCOME";
|
|
8510
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["WORK_EXPENSES"] = 7] = "WORK_EXPENSES";
|
|
8511
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_DEDUCTIONS"] = 9] = "INTEREST_DEDUCTIONS";
|
|
8512
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CAPITAL_WORKS"] = 10] = "CAPITAL_WORKS";
|
|
8513
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PLANT_AND_EQUIPMENT"] = 11] = "PLANT_AND_EQUIPMENT";
|
|
8514
8514
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BORROWING_EXPENSES"] = 29] = "BORROWING_EXPENSES";
|
|
8515
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_RENTAL_DEDUCTIONS"] = 12] = "OTHER_RENTAL_DEDUCTIONS";
|
|
8516
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_DEDUCTIONS"] = 18] = "OTHER_DEDUCTIONS";
|
|
8517
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PURCHASES_AND_OTHER_COSTS"] = 48] = "PURCHASES_AND_OTHER_COSTS";
|
|
8518
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CONTRACTORS_SUBCONTRACTORS_COMMISSION_EXPENSES"] = 49] = "CONTRACTORS_SUBCONTRACTORS_COMMISSION_EXPENSES";
|
|
8519
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SUPERANNUATION_EXPENSES"] = 50] = "SUPERANNUATION_EXPENSES";
|
|
8520
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BAD_DEBTS"] = 51] = "BAD_DEBTS";
|
|
8521
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["LEASE_EXPENSES"] = 52] = "LEASE_EXPENSES";
|
|
8522
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["RENT_EXPENSES"] = 53] = "RENT_EXPENSES";
|
|
8523
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_EXPENSES_WITHIN_AUSTRALIA"] = 54] = "INTEREST_EXPENSES_WITHIN_AUSTRALIA";
|
|
8524
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_EXPENSES_OVERSEAS"] = 55] = "INTEREST_EXPENSES_OVERSEAS";
|
|
8525
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DEPRECIATION_EXPENSES"] = 56] = "DEPRECIATION_EXPENSES";
|
|
8526
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["MOTOR_VEHICLE_EXPENSES"] = 57] = "MOTOR_VEHICLE_EXPENSES";
|
|
8527
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ALL_OTHER_EXPENSES"] = 58] = "ALL_OTHER_EXPENSES";
|
|
8515
8528
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_TAX_PAYABLE"] = 19] = "GROSS_TAX_PAYABLE";
|
|
8516
8529
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_ON_TAXABLE_INCOME"] = 20] = "TAX_ON_TAXABLE_INCOME";
|
|
8517
8530
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["MEDICARE"] = 21] = "MEDICARE";
|
|
8518
8531
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["STUDENT_LOAN_REPAYMENT"] = 22] = "STUDENT_LOAN_REPAYMENT";
|
|
8532
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_CREDITS"] = 23] = "TAX_CREDITS";
|
|
8519
8533
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_WITHHELD"] = 24] = "TAX_WITHHELD";
|
|
8520
8534
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_INSTALMENTS"] = 25] = "TAX_INSTALMENTS";
|
|
8521
8535
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["FRANKING_CREDITS"] = 26] = "FRANKING_CREDITS";
|
|
8536
|
+
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_OFFSETS"] = 27] = "TAX_OFFSETS";
|
|
8522
8537
|
TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_PAYABLE"] = 28] = "TAX_PAYABLE";
|
|
8523
8538
|
})(exports.TaxReturnCategoryListEnum || (exports.TaxReturnCategoryListEnum = {}));
|
|
8524
8539
|
|
|
@@ -8557,7 +8572,8 @@
|
|
|
8557
8572
|
],
|
|
8558
8573
|
depreciation: [
|
|
8559
8574
|
exports.TaxReturnCategoryListEnum.CAPITAL_WORKS,
|
|
8560
|
-
|
|
8575
|
+
// @TODO Nik/Alex (it was TaxReturnCategoryListEnum.DEPRECIATION which doesn't exist)
|
|
8576
|
+
exports.TaxReturnCategoryListEnum.PLANT_AND_EQUIPMENT
|
|
8561
8577
|
]
|
|
8562
8578
|
},
|
|
8563
8579
|
other: {
|
|
@@ -8565,7 +8581,8 @@
|
|
|
8565
8581
|
exports.TaxReturnCategoryListEnum.GROSS_INTEREST,
|
|
8566
8582
|
exports.TaxReturnCategoryListEnum.DIVIDENDS,
|
|
8567
8583
|
exports.TaxReturnCategoryListEnum.SHARE_SCHEMES,
|
|
8568
|
-
exports.TaxReturnCategoryListEnum.
|
|
8584
|
+
exports.TaxReturnCategoryListEnum.PARTNERSHIPS,
|
|
8585
|
+
exports.TaxReturnCategoryListEnum.TRUSTS,
|
|
8569
8586
|
exports.TaxReturnCategoryListEnum.PSI_SBE_INCOME,
|
|
8570
8587
|
exports.TaxReturnCategoryListEnum.SOLE_TRADER_BUSINESS_INCOME,
|
|
8571
8588
|
exports.TaxReturnCategoryListEnum.CAPITAL_GAINS,
|
|
@@ -8583,7 +8600,29 @@
|
|
|
8583
8600
|
taxOffsets: [
|
|
8584
8601
|
exports.TaxReturnCategoryListEnum.TAX_OFFSETS
|
|
8585
8602
|
]
|
|
8586
|
-
}
|
|
8603
|
+
},
|
|
8604
|
+
sole: {
|
|
8605
|
+
income: [
|
|
8606
|
+
exports.TaxReturnCategoryListEnum.GROSS_PAYMENTS_NO_ABN_GIVEN,
|
|
8607
|
+
exports.TaxReturnCategoryListEnum.GROSS_PAYMENTS_VOLUNTARY_AGREEMENT,
|
|
8608
|
+
exports.TaxReturnCategoryListEnum.GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER,
|
|
8609
|
+
exports.TaxReturnCategoryListEnum.ASSESSABLE_GOVERNMENT_PAYMENTS,
|
|
8610
|
+
exports.TaxReturnCategoryListEnum.OTHER_BUSINESS_INCOME
|
|
8611
|
+
],
|
|
8612
|
+
expenses: [
|
|
8613
|
+
exports.TaxReturnCategoryListEnum.PURCHASES_AND_OTHER_COSTS,
|
|
8614
|
+
exports.TaxReturnCategoryListEnum.CONTRACTORS_SUBCONTRACTORS_COMMISSION_EXPENSES,
|
|
8615
|
+
exports.TaxReturnCategoryListEnum.SUPERANNUATION_EXPENSES,
|
|
8616
|
+
exports.TaxReturnCategoryListEnum.BAD_DEBTS,
|
|
8617
|
+
exports.TaxReturnCategoryListEnum.LEASE_EXPENSES,
|
|
8618
|
+
exports.TaxReturnCategoryListEnum.RENT_EXPENSES,
|
|
8619
|
+
exports.TaxReturnCategoryListEnum.INTEREST_EXPENSES_WITHIN_AUSTRALIA,
|
|
8620
|
+
exports.TaxReturnCategoryListEnum.INTEREST_EXPENSES_OVERSEAS,
|
|
8621
|
+
exports.TaxReturnCategoryListEnum.DEPRECIATION_EXPENSES,
|
|
8622
|
+
exports.TaxReturnCategoryListEnum.MOTOR_VEHICLE_EXPENSES,
|
|
8623
|
+
exports.TaxReturnCategoryListEnum.ALL_OTHER_EXPENSES
|
|
8624
|
+
]
|
|
8625
|
+
},
|
|
8587
8626
|
};
|
|
8588
8627
|
|
|
8589
8628
|
/**
|
|
@@ -9053,7 +9092,8 @@
|
|
|
9053
9092
|
TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["WORK_TANK"] = 1] = "WORK_TANK";
|
|
9054
9093
|
TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["PROPERTY_TANK"] = 2] = "PROPERTY_TANK";
|
|
9055
9094
|
TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["OTHER_INCOME"] = 3] = "OTHER_INCOME";
|
|
9056
|
-
TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["
|
|
9095
|
+
TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["SOLE_TANK"] = 4] = "SOLE_TANK";
|
|
9096
|
+
TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["SUMMARY"] = 5] = "SUMMARY";
|
|
9057
9097
|
})(exports.TaxReturnCategorySectionEnum || (exports.TaxReturnCategorySectionEnum = {}));
|
|
9058
9098
|
|
|
9059
9099
|
exports.TaxReviewStatusEnum = void 0;
|
|
@@ -9090,8 +9130,9 @@
|
|
|
9090
9130
|
(function (TaxSummarySectionEnum) {
|
|
9091
9131
|
TaxSummarySectionEnum[TaxSummarySectionEnum["WORK_TANK"] = 1] = "WORK_TANK";
|
|
9092
9132
|
TaxSummarySectionEnum[TaxSummarySectionEnum["PROPERTY_TANK"] = 2] = "PROPERTY_TANK";
|
|
9093
|
-
TaxSummarySectionEnum[TaxSummarySectionEnum["
|
|
9094
|
-
TaxSummarySectionEnum[TaxSummarySectionEnum["
|
|
9133
|
+
TaxSummarySectionEnum[TaxSummarySectionEnum["OTHER_TANK"] = 3] = "OTHER_TANK";
|
|
9134
|
+
TaxSummarySectionEnum[TaxSummarySectionEnum["SOLE_TANK"] = 4] = "SOLE_TANK";
|
|
9135
|
+
TaxSummarySectionEnum[TaxSummarySectionEnum["SUMMARY"] = 5] = "SUMMARY";
|
|
9095
9136
|
})(exports.TaxSummarySectionEnum || (exports.TaxSummarySectionEnum = {}));
|
|
9096
9137
|
|
|
9097
9138
|
exports.TaxSummaryTaxSummaryEnum = void 0;
|
|
@@ -11230,7 +11271,7 @@
|
|
|
11230
11271
|
MyTaxRent.prototype.calculateOtherRentalDeductionsAmount = function () {
|
|
11231
11272
|
var _a, _b, _c;
|
|
11232
11273
|
var plantAndEquipmentAmount = Math.abs(((_a = this.taxSummaryPropertySection.items
|
|
11233
|
-
.findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.
|
|
11274
|
+
.findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.PLANT_AND_EQUIPMENT)) === null || _a === void 0 ? void 0 : _a.amount) || 0);
|
|
11234
11275
|
var borrowingExpensesAmount = Math.abs(((_b = this.taxSummaryPropertySection.items
|
|
11235
11276
|
.findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.BORROWING_EXPENSES)) === null || _b === void 0 ? void 0 : _b.amount) || 0);
|
|
11236
11277
|
var otherRentalDeductionsAmount = Math.abs(((_c = this.taxSummaryPropertySection.items
|
|
@@ -11473,8 +11514,10 @@
|
|
|
11473
11514
|
return 'taxSummaryWorkTank';
|
|
11474
11515
|
case exports.TaxSummarySectionEnum.PROPERTY_TANK:
|
|
11475
11516
|
return 'taxSummaryPropertyTank';
|
|
11476
|
-
case exports.TaxSummarySectionEnum.
|
|
11517
|
+
case exports.TaxSummarySectionEnum.OTHER_TANK:
|
|
11477
11518
|
return 'taxSummaryOtherIncome';
|
|
11519
|
+
case exports.TaxSummarySectionEnum.SOLE_TANK:
|
|
11520
|
+
return 'taxSummarySoleTank';
|
|
11478
11521
|
default:
|
|
11479
11522
|
return 'taxSummaryTotal';
|
|
11480
11523
|
}
|
|
@@ -11490,7 +11533,7 @@
|
|
|
11490
11533
|
}
|
|
11491
11534
|
Object.defineProperty(TaxSummary.prototype, "sections", {
|
|
11492
11535
|
get: function () {
|
|
11493
|
-
return [this.work, this.property, this.
|
|
11536
|
+
return [this.work, this.property, this.other, this.sole, this.summary];
|
|
11494
11537
|
},
|
|
11495
11538
|
enumerable: false,
|
|
11496
11539
|
configurable: true
|
|
@@ -11525,7 +11568,7 @@
|
|
|
11525
11568
|
*/
|
|
11526
11569
|
get: function () {
|
|
11527
11570
|
var income = this.work.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.income, exports.TaxSummarySectionEnum.WORK_TANK);
|
|
11528
|
-
var expenses = this.
|
|
11571
|
+
var expenses = this.work.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.expenses, exports.TaxSummarySectionEnum.WORK_TANK);
|
|
11529
11572
|
var interest = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.interest, exports.TaxSummarySectionEnum.WORK_TANK);
|
|
11530
11573
|
return income - Math.abs(expenses) - Math.abs(interest);
|
|
11531
11574
|
},
|
|
@@ -11564,10 +11607,10 @@
|
|
|
11564
11607
|
* https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
|
|
11565
11608
|
*/
|
|
11566
11609
|
get: function () {
|
|
11567
|
-
var income = this.
|
|
11568
|
-
var expenses = this.
|
|
11569
|
-
var taxWithheld = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.TAX_WITHHELD], exports.TaxSummarySectionEnum.
|
|
11570
|
-
var taxInstalments = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.TAX_INSTALMENTS], exports.TaxSummarySectionEnum.
|
|
11610
|
+
var income = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.income, exports.TaxSummarySectionEnum.OTHER_TANK);
|
|
11611
|
+
var expenses = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.expenses, exports.TaxSummarySectionEnum.OTHER_TANK);
|
|
11612
|
+
var taxWithheld = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.TAX_WITHHELD], exports.TaxSummarySectionEnum.OTHER_TANK);
|
|
11613
|
+
var taxInstalments = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.TAX_INSTALMENTS], exports.TaxSummarySectionEnum.OTHER_TANK);
|
|
11571
11614
|
return income - Math.abs(expenses) - Math.abs(taxWithheld) - Math.abs(taxInstalments);
|
|
11572
11615
|
},
|
|
11573
11616
|
enumerable: false,
|
|
@@ -11579,16 +11622,44 @@
|
|
|
11579
11622
|
* https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
|
|
11580
11623
|
*/
|
|
11581
11624
|
get: function () {
|
|
11582
|
-
var income = this.
|
|
11583
|
-
var expenses = this.
|
|
11625
|
+
var income = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.income, exports.TaxSummarySectionEnum.OTHER_TANK);
|
|
11626
|
+
var expenses = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.expenses, exports.TaxSummarySectionEnum.OTHER_TANK);
|
|
11584
11627
|
var taxOffsets = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.TAX_OFFSETS], exports.TaxSummarySectionEnum.SUMMARY);
|
|
11585
|
-
var taxInstallments = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.TAX_INSTALMENTS], exports.TaxSummarySectionEnum.
|
|
11586
|
-
var frankingCredits = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.FRANKING_CREDITS], exports.TaxSummarySectionEnum.
|
|
11628
|
+
var taxInstallments = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.TAX_INSTALMENTS], exports.TaxSummarySectionEnum.OTHER_TANK);
|
|
11629
|
+
var frankingCredits = this.summary.items.sumByCategoriesAndSection([exports.TaxReturnCategoryListEnum.FRANKING_CREDITS], exports.TaxSummarySectionEnum.OTHER_TANK);
|
|
11587
11630
|
return income - Math.abs(expenses) + Math.abs(taxOffsets) + Math.abs(taxInstallments) + Math.abs(frankingCredits);
|
|
11588
11631
|
},
|
|
11589
11632
|
enumerable: false,
|
|
11590
11633
|
configurable: true
|
|
11591
11634
|
});
|
|
11635
|
+
Object.defineProperty(TaxSummary.prototype, "soleNetCash", {
|
|
11636
|
+
/**
|
|
11637
|
+
* @TODO Nicole update documentation + check calculations
|
|
11638
|
+
* Sole Net Cash = gross income – expenses
|
|
11639
|
+
* https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
|
|
11640
|
+
*/
|
|
11641
|
+
get: function () {
|
|
11642
|
+
var income = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.income, exports.TaxSummarySectionEnum.SOLE_TANK);
|
|
11643
|
+
var expenses = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.expenses, exports.TaxSummarySectionEnum.SOLE_TANK);
|
|
11644
|
+
return income - Math.abs(expenses);
|
|
11645
|
+
},
|
|
11646
|
+
enumerable: false,
|
|
11647
|
+
configurable: true
|
|
11648
|
+
});
|
|
11649
|
+
Object.defineProperty(TaxSummary.prototype, "soleNetTotal", {
|
|
11650
|
+
/**
|
|
11651
|
+
* @TODO Nicole update documentation + check calculations
|
|
11652
|
+
* Sole Net Total = Gross income - expenses
|
|
11653
|
+
* https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
|
|
11654
|
+
*/
|
|
11655
|
+
get: function () {
|
|
11656
|
+
var income = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.income, exports.TaxSummarySectionEnum.SOLE_TANK);
|
|
11657
|
+
var expenses = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.expenses, exports.TaxSummarySectionEnum.SOLE_TANK);
|
|
11658
|
+
return income - Math.abs(expenses);
|
|
11659
|
+
},
|
|
11660
|
+
enumerable: false,
|
|
11661
|
+
configurable: true
|
|
11662
|
+
});
|
|
11592
11663
|
return TaxSummary;
|
|
11593
11664
|
}());
|
|
11594
11665
|
__decorate([
|
|
@@ -11599,7 +11670,10 @@
|
|
|
11599
11670
|
], TaxSummary.prototype, "property", void 0);
|
|
11600
11671
|
__decorate([
|
|
11601
11672
|
classTransformer.Type(function () { return TaxSummarySection; })
|
|
11602
|
-
], TaxSummary.prototype, "
|
|
11673
|
+
], TaxSummary.prototype, "other", void 0);
|
|
11674
|
+
__decorate([
|
|
11675
|
+
classTransformer.Type(function () { return TaxSummarySection; })
|
|
11676
|
+
], TaxSummary.prototype, "sole", void 0);
|
|
11603
11677
|
__decorate([
|
|
11604
11678
|
classTransformer.Type(function () { return TaxSummarySection; })
|
|
11605
11679
|
], TaxSummary.prototype, "summary", void 0);
|