taxtank-core 0.21.9 → 0.21.10
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 +73 -29
- package/bundles/taxtank-core.umd.js.map +1 -1
- package/esm2015/lib/db/Enums/chart-accounts-heading-list.enum.js +8 -1
- package/esm2015/lib/forms/report/my-tax/my-tax-deductions.form.js +9 -3
- package/esm2015/lib/models/report/my-tax/my-tax-deductions/deduction-fields.const.js +9 -2
- package/esm2015/lib/models/report/my-tax/my-tax-deductions/my-tax-deductions.js +16 -16
- package/esm2015/lib/models/report/my-tax/my-tax-estimate/my-tax-estimate.js +3 -3
- package/esm2015/lib/models/report/my-tax/my-tax-interest/my-tax-interest.js +2 -2
- package/esm2015/lib/models/report/my-tax/my-tax-rent/my-tax-rent.js +35 -9
- package/fesm2015/taxtank-core.js +73 -29
- package/fesm2015/taxtank-core.js.map +1 -1
- package/lib/db/Enums/chart-accounts-heading-list.enum.d.ts +7 -0
- package/lib/forms/report/my-tax/my-tax-deductions.form.d.ts +1 -1
- package/lib/models/report/my-tax/my-tax-rent/my-tax-rent.d.ts +11 -1
- package/package.json +1 -1
|
@@ -13,6 +13,13 @@ export var ChartAccountsHeadingListEnum;
|
|
|
13
13
|
ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["HOME_OFFICE_RUNNING"] = 17] = "HOME_OFFICE_RUNNING";
|
|
14
14
|
ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["TOOLS_EQUIPMENT"] = 18] = "TOOLS_EQUIPMENT";
|
|
15
15
|
ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["HOME_OFFICE_OCCUPANCY"] = 19] = "HOME_OFFICE_OCCUPANCY";
|
|
16
|
+
ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["AWARD_OVERTIME_MEAL_ALLOWANCE_EXPENSE"] = 20] = "AWARD_OVERTIME_MEAL_ALLOWANCE_EXPENSE";
|
|
17
|
+
ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["NEWSPAPER"] = 21] = "NEWSPAPER";
|
|
18
|
+
ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["PRINTING_POSTAGE_STATIONERY"] = 22] = "PRINTING_POSTAGE_STATIONERY";
|
|
19
|
+
ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["SEMINARS_ETC"] = 23] = "SEMINARS_ETC";
|
|
20
|
+
ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["TELEPHONE"] = 24] = "TELEPHONE";
|
|
21
|
+
ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["UNION_FEES"] = 25] = "UNION_FEES";
|
|
22
|
+
ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["OTHER"] = 26] = "OTHER";
|
|
16
23
|
ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["DONATIONS"] = 27] = "DONATIONS";
|
|
17
24
|
ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["PSI"] = 30] = "PSI";
|
|
18
25
|
ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["BONUSES"] = 34] = "BONUSES";
|
|
@@ -21,4 +28,4 @@ export var ChartAccountsHeadingListEnum;
|
|
|
21
28
|
ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["INTEREST_DEDUCTIONS"] = 47] = "INTEREST_DEDUCTIONS";
|
|
22
29
|
ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["DIVIDEND_DEDUCTIONS"] = 48] = "DIVIDEND_DEDUCTIONS";
|
|
23
30
|
})(ChartAccountsHeadingListEnum || (ChartAccountsHeadingListEnum = {}));
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhcnQtYWNjb3VudHMtaGVhZGluZy1saXN0LmVudW0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvZGIvRW51bXMvY2hhcnQtYWNjb3VudHMtaGVhZGluZy1saXN0LmVudW0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxDQUFOLElBQVksNEJBNEJYO0FBNUJELFdBQVksNEJBQTRCO0lBQ3RDLG1KQUEwQyxDQUFBO0lBQzFDLHlKQUE2QyxDQUFBO0lBQzdDLHlKQUE2QyxDQUFBO0lBQzdDLGdJQUFpQyxDQUFBO0lBQ2pDLHNIQUE0QixDQUFBO0lBQzVCLDhHQUF3QixDQUFBO0lBQ3hCLG9JQUFtQyxDQUFBO0lBQ25DLDBIQUE4QixDQUFBO0lBQzlCLDhIQUFnQyxDQUFBO0lBQ2hDLGtHQUFrQixDQUFBO0lBQ2xCLDhHQUF3QixDQUFBO0lBQ3hCLHNHQUFvQixDQUFBO0lBQ3BCLGtIQUEwQixDQUFBO0lBQzFCLGtKQUEwQyxDQUFBO0lBQzFDLDBGQUFjLENBQUE7SUFDZCw4SEFBZ0MsQ0FBQTtJQUNoQyxnR0FBaUIsQ0FBQTtJQUNqQiwwRkFBYyxDQUFBO0lBQ2QsNEZBQWUsQ0FBQTtJQUNmLGtGQUFVLENBQUE7SUFDViwwRkFBYyxDQUFBO0lBQ2QsOEVBQVEsQ0FBQTtJQUNSLHNGQUFZLENBQUE7SUFDWix3R0FBcUIsQ0FBQTtJQUNyQiw4RUFBUSxDQUFBO0lBQ1IsOEdBQXdCLENBQUE7SUFDeEIsOEdBQXdCLENBQUE7QUFDMUIsQ0FBQyxFQTVCVyw0QkFBNEIsS0FBNUIsNEJBQTRCLFFBNEJ2QyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBlbnVtIENoYXJ0QWNjb3VudHNIZWFkaW5nTGlzdEVudW0ge1xuICBBTExPV0FOQ0VTX0VBUk5JTkdTX1RJUFNfRElSRUNUT1JfRkVFUyA9IDIsXG4gIEFVU1RSQUxJQU5fR09WRVJOTUVOVF9BTExPV0FOQ0VTX1BBWU1FTlRTID0gNCxcbiAgQVVTVFJBTElBTl9HT1ZFUk5NRU5UX1BFTlNJT05TX0FMTE9XQU5DRVMgPSA1LFxuICBXT1JLX1JFTEFURURfVFJBVkVMX0VYUEVOU0VTID0gMTAsXG4gIENPTVBVTFNPUllfV09SS19VTklGT1JNID0gMTEsXG4gIFBST1RFQ1RJT05fQ0xPVEhJTkcgPSAxMixcbiAgT0NDVVBBVElPTkFMX1NQRUNJRklDX0NMT1RISU5HID0gMTMsXG4gIFNFTEZfRURVQ0FUSU9OQUxfRVhQRU5TRVMgPSAxNCxcbiAgT1RIRVJfV09SS19SRUxBVEVEX0VYUEVOU0VTID0gMTUsXG4gIFNVQlNDUklQVElPTlMgPSAxNixcbiAgSE9NRV9PRkZJQ0VfUlVOTklORyA9IDE3LFxuICBUT09MU19FUVVJUE1FTlQgPSAxOCxcbiAgSE9NRV9PRkZJQ0VfT0NDVVBBTkNZID0gMTksXG4gIEFXQVJEX09WRVJUSU1FX01FQUxfQUxMT1dBTkNFX0VYUEVOU0UgPSAyMCxcbiAgTkVXU1BBUEVSID0gMjEsXG4gIFBSSU5USU5HX1BPU1RBR0VfU1RBVElPTkVSWSA9IDIyLFxuICBTRU1JTkFSU19FVEMgPSAyMyxcbiAgVEVMRVBIT05FID0gMjQsXG4gIFVOSU9OX0ZFRVMgPSAyNSxcbiAgT1RIRVIgPSAyNixcbiAgRE9OQVRJT05TID0gMjcsXG4gIFBTSSA9IDMwLFxuICBCT05VU0VTID0gMzQsXG4gIE9USEVSX0RFRFVDVElPTlMgPSAzNyxcbiAgRVRQID0gMzksXG4gIElOVEVSRVNUX0RFRFVDVElPTlMgPSA0NyxcbiAgRElWSURFTkRfREVEVUNUSU9OUyA9IDQ4LFxufVxuIl19
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { AbstractForm } from '../../abstract.form';
|
|
2
2
|
import { FormControl, Validators } from '@angular/forms';
|
|
3
|
+
import { conditionalValidator } from '../../../validators';
|
|
3
4
|
export class MyTaxDeductionsForm extends AbstractForm {
|
|
4
5
|
constructor(deductions) {
|
|
5
6
|
var _a;
|
|
@@ -16,12 +17,12 @@ export class MyTaxDeductionsForm extends AbstractForm {
|
|
|
16
17
|
value: deductions.workRelatedTravelExpensesTotalAmount,
|
|
17
18
|
disabled: true
|
|
18
19
|
}),
|
|
19
|
-
workRelatedClothingType: new FormControl(deductions.workRelatedClothingType, Validators.required),
|
|
20
|
+
workRelatedClothingType: new FormControl(deductions.workRelatedClothingType, conditionalValidator(() => !!deductions.workRelatedClothingTotalAmount, Validators.required)),
|
|
20
21
|
workRelatedClothingTotalAmount: new FormControl({
|
|
21
22
|
value: deductions.workRelatedClothingTotalAmount,
|
|
22
23
|
disabled: true
|
|
23
24
|
}),
|
|
24
|
-
workRelatedSelfEducationType: new FormControl(deductions.workRelatedSelfEducationType, Validators.required),
|
|
25
|
+
workRelatedSelfEducationType: new FormControl(deductions.workRelatedSelfEducationType, conditionalValidator(() => !!deductions.workRelatedSelfEducationTotalAmount, Validators.required)),
|
|
25
26
|
workRelatedSelfEducationTotalAmount: new FormControl({
|
|
26
27
|
value: deductions.workRelatedSelfEducationTotalAmount,
|
|
27
28
|
disabled: true
|
|
@@ -58,6 +59,11 @@ export class MyTaxDeductionsForm extends AbstractForm {
|
|
|
58
59
|
value: deductions.otherManagingCostsTotalAmount,
|
|
59
60
|
disabled: true
|
|
60
61
|
}),
|
|
62
|
+
fundName: new FormControl(''),
|
|
63
|
+
hasFund: new FormControl(false),
|
|
64
|
+
fundABN: new FormControl(''),
|
|
65
|
+
fundTFN: new FormControl(''),
|
|
66
|
+
fundAccountNumber: new FormControl(''),
|
|
61
67
|
personalSuperContributionsTotalAmount: new FormControl({
|
|
62
68
|
value: deductions.personalSuperContributionsTotalAmount,
|
|
63
69
|
disabled: true
|
|
@@ -73,4 +79,4 @@ export class MyTaxDeductionsForm extends AbstractForm {
|
|
|
73
79
|
});
|
|
74
80
|
}
|
|
75
81
|
}
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"my-tax-deductions.form.js","sourceRoot":"","sources":["../../../../../../../projects/tt-core/src/lib/forms/report/my-tax/my-tax-deductions.form.ts"],"names":[],"mappings":"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","sourcesContent":["import { AbstractForm } from '../../abstract.form';\nimport { FormControl, Validators } from '@angular/forms';\nimport { MyTaxDeductions } from '../../../models/report/my-tax';\nimport { conditionalValidator } from '../../../validators';\n\nexport class MyTaxDeductionsForm extends AbstractForm<MyTaxDeductions> {\n  constructor(\n    deductions: MyTaxDeductions,\n  ) {\n    super({\n      vehicleClaimMethod: new FormControl({\n        value: deductions.vehicleClaim?.method,\n        disabled: true\n      }),\n      vehicleExpensesTotalAmount: new FormControl({\n        value: deductions.vehicleExpensesTotalAmount,\n        disabled: true\n      }),\n      workRelatedTravelExpensesTotalAmount: new FormControl({\n        value: deductions.workRelatedTravelExpensesTotalAmount,\n        disabled: true\n      }),\n      workRelatedClothingType: new FormControl(\n        deductions.workRelatedClothingType,\n        conditionalValidator(\n          (): boolean => !!deductions.workRelatedClothingTotalAmount,\n          Validators.required\n        )\n      ),\n      workRelatedClothingTotalAmount: new FormControl({\n        value: deductions.workRelatedClothingTotalAmount,\n        disabled: true\n      }),\n      workRelatedSelfEducationType: new FormControl(\n        deductions.workRelatedSelfEducationType,\n        conditionalValidator(\n          (): boolean => !!deductions.workRelatedSelfEducationTotalAmount,\n          Validators.required\n        )\n      ),\n      workRelatedSelfEducationTotalAmount: new FormControl({\n        value: deductions.workRelatedSelfEducationTotalAmount,\n        disabled: true\n      }),\n      otherWorkRelatedSelfEducationTotalAmount: new FormControl({\n        value: deductions.otherWorkRelatedExpensesTotalAmount,\n        disabled: true\n      }),\n      lowValuePoolDeductionTotalAmount: new FormControl({\n        value: deductions.lowValuePoolDeductionTotalAmount,\n        disabled: true\n      }),\n      interestExpensesTotalAmount: new FormControl({\n        value: deductions.interestExpensesTotalAmount,\n        disabled: true\n      }),\n      dividendExpensesTotalAmount: new FormControl({\n        value: deductions.dividendExpensesTotalAmount,\n        disabled: true\n      }),\n      donationsTotalAmount: new FormControl({\n        value: deductions.donationsTotalAmount,\n        disabled: true\n      }),\n      interestsChargedByATOTotalAmount: new FormControl({\n        value: deductions.interestsChargedByATOTotalAmount,\n        disabled: true\n      }),\n      litigationCostsTotalAmount: new FormControl({\n        value: deductions.litigationCostsTotalAmount,\n        disabled: true\n      }),\n      otherManagingCostsTotalAmount: new FormControl({\n        value: deductions.otherManagingCostsTotalAmount,\n        disabled: true\n      }),\n      fundName: new FormControl(''),\n      hasFund: new FormControl(false),\n      fundABN: new FormControl(''),\n      fundTFN: new FormControl(''),\n      fundAccountNumber: new FormControl(''),\n      personalSuperContributionsTotalAmount: new FormControl({\n        value: deductions.personalSuperContributionsTotalAmount,\n        disabled: true\n      }),\n      forestryManagedInvestmentSchemesDeductionsTotalAmount: new FormControl({\n        value: deductions.forestryManagedInvestmentSchemesDeductionsTotalAmount,\n        disabled: true\n      }),\n      otherDeductionsTotalAmount: new FormControl({\n        value: deductions.otherDeductionsTotalAmount,\n        disabled: true\n      })\n    });\n  }\n}\n"]}
|
|
@@ -16,7 +16,14 @@ export const DEDUCTION_CATEGORIES = {
|
|
|
16
16
|
ChartAccountsHeadingListEnum.OTHER_WORK_RELATED_EXPENSES,
|
|
17
17
|
ChartAccountsHeadingListEnum.SUBSCRIPTIONS,
|
|
18
18
|
ChartAccountsHeadingListEnum.HOME_OFFICE_RUNNING,
|
|
19
|
-
ChartAccountsHeadingListEnum.HOME_OFFICE_OCCUPANCY
|
|
19
|
+
ChartAccountsHeadingListEnum.HOME_OFFICE_OCCUPANCY,
|
|
20
|
+
ChartAccountsHeadingListEnum.AWARD_OVERTIME_MEAL_ALLOWANCE_EXPENSE,
|
|
21
|
+
ChartAccountsHeadingListEnum.NEWSPAPER,
|
|
22
|
+
ChartAccountsHeadingListEnum.PRINTING_POSTAGE_STATIONERY,
|
|
23
|
+
ChartAccountsHeadingListEnum.SEMINARS_ETC,
|
|
24
|
+
ChartAccountsHeadingListEnum.TELEPHONE,
|
|
25
|
+
ChartAccountsHeadingListEnum.UNION_FEES,
|
|
26
|
+
ChartAccountsHeadingListEnum.OTHER
|
|
20
27
|
],
|
|
21
28
|
workRelatedSelfEducationExpenses: [
|
|
22
29
|
ChartAccountsHeadingListEnum.SELF_EDUCATIONAL_EXPENSES
|
|
@@ -54,4 +61,4 @@ export const DEDUCTION_CATEGORIES = {
|
|
|
54
61
|
ChartAccountsListEnum.FORESTRY_MANAGED_INVESTMENT_SCHEMES_DEDUCTION
|
|
55
62
|
]
|
|
56
63
|
};
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
64
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVkdWN0aW9uLWZpZWxkcy5jb25zdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9tb2RlbHMvcmVwb3J0L215LXRheC9teS10YXgtZGVkdWN0aW9ucy9kZWR1Y3Rpb24tZmllbGRzLmNvbnN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxNQUFNLHVEQUF1RCxDQUFDO0FBQ3JHLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBRXRGOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBOEI7SUFDN0QsMkJBQTJCLEVBQUU7UUFDM0IsNEJBQTRCLENBQUMsdUJBQXVCO1FBQ3BELDRCQUE0QixDQUFDLG1CQUFtQjtRQUNoRCw0QkFBNEIsQ0FBQyw4QkFBOEI7UUFDM0QsNEJBQTRCLENBQUMseUJBQXlCO0tBQ3ZEO0lBQ0QsMEJBQTBCLEVBQUU7UUFDMUIsNEJBQTRCLENBQUMsMkJBQTJCO1FBQ3hELDRCQUE0QixDQUFDLGFBQWE7UUFDMUMsNEJBQTRCLENBQUMsbUJBQW1CO1FBQ2hELDRCQUE0QixDQUFDLHFCQUFxQjtRQUNsRCw0QkFBNEIsQ0FBQyxxQ0FBcUM7UUFDbEUsNEJBQTRCLENBQUMsU0FBUztRQUN0Qyw0QkFBNEIsQ0FBQywyQkFBMkI7UUFDeEQsNEJBQTRCLENBQUMsWUFBWTtRQUN6Qyw0QkFBNEIsQ0FBQyxTQUFTO1FBQ3RDLDRCQUE0QixDQUFDLFVBQVU7UUFDdkMsNEJBQTRCLENBQUMsS0FBSztLQUNuQztJQUNELGdDQUFnQyxFQUFFO1FBQ2hDLDRCQUE0QixDQUFDLHlCQUF5QjtLQUN2RDtJQUNELGdCQUFnQixFQUFFO1FBQ2hCLDRCQUE0QixDQUFDLG1CQUFtQjtLQUNqRDtJQUNELGdCQUFnQixFQUFFO1FBQ2hCLDRCQUE0QixDQUFDLG1CQUFtQjtLQUNqRDtJQUNELFNBQVMsRUFBRTtRQUNULDRCQUE0QixDQUFDLFNBQVM7S0FDdkM7SUFDRCxlQUFlLEVBQUU7UUFDZiw0QkFBNEIsQ0FBQyxnQkFBZ0I7S0FDOUM7SUFDRCxxQkFBcUIsRUFBRTtRQUNyQixxQkFBcUIsQ0FBQyx1QkFBdUI7S0FDOUM7SUFDRCxlQUFlLEVBQUU7UUFDZixxQkFBcUIsQ0FBQyxnQkFBZ0I7S0FDdkM7SUFDRCxrQkFBa0IsRUFBRTtRQUNsQixxQkFBcUIsQ0FBQyx5QkFBeUI7UUFDL0MscUJBQXFCLENBQUMsMkNBQTJDO1FBQ2pFLHFCQUFxQixDQUFDLHdCQUF3QjtRQUM5QyxxQkFBcUIsQ0FBQyxZQUFZO1FBQ2xDLHFCQUFxQixDQUFDLG9CQUFvQjtRQUMxQyxxQkFBcUIsQ0FBQyxxQkFBcUI7S0FDNUM7SUFDRCwwQkFBMEIsRUFBRTtRQUMxQixxQkFBcUIsQ0FBQyx1Q0FBdUM7S0FDOUQ7SUFDRCwwQ0FBMEMsRUFBRTtRQUMxQyxxQkFBcUIsQ0FBQyw2Q0FBNkM7S0FDcEU7Q0FDRixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ2hhcnRBY2NvdW50c0hlYWRpbmdMaXN0RW51bSB9IGZyb20gJy4uLy4uLy4uLy4uL2RiL0VudW1zL2NoYXJ0LWFjY291bnRzLWhlYWRpbmctbGlzdC5lbnVtJztcbmltcG9ydCB7IENoYXJ0QWNjb3VudHNMaXN0RW51bSB9IGZyb20gJy4uLy4uLy4uLy4uL2RiL0VudW1zL2NoYXJ0LWFjY291bnRzLWxpc3QuZW51bSc7XG5cbi8qKlxuICogQ29uc3Qgd2l0aCB0aGUgY2F0ZWdvcmllcyBmb3IgbXktdGF4ICdEZWR1Y3Rpb25zJyByZXBvcnQuXG4gKiBHcm91cGVkIGJ5IENoYXJ0QWNjb3VudHNIZWFkaW5nTGlzdEVudW0gLyBDaGFydEFjY291bnRzTGlzdEVudW0gYmFzZWQgb24gcnVsZXMgZnJvbSBkb2N1bWVudGF0aW9uXG4gKiBodHRwczovL3RheHRhbmsuYXRsYXNzaWFuLm5ldC93aWtpL3NwYWNlcy9UQVhUQU5LL3BhZ2VzLzQ2NDQxMTA0NjYvVGF4K1JldHVybitNeVRheCstK09ubGluZStGb3JtIChzZWN0aW9uIFwiRGVkdWN0aW9uXCIpXG4gKi9cbmV4cG9ydCBjb25zdCBERURVQ1RJT05fQ0FURUdPUklFUzoge1trZXk6IHN0cmluZ106IG51bWJlcltdfSA9IHtcbiAgd29ya1JlbGF0ZWRDbG90aGluZ0V4cGVuc2VzOiBbXG4gICAgQ2hhcnRBY2NvdW50c0hlYWRpbmdMaXN0RW51bS5DT01QVUxTT1JZX1dPUktfVU5JRk9STSxcbiAgICBDaGFydEFjY291bnRzSGVhZGluZ0xpc3RFbnVtLlBST1RFQ1RJT05fQ0xPVEhJTkcsXG4gICAgQ2hhcnRBY2NvdW50c0hlYWRpbmdMaXN0RW51bS5PQ0NVUEFUSU9OQUxfU1BFQ0lGSUNfQ0xPVEhJTkcsXG4gICAgQ2hhcnRBY2NvdW50c0hlYWRpbmdMaXN0RW51bS5TRUxGX0VEVUNBVElPTkFMX0VYUEVOU0VTXG4gIF0sXG4gIG90aGVySW5jb21lUmVsYXRlZEV4cGVuc2VzOiBbXG4gICAgQ2hhcnRBY2NvdW50c0hlYWRpbmdMaXN0RW51bS5PVEhFUl9XT1JLX1JFTEFURURfRVhQRU5TRVMsXG4gICAgQ2hhcnRBY2NvdW50c0hlYWRpbmdMaXN0RW51bS5TVUJTQ1JJUFRJT05TLFxuICAgIENoYXJ0QWNjb3VudHNIZWFkaW5nTGlzdEVudW0uSE9NRV9PRkZJQ0VfUlVOTklORyxcbiAgICBDaGFydEFjY291bnRzSGVhZGluZ0xpc3RFbnVtLkhPTUVfT0ZGSUNFX09DQ1VQQU5DWSxcbiAgICBDaGFydEFjY291bnRzSGVhZGluZ0xpc3RFbnVtLkFXQVJEX09WRVJUSU1FX01FQUxfQUxMT1dBTkNFX0VYUEVOU0UsXG4gICAgQ2hhcnRBY2NvdW50c0hlYWRpbmdMaXN0RW51bS5ORVdTUEFQRVIsXG4gICAgQ2hhcnRBY2NvdW50c0hlYWRpbmdMaXN0RW51bS5QUklOVElOR19QT1NUQUdFX1NUQVRJT05FUlksXG4gICAgQ2hhcnRBY2NvdW50c0hlYWRpbmdMaXN0RW51bS5TRU1JTkFSU19FVEMsXG4gICAgQ2hhcnRBY2NvdW50c0hlYWRpbmdMaXN0RW51bS5URUxFUEhPTkUsXG4gICAgQ2hhcnRBY2NvdW50c0hlYWRpbmdMaXN0RW51bS5VTklPTl9GRUVTLFxuICAgIENoYXJ0QWNjb3VudHNIZWFkaW5nTGlzdEVudW0uT1RIRVJcbiAgXSxcbiAgd29ya1JlbGF0ZWRTZWxmRWR1Y2F0aW9uRXhwZW5zZXM6IFtcbiAgICBDaGFydEFjY291bnRzSGVhZGluZ0xpc3RFbnVtLlNFTEZfRURVQ0FUSU9OQUxfRVhQRU5TRVNcbiAgXSxcbiAgaW50ZXJlc3RFeHBlbnNlczogW1xuICAgIENoYXJ0QWNjb3VudHNIZWFkaW5nTGlzdEVudW0uSU5URVJFU1RfREVEVUNUSU9OU1xuICBdLFxuICBkaXZpZGVuZEV4cGVuc2VzOiBbXG4gICAgQ2hhcnRBY2NvdW50c0hlYWRpbmdMaXN0RW51bS5ESVZJREVORF9ERURVQ1RJT05TXG4gIF0sXG4gIGRvbmF0aW9uczogW1xuICAgIENoYXJ0QWNjb3VudHNIZWFkaW5nTGlzdEVudW0uRE9OQVRJT05TXG4gIF0sXG4gIG90aGVyRGVkdWN0aW9uczogW1xuICAgIENoYXJ0QWNjb3VudHNIZWFkaW5nTGlzdEVudW0uT1RIRVJfREVEVUNUSU9OU1xuICBdLFxuICBpbnRlcmVzdHNDaGFyZ2VkQnlBVE86IFtcbiAgICBDaGFydEFjY291bnRzTGlzdEVudW0uSU5URVJFU1RfQ0hBUkdFRF9CWV9BVE9cbiAgXSxcbiAgbGl0aWdhdGlvbkNvc3RzOiBbXG4gICAgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLkxJVElHQVRJT05fQ09TVFNcbiAgXSxcbiAgb3RoZXJNYW5hZ2luZ0Nvc3RzOiBbXG4gICAgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLkFDQ09VTlRBTlRfVEFYX0FHRU5UX0ZFRVMsXG4gICAgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLlRSQVZFTF9DT1NUU19UT19TRUVfWU9VUl9BQ0NPVU5UQU5UX0FEVklTT1IsXG4gICAgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLkFDQ09VTlRJTkdfU09GVFdBUkVfRkVFUyxcbiAgICBDaGFydEFjY291bnRzTGlzdEVudW0uQURWSVNPUl9GRUVTLFxuICAgIENoYXJ0QWNjb3VudHNMaXN0RW51bS5JTkNPTUVfVEFYX1ZBUklBVElPTixcbiAgICBDaGFydEFjY291bnRzTGlzdEVudW0uU09GVFdBUkVfRkVFU19UQVhUQU5LXG4gIF0sXG4gIHBlcnNvbmFsU3VwZXJDb250cmlidXRpb25zOiBbXG4gICAgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLlBFUlNPTkFMX1NVUEVSX0NPTlRSSUJVVElPTlNfREVEVUNUSUJMRVxuICBdLFxuICBmb3Jlc3RyeU1hbmFnZWRJbnZlc3RtZW50U2NoZW1lc0RlZHVjdGlvbnM6IFtcbiAgICBDaGFydEFjY291bnRzTGlzdEVudW0uRk9SRVNUUllfTUFOQUdFRF9JTlZFU1RNRU5UX1NDSEVNRVNfREVEVUNUSU9OXG4gIF1cbn07XG4iXX0=
|
|
@@ -18,45 +18,45 @@ export class MyTaxDeductions {
|
|
|
18
18
|
this.workRelatedClothingExpenses = this.transactions
|
|
19
19
|
.filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.workRelatedClothingExpenses);
|
|
20
20
|
this.personalSuperContributions = this.transactions
|
|
21
|
-
.filterBy('chartAccounts.
|
|
21
|
+
.filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.personalSuperContributions);
|
|
22
22
|
this.workRelatedSelfEducationExpenses = this.transactions
|
|
23
23
|
.filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.workRelatedSelfEducationExpenses);
|
|
24
24
|
this.vehicleExpensesTotalAmount = this.getVehicleExpensesTotalAmount();
|
|
25
25
|
this.workRelatedTravelExpensesTotalAmount = this.transactions
|
|
26
26
|
.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.WORK_RELATED_TRAVEL_EXPENSES)
|
|
27
|
-
.sumBy('
|
|
27
|
+
.sumBy('claimAmount');
|
|
28
28
|
this.workRelatedClothingType = this.workRelatedClothingExpenses.length ? DeductionClothingTypeEnum.COMPULSORY_C : null;
|
|
29
|
-
this.workRelatedClothingTotalAmount = this.workRelatedClothingExpenses.sumBy('
|
|
29
|
+
this.workRelatedClothingTotalAmount = this.workRelatedClothingExpenses.sumBy('claimAmount');
|
|
30
30
|
this.workRelatedSelfEducationType = this.workRelatedSelfEducationExpenses.length ?
|
|
31
31
|
DeductionSelfEducationTypeEnum.IMPROVE_SKILLS_FOR_CURRENT_EARNINGS_K : null;
|
|
32
|
-
this.workRelatedSelfEducationTotalAmount = this.workRelatedSelfEducationExpenses.sumBy('
|
|
32
|
+
this.workRelatedSelfEducationTotalAmount = this.workRelatedSelfEducationExpenses.sumBy('claimAmount');
|
|
33
33
|
this.lowValuePoolDeductionTotalAmount = this.depreciations.getByTankType(TankTypeEnum.WORK)
|
|
34
34
|
.getLowValuePoolDepreciations().sumBy('claimAmount');
|
|
35
35
|
this.interestExpensesTotalAmount = this.transactions
|
|
36
36
|
.filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.interestExpenses)
|
|
37
|
-
.sumBy('
|
|
37
|
+
.sumBy('claimAmount');
|
|
38
38
|
this.dividendExpensesTotalAmount = this.transactions
|
|
39
39
|
.filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.dividendExpenses)
|
|
40
|
-
.sumBy('
|
|
40
|
+
.sumBy('claimAmount');
|
|
41
41
|
this.donationsTotalAmount = this.transactions
|
|
42
42
|
.filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.donations)
|
|
43
|
-
.sumBy('
|
|
43
|
+
.sumBy('claimAmount');
|
|
44
44
|
this.interestsChargedByATOTotalAmount = this.transactions
|
|
45
45
|
.filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.interestsChargedByATO)
|
|
46
|
-
.sumBy('
|
|
46
|
+
.sumBy('claimAmount');
|
|
47
47
|
this.litigationCostsTotalAmount = this.transactions
|
|
48
48
|
.filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.litigationCosts)
|
|
49
|
-
.sumBy('
|
|
49
|
+
.sumBy('claimAmount');
|
|
50
50
|
this.otherManagingCostsTotalAmount = this.transactions
|
|
51
51
|
.filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.otherManagingCosts)
|
|
52
|
-
.sumBy('
|
|
53
|
-
this.personalSuperContributionsTotalAmount = this.personalSuperContributions.sumBy('
|
|
52
|
+
.sumBy('claimAmount');
|
|
53
|
+
this.personalSuperContributionsTotalAmount = this.personalSuperContributions.sumBy('claimAmount');
|
|
54
54
|
this.forestryManagedInvestmentSchemesDeductionsTotalAmount = this.transactions
|
|
55
55
|
.filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.forestryManagedInvestmentSchemesDeductions)
|
|
56
|
-
.sumBy('
|
|
56
|
+
.sumBy('claimAmount');
|
|
57
57
|
this.otherDeductionsTotalAmount = this.transactions
|
|
58
58
|
.filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.otherDeductions)
|
|
59
|
-
.sumBy('
|
|
59
|
+
.sumBy('claimAmount');
|
|
60
60
|
}
|
|
61
61
|
getVehicleExpensesTotalAmount() {
|
|
62
62
|
var _a;
|
|
@@ -67,7 +67,7 @@ export class MyTaxDeductions {
|
|
|
67
67
|
}
|
|
68
68
|
setVehicleClaimData() {
|
|
69
69
|
this.klmsMethodClaimAmount = this.vehicleClaim.getKLMsClaimAmount(this.vehicleClaimRate);
|
|
70
|
-
this.totalExpensesAmount = new VehicleExpenseCollection(this.transactions.getByTankType(this.vehicleClaim.tankType), this.depreciations.getByTankType(this.vehicleClaim.tankType), this.vehicleClaim).sumBy('
|
|
70
|
+
this.totalExpensesAmount = new VehicleExpenseCollection(this.transactions.getByTankType(this.vehicleClaim.tankType), this.depreciations.getByTankType(this.vehicleClaim.tankType), this.vehicleClaim).sumBy('claimAmount');
|
|
71
71
|
}
|
|
72
72
|
/**
|
|
73
73
|
* Total amount from Other work related expenses and Tools & equipment depreciations
|
|
@@ -75,8 +75,8 @@ export class MyTaxDeductions {
|
|
|
75
75
|
setOtherWorkRelatedExpensesTotalAmount() {
|
|
76
76
|
const otherIncomeRelatedExpenses = this.transactions
|
|
77
77
|
.filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherIncomeRelatedExpenses);
|
|
78
|
-
this.otherWorkRelatedExpensesTotalAmount = Math.abs(otherIncomeRelatedExpenses.sumBy('
|
|
78
|
+
this.otherWorkRelatedExpensesTotalAmount = Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) +
|
|
79
79
|
this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"my-tax-deductions.js","sourceRoot":"","sources":["../../../../../../../../projects/tt-core/src/lib/models/report/my-tax/my-tax-deductions/my-tax-deductions.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,uDAAuD,CAAC;AACrG,OAAO,EAAE,wBAAwB,EAAE,MAAM,2EAA2E,CAAC;AACrH,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AACtF,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,MAAM,OAAO,eAAe;IA4B1B,YACE,YAAmC,EACnC,aAAqC,EACrC,YAA0B,EAC1B,gBAAwB;QAExB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QAEzC,0CAA0C;QAC1C,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,IAAI,CAAC,mBAAmB,EAAE,CAAC;SAC5B;QAED,IAAI,CAAC,sCAAsC,EAAE,CAAC;QAE9C,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC,YAAY;aACjD,QAAQ,CAAC,0BAA0B,EAAE,oBAAoB,CAAC,2BAA2B,CAAC,CAAC;QAC1F,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC,YAAY;aAChD,QAAQ,CAAC,0BAA0B,EAAE,oBAAoB,CAAC,0BAA0B,CAAC,CAAC;QACzF,IAAI,CAAC,gCAAgC,GAAG,IAAI,CAAC,YAAY;aACtD,QAAQ,CAAC,0BAA0B,EAAE,oBAAoB,CAAC,gCAAgC,CAAC,CAAC;QAC/F,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;QACvE,IAAI,CAAC,oCAAoC,GAAG,IAAI,CAAC,YAAY;aAC1D,QAAQ,CAAC,0BAA0B,EAAE,4BAA4B,CAAC,4BAA4B,CAAC;aAC/F,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnB,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC,CAAC,yBAAyB,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC;QACvH,IAAI,CAAC,8BAA8B,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACvF,IAAI,CAAC,4BAA4B,GAAG,IAAI,CAAC,gCAAgC,CAAC,MAAM,CAAC,CAAC;YAChF,8BAA8B,CAAC,qCAAqC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9E,IAAI,CAAC,mCAAmC,GAAG,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACjG,IAAI,CAAC,gCAAgC,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC;aACxF,4BAA4B,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACvD,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC,YAAY;aACjD,QAAQ,CAAC,0BAA0B,EAAE,oBAAoB,CAAC,gBAAgB,CAAC;aAC3E,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnB,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC,YAAY;aACjD,QAAQ,CAAC,0BAA0B,EAAE,oBAAoB,CAAC,gBAAgB,CAAC;aAC3E,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnB,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,YAAY;aAC1C,QAAQ,CAAC,0BAA0B,EAAE,oBAAoB,CAAC,SAAS,CAAC;aACpE,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnB,IAAI,CAAC,gCAAgC,GAAG,IAAI,CAAC,YAAY;aACtD,QAAQ,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,qBAAqB,CAAC;aACxE,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnB,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC,YAAY;aAChD,QAAQ,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,eAAe,CAAC;aAClE,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnB,IAAI,CAAC,6BAA6B,GAAG,IAAI,CAAC,YAAY;aACnD,QAAQ,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,kBAAkB,CAAC;aACrE,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnB,IAAI,CAAC,qCAAqC,GAAG,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7F,IAAI,CAAC,qDAAqD,GAAG,IAAI,CAAC,YAAY;aAC3E,QAAQ,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,0CAA0C,CAAC;aAC7F,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnB,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC,YAAY;aAChD,QAAQ,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,eAAe,CAAC;aAClE,KAAK,CAAC,QAAQ,CAAC,CAAC;IACrB,CAAC;IAEO,6BAA6B;;QACnC,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,OAAO,CAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,eAAe,EAAE,EAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC;SACrG;QAED,OAAO,CAAC,CAAC;IACX,CAAC;IAEO,mBAAmB;QACzB,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAEzF,IAAI,CAAC,mBAAmB,GAAG,IAAI,wBAAwB,CACrD,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAC3D,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAC5D,IAAI,CAAC,YAAY,CAClB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC;IAED;;OAEG;IACK,sCAAsC;QAC5C,MAAM,0BAA0B,GAA0B,IAAI,CAAC,YAAY;aACxE,QAAQ,CAAC,0BAA0B,EAAE,oBAAoB,CAAC,0BAA0B,CAAC,CAAC;QAEzF,IAAI,CAAC,mCAAmC,GAAG,IAAI,CAAC,GAAG,CAAC,0BAA0B,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC7F,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,0BAA0B,EAAE,4BAA4B,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAC/H,CAAC;CACF","sourcesContent":["import { TransactionCollection } from '../../../../collections/transaction/transaction.collection';\nimport { DepreciationCollection } from '../../../../collections/depreciation.collection';\nimport { VehicleClaim } from '../../../logbook/vehicle-claim';\nimport { DEDUCTION_CATEGORIES } from './deduction-fields.const';\nimport { ChartAccountsHeadingListEnum } from '../../../../db/Enums/chart-accounts-heading-list.enum';\nimport { VehicleExpenseCollection } from '../../../../collections/report/vehicle-expense/vehicle-expense.collection';\nimport { DeductionClothingTypeEnum } from './deduction-clothing-type.enum';\nimport { DeductionSelfEducationTypeEnum } from './deduction-self-education-type.enum';\nimport { TankTypeEnum } from '../../../../db/Enums/tank-type.enum';\n\nexport class MyTaxDeductions {\n  transactions: TransactionCollection;\n  depreciations: DepreciationCollection;\n  vehicleClaim: VehicleClaim;\n  vehicleClaimRate: number;\n  workRelatedClothingExpenses: TransactionCollection;\n  workRelatedSelfEducationExpenses: TransactionCollection;\n  personalSuperContributions: TransactionCollection;\n  otherWorkRelatedExpensesTotalAmount: number;\n  klmsMethodClaimAmount: number;\n  totalExpensesAmount: number;\n  vehicleExpensesTotalAmount: number;\n  workRelatedTravelExpensesTotalAmount: number;\n  workRelatedClothingType: DeductionClothingTypeEnum;\n  workRelatedClothingTotalAmount: number;\n  workRelatedSelfEducationType: DeductionSelfEducationTypeEnum;\n  workRelatedSelfEducationTotalAmount: number;\n  lowValuePoolDeductionTotalAmount: number;\n  interestExpensesTotalAmount: number;\n  dividendExpensesTotalAmount: number;\n  donationsTotalAmount: number;\n  interestsChargedByATOTotalAmount: number;\n  litigationCostsTotalAmount: number;\n  otherManagingCostsTotalAmount: number;\n  personalSuperContributionsTotalAmount: number;\n  forestryManagedInvestmentSchemesDeductionsTotalAmount: number;\n  otherDeductionsTotalAmount: number;\n\n  constructor(\n    transactions: TransactionCollection,\n    depreciations: DepreciationCollection,\n    vehicleClaim: VehicleClaim,\n    vehicleClaimRate: number\n  ) {\n    this.transactions = transactions;\n    this.depreciations = depreciations;\n    this.vehicleClaim = vehicleClaim;\n    this.vehicleClaimRate = vehicleClaimRate;\n\n    // user can have no selected vehicle claim\n    if (this.vehicleClaim) {\n      this.setVehicleClaimData();\n    }\n\n    this.setOtherWorkRelatedExpensesTotalAmount();\n\n    this.workRelatedClothingExpenses = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.workRelatedClothingExpenses);\n    this.personalSuperContributions = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.personalSuperContributions);\n    this.workRelatedSelfEducationExpenses = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.workRelatedSelfEducationExpenses);\n    this.vehicleExpensesTotalAmount = this.getVehicleExpensesTotalAmount();\n    this.workRelatedTravelExpensesTotalAmount = this.transactions\n      .filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.WORK_RELATED_TRAVEL_EXPENSES)\n      .sumBy('amount');\n    this.workRelatedClothingType = this.workRelatedClothingExpenses.length ? DeductionClothingTypeEnum.COMPULSORY_C : null;\n    this.workRelatedClothingTotalAmount = this.workRelatedClothingExpenses.sumBy('amount');\n    this.workRelatedSelfEducationType = this.workRelatedSelfEducationExpenses.length ?\n      DeductionSelfEducationTypeEnum.IMPROVE_SKILLS_FOR_CURRENT_EARNINGS_K : null;\n    this.workRelatedSelfEducationTotalAmount = this.workRelatedSelfEducationExpenses.sumBy('amount');\n    this.lowValuePoolDeductionTotalAmount = this.depreciations.getByTankType(TankTypeEnum.WORK)\n      .getLowValuePoolDepreciations().sumBy('claimAmount');\n    this.interestExpensesTotalAmount = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.interestExpenses)\n      .sumBy('amount');\n    this.dividendExpensesTotalAmount = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.dividendExpenses)\n      .sumBy('amount');\n    this.donationsTotalAmount = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.donations)\n      .sumBy('amount');\n    this.interestsChargedByATOTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.interestsChargedByATO)\n      .sumBy('amount');\n    this.litigationCostsTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.litigationCosts)\n      .sumBy('amount');\n    this.otherManagingCostsTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.otherManagingCosts)\n      .sumBy('amount');\n    this.personalSuperContributionsTotalAmount = this.personalSuperContributions.sumBy('amount');\n    this.forestryManagedInvestmentSchemesDeductionsTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.forestryManagedInvestmentSchemesDeductions)\n      .sumBy('amount');\n    this.otherDeductionsTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.otherDeductions)\n      .sumBy('amount');\n  }\n\n  private getVehicleExpensesTotalAmount(): number {\n    if (this.vehicleClaim) {\n      return this.vehicleClaim?.isLogbookMethod() ? this.totalExpensesAmount : this.klmsMethodClaimAmount;\n    }\n\n    return 0;\n  }\n\n  private setVehicleClaimData(): void {\n    this.klmsMethodClaimAmount = this.vehicleClaim.getKLMsClaimAmount(this.vehicleClaimRate);\n\n    this.totalExpensesAmount = new VehicleExpenseCollection(\n      this.transactions.getByTankType(this.vehicleClaim.tankType),\n      this.depreciations.getByTankType(this.vehicleClaim.tankType),\n      this.vehicleClaim\n    ).sumBy('amount');\n  }\n\n  /**\n   * Total amount from Other work related expenses and Tools & equipment depreciations\n   */\n  private setOtherWorkRelatedExpensesTotalAmount(): void {\n    const otherIncomeRelatedExpenses: TransactionCollection = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherIncomeRelatedExpenses);\n\n    this.otherWorkRelatedExpensesTotalAmount = Math.abs(otherIncomeRelatedExpenses.sumBy('amount')) +\n      this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');\n  }\n}\n"]}
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"my-tax-deductions.js","sourceRoot":"","sources":["../../../../../../../../projects/tt-core/src/lib/models/report/my-tax/my-tax-deductions/my-tax-deductions.ts"],"names":[],"mappings":"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","sourcesContent":["import { TransactionCollection } from '../../../../collections/transaction/transaction.collection';\nimport { DepreciationCollection } from '../../../../collections/depreciation.collection';\nimport { VehicleClaim } from '../../../logbook/vehicle-claim';\nimport { DEDUCTION_CATEGORIES } from './deduction-fields.const';\nimport { ChartAccountsHeadingListEnum } from '../../../../db/Enums/chart-accounts-heading-list.enum';\nimport { VehicleExpenseCollection } from '../../../../collections/report/vehicle-expense/vehicle-expense.collection';\nimport { DeductionClothingTypeEnum } from './deduction-clothing-type.enum';\nimport { DeductionSelfEducationTypeEnum } from './deduction-self-education-type.enum';\nimport { TankTypeEnum } from '../../../../db/Enums/tank-type.enum';\n\nexport class MyTaxDeductions {\n  transactions: TransactionCollection;\n  depreciations: DepreciationCollection;\n  vehicleClaim: VehicleClaim;\n  vehicleClaimRate: number;\n  workRelatedClothingExpenses: TransactionCollection;\n  workRelatedSelfEducationExpenses: TransactionCollection;\n  personalSuperContributions: TransactionCollection;\n  otherWorkRelatedExpensesTotalAmount: number;\n  klmsMethodClaimAmount: number;\n  totalExpensesAmount: number;\n  vehicleExpensesTotalAmount: number;\n  workRelatedTravelExpensesTotalAmount: number;\n  workRelatedClothingType: DeductionClothingTypeEnum;\n  workRelatedClothingTotalAmount: number;\n  workRelatedSelfEducationType: DeductionSelfEducationTypeEnum;\n  workRelatedSelfEducationTotalAmount: number;\n  lowValuePoolDeductionTotalAmount: number;\n  interestExpensesTotalAmount: number;\n  dividendExpensesTotalAmount: number;\n  donationsTotalAmount: number;\n  interestsChargedByATOTotalAmount: number;\n  litigationCostsTotalAmount: number;\n  otherManagingCostsTotalAmount: number;\n  personalSuperContributionsTotalAmount: number;\n  forestryManagedInvestmentSchemesDeductionsTotalAmount: number;\n  otherDeductionsTotalAmount: number;\n\n  constructor(\n    transactions: TransactionCollection,\n    depreciations: DepreciationCollection,\n    vehicleClaim: VehicleClaim,\n    vehicleClaimRate: number\n  ) {\n    this.transactions = transactions;\n    this.depreciations = depreciations;\n    this.vehicleClaim = vehicleClaim;\n    this.vehicleClaimRate = vehicleClaimRate;\n\n    // user can have no selected vehicle claim\n    if (this.vehicleClaim) {\n      this.setVehicleClaimData();\n    }\n\n    this.setOtherWorkRelatedExpensesTotalAmount();\n\n    this.workRelatedClothingExpenses = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.workRelatedClothingExpenses);\n    this.personalSuperContributions = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.personalSuperContributions);\n    this.workRelatedSelfEducationExpenses = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.workRelatedSelfEducationExpenses);\n    this.vehicleExpensesTotalAmount = this.getVehicleExpensesTotalAmount();\n    this.workRelatedTravelExpensesTotalAmount = this.transactions\n      .filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.WORK_RELATED_TRAVEL_EXPENSES)\n      .sumBy('claimAmount');\n    this.workRelatedClothingType = this.workRelatedClothingExpenses.length ? DeductionClothingTypeEnum.COMPULSORY_C : null;\n    this.workRelatedClothingTotalAmount = this.workRelatedClothingExpenses.sumBy('claimAmount');\n    this.workRelatedSelfEducationType = this.workRelatedSelfEducationExpenses.length ?\n      DeductionSelfEducationTypeEnum.IMPROVE_SKILLS_FOR_CURRENT_EARNINGS_K : null;\n    this.workRelatedSelfEducationTotalAmount = this.workRelatedSelfEducationExpenses.sumBy('claimAmount');\n    this.lowValuePoolDeductionTotalAmount = this.depreciations.getByTankType(TankTypeEnum.WORK)\n      .getLowValuePoolDepreciations().sumBy('claimAmount');\n    this.interestExpensesTotalAmount = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.interestExpenses)\n      .sumBy('claimAmount');\n    this.dividendExpensesTotalAmount = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.dividendExpenses)\n      .sumBy('claimAmount');\n    this.donationsTotalAmount = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.donations)\n      .sumBy('claimAmount');\n    this.interestsChargedByATOTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.interestsChargedByATO)\n      .sumBy('claimAmount');\n    this.litigationCostsTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.litigationCosts)\n      .sumBy('claimAmount');\n    this.otherManagingCostsTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.otherManagingCosts)\n      .sumBy('claimAmount');\n    this.personalSuperContributionsTotalAmount = this.personalSuperContributions.sumBy('claimAmount');\n    this.forestryManagedInvestmentSchemesDeductionsTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.forestryManagedInvestmentSchemesDeductions)\n      .sumBy('claimAmount');\n    this.otherDeductionsTotalAmount = this.transactions\n      .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.otherDeductions)\n      .sumBy('claimAmount');\n  }\n\n  private getVehicleExpensesTotalAmount(): number {\n    if (this.vehicleClaim) {\n      return this.vehicleClaim?.isLogbookMethod() ? this.totalExpensesAmount : this.klmsMethodClaimAmount;\n    }\n\n    return 0;\n  }\n\n  private setVehicleClaimData(): void {\n    this.klmsMethodClaimAmount = this.vehicleClaim.getKLMsClaimAmount(this.vehicleClaimRate);\n\n    this.totalExpensesAmount = new VehicleExpenseCollection(\n      this.transactions.getByTankType(this.vehicleClaim.tankType),\n      this.depreciations.getByTankType(this.vehicleClaim.tankType),\n      this.vehicleClaim\n    ).sumBy('claimAmount');\n  }\n\n  /**\n   * Total amount from Other work related expenses and Tools & equipment depreciations\n   */\n  private setOtherWorkRelatedExpensesTotalAmount(): void {\n    const otherIncomeRelatedExpenses: TransactionCollection = this.transactions\n      .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherIncomeRelatedExpenses);\n\n    this.otherWorkRelatedExpensesTotalAmount = Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) +\n      this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');\n  }\n}\n"]}
|
|
@@ -11,8 +11,8 @@ export class MyTaxEstimate {
|
|
|
11
11
|
const taxOffsetsReportItem = summarySection.items.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.TAX_OFFSETS);
|
|
12
12
|
const lowMiddleIncomeTaxOffsets = this.getLowMiddleIncomeTaxOffsets(taxOffsetsReportItem);
|
|
13
13
|
const taxPayable = grossTaxPayableReportItem.items.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.TAX_ON_TAXABLE_INCOME).amount;
|
|
14
|
-
const medicareLevy = medicareReportItem.details.findBy('name', 'Medicare Levy
|
|
15
|
-
const medicareLevySurcharge = medicareReportItem.details.findBy('name', 'Medicare Levy
|
|
14
|
+
const medicareLevy = medicareReportItem.details.findBy('name', 'Medicare Levy (based on single)').amount;
|
|
15
|
+
const medicareLevySurcharge = medicareReportItem.details.findBy('name', 'Medicare Levy Surcharge').amount;
|
|
16
16
|
const taxCredits = summarySection.items.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.TAX_CREDITS).amount;
|
|
17
17
|
const taxOffsets = this.getTaxOffsets(taxOffsetsReportItem.amount, lowMiddleIncomeTaxOffsets);
|
|
18
18
|
return plainToClass(MyTaxEstimate, {
|
|
@@ -37,4 +37,4 @@ export class MyTaxEstimate {
|
|
|
37
37
|
return taxOffsetsReportItemAmount - lowMiddleIncomeTaxOffsets;
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LWVzdGltYXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL21vZGVscy9yZXBvcnQvbXktdGF4L215LXRheC1lc3RpbWF0ZS9teS10YXgtZXN0aW1hdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sb0RBQW9ELENBQUM7QUFHL0YsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBR2pEOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGFBQWE7SUFZeEIsTUFBTSxDQUFDLGNBQWMsQ0FBQyxVQUFzQjtRQUMxQyxNQUFNLGNBQWMsR0FBc0IsVUFBVSxDQUFDLE9BQU8sQ0FBQztRQUM3RCxNQUFNLHlCQUF5QixHQUFlLGNBQWMsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLHNCQUFzQixFQUFFLHlCQUF5QixDQUFDLGlCQUFpQixDQUFDLENBQUM7UUFDL0ksTUFBTSxrQkFBa0IsR0FBZSx5QkFBeUIsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLHNCQUFzQixFQUFFLHlCQUF5QixDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzFJLE1BQU0sb0JBQW9CLEdBQWUsY0FBYyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsc0JBQXNCLEVBQUUseUJBQXlCLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDcEksTUFBTSx5QkFBeUIsR0FBVyxJQUFJLENBQUMsNEJBQTRCLENBQUMsb0JBQW9CLENBQUMsQ0FBQztRQUNsRyxNQUFNLFVBQVUsR0FBVyx5QkFBeUIsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLHNCQUFzQixFQUFFLHlCQUF5QixDQUFDLHFCQUFxQixDQUFDLENBQUMsTUFBTSxDQUFDO1FBQ2xKLE1BQU0sWUFBWSxHQUFXLGtCQUFrQixDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLGlDQUFpQyxDQUFDLENBQUMsTUFBTSxDQUFDO1FBQ2pILE1BQU0scUJBQXFCLEdBQVcsa0JBQWtCLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxNQUFNLENBQUM7UUFDbEgsTUFBTSxVQUFVLEdBQVcsY0FBYyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsc0JBQXNCLEVBQUUseUJBQXlCLENBQUMsV0FBVyxDQUFDLENBQUMsTUFBTSxDQUFDO1FBQzdILE1BQU0sVUFBVSxHQUFXLElBQUksQ0FBQyxhQUFhLENBQUMsb0JBQW9CLENBQUMsTUFBTSxFQUFFLHlCQUF5QixDQUFDLENBQUM7UUFFdEcsT0FBTyxZQUFZLENBQUMsYUFBYSxFQUFFO1lBQ2pDLGFBQWEsRUFBRSxjQUFjLENBQUMsU0FBUztZQUN2QyxlQUFlLEVBQUUseUJBQXlCLENBQUMsTUFBTTtZQUNqRCx5QkFBeUI7WUFDekIsVUFBVTtZQUNWLFlBQVk7WUFDWixxQkFBcUI7WUFDckIsVUFBVTtZQUNWLFVBQVU7WUFDVixTQUFTLEVBQUUsVUFBVSxDQUFDLG9CQUFvQjtZQUMxQyxtQkFBbUIsRUFBRSxVQUFVLENBQUMsVUFBVTtTQUMzQyxDQUFDLENBQUE7SUFDSixDQUFDO0lBRUQsTUFBTSxDQUFDLDRCQUE0QixDQUFDLG9CQUFnQztRQUNsRSxNQUFNLGtCQUFrQixHQUFzQixvQkFBb0IsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSx1QkFBdUIsQ0FBQyxDQUFDO1FBQ25ILE1BQU0sd0JBQXdCLEdBQXNCLG9CQUFvQixDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLGtDQUFrQyxDQUFDLENBQUM7UUFFcEksT0FBTyxrQkFBa0IsQ0FBQyxNQUFNLEdBQUcsd0JBQXdCLENBQUMsTUFBTSxDQUFDO0lBQ3JFLENBQUM7SUFFRCxNQUFNLENBQUMsYUFBYSxDQUFDLDBCQUFrQyxFQUFFLHlCQUFpQztRQUN4RixPQUFPLDBCQUEwQixHQUFHLHlCQUF5QixDQUFBO0lBQy9ELENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFRheFN1bW1hcnlTZWN0aW9uIH0gZnJvbSAnLi4vLi4vLi4vdGF4LXN1bW1hcnkvdGF4LXN1bW1hcnktc2VjdGlvbic7XG5pbXBvcnQgeyBUYXhSZXR1cm5DYXRlZ29yeUxpc3RFbnVtIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvRW51bXMvdGF4LXJldHVybi1jYXRlZ29yeS1saXN0LmVudW0nO1xuaW1wb3J0IHsgUmVwb3J0SXRlbSB9IGZyb20gJy4uLy4uLy4uL3RheC1zdW1tYXJ5L3JlcG9ydC1pdGVtJztcbmltcG9ydCB7IFRheFN1bW1hcnkgfSBmcm9tICcuLi8uLi8uLi90YXgtc3VtbWFyeS90YXgtc3VtbWFyeSc7XG5pbXBvcnQgeyBwbGFpblRvQ2xhc3MgfSBmcm9tICdjbGFzcy10cmFuc2Zvcm1lcic7XG5pbXBvcnQgeyBSZXBvcnRJdGVtRGV0YWlscyB9IGZyb20gJy4uLy4uLy4uL3RheC1zdW1tYXJ5L3JlcG9ydC1pdGVtLWRldGFpbHMnO1xuXG4vKipcbiAqIEBUb2RvIGFkZCBsaW5rIHRvIGRvY3VtZW50YXRpb24gYWJvdXQgcmVsYXRlZCBmaWVsZHMsIGFkZCBjb21tZW50cyB0byBtZXRob2RzXG4gKi9cbmV4cG9ydCBjbGFzcyBNeVRheEVzdGltYXRlIHtcbiAgdGF4YWJsZUluY29tZTogbnVtYmVyO1xuICB0YXhQYXlhYmxlOiBudW1iZXI7XG4gIGdyb3NzVGF4UGF5YWJsZTogbnVtYmVyO1xuICBtZWRpY2FyZUxldnk6IG51bWJlcjtcbiAgbWVkaWNhcmVMZXZ5U3VyY2hhcmdlOiBudW1iZXI7XG4gIHRheENyZWRpdHM6IG51bWJlcjtcbiAgbG93TWlkZGxlSW5jb21lVGF4T2Zmc2V0czogbnVtYmVyO1xuICBwZXJjZW50YWdlT2ZUYXhQYWlkOiBudW1iZXI7XG4gIHRheE9mZnNldHM6IG51bWJlcjtcbiAgbmV0UmVmdW5kOiBudW1iZXI7XG5cbiAgc3RhdGljIGZyb21UYXhTdW1tYXJ5KHRheFN1bW1hcnk6IFRheFN1bW1hcnkpOiBNeVRheEVzdGltYXRlIHtcbiAgICBjb25zdCBzdW1tYXJ5U2VjdGlvbjogVGF4U3VtbWFyeVNlY3Rpb24gPSB0YXhTdW1tYXJ5LnN1bW1hcnk7XG4gICAgY29uc3QgZ3Jvc3NUYXhQYXlhYmxlUmVwb3J0SXRlbTogUmVwb3J0SXRlbSA9IHN1bW1hcnlTZWN0aW9uLml0ZW1zLmZpbmRCeSgndGF4UmV0dXJuQ2F0ZWdvcnkuaWQnLCBUYXhSZXR1cm5DYXRlZ29yeUxpc3RFbnVtLkdST1NTX1RBWF9QQVlBQkxFKTtcbiAgICBjb25zdCBtZWRpY2FyZVJlcG9ydEl0ZW06IFJlcG9ydEl0ZW0gPSBncm9zc1RheFBheWFibGVSZXBvcnRJdGVtLml0ZW1zLmZpbmRCeSgndGF4UmV0dXJuQ2F0ZWdvcnkuaWQnLCBUYXhSZXR1cm5DYXRlZ29yeUxpc3RFbnVtLk1FRElDQVJFKTtcbiAgICBjb25zdCB0YXhPZmZzZXRzUmVwb3J0SXRlbTogUmVwb3J0SXRlbSA9IHN1bW1hcnlTZWN0aW9uLml0ZW1zLmZpbmRCeSgndGF4UmV0dXJuQ2F0ZWdvcnkuaWQnLCBUYXhSZXR1cm5DYXRlZ29yeUxpc3RFbnVtLlRBWF9PRkZTRVRTKTtcbiAgICBjb25zdCBsb3dNaWRkbGVJbmNvbWVUYXhPZmZzZXRzOiBudW1iZXIgPSB0aGlzLmdldExvd01pZGRsZUluY29tZVRheE9mZnNldHModGF4T2Zmc2V0c1JlcG9ydEl0ZW0pO1xuICAgIGNvbnN0IHRheFBheWFibGU6IG51bWJlciA9IGdyb3NzVGF4UGF5YWJsZVJlcG9ydEl0ZW0uaXRlbXMuZmluZEJ5KCd0YXhSZXR1cm5DYXRlZ29yeS5pZCcsIFRheFJldHVybkNhdGVnb3J5TGlzdEVudW0uVEFYX09OX1RBWEFCTEVfSU5DT01FKS5hbW91bnQ7XG4gICAgY29uc3QgbWVkaWNhcmVMZXZ5OiBudW1iZXIgPSBtZWRpY2FyZVJlcG9ydEl0ZW0uZGV0YWlscy5maW5kQnkoJ25hbWUnLCAnTWVkaWNhcmUgTGV2eSAoYmFzZWQgb24gc2luZ2xlKScpLmFtb3VudDtcbiAgICBjb25zdCBtZWRpY2FyZUxldnlTdXJjaGFyZ2U6IG51bWJlciA9IG1lZGljYXJlUmVwb3J0SXRlbS5kZXRhaWxzLmZpbmRCeSgnbmFtZScsICdNZWRpY2FyZSBMZXZ5IFN1cmNoYXJnZScpLmFtb3VudDtcbiAgICBjb25zdCB0YXhDcmVkaXRzOiBudW1iZXIgPSBzdW1tYXJ5U2VjdGlvbi5pdGVtcy5maW5kQnkoJ3RheFJldHVybkNhdGVnb3J5LmlkJywgVGF4UmV0dXJuQ2F0ZWdvcnlMaXN0RW51bS5UQVhfQ1JFRElUUykuYW1vdW50O1xuICAgIGNvbnN0IHRheE9mZnNldHM6IG51bWJlciA9IHRoaXMuZ2V0VGF4T2Zmc2V0cyh0YXhPZmZzZXRzUmVwb3J0SXRlbS5hbW91bnQsIGxvd01pZGRsZUluY29tZVRheE9mZnNldHMpO1xuXG4gICAgcmV0dXJuIHBsYWluVG9DbGFzcyhNeVRheEVzdGltYXRlLCB7XG4gICAgICB0YXhhYmxlSW5jb21lOiBzdW1tYXJ5U2VjdGlvbi5uZXRBbW91bnQsXG4gICAgICBncm9zc1RheFBheWFibGU6IGdyb3NzVGF4UGF5YWJsZVJlcG9ydEl0ZW0uYW1vdW50LFxuICAgICAgbG93TWlkZGxlSW5jb21lVGF4T2Zmc2V0cyxcbiAgICAgIHRheFBheWFibGUsXG4gICAgICBtZWRpY2FyZUxldnksXG4gICAgICBtZWRpY2FyZUxldnlTdXJjaGFyZ2UsXG4gICAgICB0YXhDcmVkaXRzLFxuICAgICAgdGF4T2Zmc2V0cyxcbiAgICAgIG5ldFJlZnVuZDogdGF4U3VtbWFyeS5wcm9qZWN0ZWRUYXhQb3NpdGlvbixcbiAgICAgIHBlcmNlbnRhZ2VPZlRheFBhaWQ6IHRheFN1bW1hcnkudGF4UGVyY2VudFxuICAgIH0pXG4gIH1cblxuICBzdGF0aWMgZ2V0TG93TWlkZGxlSW5jb21lVGF4T2Zmc2V0cyh0YXhPZmZzZXRzUmVwb3J0SXRlbTogUmVwb3J0SXRlbSk6IG51bWJlciB7XG4gICAgY29uc3QgdGF4T2Zmc2V0TG93SW5jb21lOiBSZXBvcnRJdGVtRGV0YWlscyA9IHRheE9mZnNldHNSZXBvcnRJdGVtLmRldGFpbHMuZmluZEJ5KCduYW1lJywgJ1RheCBPZmZzZXQgTG93IEluY29tZScpO1xuICAgIGNvbnN0IHRheE9mZnNldExvd01pZGRsZUluY29tZTogUmVwb3J0SXRlbURldGFpbHMgPSB0YXhPZmZzZXRzUmVwb3J0SXRlbS5kZXRhaWxzLmZpbmRCeSgnbmFtZScsICdUYXggT2Zmc2V0IExvdyBhbmQgTWlkZGxlIEluY29tZScpO1xuXG4gICAgcmV0dXJuIHRheE9mZnNldExvd0luY29tZS5hbW91bnQgKyB0YXhPZmZzZXRMb3dNaWRkbGVJbmNvbWUuYW1vdW50O1xuICB9XG5cbiAgc3RhdGljIGdldFRheE9mZnNldHModGF4T2Zmc2V0c1JlcG9ydEl0ZW1BbW91bnQ6IG51bWJlciwgbG93TWlkZGxlSW5jb21lVGF4T2Zmc2V0czogbnVtYmVyKTogbnVtYmVyIHtcbiAgICByZXR1cm4gdGF4T2Zmc2V0c1JlcG9ydEl0ZW1BbW91bnQgLSBsb3dNaWRkbGVJbmNvbWVUYXhPZmZzZXRzXG4gIH1cbn1cbiJdfQ==
|
|
@@ -5,7 +5,7 @@ export class MyTaxInterest {
|
|
|
5
5
|
this.interestPaidTransactions = transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.ATO_INTEREST_PAID);
|
|
6
6
|
this.interestEarnedTotalAmount = this.interestEarnedTransactions.sumBy('amount');
|
|
7
7
|
this.interestEarnedTotalTax = this.interestEarnedTransactions.sumBy('tax');
|
|
8
|
-
this.interestPaidTotalAmount = this.
|
|
8
|
+
this.interestPaidTotalAmount = this.interestPaidTransactions.sumBy('amount');
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LWludGVyZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL21vZGVscy9yZXBvcnQvbXktdGF4L215LXRheC1pbnRlcmVzdC9teS10YXgtaW50ZXJlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sK0NBQStDLENBQUM7QUFFdEYsTUFBTSxPQUFPLGFBQWE7SUFPeEIsWUFDRSxZQUFtQztRQUVuQyxJQUFJLENBQUMsMEJBQTBCLEdBQUcsWUFBWSxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsRUFBRSxxQkFBcUIsQ0FBQyxlQUFlLENBQUMsQ0FBQztRQUNuSCxJQUFJLENBQUMsd0JBQXdCLEdBQUcsWUFBWSxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsRUFBRSxxQkFBcUIsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1FBQ25ILElBQUksQ0FBQyx5QkFBeUIsR0FBRyxJQUFJLENBQUMsMEJBQTBCLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ2pGLElBQUksQ0FBQyxzQkFBc0IsR0FBRyxJQUFJLENBQUMsMEJBQTBCLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzNFLElBQUksQ0FBQyx1QkFBdUIsR0FBRyxJQUFJLENBQUMsd0JBQXdCLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQy9FLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFRyYW5zYWN0aW9uQ29sbGVjdGlvbiB9IGZyb20gJy4uLy4uLy4uLy4uL2NvbGxlY3Rpb25zL3RyYW5zYWN0aW9uL3RyYW5zYWN0aW9uLmNvbGxlY3Rpb24nO1xuaW1wb3J0IHsgQ2hhcnRBY2NvdW50c0xpc3RFbnVtIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvRW51bXMvY2hhcnQtYWNjb3VudHMtbGlzdC5lbnVtJztcblxuZXhwb3J0IGNsYXNzIE15VGF4SW50ZXJlc3Qge1xuICBpbnRlcmVzdEVhcm5lZFRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uO1xuICBpbnRlcmVzdFBhaWRUcmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbjtcbiAgaW50ZXJlc3RFYXJuZWRUb3RhbEFtb3VudDogbnVtYmVyO1xuICBpbnRlcmVzdEVhcm5lZFRvdGFsVGF4OiBudW1iZXI7XG4gIGludGVyZXN0UGFpZFRvdGFsQW1vdW50OiBudW1iZXI7XG5cbiAgY29uc3RydWN0b3IoXG4gICAgdHJhbnNhY3Rpb25zOiBUcmFuc2FjdGlvbkNvbGxlY3Rpb24sXG4gICkge1xuICAgIHRoaXMuaW50ZXJlc3RFYXJuZWRUcmFuc2FjdGlvbnMgPSB0cmFuc2FjdGlvbnMuZmlsdGVyQnkoJ2NoYXJ0QWNjb3VudHMuaWQnLCBDaGFydEFjY291bnRzTGlzdEVudW0uSU5URVJFU1RfRUFSTkVEKTtcbiAgICB0aGlzLmludGVyZXN0UGFpZFRyYW5zYWN0aW9ucyA9IHRyYW5zYWN0aW9ucy5maWx0ZXJCeSgnY2hhcnRBY2NvdW50cy5pZCcsIENoYXJ0QWNjb3VudHNMaXN0RW51bS5BVE9fSU5URVJFU1RfUEFJRCk7XG4gICAgdGhpcy5pbnRlcmVzdEVhcm5lZFRvdGFsQW1vdW50ID0gdGhpcy5pbnRlcmVzdEVhcm5lZFRyYW5zYWN0aW9ucy5zdW1CeSgnYW1vdW50Jyk7XG4gICAgdGhpcy5pbnRlcmVzdEVhcm5lZFRvdGFsVGF4ID0gdGhpcy5pbnRlcmVzdEVhcm5lZFRyYW5zYWN0aW9ucy5zdW1CeSgndGF4Jyk7XG4gICAgdGhpcy5pbnRlcmVzdFBhaWRUb3RhbEFtb3VudCA9IHRoaXMuaW50ZXJlc3RQYWlkVHJhbnNhY3Rpb25zLnN1bUJ5KCdhbW91bnQnKTtcbiAgfVxufVxuIl19
|
|
@@ -1,24 +1,50 @@
|
|
|
1
1
|
import { ChartAccountsListEnum } from '../../../../db/Enums/chart-accounts-list.enum';
|
|
2
|
+
import { TaxReturnCategoryListEnum } from '../../../../db/Enums/tax-return-category-list.enum';
|
|
2
3
|
export class MyTaxRent {
|
|
3
|
-
constructor(transactions, depreciations) {
|
|
4
|
+
constructor(transactions, depreciations, taxSummary) {
|
|
4
5
|
this.propertyExpenses = transactions.getPropertyTransactions().getExpenseTransactions();
|
|
6
|
+
this.taxSummaryPropertySection = taxSummary.property;
|
|
5
7
|
this.grossRentAmount = transactions
|
|
8
|
+
.getPropertyTransactions()
|
|
6
9
|
.getIncomeTransactions()
|
|
7
10
|
.filterBy('chartAccounts.id', ChartAccountsListEnum.RENTAL_INCOME)
|
|
8
|
-
.sumBy('
|
|
9
|
-
transactions
|
|
10
|
-
|
|
11
|
+
.sumBy('claimAmount') +
|
|
12
|
+
transactions
|
|
13
|
+
.getPropertyTransactions()
|
|
14
|
+
.getIncomeTransactions()
|
|
11
15
|
.filterBy('chartAccounts.id', ChartAccountsListEnum.OTHER_RENTAL_INCOME)
|
|
12
|
-
.sumBy('
|
|
16
|
+
.sumBy('claimAmount');
|
|
13
17
|
this.interestDeductionsAmount = Math.abs(transactions.getInterestTransactions().sumBy('amount'));
|
|
14
18
|
this.capitalWorksDeductionsAmount = Math.abs(depreciations.getCapitalDepreciations().sumBy('claimAmount'));
|
|
15
|
-
this.otherRentalDeductionsAmount =
|
|
16
|
-
|
|
17
|
-
|
|
19
|
+
this.otherRentalDeductionsAmount = this.calculateOtherRentalDeductionsAmount();
|
|
20
|
+
/**
|
|
21
|
+
* @Todo Vik uncomment when task TT-2009 will be implemented
|
|
22
|
+
*/
|
|
23
|
+
// this.otherRentalDeductionsAmount = depreciations.getByTankType(TankTypeEnum.PROPERTY).getAssets().claimAmount +
|
|
24
|
+
// depreciations.getByTankType(TankTypeEnum.PROPERTY).getBorrowingExpenseDepreciations().claimAmount +
|
|
25
|
+
// Math.abs(this.propertyExpenses.sumBy('claimAmount'));
|
|
18
26
|
this.netRent = this.grossRentAmount -
|
|
19
27
|
this.interestDeductionsAmount -
|
|
20
28
|
this.capitalWorksDeductionsAmount -
|
|
21
29
|
this.otherRentalDeductionsAmount;
|
|
22
30
|
}
|
|
31
|
+
/**
|
|
32
|
+
* @Todo Vik remove when TT-2009 will be implemented.
|
|
33
|
+
* We use tax summary data here because claim amount from depreciation is different
|
|
34
|
+
* from the claim amount that we get from tax summary (depreciation claim amount is not affected by property share,
|
|
35
|
+
* property contract date, e.t.c.). Details in the TT-2009 task
|
|
36
|
+
*/
|
|
37
|
+
calculateOtherRentalDeductionsAmount() {
|
|
38
|
+
const plantAndEquipmentAmount = Math.abs(this.taxSummaryPropertySection.items
|
|
39
|
+
.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.DEPRECIATION)
|
|
40
|
+
.amount);
|
|
41
|
+
const borrowingExpensesAmount = Math.abs(this.taxSummaryPropertySection.items
|
|
42
|
+
.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.BORROWING_EXPENSES)
|
|
43
|
+
.amount);
|
|
44
|
+
const otherRentalDeductionsAmount = Math.abs(this.taxSummaryPropertySection.items
|
|
45
|
+
.findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.OTHER_RENTAL_DEDUCTIONS)
|
|
46
|
+
.amount);
|
|
47
|
+
return +Math.floor(plantAndEquipmentAmount + borrowingExpensesAmount + otherRentalDeductionsAmount).toFixed(2);
|
|
48
|
+
}
|
|
23
49
|
}
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LXJlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvbW9kZWxzL3JlcG9ydC9teS10YXgvbXktdGF4LXJlbnQvbXktdGF4LXJlbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sK0NBQStDLENBQUM7QUFLdEYsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sb0RBQW9ELENBQUM7QUFFL0YsTUFBTSxPQUFPLFNBQVM7SUFTcEIsWUFDRSxZQUFtQyxFQUNuQyxhQUFxQyxFQUNyQyxVQUFzQjtRQUV0QixJQUFJLENBQUMsZ0JBQWdCLEdBQUcsWUFBWSxDQUFDLHVCQUF1QixFQUFFLENBQUMsc0JBQXNCLEVBQUUsQ0FBQztRQUN4RixJQUFJLENBQUMseUJBQXlCLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQztRQUNyRCxJQUFJLENBQUMsZUFBZSxHQUFHLFlBQVk7YUFDOUIsdUJBQXVCLEVBQUU7YUFDekIscUJBQXFCLEVBQUU7YUFDdkIsUUFBUSxDQUFDLGtCQUFrQixFQUFFLHFCQUFxQixDQUFDLGFBQWEsQ0FBQzthQUNqRSxLQUFLLENBQUMsYUFBYSxDQUFDO1lBQ3ZCLFlBQVk7aUJBQ1QsdUJBQXVCLEVBQUU7aUJBQ3pCLHFCQUFxQixFQUFFO2lCQUN2QixRQUFRLENBQUMsa0JBQWtCLEVBQUUscUJBQXFCLENBQUMsbUJBQW1CLENBQUM7aUJBQ3ZFLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUUxQixJQUFJLENBQUMsd0JBQXdCLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsdUJBQXVCLEVBQUUsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUNqRyxJQUFJLENBQUMsNEJBQTRCLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsdUJBQXVCLEVBQUUsQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztRQUUzRyxJQUFJLENBQUMsMkJBQTJCLEdBQUcsSUFBSSxDQUFDLG9DQUFvQyxFQUFFLENBQUM7UUFFL0U7O1dBRUc7UUFDSCxrSEFBa0g7UUFDbEgsd0dBQXdHO1FBQ3hHLDBEQUEwRDtRQUUxRCxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxlQUFlO1lBQ2pDLElBQUksQ0FBQyx3QkFBd0I7WUFDN0IsSUFBSSxDQUFDLDRCQUE0QjtZQUNqQyxJQUFJLENBQUMsMkJBQTJCLENBQUM7SUFDckMsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0ssb0NBQW9DO1FBQzFDLE1BQU0sdUJBQXVCLEdBQVcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMseUJBQXlCLENBQUMsS0FBSzthQUNsRixNQUFNLENBQUMsc0JBQXNCLEVBQUUseUJBQXlCLENBQUMsWUFBWSxDQUFDO2FBQ3RFLE1BQU0sQ0FBQyxDQUFDO1FBRVgsTUFBTSx1QkFBdUIsR0FBVyxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxLQUFLO2FBQ2xGLE1BQU0sQ0FBQyxzQkFBc0IsRUFBRSx5QkFBeUIsQ0FBQyxrQkFBa0IsQ0FBQzthQUM1RSxNQUFNLENBQUMsQ0FBQztRQUVYLE1BQU0sMkJBQTJCLEdBQVcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMseUJBQXlCLENBQUMsS0FBSzthQUN0RixNQUFNLENBQUMsc0JBQXNCLEVBQUUseUJBQXlCLENBQUMsdUJBQXVCLENBQUM7YUFDakYsTUFBTSxDQUFDLENBQUM7UUFDWCxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyx1QkFBdUIsR0FBRyx1QkFBdUIsR0FBRywyQkFBMkIsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNqSCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBUcmFuc2FjdGlvbkNvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi8uLi8uLi9jb2xsZWN0aW9ucy90cmFuc2FjdGlvbi90cmFuc2FjdGlvbi5jb2xsZWN0aW9uJztcbmltcG9ydCB7IENoYXJ0QWNjb3VudHNMaXN0RW51bSB9IGZyb20gJy4uLy4uLy4uLy4uL2RiL0VudW1zL2NoYXJ0LWFjY291bnRzLWxpc3QuZW51bSc7XG5pbXBvcnQgeyBEZXByZWNpYXRpb25Db2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vLi4vLi4vY29sbGVjdGlvbnMvZGVwcmVjaWF0aW9uLmNvbGxlY3Rpb24nO1xuaW1wb3J0IHsgVGFua1R5cGVFbnVtIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvRW51bXMvdGFuay10eXBlLmVudW0nO1xuaW1wb3J0IHsgVGF4U3VtbWFyeSB9IGZyb20gJy4uLy4uLy4uL3RheC1zdW1tYXJ5L3RheC1zdW1tYXJ5JztcbmltcG9ydCB7IFRheFN1bW1hcnlTZWN0aW9uIH0gZnJvbSAnLi4vLi4vLi4vdGF4LXN1bW1hcnkvdGF4LXN1bW1hcnktc2VjdGlvbic7XG5pbXBvcnQgeyBUYXhSZXR1cm5DYXRlZ29yeUxpc3RFbnVtIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvRW51bXMvdGF4LXJldHVybi1jYXRlZ29yeS1saXN0LmVudW0nO1xuXG5leHBvcnQgY2xhc3MgTXlUYXhSZW50IHtcbiAgcHJvcGVydHlFeHBlbnNlczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uO1xuICB0YXhTdW1tYXJ5UHJvcGVydHlTZWN0aW9uOiBUYXhTdW1tYXJ5U2VjdGlvbjtcbiAgZ3Jvc3NSZW50QW1vdW50OiBudW1iZXI7XG4gIGludGVyZXN0RGVkdWN0aW9uc0Ftb3VudDogbnVtYmVyO1xuICBjYXBpdGFsV29ya3NEZWR1Y3Rpb25zQW1vdW50OiBudW1iZXI7XG4gIG90aGVyUmVudGFsRGVkdWN0aW9uc0Ftb3VudDogbnVtYmVyO1xuICBuZXRSZW50OiBudW1iZXI7XG5cbiAgY29uc3RydWN0b3IoXG4gICAgdHJhbnNhY3Rpb25zOiBUcmFuc2FjdGlvbkNvbGxlY3Rpb24sXG4gICAgZGVwcmVjaWF0aW9uczogRGVwcmVjaWF0aW9uQ29sbGVjdGlvbixcbiAgICB0YXhTdW1tYXJ5OiBUYXhTdW1tYXJ5XG4gICkge1xuICAgIHRoaXMucHJvcGVydHlFeHBlbnNlcyA9IHRyYW5zYWN0aW9ucy5nZXRQcm9wZXJ0eVRyYW5zYWN0aW9ucygpLmdldEV4cGVuc2VUcmFuc2FjdGlvbnMoKTtcbiAgICB0aGlzLnRheFN1bW1hcnlQcm9wZXJ0eVNlY3Rpb24gPSB0YXhTdW1tYXJ5LnByb3BlcnR5O1xuICAgIHRoaXMuZ3Jvc3NSZW50QW1vdW50ID0gdHJhbnNhY3Rpb25zXG4gICAgICAgIC5nZXRQcm9wZXJ0eVRyYW5zYWN0aW9ucygpXG4gICAgICAgIC5nZXRJbmNvbWVUcmFuc2FjdGlvbnMoKVxuICAgICAgICAuZmlsdGVyQnkoJ2NoYXJ0QWNjb3VudHMuaWQnLCBDaGFydEFjY291bnRzTGlzdEVudW0uUkVOVEFMX0lOQ09NRSlcbiAgICAgICAgLnN1bUJ5KCdjbGFpbUFtb3VudCcpICtcbiAgICAgIHRyYW5zYWN0aW9uc1xuICAgICAgICAuZ2V0UHJvcGVydHlUcmFuc2FjdGlvbnMoKVxuICAgICAgICAuZ2V0SW5jb21lVHJhbnNhY3Rpb25zKClcbiAgICAgICAgLmZpbHRlckJ5KCdjaGFydEFjY291bnRzLmlkJywgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLk9USEVSX1JFTlRBTF9JTkNPTUUpXG4gICAgICAgIC5zdW1CeSgnY2xhaW1BbW91bnQnKTtcblxuICAgIHRoaXMuaW50ZXJlc3REZWR1Y3Rpb25zQW1vdW50ID0gTWF0aC5hYnModHJhbnNhY3Rpb25zLmdldEludGVyZXN0VHJhbnNhY3Rpb25zKCkuc3VtQnkoJ2Ftb3VudCcpKTtcbiAgICB0aGlzLmNhcGl0YWxXb3Jrc0RlZHVjdGlvbnNBbW91bnQgPSBNYXRoLmFicyhkZXByZWNpYXRpb25zLmdldENhcGl0YWxEZXByZWNpYXRpb25zKCkuc3VtQnkoJ2NsYWltQW1vdW50JykpO1xuXG4gICAgdGhpcy5vdGhlclJlbnRhbERlZHVjdGlvbnNBbW91bnQgPSB0aGlzLmNhbGN1bGF0ZU90aGVyUmVudGFsRGVkdWN0aW9uc0Ftb3VudCgpO1xuXG4gICAgLyoqXG4gICAgICogQFRvZG8gVmlrIHVuY29tbWVudCB3aGVuIHRhc2sgVFQtMjAwOSB3aWxsIGJlIGltcGxlbWVudGVkXG4gICAgICovXG4gICAgLy8gdGhpcy5vdGhlclJlbnRhbERlZHVjdGlvbnNBbW91bnQgPSBkZXByZWNpYXRpb25zLmdldEJ5VGFua1R5cGUoVGFua1R5cGVFbnVtLlBST1BFUlRZKS5nZXRBc3NldHMoKS5jbGFpbUFtb3VudCArXG4gICAgLy8gICBkZXByZWNpYXRpb25zLmdldEJ5VGFua1R5cGUoVGFua1R5cGVFbnVtLlBST1BFUlRZKS5nZXRCb3Jyb3dpbmdFeHBlbnNlRGVwcmVjaWF0aW9ucygpLmNsYWltQW1vdW50ICtcbiAgICAvLyAgIE1hdGguYWJzKHRoaXMucHJvcGVydHlFeHBlbnNlcy5zdW1CeSgnY2xhaW1BbW91bnQnKSk7XG5cbiAgICB0aGlzLm5ldFJlbnQgPSB0aGlzLmdyb3NzUmVudEFtb3VudCAtXG4gICAgICB0aGlzLmludGVyZXN0RGVkdWN0aW9uc0Ftb3VudCAtXG4gICAgICB0aGlzLmNhcGl0YWxXb3Jrc0RlZHVjdGlvbnNBbW91bnQgLVxuICAgICAgdGhpcy5vdGhlclJlbnRhbERlZHVjdGlvbnNBbW91bnQ7XG4gIH1cblxuICAvKipcbiAgICogQFRvZG8gVmlrIHJlbW92ZSB3aGVuIFRULTIwMDkgd2lsbCBiZSBpbXBsZW1lbnRlZC5cbiAgICogV2UgdXNlIHRheCBzdW1tYXJ5IGRhdGEgaGVyZSBiZWNhdXNlIGNsYWltIGFtb3VudCBmcm9tIGRlcHJlY2lhdGlvbiBpcyBkaWZmZXJlbnRcbiAgICogZnJvbSB0aGUgY2xhaW0gYW1vdW50IHRoYXQgd2UgZ2V0IGZyb20gdGF4IHN1bW1hcnkgKGRlcHJlY2lhdGlvbiBjbGFpbSBhbW91bnQgaXMgbm90IGFmZmVjdGVkIGJ5IHByb3BlcnR5IHNoYXJlLFxuICAgKiBwcm9wZXJ0eSBjb250cmFjdCBkYXRlLCBlLnQuYy4pLiBEZXRhaWxzIGluIHRoZSBUVC0yMDA5IHRhc2tcbiAgICovXG4gIHByaXZhdGUgY2FsY3VsYXRlT3RoZXJSZW50YWxEZWR1Y3Rpb25zQW1vdW50KCk6IG51bWJlciB7XG4gICAgY29uc3QgcGxhbnRBbmRFcXVpcG1lbnRBbW91bnQ6IG51bWJlciA9IE1hdGguYWJzKHRoaXMudGF4U3VtbWFyeVByb3BlcnR5U2VjdGlvbi5pdGVtc1xuICAgICAgLmZpbmRCeSgndGF4UmV0dXJuQ2F0ZWdvcnkuaWQnLCBUYXhSZXR1cm5DYXRlZ29yeUxpc3RFbnVtLkRFUFJFQ0lBVElPTilcbiAgICAgIC5hbW91bnQpO1xuXG4gICAgY29uc3QgYm9ycm93aW5nRXhwZW5zZXNBbW91bnQ6IG51bWJlciA9IE1hdGguYWJzKHRoaXMudGF4U3VtbWFyeVByb3BlcnR5U2VjdGlvbi5pdGVtc1xuICAgICAgLmZpbmRCeSgndGF4UmV0dXJuQ2F0ZWdvcnkuaWQnLCBUYXhSZXR1cm5DYXRlZ29yeUxpc3RFbnVtLkJPUlJPV0lOR19FWFBFTlNFUylcbiAgICAgIC5hbW91bnQpO1xuXG4gICAgY29uc3Qgb3RoZXJSZW50YWxEZWR1Y3Rpb25zQW1vdW50OiBudW1iZXIgPSBNYXRoLmFicyh0aGlzLnRheFN1bW1hcnlQcm9wZXJ0eVNlY3Rpb24uaXRlbXNcbiAgICAgIC5maW5kQnkoJ3RheFJldHVybkNhdGVnb3J5LmlkJywgVGF4UmV0dXJuQ2F0ZWdvcnlMaXN0RW51bS5PVEhFUl9SRU5UQUxfREVEVUNUSU9OUylcbiAgICAgIC5hbW91bnQpO1xuICAgIHJldHVybiArTWF0aC5mbG9vcihwbGFudEFuZEVxdWlwbWVudEFtb3VudCArIGJvcnJvd2luZ0V4cGVuc2VzQW1vdW50ICsgb3RoZXJSZW50YWxEZWR1Y3Rpb25zQW1vdW50KS50b0ZpeGVkKDIpO1xuICB9XG59XG4iXX0=
|