taxtank-core 0.21.8 → 0.21.11

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/chart-accounts-heading-list.enum.d.ts

@@ -12,6 +12,13 @@ export declare enum ChartAccountsHeadingListEnum {
     HOME_OFFICE_RUNNING = 17,
     TOOLS_EQUIPMENT = 18,
     HOME_OFFICE_OCCUPANCY = 19,
+    AWARD_OVERTIME_MEAL_ALLOWANCE_EXPENSE = 20,
+    NEWSPAPER = 21,
+    PRINTING_POSTAGE_STATIONERY = 22,
+    SEMINARS_ETC = 23,
+    TELEPHONE = 24,
+    UNION_FEES = 25,
+    OTHER = 26,
     DONATIONS = 27,
     PSI = 30,
     BONUSES = 34,

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/abstract.form.d.ts

@@ -2,6 +2,7 @@ import { AbstractControl, AbstractControlOptions, AsyncValidatorFn, FormGroup, V
 import { EventEmitter, Type } from '@angular/core';
 /**
  * Abstract form class
+ * @TODO rename to AbstractFormGroup
  */
 export declare abstract class AbstractForm<Model> extends FormGroup {
     protected modelClass: Type<Model>;
@@ -17,5 +18,8 @@ export declare abstract class AbstractForm<Model> extends FormGroup {
      * @param data Additional data object which be merged to form value
      */
     submit(data?: object): Model;
+    addControl(name: string, control: AbstractControl, options?: {
+        emitEvent?: boolean;
+    }): this;
     private createModelInstance;
 }

package/lib/forms/bank/bank-account/bank-account-add-manual.form.d.ts

@@ -1,11 +1,11 @@
-import { AbstractForm } from '../../abstract.form';
 import { BankAccount } from '../../../models/bank/bank-account';
 import { BankConnection } from '../../../models/bank/bank-connection';
 import { IEventListener } from '../../../interfaces/event-listener.interface';
+import { BankAccountAllocationForm } from './bank-account-allocation.form';
 /**
  * Form is using for single manual bank account creation (not Basiq)
  */
-export declare class BankAccountAddManualForm extends AbstractForm<BankAccount> implements IEventListener {
+export declare class BankAccountAddManualForm extends BankAccountAllocationForm implements IEventListener {
     private connection;
     static accountNumberPattern: string;
     constructor(connection: BankConnection);
@@ -14,10 +14,6 @@ export declare class BankAccountAddManualForm extends AbstractForm<BankAccount>
      * Add/Remove loan form depends on selected bank account type
      */
     private listenTypeChanges;
-    /**
-     * Add/Remove bank account properties form depends on selected tank type
-     */
-    private listenTankTypeChanges;
     /**
      * Attach bank connection to manual bank account
      */

package/lib/forms/bank/bank-account/bank-account-allocation.form.d.ts

@@ -0,0 +1,7 @@
+import { AbstractForm } from '../../abstract.form';
+import { BankAccount } from '../../../models/bank/bank-account';
+export declare class BankAccountAllocationForm extends AbstractForm<BankAccount> {
+    private bankAccount?;
+    constructor(bankAccount?: BankAccount);
+    watchTankType(): void;
+}

package/lib/forms/bank/bank-account/bank-account-import.form.d.ts

@@ -1,15 +1,9 @@
-import { AbstractForm } from '../../abstract.form';
 import { BankAccount } from '../../../models/bank/bank-account';
-import { IEventListener } from '../../../interfaces/event-listener.interface';
+import { BankAccountAllocationForm } from './bank-account-allocation.form';
 /**
  * Form is using for import basiq bank accounts.
  * Basiq accounts has all data except tank type, properties and loan partially
  */
-export declare class BankAccountImportForm extends AbstractForm<BankAccount> implements IEventListener {
+export declare class BankAccountImportForm extends BankAccountAllocationForm {
     constructor(bankAccount: BankAccount);
-    listenEvents(): void;
-    /**
-     * Add/Remove bank account properties form depends on selected tank type
-     */
-    private listenTankTypeChanges;
 }

package/lib/forms/bank/bank-account/bank-account-properties.form.d.ts

@@ -2,6 +2,7 @@ import { FormArray } from '@angular/forms';
 import { BankAccountProperty } from '../../../models/bank/bank-account-property';
 /**
  * Form array with bank account properties
+ * @TODO create AbstractFormArray
  */
 export declare class BankAccountPropertiesForm extends FormArray {
     constructor(bankAccountProperties?: BankAccountProperty[]);

package/lib/forms/index.d.ts

@@ -1,4 +1,5 @@
 export * from './abstract.form';
+export * from './bank/bank-account/bank-account-allocation.form';
 export * from './bank/bank-account/bank-account-import.form';
 export * from './bank/bank-account/bank-account-loan.form';
 export * from './bank/bank-account/bank-account-add-manual.form';

package/lib/forms/report/my-tax/my-tax-deductions.form.d.ts

@@ -1,5 +1,5 @@
 import { AbstractForm } from '../../abstract.form';
-import { MyTaxDeductions } from '../../../models/report/my-tax/my-tax-deductions/my-tax-deductions';
+import { MyTaxDeductions } from '../../../models/report/my-tax';
 export declare class MyTaxDeductionsForm extends AbstractForm<MyTaxDeductions> {
     constructor(deductions: MyTaxDeductions);
 }

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/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/report/my-tax/my-tax-rent/my-tax-rent.d.ts

@@ -1,11 +1,21 @@
 import { TransactionCollection } from '../../../../collections/transaction/transaction.collection';
 import { DepreciationCollection } from '../../../../collections/depreciation.collection';
+import { TaxSummary } from '../../../tax-summary/tax-summary';
+import { TaxSummarySection } from '../../../tax-summary/tax-summary-section';
 export declare class MyTaxRent {
     propertyExpenses: TransactionCollection;
+    taxSummaryPropertySection: TaxSummarySection;
     grossRentAmount: number;
     interestDeductionsAmount: number;
     capitalWorksDeductionsAmount: number;
     otherRentalDeductionsAmount: number;
     netRent: number;
-    constructor(transactions: TransactionCollection, depreciations: DepreciationCollection);
+    constructor(transactions: TransactionCollection, depreciations: DepreciationCollection, taxSummary: TaxSummary);
+    /**
+     * @Todo Vik remove when TT-2009 will be implemented.
+     * We use tax summary data here because claim amount from depreciation is different
+     * from the claim amount that we get from tax summary (depreciation claim amount is not affected by property share,
+     * property contract date, e.t.c.). Details in the TT-2009 task
+     */
+    private calculateOtherRentalDeductionsAmount;
 }

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/fields-sum.validator.d.ts

@@ -0,0 +1,8 @@
+import { ValidatorFn } from '@angular/forms';
+/**
+ * Validator that check if sum amount of provided fields is greater than provided sum
+ * @param field to check in each formArray element
+ * @param summary to compare with fields sum
+ * @param fieldAlias to show it in error message
+ */
+export declare function fieldsSumValidator(field: string, summary?: number, fieldAlias?: string): 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.8",
+  "version": "0.21.11",
   "private": false,
   "peerDependencies": {
     "@angular/common": "^12.2.3 || ~13.0.0",

package/public-api.d.ts

@@ -74,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';