taxtank-core 0.32.88 → 0.32.89

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.
@@ -17,7 +17,7 @@ export class BasReportForm extends AbstractForm {
17
17
  salary: new UntypedFormControl(report.salary, Validators.required),
18
18
  taxWithheldSalary: new UntypedFormControl(report.taxWithheldSalary, Validators.required),
19
19
  taxWithheldNoABN: new UntypedFormControl(report.taxWithheldNoABN, Validators.required),
20
- taxWithheldTotal: new UntypedFormControl({ value: report.taxWithheldTotal || 0, disabled: true }),
20
+ taxWithheldTotal: new UntypedFormControl({ value: report.taxWithheldTotal, disabled: true }),
21
21
  paygTaxInstalment: new UntypedFormControl(report.paygTaxInstalment, Validators.required),
22
22
  fuelTaxCredit: new UntypedFormControl(report.fuelTaxCredit, Validators.required),
23
23
  gst: new UntypedFormControl({ value: report.gst, disabled: true }),
@@ -59,4 +59,4 @@ export class BasReportForm extends AbstractForm {
59
59
  return super.submit(data, true);
60
60
  }
61
61
  }
62
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bas-report.form.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/forms/sole/bas-report.form.ts"],"names":[],"mappings":"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","sourcesContent":["import { AbstractForm } from '../abstract.form';\nimport { BasReport } from '../../models';\nimport { UntypedFormControl, Validators } from '@angular/forms';\nimport { combineLatest } from 'rxjs';\nimport {\n  DepreciationCollection,\n  TransactionCollection\n} from '../../collections';\n\n/**\n * business activity statement report\n * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/268533936/BAS+Report\n */\nexport class BasReportForm extends AbstractForm<BasReport> {\n  constructor(report: BasReport, transactions: TransactionCollection, depreciations: DepreciationCollection) {\n    super({\n      dateFrom: new UntypedFormControl(report.dateFrom, Validators.required),\n      dateTo: new UntypedFormControl(report.dateTo, Validators.required),\n      income: new UntypedFormControl({ value: report.income, disabled: true }),\n      incomeGST: new UntypedFormControl({ value: report.incomeGST, disabled: true }, Validators.required),\n      expenseGST: new UntypedFormControl({ value: report.expenseGST, disabled: true }, Validators.required),\n      salary: new UntypedFormControl(report.salary, Validators.required),\n      taxWithheldSalary: new UntypedFormControl(report.taxWithheldSalary, Validators.required),\n      taxWithheldNoABN: new UntypedFormControl(report.taxWithheldNoABN, Validators.required),\n      taxWithheldTotal: new UntypedFormControl({ value: report.taxWithheldTotal || 0, disabled: true }),\n      paygTaxInstalment: new UntypedFormControl(report.paygTaxInstalment, Validators.required),\n      fuelTaxCredit: new UntypedFormControl(report.fuelTaxCredit, Validators.required),\n      gst: new UntypedFormControl({ value: report.gst, disabled: true }),\n    }, report);\n\n    // prefill income/expense data based on transactions/depreciations filtered by specified date\n    combineLatest([this.get('dateFrom').valueChanges, this.get('dateTo').valueChanges])\n      .subscribe(([dateFrom, dateTo]) => {\n        const filteredTransactions = transactions.filterByRange('date', dateFrom, dateTo);\n        const filteredDepreciations = depreciations.filterByRange('date', dateFrom, dateTo);\n\n        const incomeTransactions = filteredTransactions.getIncomeTransactions();\n        const expenseTransactions = new TransactionCollection(\n          filteredTransactions.getExpenseTransactions().toArray(),\n          filteredDepreciations.toArray()\n        );\n\n        // all sole income claimed as 100%\n        // @TODO temp fix, waiting for TT-3503/TT-3495 breaking changes\n        this.patchField('income', incomeTransactions.sumBy('amountWithGst'));\n        this.patchField('incomeGST', incomeTransactions.sumBy('gstAmount'));\n        this.patchField('expenseGST', expenseTransactions.filterBy('isGST', true).sumBy('gstClaimAmount'));\n      });\n\n    // calculate taxWithheldTotal\n    combineLatest([this.get('taxWithheldSalary').valueChanges, this.get('taxWithheldNoABN').valueChanges])\n      .subscribe(([taxWithheldSalary, taxWithheldNoABN]) => {\n        this.patchField('taxWithheldTotal', taxWithheldSalary + taxWithheldNoABN);\n      });\n\n    // calculate gst payable/refundable\n    combineLatest([\n      this.get('incomeGST').valueChanges,\n      this.get('expenseGST').valueChanges,\n      this.get('taxWithheldTotal').valueChanges,\n      this.get('paygTaxInstalment').valueChanges,\n      this.get('fuelTaxCredit').valueChanges,\n    ]).subscribe(([incomeGST, expenseGST, taxWithheldTotal, paygTaxInstalment, fuelTaxCredit]) => {\n      this.patchField('gst', incomeGST - expenseGST + taxWithheldTotal + paygTaxInstalment - fuelTaxCredit);\n    });\n\n    // emit init values to calculate dynamic fields\n    if (report.id) {\n      this.emitValues();\n    }\n  }\n\n  submit(data: object = {}): BasReport {\n    return super.submit(data, true);\n  }\n}\n"]}
62
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bas-report.form.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/forms/sole/bas-report.form.ts"],"names":[],"mappings":"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","sourcesContent":["import { AbstractForm } from '../abstract.form';\nimport { BasReport } from '../../models';\nimport { UntypedFormControl, Validators } from '@angular/forms';\nimport { combineLatest } from 'rxjs';\nimport {\n  DepreciationCollection,\n  TransactionCollection\n} from '../../collections';\n\n/**\n * business activity statement report\n * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/268533936/BAS+Report\n */\nexport class BasReportForm extends AbstractForm<BasReport> {\n  constructor(report: BasReport, transactions: TransactionCollection, depreciations: DepreciationCollection) {\n    super({\n      dateFrom: new UntypedFormControl(report.dateFrom, Validators.required),\n      dateTo: new UntypedFormControl(report.dateTo, Validators.required),\n      income: new UntypedFormControl({ value: report.income, disabled: true }),\n      incomeGST: new UntypedFormControl({ value: report.incomeGST, disabled: true }, Validators.required),\n      expenseGST: new UntypedFormControl({ value: report.expenseGST, disabled: true }, Validators.required),\n      salary: new UntypedFormControl(report.salary, Validators.required),\n      taxWithheldSalary: new UntypedFormControl(report.taxWithheldSalary, Validators.required),\n      taxWithheldNoABN: new UntypedFormControl(report.taxWithheldNoABN, Validators.required),\n      taxWithheldTotal: new UntypedFormControl({ value: report.taxWithheldTotal, disabled: true }),\n      paygTaxInstalment: new UntypedFormControl(report.paygTaxInstalment, Validators.required),\n      fuelTaxCredit: new UntypedFormControl(report.fuelTaxCredit, Validators.required),\n      gst: new UntypedFormControl({ value: report.gst, disabled: true }),\n    }, report);\n\n    // prefill income/expense data based on transactions/depreciations filtered by specified date\n    combineLatest([this.get('dateFrom').valueChanges, this.get('dateTo').valueChanges])\n      .subscribe(([dateFrom, dateTo]) => {\n        const filteredTransactions = transactions.filterByRange('date', dateFrom, dateTo);\n        const filteredDepreciations = depreciations.filterByRange('date', dateFrom, dateTo);\n\n        const incomeTransactions = filteredTransactions.getIncomeTransactions();\n        const expenseTransactions = new TransactionCollection(\n          filteredTransactions.getExpenseTransactions().toArray(),\n          filteredDepreciations.toArray()\n        );\n\n        // all sole income claimed as 100%\n        // @TODO temp fix, waiting for TT-3503/TT-3495 breaking changes\n        this.patchField('income', incomeTransactions.sumBy('amountWithGst'));\n        this.patchField('incomeGST', incomeTransactions.sumBy('gstAmount'));\n        this.patchField('expenseGST', expenseTransactions.filterBy('isGST', true).sumBy('gstClaimAmount'));\n      });\n\n    // calculate taxWithheldTotal\n    combineLatest([this.get('taxWithheldSalary').valueChanges, this.get('taxWithheldNoABN').valueChanges])\n      .subscribe(([taxWithheldSalary, taxWithheldNoABN]) => {\n        this.patchField('taxWithheldTotal', taxWithheldSalary + taxWithheldNoABN);\n      });\n\n    // calculate gst payable/refundable\n    combineLatest([\n      this.get('incomeGST').valueChanges,\n      this.get('expenseGST').valueChanges,\n      this.get('taxWithheldTotal').valueChanges,\n      this.get('paygTaxInstalment').valueChanges,\n      this.get('fuelTaxCredit').valueChanges,\n    ]).subscribe(([incomeGST, expenseGST, taxWithheldTotal, paygTaxInstalment, fuelTaxCredit]) => {\n      this.patchField('gst', incomeGST - expenseGST + taxWithheldTotal + paygTaxInstalment - fuelTaxCredit);\n    });\n\n    // emit init values to calculate dynamic fields\n    if (report.id) {\n      this.emitValues();\n    }\n  }\n\n  submit(data: object = {}): BasReport {\n    return super.submit(data, true);\n  }\n}\n"]}
@@ -21418,7 +21418,7 @@ class BasReportForm extends AbstractForm {
21418
21418
  salary: new UntypedFormControl(report.salary, Validators.required),
21419
21419
  taxWithheldSalary: new UntypedFormControl(report.taxWithheldSalary, Validators.required),
21420
21420
  taxWithheldNoABN: new UntypedFormControl(report.taxWithheldNoABN, Validators.required),
21421
- taxWithheldTotal: new UntypedFormControl({ value: report.taxWithheldTotal || 0, disabled: true }),
21421
+ taxWithheldTotal: new UntypedFormControl({ value: report.taxWithheldTotal, disabled: true }),
21422
21422
  paygTaxInstalment: new UntypedFormControl(report.paygTaxInstalment, Validators.required),
21423
21423
  fuelTaxCredit: new UntypedFormControl(report.fuelTaxCredit, Validators.required),
21424
21424
  gst: new UntypedFormControl({ value: report.gst, disabled: true }),