taxtank-core 1.0.39 → 1.0.41

package/package.json

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

package/public-api.d.ts

@@ -37,6 +37,7 @@ export * from './src/lib/db/Enums/depreciation-write-off-amount.enum';
 export * from './src/lib/db/Enums/firm/firm-type.enum';
 export * from './src/lib/db/Enums/income-source';
 export * from './src/lib/db/Enums/invite-status.enum';
+export * from './src/lib/db/Enums/youtube-videos.enum';
 export * from './src/lib/db/Enums/bank/loan';
 export * from './src/lib/db/Enums/phone-type.enum';
 export * from './src/lib/db/Enums/property/property-depreciation-calculation.enum';
@@ -156,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/account-setup-item.collection.d.ts

@@ -1,6 +1,10 @@
-import { AccountSetupItem } from '../models/account-setup/account-setup-item';
+import { AccountSetupItem } from '../models';
 import { Collection } from './collection';
+import { User } from '../models';
 export declare class AccountSetupItemCollection extends Collection<AccountSetupItem> {
     constructor(items: AccountSetupItem[]);
     isCompleted(): boolean;
+    getByUser(user: User): this;
+    getScore(): number;
+    setUrlId(id: string): void;
 }

package/src/lib/collections/bank-account.collection.d.ts

@@ -31,7 +31,7 @@ export declare class BankAccountCollection extends Collection<BankAccount> {
     /**
      * Get Collection of bank accounts by tank type
      */
-    getByTankType(tankType: TankTypeEnum): BankAccountCollection;
+    getByTankType(tankType?: TankTypeEnum): BankAccountCollection;
     /**
      * Get list of all bank account properties
      */

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

@@ -10,6 +10,11 @@ export declare class ServiceSubscriptionCollection extends Collection<ServiceSub
     getExpiredTrials(): this;
     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
@@ -19,5 +24,6 @@ export declare class ServiceSubscriptionCollection extends Collection<ServiceSub
     findByProduct(product: ServiceProduct): ServiceSubscription;
     filterByProduct(product: ServiceProduct): this;
     filterByRole(role: UserRolesEnum): this;
+    findByRole(role: UserRolesEnum): ServiceSubscription;
     hasPropertyTank(): boolean;
 }

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

@@ -10,3 +10,4 @@ export * from './subscription';
 export * from './user';
 export * from './sole';
 export * from './home-office';
+export * from './setup-item-type.enum';

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

@@ -1,4 +1,11 @@
 export declare enum SetupItemTypeEnum {
-    CLIENT = 1,
-    EMPLOYEE = 2
+    EMPLOYEE = 0,
+    WORK = 1,
+    PROPERTIES = 2,
+    PROPERTY = 3,
+    BUSINESSES = 4,
+    HOLDING = 5,
+    BANK_ACCOUNTS = 6,
+    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

@@ -0,0 +1,18 @@
+export declare enum YoutubeVideosEnum {
+    HOLDING_ONBOARDING = "r3RhObELk-E",
+    MONEY_ONBOARDING = "E9NU14ndjhc",
+    PROPERTY_ONBOARDING = "llUV98-EMdI",
+    SOLE_ONBOARDING = "rqfTQFGwkUM",
+    WORK_ONBOARDING = "QEKolzS1B0U",
+    PROPERTY_RENTAL = "MPkB0NBd-9E",
+    PROPERTY_DEPRECIATION = "_34lK9ooFzc",
+    VEHICLE_CLAIM = "4-6WaM83cw0",
+    SOLE_DEPRECIATION = "Bw3tx4miFF8",
+    SOLE_HOME_OFFICE = "fF8_kJHEKRE",
+    WORK_DEPRECIATION = "gNa9M4xovuI",
+    WORK_HOME_OFFICE = "qrQu4Yl72bU",
+    BANK_FEEDS = "meQmpw7ZY7c",
+    BANK_ACCOUNT_TRANSACTION = "meQmpw7ZY7c",
+    BANK_ALLOCATION_RULE = "meQmpw7ZY7c",
+    ALLOCATE_TRANSACTION = "meQmpw7ZY7c"
+}

package/src/lib/db/Models/property/property.d.ts

@@ -42,4 +42,5 @@ export declare class Property extends ObservableModel {
     depreciations?: Depreciation[];
     file: File;
     corelogicLastRequest: Date;
+    get capitalCosts(): number;
 }

package/src/lib/db/Models/setup-item.d.ts

@@ -1,4 +1,4 @@
-import { SetupItemTypeEnum } from '../Enums/setup-item-type.enum';
+import { SetupItemTypeEnum } from '../Enums';
 import { UserRolesEnum } from 'taxtank-core/common';
 import { AbstractModel } from './abstract-model';
 export declare class SetupItem extends AbstractModel {
@@ -7,5 +7,8 @@ export declare class SetupItem extends AbstractModel {
     description?: string;
     url?: string;
     urlFragment?: string;
+    isRequired?: boolean;
+    order?: number;
+    score?: number;
     roles?: UserRolesEnum;
 }

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/forms/transaction/holding/holding-expense.form.d.ts

@@ -0,0 +1,8 @@
+import { Transaction, TransactionAllocation } from '../../../models';
+import { AbstractControl } from '@angular/forms';
+import { TransactionForm } from '../transaction.form';
+export declare class HoldingExpenseForm extends TransactionForm {
+    constructor(transaction: Transaction, registeredForGst: boolean, allocations: TransactionAllocation[], controls?: {
+        [key: string]: AbstractControl;
+    });
+}

package/src/lib/forms/transaction/index.d.ts

@@ -5,4 +5,5 @@ export * from './sole/sole-income.form';
 export * from './work/work-income.form';
 export * from './work/work-expense.form';
 export * from './holding/holding-income.form';
+export * from './holding/holding-expense.form';
 export * from './transaction-base-filter.form';

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

@@ -0,0 +1,5 @@
+export declare enum AccountSetupItemStatusEnum {
+    PENDING = 1,
+    ACHIEVED = 2,
+    SKIPPED = 3
+}

package/src/lib/models/account-setup/account-setup-item.d.ts

@@ -1,15 +1,8 @@
 import { SetupItem } from '../../db/Models/setup-item';
 export declare class AccountSetupItem extends SetupItem {
-    isCompleted: boolean;
-    get isSalary(): boolean;
-    get isOtherIncome(): boolean;
-    get isProperty(): boolean;
-    get isBankFeeds(): boolean;
-    get isWorkLogbook(): boolean;
-    get isTransactionAllocate(): boolean;
-    get isSoleBusiness(): boolean;
-    get isHoldings(): boolean;
-    get isFirmDetails(): boolean;
-    get isInviteTeam(): boolean;
-    get isInviteClients(): boolean;
+    status: number;
+    get isPending(): boolean;
+    get isAchieved(): boolean;
+    get isCompleted(): boolean;
+    get isSkipped(): boolean;
 }

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

@@ -1,17 +1,37 @@
 /**
- * Enum list of all possible account setup items ids. Using with [ACCOUNT_SETUP_ITEMS]{@link ACCOUNT_SETUP_ITEMS}
- * @TODO Vik/Nikita: Do we need to generate it from backend? If some ids changed?
+ * TODO remove
  */
 export declare enum AccountSetupItemsEnum {
-    SALARY = 1,
-    OTHER_INCOME = 2,
+    FIRM_DETAILS = 9,
+    FIRM_EMPLOYEES = 10,
+    FIRM_CLIENTS = 11,
+    WORK_SALARY = 1,
+    WORK_OTHER_INCOME = 2,
+    WORK_VEHICLE_CLAIM = 5,
+    WORK_HOME_OFFICE = 13,
+    WORK_BANK_ACCOUNT = 14,
+    WORK_DEPRECIATION = 15,
     PROPERTY = 3,
-    BANK_FEEDS = 4,
-    WORK_LOGBOOK = 5,
-    TRANSACTION_ALLOCATE = 6,
+    PROPERTIES = 29,
+    PROPERTIES_BANK_ACCOUNT = 30,
+    PROPERTY_CAPITAL_COST = 17,
+    PROPERTY_RENT_INCOME = 18,
+    PROPERTY_DEPRECIATION = 19,
+    PROPERTY_CO_OWNER = 20,
     SOLE_BUSINESS = 7,
-    HOLDINGS = 8,
-    FIRM_DETAILS = 9,
-    INVITE_TEAM = 10,
-    INVITE_CLIENTS = 11
+    SOLE_BUSINESSES = 33,
+    SOLE_VEHICLE_CLAIM = 12,
+    SOLE_HOME_OFFICE = 21,
+    SOLE_DEPRECIATION = 22,
+    SOLE_BANK_ACCOUNT = 23,
+    SOLE_LOGO = 16,
+    HOLDING_TRADE = 8,
+    HOLDING_INTEGRATION = 25,
+    HOLDING_REPORTS = 36,
+    BANK_CONNECTION = 4,
+    BANK_ACCOUNT = 26,
+    BANK_TRANSACTION = 24,
+    BANK_ALLOCATION = 6,
+    BANK_RULE = 27,
+    BANK_BORROWING_EXPENSE = 28
 }

package/src/lib/models/account-setup/index.d.ts

@@ -0,0 +1,3 @@
+export * from './account-setup-item';
+export * from './account-setup-items.enum';
+export * from './account-setup-item-status.enum';

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

@@ -29,3 +29,4 @@ export * from './firm';
 export * from './home-office';
 export * from './aussie';
 export * from './date-range';
+export * from './account-setup';

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

@@ -7,7 +7,7 @@ import { Phone } from '../phone/phone';
 import { ServiceSubscription } from '../service-subscription';
 import { SoleDetails } from '../sole';
 import { AppFile } from '../file';
-import { AccountSetupItem } from '../account-setup/account-setup-item';
+import { AccountSetupItem } from '../account-setup';
 import { TankTypeEnum } from '../../db/Enums/tank-type.enum';
 export declare class User extends BaseUser {
     subscriptions: ServiceSubscription[];
@@ -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,8 +1,7 @@
-import { BankAccountService, ClientInviteService, ClientMovementService, EmployeeInviteService, EmployeeService, FirmService, HoldingTradeService, IncomeSourceService, PropertyService, SoleBusinessService, TransactionAllocationService, TransactionService, UserService, VehicleClaimService } from '../http';
-import { User } from '../../models';
+import { BankAccount, Property, SoleBusiness, User } from '../../models';
+import { AllocationRuleService, BankAccountService, BankConnectionService, BankTransactionService, 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';
-import { SetupItemTypeEnum } from '../../db/Enums/setup-item-type.enum';
 import { SetupItemService } from '../http/setup-item/setup-item.service';
 import * as i0 from "@angular/core";
 /**
@@ -13,11 +12,17 @@ export declare class AccountSetupService {
     private setupItemService;
     private propertyService;
     private incomeSourceService;
+    private bankConnectionService;
     private bankAccountsService;
+    private bankTransactionService;
+    private loanService;
+    private allocationRuleService;
     private transactionAllocationService;
     private vehicleClaimService;
+    private homeOfficeClaimService;
     private transactionService;
-    private soleBusinessService;
+    private depreciationService;
+    private businessService;
     private holdingService;
     private userService;
     private clientMovementService;
@@ -25,32 +30,45 @@ export declare class AccountSetupService {
     private employeeService;
     private employeeInviteService;
     private firmService;
+    private sharesightDetailsService;
+    private propertyShareService;
     items: AccountSetupItemCollection;
     user: User;
-    constructor(setupItemService: SetupItemService, propertyService: PropertyService, incomeSourceService: IncomeSourceService, bankAccountsService: BankAccountService, transactionAllocationService: TransactionAllocationService, vehicleClaimService: VehicleClaimService, transactionService: TransactionService, soleBusinessService: SoleBusinessService, holdingService: HoldingTradeService, userService: UserService, clientMovementService: ClientMovementService, clientInviteService: ClientInviteService, employeeService: EmployeeService, employeeInviteService: EmployeeInviteService, firmService: FirmService);
+    constructor(setupItemService: SetupItemService, propertyService: PropertyService, incomeSourceService: IncomeSourceService, bankConnectionService: BankConnectionService, bankAccountsService: BankAccountService, bankTransactionService: BankTransactionService, 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(type: SetupItemTypeEnum): Observable<AccountSetupItemCollection>;
-    getClientItems$(): Observable<AccountSetupItemCollection>;
-    getFirmItems$(): Observable<AccountSetupItemCollection>;
+    get(property?: Property, business?: SoleBusiness, bankAccount?: BankAccount): Observable<AccountSetupItemCollection>;
+    setItemsStatus(property?: Property, business?: SoleBusiness, bankAccount?: BankAccount): Observable<AccountSetupItemCollection>;
     /**
      * Check and update isCompleted flag for passed item
      */
     private setItemStatus;
+    private getAllocations;
+    private getTransactions;
+    private getCoOwners;
     /**
-     * @TODO Alex: work with collection when services refactored
-     * @TODO Vik: waiting for income sources refactoring
+     * AccountSetupItemsEnum.FIRM_CLIENTS completed when client invites sent or accepted
      */
-    private getIncomeSources;
+    private getClients;
+    /**
+     * AccountSetupItemsEnum.FIRM_EMPLOYEES completed when employee invites sent or accepted
+     */
+    private getEmployees;
     /**
-     * Show logbook item when user has at least 1 vehicle transaction
+     * AccountSetupItemsEnum.FIRM_DETAILS when firm data filled
      */
-    private getLogbookItem;
+    private getFirms;
     /**
-     * Hide bank feeds item when user has only holding tank
+     * @TODO Alex: work with collection when services refactored
+     * @TODO Vik: waiting for income sources refactoring
      */
-    private getBankFeedsItem;
+    private getIncomeSources;
+    private getVehicleClaims;
+    private getHomeOfficeClaims;
+    private getBankAccounts;
+    private getDepreciations;
+    private getSharesightDetails;
     static ɵfac: i0.ɵɵFactoryDeclaration<AccountSetupService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<AccountSetupService>;
 }

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

@@ -9,10 +9,6 @@ export declare class FirmService {
     firm: Firm;
     firmSubject: ReplaySubject<Firm>;
     constructor(http: HttpClient, environment: any);
-    /**
-     * Register new firm
-     * @param data: firm and firm owner data to register
-     */
     register(data: Firm): Observable<Firm>;
     get(): Observable<Firm>;
     update(firm: Firm): Observable<void>;

package/src/lib/services/http/loan/borrowing-expense/borrowing-expense.service.d.ts

@@ -2,6 +2,7 @@ import { Observable, ReplaySubject } from 'rxjs';
 import { HttpClient } from '@angular/common/http';
 import { BorrowingExpense } from '../../../../models/borrowing-expense/borrowing-expense';
 import { Loan } from '../../../../models/loan/loan';
+import { BorrowingExpenseLoan } from '../../../../models/borrowing-expense/borrowing-expense-loan';
 import * as i0 from "@angular/core";
 /**
  * @TODO Alex (TT-1777): Refactor with rest service
@@ -16,7 +17,7 @@ export declare class BorrowingExpenseService {
      * Get borrowing expenses
      */
     get(): Observable<BorrowingExpense[]>;
-    getLoanBorrowingExpenses(loan?: Loan): Observable<any>;
+    getLoanBorrowingExpenses(loan?: Loan): Observable<BorrowingExpenseLoan[]>;
     static ɵfac: i0.ɵɵFactoryDeclaration<BorrowingExpenseService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<BorrowingExpenseService>;
 }

package/src/lib/services/http/rest/rest-old.service.d.ts

@@ -13,6 +13,7 @@ import * as i0 from "@angular/core";
  */
 export declare abstract class RestService<BaseModel, Model extends BaseModel> {
     protected environment: any;
+    private inFlight$?;
     protected toastService: ToastService;
     protected http: HttpClient;
     protected eventDispatcherService: EventDispatcherService;

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

@@ -19,6 +19,7 @@ import * as i0 from "@angular/core";
  */
 export declare abstract class RestService<BaseModel, Model extends AbstractModel, CollectionModel extends Collection<Model>> extends DataService<BaseModel, Model, CollectionModel> {
     protected environment: any;
+    private inFlight$?;
     /**
      * Url part for service entity API
      */

package/src/lib/services/http/setup-item/setup-item.service.d.ts

@@ -1,6 +1,6 @@
 import { AccountSetupItemCollection } from '../../../collections';
 import { SetupItem } from '../../../db/Models/setup-item';
-import { AccountSetupItem } from '../../../models/account-setup/account-setup-item';
+import { AccountSetupItem } from '../../../models';
 import { RestMethod, RestService } from '../rest';
 import * as i0 from "@angular/core";
 export declare class SetupItemService extends RestService<SetupItem, AccountSetupItem, AccountSetupItemCollection> {

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

@@ -1,9 +1,8 @@
 import { Observable } from 'rxjs';
 import { User as UserBase } from '../../../db/Models/user/user';
-import { User } from '../../../models';
+import { AccountSetupItem, User } from '../../../models';
 import { RestMethod, RestService } from '../rest';
 import { Collection } from '../../../collections';
-import { AccountSetupItem } from '../../../models/account-setup/account-setup-item';
 import { IEventListener } from '../../../interfaces';
 import { MixpanelService } from 'taxtank-core/common';
 import * as i0 from "@angular/core";
@@ -35,7 +34,9 @@ export declare class UserService extends RestService<UserBase, User, Collection<
     updatePhoto(photo: FormData): Observable<void>;
     createBasiq(): Observable<string>;
     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;