taxtank-core 1.0.33 → 1.0.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "private": false,
   "peerDependencies": {
     "@angular/common": "^19.0.2",

package/public-api.d.ts

@@ -157,6 +157,7 @@ export * from './src/lib/models/user-event/user-event-type';
  * Services
  */
 export * from './src/lib/services';
+export * from './src/lib/resolvers';
 /**
  * Interfaces
  */

package/src/lib/collections/subscription/service-subscription.collection.d.ts

@@ -11,6 +11,10 @@ export declare class ServiceSubscriptionCollection extends Collection<ServiceSub
     getExpiredAfter(date?: Date): this;
     getPaid(): this;
     getRoles(): UserRolesEnum[];
+    /**
+     * search roles including hierarchy
+     */
+    hasRoles(roles: UserRolesEnum | UserRolesEnum[]): boolean;
     getActivePaid(): ServiceSubscription;
     /**
      * @TODO vik remove trials replaced by paid item

package/src/lib/collections/tax-summary/tax-return-categories.const.d.ts

@@ -1,4 +1,7 @@
 import { TaxReturnCategoryListEnum } from '../../db/Enums';
+/**
+ * @TODO vik check (tax_return_category/tax_return_item/chart_accounts)
+ */
 export declare const TAX_RETURN_CATEGORIES: {
     [key: string]: {
         [key: string]: TaxReturnCategoryListEnum[];

package/src/lib/db/Enums/setup-item-type.enum.d.ts

@@ -3,8 +3,9 @@ export declare enum SetupItemTypeEnum {
     WORK = 1,
     PROPERTIES = 2,
     PROPERTY = 3,
-    BUSINESS = 4,
+    BUSINESSES = 4,
     HOLDING = 5,
     BANK_ACCOUNTS = 6,
-    BANK_ACCOUNT = 7
+    BANK_ACCOUNT = 7,
+    BUSINESS = 8
 }

package/src/lib/db/Enums/tax-return/tax-return-category-list.enum.d.ts

@@ -12,13 +12,10 @@ export declare enum TaxReturnCategoryListEnum {
     DIVIDENDS = 6,
     SHARE_SCHEMES = 35,
     GROSS_RENT = 8,
-    PARTNERSHIPS_TRUSTS = 13,
     PARTNERSHIPS = 36,
     TRUSTS = 37,
     PSI_SBE_INCOME = 14,
-    SOLE_TRADER_BUSINESS_INCOME = 38,
     CAPITAL_GAINS = 15,
-    FOREIGN_SOURCE_INCOME = 16,
     BONUSES_FROM_LIFE_INSURANCE = 17,
     FORESTRY_MANAGED_INVESTMENT_SCHEMES = 39,
     OTHER_INCOME = 40,
@@ -45,6 +42,7 @@ export declare enum TaxReturnCategoryListEnum {
     DEPRECIATION_EXPENSES = 56,
     MOTOR_VEHICLE_EXPENSES = 57,
     ALL_OTHER_EXPENSES = 58,
+    WORK_RELATED_DEPRECIATION = 69,
     GROSS_TAX_PAYABLE = 19,
     TAX_ON_TAXABLE_INCOME = 20,
     MEDICARE = 21,
@@ -60,5 +58,8 @@ export declare enum TaxReturnCategoryListEnum {
     TAX_PAYABLE = 28,
     BUSINESS_INCOME_OR_LOSS = 59,
     DEFERRED_BUSINESS_LOSSES = 60,
+    TAX_OFFSET_LOW = 61,
+    tAX_OFFSET_MIDDLE = 62,
+    TAX_OFFSET_SOLE = 63,
     DEFERRED_BUSINESS_LOSSES_FROM_PRIOR_YEAR = 64
 }

package/src/lib/db/Enums/tax-summary-section.enum.d.ts

@@ -1,7 +1,8 @@
 export declare enum TaxSummarySectionEnum {
     WORK_TANK = 1,
     PROPERTY_TANK = 2,
-    OTHER_TANK = 3,
-    SOLE_TANK = 4,
-    SUMMARY = 5
+    HOLDINGS_TANK = 3,
+    CAPITAL_GAINS = 4,
+    SOLE_TANK = 5,
+    SUMMARY = 6
 }

package/src/lib/db/Enums/youtube-videos.enum.d.ts

@@ -3,5 +3,12 @@ export declare enum YoutubeVideosEnum {
     MONEY_ONBOARDING = "E9NU14ndjhc",
     PROPERTY_ONBOARDING = "llUV98-EMdI",
     SOLE_ONBOARDING = "rqfTQFGwkUM",
-    WORK_ONBOARDING = "QEKolzS1B0U"
+    WORK_ONBOARDING = "QEKolzS1B0U",
+    PROPERTY_RENTAL = "E9NU14ndjhc",
+    PROPERTY_DEPRECIATION = "E9NU14ndjhc",
+    SOLE_VEHICLE_CLAIM = "E9NU14ndjhc",
+    HOME_OFFICE = "E9NU14ndjhc",
+    SOLE_DEPRECIATION = "E9NU14ndjhc",
+    WORK_VEHICLE_CLAIM = "E9NU14ndjhc",
+    WORK_DEPRECIATION = "E9NU14ndjhc"
 }

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

@@ -16,7 +16,6 @@ export declare class SoleBusiness extends ObservableModel {
     name?: string;
     description?: string;
     website?: string;
-    logo?: string;
     deletedAt?: Date;
     user?: User;
     activity?: SoleBusinessActivity;

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

@@ -61,6 +61,9 @@ export declare abstract class AbstractForm<Model, Controls extends ControlsInter
      * upgraded version of patchValue to skip duplicated changes
      */
     patchField(name: string, value: any): void;
+    patch(fields: {
+        [key: string]: any;
+    }): void;
     fieldChanged(name: string): boolean;
     addValidators(validators: ValidatorFn | ValidatorFn[], controls?: AbstractControl[]): void;
     removeValidators(validators: ValidatorFn | ValidatorFn[], controls?: AbstractControl[]): void;

package/src/lib/models/account-setup/account-setup-items.enum.d.ts

@@ -24,6 +24,7 @@ export declare enum AccountSetupItemsEnum {
     SOLE_HOME_OFFICE = 21,
     SOLE_DEPRECIATION = 22,
     SOLE_BANK_ACCOUNT = 23,
+    SOLE_LOGO = 24,
     HOLDING_TRADE = 8,
     HOLDING_INTEGRATION = 25,
     HOLDING_REPORTS = 36,

package/src/lib/models/tax-summary/tax-summary.d.ts

@@ -8,7 +8,7 @@ import { SoleBusiness } from '../sole';
 export declare class TaxSummary {
     work: TaxSummarySection;
     property: TaxSummarySection;
-    other: TaxSummarySection;
+    holdings: TaxSummarySection;
     sole: TaxSummarySection;
     summary: TaxSummarySection;
     projectedTaxPosition: number;
@@ -40,15 +40,15 @@ export declare class TaxSummary {
      */
     get propertyNetTotal(): number;
     /**
-     * Other Net Cash = gross income – expenses – tax withheld - tax instalments
+     * Holdings Net Cash = gross income – expenses – tax withheld - tax instalments
      * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
      */
-    get otherNetCash(): number;
+    get holdingsNetCash(): number;
     /**
-     * Other Net Total = Gross income - expenses + tax offsets + tax instalments + franking credits
+     * Holding Net Total = Gross income - expenses + tax offsets + tax instalments + franking credits
      * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
      */
-    get otherNetTotal(): number;
+    get holdingsNetTotal(): number;
     /**
      * Sole Net Cash = gross income – expenses
      * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main

package/src/lib/models/user/user.d.ts

@@ -29,6 +29,7 @@ export declare class User extends BaseUser {
      *
      */
     get position(): string;
+    addRoles(roles?: UserRolesEnum[]): void;
     /**
      * search roles including hierarchy
      */

package/src/lib/resolvers/business/business.resolver.d.ts

@@ -0,0 +1,11 @@
+import { Observable } from 'rxjs';
+import { SoleDetails } from '../../models';
+import { SoleDetailsService } from '../../services';
+import * as i0 from "@angular/core";
+export declare class BusinessResolver {
+    private soleDetailsService;
+    constructor(soleDetailsService: SoleDetailsService);
+    resolve(): Observable<SoleDetails>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<BusinessResolver, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<BusinessResolver>;
+}

package/src/lib/resolvers/business/sole-details.resolver.d.ts

@@ -0,0 +1,11 @@
+import { Observable } from 'rxjs';
+import { SoleDetails } from '../../models';
+import { SoleDetailsService } from '../../services';
+import * as i0 from "@angular/core";
+export declare class SoleDetailsResolver {
+    private soleDetails;
+    constructor(soleDetails: SoleDetailsService);
+    resolve(): Observable<SoleDetails>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<SoleDetailsResolver, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<SoleDetailsResolver>;
+}

package/src/lib/resolvers/index.d.ts

@@ -0,0 +1,2 @@
+export * from './business/business.resolver';
+export * from './business/sole-details.resolver';

package/src/lib/services/account-setup/account-setup.service.d.ts

@@ -1,4 +1,4 @@
-import { Property, User } from '../../models';
+import { Property, SoleBusiness, User } from '../../models';
 import { AllocationRuleService, BankAccountService, BankConnectionService, ClientInviteService, ClientMovementService, DepreciationService, EmployeeInviteService, EmployeeService, FirmService, HoldingTradeService, HomeOfficeClaimService, IncomeSourceService, LoanService, PropertyService, PropertyShareService, SharesightDetailsService, SoleBusinessService, TransactionAllocationService, TransactionService, UserService, VehicleClaimService } from '../http';
 import { AccountSetupItemCollection } from '../../collections';
 import { Observable } from 'rxjs';
@@ -21,7 +21,7 @@ export declare class AccountSetupService {
     private homeOfficeClaimService;
     private transactionService;
     private depreciationService;
-    private soleBusinessService;
+    private businessService;
     private holdingService;
     private userService;
     private clientMovementService;
@@ -33,17 +33,16 @@ export declare class AccountSetupService {
     private propertyShareService;
     items: AccountSetupItemCollection;
     user: User;
-    constructor(setupItemService: SetupItemService, propertyService: PropertyService, incomeSourceService: IncomeSourceService, bankConnectionService: BankConnectionService, bankAccountsService: BankAccountService, loanService: LoanService, allocationRuleService: AllocationRuleService, transactionAllocationService: TransactionAllocationService, vehicleClaimService: VehicleClaimService, homeOfficeClaimService: HomeOfficeClaimService, transactionService: TransactionService, depreciationService: DepreciationService, soleBusinessService: SoleBusinessService, holdingService: HoldingTradeService, userService: UserService, clientMovementService: ClientMovementService, clientInviteService: ClientInviteService, employeeService: EmployeeService, employeeInviteService: EmployeeInviteService, firmService: FirmService, sharesightDetailsService: SharesightDetailsService, propertyShareService: PropertyShareService);
+    constructor(setupItemService: SetupItemService, propertyService: PropertyService, incomeSourceService: IncomeSourceService, bankConnectionService: BankConnectionService, bankAccountsService: BankAccountService, loanService: LoanService, allocationRuleService: AllocationRuleService, transactionAllocationService: TransactionAllocationService, vehicleClaimService: VehicleClaimService, homeOfficeClaimService: HomeOfficeClaimService, transactionService: TransactionService, depreciationService: DepreciationService, businessService: SoleBusinessService, holdingService: HoldingTradeService, userService: UserService, clientMovementService: ClientMovementService, clientInviteService: ClientInviteService, employeeService: EmployeeService, employeeInviteService: EmployeeInviteService, firmService: FirmService, sharesightDetailsService: SharesightDetailsService, propertyShareService: PropertyShareService);
     /**
      * Get list of account setup items for current user/firm
      */
-    get(property?: Property): Observable<AccountSetupItemCollection>;
-    setItemsStatus(property?: Property): Observable<AccountSetupItemCollection>;
+    get(property?: Property, business?: SoleBusiness): Observable<AccountSetupItemCollection>;
+    setItemsStatus(property?: Property, business?: SoleBusiness): Observable<AccountSetupItemCollection>;
     /**
      * Check and update isCompleted flag for passed item
      */
     private setItemStatus;
-    private getProperties;
     private getTransactions;
     private getCoOwners;
     /**

package/src/lib/services/http/subscription/service-subscription/subscription.service.d.ts

@@ -36,6 +36,7 @@ export declare class SubscriptionService extends RestService<ServiceSubscription
     cancel(subscription: ServiceSubscription): Observable<object>;
     renew(subscription: ServiceSubscription): Observable<object>;
     getCoupon(code: string): Observable<any>;
+    setCache(data: any[], next?: boolean): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<SubscriptionService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<SubscriptionService>;
 }

package/src/lib/services/http/user/user.service.d.ts

@@ -36,6 +36,7 @@ export declare class UserService extends RestService<UserBase, User, Collection<
     skipSetupItem(item: AccountSetupItem): Observable<User>;
     restoreSetupItem(item: AccountSetupItem): Observable<User>;
     /**
+     * @TODO stop using user for roles
      * Update cache when user's service subscription is updated
      */
     private listenServiceSubscriptionUpdated;