taxtank-core 0.27.2 → 0.27.3

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

@@ -26,7 +26,8 @@ export declare class DepreciationCollection extends Collection<Depreciation> {
     getCapitalDepreciations(): this;
     getBorrowingExpenseDepreciations(): DepreciationCollection;
     getWrittenOffDepreciations(): DepreciationCollection;
-    getLowValuePoolDepreciations(): DepreciationCollection;
+    getLVPDepreciations(): this;
+    getSBPDepreciations(): this;
     getCapitalProjects(): DepreciationCapitalProject[];
     /**
      * Get a new collection of depreciations related to vehicles

package/lib/db/Enums/depreciation-calculation.enum.d.ts

@@ -1,7 +1,7 @@
 export declare enum DepreciationCalculationEnum {
     PRIME_COST = 1,
     DIMINISHING = 2,
-    CAPITAL = 3,
     LVP = 4,
-    AMORTISATION = 5
+    AMORTISATION = 5,
+    SBP = 6
 }

package/lib/db/Enums/sole-depreciation-method.enum.d.ts

@@ -0,0 +1,4 @@
+export declare enum SoleDepreciationMethodEnum {
+    SBP = 1,
+    DEPRECIATION = 2
+}

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

@@ -0,0 +1,6 @@
+import { AbstractModel } from '../abstract-model';
+export declare class SoleBusinessActivity extends AbstractModel {
+    name?: string;
+    code?: number;
+    id?: number;
+}

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

@@ -8,15 +8,16 @@ import { Transaction } from '../transaction/transaction';
 import { Depreciation } from '../depreciation/depreciation';
 import { AbstractModel } from '../abstract-model';
 import { VehicleLogbook } from '../vehicle/vehicle-logbook';
+import { SoleBusinessActivity } from './sole-business-activity';
 export declare class SoleBusiness extends AbstractModel {
     name?: string;
-    code?: string;
     description?: string;
     website?: string;
     logo?: string;
     id?: number;
     deletedAt?: Date;
     user?: User;
+    activity?: SoleBusinessActivity;
     allocations?: SoleBusinessAllocation[];
     losses?: SoleBusinessLoss[];
     invoices?: SoleInvoice[];

package/lib/db/Models/sole/sole-depreciation-method.d.ts

@@ -0,0 +1,10 @@
+import { User } from '../user/user';
+import { SoleDepreciationMethodEnum } from '../../Enums/sole-depreciation-method.enum';
+import { AbstractModel } from '../abstract-model';
+export declare class SoleDepreciationMethod extends AbstractModel {
+    method?: SoleDepreciationMethodEnum;
+    closeBalance?: number;
+    id?: number;
+    financialYear?: number;
+    user?: User;
+}

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

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

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

@@ -1,5 +1,5 @@
 import { AbstractForm } from '../abstract.form';
-import { SoleBusiness } from '../../models/sole/sole-business';
+import { SoleBusiness } from '../../models';
 export declare class SoleBusinessForm extends AbstractForm<SoleBusiness> {
     constructor(business?: SoleBusiness);
 }

package/lib/forms/sole/sole-depreciation-method.form.d.ts

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

package/lib/models/depreciation/depreciation-group.enum.d.ts

@@ -3,5 +3,6 @@ export declare enum DepreciationGroupEnum {
     PLANT_EQUIPMENT = 1,
     LOW_VALUE_POOL = 2,
     WRITTEN_OFF_ITEMS = 3,
-    BORROWING_EXPENSES = 4
+    BORROWING_EXPENSES = 4,
+    SMALL_BUSINESS_POOL = 5
 }

package/lib/models/depreciation/depreciation.d.ts

@@ -8,6 +8,9 @@ import { IReceipt } from '../../interfaces/receipt.interface';
 import { Transaction } from '../transaction/transaction';
 import { Expense } from '../../interfaces/expense.interface';
 import { DepreciationReceipt } from './depreciation-receipt';
+/**
+ * @TODO Alex: clarify grouping rules and refactor
+ */
 export declare class Depreciation extends DepreciationBase implements Expense, IReceipt {
     static WRITTEN_OFF_THRESHOLD: number;
     static LOW_VALUE_POOL_THRESHOLD: number;
@@ -29,24 +32,14 @@ export declare class Depreciation extends DepreciationBase implements Expense, I
     isCapital(): boolean;
     isBorrowingExpense(): boolean;
     isAsset(): boolean;
-    /**
-     * check if depreciation should be displayed in written off category
-     * details in project documentation
-     * @TODO new FinancialYear(this.writeOffDate) === new FinancialYear()
-     */
-    isWrittenOff(): boolean;
-    /**
-     * Check if depreciation is Plant & Equipment
-     */
-    isPlantEquipment(): boolean;
-    /**
-     * check if depreciation should be displayed in low value pool
-     * details in project documentation
-     * @TODO new FinancialYear(this.writeOffDate) === new FinancialYear()
-     */
-    isLowValuePool(): boolean;
+    isSBPCalculation(): boolean;
     isPrimeCost(): boolean;
     isDiminishing(): boolean;
+    isPlantEquipmentPool(): boolean;
+    isLVP(): boolean;
+    isSBP(): boolean;
+    isWrittenOff(): boolean;
+    get writeOffYear(): number;
     /**
      * Check if depreciation chart accounts heading related to vehicles category
      */

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

@@ -27,34 +27,36 @@ export declare enum AppEventTypeEnum {
     MESSAGE_FILE_CREATED = 25,
     MESSAGE_FILE_DELETED = 26,
     NOTIFICATION_ADDED = 27,
-    PROPERTY_UPDATED_WITH_DOCUMENT = 28,
-    PROPERTY_DOCUMENT_ADDED = 29,
-    PROPERTY_MOVEMENT_CREATED = 30,
-    PROPERTY_MOVEMENT_UPDATED = 31,
-    PROPERTY_MOVEMENT_DELETED = 32,
-    PROPERTY_SHARE_UPDATED = 33,
-    PROPERTY_SALE_ADDED = 34,
-    PROPERTY_SALE_DELETED = 35,
-    PROPERTY_SUBSCRIPTION_ADDED = 36,
-    PROPERTY_SUBSCRIPTION_DELETED = 37,
-    PROPERTY_VALUATION_DOCUMENT_CREATED = 38,
-    SERVICE_SUBSCRIPTION_UPDATED = 39,
-    TAX_REVIEW_UPDATED = 40,
-    TRANSACTION_CREATED = 41,
-    TRANSACTION_DELETED = 42,
-    TRANSACTION_UPDATED = 43,
-    TRANSACTION_UPDATED_WITH_RECEIPT = 44,
-    TRANSACTION_UPDATED_WITH_DELETED_RECEIPT = 45,
-    TRANSACTION_RECEIPT_CREATED = 46,
-    TRANSACTION_RECEIPT_DELETED = 47,
-    TRANSACTIONS_CREATED = 48,
-    USER_UPDATED = 49,
-    VEHICLE_CLAIM_UPDATED = 50,
-    VEHICLE_CLAIM_CREATED = 51,
-    VEHICLE_CLAIM_DETAILS_UPDATED = 52,
-    VEHICLE_CLAIM_DETAILS_CREATED = 53,
-    VEHICLE_LOGBOOK_CREATED = 54,
-    VEHICLE_LOGBOOK_UPDATED = 55,
-    VEHICLE_LOGBOOK_DELETED = 56,
-    VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED = 57
+    PROPERTY_DEPRECIATION_CALCULATION_UPDATED = 28,
+    PROPERTY_UPDATED_WITH_DOCUMENT = 29,
+    PROPERTY_DOCUMENT_ADDED = 30,
+    PROPERTY_MOVEMENT_CREATED = 31,
+    PROPERTY_MOVEMENT_UPDATED = 32,
+    PROPERTY_MOVEMENT_DELETED = 33,
+    PROPERTY_SHARE_UPDATED = 34,
+    PROPERTY_SALE_ADDED = 35,
+    PROPERTY_SALE_DELETED = 36,
+    PROPERTY_SUBSCRIPTION_ADDED = 37,
+    PROPERTY_SUBSCRIPTION_DELETED = 38,
+    PROPERTY_VALUATION_DOCUMENT_CREATED = 39,
+    SERVICE_SUBSCRIPTION_UPDATED = 40,
+    SOLE_DEPRECIATION_METHOD_UPDATED = 41,
+    TAX_REVIEW_UPDATED = 42,
+    TRANSACTION_CREATED = 43,
+    TRANSACTION_DELETED = 44,
+    TRANSACTION_UPDATED = 45,
+    TRANSACTION_UPDATED_WITH_RECEIPT = 46,
+    TRANSACTION_UPDATED_WITH_DELETED_RECEIPT = 47,
+    TRANSACTION_RECEIPT_CREATED = 48,
+    TRANSACTION_RECEIPT_DELETED = 49,
+    TRANSACTIONS_CREATED = 50,
+    USER_UPDATED = 51,
+    VEHICLE_CLAIM_UPDATED = 52,
+    VEHICLE_CLAIM_CREATED = 53,
+    VEHICLE_CLAIM_DETAILS_UPDATED = 54,
+    VEHICLE_CLAIM_DETAILS_CREATED = 55,
+    VEHICLE_LOGBOOK_CREATED = 56,
+    VEHICLE_LOGBOOK_UPDATED = 57,
+    VEHICLE_LOGBOOK_DELETED = 58,
+    VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED = 59
 }

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

@@ -1,7 +1,9 @@
 export * from './sole-business';
+export * from './sole-business-activity';
 export * from './sole-business-allocation';
 export * from './sole-business-loss';
 export * from './sole-contact';
+export * from './sole-depreciation-method';
 export * from './sole-details';
 export * from './sole-invoice';
 export * from './sole-invoice-item';

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

@@ -0,0 +1,3 @@
+import { SoleBusinessActivity as SoleBusinessActivityBase } from "../../db/Models/sole/sole-business-activity";
+export declare class SoleBusinessActivity extends SoleBusinessActivityBase {
+}

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

@@ -8,6 +8,7 @@ import { VehicleClaim } from '../vehicle';
 import { Depreciation } from '../depreciation/depreciation';
 import { Transaction } from '../transaction/transaction';
 import { Photoable } from '../../interfaces/photoable';
+import { SoleBusinessActivity } from '../../db/Models/sole/sole-business-activity';
 export declare class SoleBusiness extends SoleBusinessBase implements Photoable {
     /**
      * Maximum number of businesses that a person can have, according to the ATO
@@ -21,6 +22,7 @@ export declare class SoleBusiness extends SoleBusinessBase implements Photoable
     vehicleClaims: VehicleClaim[];
     transactions: Transaction[];
     depreciations: Depreciation[];
+    activity: SoleBusinessActivity;
     getPhotoPlaceholder(): string;
     getPhoto(): string;
 }

package/lib/models/sole/sole-depreciation-method.d.ts

@@ -0,0 +1,4 @@
+import { SoleDepreciationMethod as SoleDepreciationMethodBase } from '../../db/Models/sole/sole-depreciation-method';
+export declare class SoleDepreciationMethod extends SoleDepreciationMethodBase {
+    isSBP(): boolean;
+}

package/lib/services/http/depreciation/depreciation.service.d.ts

@@ -47,6 +47,14 @@ export declare class DepreciationService extends RestService<DepreciationBase, D
      */
     private listenVehicleClaimChanges;
     private replaceInCache;
+    /**
+     * @TODO Alex: create common method resetCacheOn(events: AppEventType[])
+     */
+    private listenSoleDepreciationMethodChanges;
+    /**
+     * @TODO Alex: create common method resetCacheOn(events: AppEventType[])
+     */
+    private listenPropertyDepreciationCalculationChanges;
     static ɵfac: i0.ɵɵFactoryDeclaration<DepreciationService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<DepreciationService>;
 }

package/lib/services/http/property/property.service.d.ts

@@ -26,6 +26,7 @@ export declare class PropertyService extends RestService<PropertyBase, Property>
     private listenSalesAdded;
     private listenSalesDeleted;
     update(property: Property): Observable<Property>;
+    updateDepreciationCalculation(property: Property): Observable<Property>;
     getByCategoryId(id: number): Observable<Property[]>;
     /**
      * Activate deactivated property

package/lib/services/http/sole/index.d.ts

@@ -1,4 +1,6 @@
 export * from './sole-business/sole-business.service';
+export * from './sole-business-activity/sole-business-activity.service';
 export * from './sole-contact/sole-contact.service';
+export * from './sole-depreciation-method/sole-depreciation-method.service';
 export * from './sole-details/sole-details.service';
 export * from './sole-invoice-template/sole-invoice-template.service';

package/lib/services/http/sole/sole-business-activity/sole-business-activity.service.d.ts

@@ -0,0 +1,11 @@
+import { RestService } from '../../rest/rest.service';
+import { SoleBusinessActivity as SoleBusinessActivityBase } from '../../../../db/Models/sole/sole-business-activity';
+import { SoleBusinessActivity } from '../../../../models';
+import * as i0 from "@angular/core";
+export declare class SoleBusinessActivityService extends RestService<SoleBusinessActivityBase, SoleBusinessActivity> {
+    modelClass: typeof SoleBusinessActivity;
+    url: string;
+    isHydra: boolean;
+    static ɵfac: i0.ɵɵFactoryDeclaration<SoleBusinessActivityService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<SoleBusinessActivityService>;
+}

package/lib/services/http/sole/sole-depreciation-method/sole-depreciation-method.service.d.ts

@@ -0,0 +1,23 @@
+import { HttpClient } from '@angular/common/http';
+import { SoleDepreciationMethod } from '../../../../models';
+import { Observable, ReplaySubject } from 'rxjs';
+import { EventDispatcherService } from '../../../event/event-dispatcher.service';
+import { ToastService } from '../../../toast/toast.service';
+import * as i0 from "@angular/core";
+/**
+ * @TODO Alex: extend rest service when refactored
+ */
+export declare class SoleDepreciationMethodService {
+    private http;
+    private environment;
+    private eventDispatcherService;
+    private toastService;
+    cache: SoleDepreciationMethod;
+    cacheSubject: ReplaySubject<SoleDepreciationMethod>;
+    url: string;
+    constructor(http: HttpClient, environment: any, eventDispatcherService: EventDispatcherService, toastService: ToastService);
+    get(): Observable<SoleDepreciationMethod>;
+    update(soleDepreciationMethod: SoleDepreciationMethod): Observable<SoleDepreciationMethod>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<SoleDepreciationMethodService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<SoleDepreciationMethodService>;
+}

package/package.json

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

package/public-api.d.ts

@@ -99,6 +99,7 @@ export * from './lib/db/Enums/registration-invite-status.enum';
 export * from './lib/db/Enums/salary-forecast-frequency.enum';
 export * from './lib/db/Enums/service-notification-status.enum';
 export * from './lib/db/Enums/service-notification-type.enum';
+export * from './lib/db/Enums/sole-depreciation-method.enum';
 export * from './lib/db/Enums/subscription/service-payment-status.enum';
 export * from './lib/db/Enums/subscription/service-price-recurring-interval.enum';
 export * from './lib/db/Enums/subscription/service-price-type.enum';