taxtank-core 0.21.5 → 0.21.8

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/db/Models/bank/bank-account.d.ts

@@ -1,12 +1,12 @@
 import { BankAccountStatusEnum } from '../../Enums/bank-account-status.enum';
 import { BankAccountTypeEnum } from '../../Enums/bank-account-type.enum';
-import { TankTypeEnum } from '../../Enums/tank-type.enum';
 import { BankConnection } from './bank-connection';
 import { BankAccountProperty } from './bank-account-property';
 import { BankTransaction } from './bank-transaction';
 import { BankAccountBalance } from './bank-account-balance';
 import { Loan } from '../loan/loan';
 import { AbstractModel } from '../abstract-model';
+import { SoleBusinessAllocation } from '../sole/sole-business-allocation';
 export declare class BankAccount extends AbstractModel {
     id?: number;
     status?: BankAccountStatusEnum;
@@ -15,7 +15,6 @@ export declare class BankAccount extends AbstractModel {
     accountName?: string;
     nickname?: string;
     accountNumber?: string;
-    tankType?: TankTypeEnum;
     currentBalance?: number;
     currency?: string;
     isManual?: boolean;
@@ -28,6 +27,7 @@ export declare class BankAccount extends AbstractModel {
     updatedAt?: Date;
     bankConnection?: BankConnection;
     bankAccountProperties?: BankAccountProperty[];
+    businessAllocations?: SoleBusinessAllocation[];
     bankTransactions?: BankTransaction[];
     balances?: BankAccountBalance[];
     loan?: Loan;

package/lib/db/Models/depreciation/depreciation.d.ts

@@ -10,6 +10,7 @@ import { DepreciationReceipt } from './depreciation-receipt';
 import { DepreciationForecast } from './depreciation-forecast';
 import { Loan } from '../loan/loan';
 import { TransactionBase } from '../transaction/transaction-base';
+import { SoleBusiness } from '../sole/sole-business';
 export declare class Depreciation extends TransactionBase {
     id?: number;
     createdAt?: Date;
@@ -39,4 +40,5 @@ export declare class Depreciation extends TransactionBase {
     loan?: Loan;
     createdBy?: User;
     updatedBy?: User;
+    business?: SoleBusiness;
 }

package/lib/db/Models/sole/sole-business-allocation.d.ts

@@ -0,0 +1,9 @@
+import { BankAccount } from '../bank/bank-account';
+import { SoleBusiness } from './sole-business';
+import { AbstractModel } from '../abstract-model';
+export declare class SoleBusinessAllocation extends AbstractModel {
+    percent?: number;
+    id?: number;
+    bankAccount?: BankAccount;
+    business?: SoleBusiness;
+}

package/lib/db/Models/sole/sole-business-loss.d.ts

@@ -0,0 +1,9 @@
+import { SoleBusiness } from './sole-business';
+import { AbstractModel } from '../abstract-model';
+export declare class SoleBusinessLoss extends AbstractModel {
+    financialYear?: number;
+    amount?: number;
+    id?: number;
+    deletedAt?: Date;
+    business?: SoleBusiness;
+}

package/lib/db/Models/sole/sole-business.d.ts

@@ -0,0 +1,26 @@
+import { User } from '../user/user';
+import { SoleBusinessAllocation } from './sole-business-allocation';
+import { SoleBusinessLoss } from './sole-business-loss';
+import { SoleInvoice } from './sole-invoice';
+import { SoleInvoiceTemplate } from './sole-invoice-template';
+import { VehicleClaim } from '../vehicle/vehicle-claim';
+import { Transaction } from '../transaction/transaction';
+import { Depreciation } from '../depreciation/depreciation';
+import { AbstractModel } from '../abstract-model';
+export declare class SoleBusiness extends AbstractModel {
+    name?: string;
+    code?: string;
+    description?: string;
+    website?: string;
+    logo?: string;
+    id?: number;
+    deletedAt?: Date;
+    user?: User;
+    allocations?: SoleBusinessAllocation[];
+    losses?: SoleBusinessLoss[];
+    invoices?: SoleInvoice[];
+    invoiceTemplates?: SoleInvoiceTemplate[];
+    vehicleClaims?: VehicleClaim[];
+    transactions?: Transaction[];
+    depreciations?: Depreciation[];
+}

package/lib/db/Models/sole/sole-contact.d.ts

@@ -0,0 +1,17 @@
+import { User } from '../user/user';
+import { Phone } from '../phone';
+import { Address } from '../address';
+import { SoleInvoice } from './sole-invoice';
+import { AbstractModel } from '../abstract-model';
+export declare class SoleContact extends AbstractModel {
+    name?: string;
+    abn?: number;
+    firstName?: string;
+    lastName?: string;
+    email?: string;
+    id?: number;
+    user?: User;
+    phone?: Phone;
+    address?: Address;
+    invoices?: SoleInvoice[];
+}

package/lib/db/Models/sole/sole-invoice-item.d.ts

@@ -0,0 +1,12 @@
+import { SoleInvoice } from './sole-invoice';
+import { ChartAccounts } from '../chart-accounts/chart-accounts';
+import { AbstractModel } from '../abstract-model';
+export declare class SoleInvoiceItem extends AbstractModel {
+    description?: string;
+    quantity?: number;
+    price?: number;
+    id?: number;
+    isGST?: boolean;
+    invoice?: SoleInvoice;
+    chartAccounts?: ChartAccounts;
+}

package/lib/db/Models/sole/sole-invoice-template.d.ts

@@ -0,0 +1,10 @@
+import { SoleBusiness } from './sole-business';
+import { BankAccount } from '../bank/bank-account';
+import { AbstractModel } from '../abstract-model';
+export declare class SoleInvoiceTemplate extends AbstractModel {
+    isTaxIncluded?: boolean;
+    term?: number;
+    id?: number;
+    business?: SoleBusiness;
+    bankAccount?: BankAccount;
+}

package/lib/db/Models/sole/sole-invoice.d.ts

@@ -0,0 +1,18 @@
+import { User } from '../user/user';
+import { SoleBusiness } from './sole-business';
+import { SoleInvoiceItem } from './sole-invoice-item';
+import { SoleContact } from './sole-contact';
+import { SoleInvoiceTemplate } from './sole-invoice-template';
+import { AbstractModel } from '../abstract-model';
+export declare class SoleInvoice extends AbstractModel {
+    number?: string;
+    dateFrom?: Date;
+    dateTo?: Date;
+    id?: number;
+    status?: number;
+    user?: User;
+    business?: SoleBusiness;
+    items?: SoleInvoiceItem[];
+    payer?: SoleContact;
+    template?: SoleInvoiceTemplate;
+}

package/lib/db/Models/transaction/transaction.d.ts

@@ -11,6 +11,7 @@ import { Loan } from '../loan/loan';
 import { TransactionBase } from './transaction-base';
 import { Property } from '../property/property';
 import { Depreciation } from '../depreciation/depreciation';
+import { SoleBusiness } from '../sole/sole-business';
 export declare class Transaction extends TransactionBase {
     id?: number;
     type?: TransactionTypeEnum;
@@ -40,4 +41,5 @@ export declare class Transaction extends TransactionBase {
     depreciation?: Depreciation;
     createdBy?: User;
     updatedBy?: User;
+    business?: SoleBusiness;
 }

package/lib/db/Models/vehicle/vehicle-claim.d.ts

@@ -1,7 +1,7 @@
 import { VehicleClaimMethodEnum } from '../../Enums/vehicle-claim-method.enum';
 import { User } from '../user/user';
-import { TankTypeEnum } from '../../Enums/tank-type.enum';
 import { AbstractModel } from '../abstract-model';
+import { SoleBusiness } from '../sole/sole-business';
 export declare class VehicleClaim extends AbstractModel {
     financialYear?: number;
     method?: VehicleClaimMethodEnum;
@@ -10,5 +10,5 @@ export declare class VehicleClaim extends AbstractModel {
     isManual?: boolean;
     id?: number;
     user?: User;
-    tankType?: TankTypeEnum;
+    business?: SoleBusiness;
 }

package/lib/db/Models/vehicle/vehicle.d.ts

@@ -1,11 +1,9 @@
 import { User } from '../user/user';
 import { VehicleLogbook } from './vehicle-logbook';
-import { TankTypeEnum } from '../../Enums/tank-type.enum';
 import { AbstractModel } from '../abstract-model';
 export declare class Vehicle extends AbstractModel {
     name?: string;
     id?: number;
     user?: User;
     logbook?: VehicleLogbook[];
-    tankType?: TankTypeEnum;
 }

package/lib/models/bank/bank-account.d.ts

@@ -1,6 +1,7 @@
 import { BankAccount as BankAccountBase } from '../../db/Models/bank/bank-account';
 import { BankAccountTypeEnum } from '../../db/Enums/bank-account-type.enum';
 import { Loan } from '../loan/loan';
+import { TankTypeEnum } from '../../db/Enums/tank-type.enum';
 import { BankAccountBalance } from '../../db/Models/bank/bank-account-balance';
 import { BankAccountProperty } from './bank-account-property';
 import { BankConnection } from './bank-connection';
@@ -43,6 +44,7 @@ export declare class BankAccount extends BankAccountBase {
      * check if bank account related to sole tank
      */
     isSoleTank(): boolean;
+    get tankType(): TankTypeEnum;
     /**
      * Get Bank account property by id
      * @param id Id of property

package/lib/models/logbook/vehicle-claim.d.ts

@@ -18,6 +18,7 @@ export declare class VehicleClaim extends VehicleClaimBase {
     isKLMsMethod(): boolean;
     isWorkTank(): boolean;
     isSoleTank(): boolean;
+    get tankType(): TankTypeEnum;
     /**
      * Claim amount for KLMs method. Exists only for KLMs method.
      */

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/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/services/event/sse.service.d.ts

@@ -4,6 +4,7 @@ import { JwtService } from '../auth/jwt.service';
 import * as i0 from "@angular/core";
 /**
  * server sent events service
+ * https://symfony.com/doc/current/mercure.html
  */
 export declare class SseService {
     private zone;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "0.21.5",
+  "version": "0.21.8",
   "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';
@@ -248,22 +249,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 +313,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';