taxtank-core 0.21.8 → 0.21.11
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 +264 -128
- package/bundles/taxtank-core.umd.js.map +1 -1
- package/esm2015/lib/collections/collection.js +7 -1
- package/esm2015/lib/db/Enums/chart-accounts-heading-list.enum.js +8 -1
- package/esm2015/lib/db/Enums/income-source-forecast-trust-type.enum.js +15 -0
- package/esm2015/lib/db/Enums/income-source-type-list-other.enum.js +3 -2
- package/esm2015/lib/db/Models/incomeSource/income-source-forecast.js +1 -1
- package/esm2015/lib/forms/abstract.form.js +6 -1
- package/esm2015/lib/forms/bank/bank-account/bank-account-add-manual.form.js +9 -42
- package/esm2015/lib/forms/bank/bank-account/bank-account-allocation.form.js +31 -0
- package/esm2015/lib/forms/bank/bank-account/bank-account-import.form.js +4 -30
- package/esm2015/lib/forms/bank/bank-account/bank-account-properties.form.js +28 -7
- package/esm2015/lib/forms/index.js +2 -1
- package/esm2015/lib/forms/report/my-tax/my-tax-deductions.form.js +9 -3
- package/esm2015/lib/forms/report/my-tax/my-tax-partnerships-and-trusts.form.js +5 -2
- package/esm2015/lib/interfaces/income-source-forecast.interface.js +1 -1
- package/esm2015/lib/models/income-source/income-source-type.js +3 -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-partnerships-and-trusts/my-tax-partnerships-and-trusts.js +20 -2
- package/esm2015/lib/models/report/my-tax/my-tax-rent/my-tax-rent.js +35 -9
- package/esm2015/lib/validators/conditional.validator.js +26 -0
- package/esm2015/lib/validators/fields-sum.validator.js +26 -0
- package/esm2015/lib/validators/index.js +2 -1
- package/esm2015/public-api.js +2 -1
- package/fesm2015/taxtank-core.js +255 -124
- package/fesm2015/taxtank-core.js.map +1 -1
- package/lib/collections/collection.d.ts +2 -0
- package/lib/db/Enums/chart-accounts-heading-list.enum.d.ts +7 -0
- package/lib/db/Enums/income-source-forecast-trust-type.enum.d.ts +13 -0
- package/lib/db/Enums/income-source-type-list-other.enum.d.ts +3 -2
- package/lib/db/Models/incomeSource/income-source-forecast.d.ts +3 -1
- package/lib/forms/abstract.form.d.ts +4 -0
- package/lib/forms/bank/bank-account/bank-account-add-manual.form.d.ts +2 -6
- package/lib/forms/bank/bank-account/bank-account-allocation.form.d.ts +7 -0
- package/lib/forms/bank/bank-account/bank-account-import.form.d.ts +2 -8
- package/lib/forms/bank/bank-account/bank-account-properties.form.d.ts +1 -0
- package/lib/forms/index.d.ts +1 -0
- package/lib/forms/report/my-tax/my-tax-deductions.form.d.ts +1 -1
- package/lib/forms/report/my-tax/my-tax-partnerships-and-trusts.form.d.ts +1 -1
- package/lib/interfaces/income-source-forecast.interface.d.ts +2 -0
- package/lib/models/report/my-tax/my-tax-partnerships-and-trusts/my-tax-partnerships-and-trusts.d.ts +9 -1
- package/lib/models/report/my-tax/my-tax-rent/my-tax-rent.d.ts +11 -1
- package/lib/validators/conditional.validator.d.ts +2 -0
- package/lib/validators/fields-sum.validator.d.ts +8 -0
- package/lib/validators/index.d.ts +1 -0
- package/package.json +1 -1
- package/public-api.d.ts +1 -0
|
@@ -2,6 +2,7 @@ import { IncomeSourceType as IncomeSourceTypeBase } from '../../db/Models/income
|
|
|
2
2
|
import { IncomeSourceTypeListWorkEnum } from '../../db/Enums/income-source-type-list-work.enum';
|
|
3
3
|
import { IncomeSourceTypeListOtherEnum } from '../../db/Enums/income-source-type-list-other.enum';
|
|
4
4
|
import { IncomeSourceTypeEnum } from '../../db/Enums/income-source-type.enum';
|
|
5
|
+
import { IncomeSourceTypeListSoleEnum } from '../../db/Enums/income-source-type-list-sole.enum';
|
|
5
6
|
export class IncomeSourceType extends IncomeSourceTypeBase {
|
|
6
7
|
isBonuses() {
|
|
7
8
|
return this.id === IncomeSourceTypeListWorkEnum.BONUSES;
|
|
@@ -13,8 +14,7 @@ export class IncomeSourceType extends IncomeSourceTypeBase {
|
|
|
13
14
|
return !!IncomeSourceTypeListOtherEnum[this.id];
|
|
14
15
|
}
|
|
15
16
|
isSole() {
|
|
16
|
-
|
|
17
|
-
return !!IncomeSourceTypeListOtherEnum[this.id];
|
|
17
|
+
return !!IncomeSourceTypeListSoleEnum[this.id];
|
|
18
18
|
}
|
|
19
19
|
get type() {
|
|
20
20
|
switch (true) {
|
|
@@ -27,4 +27,4 @@ export class IncomeSourceType extends IncomeSourceTypeBase {
|
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5jb21lLXNvdXJjZS10eXBlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL21vZGVscy9pbmNvbWUtc291cmNlL2luY29tZS1zb3VyY2UtdHlwZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsZ0JBQWdCLElBQUksb0JBQW9CLEVBQUUsTUFBTSxpREFBaUQsQ0FBQztBQUMzRyxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSxrREFBa0QsQ0FBQztBQUNoRyxPQUFPLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSxtREFBbUQsQ0FBQztBQUNsRyxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQztBQUM5RSxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSxrREFBa0QsQ0FBQztBQUVoRyxNQUFNLE9BQU8sZ0JBQWlCLFNBQVEsb0JBQW9CO0lBQ3hELFNBQVM7UUFDUCxPQUFPLElBQUksQ0FBQyxFQUFFLEtBQUssNEJBQTRCLENBQUMsT0FBTyxDQUFDO0lBQzFELENBQUM7SUFFRCxNQUFNO1FBQ0osT0FBTyxDQUFDLENBQUMsNEJBQTRCLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ2pELENBQUM7SUFFRCxPQUFPO1FBQ0wsT0FBTyxDQUFDLENBQUMsNkJBQTZCLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ2xELENBQUM7SUFFRCxNQUFNO1FBQ0osT0FBTyxDQUFDLENBQUMsNEJBQTRCLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ2pELENBQUM7SUFFRCxJQUFJLElBQUk7UUFDTixRQUFRLElBQUksRUFBRTtZQUNaLEtBQUssSUFBSSxDQUFDLE1BQU0sRUFBRTtnQkFDaEIsT0FBTyxvQkFBb0IsQ0FBQyxJQUFJLENBQUM7WUFDbkMsS0FBSyxJQUFJLENBQUMsTUFBTSxFQUFFO2dCQUNoQixPQUFPLG9CQUFvQixDQUFDLElBQUksQ0FBQztZQUNuQztnQkFDRSxPQUFPLG9CQUFvQixDQUFDLEtBQUssQ0FBQztTQUNyQztJQUNILENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluY29tZVNvdXJjZVR5cGUgYXMgSW5jb21lU291cmNlVHlwZUJhc2UgfSBmcm9tICcuLi8uLi9kYi9Nb2RlbHMvaW5jb21lU291cmNlL2luY29tZS1zb3VyY2UtdHlwZSc7XG5pbXBvcnQgeyBJbmNvbWVTb3VyY2VUeXBlTGlzdFdvcmtFbnVtIH0gZnJvbSAnLi4vLi4vZGIvRW51bXMvaW5jb21lLXNvdXJjZS10eXBlLWxpc3Qtd29yay5lbnVtJztcbmltcG9ydCB7IEluY29tZVNvdXJjZVR5cGVMaXN0T3RoZXJFbnVtIH0gZnJvbSAnLi4vLi4vZGIvRW51bXMvaW5jb21lLXNvdXJjZS10eXBlLWxpc3Qtb3RoZXIuZW51bSc7XG5pbXBvcnQgeyBJbmNvbWVTb3VyY2VUeXBlRW51bSB9IGZyb20gJy4uLy4uL2RiL0VudW1zL2luY29tZS1zb3VyY2UtdHlwZS5lbnVtJztcbmltcG9ydCB7IEluY29tZVNvdXJjZVR5cGVMaXN0U29sZUVudW0gfSBmcm9tICcuLi8uLi9kYi9FbnVtcy9pbmNvbWUtc291cmNlLXR5cGUtbGlzdC1zb2xlLmVudW0nO1xuXG5leHBvcnQgY2xhc3MgSW5jb21lU291cmNlVHlwZSBleHRlbmRzIEluY29tZVNvdXJjZVR5cGVCYXNlIHtcbiAgaXNCb251c2VzKCk6IGJvb2xlYW4ge1xuICAgIHJldHVybiB0aGlzLmlkID09PSBJbmNvbWVTb3VyY2VUeXBlTGlzdFdvcmtFbnVtLkJPTlVTRVM7XG4gIH1cblxuICBpc1dvcmsoKTogYm9vbGVhbiB7XG4gICAgcmV0dXJuICEhSW5jb21lU291cmNlVHlwZUxpc3RXb3JrRW51bVt0aGlzLmlkXTtcbiAgfVxuXG4gIGlzT3RoZXIoKTogYm9vbGVhbiB7XG4gICAgcmV0dXJuICEhSW5jb21lU291cmNlVHlwZUxpc3RPdGhlckVudW1bdGhpcy5pZF07XG4gIH1cblxuICBpc1NvbGUoKTogYm9vbGVhbiB7XG4gICAgcmV0dXJuICEhSW5jb21lU291cmNlVHlwZUxpc3RTb2xlRW51bVt0aGlzLmlkXTtcbiAgfVxuXG4gIGdldCB0eXBlKCk6IEluY29tZVNvdXJjZVR5cGVFbnVtIHtcbiAgICBzd2l0Y2ggKHRydWUpIHtcbiAgICAgIGNhc2UgdGhpcy5pc1dvcmsoKTpcbiAgICAgICAgcmV0dXJuIEluY29tZVNvdXJjZVR5cGVFbnVtLldPUks7XG4gICAgICBjYXNlIHRoaXMuaXNTb2xlKCk6XG4gICAgICAgIHJldHVybiBJbmNvbWVTb3VyY2VUeXBlRW51bS5TT0xFO1xuICAgICAgZGVmYXVsdDpcbiAgICAgICAgcmV0dXJuIEluY29tZVNvdXJjZVR5cGVFbnVtLk9USEVSO1xuICAgIH1cbiAgfVxufVxuIl19
|
|
@@ -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":"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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.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
|
|
@@ -2,12 +2,14 @@ import { ChartAccountsListEnum } from '../../../../db/Enums/chart-accounts-list.
|
|
|
2
2
|
import { ChartAccountsHeadingTaxableEnum } from '../../../../db/Enums/chart-accounts-heading-taxable.enum';
|
|
3
3
|
import { ChartAccountsMetadataListEnum } from '../../../../db/Enums/chart-accounts-metadata-list.enum';
|
|
4
4
|
export class MyTaxPartnershipsAndTrusts {
|
|
5
|
-
constructor(transactions) {
|
|
5
|
+
constructor(transactions, incomeSources) {
|
|
6
6
|
this.transactions = transactions;
|
|
7
|
+
this.incomeSources = incomeSources;
|
|
7
8
|
this.partnershipIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_INCOME);
|
|
8
9
|
this.partnershipExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_EXPENSES);
|
|
9
10
|
this.trustsIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_INCOME);
|
|
10
11
|
this.trustsExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_EXPENSES);
|
|
12
|
+
this.trustType = this.getTrustType();
|
|
11
13
|
this.netNonPrimaryProductionAmount = (this.partnershipIncomes.sumBy('amount') - this.partnershipExpenses.sumBy('amount')) +
|
|
12
14
|
(this.trustsIncomes.sumBy('amount') - this.trustsExpenses.sumBy('amount'));
|
|
13
15
|
this.partnershipsNetIncome = this.partnershipIncomes.sumBy('amount') -
|
|
@@ -27,5 +29,21 @@ export class MyTaxPartnershipsAndTrusts {
|
|
|
27
29
|
.sumBy('value');
|
|
28
30
|
this.taxOffsetNRASTotalAmount = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TAX_OFFSETS_N_R_A_S).sumBy('amount');
|
|
29
31
|
}
|
|
32
|
+
/**
|
|
33
|
+
* Get Income source forecast trust type, related to trust income with max amount
|
|
34
|
+
*/
|
|
35
|
+
getTrustType() {
|
|
36
|
+
const filteredTrustIncomes = this.trustsIncomes
|
|
37
|
+
.filterBy('incomeSource.id', this.incomeSources
|
|
38
|
+
.removeBy('actualForecast.trustType', null)
|
|
39
|
+
.getIds());
|
|
40
|
+
if (!filteredTrustIncomes.length) {
|
|
41
|
+
return null;
|
|
42
|
+
}
|
|
43
|
+
return this.incomeSources
|
|
44
|
+
.findBy('id', filteredTrustIncomes.maxBy('amount').incomeSource.id)
|
|
45
|
+
.actualForecast
|
|
46
|
+
.trustType;
|
|
47
|
+
}
|
|
30
48
|
}
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"my-tax-partnerships-and-trusts.js","sourceRoot":"","sources":["../../../../../../../../projects/tt-core/src/lib/models/report/my-tax/my-tax-partnerships-and-trusts/my-tax-partnerships-and-trusts.ts"],"names":[],"mappings":"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","sourcesContent":["import { TransactionCollection } from '../../../../collections/transaction/transaction.collection';\nimport { ChartAccountsListEnum } from '../../../../db/Enums/chart-accounts-list.enum';\nimport { ChartAccountsHeadingTaxableEnum } from '../../../../db/Enums/chart-accounts-heading-taxable.enum';\nimport { ChartAccountsMetadataListEnum } from '../../../../db/Enums/chart-accounts-metadata-list.enum';\nimport { IncomeSourceForecastTrustTypeEnum } from '../../../../db/Enums/income-source-forecast-trust-type.enum';\nimport { IncomeSourceCollection } from '../../../../collections/income-source.collection';\n\nexport class MyTaxPartnershipsAndTrusts {\n  transactions: TransactionCollection;\n  incomeSources: IncomeSourceCollection;\n  partnershipIncomes: TransactionCollection;\n  partnershipExpenses: TransactionCollection;\n  trustsIncomes: TransactionCollection;\n  trustsExpenses: TransactionCollection;\n  trustType: IncomeSourceForecastTrustTypeEnum;\n  netNonPrimaryProductionAmount: number;\n  partnershipsNetIncome: number;\n  trustsNetIncome: number;\n  partnershipsSmallBusinessNetIncome: number;\n  trustsSmallBusinessNetIncome: number;\n  taxPaidTotal: number;\n  frankingCreditsTotal: number;\n  taxOffsetNRASTotalAmount: number;\n\n  constructor(\n    transactions: TransactionCollection,\n    incomeSources: IncomeSourceCollection,\n  ) {\n    this.transactions = transactions;\n    this.incomeSources = incomeSources;\n    this.partnershipIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_INCOME);\n    this.partnershipExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.PARTNERSHIP_EXPENSES);\n    this.trustsIncomes = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_INCOME);\n    this.trustsExpenses = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TRUST_EXPENSES);\n    this.trustType = this.getTrustType();\n    this.netNonPrimaryProductionAmount = (this.partnershipIncomes.sumBy('amount') - this.partnershipExpenses.sumBy('amount')) +\n      (this.trustsIncomes.sumBy('amount') - this.trustsExpenses.sumBy('amount'));\n    this.partnershipsNetIncome = this.partnershipIncomes.sumBy('amount') -\n      this.partnershipExpenses.sumBy('amount');\n    this.trustsNetIncome = this.trustsIncomes.sumBy('amount') - this.trustsExpenses.sumBy('amount');\n    this.partnershipsSmallBusinessNetIncome = this.partnershipIncomes.sumBy('amount') -\n      this.partnershipExpenses.sumBy('amount');\n    this.trustsSmallBusinessNetIncome = this.trustsIncomes.sumBy('amount') -\n      this.trustsExpenses.sumBy('amount');\n    this.taxPaidTotal = this.transactions\n      .filterBy('chartAccounts.heading.id', ChartAccountsHeadingTaxableEnum.PARTNERSHIPS_AND_TRUSTS_INCOME)\n      .sumBy('tax');\n    this.frankingCreditsTotal = this.transactions\n      .filterBy('chartAccounts.heading.id', ChartAccountsHeadingTaxableEnum.PARTNERSHIPS_AND_TRUSTS_INCOME)\n      .getTransactionsMetadata()\n      .filterBy('chartAccountsMetadata.id', ChartAccountsMetadataListEnum.FRANKING_CREDIT)\n      .sumBy('value');\n    this.taxOffsetNRASTotalAmount = this.transactions.filterBy('chartAccounts.id', ChartAccountsListEnum.TAX_OFFSETS_N_R_A_S).sumBy('amount');\n  }\n\n  /**\n   * Get Income source forecast trust type, related to trust income with max amount\n   */\n  private getTrustType(): IncomeSourceForecastTrustTypeEnum {\n    const filteredTrustIncomes: TransactionCollection = this.trustsIncomes\n      .filterBy('incomeSource.id', this.incomeSources\n        .removeBy('actualForecast.trustType', null)\n        .getIds()\n      );\n\n    if (!filteredTrustIncomes.length) {\n      return null;\n    }\n\n    return this.incomeSources\n      .findBy('id', filteredTrustIncomes.maxBy('amount').incomeSource.id)\n      .actualForecast\n      .trustType;\n  }\n}\n"]}
|
|
@@ -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=
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { distinctUntilChanged } from 'rxjs/operators';
|
|
2
|
+
export function conditionalValidator(condition, validator) {
|
|
3
|
+
return function (control) {
|
|
4
|
+
revalidateOnChanges(control);
|
|
5
|
+
if (control && control.parent) {
|
|
6
|
+
if (condition(control.parent)) {
|
|
7
|
+
return validator(control);
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
return null;
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Conditional validator depends on other fields and should be updated on each form value change
|
|
15
|
+
*/
|
|
16
|
+
function revalidateOnChanges(control) {
|
|
17
|
+
if (control && control.parent && !control['_revalidateOnChanges']) {
|
|
18
|
+
control['_revalidateOnChanges'] = true;
|
|
19
|
+
control.parent.valueChanges.pipe(distinctUntilChanged((a, b) => JSON.stringify(a) === JSON.stringify(b)))
|
|
20
|
+
.subscribe(() => {
|
|
21
|
+
control.updateValueAndValidity({ emitEvent: false });
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZGl0aW9uYWwudmFsaWRhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL3ZhbGlkYXRvcnMvY29uZGl0aW9uYWwudmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRXRELE1BQU0sVUFBVSxvQkFBb0IsQ0FDbEMsU0FBZ0QsRUFDaEQsU0FBc0Q7SUFDdEQsT0FBTyxVQUFVLE9BQXdCO1FBQ3ZDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBRTdCLElBQUksT0FBTyxJQUFJLE9BQU8sQ0FBQyxNQUFNLEVBQUU7WUFDN0IsSUFBSSxTQUFTLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFO2dCQUM3QixPQUFPLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQzthQUMzQjtTQUNGO1FBRUQsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDLENBQUM7QUFDSixDQUFDO0FBRUQ7O0dBRUc7QUFDSCxTQUFTLG1CQUFtQixDQUFDLE9BQXdCO0lBQ25ELElBQUksT0FBTyxJQUFJLE9BQU8sQ0FBQyxNQUFNLElBQUksQ0FBQyxPQUFPLENBQUMsc0JBQXNCLENBQUMsRUFBRTtRQUNqRSxPQUFPLENBQUMsc0JBQXNCLENBQUMsR0FBRyxJQUFJLENBQUM7UUFDdkMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUM5QixvQkFBb0IsQ0FBQyxDQUFDLENBQVMsRUFBRSxDQUFTLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEtBQUssSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUN4RjthQUNFLFNBQVMsQ0FBQyxHQUFHLEVBQUU7WUFDZCxPQUFPLENBQUMsc0JBQXNCLENBQUMsRUFBQyxTQUFTLEVBQUUsS0FBSyxFQUFDLENBQUMsQ0FBQztRQUNyRCxDQUFDLENBQUMsQ0FBQztLQUNOO0lBRUQsT0FBTztBQUNULENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBYnN0cmFjdENvbnRyb2wsIFZhbGlkYXRpb25FcnJvcnMsIFZhbGlkYXRvckZuIH0gZnJvbSAnQGFuZ3VsYXIvZm9ybXMnO1xuaW1wb3J0IHsgZGlzdGluY3RVbnRpbENoYW5nZWQgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5cbmV4cG9ydCBmdW5jdGlvbiBjb25kaXRpb25hbFZhbGlkYXRvcihcbiAgY29uZGl0aW9uOiAoY29udHJvbDogQWJzdHJhY3RDb250cm9sKSA9PiBib29sZWFuLFxuICB2YWxpZGF0b3I6IChjb250cm9sOiBBYnN0cmFjdENvbnRyb2wpID0+IG9iamVjdCB8IG51bGwpOiBWYWxpZGF0b3JGbiB7XG4gIHJldHVybiBmdW5jdGlvbiAoY29udHJvbDogQWJzdHJhY3RDb250cm9sKTogVmFsaWRhdGlvbkVycm9ycyB7XG4gICAgcmV2YWxpZGF0ZU9uQ2hhbmdlcyhjb250cm9sKTtcblxuICAgIGlmIChjb250cm9sICYmIGNvbnRyb2wucGFyZW50KSB7XG4gICAgICBpZiAoY29uZGl0aW9uKGNvbnRyb2wucGFyZW50KSkge1xuICAgICAgICByZXR1cm4gdmFsaWRhdG9yKGNvbnRyb2wpO1xuICAgICAgfVxuICAgIH1cblxuICAgIHJldHVybiBudWxsO1xuICB9O1xufVxuXG4vKipcbiAqIENvbmRpdGlvbmFsIHZhbGlkYXRvciBkZXBlbmRzIG9uIG90aGVyIGZpZWxkcyBhbmQgc2hvdWxkIGJlIHVwZGF0ZWQgb24gZWFjaCBmb3JtIHZhbHVlIGNoYW5nZVxuICovXG5mdW5jdGlvbiByZXZhbGlkYXRlT25DaGFuZ2VzKGNvbnRyb2w6IEFic3RyYWN0Q29udHJvbCk6IHZvaWQge1xuICBpZiAoY29udHJvbCAmJiBjb250cm9sLnBhcmVudCAmJiAhY29udHJvbFsnX3JldmFsaWRhdGVPbkNoYW5nZXMnXSkge1xuICAgIGNvbnRyb2xbJ19yZXZhbGlkYXRlT25DaGFuZ2VzJ10gPSB0cnVlO1xuICAgIGNvbnRyb2wucGFyZW50LnZhbHVlQ2hhbmdlcy5waXBlKFxuICAgICAgZGlzdGluY3RVbnRpbENoYW5nZWQoKGE6IG9iamVjdCwgYjogb2JqZWN0KSA9PiBKU09OLnN0cmluZ2lmeShhKSA9PT0gSlNPTi5zdHJpbmdpZnkoYikpXG4gICAgKVxuICAgICAgLnN1YnNjcmliZSgoKSA9PiB7XG4gICAgICAgIGNvbnRyb2wudXBkYXRlVmFsdWVBbmRWYWxpZGl0eSh7ZW1pdEV2ZW50OiBmYWxzZX0pO1xuICAgICAgfSk7XG4gIH1cblxuICByZXR1cm47XG59XG4iXX0=
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Validator that check if sum amount of provided fields is greater than provided sum
|
|
3
|
+
* @param field to check in each formArray element
|
|
4
|
+
* @param summary to compare with fields sum
|
|
5
|
+
* @param fieldAlias to show it in error message
|
|
6
|
+
*/
|
|
7
|
+
export function fieldsSumValidator(field, summary = 100, fieldAlias) {
|
|
8
|
+
return (formArray) => {
|
|
9
|
+
// calculate sum of desired fields in formArray control
|
|
10
|
+
const fieldsSum = formArray['controls']
|
|
11
|
+
.reduce((acc, group) => acc += group.get(field).value, 0);
|
|
12
|
+
if (fieldsSum <= summary) {
|
|
13
|
+
return null;
|
|
14
|
+
}
|
|
15
|
+
else {
|
|
16
|
+
return {
|
|
17
|
+
fieldsSum: {
|
|
18
|
+
name: field,
|
|
19
|
+
alias: fieldAlias,
|
|
20
|
+
summary
|
|
21
|
+
}
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmllbGRzLXN1bS52YWxpZGF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvdmFsaWRhdG9ycy9maWVsZHMtc3VtLnZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQTs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSxrQkFBa0IsQ0FBQyxLQUFhLEVBQUUsVUFBa0IsR0FBRyxFQUFFLFVBQW1CO0lBQzFGLE9BQU8sQ0FBQyxTQUEwQixFQUFvQixFQUFFO1FBQ3RELHVEQUF1RDtRQUN2RCxNQUFNLFNBQVMsR0FBVyxTQUFTLENBQUMsVUFBVSxDQUFDO2FBQzVDLE1BQU0sQ0FBQyxDQUFDLEdBQVcsRUFBRSxLQUFzQixFQUFFLEVBQUUsQ0FBQyxHQUFHLElBQUksS0FBSyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFFckYsSUFBSSxTQUFTLElBQUksT0FBTyxFQUFFO1lBQ3hCLE9BQU8sSUFBSSxDQUFDO1NBQ2I7YUFBTTtZQUNMLE9BQU87Z0JBQ0wsU0FBUyxFQUFFO29CQUNULElBQUksRUFBRSxLQUFLO29CQUNYLEtBQUssRUFBRSxVQUFVO29CQUNqQixPQUFPO2lCQUNSO2FBQ0YsQ0FBQztTQUNIO0lBQ0gsQ0FBQyxDQUFDO0FBQ0osQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFic3RyYWN0Q29udHJvbCwgVmFsaWRhdGlvbkVycm9ycywgVmFsaWRhdG9yRm4gfSBmcm9tICdAYW5ndWxhci9mb3Jtcyc7XG5cbi8qKlxuICogVmFsaWRhdG9yIHRoYXQgY2hlY2sgaWYgc3VtIGFtb3VudCBvZiBwcm92aWRlZCBmaWVsZHMgaXMgZ3JlYXRlciB0aGFuIHByb3ZpZGVkIHN1bVxuICogQHBhcmFtIGZpZWxkIHRvIGNoZWNrIGluIGVhY2ggZm9ybUFycmF5IGVsZW1lbnRcbiAqIEBwYXJhbSBzdW1tYXJ5IHRvIGNvbXBhcmUgd2l0aCBmaWVsZHMgc3VtXG4gKiBAcGFyYW0gZmllbGRBbGlhcyB0byBzaG93IGl0IGluIGVycm9yIG1lc3NhZ2VcbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGZpZWxkc1N1bVZhbGlkYXRvcihmaWVsZDogc3RyaW5nLCBzdW1tYXJ5OiBudW1iZXIgPSAxMDAsIGZpZWxkQWxpYXM/OiBzdHJpbmcpOiBWYWxpZGF0b3JGbiB7XG4gIHJldHVybiAoZm9ybUFycmF5OiBBYnN0cmFjdENvbnRyb2wpOiBWYWxpZGF0aW9uRXJyb3JzID0+IHtcbiAgICAvLyBjYWxjdWxhdGUgc3VtIG9mIGRlc2lyZWQgZmllbGRzIGluIGZvcm1BcnJheSBjb250cm9sXG4gICAgY29uc3QgZmllbGRzU3VtOiBudW1iZXIgPSBmb3JtQXJyYXlbJ2NvbnRyb2xzJ11cbiAgICAgIC5yZWR1Y2UoKGFjYzogbnVtYmVyLCBncm91cDogQWJzdHJhY3RDb250cm9sKSA9PiBhY2MgKz0gZ3JvdXAuZ2V0KGZpZWxkKS52YWx1ZSwgMCk7XG5cbiAgICBpZiAoZmllbGRzU3VtIDw9IHN1bW1hcnkpIHtcbiAgICAgIHJldHVybiBudWxsO1xuICAgIH0gZWxzZSB7XG4gICAgICByZXR1cm4ge1xuICAgICAgICBmaWVsZHNTdW06IHtcbiAgICAgICAgICBuYW1lOiBmaWVsZCxcbiAgICAgICAgICBhbGlhczogZmllbGRBbGlhcyxcbiAgICAgICAgICBzdW1tYXJ5XG4gICAgICAgIH1cbiAgICAgIH07XG4gICAgfVxuICB9O1xufVxuIl19
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export * from './at-least-one.validator';
|
|
2
2
|
export * from './autocomplete.validator';
|
|
3
|
+
export * from './conditional.validator';
|
|
3
4
|
export * from './password.validator';
|
|
4
5
|
export * from './password-match.validator';
|
|
5
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvdmFsaWRhdG9ycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsMEJBQTBCLENBQUM7QUFDekMsY0FBYyx5QkFBeUIsQ0FBQztBQUN4QyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsNEJBQTRCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgKiBmcm9tICcuL2F0LWxlYXN0LW9uZS52YWxpZGF0b3InO1xuZXhwb3J0ICogZnJvbSAnLi9hdXRvY29tcGxldGUudmFsaWRhdG9yJztcbmV4cG9ydCAqIGZyb20gJy4vY29uZGl0aW9uYWwudmFsaWRhdG9yJztcbmV4cG9ydCAqIGZyb20gJy4vcGFzc3dvcmQudmFsaWRhdG9yJztcbmV4cG9ydCAqIGZyb20gJy4vcGFzc3dvcmQtbWF0Y2gudmFsaWRhdG9yJztcbiJdfQ==
|