taxtank-core 0.31.8 → 0.31.9

package/fesm2020/taxtank-core.mjs

@@ -34,7 +34,6 @@ import { NavigationEnd } from '@angular/router';
 import _ from 'lodash';
 import merge from 'lodash/merge';
 import { loadStripe } from '@stripe/stripe-js';
-import fromPairs from 'lodash/fromPairs';
 import { jsPDF } from 'jspdf';
 import { applyPlugin } from 'jspdf-autotable';
 import html2pdf from 'html2pdf.js';
@@ -13872,7 +13871,7 @@ class SubscriptionService extends RestService$1 {
             // @TODO vik test and remove
             setTimeout(() => {
                 this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.SERVICE_SUBSCRIPTION_UPDATED, null));
-                this.toastService.success('Subscription successfully updated');
+                this.toastService.success('Subscription successfully updated!!!');
             }, 2000);
         });
     }
@@ -17777,8 +17776,7 @@ const ACCOUNT_SETUP_ITEMS = {
  * Checks required steps and their completion
  */
 class AccountSetupService {
-    constructor(clientIncomeTypesService, propertyService, incomeSourceService, bankAccountsService, transactionAllocationService, vehicleClaimService, transactionService, soleBusinessService, holdingService, userService) {
-        this.clientIncomeTypesService = clientIncomeTypesService;
+    constructor(propertyService, incomeSourceService, bankAccountsService, transactionAllocationService, vehicleClaimService, transactionService, soleBusinessService, holdingService, userService) {
         this.propertyService = propertyService;
         this.incomeSourceService = incomeSourceService;
         this.bankAccountsService = bankAccountsService;
@@ -17796,12 +17794,10 @@ class AccountSetupService {
     get() {
         if (!this.cache) {
             this.cache = new AccountSetupItemCollection([]);
-            this.clientIncomeTypesService.getFirst()
-                .pipe(mergeMap((incomeTypes) => {
-                this.clientIncomeTypesId = incomeTypes.id;
-                return this.createBatch(incomeTypes);
-            }))
-                .subscribe((items) => {
+            this.userService.getFirst().pipe(mergeMap((user) => {
+                this.user = user;
+                return this.createBatch();
+            })).subscribe((items) => {
                 switch (true) {
                     case !this.cache:
                     case this.cache.filterBy('isCompleted', true).length !== items.filterBy('isCompleted', true).length:
@@ -17813,12 +17809,6 @@ class AccountSetupService {
         }
         return this.cacheSubject.asObservable();
     }
-    /**
-     * Prepare client income types to update to hide depended account setup items
-     */
-    prepareIncomeTypes(item) {
-        return plainToClass(ClientIncomeTypes, Object.assign({ id: this.clientIncomeTypesId }, fromPairs(item.clientIncomeTypes.map((type) => [type, false]))));
-    }
     /**
      * Get a single AccountSetupItem and check it's completion
      */
@@ -17838,28 +17828,27 @@ class AccountSetupService {
      * Get batch of requests to get list of required AccountSetupItem's.
      * Some items are optional and depends of user's client income types
      */
-    createBatch(incomeTypes) {
+    createBatch() {
         const batch = [];
-        const user = this.userService.getCacheFirst();
         // Salary item is completed when user added salary income source
-        if (incomeTypes.work && user.hasRoles(UserRolesEnum.WORK_TANK)) {
+        if (this.user.hasRoles(UserRolesEnum.WORK_TANK)) {
             batch.push(this.create(AccountSetupItemsEnum.SALARY, this.getIncomeSources(true)), 
             // Other income is a part of work tank, completed when user added at least one other income source
             this.create(AccountSetupItemsEnum.OTHER_INCOME, this.getIncomeSources()));
         }
         // Rental income item is completed when user added at least one property
-        if (incomeTypes.property && user.hasRoles(UserRolesEnum.PROPERTY_TANK)) {
+        if (this.user.hasRoles(UserRolesEnum.PROPERTY_TANK)) {
             batch.push(this.create(AccountSetupItemsEnum.PROPERTY, this.propertyService.getArray()));
         }
         // Sole business item is completed when user added at least one business
-        if (incomeTypes.sole && user.hasRoles(UserRolesEnum.SOLE_TANK)) {
+        if (this.user.hasRoles(UserRolesEnum.SOLE_TANK)) {
             batch.push(this.create(AccountSetupItemsEnum.SOLE_BUSINESS, this.soleBusinessService.get()));
         }
         // holdings item is completed when user added at least one holding
-        if (incomeTypes.holdings && user.hasRoles(UserRolesEnum.HOLDING_TANK)) {
+        if (this.user.hasRoles(UserRolesEnum.HOLDING_TANK)) {
             batch.push(this.create(AccountSetupItemsEnum.HOLDINGS, this.holdingService.getArray()));
         }
-        if (incomeTypes.sole || incomeTypes.property || incomeTypes.work || incomeTypes.holdings) {
+        if (this.user.hasRoles([UserRolesEnum.WORK_TANK, UserRolesEnum.PROPERTY_TANK, UserRolesEnum.SOLE_TANK, UserRolesEnum.HOLDING_TANK])) {
             // Bank feeds item is completed when user added at least one bank account (basiq or manual)
             batch.push(this.getBankFeedsItem());
             // Logbook item is completed when user has at least one vehicle claim with any method (kms or logbook)
@@ -17908,14 +17897,14 @@ class AccountSetupService {
         return this.create(AccountSetupItemsEnum.BANK_FEEDS, this.bankAccountsService.getArray());
     }
 }
-AccountSetupService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AccountSetupService, deps: [{ token: ClientIncomeTypesService }, { token: PropertyService }, { token: IncomeSourceService }, { token: BankAccountService }, { token: TransactionAllocationService }, { token: VehicleClaimService }, { token: TransactionService }, { token: SoleBusinessService }, { token: HoldingService }, { token: UserService }], target: i0.ɵɵFactoryTarget.Injectable });
+AccountSetupService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AccountSetupService, deps: [{ token: PropertyService }, { token: IncomeSourceService }, { token: BankAccountService }, { token: TransactionAllocationService }, { token: VehicleClaimService }, { token: TransactionService }, { token: SoleBusinessService }, { token: HoldingService }, { token: UserService }], target: i0.ɵɵFactoryTarget.Injectable });
 AccountSetupService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AccountSetupService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AccountSetupService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: ClientIncomeTypesService }, { type: PropertyService }, { type: IncomeSourceService }, { type: BankAccountService }, { type: TransactionAllocationService }, { type: VehicleClaimService }, { type: TransactionService }, { type: SoleBusinessService }, { type: HoldingService }, { type: UserService }]; } });
+        }], ctorParameters: function () { return [{ type: PropertyService }, { type: IncomeSourceService }, { type: BankAccountService }, { type: TransactionAllocationService }, { type: VehicleClaimService }, { type: TransactionService }, { type: SoleBusinessService }, { type: HoldingService }, { type: UserService }]; } });
 
 /**
  * Service to work with Rewardful (affiliate program) API