taxtank-core 0.21.6 → 0.21.9

package/lib/collections/chart-accounts.collection.d.ts

@@ -0,0 +1,8 @@
+import { Collection } from './collection';
+import { ChartAccounts } from '../models/chart-accounts/chart-accounts';
+export declare class ChartAccountsCollection extends Collection<ChartAccounts> {
+    /**
+     * Get 'Klms travelled for work' related chart account value
+     */
+    getVehicleKlmsRate(year?: number): number;
+}

package/lib/collections/collection.d.ts

@@ -34,4 +34,6 @@ export declare class Collection<Model extends AbstractModel> implements Iterable
     replaceBy(path: string, value: any, item: Model): this;
     remove(items: Model[]): this;
     removeBy(path: string, values: any): this;
+    minBy(path: string): Model;
+    maxBy(path: string): Model;
 }

package/lib/db/Enums/income-source-forecast-trust-type.enum.d.ts

@@ -0,0 +1,13 @@
+export declare enum IncomeSourceForecastTrustTypeEnum {
+    SPECIAL_DISABILITY_TRUST = 1,
+    DECEASED_ESTATE = 2,
+    FIXED_TRUST = 3,
+    HYBRID_TRUST = 4,
+    DISCRETIONARY_SERVICE_TRUST = 5,
+    DISCRETIONARY_TRADING_TRUST = 6,
+    DISCRETIONARY_INVESTMENT_TRUST = 7,
+    CASH_MANAGEMENT_UNIT_TRUST = 8,
+    PUBLIC_UNIT_TRUST_LISTED = 9,
+    PUBLIC_UNIT_TRUST_UNLISTED = 10,
+    TESTAMENTARY_TRUST = 11
+}

package/lib/db/Enums/income-source-type-list-other.enum.d.ts

@@ -1,6 +1,7 @@
 export declare enum IncomeSourceTypeListOtherEnum {
     PSI = 6,
     SOLE_TRADER = 7,
-    PARTNERSHIPS_AND_TRUSTS = 9,
-    OTHER_INCOME = 10
+    TRUSTS = 9,
+    OTHER_INCOME = 10,
+    PARTNERSHIPS = 12
 }

package/lib/db/Models/incomeSource/income-source-forecast.d.ts

@@ -1,13 +1,15 @@
+import { IncomeSourceForecastTrustTypeEnum } from '../../Enums/income-source-forecast-trust-type.enum';
 import { IncomeSource } from './income-source';
 import { IncomeSourceType } from './income-source-type';
 import { AbstractModel } from '../abstract-model';
 export declare class IncomeSourceForecast extends AbstractModel {
-    id?: number;
     financialYear?: number;
     amount?: number;
     tax?: number;
     taxInstalments?: number;
     frankingCredits?: number;
+    trustType?: IncomeSourceForecastTrustTypeEnum;
+    id?: number;
     incomeSource?: IncomeSource;
     incomeSourceType?: IncomeSourceType;
 }

package/lib/forms/report/my-tax/my-tax-partnerships-and-trusts.form.d.ts

@@ -1,5 +1,5 @@
 import { AbstractForm } from '../../abstract.form';
-import { MyTaxPartnershipsAndTrusts } from '../../../models/report/my-tax/my-tax-partnerships-and-trusts/my-tax-partnerships-and-trusts';
+import { MyTaxPartnershipsAndTrusts } from '../../../models/report/my-tax';
 export declare class MyTaxPartnershipsAndTrustsForm extends AbstractForm<MyTaxPartnershipsAndTrusts> {
     constructor(partnershipsAndTrusts: MyTaxPartnershipsAndTrusts);
 }

package/lib/interfaces/income-source-forecast.interface.d.ts

@@ -1,4 +1,5 @@
 import { IncomeSource } from "../models/income-source/income-source";
+import { IncomeSourceForecastTrustTypeEnum } from '../db/Enums/income-source-forecast-trust-type.enum';
 /**
  * Interface for income source forecasts
  */
@@ -7,4 +8,5 @@ export interface IIncomeSourceForecast {
     financialYear?: number;
     incomeSource?: IncomeSource;
     netPay?: number;
+    trustType?: IncomeSourceForecastTrustTypeEnum;
 }

package/lib/models/report/my-tax/index.d.ts

@@ -0,0 +1,20 @@
+/**
+ * 'My Tax' report related data (classes, enums, const, e.t.c)
+ */
+export * from './my-tax-business-or-losses/my-tax-business-or-losses';
+export * from './my-tax-deductions/my-tax-deductions';
+export * from './my-tax-deductions/deduction-fields.const';
+export * from './my-tax-deductions/deduction-self-education-type.enum';
+export * from './my-tax-deductions/deduction-clothing-type.enum';
+export * from './my-tax-dividends/my-tax-dividends';
+export * from './my-tax-employee-share-schemes/my-tax-employee-share-schemes';
+export * from './my-tax-estimate/my-tax-estimate';
+export * from './my-tax-income-statements/my-tax-income-statements';
+export * from './my-tax-income-tests/my-tax-income-tests';
+export * from './my-tax-interest/my-tax-interest';
+export * from './my-tax-losses/my-tax-losses';
+export * from './my-tax-offsets/my-tax-offsets';
+export * from './my-tax-other-income/my-tax-other-income';
+export * from './my-tax-partnerships-and-trusts/my-tax-partnerships-and-trusts';
+export * from './my-tax-rent/my-tax-rent';
+export * from './ato-links';

package/lib/models/report/my-tax/my-tax-deductions/my-tax-deductions.d.ts

@@ -31,6 +31,7 @@ export declare class MyTaxDeductions {
     forestryManagedInvestmentSchemesDeductionsTotalAmount: number;
     otherDeductionsTotalAmount: number;
     constructor(transactions: TransactionCollection, depreciations: DepreciationCollection, vehicleClaim: VehicleClaim, vehicleClaimRate: number);
+    private getVehicleExpensesTotalAmount;
     private setVehicleClaimData;
     /**
      * Total amount from Other work related expenses and Tools & equipment depreciations

package/lib/models/report/my-tax/my-tax-estimate/my-tax-estimate.d.ts

@@ -0,0 +1,20 @@
+import { ReportItem } from '../../../tax-summary/report-item';
+import { TaxSummary } from '../../../tax-summary/tax-summary';
+/**
+ * @Todo add link to documentation about related fields, add comments to methods
+ */
+export declare class MyTaxEstimate {
+    taxableIncome: number;
+    taxPayable: number;
+    grossTaxPayable: number;
+    medicareLevy: number;
+    medicareLevySurcharge: number;
+    taxCredits: number;
+    lowMiddleIncomeTaxOffsets: number;
+    percentageOfTaxPaid: number;
+    taxOffsets: number;
+    netRefund: number;
+    static fromTaxSummary(taxSummary: TaxSummary): MyTaxEstimate;
+    static getLowMiddleIncomeTaxOffsets(taxOffsetsReportItem: ReportItem): number;
+    static getTaxOffsets(taxOffsetsReportItemAmount: number, lowMiddleIncomeTaxOffsets: number): number;
+}

package/lib/models/report/my-tax/my-tax-partnerships-and-trusts/my-tax-partnerships-and-trusts.d.ts

@@ -1,10 +1,14 @@
 import { TransactionCollection } from '../../../../collections/transaction/transaction.collection';
+import { IncomeSourceForecastTrustTypeEnum } from '../../../../db/Enums/income-source-forecast-trust-type.enum';
+import { IncomeSourceCollection } from '../../../../collections/income-source.collection';
 export declare class MyTaxPartnershipsAndTrusts {
     transactions: TransactionCollection;
+    incomeSources: IncomeSourceCollection;
     partnershipIncomes: TransactionCollection;
     partnershipExpenses: TransactionCollection;
     trustsIncomes: TransactionCollection;
     trustsExpenses: TransactionCollection;
+    trustType: IncomeSourceForecastTrustTypeEnum;
     netNonPrimaryProductionAmount: number;
     partnershipsNetIncome: number;
     trustsNetIncome: number;
@@ -13,5 +17,9 @@ export declare class MyTaxPartnershipsAndTrusts {
     taxPaidTotal: number;
     frankingCreditsTotal: number;
     taxOffsetNRASTotalAmount: number;
-    constructor(transactions: TransactionCollection);
+    constructor(transactions: TransactionCollection, incomeSources: IncomeSourceCollection);
+    /**
+     * Get Income source forecast trust type, related to trust income with max amount
+     */
+    private getTrustType;
 }

package/lib/models/tax-summary/report-item.d.ts

@@ -2,16 +2,23 @@ import { TaxReturnCategory } from '../../db/Models/tax-return/tax-return-categor
 import { ReportItemDetails } from './report-item-details';
 import { ReportItemCollection } from '../../collections/tax-summary/report-item.collection';
 import { AbstractModel } from '../../db/Models/abstract-model';
+import { Collection } from '../../collections/collection';
 /**
+ * @Todo no base model - should be generated on backend side
  * Used in tax summary reports to show amounts relating to a tax return category entity and details of what this
  * amount is comprised of. Example here shows an amount of $951.96 and also details of what this amount is comprised of:
  */
 export declare class ReportItem extends AbstractModel {
     amount: number;
-    details: ReportItemDetails[];
     taxReturnCategory: TaxReturnCategory;
     title: string;
     items: ReportItemCollection;
+    /**
+     * @Todo Alex: We need to apply this everywhere - transform an array into a collection,
+     * but at the moment we can't do this due to inheritance from the base model.
+     * Potential solution: Inherit Collection from Array
+     */
+    details: Collection<ReportItemDetails>;
     /**
      * Get amount for one income source
      * @param name Name of income source for filter

package/lib/validators/conditional.validator.d.ts

@@ -0,0 +1,2 @@
+import { AbstractControl, ValidatorFn } from '@angular/forms';
+export declare function conditionalValidator(condition: (control: AbstractControl) => boolean, validator: (control: AbstractControl) => object | null): ValidatorFn;

package/lib/validators/index.d.ts

@@ -1,4 +1,5 @@
 export * from './at-least-one.validator';
 export * from './autocomplete.validator';
+export * from './conditional.validator';
 export * from './password.validator';
 export * from './password-match.validator';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "0.21.6",
+  "version": "0.21.9",
   "private": false,
   "peerDependencies": {
     "@angular/common": "^12.2.3 || ~13.0.0",

package/public-api.d.ts

@@ -9,6 +9,7 @@ export * from './lib/collections/collection';
 export * from './lib/collections/account-setup-item.collection';
 export * from './lib/collections/bank-account.collection';
 export * from './lib/collections/bank-transaction.collection';
+export * from './lib/collections/chart-accounts.collection';
 export * from './lib/collections/client.collection';
 export * from './lib/collections/client-movement.collection';
 export * from './lib/collections/client-portfolio-report.collection';
@@ -73,6 +74,7 @@ export * from './lib/db/Enums/depreciation-calculation-percent.enum';
 export * from './lib/db/Enums/depreciation-type.enum';
 export * from './lib/db/Enums/depreciation-write-off-amount.enum';
 export * from './lib/db/Enums/firm-type.enum';
+export * from './lib/db/Enums/income-source-forecast-trust-type.enum';
 export * from './lib/db/Enums/income-source-type.enum';
 export * from './lib/db/Enums/income-source-type-list-other.enum';
 export * from './lib/db/Enums/income-source-type-list-sole.enum';
@@ -248,22 +250,7 @@ export * from './lib/models/registration-invite/registration-invite';
 export * from './lib/models/report/depreciation/depreciation-lvp-report-item';
 export * from './lib/models/report/depreciation/depreciation-report-item';
 export * from './lib/models/report/depreciation/depreciation-lvp-asset-type.enum';
-export * from './lib/models/report/my-tax/ato-links';
-export * from './lib/models/report/my-tax/my-tax-business-or-losses/my-tax-business-or-losses';
-export * from './lib/models/report/my-tax/my-tax-deductions/my-tax-deductions';
-export * from './lib/models/report/my-tax/my-tax-deductions/deduction-clothing-type.enum';
-export * from './lib/models/report/my-tax/my-tax-deductions/deduction-fields.const';
-export * from './lib/models/report/my-tax/my-tax-deductions/deduction-self-education-type.enum';
-export * from './lib/models/report/my-tax/my-tax-dividends/my-tax-dividends';
-export * from './lib/models/report/my-tax/my-tax-employee-share-schemes/my-tax-employee-share-schemes';
-export * from './lib/models/report/my-tax/my-tax-income-statements/my-tax-income-statements';
-export * from './lib/models/report/my-tax/my-tax-income-tests/my-tax-income-tests';
-export * from './lib/models/report/my-tax/my-tax-interest/my-tax-interest';
-export * from './lib/models/report/my-tax/my-tax-losses/my-tax-losses';
-export * from './lib/models/report/my-tax/my-tax-offsets/my-tax-offsets';
-export * from './lib/models/report/my-tax/my-tax-other-income/my-tax-other-income';
-export * from './lib/models/report/my-tax/my-tax-partnerships-and-trusts/my-tax-partnerships-and-trusts';
-export * from './lib/models/report/my-tax/my-tax-rent/my-tax-rent';
+export * from './lib/models/report/my-tax';
 export * from './lib/models/report/property/property-report-item';
 export * from './lib/models/report/property/property-report-item-transaction';
 export * from './lib/models/report/vehicle-expense/vehicle-expense';
@@ -327,6 +314,7 @@ export * from './lib/services/http/chat/message-document/message-document.servic
 export * from './lib/services/http/firm/client-invite/client-invite.service';
 export * from './lib/services/http/firm/client-movement/client-movement.service';
 export * from './lib/services/http/firm/portfolio-report/client-portfolio-report.service';
+export * from './lib/services/http/firm/portfolio-report/client-portfolio-report.service';
 export * from './lib/services/http/depreciation/depreciation-capital-project/depreciation-capital-project.service';
 export * from './lib/services/http/depreciation/depreciation.service';
 export * from './lib/services/http/document/document-folder/document-folder.service';