taxtank-core 1.0.35 → 1.0.37

package/fesm2022/taxtank-core.mjs

@@ -5440,7 +5440,7 @@ var AccountSetupItemsEnum;
     AccountSetupItemsEnum[AccountSetupItemsEnum["SOLE_HOME_OFFICE"] = 21] = "SOLE_HOME_OFFICE";
     AccountSetupItemsEnum[AccountSetupItemsEnum["SOLE_DEPRECIATION"] = 22] = "SOLE_DEPRECIATION";
     AccountSetupItemsEnum[AccountSetupItemsEnum["SOLE_BANK_ACCOUNT"] = 23] = "SOLE_BANK_ACCOUNT";
-    AccountSetupItemsEnum[AccountSetupItemsEnum["SOLE_LOGO"] = 24] = "SOLE_LOGO";
+    AccountSetupItemsEnum[AccountSetupItemsEnum["SOLE_LOGO"] = 16] = "SOLE_LOGO";
     // holding
     AccountSetupItemsEnum[AccountSetupItemsEnum["HOLDING_TRADE"] = 8] = "HOLDING_TRADE";
     AccountSetupItemsEnum[AccountSetupItemsEnum["HOLDING_INTEGRATION"] = 25] = "HOLDING_INTEGRATION";
@@ -5448,6 +5448,7 @@ var AccountSetupItemsEnum;
     // bank accounts
     AccountSetupItemsEnum[AccountSetupItemsEnum["BANK_CONNECTION"] = 4] = "BANK_CONNECTION";
     AccountSetupItemsEnum[AccountSetupItemsEnum["BANK_ACCOUNT"] = 26] = "BANK_ACCOUNT";
+    AccountSetupItemsEnum[AccountSetupItemsEnum["BANK_TRANSACTION"] = 24] = "BANK_TRANSACTION";
     AccountSetupItemsEnum[AccountSetupItemsEnum["BANK_ALLOCATION"] = 6] = "BANK_ALLOCATION";
     AccountSetupItemsEnum[AccountSetupItemsEnum["BANK_RULE"] = 27] = "BANK_RULE";
     AccountSetupItemsEnum[AccountSetupItemsEnum["BANK_BORROWING_EXPENSE"] = 28] = "BANK_BORROWING_EXPENSE";
@@ -19334,12 +19335,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.2", ngImpor
  * Checks required steps and their completion
  */
 class AccountSetupService {
-    constructor(setupItemService, propertyService, incomeSourceService, bankConnectionService, bankAccountsService, loanService, allocationRuleService, transactionAllocationService, vehicleClaimService, homeOfficeClaimService, transactionService, depreciationService, businessService, holdingService, userService, clientMovementService, clientInviteService, employeeService, employeeInviteService, firmService, sharesightDetailsService, propertyShareService) {
+    constructor(setupItemService, propertyService, incomeSourceService, bankConnectionService, bankAccountsService, bankTransactionService, loanService, allocationRuleService, transactionAllocationService, vehicleClaimService, homeOfficeClaimService, transactionService, depreciationService, businessService, holdingService, userService, clientMovementService, clientInviteService, employeeService, employeeInviteService, firmService, sharesightDetailsService, propertyShareService) {
         this.setupItemService = setupItemService;
         this.propertyService = propertyService;
         this.incomeSourceService = incomeSourceService;
         this.bankConnectionService = bankConnectionService;
         this.bankAccountsService = bankAccountsService;
+        this.bankTransactionService = bankTransactionService;
         this.loanService = loanService;
         this.allocationRuleService = allocationRuleService;
         this.transactionAllocationService = transactionAllocationService;
@@ -19361,15 +19363,15 @@ class AccountSetupService {
     /**
      * Get list of account setup items for current user/firm
      */
-    get(property, business) {
+    get(property, business, bankAccount) {
         // @TODO it takes time for user to update, makes sense to subscribe to serviceSubscription instead
         return combineLatest([this.setupItemService.get(), this.userService.getFirst()]).pipe(switchMap(([items, user]) => {
             this.user = user;
             this.items = items.getByUser(user);
-            return this.setItemsStatus(property, business);
+            return this.setItemsStatus(property, business, bankAccount);
         }));
     }
-    setItemsStatus(property, business) {
+    setItemsStatus(property, business, bankAccount) {
         const itemsById = this.items.indexBy('id');
         const requests = pick({
             // firm
@@ -19391,35 +19393,41 @@ class AccountSetupService {
             [AccountSetupItemsEnum.SOLE_BUSINESS]: this.businessService.getArray(),
             [AccountSetupItemsEnum.SOLE_BUSINESSES]: this.businessService.getArray().pipe(map(businesses => businesses.slice(1))),
             [AccountSetupItemsEnum.SOLE_BANK_ACCOUNT]: this.getBankAccounts(TankTypeEnum.SOLE),
-            // holding
+            // holdings
             [AccountSetupItemsEnum.HOLDING_TRADE]: this.holdingService.getArray(),
             [AccountSetupItemsEnum.HOLDING_INTEGRATION]: this.getSharesightDetails(true),
-            // bankAccount
+            // bankAccounts
             [AccountSetupItemsEnum.BANK_CONNECTION]: this.bankConnectionService.getArray(),
             [AccountSetupItemsEnum.BANK_ACCOUNT]: this.getBankAccounts(),
-            [AccountSetupItemsEnum.BANK_ALLOCATION]: this.transactionAllocationService.get(),
-            [AccountSetupItemsEnum.BANK_RULE]: this.allocationRuleService.getArray(),
-            [AccountSetupItemsEnum.BANK_BORROWING_EXPENSE]: this.getBorrowingExpenses(),
         }, this.items.getIds());
         // property
         if (property) {
             requests[AccountSetupItemsEnum.PROPERTY_CAPITAL_COST] = this.propertyService.getBy('id', property.id).pipe(map(properties => properties.filter(property => !!property.capitalCosts)));
-            requests[AccountSetupItemsEnum.PROPERTY_RENT_INCOME] = this.getTransactions(property).pipe(map(transactions => new TransactionCollection(transactions).filterBy('chartAccounts.id', ChartAccountsListEnum.RENTAL_INCOME)));
+            requests[AccountSetupItemsEnum.PROPERTY_RENT_INCOME] = this.getTransactions(property.id).pipe(map(transactions => new TransactionCollection(transactions).filterBy('chartAccounts.id', ChartAccountsListEnum.RENTAL_INCOME)));
             requests[AccountSetupItemsEnum.PROPERTY_DEPRECIATION] = this.getDepreciations(TankTypeEnum.PROPERTY, property.id);
-            requests[AccountSetupItemsEnum.PROPERTY_CO_OWNER] = this.getCoOwners(property);
+            requests[AccountSetupItemsEnum.PROPERTY_CO_OWNER] = this.getCoOwners(property.id);
         }
         // business
         if (business) {
-            requests[AccountSetupItemsEnum.SOLE_VEHICLE_CLAIM] = this.getVehicleClaims(business);
-            requests[AccountSetupItemsEnum.SOLE_HOME_OFFICE] = this.getHomeOfficeClaims(business);
+            requests[AccountSetupItemsEnum.SOLE_VEHICLE_CLAIM] = this.getVehicleClaims(business.id);
+            requests[AccountSetupItemsEnum.SOLE_HOME_OFFICE] = this.getHomeOfficeClaims(business.id);
             requests[AccountSetupItemsEnum.SOLE_DEPRECIATION] = this.getDepreciations(TankTypeEnum.SOLE, business.id);
             requests[AccountSetupItemsEnum.SOLE_LOGO] = this.businessService.getBy('id', business.id).pipe(map(businesses => businesses.filter(business => !!business.file)));
         }
+        // bankAccount
+        if (bankAccount) {
+            requests[AccountSetupItemsEnum.BANK_TRANSACTION] = this.bankTransactionService.get().pipe(map(transactions => transactions.filterBy('bankAccount.id', bankAccount.id)));
+            requests[AccountSetupItemsEnum.BANK_ALLOCATION] = this.getAllocations(bankAccount.id);
+            requests[AccountSetupItemsEnum.BANK_RULE] = this.allocationRuleService.get().pipe(map(rules => rules.filterBy('bankAccount.id', bankAccount.id)));
+            if (bankAccount.loan) {
+                requests[AccountSetupItemsEnum.BANK_BORROWING_EXPENSE] = this.loanService.get().pipe(map(loans => loans.filterBy('bankAccount.id', bankAccount.id).filter(loan => !!loan.borrowingExpenses.length)));
+            }
+        }
         const batch = Object.keys(requests).map(id => this.setItemStatus(itemsById.get(id), requests[id]));
         if (!batch.length) {
             return of(new AccountSetupItemCollection([]));
         }
-        return combineLatest(batch).pipe(map((items) => new AccountSetupItemCollection(items)));
+        return combineLatest(batch).pipe(map((items) => new AccountSetupItemCollection(items).sortBy('order', 'asc')));
     }
     /**
      * Check and update isCompleted flag for passed item
@@ -19431,11 +19439,17 @@ class AccountSetupService {
             return item;
         }));
     }
-    getTransactions(property) {
-        return this.transactionService.getByPropertyId(property.id);
+    getAllocations(bankAccountId) {
+        return combineLatest([this.bankTransactionService.get(), this.transactionAllocationService.get()]).pipe(map(([bankTransactions, allocations]) => {
+            const bankTransactionsIds = bankTransactions.filterBy('bankAccount.id', bankAccountId).getIds();
+            return new TransactionAllocationCollection(allocations).getByBankTransactionsIds(bankTransactionsIds).toArray();
+        }));
     }
-    getCoOwners(property) {
-        return this.propertyShareService.getArrayBy('property.id', property.id).pipe(map(shares => shares.slice(1)));
+    getTransactions(propertyId) {
+        return this.transactionService.getByPropertyId(propertyId);
+    }
+    getCoOwners(propertyId) {
+        return this.propertyShareService.getArrayBy('property.id', propertyId).pipe(map(shares => shares.slice(1)));
     }
     /**
      * AccountSetupItemsEnum.FIRM_CLIENTS completed when client invites sent or accepted
@@ -19468,11 +19482,11 @@ class AccountSetupService {
             return collection.items.filter((incomeSource) => incomeSource.isOtherIncome());
         }));
     }
-    getVehicleClaims(business) {
-        return this.vehicleClaimService.getArray().pipe(map(claims => claims.filter(claim => business ? claim.business.id === business.id : !claim.business)));
+    getVehicleClaims(businessId) {
+        return this.vehicleClaimService.getArray().pipe(map(claims => claims.filter(claim => claim.business?.id === businessId)));
     }
-    getHomeOfficeClaims(business) {
-        return this.homeOfficeClaimService.getArray().pipe(map(claims => claims.filter(claim => business ? claim.business.id === business.id : !claim.business)));
+    getHomeOfficeClaims(businessId) {
+        return this.homeOfficeClaimService.getArray().pipe(map(claims => claims.filter(claim => claim.business?.id === businessId)));
     }
     getBankAccounts(tankType) {
         return this.bankAccountsService.get().pipe(map((bankAccounts => bankAccounts.getByTankType(tankType).toArray())));
@@ -19492,10 +19506,7 @@ class AccountSetupService {
     getSharesightDetails(importEnabled) {
         return this.sharesightDetailsService.getArray().pipe(map(details => details.filter(detail => importEnabled ? detail.importEnabled : detail.exportEnabled)));
     }
-    getBorrowingExpenses() {
-        return this.loanService.getArray().pipe(map(loans => loans.filter(loan => !!loan.borrowingExpenses.length)));
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.2", ngImport: i0, type: AccountSetupService, deps: [{ token: SetupItemService }, { token: PropertyService }, { token: IncomeSourceService }, { token: BankConnectionService }, { token: BankAccountService }, { token: LoanService }, { token: AllocationRuleService }, { token: TransactionAllocationService }, { token: VehicleClaimService }, { token: HomeOfficeClaimService }, { token: TransactionService }, { token: DepreciationService }, { token: SoleBusinessService }, { token: HoldingTradeService }, { token: UserService }, { token: ClientMovementService }, { token: ClientInviteService }, { token: EmployeeService }, { token: EmployeeInviteService }, { token: FirmService }, { token: SharesightDetailsService }, { token: PropertyShareService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.2", ngImport: i0, type: AccountSetupService, deps: [{ token: SetupItemService }, { token: PropertyService }, { token: IncomeSourceService }, { token: BankConnectionService }, { token: BankAccountService }, { token: BankTransactionService }, { token: LoanService }, { token: AllocationRuleService }, { token: TransactionAllocationService }, { token: VehicleClaimService }, { token: HomeOfficeClaimService }, { token: TransactionService }, { token: DepreciationService }, { token: SoleBusinessService }, { token: HoldingTradeService }, { token: UserService }, { token: ClientMovementService }, { token: ClientInviteService }, { token: EmployeeService }, { token: EmployeeInviteService }, { token: FirmService }, { token: SharesightDetailsService }, { token: PropertyShareService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.1.2", ngImport: i0, type: AccountSetupService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.2", ngImport: i0, type: AccountSetupService, decorators: [{
@@ -19503,7 +19514,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.2", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: () => [{ type: SetupItemService }, { type: PropertyService }, { type: IncomeSourceService }, { type: BankConnectionService }, { type: BankAccountService }, { type: LoanService }, { type: AllocationRuleService }, { type: TransactionAllocationService }, { type: VehicleClaimService }, { type: HomeOfficeClaimService }, { type: TransactionService }, { type: DepreciationService }, { type: SoleBusinessService }, { type: HoldingTradeService }, { type: UserService }, { type: ClientMovementService }, { type: ClientInviteService }, { type: EmployeeService }, { type: EmployeeInviteService }, { type: FirmService }, { type: SharesightDetailsService }, { type: PropertyShareService }] });
+        }], ctorParameters: () => [{ type: SetupItemService }, { type: PropertyService }, { type: IncomeSourceService }, { type: BankConnectionService }, { type: BankAccountService }, { type: BankTransactionService }, { type: LoanService }, { type: AllocationRuleService }, { type: TransactionAllocationService }, { type: VehicleClaimService }, { type: HomeOfficeClaimService }, { type: TransactionService }, { type: DepreciationService }, { type: SoleBusinessService }, { type: HoldingTradeService }, { type: UserService }, { type: ClientMovementService }, { type: ClientInviteService }, { type: EmployeeService }, { type: EmployeeInviteService }, { type: FirmService }, { type: SharesightDetailsService }, { type: PropertyShareService }] });
 
 class AdblockService {
     constructor() {
@@ -21103,14 +21114,18 @@ var YoutubeVideosEnum;
     YoutubeVideosEnum["PROPERTY_ONBOARDING"] = "llUV98-EMdI";
     YoutubeVideosEnum["SOLE_ONBOARDING"] = "rqfTQFGwkUM";
     YoutubeVideosEnum["WORK_ONBOARDING"] = "QEKolzS1B0U";
-    // @TODO replace
     YoutubeVideosEnum["PROPERTY_RENTAL"] = "E9NU14ndjhc";
-    YoutubeVideosEnum["PROPERTY_DEPRECIATION"] = "E9NU14ndjhc";
-    YoutubeVideosEnum["SOLE_VEHICLE_CLAIM"] = "E9NU14ndjhc";
-    YoutubeVideosEnum["HOME_OFFICE"] = "E9NU14ndjhc";
-    YoutubeVideosEnum["SOLE_DEPRECIATION"] = "E9NU14ndjhc";
-    YoutubeVideosEnum["WORK_VEHICLE_CLAIM"] = "E9NU14ndjhc";
-    YoutubeVideosEnum["WORK_DEPRECIATION"] = "E9NU14ndjhc";
+    YoutubeVideosEnum["PROPERTY_DEPRECIATION"] = "_34lK9ooFzc";
+    YoutubeVideosEnum["VEHICLE_CLAIM"] = "4-6WaM83cw0";
+    YoutubeVideosEnum["SOLE_DEPRECIATION"] = "Bw3tx4miFF8";
+    YoutubeVideosEnum["SOLE_HOME_OFFICE"] = "fF8_kJHEKRE";
+    YoutubeVideosEnum["WORK_DEPRECIATION"] = "gNa9M4xovuI";
+    YoutubeVideosEnum["WORK_HOME_OFFICE"] = "qrQu4Yl72bU";
+    YoutubeVideosEnum["BANK_FEEDS"] = "meQmpw7ZY7c";
+    // @TODO replace PROPERTY_RENTAL
+    YoutubeVideosEnum["BANK_ACCOUNT_TRANSACTION"] = "meQmpw7ZY7c";
+    YoutubeVideosEnum["BANK_ALLOCATION_RULE"] = "meQmpw7ZY7c";
+    YoutubeVideosEnum["ALLOCATE_TRANSACTION"] = "meQmpw7ZY7c";
 })(YoutubeVideosEnum || (YoutubeVideosEnum = {}));
 
 var PropertyDepreciationCalculationEnum;