taxtank-core 0.24.4 → 0.25.0

package/lib/collections/depreciation.collection.d.ts

@@ -4,6 +4,7 @@ import { Depreciation } from '../models/depreciation/depreciation';
 import { DepreciationCapitalProject } from '../models/depreciation/depreciation-capital-project';
 import { TransactionCollection } from './transaction/transaction.collection';
 import { ChartAccountsCategoryEnum } from '../db/Enums/chart-accounts-category.enum';
+import { VehicleClaim } from '../models';
 export declare class DepreciationCollection extends Collection<Depreciation> {
     /**
      * Get total amount of all depreciations in the collection
@@ -30,10 +31,14 @@ export declare class DepreciationCollection extends Collection<Depreciation> {
     /**
      * Get a new collection of depreciations related to vehicles
      */
-    getVehicleDepreciations(): DepreciationCollection;
+    getVehicleDepreciations(): this;
     getByTankType(tankType: TankTypeEnum): this;
     /**
      * Create TransactionCollection from depreciation items
      */
     toTransactions(): TransactionCollection;
+    /**
+     * Get depreciations by vehicle claim. Only vehicle depreciations may be related to vehicle claim
+     */
+    getByVehicleClaim(vehicleClaim: VehicleClaim): this;
 }

package/lib/collections/index.d.ts

@@ -0,0 +1 @@
+export * from './vehicle';

package/lib/collections/loan/loan-payment.collection.d.ts

@@ -1,7 +1,11 @@
 import { ExportableCollection } from '../exportable.collection';
 import { ExportCell } from '../../models/export/export-cell';
 import { LoanPayment } from '../../models/loan/loan-payment';
+import { FinancialYear } from '../../models/financial-year/financial-year';
 export declare class LoanPaymentCollection extends ExportableCollection<LoanPayment> {
     getExportHeader(): string[];
     getExportBody(): ExportCell[][];
+    get paymentDue(): number;
+    getByFinYear(finYear?: FinancialYear): this;
+    getForCurrentYear(): this;
 }

package/lib/collections/loan/loan.collection.d.ts

@@ -1,5 +1,7 @@
 import { Collection } from '../collection';
 import { Loan } from '../../models/loan/loan';
+import { CollectionDictionary } from '../collection-dictionary';
+import { LoanPaymentCollection } from './loan-payment.collection';
 export declare class LoanCollection extends Collection<Loan> {
     /**
      * Get new collection of loans filtered by bank accounts ids
@@ -11,4 +13,8 @@ export declare class LoanCollection extends Collection<Loan> {
      * @param id id of bank account
      */
     getByBankAccountId(id: number): Loan;
+    /**
+     * Get list of current fin year payments grouped by loan id
+     */
+    groupCurrentYearPaymentsByLoans(): CollectionDictionary<LoanPaymentCollection>;
 }

package/lib/collections/report/vehicle-expense/vehicle-expense.collection.d.ts

@@ -2,7 +2,7 @@ import { Collection } from '../../collection';
 import { VehicleExpense } from '../../../models/report/vehicle-expense/vehicle-expense';
 import { TransactionCollection } from '../../transaction/transaction.collection';
 import { DepreciationCollection } from '../../depreciation.collection';
-import { VehicleClaim } from '../../../models/logbook/vehicle-claim';
+import { VehicleClaim } from '../../../models/vehicle/vehicle-claim';
 export declare class VehicleExpenseCollection extends Collection<VehicleExpense> {
     constructor(transactions: TransactionCollection, depreciations: DepreciationCollection, vehicleClaim: VehicleClaim);
     private setItems;

package/lib/collections/transaction/transaction.collection.d.ts

@@ -6,6 +6,7 @@ import { ExportableCollection } from '../exportable.collection';
 import { ExportCell } from '../../models/export/export-cell';
 import { Collection } from '../collection';
 import { TransactionMetadata } from '../../models/transaction/transaction-metadata';
+import { VehicleClaim } from '../../models';
 /**
  * Collection of transactions
  */
@@ -82,4 +83,12 @@ export declare class TransactionCollection extends ExportableCollection<Transact
     getExportHeader(): string[];
     getExportFooter(): ExportCell[];
     getExportBody(): ExportCell[][];
+    /**
+     * Get list of vehicle transactions filtered by vehicle claim
+     */
+    getByVehicleClaim(vehicleClaim: VehicleClaim): this;
+    /**
+     * Get list of vehicle transactions except KLMS transactions
+     */
+    getLogbookTransactions(): this;
 }

package/lib/collections/vehicle/index.d.ts

@@ -0,0 +1,2 @@
+export * from './vehicle-claim.collection';
+export * from './vehicle-logbook.collection';

package/lib/collections/vehicle/vehicle-claim.collection.d.ts

@@ -0,0 +1,14 @@
+import { Collection } from '../collection';
+import { VehicleClaim } from '../../models';
+export declare class VehicleClaimCollection extends Collection<VehicleClaim> {
+    /**
+     * Get remaining kilometers limit. Total limit ({@link VehicleClaim.totalKmsLimit}) - claimed kilometers from other vehicle claims
+     * @param claim may not exist when user come to vehicle claim page 1st time and not created claim yet
+     */
+    getKlmsLimitForClaim(claim?: VehicleClaim): number;
+    /**
+     * Get remaining work usage limit. Total limit ({@link VehicleClaim.totalWorkUsagePercent}) - claimed percent from other vehicle claims
+     * @param claim may not exist when user come to vehicle claim page 1st time and not created claim yet
+     */
+    getWorkUsageLimitForClaim(claim?: VehicleClaim): number;
+}

package/lib/collections/vehicle/vehicle-logbook.collection.d.ts

@@ -0,0 +1,38 @@
+import { Collection } from '../collection';
+import { LogbookPeriod, VehicleClaim, VehicleLogbook } from '../../models';
+export declare class VehicleLogbookCollection extends Collection<VehicleLogbook> {
+    /**
+     * Best period may be calculated only when user has logbooks minimum for {@link VehicleLogbook.periodDuration}
+     * @TODO Vik: Best period: move this and related logic to backend
+     */
+    isBestPeriodExist(): boolean;
+    /**
+     * Get collection of non-personal logbooks (work-related, sole-related).
+     * @TODO Vik: Best period: move this and related logic to backend
+     */
+    getClaimableLogbooks(): this;
+    /**
+     * Logbook Period is the best when it has the biggest work usage percent
+     * Best period duration is defined as {@link VehicleLogbook.periodDuration} by the ATO
+     * @TODO Vik: Best period: move this and related logic to backend
+     */
+    getBestPeriod(): LogbookPeriod;
+    /**
+     * Calculate total kilometers traveled
+     */
+    get kilometers(): number;
+    /**
+     * Calculate work usage (percent of business-related kilometers from total kilometers)
+     * @TODO Alex: TT-2089 replace with getter
+     */
+    getWorkUsage(): number;
+    /**
+     * Get LOGBOOK_PERIOD_DURATION date range from passed start date
+     * @TODO Vik: Best period: move this and related logic to backend
+     */
+    private getPeriodRange;
+    /**
+     * Get list of logbooks related to passed vehicle claim
+     */
+    getByVehicleClaim(claim: VehicleClaim): this;
+}

package/lib/db/Enums/bank-account-type.enum.d.ts

@@ -2,7 +2,6 @@ export declare enum BankAccountTypeEnum {
     TRANSACTION = 1,
     SAVINGS = 2,
     CREDIT_CARD = 3,
-    MORTGAGE = 4,
     LOAN = 5,
     INVESTMENT = 6,
     TERM_DEPOSIT = 7,

package/lib/db/Enums/vehicle-claim-details-method.enum.d.ts

@@ -0,0 +1,4 @@
+export declare enum VehicleClaimDetailsMethodEnum {
+    KMS = 1,
+    LOGBOOK = 2
+}

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

@@ -7,6 +7,7 @@ import { VehicleClaim } from '../vehicle/vehicle-claim';
 import { Transaction } from '../transaction/transaction';
 import { Depreciation } from '../depreciation/depreciation';
 import { AbstractModel } from '../abstract-model';
+import { VehicleLogbook } from '../vehicle/vehicle-logbook';
 export declare class SoleBusiness extends AbstractModel {
     name?: string;
     code?: string;
@@ -21,6 +22,7 @@ export declare class SoleBusiness extends AbstractModel {
     invoices?: SoleInvoice[];
     invoiceTemplates?: SoleInvoiceTemplate[];
     vehicleClaims?: VehicleClaim[];
+    vehicleLogbooks?: VehicleLogbook[];
     transactions?: Transaction[];
     depreciations?: Depreciation[];
 }

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

@@ -2,6 +2,7 @@ import { SoleBusiness } from './sole-business';
 import { BankAccount } from '../bank/bank-account';
 import { AbstractModel } from '../abstract-model';
 export declare class SoleInvoiceTemplate extends AbstractModel {
+    name?: string;
     isTaxIncluded?: boolean;
     term?: number;
     id?: number;

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

@@ -2,6 +2,7 @@ import { Property } from '../property/property';
 import { ChartAccounts } from '../chart-accounts/chart-accounts';
 import { AbstractModel } from '../abstract-model';
 import { SoleBusiness } from '../sole/sole-business';
+import { TankTypeEnum } from '../../Enums/tank-type.enum';
 export declare class TransactionBase extends AbstractModel {
     id?: number;
     amount?: number;
@@ -16,6 +17,7 @@ export declare class TransactionBase extends AbstractModel {
      */
     file: File;
     claimPercent?: number;
+    get tankType(): TankTypeEnum;
     /**
      * Check if current tank is Property
      */

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

@@ -0,0 +1,10 @@
+import { VehicleClaimDetailsMethodEnum } from '../../Enums/vehicle-claim-details-method.enum';
+import { User } from '../user/user';
+import { AbstractModel } from '../abstract-model';
+export declare class VehicleClaimDetails extends AbstractModel {
+    financialYear?: number;
+    method?: VehicleClaimDetailsMethodEnum;
+    isManual?: boolean;
+    id?: number;
+    user?: User;
+}

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

@@ -1,14 +1,12 @@
-import { VehicleClaimMethodEnum } from '../../Enums/vehicle-claim-method.enum';
 import { User } from '../user/user';
 import { AbstractModel } from '../abstract-model';
 import { SoleBusiness } from '../sole/sole-business';
+import { VehicleClaimDetails } from './vehicle-claim-details';
 export declare class VehicleClaim extends AbstractModel {
-    financialYear?: number;
-    method?: VehicleClaimMethodEnum;
+    id?: number;
     kilometers?: number;
     workUsage?: number;
-    isManual?: boolean;
-    id?: number;
+    details?: VehicleClaimDetails;
     user?: User;
     business?: SoleBusiness;
 }

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

@@ -1,16 +1,17 @@
-import { VehicleLogbookPurposeEnum } from '../../Enums/vehicle-logbook-purpose.enum';
 import { Vehicle } from './vehicle';
 import { User } from '../user/user';
+import { SoleBusiness } from '../sole/sole-business';
 import { AbstractModel } from '../abstract-model';
 export declare class VehicleLogbook extends AbstractModel {
     date?: Date;
     odometerStart?: number;
     odometerEnd?: number;
-    purpose?: VehicleLogbookPurposeEnum;
+    isPersonal?: boolean;
     description?: string;
     id?: number;
     createdAt?: Date;
     updatedAt?: Date;
+    business?: SoleBusiness;
     vehicle?: Vehicle;
     createdBy?: User;
     updatedBy?: User;

package/lib/forms/abstract.form.d.ts

@@ -3,15 +3,25 @@ import { EventEmitter, Type } from '@angular/core';
 /**
  * Abstract form class
  * @TODO rename to AbstractFormGroup
+ * @TODO Alex: refactor: check and improve logic
  */
 export declare abstract class AbstractForm<Model> extends FormGroup {
+    /**
+     * Initial form value for comparison with changes to check saved/unsaved state
+     */
+    private initialValue;
     protected modelClass: Type<Model>;
     model: Model;
     submitted: boolean;
+    /**
+     * Flag display if some form values changed
+     */
+    unsaved: boolean;
     onSubmit: EventEmitter<Model>;
     protected constructor(controls: {
         [key: string]: AbstractControl;
     }, model?: Model, validatorOrOpts?: ValidatorFn | ValidatorFn[] | AbstractControlOptions | null, asyncValidator?: AsyncValidatorFn | AsyncValidatorFn[] | null);
+    get saved(): boolean;
     /**
      * Check validation and return a new instance of generic model.
      * Merge form value to initial object
@@ -21,5 +31,7 @@ export declare abstract class AbstractForm<Model> extends FormGroup {
     addControl(name: string, control: AbstractControl, options?: {
         emitEvent?: boolean;
     }): this;
+    markAsUnsaved(): void;
+    markAsSaved(): void;
     private createModelInstance;
 }

package/lib/forms/index.d.ts

@@ -1,7 +1,7 @@
 export * from './abstract.form';
+export * from './loan';
 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';
 export * from './bank/bank-account/bank-account-properties.form';
 export * from './bank/bank-account/bank-accounts-import.form';
@@ -11,7 +11,6 @@ export * from './login/login.form';
 export * from './register/register-client.form';
 export * from './register/register-firm.form';
 export * from './user';
-export * from './vehicle/vehicle.form';
-export * from './vehicle/vehicle-claim.form';
 export * from './report/my-tax';
 export * from './sole';
+export * from './vehicle';

package/lib/forms/loan/index.d.ts

@@ -0,0 +1 @@
+export * from './loan.form';

package/lib/forms/loan/loan.form.d.ts

@@ -0,0 +1,25 @@
+import { AbstractForm } from '../abstract.form';
+import { Loan } from '../../models/loan/loan';
+import { LoanTypeEnum } from '../../db/Enums/loan-type.enum';
+/**
+ * Form with loan details.
+ * Loan could be created from bank account (Bank Loan) or directly from loan page (Vehicle Loan)
+ */
+export declare class LoanForm extends AbstractForm<Loan> {
+    private loan;
+    static mortgageLoanTypes: LoanTypeEnum[];
+    constructor(loan?: Loan);
+    listenEvents(): void;
+    /**
+     * Set term automatically by loan type changes
+     */
+    listenTypeChanges(): void;
+    /**
+     * term validation depends on selected repaymentFrequency
+     */
+    listenRepaymentFrequencyChanges(): void;
+    /**
+     * For vehicle loans term has a maximum value depended of repayment frequency
+     */
+    private updateTermValidation;
+}

package/lib/forms/sole/index.d.ts

@@ -1,3 +1,5 @@
 export * from './sole-business.form';
+export * from './sole-business-allocations.form';
 export * from './sole-contact.form';
 export * from './sole-details.form';
+export * from './sole-invoice-template.form';

package/lib/forms/sole/sole-business-allocations.form.d.ts

@@ -0,0 +1,17 @@
+import { FormArray } from '@angular/forms';
+import { SoleBusinessAllocation } from '../../models';
+/**
+ * Form array with bank account business allocations
+ * @TODO create AbstractFormArray
+ */
+export declare class SoleBusinessAllocationsForm extends FormArray {
+    constructor(businessAllocations?: SoleBusinessAllocation[]);
+    add(): void;
+    enablePercent(): void;
+    disablePercent(): void;
+    /**
+     * Percentage available for adding a new bank account business allocation.
+     * Remaining percent can't be more than 100 and less than 0
+     */
+    private getRemainingPercent;
+}

package/lib/forms/sole/sole-invoice-template.form.d.ts

@@ -0,0 +1,5 @@
+import { AbstractForm } from '../abstract.form';
+import { SoleInvoiceTemplate } from '../../models';
+export declare class SoleInvoiceTemplateForm extends AbstractForm<SoleInvoiceTemplate> {
+    constructor(invoiceTemplate: SoleInvoiceTemplate);
+}

package/lib/forms/vehicle/index.d.ts

@@ -0,0 +1,4 @@
+export * from './vehicle.form';
+export * from './vehicle-claim.form';
+export * from './vehicle-claim-details.form';
+export * from './vehicle-logbook.form';

package/lib/forms/vehicle/vehicle-claim-details.form.d.ts

@@ -0,0 +1,13 @@
+import { AbstractForm } from '../abstract.form';
+import { VehicleClaimDetails } from '../../models';
+import { VehicleLogbookCollection } from '../../collections';
+/**
+ * Add/Edit vehicle claim details form
+ */
+export declare class VehicleClaimDetailsForm extends AbstractForm<VehicleClaimDetails> {
+    /**
+     * @param vehicleClaimDetails required because we create a new details with prefilled data (like Financial year)
+     * @param logbooks required for isManual field disabled state management
+     */
+    constructor(vehicleClaimDetails: VehicleClaimDetails, logbooks: VehicleLogbookCollection);
+}

package/lib/forms/vehicle/vehicle-claim.form.d.ts

@@ -1,43 +1,13 @@
 import { AbstractForm } from '../abstract.form';
-import { VehicleClaim } from '../../models/logbook/vehicle-claim';
-import { VehicleLogbookCollection } from '../../collections/vehicle-logbook.collection';
+import { VehicleClaim } from '../../models';
+import { VehicleClaimDetails } from '../../models';
+/**
+ * Add/Edit Vehicle Claim form
+ */
 export declare class VehicleClaimForm extends AbstractForm<VehicleClaim> {
-    private vehicleClaim;
-    private logbooks;
-    constructor(vehicleClaim: VehicleClaim, logbooks: VehicleLogbookCollection);
     /**
-     * Check if vehicle claim method changed
+     * @param vehicleClaim required even for the new claim, because claim needs business for sole tank
+     * @param details required for form controls disabled state management
      */
-    isMethodChanged(): boolean;
-    /**
-     * Check if KLMs method selected
-     */
-    isKLMsMethod(): boolean;
-    /**
-     * Check if Logbook method selected
-     */
-    isLogbookMethod(): boolean;
-    /**
-     * Check if user selected manual calculation
-     */
-    isManual(): boolean;
-    /**
-     * @TODO save model, add generics and handle it in AbstractForm
-     */
-    submit(): VehicleClaim;
-    private setIsManualState;
-    /**
-     * Handle method field value changes.
-     * Set work usage value depended of selected method.
-     */
-    private listenMethodChanges;
-    /**
-     * Handle isManual field value changes.
-     * Enable/disable fields depended of isManual value
-     */
-    private listenIsManualChanges;
-    /**
-     * Set automatic calculated values depended of current method for non-manual vehicle claim
-     */
-    private setValues;
+    constructor(vehicleClaim: VehicleClaim, details: VehicleClaimDetails);
 }

package/lib/forms/vehicle/vehicle-logbook.form.d.ts

@@ -0,0 +1,20 @@
+import { AbstractForm } from '../abstract.form';
+import { VehicleLogbook } from '../../models';
+import { VehicleLogbookCollection } from '../../collections';
+/**
+ * Add/Edit vehicle logbook form.
+ * Behavior cases:
+ * 1) Create the first logbook OR Edit the single logbook: all fields enabled
+ * 2) Create the non-first logbook OR Edit the last logbook: odometerStart disabled
+ * 3) Edit the non-last logbook: odometerStart, odometerEnd, date disabled
+ */
+export declare class VehicleLogbookForm extends AbstractForm<VehicleLogbook> {
+    private logbook;
+    private logbooks;
+    static maxDescriptionLength: number;
+    /**
+     * @param logbook required because we need to set vehicle allocation and we can not set in in the form
+     * @param logbooks list of all logbooks related to current logbook's vehicle. Required for form fields validation and disabled state management
+     */
+    constructor(logbook: VehicleLogbook, logbooks: VehicleLogbookCollection);
+}

package/lib/forms/vehicle/vehicle.form.d.ts

@@ -1,5 +1,8 @@
 import { AbstractForm } from '../abstract.form';
-import { Vehicle } from '../../models/logbook/vehicle';
+import { Vehicle } from '../../models';
+/**
+ * Add/Edit Vehicle form
+ */
 export declare class VehicleForm extends AbstractForm<Vehicle> {
     private vehicle;
     static maxNameLength: number;

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

@@ -5,12 +5,14 @@ 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';
+import { SoleBusinessAllocation } from '../sole';
 export declare class BankAccount extends BankAccountBase {
-    static loanTypes: BankAccountTypeEnum[];
     bankAccountProperties: BankAccountProperty[];
+    businessAllocations: SoleBusinessAllocation[];
     balances: BankAccountBalance[];
     loan: Loan;
     bankConnection: BankConnection;
+    type: BankAccountTypeEnum;
     /**
      * Get current opening balance amount
      */
@@ -25,7 +27,6 @@ export declare class BankAccount extends BankAccountBase {
     isSavingsAccount(): boolean;
     /**
      * check if bank account type is Loan
-     * @TODO nicole check
      */
     isLoan(): boolean;
     /**

package/lib/models/event/app-event-type.enum.d.ts

@@ -48,7 +48,10 @@ export declare enum AppEventTypeEnum {
     USER_UPDATED = 46,
     VEHICLE_CLAIM_UPDATED = 47,
     VEHICLE_CLAIM_CREATED = 48,
-    VEHICLE_LOGBOOK_CREATED = 49,
-    VEHICLE_LOGBOOK_UPDATED = 50,
-    VEHICLE_LOGBOOK_DELETED = 51
+    VEHICLE_CLAIM_DETAILS_UPDATED = 49,
+    VEHICLE_CLAIM_DETAILS_CREATED = 50,
+    VEHICLE_LOGBOOK_CREATED = 51,
+    VEHICLE_LOGBOOK_UPDATED = 52,
+    VEHICLE_LOGBOOK_DELETED = 53,
+    VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED = 54
 }

package/lib/models/index.d.ts

@@ -1 +1,2 @@
 export * from './sole';
+export * from './vehicle';

package/lib/models/loan/loan.d.ts

@@ -2,6 +2,14 @@ import { Loan as LoanBase } from '../../db/Models/loan/loan';
 import { LoanPayment } from './loan-payment';
 import { LoanPayout } from './loan-payout';
 export declare class Loan extends LoanBase {
+    /**
+     * 30 years is default mortgage term
+     */
+    static mortgageDefaultTerm: number;
+    /**
+     * 5 years is default bank loan term
+     */
+    static loanDefaultTerm: number;
     payments: LoanPayment[];
     commencementDate: Date;
     payout: LoanPayout;
@@ -15,4 +23,22 @@ export declare class Loan extends LoanBase {
      * @param year financial year for filter
      */
     getLastPaymentByYear(year: number): LoanPayment;
+    /**
+     * The size of loan interest
+     * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/212369955/Loans+vehicle+loans
+     * @TODO Vik/Nicole: need to update documentation. Derek gave the right formulas to Mikhail
+     */
+    getInterest(): number;
+    /**
+     * The last payment size
+     * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/212369955/Loans+vehicle+loans
+     * @TODO Vik/Nicole: need to update documentation. Derek gave the right formulas to Mikhail
+     */
+    getBalloonPayment(): number;
+    /**
+     * Percent of ballon payment from all payments
+     * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/212369955/Loans+vehicle+loans
+     * @TODO Vik/Nicole: need to update documentation. Derek gave the right formulas to Mikhail
+     */
+    getBalloonPaymentPercentage(): number;
 }

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

@@ -1,12 +1,13 @@
 import { TransactionCollection } from '../../../../collections/transaction/transaction.collection';
 import { DepreciationCollection } from '../../../../collections/depreciation.collection';
-import { VehicleClaim } from '../../../logbook/vehicle-claim';
 import { DeductionClothingTypeEnum } from './deduction-clothing-type.enum';
 import { DeductionSelfEducationTypeEnum } from './deduction-self-education-type.enum';
+import { VehicleClaim, VehicleClaimDetails } from '../../../vehicle';
 export declare class MyTaxDeductions {
     transactions: TransactionCollection;
     depreciations: DepreciationCollection;
     vehicleClaim: VehicleClaim;
+    vehicleClaimDetails: VehicleClaimDetails;
     vehicleClaimRate: number;
     workRelatedClothingExpenses: TransactionCollection;
     workRelatedSelfEducationExpenses: TransactionCollection;
@@ -30,7 +31,7 @@ export declare class MyTaxDeductions {
     personalSuperContributionsTotalAmount: number;
     forestryManagedInvestmentSchemesDeductionsTotalAmount: number;
     otherDeductionsTotalAmount: number;
-    constructor(transactions: TransactionCollection, depreciations: DepreciationCollection, vehicleClaim: VehicleClaim, vehicleClaimRate: number);
+    constructor(transactions: TransactionCollection, depreciations: DepreciationCollection, vehicleClaim: VehicleClaim, vehicleClaimDetails: VehicleClaimDetails, vehicleClaimRate: number);
     private getVehicleExpensesTotalAmount;
     private setVehicleClaimData;
     /**

package/lib/models/sole/sole-business.d.ts

@@ -4,7 +4,7 @@ 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 '../logbook/vehicle-claim';
+import { VehicleClaim } from '../vehicle/vehicle-claim';
 import { Depreciation } from '../depreciation/depreciation';
 import { Transaction } from '../transaction/transaction';
 import { Photoable } from '../../interfaces/photoable';

package/lib/models/sole/sole-invoice-template.d.ts

@@ -4,4 +4,5 @@ import { SoleInvoiceTemplate as SoleInvoiceTemplateBase } from '../../db/Models/
 export declare class SoleInvoiceTemplate extends SoleInvoiceTemplateBase {
     business: SoleBusiness;
     bankAccount: BankAccount;
+    static create(businessId: number): SoleInvoiceTemplate;
 }

package/lib/models/vehicle/index.d.ts

@@ -0,0 +1,5 @@
+export * from './logbook-period';
+export * from './vehicle';
+export * from './vehicle-claim';
+export * from './vehicle-claim-details';
+export * from './vehicle-logbook';

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

@@ -0,0 +1,15 @@
+import { VehicleLogbookCollection } from '../../collections';
+import { VehicleClaim } from './vehicle-claim';
+/**
+ * Class contains traveled kilometers and work usage percent in 12 weeks date range
+ * @TODO Vik: Best period: move this and related logic to backend
+ */
+export declare class LogbookPeriod {
+    from: Date;
+    to: Date;
+    kilometers: number;
+    workUsage: number;
+    logbooks: VehicleLogbookCollection;
+    isEndOfYear(): boolean;
+    getWorkUsageByClaim(claim: VehicleClaim): number;
+}

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

@@ -0,0 +1,8 @@
+import { VehicleClaimDetails as VehicleClaimDetailsBase } from '../../db/Models/vehicle/vehicle-claim-details';
+import { User } from '../user/user';
+export declare class VehicleClaimDetails extends VehicleClaimDetailsBase {
+    user: User;
+    isLogbookMethod(): boolean;
+    isKlmsMethod(): boolean;
+    static create(): VehicleClaimDetails;
+}