taxtank-core 0.21.15 → 0.21.16

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.
Files changed (6) hide show
  1. package/bundles/taxtank-core.umd.js +1 -1
  2. package/bundles/taxtank-core.umd.js.map +1 -1
  3. package/esm2015/lib/models/report/my-tax/my-tax-deductions/my-tax-deductions.js +6 -3
  4. package/fesm2015/taxtank-core.js +4 -1
  5. package/fesm2015/taxtank-core.js.map +1 -1
  6. package/package.json +1 -1
package/esm2015/lib/models/report/my-tax/my-tax-deductions/my-tax-deductions.js CHANGED
@@ -1,6 +1,6 @@
1
+ import { TransactionCollection } from '../../../../collections/transaction/transaction.collection';
1
2
  import { DEDUCTION_CATEGORIES } from './deduction-fields.const';
2
3
  import { ChartAccountsHeadingListEnum } from '../../../../db/Enums/chart-accounts-heading-list.enum';
3
- import { VehicleExpenseCollection } from '../../../../collections/report/vehicle-expense/vehicle-expense.collection';
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';
@@ -67,7 +67,10 @@ 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('amount');
70
+ this.totalExpensesAmount = this.vehicleClaim.getLogbookClaimAmount(new TransactionCollection([
71
+ ...this.transactions.getByTankType(this.vehicleClaim.tankType),
72
+ ...this.depreciations.getByTankType(this.vehicleClaim.tankType).toTransactions().toArray()
73
+ ]));
71
74
  }
72
75
  /**
73
76
  * Total amount from Other work related expenses and Tools & equipment depreciations
@@ -79,4 +82,4 @@ export class MyTaxDeductions {
79
82
  this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');
80
83
  }
81
84
  }
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('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('claimAmount')) +\n      this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');\n  }\n}\n"]}
85
+ //# 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    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\n    this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) +\n      this.depreciations.filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');\n  }\n}\n"]}
package/fesm2015/taxtank-core.js CHANGED
@@ -7589,7 +7589,10 @@ class MyTaxDeductions {
7589
7589
  }
7590
7590
  setVehicleClaimData() {
7591
7591
  this.klmsMethodClaimAmount = this.vehicleClaim.getKLMsClaimAmount(this.vehicleClaimRate);
7592
- this.totalExpensesAmount = new VehicleExpenseCollection(this.transactions.getByTankType(this.vehicleClaim.tankType), this.depreciations.getByTankType(this.vehicleClaim.tankType), this.vehicleClaim).sumBy('amount');
7592
+ this.totalExpensesAmount = this.vehicleClaim.getLogbookClaimAmount(new TransactionCollection([
7593
+ ...this.transactions.getByTankType(this.vehicleClaim.tankType),
7594
+ ...this.depreciations.getByTankType(this.vehicleClaim.tankType).toTransactions().toArray()
7595
+ ]));
7593
7596
  }
7594
7597
  /**
7595
7598
  * Total amount from Other work related expenses and Tools & equipment depreciations