taxtank-core 0.32.131 → 0.32.132
Sign up to get free protection for your applications and to get access to all the features.
- package/esm2022/lib/forms/holding/holding-reinvest.form.mjs +1 -3
- package/esm2022/lib/forms/report/my-tax/my-tax-deductions.form.mjs +1 -1
- package/esm2022/lib/models/report/my-tax/my-tax-deductions/my-tax-deductions.mjs +4 -4
- package/fesm2022/taxtank-core.mjs +2 -5
- package/fesm2022/taxtank-core.mjs.map +1 -1
- package/lib/forms/report/my-tax/my-tax-deductions.form.d.ts +1 -1
- package/lib/models/report/my-tax/my-tax-deductions/my-tax-deductions.d.ts +1 -1
- package/package.json +1 -1
@@ -72,8 +72,6 @@ export class HoldingReinvestForm extends AbstractForm {
|
|
72
72
|
*/
|
73
73
|
submit() {
|
74
74
|
const value = this.transactionForm.getRawValue();
|
75
|
-
console.log(value.amount);
|
76
|
-
console.log(this.get('cashVariance').value);
|
77
75
|
return super.submit({
|
78
76
|
transaction: this.transactionForm.submit({
|
79
77
|
type: TransactionTypeEnum.CREDIT,
|
@@ -84,4 +82,4 @@ export class HoldingReinvestForm extends AbstractForm {
|
|
84
82
|
});
|
85
83
|
}
|
86
84
|
}
|
87
|
-
//# sourceMappingURL=data:application/json;base64,
|
85
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"holding-reinvest.form.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/forms/holding/holding-reinvest.form.ts"],"names":[],"mappings":"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","sourcesContent":["import { HoldingReinvest } from '../../models';\nimport { IEventListener } from '../../interfaces';\nimport { AbstractForm } from '../abstract.form';\nimport { HoldingForm } from './holding.form';\nimport { HoldingIncomeForm } from '../transaction';\nimport { TransactionTypeEnum } from '../../db/Enums/transaction-type.enum';\nimport { FormControl, Validators } from '@angular/forms';\n\n/**\n * @TODO vik TT-4048\n */\nexport class HoldingReinvestForm extends AbstractForm<HoldingReinvest> implements IEventListener {\n  constructor(private reinvest: HoldingReinvest) {\n    super({\n      // the difference between dividends amount and given shares (shares=dividendsAmount/sharePrice)\n      cashVariance: new FormControl({ value: 0, disabled: true }, Validators.required),\n      transaction: new HoldingIncomeForm(reinvest.transaction, null, []),\n      holding: new HoldingForm(reinvest.holding)\n    }, reinvest);\n\n    this.listenEvents();\n\n    // emit values to trigger changes and create chart accounts metafields\n    (this.get('transaction') as HoldingIncomeForm).emitValues();\n    // disable amount field because we calculate the value automatically and this field is visible as disabled\n    this.get(['transaction', 'amount']).disable();\n    // franked/unfranked fields are required\n    this.transactionForm.getAmountComponents().forEach(control => {\n      control.addValidators(Validators.required);\n      control.setValue(null);\n    });\n  }\n\n  listenEvents(): void {\n    this.listenHoldingChanges();\n    this.listenDateChanges();\n    this.listenAmountChanges();\n  }\n\n  private get transactionForm(): HoldingIncomeForm {\n    return this.get('transaction') as HoldingIncomeForm;\n  }\n\n  private get holdingForm(): HoldingForm {\n    return this.get('holding') as HoldingForm;\n  }\n\n  /**\n   * calculated automatically as cashVariance=transactionAmount-frankedAmount-unfrankedAmount\n   */\n  private listenAmountChanges(): void {\n    this.transactionForm.valueChanges.subscribe(() => {\n      const sum = this.transactionForm.getAmountComponents().reduce((acc, control) => acc + control.value, 0);\n      this.get('cashVariance').setValue(this.get(['transaction', 'amount']).value - sum);\n    });\n  }\n\n  /**\n   * Set transaction amount based on holding quantity and price\n   */\n  private listenHoldingChanges(): void {\n    // we can watch the whole holding form because we have only 2 fields in the form template\n    this.get('holding').valueChanges.subscribe((value) => {\n      if (!value.quantity || !value.price) {\n        this.get(['transaction', 'amount']).setValue(0);\n        return;\n      }\n\n      this.get(['transaction', 'amount']).setValue(value.quantity * value.price);\n    });\n  }\n\n  /**\n   * Set holding date the same as transaction date\n   */\n  private listenDateChanges(): void {\n    this.get(['transaction', 'date']).valueChanges.subscribe((date: Date) => {\n      this.get(['holding', 'date']).setValue(date);\n    });\n  }\n\n  /**\n   * @TODO Alex (TT-2847): attach file to both (transaction and holding) when files system refactored\n   */\n  submit(): HoldingReinvest {\n    const value = this.transactionForm.getRawValue();\n\n    return super.submit({\n      transaction: this.transactionForm.submit({\n        type: TransactionTypeEnum.CREDIT,\n        description: `Reinvestment - ${value.incomeSource.name}`,\n        amount: value.amount - this.get('cashVariance').value\n      }),\n      holding: this.holdingForm.submit()\n    });\n  }\n}\n"]}
|
@@ -82,4 +82,4 @@ export class MyTaxDeductionsForm extends AbstractForm {
|
|
82
82
|
});
|
83
83
|
}
|
84
84
|
}
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
85
|
+
//# 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 { UntypedFormControl, Validators } from '@angular/forms';\nimport { MyTaxDeductions } from '../../../models/report';\nimport { conditionalValidator } from '../../../validators';\n\nexport class MyTaxDeductionsForm extends AbstractForm<MyTaxDeductions> {\n  constructor(deductions: MyTaxDeductions) {\n    super({\n      vehicleClaimMethod: new UntypedFormControl({\n        value: deductions.vehicleClaimDetails?.method,\n        disabled: true\n      }),\n      vehicleExpensesTotalAmount: new UntypedFormControl({\n        value: deductions.vehicleExpensesTotalAmount,\n        disabled: true\n      }),\n      workRelatedTravelExpensesTotalAmount: new UntypedFormControl({\n        value: deductions.workRelatedTravelExpensesTotalAmount,\n        disabled: true\n      }),\n      workRelatedClothingType: new UntypedFormControl(\n        deductions.workRelatedClothingType,\n        conditionalValidator(\n          (): boolean => !!deductions.workRelatedClothingTotalAmount,\n          Validators.required\n        )\n      ),\n      workRelatedClothingTotalAmount: new UntypedFormControl({\n        value: deductions.workRelatedClothingTotalAmount,\n        disabled: true\n      }),\n      workRelatedSelfEducationType: new UntypedFormControl(\n        deductions.workRelatedSelfEducationType,\n        conditionalValidator(\n          (): boolean => !!deductions.workRelatedSelfEducationTotalAmount,\n          Validators.required\n        )\n      ),\n      workRelatedSelfEducationTotalAmount: new UntypedFormControl({\n        value: deductions.workRelatedSelfEducationTotalAmount,\n        disabled: true\n      }),\n      otherWorkRelatedSelfEducationTotalAmount: new UntypedFormControl({\n        value: deductions.otherWorkRelatedExpensesTotalAmount,\n        disabled: true\n      }),\n      lowValuePoolDeductionTotalAmount: new UntypedFormControl({\n        value: deductions.lowValuePoolDeductionTotalAmount,\n        disabled: true\n      }),\n      interestExpensesTotalAmount: new UntypedFormControl({\n        value: deductions.interestExpensesTotalAmount,\n        disabled: true\n      }),\n      dividendExpensesTotalAmount: new UntypedFormControl({\n        value: deductions.dividendExpensesTotalAmount,\n        disabled: true\n      }),\n      donationsTotalAmount: new UntypedFormControl({\n        value: deductions.donationsTotalAmount,\n        disabled: true\n      }),\n      interestsChargedByATOTotalAmount: new UntypedFormControl({\n        value: deductions.interestsChargedByATOTotalAmount,\n        disabled: true\n      }),\n      litigationCostsTotalAmount: new UntypedFormControl({\n        value: deductions.litigationCostsTotalAmount,\n        disabled: true\n      }),\n      otherManagingCostsTotalAmount: new UntypedFormControl({\n        value: deductions.otherManagingCostsTotalAmount,\n        disabled: true\n      }),\n      fundName: new UntypedFormControl(''),\n      hasFund: new UntypedFormControl(true),\n      fundABN: new UntypedFormControl(''),\n      fundTFN: new UntypedFormControl(''),\n      fundAccountNumber: new UntypedFormControl(''),\n      personalSuperContributionsTotalAmount: new UntypedFormControl({\n        value: deductions.personalSuperContributionsTotalAmount,\n        disabled: true\n      }),\n      forestryManagedInvestmentSchemesDeductionsTotalAmount: new UntypedFormControl({\n        value: deductions.forestryManagedInvestmentSchemesDeductionsTotalAmount,\n        disabled: true\n      }),\n      otherDeductionsTotalAmount: new UntypedFormControl({\n        value: deductions.otherDeductionsTotalAmount,\n        disabled: true\n      }),\n      depreciationAndCapitalAllowancesTotalAmount: new UntypedFormControl({\n        value: deductions.depreciationAndCapitalAllowancesTotalAmount,\n        disabled: true\n      })\n    });\n  }\n}\n"]}
|
@@ -4,11 +4,12 @@ import { ChartAccountsHeadingListEnum } from '../../../../db/Enums';
|
|
4
4
|
import { DeductionClothingTypeEnum } from './deduction-clothing-type.enum';
|
5
5
|
import { DeductionSelfEducationTypeEnum } from './deduction-self-education-type.enum';
|
6
6
|
import { TankTypeEnum } from '../../../../db/Enums/tank-type.enum';
|
7
|
+
import { FinancialYear } from '../../../financial-year';
|
7
8
|
export class MyTaxDeductions {
|
8
9
|
/**
|
9
10
|
* can't claim the first $250 of self-education expenses (Item code D4)
|
10
11
|
*/
|
11
|
-
static { this.selfEducationNotDeductibleAmount = -250; }
|
12
|
+
static { this.selfEducationNotDeductibleAmount = new FinancialYear().year > 2022 ? 0 : -250; }
|
12
13
|
constructor(transactions, depreciations, vehicleClaim, vehicleClaimDetails, vehicleClaimRate) {
|
13
14
|
this.transactions = transactions;
|
14
15
|
this.depreciations = depreciations;
|
@@ -89,8 +90,7 @@ export class MyTaxDeductions {
|
|
89
90
|
this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');
|
90
91
|
}
|
91
92
|
calculateWorkRelatedSelfEducationTotalAmount() {
|
92
|
-
return
|
93
|
-
this.workRelatedSelfEducationExpenses.sumBy('claimAmount') - MyTaxDeductions.selfEducationNotDeductibleAmount;
|
93
|
+
return this.workRelatedSelfEducationExpenses ? this.workRelatedSelfEducationExpenses.sumBy('claimAmount') - MyTaxDeductions.selfEducationNotDeductibleAmount : 0;
|
94
94
|
}
|
95
95
|
}
|
96
|
-
//# 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';\nimport { DepreciationCollection } from '../../../../collections/depreciation.collection';\nimport { DEDUCTION_CATEGORIES } from './deduction-fields.const';\nimport { ChartAccountsHeadingListEnum } from '../../../../db/Enums';\nimport { DeductionClothingTypeEnum } from './deduction-clothing-type.enum';\nimport { DeductionSelfEducationTypeEnum } from './deduction-self-education-type.enum';\nimport { TankTypeEnum } from '../../../../db/Enums/tank-type.enum';\nimport { VehicleClaim, VehicleClaimDetails } from '../../../vehicle';\nimport { Depreciation } from '../../../depreciation/depreciation';\n\nexport class MyTaxDeductions {\n  /**\n   * can't claim the first $250 of self-education expenses (Item code D4)\n   */\n  static selfEducationNotDeductibleAmount = -250;\n\n  transactions: TransactionCollection;\n  depreciations: DepreciationCollection;\n  vehicleClaim: VehicleClaim;\n  vehicleClaimDetails: VehicleClaimDetails;\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  depreciationAndCapitalAllowancesTotalAmount: number;\n\n  constructor(\n    transactions: TransactionCollection,\n    depreciations: DepreciationCollection,\n    vehicleClaim: VehicleClaim,\n    vehicleClaimDetails: VehicleClaimDetails,\n    vehicleClaimRate: number\n  ) {\n    this.transactions = transactions;\n    this.depreciations = depreciations;\n    this.vehicleClaim = vehicleClaim;\n    this.vehicleClaimDetails = vehicleClaimDetails;\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.calculateWorkRelatedSelfEducationTotalAmount();\n    this.lowValuePoolDeductionTotalAmount = this.depreciations.getByTankType(TankTypeEnum.WORK)\n      .getLVPDepreciations().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.heading.id', DEDUCTION_CATEGORIES.otherDeductions)\n      .sumBy('claimAmount');\n    this.depreciationAndCapitalAllowancesTotalAmount = this.depreciations\n      .filter((depreciation: Depreciation) => !depreciation.isLVP())\n      .sumBy('claimAmount');\n  }\n\n  private getVehicleExpensesTotalAmount(): number {\n    if (this.vehicleClaimDetails) {\n      return this.vehicleClaimDetails.isLogbookMethod() ? this.totalExpensesAmount : this.klmsMethodClaimAmount;\n    }\n\n    return 0;\n  }\n\n  private setVehicleClaimData(): void {\n    this.klmsMethodClaimAmount = this.vehicleClaim.getKMSClaimAmount(this.vehicleClaimRate);\n    this.totalExpensesAmount = this.vehicleClaim.getLogbookClaimAmount(\n      new TransactionCollection([\n        ...this.transactions.getByTankType(this.vehicleClaim.tankType),\n        ...this.depreciations.getByTankType(this.vehicleClaim.tankType).toTransactions().toArray()\n      ])\n    );\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    this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) -\n      this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');\n  }\n\n  private calculateWorkRelatedSelfEducationTotalAmount(): number {\n    return !this.workRelatedSelfEducationExpenses ? 0 :\n      this.workRelatedSelfEducationExpenses.sumBy('claimAmount') - MyTaxDeductions.selfEducationNotDeductibleAmount;\n  }\n}\n"]}
|
96
|
+
//# 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';\nimport { DepreciationCollection } from '../../../../collections';\nimport { DEDUCTION_CATEGORIES } from './deduction-fields.const';\nimport { ChartAccountsHeadingListEnum } from '../../../../db/Enums';\nimport { DeductionClothingTypeEnum } from './deduction-clothing-type.enum';\nimport { DeductionSelfEducationTypeEnum } from './deduction-self-education-type.enum';\nimport { TankTypeEnum } from '../../../../db/Enums/tank-type.enum';\nimport { VehicleClaim, VehicleClaimDetails } from '../../../vehicle';\nimport { Depreciation } from '../../../depreciation';\nimport { FinancialYear } from '../../../financial-year';\n\nexport class MyTaxDeductions {\n  /**\n   * can't claim the first $250 of self-education expenses (Item code D4)\n   */\n  static selfEducationNotDeductibleAmount = new FinancialYear().year > 2022 ? 0 : -250;\n\n  transactions: TransactionCollection;\n  depreciations: DepreciationCollection;\n  vehicleClaim: VehicleClaim;\n  vehicleClaimDetails: VehicleClaimDetails;\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  depreciationAndCapitalAllowancesTotalAmount: number;\n\n  constructor(\n    transactions: TransactionCollection,\n    depreciations: DepreciationCollection,\n    vehicleClaim: VehicleClaim,\n    vehicleClaimDetails: VehicleClaimDetails,\n    vehicleClaimRate: number\n  ) {\n    this.transactions = transactions;\n    this.depreciations = depreciations;\n    this.vehicleClaim = vehicleClaim;\n    this.vehicleClaimDetails = vehicleClaimDetails;\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.calculateWorkRelatedSelfEducationTotalAmount();\n    this.lowValuePoolDeductionTotalAmount = this.depreciations.getByTankType(TankTypeEnum.WORK)\n      .getLVPDepreciations().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.heading.id', DEDUCTION_CATEGORIES.otherDeductions)\n      .sumBy('claimAmount');\n    this.depreciationAndCapitalAllowancesTotalAmount = this.depreciations\n      .filter((depreciation: Depreciation) => !depreciation.isLVP())\n      .sumBy('claimAmount');\n  }\n\n  private getVehicleExpensesTotalAmount(): number {\n    if (this.vehicleClaimDetails) {\n      return this.vehicleClaimDetails.isLogbookMethod() ? this.totalExpensesAmount : this.klmsMethodClaimAmount;\n    }\n\n    return 0;\n  }\n\n  private setVehicleClaimData(): void {\n    this.klmsMethodClaimAmount = this.vehicleClaim.getKMSClaimAmount(this.vehicleClaimRate);\n    this.totalExpensesAmount = this.vehicleClaim.getLogbookClaimAmount(\n      new TransactionCollection([\n        ...this.transactions.getByTankType(this.vehicleClaim.tankType),\n        ...this.depreciations.getByTankType(this.vehicleClaim.tankType).toTransactions().toArray()\n      ])\n    );\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    this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) -\n      this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');\n  }\n\n  private calculateWorkRelatedSelfEducationTotalAmount(): number {\n    return this.workRelatedSelfEducationExpenses ? this.workRelatedSelfEducationExpenses.sumBy('claimAmount') - MyTaxDeductions.selfEducationNotDeductibleAmount : 0;\n  }\n}\n"]}
|
@@ -7768,7 +7768,7 @@ class MyTaxDeductions {
|
|
7768
7768
|
/**
|
7769
7769
|
* can't claim the first $250 of self-education expenses (Item code D4)
|
7770
7770
|
*/
|
7771
|
-
static { this.selfEducationNotDeductibleAmount = -250; }
|
7771
|
+
static { this.selfEducationNotDeductibleAmount = new FinancialYear().year > 2022 ? 0 : -250; }
|
7772
7772
|
constructor(transactions, depreciations, vehicleClaim, vehicleClaimDetails, vehicleClaimRate) {
|
7773
7773
|
this.transactions = transactions;
|
7774
7774
|
this.depreciations = depreciations;
|
@@ -7849,8 +7849,7 @@ class MyTaxDeductions {
|
|
7849
7849
|
this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');
|
7850
7850
|
}
|
7851
7851
|
calculateWorkRelatedSelfEducationTotalAmount() {
|
7852
|
-
return
|
7853
|
-
this.workRelatedSelfEducationExpenses.sumBy('claimAmount') - MyTaxDeductions.selfEducationNotDeductibleAmount;
|
7852
|
+
return this.workRelatedSelfEducationExpenses ? this.workRelatedSelfEducationExpenses.sumBy('claimAmount') - MyTaxDeductions.selfEducationNotDeductibleAmount : 0;
|
7854
7853
|
}
|
7855
7854
|
}
|
7856
7855
|
|
@@ -24399,8 +24398,6 @@ class HoldingReinvestForm extends AbstractForm {
|
|
24399
24398
|
*/
|
24400
24399
|
submit() {
|
24401
24400
|
const value = this.transactionForm.getRawValue();
|
24402
|
-
console.log(value.amount);
|
24403
|
-
console.log(this.get('cashVariance').value);
|
24404
24401
|
return super.submit({
|
24405
24402
|
transaction: this.transactionForm.submit({
|
24406
24403
|
type: TransactionTypeEnum.CREDIT,
|