Merge branch 'release/2.3'

(cherry picked from commit 1d865c47d7)

angular.json

@@ -1600,6 +1600,43 @@
           }
         }
       }
+    },
+    "@domain/product-list": {
+      "projectType": "library",
+      "root": "apps/domain/product-list",
+      "sourceRoot": "apps/domain/product-list/src",
+      "prefix": "lib",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:ng-packagr",
+          "options": {
+            "project": "apps/domain/product-list/ng-package.json"
+          },
+          "configurations": {
+            "production": {
+              "tsConfig": "apps/domain/product-list/tsconfig.lib.prod.json"
+            },
+            "development": {
+              "tsConfig": "apps/domain/product-list/tsconfig.lib.json"
+            }
+          },
+          "defaultConfiguration": "production"
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "tsConfig": "apps/domain/product-list/tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
+            "polyfills": [
+              "zone.js",
+              "zone.js/testing"
+            ]
+          }
+        }
+      }
     }
+  },
+  "cli": {
+    "analytics": false
   }
 }

apps/adapter/scan/src/lib/dev.scan-adapter.ts

@@ -11,13 +11,9 @@ export class DevScanAdapter implements ScanAdapter {
   constructor(private _modal: UiModalService, private _environmentService: EnvironmentService) {}
 
   async init(): Promise<boolean> {
-    if (this._environmentService.isTablet()) {
-      return new Promise((resolve, reject) => {
-        resolve(isDevMode());
-      });
-    }
-
-    return false;
+    return new Promise((resolve, reject) => {
+      resolve(isDevMode());
+    });
   }
 
   scan(): Observable<string> {

apps/adapter/scan/src/lib/native.scan-adapter.ts

@@ -12,7 +12,7 @@ export class NativeScanAdapter implements ScanAdapter {
 
   init(): Promise<boolean> {
     return new Promise((resolve, reject) => {
-      resolve(this.nativeContainerService.isUiWebview().isNative);
+      resolve(this.nativeContainerService.isNative);
     });
   }
 

apps/adapter/scan/src/lib/scan.service.ts

@@ -14,7 +14,6 @@ export class ScanAdapterService {
   async init(): Promise<void> {
     for (const adapter of this.scanAdapters) {
       const isReady = await adapter.init();
-      console.log('ScanAdapterService.init', adapter.name, isReady);
       this._readyAdapters[adapter.name] = isReady;
     }
   }
@@ -24,42 +23,30 @@ export class ScanAdapterService {
   }
 
   getAdapter(name: string): ScanAdapter | undefined {
-    return this.scanAdapters.find((adapter) => adapter.name === name);
+    return this._readyAdapters[name] && this.scanAdapters.find((adapter) => adapter.name === name);
   }
 
-  // return true if at least one adapter is ready
   isReady(): boolean {
     return Object.values(this._readyAdapters).some((ready) => ready);
   }
 
-  scan(ops: { use?: string; include?: string[]; exclude?: string[] } = { exclude: ['Dev'] }): Observable<string> {
+  scan(): Observable<string> {
+    const adapterOrder = ['Native', 'Scandit', 'Dev'];
+
     let adapter: ScanAdapter;
 
-    if (ops.use == undefined) {
-      // get the first adapter that is ready to use
-      adapter = this.scanAdapters
-        .filter((adapter) => {
-          if (ops.include?.length) {
-            return ops.include.includes(adapter.name);
-          } else if (ops.exclude?.length) {
-            return !ops.exclude.includes(adapter.name);
-          } else {
-            return true;
-          }
-        })
-        .find((adapter) => this._readyAdapters[adapter.name]);
-    } else {
-      adapter = this.getAdapter(ops.use);
+    for (const name of adapterOrder) {
+      adapter = this.getAdapter(name);
+
+      if (adapter) {
+        break;
+      }
     }
 
     if (!adapter) {
       return throwError('No adapter found');
     }
 
-    if (this._readyAdapters[adapter.name] == false) {
-      return throwError('Adapter is not ready');
-    }
-
     return adapter.scan();
   }
 }

apps/core/application/src/lib/application.service.ts

@@ -4,7 +4,7 @@ import { Store } from '@ngrx/store';
 import { BranchDTO } from '@swagger/checkout';
 import { isBoolean, isNumber } from '@utils/common';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import { first, map, switchMap } from 'rxjs/operators';
 import { ApplicationProcess } from './defs';
 import {
   removeProcess,
@@ -70,7 +70,13 @@ export class ApplicationService {
     this.store.dispatch(patchProcessData({ processId, data }));
   }
 
-  getSelectedBranch$(processId: number): Observable<BranchDTO> {
+  getSelectedBranch$(processId?: number): Observable<BranchDTO> {
+    if (!processId) {
+      return this.activatedProcessId$.pipe(
+        switchMap((processId) => this.getProcessById$(processId).pipe(map((process) => process?.data?.selectedBranch)))
+      );
+    }
+
     return this.getProcessById$(processId).pipe(map((process) => process?.data?.selectedBranch));
   }
 

apps/core/auth/src/lib/auth.module.ts

@@ -1,7 +1,11 @@
 import { ModuleWithProviders, NgModule } from '@angular/core';
 import { AuthService } from './auth.service';
 import { OAuthModule } from 'angular-oauth2-oidc';
-@NgModule({})
+import { IfRoleDirective } from './if-role.directive';
+@NgModule({
+  declarations: [IfRoleDirective],
+  exports: [IfRoleDirective],
+})
 export class AuthModule {
   static forRoot(): ModuleWithProviders<AuthModule> {
     return {

apps/core/auth/src/lib/auth.service.ts

@@ -1,9 +1,10 @@
+import { coerceArray, coerceStringArray } from '@angular/cdk/coercion';
 import { Injectable } from '@angular/core';
 import { Config } from '@core/config';
 import { isNullOrUndefined } from '@utils/common';
 import { AuthConfig, OAuthService } from 'angular-oauth2-oidc';
 import { JwksValidationHandler } from 'angular-oauth2-oidc-jwks';
-import { BehaviorSubject } from 'rxjs';
+import { asapScheduler, BehaviorSubject } from 'rxjs';
 
 @Injectable({
   providedIn: 'root',
@@ -14,20 +15,29 @@ export class AuthService {
     return this._initialized.asObservable();
   }
 
-  constructor(private _config: Config, private readonly _oAuthService: OAuthService) {}
+  private _authConfig: AuthConfig;
+
+  constructor(private _config: Config, private readonly _oAuthService: OAuthService) {
+    this._oAuthService.events?.subscribe((event) => {
+      if (event.type === 'token_received') {
+        console.log('SSO Token Expiration:', new Date(this._oAuthService.getAccessTokenExpiration()));
+      }
+    });
+  }
 
   async init() {
     if (this._initialized.getValue()) {
       throw new Error('AuthService is already initialized');
     }
 
-    const authConfig: AuthConfig = this._config.get('@core/auth');
+    this._authConfig = this._config.get('@core/auth');
 
-    authConfig.redirectUri = window.location.origin;
-    authConfig.silentRefreshRedirectUri = window.location.origin + '/silent-refresh.html';
-    authConfig.useSilentRefresh = true;
+    this._authConfig.redirectUri = window.location.origin;
 
-    this._oAuthService.configure(authConfig);
+    this._authConfig.silentRefreshRedirectUri = window.location.origin + '/silent-refresh.html';
+    this._authConfig.useSilentRefresh = true;
+
+    this._oAuthService.configure(this._authConfig);
     this._oAuthService.tokenValidationHandler = new JwksValidationHandler();
 
     this._oAuthService.setupAutomaticSilentRefresh();
@@ -84,5 +94,32 @@ export class AuthService {
 
   async logout() {
     await this._oAuthService.revokeTokenAndLogout();
+    // asapScheduler.schedule(() => {
+    //   window.location.reload();
+    // }, 250);
+  }
+
+  hasRole(role: string | string[]) {
+    const roles = coerceArray(role);
+
+    const userRoles = this.getClaimByKey('role');
+
+    if (isNullOrUndefined(userRoles)) {
+      return false;
+    }
+
+    return roles.every((r) => userRoles.includes(r));
+  }
+
+  async refresh() {
+    try {
+      if (this._authConfig.responseType.includes('code') && this._authConfig.scope.includes('offline_access')) {
+        await this._oAuthService.refreshToken();
+      } else {
+        await this._oAuthService.silentRefresh();
+      }
+    } catch (error) {
+      console.error(error);
+    }
   }
 }

apps/core/auth/src/lib/if-role.directive.spec.ts

@@ -0,0 +1,65 @@
+// import { SpectatorDirective, createDirectiveFactory } from '@ngneat/spectator';
+// import { IfRoleDirective } from './if-role.directive';
+// import { AuthService } from './auth.service';
+// import { TemplateRef, ViewContainerRef } from '@angular/core';
+
+// describe('IfRoleDirective', () => {
+//   let spectator: SpectatorDirective<IfRoleDirective>;
+//   const createDirective = createDirectiveFactory({
+//     directive: IfRoleDirective,
+//     mocks: [AuthService],
+//   });
+
+//   it('should create an instance', () => {
+//     spectator = createDirective(`<div *ifRole="'admin'"></div>`);
+//     expect(spectator.directive).toBeTruthy();
+//   });
+
+//   it('should render template when user has the role', () => {
+//     spectator = createDirective(`<div *ifRole="'admin'"></div>`);
+//     const authService = spectator.inject(AuthService);
+//     const viewContainerRef = spectator.inject(ViewContainerRef);
+//     const templateRef = spectator.inject(TemplateRef);
+//     authService.hasRole.and.returnValue(true);
+//     spectator.directive.ngOnChanges();
+//     expect(viewContainerRef.createEmbeddedView).toHaveBeenCalledWith(templateRef, spectator.directive.getContext());
+//   });
+
+//   it('should render else template when user does not have the role', () => {
+//     authService.hasRole.and.returnValue(false);
+//     const elseTemplateRef = {} as TemplateRef<any>;
+//     spectator = createDirective(`<ng-template #elseTemplateRef></ng-template><div *ifRole="'admin'; else elseTemplateRef"></div>`, {
+//       hostProps: {
+//         elseTemplateRef,
+//       },
+//     });
+//     spectator.directive.ngOnChanges();
+//     expect(viewContainerRef.createEmbeddedView).toHaveBeenCalledWith(elseTemplateRef, spectator.directive.getContext());
+//   });
+
+//   it('should render else template when user does not have the role using ifNotRole input', () => {
+//     authService.hasRole.and.returnValue(false);
+//     const elseTemplateRef = {} as TemplateRef<any>;
+//     spectator = createDirective(`<ng-template #elseTemplateRef></ng-template><div *ifNotRole="'admin'; else elseTemplateRef"></div>`, {
+//       hostProps: {
+//         elseTemplateRef,
+//       },
+//     });
+//     spectator.directive.ngOnChanges();
+//     expect(viewContainerRef.createEmbeddedView).toHaveBeenCalledWith(elseTemplateRef, spectator.directive.getContext());
+//   });
+
+//   it('should clear view when user does not have the role and elseTemplateRef is not defined', () => {
+//     authService.hasRole.and.returnValue(false);
+//     spectator = createDirective(`<div *ifRole="'admin'"></div>`);
+//     spectator.directive.ngOnChanges();
+//     expect(viewContainerRef.clear).toHaveBeenCalled();
+//   });
+
+//   it('should set $implicit to ifRole or ifNotRole input', () => {
+//     spectator = createDirective(`<div *ifRole="'admin'"></div>`);
+//     expect(spectator.directive.getContext().$implicit).toEqual('admin');
+//     spectator.setInput('ifNotRole', 'user');
+//     expect(spectator.directive.getContext().$implicit).toEqual('user');
+//   });
+// });

apps/core/auth/src/lib/if-role.directive.ts

@@ -0,0 +1,59 @@
+import { Directive, Input, OnChanges, TemplateRef, ViewContainerRef } from '@angular/core';
+import { AuthService } from './auth.service';
+
+@Directive({
+  selector: '[ifRole],[ifRoleElse],[ifNotRole],[ifNotRoleElse]',
+})
+export class IfRoleDirective implements OnChanges {
+  @Input()
+  ifRole: string | string[];
+
+  @Input()
+  ifRoleElse: TemplateRef<any>;
+
+  @Input()
+  ifNotRole: string | string[];
+
+  @Input()
+  ifNotRoleElse: TemplateRef<any>;
+
+  get renderTemplateRef() {
+    if (this.ifRole) {
+      return this._authService.hasRole(this.ifRole);
+    }
+    if (this.ifNotRole) {
+      return !this._authService.hasRole(this.ifNotRole);
+    }
+    return false;
+  }
+
+  get elseTemplateRef() {
+    return this.ifRoleElse || this.ifNotRoleElse;
+  }
+
+  constructor(private _templateRef: TemplateRef<any>, private _viewContainer: ViewContainerRef, private _authService: AuthService) {}
+
+  ngOnChanges() {
+    this.render();
+  }
+
+  render() {
+    if (this.renderTemplateRef) {
+      this._viewContainer.createEmbeddedView(this._templateRef, this.getContext());
+      return;
+    }
+
+    if (this.elseTemplateRef) {
+      this._viewContainer.createEmbeddedView(this.elseTemplateRef, this.getContext());
+      return;
+    }
+
+    this._viewContainer.clear();
+  }
+
+  getContext(): { $implicit: string | string[] } {
+    return {
+      $implicit: this.ifRole || this.ifNotRole,
+    };
+  }
+}

apps/core/command/src/lib/action-handler.interface.ts

@@ -1,4 +1,6 @@
+import { CommandService } from './command.service';
+
 export abstract class ActionHandler<T = any> {
   constructor(readonly action: string) {}
-  abstract handler(data: T): Promise<T>;
+  abstract handler(data: T, service?: CommandService): Promise<T>;
 }

apps/core/command/src/lib/command.module.ts

@@ -1,8 +1,12 @@
-import { ModuleWithProviders, NgModule, Type } from '@angular/core';
+import { ModuleWithProviders, NgModule, Provider, Type } from '@angular/core';
 import { ActionHandler } from './action-handler.interface';
 import { CommandService } from './command.service';
 import { FEATURE_ACTION_HANDLERS, ROOT_ACTION_HANDLERS } from './tokens';
 
+export function provideActionHandlers(actionHandlers: Type<ActionHandler>[]): Provider[] {
+  return [CommandService, actionHandlers.map((handler) => ({ provide: FEATURE_ACTION_HANDLERS, useClass: handler, multi: true }))];
+}
+
 @NgModule({})
 export class CoreCommandModule {
   static forRoot(actionHandlers: Type<ActionHandler>[]): ModuleWithProviders<CoreCommandModule> {

apps/core/command/src/lib/command.service.ts

@@ -16,7 +16,7 @@ export class CommandService {
         throw new Error('Action Handler does not exist');
       }
 
-      data = await handler.handler(data);
+      data = await handler.handler(data, this);
     }
     return data;
   }

apps/core/environment/src/lib/environment.service.ts

@@ -1,21 +1,26 @@
 import { Injectable } from '@angular/core';
 import { Platform } from '@angular/cdk/platform';
+import { NativeContainerService } from 'native-container';
 
 @Injectable({
   providedIn: 'root',
 })
 export class EnvironmentService {
-  constructor(private _platform: Platform) {}
+  constructor(private _platform: Platform, private _nativeContainer: NativeContainerService) {}
 
   isDesktop(): boolean {
     return !this.isTablet();
   }
 
   isTablet(): boolean {
-    return this._platform.ANDROID || this._platform.IOS;
+    return this.isNative() || this.isSafari();
+  }
+
+  isNative(): boolean {
+    return this._nativeContainer.isNative;
   }
 
   isSafari(): boolean {
-    return this._platform.SAFARI;
+    return (this._platform.ANDROID || this._platform.IOS) && this._platform.SAFARI;
   }
 }

apps/domain/availability/src/lib/availability.service.ts

@@ -34,6 +34,11 @@ export class DomainAvailabilityService {
     private _branchService: StoreCheckoutBranchService
   ) {}
 
+  @memorize({ ttl: 10000 })
+  memorizedAvailabilityShippingAvailability(request: Array<AvailabilityRequestDTO>) {
+    return this._availabilityService.AvailabilityShippingAvailability(request).pipe(shareReplay(1));
+  }
+
   @memorize()
   getSuppliers(): Observable<SupplierDTO[]> {
     return this._supplierService.StoreCheckoutSupplierGetSuppliers({}).pipe(
@@ -59,8 +64,8 @@ export class DomainAvailabilityService {
   }
 
   @memorize()
-  getStockByBranch(branch: BranchDTO): Observable<StockDTO> {
-    return this._stockService.StockGetStocksByBranch({ branchId: branch.id }).pipe(
+  getStockByBranch(branchId: number): Observable<StockDTO> {
+    return this._stockService.StockGetStocksByBranch({ branchId }).pipe(
       map((response) => response.result),
       map((result) => result?.find((_) => true)),
       shareReplay(1)
@@ -140,6 +145,7 @@ export class DomainAvailabilityService {
     );
   }
 
+  @memorize({ ttl: 10000 })
   getTakeAwayAvailability({
     item,
     quantity,
@@ -149,7 +155,8 @@ export class DomainAvailabilityService {
     quantity: number;
     branch?: BranchDTO;
   }): Observable<AvailabilityDTO> {
-    const request = !!branch ? this.getStockByBranch(branch) : this.getDefaultStock();
+    console.log('getTakeAwayAvailability', item, quantity, branch);
+    const request = !!branch ? this.getStockByBranch(branch.id) : this.getDefaultStock();
     return request.pipe(
       switchMap((s) =>
         combineLatest([
@@ -160,7 +167,7 @@ export class DomainAvailabilityService {
       ),
       map(([response, supplier, defaultBranch]) => {
         const price = item?.price;
-        return this._mapToTakeAwayAvailability({ response, supplier, branch: branch ?? defaultBranch, quantity, price });
+        return this._mapToTakeAwayAvailability({ response, supplier, branchId: branch?.id ?? defaultBranch?.id, quantity, price });
       }),
       shareReplay(1)
     );
@@ -183,7 +190,7 @@ export class DomainAvailabilityService {
       this.getTakeAwaySupplier(),
     ]).pipe(
       map(([response, supplier]) => {
-        return this._mapToTakeAwayAvailability({ response, supplier, branch, quantity, price });
+        return this._mapToTakeAwayAvailability({ response, supplier, branchId: branch.id, quantity, price });
       }),
       shareReplay(1)
     );
@@ -193,16 +200,19 @@ export class DomainAvailabilityService {
     eans,
     price,
     quantity,
+    branchId,
   }: {
     eans: string[];
     price: PriceDTO;
     quantity: number;
+    branchId?: number;
   }): Observable<AvailabilityDTO> {
-    return this.getDefaultStock().pipe(
+    const request = !!branchId ? this.getStockByBranch(branchId) : this.getDefaultStock();
+    return request.pipe(
       switchMap((s) => this._stockService.StockInStockByEAN({ eans, stockId: s.id })),
       withLatestFrom(this.getTakeAwaySupplier(), this.getDefaultBranch()),
-      map(([response, supplier, branch]) => {
-        return this._mapToTakeAwayAvailability({ response, supplier, branch, quantity, price });
+      map(([response, supplier, defaultBranch]) => {
+        return this._mapToTakeAwayAvailability({ response, supplier, branchId: branchId ?? defaultBranch.id, quantity, price });
       }),
       shareReplay(1)
     );
@@ -246,57 +256,53 @@ export class DomainAvailabilityService {
 
   @memorize({ ttl: 10000 })
   getDeliveryAvailability({ item, quantity }: { item: ItemData; quantity: number }): Observable<AvailabilityDTO> {
-    return this._availabilityService
-      .AvailabilityShippingAvailability([
-        {
-          ean: item?.ean,
-          itemId: item?.itemId ? String(item?.itemId) : null,
-          price: item?.price,
-          qty: quantity,
-        },
-      ])
-      .pipe(
-        timeout(5000),
-        map((r) => this._mapToShippingAvailability(r.result)?.find((_) => true)),
-        shareReplay(1)
-      );
+    return this.memorizedAvailabilityShippingAvailability([
+      {
+        ean: item?.ean,
+        itemId: item?.itemId ? String(item?.itemId) : null,
+        price: item?.price,
+        qty: quantity,
+      },
+    ]).pipe(
+      timeout(5000),
+      map((r) => this._mapToShippingAvailability(r.result)?.find((_) => true)),
+      shareReplay(1)
+    );
   }
 
   @memorize({ ttl: 10000 })
   getDigDeliveryAvailability({ item, quantity }: { item: ItemData; quantity: number }): Observable<AvailabilityDTO> {
-    return this._availabilityService
-      .AvailabilityShippingAvailability([
-        {
-          qty: quantity,
-          ean: item?.ean,
-          itemId: item?.itemId ? String(item?.itemId) : null,
-          price: item?.price,
-        },
-      ])
-      .pipe(
-        timeout(5000),
-        map((r) => {
-          const availabilities = r.result;
-          const preferred = availabilities?.find((f) => f.preferred === 1);
+    return this.memorizedAvailabilityShippingAvailability([
+      {
+        qty: quantity,
+        ean: item?.ean,
+        itemId: item?.itemId ? String(item?.itemId) : null,
+        price: item?.price,
+      },
+    ]).pipe(
+      timeout(5000),
+      map((r) => {
+        const availabilities = r.result;
+        const preferred = availabilities?.find((f) => f.preferred === 1);
 
-          const availability: AvailabilityDTO = {
-            availabilityType: preferred?.status,
-            ssc: preferred?.ssc,
-            sscText: preferred?.sscText,
-            supplier: { id: preferred?.supplierId },
-            isPrebooked: preferred?.isPrebooked,
-            estimatedShippingDate: preferred?.requestStatusCode === '32' ? preferred?.altAt : preferred?.at,
-            estimatedDelivery: preferred?.estimatedDelivery,
-            price: preferred?.price,
-            logistician: { id: preferred?.logisticianId },
-            supplierProductNumber: preferred?.supplierProductNumber,
-            supplierInfo: preferred?.requestStatusCode,
-            lastRequest: preferred?.requested,
-          };
-          return availability;
-        }),
-        shareReplay(1)
-      );
+        const availability: AvailabilityDTO = {
+          availabilityType: preferred?.status,
+          ssc: preferred?.ssc,
+          sscText: preferred?.sscText,
+          supplier: { id: preferred?.supplierId },
+          isPrebooked: preferred?.isPrebooked,
+          estimatedShippingDate: preferred?.requestStatusCode === '32' ? preferred?.altAt : preferred?.at,
+          estimatedDelivery: preferred?.estimatedDelivery,
+          price: preferred?.price,
+          logistician: { id: preferred?.logisticianId },
+          supplierProductNumber: preferred?.supplierProductNumber,
+          supplierInfo: preferred?.requestStatusCode,
+          lastRequest: preferred?.requested,
+        };
+        return availability;
+      }),
+      shareReplay(1)
+    );
   }
 
   @memorize({ ttl: 10000 })
@@ -330,37 +336,35 @@ export class DomainAvailabilityService {
 
   @memorize({ ttl: 10000 })
   getDownloadAvailability({ item }: { item: ItemData }): Observable<AvailabilityDTO> {
-    return this._availabilityService
-      .AvailabilityShippingAvailability([
-        {
-          ean: item?.ean,
-          itemId: item?.itemId ? String(item?.itemId) : null,
-          price: item?.price,
-          qty: 1,
-        },
-      ])
-      .pipe(
-        map((r) => {
-          const availabilities = r.result;
-          const preferred = availabilities?.find((f) => f.preferred === 1);
+    return this.memorizedAvailabilityShippingAvailability([
+      {
+        ean: item?.ean,
+        itemId: item?.itemId ? String(item?.itemId) : null,
+        price: item?.price,
+        qty: 1,
+      },
+    ]).pipe(
+      map((r) => {
+        const availabilities = r.result;
+        const preferred = availabilities?.find((f) => f.preferred === 1);
 
-          const availability: AvailabilityDTO = {
-            availabilityType: preferred?.status,
-            ssc: preferred?.ssc,
-            sscText: preferred?.sscText,
-            supplier: { id: preferred?.supplierId },
-            isPrebooked: preferred?.isPrebooked,
-            estimatedShippingDate: preferred?.requestStatusCode === '32' ? preferred?.altAt : preferred?.at,
-            price: preferred?.price,
-            supplierProductNumber: preferred?.supplierProductNumber,
-            logistician: { id: preferred?.logisticianId },
-            supplierInfo: preferred?.requestStatusCode,
-            lastRequest: preferred?.requested,
-          };
-          return availability;
-        }),
-        shareReplay(1)
-      );
+        const availability: AvailabilityDTO = {
+          availabilityType: preferred?.status,
+          ssc: preferred?.ssc,
+          sscText: preferred?.sscText,
+          supplier: { id: preferred?.supplierId },
+          isPrebooked: preferred?.isPrebooked,
+          estimatedShippingDate: preferred?.requestStatusCode === '32' ? preferred?.altAt : preferred?.at,
+          price: preferred?.price,
+          supplierProductNumber: preferred?.supplierProductNumber,
+          logistician: { id: preferred?.logisticianId },
+          supplierInfo: preferred?.requestStatusCode,
+          lastRequest: preferred?.requested,
+        };
+        return availability;
+      }),
+      shareReplay(1)
+    );
   }
 
   @memorize({ ttl: 10000 })
@@ -398,7 +402,7 @@ export class DomainAvailabilityService {
 
   @memorize({ ttl: 10000 })
   getDeliveryAvailabilities(payload: AvailabilityRequestDTO[]) {
-    return this._availabilityService.AvailabilityShippingAvailability(payload).pipe(
+    return this.memorizedAvailabilityShippingAvailability(payload).pipe(
       timeout(20000),
       map((response) => this._mapToShippingAvailability(response.result))
     );
@@ -406,7 +410,7 @@ export class DomainAvailabilityService {
 
   @memorize({ ttl: 10000 })
   getDigDeliveryAvailabilities(payload: AvailabilityRequestDTO[]) {
-    return this._availabilityService.AvailabilityShippingAvailability(payload).pipe(
+    return this.memorizedAvailabilityShippingAvailability(payload).pipe(
       timeout(20000),
       map((response) => this._mapToShippingAvailability(response.result))
     );
@@ -444,6 +448,9 @@ export class DomainAvailabilityService {
   }
 
   isAvailable({ availability }: { availability: AvailabilityDTO }) {
+    if (availability?.supplier?.id === 16 && availability?.inStock == 0) {
+      return false;
+    }
     return [2, 32, 256, 1024, 2048, 4096].some((code) => availability?.availabilityType === code);
   }
 
@@ -476,17 +483,17 @@ export class DomainAvailabilityService {
   private _mapToTakeAwayAvailability({
     response,
     supplier,
-    branch,
+    branchId,
     quantity,
     price,
   }: {
     response: ResponseArgsOfIEnumerableOfStockInfoDTO;
     supplier: SupplierDTO;
-    branch: BranchDTO;
+    branchId: number;
     quantity: number;
     price: PriceDTO;
   }): AvailabilityDTO {
-    const stockInfo = response.result?.find((si) => si.branchId === branch.id);
+    const stockInfo = response.result?.find((si) => si.branchId === branchId);
     const inStock = stockInfo?.inStock ?? 0;
     const availability: AvailabilityDTO = {
       availabilityType: quantity <= inStock ? 1024 : 1, // 1024 (=Available)
@@ -535,6 +542,7 @@ export class DomainAvailabilityService {
       return preferred.map((p) => {
         return [
           {
+            orderDeadline: p?.orderDeadline,
             availabilityType: p?.status,
             ssc: p?.ssc,
             sscText: p?.sscText,
@@ -556,7 +564,6 @@ export class DomainAvailabilityService {
 
   private _mapToShippingAvailability(availabilities: SwaggerAvailabilityDTO[]) {
     const preferred = availabilities.filter((f) => f.preferred === 1);
-
     return preferred.map((p) => {
       return {
         availabilityType: p?.status,
@@ -570,6 +577,7 @@ export class DomainAvailabilityService {
         supplierInfo: p?.requestStatusCode,
         lastRequest: p?.requested,
         itemId: p.itemId,
+        priceMaintained: p.priceMaintained,
       };
     });
   }
@@ -609,7 +617,7 @@ export class DomainAvailabilityService {
   }
 
   getInStock({ itemIds, branchId }: { itemIds: number[]; branchId: number }): Observable<StockInfoDTO[]> {
-    return this.getStockByBranch({ id: branchId }).pipe(
+    return this.getStockByBranch(branchId).pipe(
       mergeMap((stock) =>
         this._stockService.StockInStock({ articleIds: itemIds, stockId: stock.id }).pipe(map((response) => response.result))
       )

apps/domain/availability/src/lib/in-stock.service.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
 import { StockInfoDTO } from '@swagger/remi';
-import { groupBy } from 'lodash';
-import { BehaviorSubject, combineLatest, Observable, OperatorFunction, Subject, timer } from 'rxjs';
-import { buffer, bufferTime, bufferWhen, debounceTime } from 'rxjs/operators';
+import { groupBy, isEqual, uniqWith } from 'lodash';
+import { BehaviorSubject, combineLatest, Observable, Subject } from 'rxjs';
+import { buffer, debounceTime, distinctUntilChanged } from 'rxjs/operators';
 import { DomainAvailabilityService } from './availability.service';
 
 export type ItemBranch = { itemId: number; branchId: number };
@@ -25,8 +25,9 @@ export class DomainInStockService {
   }
 
   private _handleStockDataToFetch = (itemBranchData: ItemBranch[]) => {
-    if (itemBranchData?.length > 0) {
-      this._fetchStockData(itemBranchData);
+    const unique = uniqWith(itemBranchData, isEqual);
+    if (unique?.length > 0) {
+      this._fetchStockData(unique);
     }
   };
 
@@ -44,16 +45,24 @@ export class DomainInStockService {
       const key = this.getKey({ itemId, branchId });
       this._addToInStockQueue({ itemId, branchId });
 
-      const sub = combineLatest([this._inStockMap, this._inStockFetchingMap]).subscribe(([inStockMap, inStockFetchingMap]) => {
-        const inStock: InStock = {
-          itemId,
-          branchId,
-          inStock: inStockMap[key],
-          fetching: inStockFetchingMap[key] ?? false,
-        };
+      let _previousValue: InStock;
 
-        obs.next(inStock);
-      });
+      const sub = combineLatest([this._inStockMap, this._inStockFetchingMap])
+        .pipe(distinctUntilChanged(isEqual))
+        .subscribe(([inStockMap, inStockFetchingMap]) => {
+          const inStock: InStock = {
+            itemId,
+            branchId,
+            inStock: inStockMap[key],
+            fetching: inStockFetchingMap[key] ?? false,
+          };
+
+          if (!isEqual(inStock, _previousValue)) {
+            obs.next(inStock);
+          }
+
+          _previousValue = inStock;
+        });
       return () => {
         sub.unsubscribe();
       };
@@ -71,10 +80,10 @@ export class DomainInStockService {
     this._inStockFetchingMap.next({ ...current, [key]: value });
   }
 
-  private _setInStock({ itemId, branchId }: ItemBranch, value: number) {
+  private _setInStock({ itemId, branchId }: ItemBranch, inStock: number) {
     const key = this.getKey({ itemId, branchId });
     const current = this._inStockMap.getValue();
-    this._inStockMap.next({ ...current, [key]: value });
+    this._inStockMap.next({ ...current, [key]: inStock });
   }
 
   private _fetchStockData(itemBranchData: ItemBranch[]) {
@@ -92,9 +101,11 @@ export class DomainInStockService {
     itemIds.forEach((itemId) => {
       const stockInfo = stockInfos.find((stockInfo) => stockInfo.itemId === itemId && stockInfo.branchId === branchId);
       let inStock = 0;
+
       if (stockInfo?.inStock) {
         inStock = stockInfo.inStock;
       }
+
       this._setInStockFetching({ itemId, branchId }, false);
       this._setInStock({ itemId, branchId }, inStock);
     });

apps/domain/checkout/src/lib/checkout.service.ts

@@ -26,8 +26,15 @@ import {
   StoreCheckoutBuyerService,
   StoreCheckoutPayerService,
   StoreCheckoutBranchService,
+  ItemsResult,
 } from '@swagger/checkout';
-import { DisplayOrderDTO, DisplayOrderItemDTO, OrderCheckoutService, ReorderValues } from '@swagger/oms';
+import {
+  DisplayOrderDTO,
+  DisplayOrderItemDTO,
+  OrderCheckoutService,
+  ReorderValues,
+  ResponseArgsOfValueTupleOfIEnumerableOfDisplayOrderDTOAndIEnumerableOfKeyValueDTOOfStringAndString,
+} from '@swagger/oms';
 import { isNullOrUndefined, memorize } from '@utils/common';
 import { combineLatest, Observable, of, concat, isObservable, throwError } from 'rxjs';
 import { bufferCount, catchError, filter, first, map, mergeMap, shareReplay, switchMap, tap, withLatestFrom } from 'rxjs/operators';
@@ -198,7 +205,15 @@ export class DomainCheckoutService {
     );
   }
 
-  canAddItems({ processId, payload, orderType }: { processId: number; payload: ItemPayload[]; orderType: string }) {
+  canAddItems({
+    processId,
+    payload,
+    orderType,
+  }: {
+    processId: number;
+    payload: ItemPayload[];
+    orderType: string;
+  }): Observable<ItemsResult[]> {
     return this.getShoppingCart({ processId }).pipe(
       first(),
       withLatestFrom(this.store.select(DomainCheckoutSelectors.selectCustomerFeaturesByProcessId, { processId })),
@@ -217,7 +232,8 @@ export class DomainCheckoutService {
           })
           .pipe(
             map((response) => {
-              return response.result;
+              // TODO: remove this when the API is fixed
+              return (response.result as unknown) as ItemsResult[];
             })
           );
       })
@@ -362,8 +378,9 @@ export class DomainCheckoutService {
   _setBuyer({ processId, buyer }: { processId: number; buyer: BuyerDTO }): Observable<CheckoutDTO> {
     return this.getCheckout({ processId }).pipe(
       first(),
-      mergeMap((checkout) =>
-        this._buyerService
+      mergeMap((checkout) => {
+        console.log('checkout', checkout, processId);
+        return this._buyerService
           .StoreCheckoutBuyerSetBuyerPOST({
             checkoutId: checkout?.id,
             buyerDTO: buyer,
@@ -371,8 +388,8 @@ export class DomainCheckoutService {
           .pipe(
             map((response) => response.result),
             tap((checkout) => this.store.dispatch(DomainCheckoutActions.setCheckout({ processId, checkout })))
-          )
-      )
+          );
+      })
     );
   }
 
@@ -700,6 +717,47 @@ export class DomainCheckoutService {
       .pipe(mergeMap((_) => completeOrder$.pipe(tap(console.log.bind(window, 'completeOrder$')))));
   }
 
+  completeKulturpassOrder({
+    processId,
+    orderItemSubsetId,
+  }: {
+    processId: number;
+    orderItemSubsetId: number;
+  }): Observable<ResponseArgsOfValueTupleOfIEnumerableOfDisplayOrderDTOAndIEnumerableOfKeyValueDTOOfStringAndString> {
+    const refreshShoppingCart$ = this.getShoppingCart({ processId, latest: true }).pipe(first());
+    const refreshCheckout$ = this.getCheckout({ processId, refresh: true }).pipe(first());
+
+    const setBuyer$ = this.getBuyer({ processId }).pipe(
+      first(),
+      mergeMap((buyer) => this._setBuyer({ processId, buyer }))
+    );
+
+    const setPayer$ = this.getPayer({ processId }).pipe(
+      first(),
+      mergeMap((payer) => this._setPayer({ processId, payer }))
+    );
+
+    const checkAvailabilities$ = this.checkAvailabilities({ processId });
+
+    const updateAvailabilities$ = this.updateAvailabilities({ processId });
+
+    return refreshShoppingCart$.pipe(
+      mergeMap((_) => refreshCheckout$),
+      mergeMap((_) => checkAvailabilities$),
+      mergeMap((_) => updateAvailabilities$),
+      mergeMap((_) => setBuyer$),
+      mergeMap((_) => setPayer$),
+      mergeMap((checkout) =>
+        this.orderCheckoutService.OrderCheckoutCreateKulturPassOrder({
+          payload: {
+            checkoutId: checkout.id,
+            orderItemSubsetId: String(orderItemSubsetId),
+          },
+        })
+      )
+    );
+  }
+
   updateDestination({
     processId,
     destinationId,
@@ -918,7 +976,7 @@ export class DomainCheckoutService {
   //#region Common
 
   private updateProcessCount(processId: number, count: number) {
-    this.applicationService.patchProcess(processId, { data: { count } });
+    this.applicationService.patchProcessData(processId, { count });
   }
 
   //#endregion

apps/domain/oms/src/lib/action-handlers/collect-on-deliverynote.action-handler.ts

@@ -21,6 +21,7 @@ export class CollectOnDeliveryNoteActionHandler extends ActionHandler<OrderItems
     const response = await this.orderService
       .OrderCollectOnDeliveryNote({
         data,
+        eagerLoading: 1,
       })
       .toPromise();
 
@@ -29,7 +30,7 @@ export class CollectOnDeliveryNoteActionHandler extends ActionHandler<OrderItems
 
     return {
       ...context,
-      receipts: response.result,
+      receipts: response.result.map((r) => r.data),
     };
   }
 }

apps/domain/oms/src/lib/action-handlers/collect-with-smallamountinvoice.action-handler.ts

@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import { ActionHandler } from '@core/command';
+import { OrderService } from '@swagger/oms';
+import { OrderItemsContext } from './order-items.context';
+
+@Injectable()
+export class CollectWithSmallAmountinvoiceActionHandler extends ActionHandler<OrderItemsContext> {
+  constructor(private orderService: OrderService) {
+    super('COLLECT_WITH_SMALLAMOUNTINVOICE');
+  }
+
+  async handler(context: OrderItemsContext): Promise<OrderItemsContext> {
+    const data: Record<number, number> = {};
+
+    context.items.forEach((orderItemSubsetId) => {
+      data[orderItemSubsetId.orderItemSubsetId] =
+        context.itemQuantity?.get(orderItemSubsetId.orderItemSubsetId) ?? orderItemSubsetId.quantity;
+    });
+
+    const response = await this.orderService
+      .OrderCollectWithSmallAmountInvoice({
+        data,
+        eagerLoading: 1,
+      })
+      .toPromise();
+
+    // Für korrekte Navigation nach Aufruf, da ProcessingStatus Serverseitig auf abgeholt gesetzt wird
+    context.items?.forEach((i) => (i.processingStatus = 256));
+
+    return {
+      ...context,
+      receipts: response.result.map((r) => r.data),
+    };
+  }
+}

apps/domain/oms/src/lib/action-handlers/index.ts

@@ -1,4 +1,3 @@
-// start:ng42.barrel
 export * from './accepted.action-handler';
 export * from './arrived.action-handler';
 export * from './assembled.action-handler';
@@ -7,6 +6,10 @@ export * from './back-to-stock.action-handler';
 export * from './canceled-by-buyer.action-handler';
 export * from './canceled-by-retailer.action-handler';
 export * from './canceled-by-supplier.action-handler';
+export * from './change-order-item-status-base.action-handler';
+export * from './collect-on-deliverynote.action-handler';
+export * from './collect-with-smallamountinvoice.action-handler';
+export * from './create-returnitem.action-handler';
 export * from './create-shipping-note.action-handler';
 export * from './delivered.action-handler';
 export * from './determine-supplier.action-handler';
@@ -25,16 +28,15 @@ export * from './parked.action-handler';
 export * from './placed.action-handler';
 export * from './preperation-for-shipping.action-handler';
 export * from './print-compartment-label.action-handler';
+export * from './print-pricediffqrcodelabel.action-handler';
 export * from './print-shipping-note.action-handler';
-export * from './re-ordered.action-handler';
+export * from './print-smallamountinvoice.action-handler';
 export * from './re-order.action-handler';
+export * from './re-ordered.action-handler';
 export * from './redirected-internally.action-handler';
 export * from './requested.action-handler';
 export * from './reserved.action-handler';
 export * from './returned-by-buyer.action-handler';
 export * from './shipping-note.action-handler';
+export * from './shop-with-kulturpass.action-handler';
 export * from './supplier-temporarily-out-of-stock.action-handler copy';
-export * from './collect-on-deliverynote.action-handler';
-export * from './create-returnitem.action-handler';
-export * from './print-pricediffqrcodelabel.action-handler';
-// end:ng42.barrel

apps/domain/oms/src/lib/action-handlers/order-items.context.ts

@@ -1,4 +1,4 @@
-import { OrderItemListItemDTO, ReceiptDTO } from '@swagger/oms';
+import { OrderItemListItemDTO, ReceiptDTO, OrderDTO } from '@swagger/oms';
 
 export interface OrderItemsContext {
   items: OrderItemListItemDTO[];
@@ -12,4 +12,6 @@ export interface OrderItemsContext {
   receipts?: ReceiptDTO[];
 
   shippingDelayComment?: string;
+
+  order?: OrderDTO;
 }

apps/domain/oms/src/lib/action-handlers/print-compartment-label.action-handler.ts

@@ -22,7 +22,7 @@ export class PrintCompartmentLabelActionHandler extends ActionHandler<OrderItems
         content: PrintModalComponent,
         config: { showScrollbarY: false },
         data: {
-          printImmediately: !this.nativeContainerService.isUiWebview().isNative,
+          printImmediately: !this.nativeContainerService.isNative,
           printerType: 'Label',
           print: (printer) =>
             this.domainPrinterService

apps/domain/oms/src/lib/action-handlers/print-shipping-note.action-handler.ts

@@ -23,11 +23,12 @@ export class PrintShippingNoteActionHandler extends ActionHandler<OrderItemsCont
         content: PrintModalComponent,
         config: { showScrollbarY: false },
         data: {
-          printImmediately: !this.nativeContainerService.isUiWebview().isNative,
+          printImmediately: !this.nativeContainerService.isNative,
           printerType: 'Label',
           print: async (printer) => {
             try {
-              for (const group of groupBy(data?.receipts, (receipt) => receipt?.buyer?.buyerNumber)) {
+              const receipts = data?.receipts?.filter((r) => r?.receiptType & 1);
+              for (const group of groupBy(receipts, (receipt) => receipt?.buyer?.buyerNumber)) {
                 await this.domainPrinterService.printShippingNote({ printer, receipts: group?.items?.map((r) => r?.id) }).toPromise();
               }
               return {

apps/domain/oms/src/lib/action-handlers/print-smallamountinvoice.action-handler.ts

@@ -0,0 +1,56 @@
+import { Injectable } from '@angular/core';
+import { ActionHandler } from '@core/command';
+import { OrderItemsContext } from './order-items.context';
+import { OMSPrintService } from '@swagger/print';
+import { UiModalService } from '@ui/modal';
+import { PrintModalComponent, PrintModalData } from '@modal/printer';
+import { NativeContainerService } from 'native-container';
+import { groupBy } from '@ui/common';
+
+@Injectable()
+export class PrintSmallamountinvoiceActionHandler extends ActionHandler<OrderItemsContext> {
+  constructor(
+    private uiModal: UiModalService,
+    private omsPrintService: OMSPrintService,
+    private nativeContainerService: NativeContainerService
+  ) {
+    super('PRINT_SMALLAMOUNTINVOICE');
+  }
+
+  async handler(data: OrderItemsContext): Promise<OrderItemsContext> {
+    await this.uiModal
+      .open({
+        content: PrintModalComponent,
+        config: { showScrollbarY: false },
+        data: {
+          printImmediately: !this.nativeContainerService.isNative,
+          printerType: 'Label',
+          print: async (printer) => {
+            try {
+              const receipts = data?.receipts?.filter((r) => r?.receiptType & 128);
+              for (const group of groupBy(receipts, (receipt) => receipt?.buyer?.buyerNumber)) {
+                await this.omsPrintService
+                  .OMSPrintKleinbetragsrechnung({
+                    data: group?.items?.map((r) => r?.id),
+                    printer,
+                  })
+                  .toPromise();
+              }
+              return {
+                error: false,
+              };
+            } catch (error) {
+              console.error(error);
+              return {
+                error: true,
+                message: error?.message || error,
+              };
+            }
+          },
+        } as PrintModalData,
+      })
+      .afterClosed$.toPromise();
+
+    return data;
+  }
+}

apps/domain/oms/src/lib/action-handlers/shop-with-kulturpass.action-handler.ts

@@ -0,0 +1,82 @@
+import { Injectable } from '@angular/core';
+import { OrderItemsContext } from './order-items.context';
+import { ActionHandler, CommandService } from '@core/command';
+import { KulturpassOrderModalService } from '@shared/modals/kulturpass-order-modal';
+import { DisplayOrderItemSubsetDTO, OrderItemListItemDTO, ReceiptDTO } from '@swagger/oms';
+import { DomainReceiptService } from '../receipt.service';
+import { DomainGoodsService } from '../goods.service';
+import { map } from 'rxjs/operators';
+
+@Injectable()
+export class ShopWithKulturpassActionHandler extends ActionHandler<OrderItemsContext> {
+  constructor(
+    private _modal: KulturpassOrderModalService,
+    private _receiptService: DomainReceiptService,
+    private _goodsService: DomainGoodsService
+  ) {
+    super('SHOP_WITH_KULTURPASS');
+  }
+
+  async handler(data: OrderItemsContext, service: CommandService): Promise<OrderItemsContext> {
+    const items: OrderItemListItemDTO[] = [];
+    const receipts: ReceiptDTO[] = [];
+
+    let command: string;
+    for (const item of data.items) {
+      const result = await this._modal.open({ orderItemListItem: item, order: data.order }).afterClosed$.toPromise();
+
+      if (result.data == null) {
+        return data;
+      }
+
+      const displayOrder = result.data[0];
+      command = result.data[1];
+
+      if (displayOrder) {
+        const subsetItems = displayOrder.items.reduce((acc, item) => [...acc, ...item.subsetItems], [] as DisplayOrderItemSubsetDTO[]);
+
+        const orderItems = await this.getItems(displayOrder.orderNumber);
+
+        items.push(...orderItems);
+
+        const subsetItemIds = subsetItems.map((item) => item.id);
+
+        const r = await this.getReceipts(subsetItemIds);
+
+        receipts.push(...r);
+      }
+    }
+
+    if (!command) {
+      return {
+        ...data,
+        items,
+        receipts,
+      };
+    } else {
+      return service.handleCommand(command, {
+        ...data,
+        items,
+        receipts,
+      });
+    }
+  }
+
+  getReceipts(ids: number[]) {
+    return this._receiptService
+      .getReceipts({
+        receiptType: 128,
+        eagerLoading: 1,
+        ids,
+      })
+      .pipe(map((res) => res.result.map((data) => data.item3.data).filter((data) => !!data)))
+      .toPromise();
+  }
+
+  getItems(orderNumber: string) {
+    return this._goodsService
+      .getWarenausgabeItemByOrderNumber(orderNumber, false)
+      .pipe(map((res) => res.result))
+      .toPromise();
+  }
+}

apps/domain/oms/src/lib/customer-order.service.ts

@@ -0,0 +1,29 @@
+import { Injectable } from '@angular/core';
+import { AutocompleteTokenDTO, OrderService, QueryTokenDTO } from '@swagger/oms';
+
+@Injectable({ providedIn: 'root' })
+export class DomainCustomerOrderService {
+  constructor(private _orderService: OrderService) {}
+
+  complete(payload: AutocompleteTokenDTO) {
+    return this._orderService.OrderKundenbestellungenAutocomplete(payload);
+  }
+
+  search(payload: QueryTokenDTO) {
+    return this._orderService.OrderKundenbestellungen({ ...payload });
+    // branch_id'
+  }
+
+  getOrderItemsByOrderNumber(orderNumber: string) {
+    return this._orderService.OrderKundenbestellungen({
+      filter: { all_branches: 'true', archive: 'true' },
+      input: {
+        qs: orderNumber,
+      },
+    });
+  }
+
+  settings() {
+    return this._orderService.OrderKundenbestellungenSettings();
+  }
+}

apps/domain/oms/src/lib/oms.service.ts

@@ -11,7 +11,6 @@ import {
   OrderListItemDTO,
   OrderService,
   ReceiptService,
-  ResponseArgsOfIEnumerableOfHistoryDTO,
   StatusValues,
   StockStatusCodeService,
   ValueTupleOfLongAndReceiptTypeAndEntityDTOContainerOfReceiptDTO,
@@ -20,7 +19,7 @@ import {
 } from '@swagger/oms';
 import { memorize } from '@utils/common';
 import { Observable } from 'rxjs';
-import { map, mergeMap, shareReplay } from 'rxjs/operators';
+import { map, shareReplay } from 'rxjs/operators';
 
 @Injectable()
 export class DomainOmsService {
@@ -189,6 +188,10 @@ export class DomainOmsService {
     );
   }
 
+  getOrderSource(orderId: number): Observable<string> {
+    return this.getOrder(orderId).pipe(map((order) => order?.features?.orderSource));
+  }
+
   updateNotifications(orderId: number, changes: { selected: NotificationChannel; email: string; mobile: string }) {
     const communicationDetails = {
       email: changes.email,

apps/domain/oms/src/lib/receipt.service.ts

@@ -1,5 +1,7 @@
 import { Injectable } from '@angular/core';
 import { ReceiptOrderItemSubsetReferenceValues, ReceiptService } from '@swagger/oms';
+import { memorize } from '@utils/common';
+import { shareReplay } from 'rxjs/operators';
 
 @Injectable()
 export class DomainReceiptService {
@@ -9,9 +11,12 @@ export class DomainReceiptService {
     return this.receiptService.ReceiptCreateShippingNote2(params);
   }
 
+  @memorize({ ttl: 1000 })
   getReceipts(payload: ReceiptOrderItemSubsetReferenceValues) {
-    return this.receiptService.ReceiptGetReceiptsByOrderItemSubset({
-      payload: payload,
-    });
+    return this.receiptService
+      .ReceiptGetReceiptsByOrderItemSubset({
+        payload: payload,
+      })
+      .pipe(shareReplay(1));
   }
 }

apps/domain/oms/src/public-api.ts

@@ -7,3 +7,4 @@ export * from './lib/receipt.service';
 export * from './lib/oms.service';
 export * from './lib/oms.module';
 export * from './lib/action-handlers';
+export * from './lib/customer-order.service';

apps/domain/package-inspection/src/lib/events.ts

@@ -0,0 +1,11 @@
+import { PackageArrivalStatusDTO } from '@swagger/wws';
+
+export abstract class PackageInspectionEvent {
+  constructor(public readonly type: string) {}
+}
+
+export class PackageStatusChangedEvent extends PackageInspectionEvent {
+  constructor(public readonly packageId: string, public readonly status: PackageArrivalStatusDTO) {
+    super('PackageStatusChangedEvent');
+  }
+}

apps/domain/package-inspection/src/lib/package-inspection.service.ts

@@ -1,10 +1,8 @@
 import { Injectable } from '@angular/core';
 import {
-  ListResponseArgsOfPackageDTO,
   ListResponseArgsOfPackageDTO2,
   PackageArrivalStatusDTO,
   PackageDetailResponseDTO,
-  PackageDTO,
   PackageDTO2,
   QuerySettingsDTO,
   QueryTokenDTO,
@@ -13,13 +11,18 @@ import {
   ResponseArgsOfQuerySettingsDTO,
   WareneingangService,
 } from '@swagger/wws';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Observable, Subject } from 'rxjs';
+import { map, tap } from 'rxjs/operators';
+import { PackageInspectionEvent, PackageStatusChangedEvent } from './events';
 
 @Injectable({
   providedIn: 'root',
 })
 export class DomainPackageInspectionService {
+  private _events = new Subject<PackageInspectionEvent>();
+
+  events = this._events.asObservable();
+
   constructor(private _wareneingang: WareneingangService) {}
 
   getQuerySettingsResponse(): Observable<ResponseArgsOfQuerySettingsDTO> {
@@ -47,23 +50,26 @@ export class DomainPackageInspectionService {
   }
 
   changePackageStatusResponse(pkg: PackageDTO2, modifier: string): Observable<ResponseArgsOfPackageArrivalStatusDTO> {
-    return this._wareneingang.WareneingangChangePackageStatus({
-      packageId: pkg.id,
-      payload: {
-        id: pkg.id,
-        annotation: pkg.annotation,
-        area: pkg.area,
-        arrivalChecked: pkg.arrivalChecked,
-        arrivalStatus: pkg.arrivalStatus,
-        deliveryNoteNumber: pkg.deliveryNoteNumber,
-        deliveryTarget: pkg.deliveryTarget,
-        estimatedDeliveryDate: pkg.estimatedDeliveryDate,
-        packageNumber: pkg.packageNumber,
-        supplier: pkg.supplier,
-        trackingNumber: pkg.trackingNumber,
-      },
-      modifier,
-    });
+    return this._wareneingang
+      .WareneingangChangePackageStatus({
+        packageId: pkg.id,
+        payload: {
+          id: pkg.id,
+          annotation: pkg.annotation,
+          area: pkg.area,
+          arrivalChecked: pkg.arrivalChecked,
+          arrivalStatus: pkg.arrivalStatus,
+          deliveryNoteNumber: pkg.deliveryNoteNumber,
+          deliveryTarget: pkg.deliveryTarget,
+          estimatedDeliveryDate: pkg.estimatedDeliveryDate,
+          packageNumber: pkg.packageNumber,
+          supplier: pkg.supplier,
+          trackingNumber: pkg.trackingNumber,
+          scanId: pkg.scanId,
+        },
+        modifier,
+      })
+      .pipe(tap((res) => this._events.next(new PackageStatusChangedEvent(pkg.id, res.result))));
   }
 
   changePackageStatus(pkg: PackageDTO2, modifier: string): Observable<PackageArrivalStatusDTO> {

apps/domain/package-inspection/src/public-api.ts

@@ -1,6 +1,6 @@
 /*
  * Public API Surface of package-inspection
  */
-
+export * from './lib/events';
 export * from './lib/package-inspection.service';
 export * from './lib/package-inspection.module';

apps/domain/printer/src/lib/printer.service.ts

@@ -5,7 +5,6 @@ import {
   CheckoutPrintService,
   ItemDTO,
   OMSPrintService,
-  PriceQRCodeDTO,
   PrintRequestOfIEnumerableOfItemDTO,
   PrintRequestOfIEnumerableOfLong,
   PrintRequestOfIEnumerableOfPriceQRCodeDTO,
@@ -13,6 +12,12 @@ import {
   ResponseArgs,
   LoyaltyCardPrintService,
 } from '@swagger/print';
+import {
+  DocumentPayloadOfIEnumerableOfProductListItemDTO,
+  ProductListItemDTO,
+  ProductListService,
+  ResponseArgsOfString,
+} from '@swagger/wws';
 import { Observable, of } from 'rxjs';
 import { catchError, filter, map, switchMap, timeout } from 'rxjs/operators';
 import { Printer } from './defs/printer.model';
@@ -27,7 +32,8 @@ export class DomainPrinterService {
     private catalogPrintService: CatalogPrintService,
     private checkoutPrintService: CheckoutPrintService,
     private eisPublicDocumentService: EISPublicDocumentService,
-    private _loyaltyCardPrintService: LoyaltyCardPrintService
+    private _loyaltyCardPrintService: LoyaltyCardPrintService,
+    private _productListService: ProductListService
   ) {}
 
   getAvailablePrinters(): Observable<Printer[] | { error: string }> {
@@ -202,6 +208,29 @@ export class DomainPrinterService {
     });
   }
 
+  printProductListItemsResponse(payload: DocumentPayloadOfIEnumerableOfProductListItemDTO): Observable<ResponseArgsOfString> {
+    return this._productListService.ProductListProductListItemPdfAsBase64(payload);
+  }
+
+  printProductListItems({
+    data,
+    printer,
+    title,
+  }: {
+    data: ProductListItemDTO[];
+    printer: string;
+    title?: string;
+  }): Observable<ResponseArgs> {
+    return this.printProductListItemsResponse({ data, title }).pipe(
+      switchMap((res) => {
+        if (!res.error) {
+          return this.printPdf({ printer, data: res.result });
+        }
+        return of(res);
+      })
+    );
+  }
+
   printDisplayInfoDTOArticles({
     articles,
     printer,

apps/domain/product-list/README.md

@@ -0,0 +1,25 @@
+# ProductList
+
+This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 15.0.0.
+
+## Code scaffolding
+
+Run `ng generate component component-name --project product-list` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project product-list`.
+
+> Note: Don't forget to add `--project product-list` or else it will be added to the default project in your `angular.json` file.
+
+## Build
+
+Run `ng build product-list` to build the project. The build artifacts will be stored in the `dist/` directory.
+
+## Publishing
+
+After building your library with `ng build product-list`, go to the dist folder `cd dist/product-list` and run `npm publish`.
+
+## Running unit tests
+
+Run `ng test product-list` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.

apps/domain/product-list/ng-package.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../../dist/domain/product-list",
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}

apps/domain/product-list/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "@domain/product-list",
+  "version": "0.0.1",
+  "peerDependencies": {
+    "@angular/common": "^15.0.0",
+    "@angular/core": "^15.0.0"
+  },
+  "dependencies": {
+    "tslib": "^2.3.0"
+  }
+}

apps/domain/product-list/src/lib/product-list.module.ts

@@ -0,0 +1,4 @@
+import { NgModule } from '@angular/core';
+
+@NgModule({})
+export class ProductListModule {}

apps/domain/product-list/src/lib/product-list.service.ts

@@ -0,0 +1,52 @@
+import { Injectable } from '@angular/core';
+import {
+  BatchResponseArgsOfProductListItemDTOAndString,
+  ListResponseArgsOfProductListItemDTO,
+  ProductListItemDTO,
+  ProductListService,
+  QuerySettingsDTO,
+  QueryTokenDTO,
+  ResponseArgsOfProductListItemDTO,
+  ResponseArgsOfQuerySettingsDTO,
+} from '@swagger/wws';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class DomainProductListService {
+  constructor(private _productList: ProductListService) {}
+
+  getQuerySettingsResponse(): Observable<ResponseArgsOfQuerySettingsDTO> {
+    return this._productList.ProductListQueryProductListItemsSettings();
+  }
+
+  getQuerySettings(): Observable<QuerySettingsDTO> {
+    return this.getQuerySettingsResponse().pipe(map((response) => response.result));
+  }
+
+  queryProductListResponse(queryToken: QueryTokenDTO): Observable<ListResponseArgsOfProductListItemDTO> {
+    return this._productList.ProductListQueryProductListItem(queryToken);
+  }
+
+  queryProductList(queryToken: QueryTokenDTO): Observable<ProductListItemDTO[]> {
+    return this.queryProductListResponse(queryToken).pipe(map((response) => response.result));
+  }
+
+  completeProductListItemResponse(productListItemUId: string): Observable<ResponseArgsOfProductListItemDTO> {
+    return this._productList.ProductListProductListItemCompleted(productListItemUId);
+  }
+
+  completeProductListItem(productListItemUId: string): Observable<ProductListItemDTO> {
+    return this.completeProductListItemResponse(productListItemUId).pipe(map((response) => response.result));
+  }
+
+  completeProductListItemsResponse(uids: string[]): Observable<BatchResponseArgsOfProductListItemDTOAndString> {
+    return this._productList.ProductListProductListItemsCompleted(uids);
+  }
+
+  completeProductListItems(uids: string[]): Observable<BatchResponseArgsOfProductListItemDTOAndString> {
+    return this.completeProductListItemsResponse(uids);
+  }
+}

apps/domain/product-list/src/public-api.ts

@@ -0,0 +1,6 @@
+/*
+ * Public API Surface of product-list
+ */
+
+export * from './lib/product-list.service';
+export * from './lib/product-list.module';

apps/domain/product-list/tsconfig.lib.json

@@ -0,0 +1,14 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../out-tsc/lib",
+    "declaration": true,
+    "declarationMap": true,
+    "inlineSources": true,
+    "types": []
+  },
+  "exclude": [
+    "**/*.spec.ts"
+  ]
+}

apps/domain/product-list/tsconfig.lib.prod.json

@@ -0,0 +1,10 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+  "extends": "./tsconfig.lib.json",
+  "compilerOptions": {
+    "declarationMap": false
+  },
+  "angularCompilerOptions": {
+    "compilationMode": "partial"
+  }
+}

apps/domain/product-list/tsconfig.spec.json

@@ -0,0 +1,14 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../out-tsc/spec",
+    "types": [
+      "jasmine"
+    ]
+  },
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}

apps/domain/remission/src/lib/remission.service.ts

@@ -447,7 +447,7 @@ export class DomainRemissionService {
    * Create a new receipt for the given return/remission
    * @param returnId Return ID
    * @param receiptNumber Receipt number
-   * @returns ReturnDTO - ShippingDocument
+   * @returns ReceiptDTO
    */
   async createReceipt(returnDTO: ReturnDTO, receiptNumber?: string): Promise<ReceiptDTO> {
     const stock = await this._getStock();
@@ -471,14 +471,41 @@ export class DomainRemissionService {
     return receipt;
   }
 
-  async completeReceipt(returnId: number, receiptId: number, packageCode: string): Promise<ReceiptDTO> {
+  /**
+   * Create a new Package and assign it to a receipt
+   * @param returnId Return ID
+   * @param receiptId Receipt ID
+   * @param packageNumber Packagenumber
+   * @returns ReceiptDTO
+   */
+  async createReceiptAndAssignPackage({
+    returnId,
+    receiptId,
+    packageNumber,
+  }: {
+    returnId: number;
+    receiptId: number;
+    packageNumber: string;
+  }): Promise<ReceiptDTO> {
+    const response = await this._returnService
+      .ReturnCreateAndAssignPackage({
+        returnId,
+        receiptId,
+        data: {
+          packageNumber,
+        },
+      })
+      .toPromise();
+    const receipt: ReceiptDTO = response.result;
+    return receipt;
+  }
+
+  async completeReceipt(returnId: number, receiptId: number): Promise<ReceiptDTO> {
     const res = await this._returnService
       .ReturnFinalizeReceipt({
         returnId,
         receiptId,
-        data: {
-          packageCode,
-        },
+        data: {},
       })
       .toPromise();
 

apps/hub/notifications/src/lib/notifications.hub.ts

@@ -1,54 +1,121 @@
 import { Inject, Injectable, InjectionToken } from '@angular/core';
+import { AuthService } from '@core/auth';
 import { SignalrHub, SignalRHubOptions } from '@core/signalr';
 import { BehaviorSubject, merge, of } from 'rxjs';
 import { filter, map, shareReplay, tap, withLatestFrom } from 'rxjs/operators';
 import { EnvelopeDTO, MessageBoardItemDTO } from './defs';
+import { cloneDeep } from 'lodash';
 
 export const NOTIFICATIONS_HUB_OPTIONS = new InjectionToken<SignalRHubOptions>('hub.notifications.options');
 
 @Injectable()
 export class NotificationsHub extends SignalrHub {
-  updateNotification$ = new BehaviorSubject<MessageBoardItemDTO>(undefined);
-  constructor(@Inject(NOTIFICATIONS_HUB_OPTIONS) options: SignalRHubOptions) {
-    super(options);
+  get branchNo() {
+    return String(this._auth.getClaimByKey('branch_no') || this._auth.getClaimByKey('sub'));
   }
 
-  notifications$ = merge(
-    of(this._getNotifications()).pipe(filter((f) => !!f)),
-    this.listen<EnvelopeDTO<MessageBoardItemDTO[]>>('messageBoard')
-  ).pipe(
-    withLatestFrom(this.updateNotification$),
-    map(([d, update]) => {
-      const data = d;
-      if (update && !!data && !data?.data?.find((message) => message?.category === 'ISA-Update')) {
-        data.data.push(update);
+  // get sessionStoragesessionStorageKey() {
+  //   return `NOTIFICATIONS_BOARD_${this.branchNo}`;
+  // }
+
+  get sessionStoragesessionStorageKey() {
+    return `NOTIFICATIONS_BOARD_AREA_${this.branchNo}`;
+  }
+
+  messageBoardItems$ = new BehaviorSubject<Record<string, MessageBoardItemDTO[]>>({});
+
+  constructor(@Inject(NOTIFICATIONS_HUB_OPTIONS) options: SignalRHubOptions, private _auth: AuthService) {
+    super(options);
+
+    this.messageBoardItems$.next(this._getNotifications());
+
+    this.messageBoardItems$.subscribe((data) => {
+      this._storeNotifactions(data);
+    });
+
+    this.listen<EnvelopeDTO<MessageBoardItemDTO[]>>('messageBoard').subscribe((envelope) => {
+      if (envelope.action === 'refresh') {
+        this.refreshMessageBoardItems(envelope.target.area, envelope.data);
       }
-      return data;
-    }),
-    tap((data) => this._storeNotifactions(data)),
-    shareReplay(1)
+    });
+  }
+
+  refreshMessageBoardItems(targetArea: string, messages: MessageBoardItemDTO[]) {
+    const current = cloneDeep(this.messageBoardItems$.value);
+
+    current[targetArea] = messages ?? [];
+
+    this.messageBoardItems$.next(current);
+  }
+
+  notifications$ = this.messageBoardItems$.asObservable().pipe(
+    map((data) => {
+      const messages = { ...data };
+      const keys = Object.keys(data);
+      for (let key of keys) {
+        if (data[key].length === 0 || data[key] === undefined) {
+          delete messages[key];
+        }
+      }
+
+      return messages;
+    })
   );
 
-  private _storeNotifactions(data: EnvelopeDTO<MessageBoardItemDTO[]>) {
-    if (data) {
-      localStorage.setItem('NOTIFICATIONS_BOARD', JSON.stringify(data));
-    }
-  }
+  // notifications$ = merge(
+  //   of(this._getNotifications()).pipe(filter((f) => !!f)),
+  //   this.listen<EnvelopeDTO<MessageBoardItemDTO[]>>('messageBoard')
+  // ).pipe(
+  //   withLatestFrom(this.updateNotification$),
+  //   map(([d, update]) => {
+  //     console.log('notifications$', d, update);
+  //     const data = d;
+  //     if (update && !!data && !data?.data?.find((message) => message?.category === 'ISA-Update')) {
+  //       data.data.push(update);
+  //     }
+  //     return data;
+  //   }),
+  //   tap((data) => this._storeNotifactions(data)),
+  //   shareReplay(1)
+  // );
 
-  private _getNotifications(): EnvelopeDTO<MessageBoardItemDTO[]> {
-    const stringData = localStorage.getItem('NOTIFICATIONS_BOARD');
+  // private _storeNotifactions(data: EnvelopeDTO<MessageBoardItemDTO[]>) {
+  //   if (data) {
+  //     sessionStorage.setItem(this.sessionStoragesessionStorageKey, JSON.stringify(data));
+  //   }
+  // }
+
+  // private _getNotifications(): EnvelopeDTO<MessageBoardItemDTO[]> {
+  //   const stringData = sessionStorage.getItem(this.sessionStoragesessionStorageKey);
+  //   if (stringData) {
+  //     return JSON.parse(stringData);
+  //   }
+  //   return undefined;
+  // }
+
+  private _getNotifications(): Record<string, MessageBoardItemDTO[]> {
+    const stringData = sessionStorage.getItem(this.sessionStoragesessionStorageKey);
     if (stringData) {
       return JSON.parse(stringData);
     }
-    return undefined;
+    return {};
+  }
+
+  private _storeNotifactions(data: Record<string, MessageBoardItemDTO[]>) {
+    if (data) {
+      delete data['messageBoard/isa-update'];
+      sessionStorage.setItem(this.sessionStoragesessionStorageKey, JSON.stringify(data));
+    }
   }
 
   updateNotification() {
-    this.updateNotification$.next({
-      category: 'ISA-Update',
-      type: 'update',
-      headline: 'Update Benachrichtigung',
-      text: 'Es steht eine aktuellere Version der ISA bereit. Bitte aktualisieren Sie die Anwendung.',
-    });
+    this.refreshMessageBoardItems('messageBoard/isa-update', [
+      {
+        category: 'ISA-Update',
+        type: 'update',
+        headline: 'Update Benachrichtigung',
+        text: 'Es steht eine aktuellere Version der ISA bereit. Bitte aktualisieren Sie die Anwendung.',
+      },
+    ]);
   }
 }

apps/isa-app/src/app/app-routing.module.ts

@@ -1,5 +1,6 @@
 import { isDevMode, NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
+import { DebugComponent } from './debug/debug.component';
 import {
   CanActivateCartGuard,
   CanActivateCartWithProcessIdGuard,
@@ -14,6 +15,7 @@ import {
   CanActivateTaskCalendarGuard,
   IsAuthenticatedGuard,
 } from './guards';
+import { CanActivateAssortmentGuard } from './guards/can-activate-assortment.guard';
 import { CanActivatePackageInspectionGuard } from './guards/can-activate-package-inspection.guard';
 import { PreviewComponent } from './preview';
 import { BranchSectionResolver, CustomerSectionResolver, ProcessIdResolver } from './resolvers';
@@ -55,6 +57,17 @@ const routes: Routes = [
                 canActivate: [CanActivateProductWithProcessIdGuard],
                 resolve: { processId: ProcessIdResolver },
               },
+              {
+                path: 'order',
+                loadChildren: () => import('@page/customer-order').then((m) => m.CustomerOrderModule),
+                canActivate: [CanActivateGoodsOutGuard],
+              },
+              {
+                path: ':processId/order',
+                loadChildren: () => import('@page/customer-order').then((m) => m.CustomerOrderModule),
+                canActivate: [CanActivateGoodsOutWithProcessIdGuard],
+                resolve: { processId: ProcessIdResolver },
+              },
               {
                 path: 'customer',
                 loadChildren: () => import('@page/customer').then((m) => m.PageCustomerModule),
@@ -115,6 +128,11 @@ const routes: Routes = [
                 loadChildren: () => import('@page/package-inspection').then((m) => m.PackageInspectionModule),
                 canActivate: [CanActivatePackageInspectionGuard],
               },
+              {
+                path: 'assortment',
+                loadChildren: () => import('@page/assortment').then((m) => m.AssortmentModule),
+                canActivate: [CanActivateAssortmentGuard],
+              },
               { path: '**', redirectTo: 'task-calendar', pathMatch: 'full' },
             ],
             resolve: { section: BranchSectionResolver },

apps/isa-app/src/app/app.component.spec.ts

@@ -9,6 +9,8 @@ import { CommonModule } from '@angular/common';
 import { SwUpdate } from '@angular/service-worker';
 import { NotificationsHub } from '@hub/notifications';
 import { UserStateService } from '@swagger/isa';
+import { UiModalService } from '@ui/modal';
+import { AuthService } from '@core/auth';
 
 describe('AppComponent', () => {
   let spectator: Spectator<AppComponent>;
@@ -21,7 +23,7 @@ describe('AppComponent', () => {
     component: AppComponent,
     imports: [CommonModule, RouterTestingModule],
     providers: [],
-    mocks: [Config, SwUpdate, UserStateService],
+    mocks: [Config, SwUpdate, UserStateService, UiModalService, AuthService],
   });
 
   beforeEach(() => {

apps/isa-app/src/app/app.component.ts

@@ -1,17 +1,18 @@
 import { DOCUMENT } from '@angular/common';
-import { Component, Inject, OnInit, Renderer2 } from '@angular/core';
+import { Component, HostListener, Inject, OnInit, Renderer2 } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { SwUpdate, UpdateAvailableEvent } from '@angular/service-worker';
 import { ApplicationService } from '@core/application';
 import { Config } from '@core/config';
 import { NotificationsHub } from '@hub/notifications';
 import packageInfo from 'package';
-import { interval, Observable, Subscription } from 'rxjs';
-import { tap } from 'rxjs/operators';
-import { Platform } from '@angular/cdk/platform';
-import { Router } from '@angular/router';
+import { asapScheduler, interval, Observable, Subscription } from 'rxjs';
 import { UserStateService } from '@swagger/isa';
 import { IsaLogProvider } from './providers';
+import { EnvironmentService } from '@core/environment';
+import { AuthService } from '@core/auth';
+import { UiMessageModalComponent, UiModalService } from '@ui/modal';
+import { tap } from 'rxjs/operators';
 
 @Component({
   selector: 'app-root',
@@ -41,19 +42,34 @@ export class AppComponent implements OnInit {
     private readonly _renderer: Renderer2,
     private readonly _swUpdate: SwUpdate,
     private readonly _notifications: NotificationsHub,
-    private readonly _platform: Platform,
-    private router: Router,
-    private infoService: UserStateService
+    private infoService: UserStateService,
+    private readonly _environment: EnvironmentService,
+    private readonly _authService: AuthService,
+    private readonly _modal: UiModalService
   ) {
     this.updateClient();
-    IsaLogProvider.InfoService = infoService;
+    IsaLogProvider.InfoService = this.infoService;
   }
 
   ngOnInit() {
     this.setTitle();
     this.logVersion();
-    this.determinePlatform();
+    asapScheduler.schedule(() => this.determinePlatform(), 250);
     this._appService.getSection$().subscribe(this.sectionChangeHandler.bind(this));
+
+    this.setupSilentRefresh();
+  }
+
+  // Setup interval for silent refresh
+  setupSilentRefresh() {
+    const silentRefreshInterval = this._config.get('silentRefresh.interval');
+    if (silentRefreshInterval > 0) {
+      interval(silentRefreshInterval).subscribe(() => {
+        if (this._authService.isAuthenticated()) {
+          this._authService.refresh();
+        }
+      });
+    }
   }
 
   setTitle() {
@@ -65,13 +81,15 @@ export class AppComponent implements OnInit {
   }
 
   determinePlatform() {
-    if (this._platform.IOS && !this._platform.SAFARI) {
-      this._renderer.addClass(this._document.body, 'tablet');
+    if (this._environment.isNative()) {
       this._renderer.addClass(this._document.body, 'tablet-native');
-    } else if (this._platform.IOS && this._platform.SAFARI) {
-      this._renderer.addClass(this._document.body, 'tablet');
+    } else if (this._environment.isTablet()) {
       this._renderer.addClass(this._document.body, 'tablet-browser');
-    } else if (this._platform.isBrowser) {
+    }
+    if (this._environment.isTablet()) {
+      this._renderer.addClass(this._document.body, 'tablet');
+    }
+    if (this._environment.isDesktop()) {
       this._renderer.addClass(this._document.body, 'desktop');
     }
   }
@@ -86,49 +104,6 @@ export class AppComponent implements OnInit {
     }
   }
 
-  // --------------------------------------------------------
-  // Implementation before Angular Version 13.x.x
-
-  // async updateClient() {
-  //   if (!this._swUpdate.isEnabled) {
-  //     return;
-  //   }
-
-  //   await this.initialCheckForUpdate();
-  //   this.checkForUpdateInterval();
-  // }
-
-  // checkForUpdateInterval() {
-  //   this.updateAvailableObs = this._swUpdate.available.pipe(
-  //     tap((availableEvent) => {
-  //       if (availableEvent?.current?.hash !== availableEvent?.available?.hash) {
-  //         this._notifications.updateNotification();
-  //         this.subscriptions.unsubscribe();
-  //       }
-  //     })
-  //   );
-  //   this.subscriptions.add(
-  //     interval(this._checkForUpdates).subscribe(async () => {
-  //       await this._swUpdate.checkForUpdate();
-  //     })
-  //   );
-  // }
-
-  // async initialCheckForUpdate() {
-  //   this.updateAvailableObs = this._swUpdate.available.pipe(
-  //     tap((availableEvent) => {
-  //       if (availableEvent?.current?.hash !== availableEvent?.available?.hash) {
-  //         location.reload();
-  //       }
-  //     })
-  //   );
-  //   this.subscriptions.add(this.updateAvailableObs.subscribe());
-  //   await this._swUpdate.checkForUpdate();
-  // }
-
-  // --------------------------------------------------------
-  // Implementation for Angular Version 13.x.x
-
   updateClient() {
     if (!this._swUpdate.isEnabled) {
       return;
@@ -155,4 +130,22 @@ export class AppComponent implements OnInit {
       }
     });
   }
+
+  @HostListener('window:visibilitychange', ['$event'])
+  onVisibilityChange(event: Event) {
+    // refresh token when app is in background
+    if (this._document.hidden && this._authService.isAuthenticated()) {
+      this._authService.refresh();
+    } else if (!this._authService.isAuthenticated()) {
+      return this._modal
+        .open({
+          content: UiMessageModalComponent,
+          title: 'Sie sind nicht mehr angemeldet',
+          data: { message: 'Sie werden neu angemeldet' },
+        })
+        .afterClosed$.subscribe(() => {
+          this._authService.login();
+        });
+    }
+  }
 }

apps/isa-app/src/app/app.module.ts

@@ -34,11 +34,18 @@ import { RootStateService } from './store/root-state.service';
 import * as Commands from './commands';
 import { UiIconModule } from '@ui/icon';
 import { PreviewComponent } from './preview';
+import { NativeContainerService } from 'native-container';
 
 registerLocaleData(localeDe, localeDeExtra);
 registerLocaleData(localeDe, 'de', localeDeExtra);
 
-export function _appInitializerFactory(config: Config, auth: AuthService, injector: Injector, scanAdapter: ScanAdapterService) {
+export function _appInitializerFactory(
+  config: Config,
+  auth: AuthService,
+  injector: Injector,
+  scanAdapter: ScanAdapterService,
+  nativeContainer: NativeContainerService
+) {
   return async () => {
     const statusElement = document.querySelector('#init-status');
     statusElement.innerHTML = 'Konfigurationen werden geladen...';
@@ -52,6 +59,10 @@ export function _appInitializerFactory(config: Config, auth: AuthService, inject
       await state.init();
     }
 
+    statusElement.innerHTML = 'Native Container wird initialisiert...';
+    await nativeContainer.init();
+
+    statusElement.innerHTML = 'Scanner wird initialisiert...';
     await scanAdapter.init();
   };
 }
@@ -96,6 +107,25 @@ export function _notificationsHubOptionsFactory(config: Config, auth: AuthServic
       aliases: [
         { alias: 'd-account', name: 'account' },
         { alias: 'd-no-account', name: 'package-variant-closed' },
+        { name: 'isa-audio', alias: 'AU' },
+        { name: 'isa-audio', alias: 'CAS' },
+        { name: 'isa-audio', alias: 'DL' },
+        { name: 'isa-audio', alias: 'KAS' },
+        { name: 'isa-hard-cover', alias: 'BUCH' },
+        { name: 'isa-hard-cover', alias: 'GEB' },
+        { name: 'isa-hard-cover', alias: 'HC' },
+        { name: 'isa-hard-cover', alias: 'KT' },
+        { name: 'isa-ebook', alias: 'EB' },
+        { name: 'isa-non-book', alias: 'GLO' },
+        { name: 'isa-non-book', alias: 'HDL' },
+        { name: 'isa-non-book', alias: 'NB' },
+        { name: 'isa-non-book', alias: 'SPL' },
+        { name: 'isa-calendar', alias: 'KA' },
+        { name: 'isa-scroll', alias: 'MA' },
+        { name: 'isa-software', alias: 'SW' },
+        { name: 'isa-soft-cover', alias: 'TB' },
+        { name: 'isa-video', alias: 'VI' },
+        { name: 'isa-news-paper', alias: 'ZS' },
       ],
     }),
   ],
@@ -104,7 +134,7 @@ export function _notificationsHubOptionsFactory(config: Config, auth: AuthServic
       provide: APP_INITIALIZER,
       useFactory: _appInitializerFactory,
       multi: true,
-      deps: [Config, AuthService, Injector, ScanAdapterService],
+      deps: [Config, AuthService, Injector, ScanAdapterService, NativeContainerService],
     },
     {
       provide: NOTIFICATIONS_HUB_OPTIONS,

apps/isa-app/src/app/debug/debug.component.html

@@ -0,0 +1,11 @@
+<div class="odd:bg-slate-200 grid grid-flow-col justify-start" *ngFor="let log of logs$ | async">
+  <div class="p-2 w-100 grow-0">
+    {{ log.timestamp | date }}
+  </div>
+  <div class="p-2 w-50 grow-0">
+    {{ log.type }}
+  </div>
+  <div class="p-2 grow">
+    {{ log.args | json }}
+  </div>
+</div>

apps/isa-app/src/app/debug/debug.component.scss

@@ -0,0 +1,6 @@
+:host {
+  @apply block;
+}
+:host {
+  @apply grid grid-flow-row bg-white overflow-scroll;
+}

apps/isa-app/src/app/debug/debug.component.ts

@@ -0,0 +1,17 @@
+import { CommonModule } from '@angular/common';
+import { Component, ChangeDetectionStrategy } from '@angular/core';
+import { DebugService } from './debug.service';
+
+@Component({
+  selector: 'app-debug',
+  templateUrl: 'debug.component.html',
+  styleUrls: ['debug.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule],
+})
+export class DebugComponent {
+  logs$ = this.debugService.logs$;
+
+  constructor(private debugService: DebugService) {}
+}

apps/isa-app/src/app/debug/debug.service.ts

@@ -0,0 +1,25 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject, fromEvent } from 'rxjs';
+
+export interface ConsoleLog {
+  timestamp?: Date;
+  type: 'log' | 'warn' | 'error';
+  args: any[];
+}
+
+@Injectable()
+export class DebugService {
+  private _consoleSubject = new BehaviorSubject<ConsoleLog[]>([]);
+
+  logs$ = this._consoleSubject.asObservable();
+
+  constructor() {
+    fromEvent(window, 'message').subscribe((event: MessageEvent) => {
+      this.add({ type: 'log', args: [event.data] });
+    });
+  }
+
+  add(log: ConsoleLog) {
+    this._consoleSubject.next([...this._consoleSubject.value, { ...log, timestamp: new Date() }]);
+  }
+}

apps/isa-app/src/app/guards/can-activate-assortment.guard.ts

@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot } from '@angular/router';
+import { ApplicationService } from '@core/application';
+import { Config } from '@core/config';
+import { first } from 'rxjs/operators';
+
+@Injectable({ providedIn: 'root' })
+export class CanActivateAssortmentGuard implements CanActivate {
+  constructor(private readonly _applicationService: ApplicationService, private readonly _config: Config) {}
+
+  async canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
+    const process = await this._applicationService.getProcessById$(this._config.get('process.ids.assortment')).pipe(first()).toPromise();
+    if (!process) {
+      await this._applicationService.createProcess({
+        id: this._config.get('process.ids.assortment'),
+        type: 'assortment',
+        section: 'branch',
+        name: 'Sortiment',
+      });
+    }
+    this._applicationService.activateProcess(this._config.get('process.ids.assortment'));
+    return true;
+  }
+}

apps/isa-app/src/app/guards/is-authenticated.guard.ts

@@ -52,11 +52,7 @@ export class IsAuthenticatedGuard implements CanActivate {
       return undefined;
     }
 
-    const result = await this._scanService
-      .scan({
-        exclude: ['Dev', 'Native'],
-      })
-      ?.toPromise();
+    const result = await this._scanService.scan()?.toPromise();
 
     if (typeof result === 'string') {
       try {

apps/isa-app/src/app/interceptors/http-error.interceptor.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { HttpInterceptor, HttpEvent, HttpHandler, HttpRequest, HttpErrorResponse } from '@angular/common/http';
-import { Observable, throwError } from 'rxjs';
+import { NEVER, Observable, throwError } from 'rxjs';
 import { UiMessageModalComponent, UiModalService } from '@ui/modal';
 import { catchError, mergeMap, tap } from 'rxjs/operators';
 import { AuthService } from '@core/auth';
@@ -25,6 +25,7 @@ export class HttpErrorInterceptor implements HttpInterceptor {
         })
         .afterClosed$.pipe(mergeMap(() => throwError(error)));
     } else if (error.status === 401) {
+      console.log('401', error);
       return this._modal
         .open({
           content: UiMessageModalComponent,
@@ -35,7 +36,7 @@ export class HttpErrorInterceptor implements HttpInterceptor {
           tap(() => {
             this._auth.login();
           }),
-          mergeMap(() => throwError(error))
+          mergeMap(() => NEVER)
         );
     }
 

apps/isa-app/src/app/preview/preview.component.html

@@ -1 +1,10 @@
-<shared-branch-selector [value]="selectedBranch$ | async" (valueChange)="setNewBranch($event)"></shared-branch-selector>
+<h1>Platform: {{ platform | json }}</h1>
+<br />
+<h1>{{ appVersion }}</h1>
+<br />
+<h1>{{ userAgent }}</h1>
+<br />
+<h1>Navigator: {{ navigator | json }}</h1>
+<br />
+<br />
+<h1>Device: {{ device }}</h1>

apps/isa-app/src/app/preview/preview.component.ts

@@ -1,3 +1,4 @@
+import { Platform, PlatformModule } from '@angular/cdk/platform';
 import { CommonModule } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
 import { BranchSelectorComponent } from '@shared/components/branch-selector';
@@ -8,13 +9,48 @@ import { BehaviorSubject } from 'rxjs';
   selector: 'app-preview',
   templateUrl: 'preview.component.html',
   styleUrls: ['preview.component.css'],
-  imports: [CommonModule, BranchSelectorComponent],
+  imports: [CommonModule, BranchSelectorComponent, PlatformModule],
   standalone: true,
 })
 export class PreviewComponent implements OnInit {
   selectedBranch$ = new BehaviorSubject<BranchDTO>({});
 
-  constructor() {}
+  get appVersion() {
+    return 'App Version: ' + (window.navigator as any).appVersion;
+  }
+
+  get userAgent() {
+    return 'User Agent: ' + (window.navigator as any).userAgent;
+  }
+
+  get navigator() {
+    const nav = {};
+    for (let i in window.navigator) nav[i] = navigator[i];
+    return nav;
+  }
+
+  get platform() {
+    return this._platform;
+  }
+
+  get device() {
+    const isIpadNative = this._platform.IOS && !this._platform.SAFARI;
+    const isIpadMini6Native = window?.navigator?.userAgent?.includes('Macintosh') && !this._platform.SAFARI;
+    const isNative = isIpadNative || isIpadMini6Native;
+    const isPWA = this._platform.IOS && this._platform.SAFARI;
+    const isDesktop = !isNative && !isPWA;
+    if (isNative) {
+      if (isIpadMini6Native) {
+        return 'IPAD mini 6 Native App';
+      } else if (isIpadNative) {
+        return 'IPAD mini 2 Native App or IPAD mini 5 Native App';
+      }
+    } else if (isPWA) {
+      return 'IPAD Safari PWA';
+    } else if (isDesktop) return 'Desktop or Macintosh';
+  }
+
+  constructor(private readonly _platform: Platform) {}
 
   ngOnInit() {}
 

apps/isa-app/src/app/shell/shell.component.html

@@ -39,7 +39,7 @@
 <div class="shell-footer-wrapper">
   <shell-footer *ngIf="section$ | async; let section">
     <ng-container *ngIf="section === 'customer'">
-      <a (click)="resetSelectedBranch()" [routerLink]="[customerBasePath$ | async, 'product']" routerLinkActive="active">
+      <a [routerLink]="[customerBasePath$ | async, 'product']" routerLinkActive="active">
         <ui-icon icon="catalog" size="30px"></ui-icon>
         Artikelsuche
       </a>
@@ -47,12 +47,20 @@
         <ui-icon icon="customer" size="24px"></ui-icon>
         Kundensuche
       </a>
-      <a [routerLink]="[customerBasePath$ | async, 'goods', 'out']" routerLinkActive="active">
+      <a *ifRole="'Store'" [routerLink]="[customerBasePath$ | async, 'goods', 'out']" routerLinkActive="active">
         <ui-icon icon="box_out" size="24px"></ui-icon>
         Warenausgabe
       </a>
+      <a *ifRole="'CallCenter'" [routerLink]="[customerBasePath$ | async, 'order']" routerLinkActive="active">
+        <ui-svg-icon icon="package-variant-closed" [size]="28"></ui-svg-icon>
+        Kundenbestellungen
+      </a>
     </ng-container>
     <ng-container *ngIf="section === 'branch'">
+      <a [routerLink]="['/filiale/assortment']" routerLinkActive="active">
+        <ui-svg-icon icon="shape-outline" [size]="24"></ui-svg-icon>
+        Sortiment
+      </a>
       <a [routerLink]="['/filiale/task-calendar']" routerLinkActive="active">
         <ui-icon icon="calendar_check" size="24px"></ui-icon>
         Tätigkeitskalender
@@ -72,3 +80,9 @@
     </ng-container>
   </shell-footer>
 </div>
+
+<button *ngIf="isDevelopment" class="block absolute bottom-0 right-0 z-tooltip p-4 opacity-5" (click)="debugOpen = !debugOpen">
+  <ui-svg-icon icon="bug-outline"></ui-svg-icon>
+</button>
+
+<app-debug *ngIf="debugOpen" class="absolute inset-x-0 top-0 max-h-[calc(100vh-80px)]"></app-debug>

apps/isa-app/src/app/shell/shell.component.scss

@@ -1,5 +1,5 @@
 :host {
-  @apply block;
+  @apply block relative min-h-screen;
 }
 
 .main-wrapper {

apps/isa-app/src/app/shell/shell.component.spec.ts

@@ -4,7 +4,7 @@ import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ApplicationProcess, ApplicationService } from '@core/application';
-import { AuthService } from '@core/auth';
+import { AuthModule, AuthService } from '@core/auth';
 import { Config } from '@core/config';
 import { BreadcrumbService } from '@core/breadcrumb';
 import { DomainAvailabilityService } from '@domain/availability';
@@ -16,7 +16,7 @@ import { DashboardComponent } from '@page/dashboard';
 import { ShellFooterComponent } from '@shell/footer';
 import { ShellHeaderComponent } from '@shell/header';
 import { ShellProcessComponent, ShellProcessTabComponent } from '@shell/process';
-import { UiIconComponent } from '@ui/icon';
+import { IconRegistry, UiIconComponent, UiIconModule } from '@ui/icon';
 import { UiModalService } from '@ui/modal';
 import { EnvelopeDTO, MessageBoardItemDTO } from 'apps/hub/notifications/src/lib/defs';
 import { MockComponent } from 'ng-mocks';
@@ -46,19 +46,28 @@ describe('ShellComponent', () => {
   const createComponent = createComponentFactory({
     component: ShellComponent,
     imports: [
+      UiIconModule,
       RouterTestingModule.withRoutes([
         { path: 'kunde', component: DummyComponent },
         { path: 'kunde/dashboard', component: DashboardComponent },
       ]),
+      AuthModule,
     ],
     declarations: [
       MockComponent(ShellHeaderComponent),
       MockComponent(ShellFooterComponent),
       MockComponent(ShellProcessComponent),
       MockComponent(ShellProcessTabComponent),
-      MockComponent(UiIconComponent),
     ],
-    mocks: [BreadcrumbService, DomainAvailabilityService, AuthService, DomainDashboardService, Config, WrongDestinationModalService],
+    mocks: [
+      BreadcrumbService,
+      DomainAvailabilityService,
+      AuthService,
+      DomainDashboardService,
+      Config,
+      WrongDestinationModalService,
+      IconRegistry,
+    ],
   });
 
   beforeEach(() => {
@@ -174,11 +183,13 @@ describe('ShellComponent', () => {
       expect(spectator.query('shell-footer')).not.toBeVisible();
     });
 
-    it('should display the menu items for section customer', () => {
+    xit('should display the menu items for section customer', () => {
       applicationServiceMock.getSection$.and.returnValue(of('customer'));
       spectator.component.customerBasePath$ = of('/kunde/1');
       spectator.detectComponentChanges();
 
+      authServiceMock.hasRole.and.returnValue(true);
+
       const anchors = spectator.queryAll('shell-footer a');
       expect(anchors[0]).toHaveText('Artikelsuche');
       expect(anchors[0]).toHaveAttribute('href', '/kunde/1/product');
@@ -193,12 +204,16 @@ describe('ShellComponent', () => {
       spectator.detectComponentChanges();
 
       const anchors = spectator.queryAll('shell-footer a');
-      expect(anchors[0]).toHaveText('Tätigkeitskalender');
-      expect(anchors[0]).toHaveAttribute('href', '/filiale/task-calendar');
-      expect(anchors[1]).toHaveText('Abholfach');
-      expect(anchors[1]).toHaveAttribute('href', '/filiale/goods/in');
-      expect(anchors[2]).toHaveText('Remission');
-      expect(anchors[2]).toHaveAttribute('href', '/filiale/remission');
+      expect(anchors[0]).toHaveText('Sortiment');
+      expect(anchors[0]).toHaveAttribute('href', '/filiale/assortment');
+      expect(anchors[1]).toHaveText('Tätigkeitskalender');
+      expect(anchors[1]).toHaveAttribute('href', '/filiale/task-calendar');
+      expect(anchors[2]).toHaveText('Abholfach');
+      expect(anchors[2]).toHaveAttribute('href', '/filiale/goods/in');
+      expect(anchors[3]).toHaveText('Remission');
+      expect(anchors[3]).toHaveAttribute('href', '/filiale/remission');
+      // expect(anchors[4]).toHaveText('Wareneingang');
+      // expect(anchors[4]).toHaveAttribute('href', '/filiale/package-inspection');
     });
   });
 

apps/isa-app/src/app/shell/shell.component.ts

@@ -20,12 +20,18 @@ import { WrongDestinationModalService } from 'apps/page/package-inspection/src/l
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ShellComponent {
+  isDevelopment = Boolean(this._config.get('debug'));
+
+  debugOpen = false;
+
   @ViewChildren('processTabs')
   readonly processTabs: QueryList<ShellProcessTabComponent>;
 
   notifications$ = this._notificationsHub.notifications$;
 
-  notificationCount$ = this.notifications$.pipe(map((message) => message?.data?.length));
+  notificationCount$ = this.notifications$.pipe(
+    map((notifications) => Object.values(notifications).reduce((acc, val) => acc + val?.length ?? 0, 0))
+  );
 
   get activatedProcessId$() {
     return this._appService.getActivatedProcessId$().pipe(
@@ -164,13 +170,6 @@ export class ShellComponent {
     });
   }
 
-  async resetSelectedBranch() {
-    const processId = await this.activatedProcessId$.pipe(take(1)).toPromise();
-    if (!!processId) {
-      this._appService.patchProcessData(processId, { selectedBranch: undefined });
-    }
-  }
-
   trackByIdFn: TrackByFunction<ApplicationProcess> = (_, process) => process.id;
 
   fetchAndOpenPackages = () => this._wrongDestinationModalService.fetchAndOpen();

apps/isa-app/src/app/shell/shell.module.ts

@@ -9,9 +9,21 @@ import { ShellFooterModule } from '@shell/footer';
 import { ShellComponent } from './shell.component';
 import { UiIconModule } from '@ui/icon';
 import { RouterModule } from '@angular/router';
+import { AuthModule } from '@core/auth';
+import { DebugComponent } from '../debug/debug.component';
 
 @NgModule({
-  imports: [RouterModule, CommonModule, ShellHeaderModule, ShellProcessModule, ShellFooterModule, UiIconModule, OverlayModule],
+  imports: [
+    RouterModule,
+    CommonModule,
+    ShellHeaderModule,
+    ShellProcessModule,
+    ShellFooterModule,
+    UiIconModule,
+    OverlayModule,
+    AuthModule,
+    DebugComponent,
+  ],
   exports: [ShellComponent],
   declarations: [ShellComponent],
   providers: [],

apps/isa-app/src/assets/images/Icon_DR.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="18px" viewBox="0 0 22 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 52.2 (67145) - http://www.bohemiancoding.com/sketch -->
+    <title>Icon_HC</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Hugendubel_Icons" transform="translate(-29.000000, -177.000000)" fill="#000000" fill-rule="nonzero" stroke="#000000" stroke-width="0.3">
+            <path d="M32.725699,178.000628 C32.7430505,177.999791 32.7604307,177.999791 32.7777823,178.000628 L37.5260449,178.000628 C38.53109,178.000628 39.44018,178.547926 40.0000026,179.340692 C40.5598253,178.547926 41.4689153,178.000628 42.4739603,178.000628 L47.222223,178.000628 C47.529035,178.00066 47.7777477,178.256627 47.7777784,178.572389 L47.7777784,179.71591 L49.4444446,179.71591 C49.7512567,179.715942 49.9999694,179.971909 50,180.287671 L50,192.008763 C49.9999694,192.324524 49.7512567,192.580492 49.4444446,192.580523 L42.4739603,192.580523 C41.4766486,192.580523 40.8524541,192.949423 40.4947942,193.688309 C40.3998428,193.879608 40.208727,194 40.0000026,194 C39.7912783,194 39.6001624,193.879608 39.5052111,193.688309 C39.1475512,192.949423 38.5233566,192.580523 37.5260449,192.580523 L30.5555607,192.580523 C30.2487486,192.580492 30.0000359,192.324524 30.0000053,192.008763 L30.0000053,180.287671 C29.9987652,179.991708 30.2171687,179.743681 30.5034773,179.71591 C30.5208289,179.715072 30.5382091,179.715072 30.5555607,179.71591 L32.2222269,179.71591 L32.2222269,178.572389 C32.2209869,178.276426 32.4393904,178.028399 32.725699,178.000628 Z M33.3333377,179.14415 L33.3333377,189.43584 L36.6232674,189.43584 C37.6190746,189.43584 38.5547188,189.729711 39.2621556,190.356017 C39.3270606,190.413476 39.3849347,190.480265 39.4444472,190.543626 L39.4444472,180.957703 C39.4433388,180.936873 39.4433388,180.915996 39.4444472,180.895166 C39.4444472,180.068361 38.4768339,179.14415 37.5260449,179.14415 L33.3333377,179.14415 Z M42.4739603,179.14415 C41.5231714,179.14415 40.555558,180.068361 40.555558,180.895166 C40.5555806,180.898144 40.5555806,180.901122 40.555558,180.9041 L40.555558,190.543626 C40.6150705,190.480265 40.6729447,190.413476 40.7378497,190.356017 C41.4452864,189.729711 42.3809306,189.43584 43.3767379,189.43584 L46.6666675,189.43584 L46.6666675,179.14415 L42.4739603,179.14415 Z M31.1111161,180.859431 L31.1111161,191.437002 L37.5260449,191.437002 C38.0365968,191.437002 38.5189494,191.531483 38.9496557,191.713949 C38.8273679,191.527334 38.6888269,191.36055 38.5329891,191.222592 C38.0547048,190.799175 37.405738,190.579361 36.6232674,190.579361 L32.7777823,190.579361 C32.4709702,190.57933 32.2222575,190.323362 32.2222269,190.007601 L32.2222269,180.859431 L31.1111161,180.859431 Z M47.7777784,180.859431 L47.7777784,190.007601 C47.7777477,190.323362 47.529035,190.57933 47.222223,190.579361 L43.3767379,190.579361 C42.5942672,190.579361 41.9453004,190.799175 41.4670161,191.222592 C41.3107359,191.360944 41.1725734,191.526903 41.0503496,191.713949 C41.4810558,191.531483 41.9634085,191.437002 42.4739603,191.437002 L48.8888892,191.437002 L48.8888892,180.859431 L47.7777784,180.859431 Z M35.5,182.116677 L37.5,182.116677 C37.7761424,182.116677 38,182.340535 38,182.616677 L38,182.645847 C38,182.921989 37.7761424,183.145847 37.5,183.145847 L35.5,183.145847 C35.2238576,183.145847 35,182.921989 35,182.645847 L35,182.616677 C35,182.340535 35.2238576,182.116677 35.5,182.116677 Z M35.5,184.175016 L37.5,184.175016 C37.7761424,184.175016 38,184.398874 38,184.675016 L38,184.704185 C38,184.980328 37.7761424,185.204185 37.5,185.204185 L35.5,185.204185 C35.2238576,185.204185 35,184.980328 35,184.704185 L35,184.675016 C35,184.398874 35.2238576,184.175016 35.5,184.175016 Z M35.5,186.233355 L37.5,186.233355 C37.7761424,186.233355 38,186.457212 38,186.733355 L38,186.762524 C38,187.038666 37.7761424,187.262524 37.5,187.262524 L35.5,187.262524 C35.2238576,187.262524 35,187.038666 35,186.762524 L35,186.733355 C35,186.457212 35.2238576,186.233355 35.5,186.233355 Z M42.5,182.116677 L44.5,182.116677 C44.7761424,182.116677 45,182.340535 45,182.616677 L45,182.645847 C45,182.921989 44.7761424,183.145847 44.5,183.145847 L42.5,183.145847 C42.2238576,183.145847 42,182.921989 42,182.645847 L42,182.616677 C42,182.340535 42.2238576,182.116677 42.5,182.116677 Z M42.5,184.175016 L44.5,184.175016 C44.7761424,184.175016 45,184.398874 45,184.675016 L45,184.704185 C45,184.980328 44.7761424,185.204185 44.5,185.204185 L42.5,185.204185 C42.2238576,185.204185 42,184.980328 42,184.704185 L42,184.675016 C42,184.398874 42.2238576,184.175016 42.5,184.175016 Z M42.5,186.233355 L44.5,186.233355 C44.7761424,186.233355 45,186.457212 45,186.733355 L45,186.762524 C45,187.038666 44.7761424,187.262524 44.5,187.262524 L42.5,187.262524 C42.2238576,187.262524 42,187.038666 42,186.762524 L42,186.733355 C42,186.457212 42.2238576,186.233355 42.5,186.233355 Z" id="Icon_HC"></path>
+        </g>
+    </g>
+</svg>

apps/isa-app/src/assets/images/Icon_GEH.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="18px" viewBox="0 0 22 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 52.2 (67145) - http://www.bohemiancoding.com/sketch -->
+    <title>Icon_HC</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Hugendubel_Icons" transform="translate(-29.000000, -177.000000)" fill="#000000" fill-rule="nonzero" stroke="#000000" stroke-width="0.3">
+            <path d="M32.725699,178.000628 C32.7430505,177.999791 32.7604307,177.999791 32.7777823,178.000628 L37.5260449,178.000628 C38.53109,178.000628 39.44018,178.547926 40.0000026,179.340692 C40.5598253,178.547926 41.4689153,178.000628 42.4739603,178.000628 L47.222223,178.000628 C47.529035,178.00066 47.7777477,178.256627 47.7777784,178.572389 L47.7777784,179.71591 L49.4444446,179.71591 C49.7512567,179.715942 49.9999694,179.971909 50,180.287671 L50,192.008763 C49.9999694,192.324524 49.7512567,192.580492 49.4444446,192.580523 L42.4739603,192.580523 C41.4766486,192.580523 40.8524541,192.949423 40.4947942,193.688309 C40.3998428,193.879608 40.208727,194 40.0000026,194 C39.7912783,194 39.6001624,193.879608 39.5052111,193.688309 C39.1475512,192.949423 38.5233566,192.580523 37.5260449,192.580523 L30.5555607,192.580523 C30.2487486,192.580492 30.0000359,192.324524 30.0000053,192.008763 L30.0000053,180.287671 C29.9987652,179.991708 30.2171687,179.743681 30.5034773,179.71591 C30.5208289,179.715072 30.5382091,179.715072 30.5555607,179.71591 L32.2222269,179.71591 L32.2222269,178.572389 C32.2209869,178.276426 32.4393904,178.028399 32.725699,178.000628 Z M33.3333377,179.14415 L33.3333377,189.43584 L36.6232674,189.43584 C37.6190746,189.43584 38.5547188,189.729711 39.2621556,190.356017 C39.3270606,190.413476 39.3849347,190.480265 39.4444472,190.543626 L39.4444472,180.957703 C39.4433388,180.936873 39.4433388,180.915996 39.4444472,180.895166 C39.4444472,180.068361 38.4768339,179.14415 37.5260449,179.14415 L33.3333377,179.14415 Z M42.4739603,179.14415 C41.5231714,179.14415 40.555558,180.068361 40.555558,180.895166 C40.5555806,180.898144 40.5555806,180.901122 40.555558,180.9041 L40.555558,190.543626 C40.6150705,190.480265 40.6729447,190.413476 40.7378497,190.356017 C41.4452864,189.729711 42.3809306,189.43584 43.3767379,189.43584 L46.6666675,189.43584 L46.6666675,179.14415 L42.4739603,179.14415 Z M31.1111161,180.859431 L31.1111161,191.437002 L37.5260449,191.437002 C38.0365968,191.437002 38.5189494,191.531483 38.9496557,191.713949 C38.8273679,191.527334 38.6888269,191.36055 38.5329891,191.222592 C38.0547048,190.799175 37.405738,190.579361 36.6232674,190.579361 L32.7777823,190.579361 C32.4709702,190.57933 32.2222575,190.323362 32.2222269,190.007601 L32.2222269,180.859431 L31.1111161,180.859431 Z M47.7777784,180.859431 L47.7777784,190.007601 C47.7777477,190.323362 47.529035,190.57933 47.222223,190.579361 L43.3767379,190.579361 C42.5942672,190.579361 41.9453004,190.799175 41.4670161,191.222592 C41.3107359,191.360944 41.1725734,191.526903 41.0503496,191.713949 C41.4810558,191.531483 41.9634085,191.437002 42.4739603,191.437002 L48.8888892,191.437002 L48.8888892,180.859431 L47.7777784,180.859431 Z M35.5,182.116677 L37.5,182.116677 C37.7761424,182.116677 38,182.340535 38,182.616677 L38,182.645847 C38,182.921989 37.7761424,183.145847 37.5,183.145847 L35.5,183.145847 C35.2238576,183.145847 35,182.921989 35,182.645847 L35,182.616677 C35,182.340535 35.2238576,182.116677 35.5,182.116677 Z M35.5,184.175016 L37.5,184.175016 C37.7761424,184.175016 38,184.398874 38,184.675016 L38,184.704185 C38,184.980328 37.7761424,185.204185 37.5,185.204185 L35.5,185.204185 C35.2238576,185.204185 35,184.980328 35,184.704185 L35,184.675016 C35,184.398874 35.2238576,184.175016 35.5,184.175016 Z M35.5,186.233355 L37.5,186.233355 C37.7761424,186.233355 38,186.457212 38,186.733355 L38,186.762524 C38,187.038666 37.7761424,187.262524 37.5,187.262524 L35.5,187.262524 C35.2238576,187.262524 35,187.038666 35,186.762524 L35,186.733355 C35,186.457212 35.2238576,186.233355 35.5,186.233355 Z M42.5,182.116677 L44.5,182.116677 C44.7761424,182.116677 45,182.340535 45,182.616677 L45,182.645847 C45,182.921989 44.7761424,183.145847 44.5,183.145847 L42.5,183.145847 C42.2238576,183.145847 42,182.921989 42,182.645847 L42,182.616677 C42,182.340535 42.2238576,182.116677 42.5,182.116677 Z M42.5,184.175016 L44.5,184.175016 C44.7761424,184.175016 45,184.398874 45,184.675016 L45,184.704185 C45,184.980328 44.7761424,185.204185 44.5,185.204185 L42.5,185.204185 C42.2238576,185.204185 42,184.980328 42,184.704185 L42,184.675016 C42,184.398874 42.2238576,184.175016 42.5,184.175016 Z M42.5,186.233355 L44.5,186.233355 C44.7761424,186.233355 45,186.457212 45,186.733355 L45,186.762524 C45,187.038666 44.7761424,187.262524 44.5,187.262524 L42.5,187.262524 C42.2238576,187.262524 42,187.038666 42,186.762524 L42,186.733355 C42,186.457212 42.2238576,186.233355 42.5,186.233355 Z" id="Icon_HC"></path>
+        </g>
+    </g>
+</svg>

apps/isa-app/src/assets/images/Icon_PP.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="18px" viewBox="0 0 22 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 52.2 (67145) - http://www.bohemiancoding.com/sketch -->
+    <title>Icon_HC</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Hugendubel_Icons" transform="translate(-29.000000, -177.000000)" fill="#000000" fill-rule="nonzero" stroke="#000000" stroke-width="0.3">
+            <path d="M32.725699,178.000628 C32.7430505,177.999791 32.7604307,177.999791 32.7777823,178.000628 L37.5260449,178.000628 C38.53109,178.000628 39.44018,178.547926 40.0000026,179.340692 C40.5598253,178.547926 41.4689153,178.000628 42.4739603,178.000628 L47.222223,178.000628 C47.529035,178.00066 47.7777477,178.256627 47.7777784,178.572389 L47.7777784,179.71591 L49.4444446,179.71591 C49.7512567,179.715942 49.9999694,179.971909 50,180.287671 L50,192.008763 C49.9999694,192.324524 49.7512567,192.580492 49.4444446,192.580523 L42.4739603,192.580523 C41.4766486,192.580523 40.8524541,192.949423 40.4947942,193.688309 C40.3998428,193.879608 40.208727,194 40.0000026,194 C39.7912783,194 39.6001624,193.879608 39.5052111,193.688309 C39.1475512,192.949423 38.5233566,192.580523 37.5260449,192.580523 L30.5555607,192.580523 C30.2487486,192.580492 30.0000359,192.324524 30.0000053,192.008763 L30.0000053,180.287671 C29.9987652,179.991708 30.2171687,179.743681 30.5034773,179.71591 C30.5208289,179.715072 30.5382091,179.715072 30.5555607,179.71591 L32.2222269,179.71591 L32.2222269,178.572389 C32.2209869,178.276426 32.4393904,178.028399 32.725699,178.000628 Z M33.3333377,179.14415 L33.3333377,189.43584 L36.6232674,189.43584 C37.6190746,189.43584 38.5547188,189.729711 39.2621556,190.356017 C39.3270606,190.413476 39.3849347,190.480265 39.4444472,190.543626 L39.4444472,180.957703 C39.4433388,180.936873 39.4433388,180.915996 39.4444472,180.895166 C39.4444472,180.068361 38.4768339,179.14415 37.5260449,179.14415 L33.3333377,179.14415 Z M42.4739603,179.14415 C41.5231714,179.14415 40.555558,180.068361 40.555558,180.895166 C40.5555806,180.898144 40.5555806,180.901122 40.555558,180.9041 L40.555558,190.543626 C40.6150705,190.480265 40.6729447,190.413476 40.7378497,190.356017 C41.4452864,189.729711 42.3809306,189.43584 43.3767379,189.43584 L46.6666675,189.43584 L46.6666675,179.14415 L42.4739603,179.14415 Z M31.1111161,180.859431 L31.1111161,191.437002 L37.5260449,191.437002 C38.0365968,191.437002 38.5189494,191.531483 38.9496557,191.713949 C38.8273679,191.527334 38.6888269,191.36055 38.5329891,191.222592 C38.0547048,190.799175 37.405738,190.579361 36.6232674,190.579361 L32.7777823,190.579361 C32.4709702,190.57933 32.2222575,190.323362 32.2222269,190.007601 L32.2222269,180.859431 L31.1111161,180.859431 Z M47.7777784,180.859431 L47.7777784,190.007601 C47.7777477,190.323362 47.529035,190.57933 47.222223,190.579361 L43.3767379,190.579361 C42.5942672,190.579361 41.9453004,190.799175 41.4670161,191.222592 C41.3107359,191.360944 41.1725734,191.526903 41.0503496,191.713949 C41.4810558,191.531483 41.9634085,191.437002 42.4739603,191.437002 L48.8888892,191.437002 L48.8888892,180.859431 L47.7777784,180.859431 Z M35.5,182.116677 L37.5,182.116677 C37.7761424,182.116677 38,182.340535 38,182.616677 L38,182.645847 C38,182.921989 37.7761424,183.145847 37.5,183.145847 L35.5,183.145847 C35.2238576,183.145847 35,182.921989 35,182.645847 L35,182.616677 C35,182.340535 35.2238576,182.116677 35.5,182.116677 Z M35.5,184.175016 L37.5,184.175016 C37.7761424,184.175016 38,184.398874 38,184.675016 L38,184.704185 C38,184.980328 37.7761424,185.204185 37.5,185.204185 L35.5,185.204185 C35.2238576,185.204185 35,184.980328 35,184.704185 L35,184.675016 C35,184.398874 35.2238576,184.175016 35.5,184.175016 Z M35.5,186.233355 L37.5,186.233355 C37.7761424,186.233355 38,186.457212 38,186.733355 L38,186.762524 C38,187.038666 37.7761424,187.262524 37.5,187.262524 L35.5,187.262524 C35.2238576,187.262524 35,187.038666 35,186.762524 L35,186.733355 C35,186.457212 35.2238576,186.233355 35.5,186.233355 Z M42.5,182.116677 L44.5,182.116677 C44.7761424,182.116677 45,182.340535 45,182.616677 L45,182.645847 C45,182.921989 44.7761424,183.145847 44.5,183.145847 L42.5,183.145847 C42.2238576,183.145847 42,182.921989 42,182.645847 L42,182.616677 C42,182.340535 42.2238576,182.116677 42.5,182.116677 Z M42.5,184.175016 L44.5,184.175016 C44.7761424,184.175016 45,184.398874 45,184.675016 L45,184.704185 C45,184.980328 44.7761424,185.204185 44.5,185.204185 L42.5,185.204185 C42.2238576,185.204185 42,184.980328 42,184.704185 L42,184.675016 C42,184.398874 42.2238576,184.175016 42.5,184.175016 Z M42.5,186.233355 L44.5,186.233355 C44.7761424,186.233355 45,186.457212 45,186.733355 L45,186.762524 C45,187.038666 44.7761424,187.262524 44.5,187.262524 L42.5,187.262524 C42.2238576,187.262524 42,187.038666 42,186.762524 L42,186.733355 C42,186.457212 42.2238576,186.233355 42.5,186.233355 Z" id="Icon_HC"></path>
+        </g>
+    </g>
+</svg>

apps/isa-app/src/config/config.feature.json

@@ -1,5 +1,8 @@
 {
     "title": "ISA - Feature",
+    "silentRefresh": {
+        "interval": 300000
+    },
     "@cdn/product-image": {
         "url": "https://produktbilder.paragon-data.net"
     },
@@ -8,7 +11,7 @@
         "clientId": "hug-isa",
         "responseType": "id_token token",
         "oidc": true,
-        "scope": "openid profile cmf_user isa-isa-webapi isa-checkout-webapi isa-cat-webapi isa-ava-webapi isa-crm-webapi isa-review-webapi isa-kpi-webapi isa-oms-webapi isa-nbo-webapi isa-print-webapi eis-service isa-inv-webapi"
+        "scope": "openid profile cmf_user isa-isa-webapi isa-checkout-webapi isa-cat-webapi isa-ava-webapi isa-crm-webapi isa-review-webapi isa-kpi-webapi isa-oms-webapi isa-nbo-webapi isa-print-webapi eis-service isa-inv-webapi isa-wws-webapi"
     },
     "@core/logger": {
         "logLevel": "debug"
@@ -38,7 +41,7 @@
         "rootUrl": "https://filialinformationsystem-test.paragon-systems.de/eiswebapi/v1"
     },
     "@swagger/remi": {
-        "rootUrl": "https://isa-test.paragon-data.net/inv/v1"
+        "rootUrl": "https://isa-test.paragon-data.net/inv/v6"
     },
     "@swagger/wws": {
         "rootUrl": "https://isa-test.paragon-data.net/wws/v1"
@@ -60,11 +63,12 @@
             "goodsIn": 2000,
             "taskCalendar": 3000,
             "remission": 4000,
-            "packageInspection": 5000
+            "packageInspection": 5000,
+            "assortment": 6000
         }
     },
     "checkForUpdates": 3600000,
     "licence": {
-        "scandit": "AQZyKCc+BEkNL00Y3h3FjawGLF+INUj7cVb0My91hl8ffiW873T8FTV1k4TIZJx5RwcJlYxhgsxHVcnM4AJgSwJhbAfxJmP/3XGijLlLp3XUIRjQwFtf7UlZAFZ7Vrt1/WSf7kxxrFQ2SE2AQwLqPg9DL+hHEfd4xT/15n8p2q7qUlCKLsV6jF12Pd7koFNSWNL3ZIkRtd1ma99/321dnwAJHFGXqWg5nprJ7sYtqUqNQ8Er9SlvKbhnw3AipHzKpz0O3oNfUsr6NlZivRBhMhCZLo5WpXo1m9uIU8zLEWMNDJ+wGUctcGxE3eCptP2zLXUgxxjB+0EXOUtT/GWUc/Ip61CMiyUf7Paz026E2eYil2yWgfkTP5CUgDMNGZFuAA1T5PhB9FRW51CjAIvwOKVMCvfixJiVoUsXHnWH2ZnXqtbDR/uEZBE7OKoBlaPL4G3Lvgdqym5EjROAztUXb6wOmVDiGzzqgizyZnIcxFBSKJAownGj9Vh4/Y/Ag1xzGzNtjz3ngSRfMfIIq/q2Q51uiLiv7mBVliPvPWMUTfTjnqnK/OSBlR2ID+COJqnUKpQMedPyOT3IMznmM6gQCmyYO5KE0MkfhFh6+pdNi6oJM2iZsxK1Z1V+GRSOIwrJEoajjDJkh439XjXk8NExFvplrLjK/oL/dsHIZiG6U5GVWW92kGkuXkJCeUz1CET3paxbGqwrd53r5d6gFABbC12CtcP2JeH4YYCpHYyPQacf0prj9Hdq3wDztShC9tH+4UQS/GbaDHKcS1ANIyPuTxHmBFtPuCJ9Uagy5QBEc8eAz2nfsbfaUxYzco6u/zhNsFbqp6zgQIxs5OcqDQ=="
+        "scandit": "AZ7zLw2eLmFWHbYP4RDq8VAEgAxmNGYcPU8YpOc3DryEXj4zMzYQFrQuUm0YewGQYEESXjpRwGX1NYmKY3pXHnAn2DeqIzh2an+FUu9socQlbQnJiHJHoWBAqcqWSua+P12tc95P3s9aaEEYvSjUy7Md88f7N+sk6zZbUmqbMXeXqmZwdkmRoUY/2w0CiiiA4gBFHgu4sMeNQ9dWyfxKTUPf5AnsxnuYpCt5KLxJWSYDv8HHj0mx8DCJTe1m2ony97Lge3JbJ5Dd+Zz6SCwqik7fv53Qole9s/3m66lYFWKAzWRKkHN1zts78CmPxPb+AAHVoqlBM3duvYmnCxxGOmlXabKUNuDR2ExaMu/nlo532jqqy25Cet/FP1UAs96ZGRgzEcHxGPp6kA53lJ15zd+cxz6G93E83AmYJkhddXBQElWEaGtQRfrEzRGmvcksR+V8MMYjGmhkVbQxGGqpnfP4IxbuEFcef6bxxTiulzo75gXoqZTt+7C1qpDcrMM3Yp0Z8RBw3JlV2tLk4FYFZpxY8QrXIcjvRYKExtQ9e5sSbST4Vx95YhEUd6iX0SBPDzcmgR4/Ef6gvJfoWgz68+rqhBGckphdHi2Mf/pYuAlh2jbwtrkErE2xWARBejR/UcU/A3F7k9RkFd5/QZC7qhsE6bZH7uhpkptIbi5XkXagwYy1oJD7yJs4VLOJteYWferRm8h1auxXew5tL8VLHciF+lLj6h8PTUDt2blLgUjHtualqlCwdSTzJyYwk4oswGGDk6E48X7LXpzuhtR8TYTOi2REN0uuTbO/slFBRw+CaYUnD0LjB9p2lb8ndcdV9adzBKmwPxiOtlOELQ=="
     }
 }

apps/isa-app/src/config/config.integration.json

@@ -1,14 +1,16 @@
 {
   "title": "ISA - Integration",
+  "silentRefresh": {
+    "interval": 300000
+  },
   "@cdn/product-image": {
     "url": "https://produktbilder.paragon-data.net"
   },
   "@core/auth": {
     "issuer": "https://sso-test.paragon-data.de",
-    "clientId": "hug-isa",
-    "responseType": "id_token token",
-    "oidc": true,
-    "scope": "openid profile cmf_user isa-isa-webapi isa-checkout-webapi isa-cat-webapi isa-ava-webapi isa-crm-webapi isa-review-webapi isa-kpi-webapi isa-oms-webapi isa-nbo-webapi isa-print-webapi eis-service isa-inv-webapi"
+    "clientId": "isa-client",
+    "responseType": "code",
+    "scope": "openid profile cmf_user isa-isa-webapi isa-checkout-webapi isa-cat-webapi isa-ava-webapi isa-crm-webapi isa-review-webapi isa-kpi-webapi isa-oms-webapi isa-nbo-webapi isa-print-webapi eis-service isa-inv-webapi isa-wws-webapi"
   },
   "@core/logger": {
     "logLevel": "debug"
@@ -38,7 +40,7 @@
     "rootUrl": "https://filialinformationsystem-integration.paragon-systems.de/eiswebapi/v1"
   },
   "@swagger/remi": {
-    "rootUrl": "https://isa-integration.paragon-data.net/inv/v1"
+    "rootUrl": "https://isa-integration.paragon-data.net/inv/v6"
   },
   "@swagger/wws": {
     "rootUrl": "https://isa-integration.paragon-data.net/wws/v1"
@@ -60,11 +62,12 @@
       "goodsIn": 2000,
       "taskCalendar": 3000,
       "remission": 4000,
-      "packageInspection": 5000
+      "packageInspection": 5000,
+      "assortment": 6000
     }
   },
   "checkForUpdates": 3600000,
   "licence": {
-    "scandit": "AQZyKCc+BEkNL00Y3h3FjawGLF+INUj7cVb0My91hl8ffiW873T8FTV1k4TIZJx5RwcJlYxhgsxHVcnM4AJgSwJhbAfxJmP/3XGijLlLp3XUIRjQwFtf7UlZAFZ7Vrt1/WSf7kxxrFQ2SE2AQwLqPg9DL+hHEfd4xT/15n8p2q7qUlCKLsV6jF12Pd7koFNSWNL3ZIkRtd1ma99/321dnwAJHFGXqWg5nprJ7sYtqUqNQ8Er9SlvKbhnw3AipHzKpz0O3oNfUsr6NlZivRBhMhCZLo5WpXo1m9uIU8zLEWMNDJ+wGUctcGxE3eCptP2zLXUgxxjB+0EXOUtT/GWUc/Ip61CMiyUf7Paz026E2eYil2yWgfkTP5CUgDMNGZFuAA1T5PhB9FRW51CjAIvwOKVMCvfixJiVoUsXHnWH2ZnXqtbDR/uEZBE7OKoBlaPL4G3Lvgdqym5EjROAztUXb6wOmVDiGzzqgizyZnIcxFBSKJAownGj9Vh4/Y/Ag1xzGzNtjz3ngSRfMfIIq/q2Q51uiLiv7mBVliPvPWMUTfTjnqnK/OSBlR2ID+COJqnUKpQMedPyOT3IMznmM6gQCmyYO5KE0MkfhFh6+pdNi6oJM2iZsxK1Z1V+GRSOIwrJEoajjDJkh439XjXk8NExFvplrLjK/oL/dsHIZiG6U5GVWW92kGkuXkJCeUz1CET3paxbGqwrd53r5d6gFABbC12CtcP2JeH4YYCpHYyPQacf0prj9Hdq3wDztShC9tH+4UQS/GbaDHKcS1ANIyPuTxHmBFtPuCJ9Uagy5QBEc8eAz2nfsbfaUxYzco6u/zhNsFbqp6zgQIxs5OcqDQ=="
+    "scandit": "AZ7zLw2eLmFWHbYP4RDq8VAEgAxmNGYcPU8YpOc3DryEXj4zMzYQFrQuUm0YewGQYEESXjpRwGX1NYmKY3pXHnAn2DeqIzh2an+FUu9socQlbQnJiHJHoWBAqcqWSua+P12tc95P3s9aaEEYvSjUy7Md88f7N+sk6zZbUmqbMXeXqmZwdkmRoUY/2w0CiiiA4gBFHgu4sMeNQ9dWyfxKTUPf5AnsxnuYpCt5KLxJWSYDv8HHj0mx8DCJTe1m2ony97Lge3JbJ5Dd+Zz6SCwqik7fv53Qole9s/3m66lYFWKAzWRKkHN1zts78CmPxPb+AAHVoqlBM3duvYmnCxxGOmlXabKUNuDR2ExaMu/nlo532jqqy25Cet/FP1UAs96ZGRgzEcHxGPp6kA53lJ15zd+cxz6G93E83AmYJkhddXBQElWEaGtQRfrEzRGmvcksR+V8MMYjGmhkVbQxGGqpnfP4IxbuEFcef6bxxTiulzo75gXoqZTt+7C1qpDcrMM3Yp0Z8RBw3JlV2tLk4FYFZpxY8QrXIcjvRYKExtQ9e5sSbST4Vx95YhEUd6iX0SBPDzcmgR4/Ef6gvJfoWgz68+rqhBGckphdHi2Mf/pYuAlh2jbwtrkErE2xWARBejR/UcU/A3F7k9RkFd5/QZC7qhsE6bZH7uhpkptIbi5XkXagwYy1oJD7yJs4VLOJteYWferRm8h1auxXew5tL8VLHciF+lLj6h8PTUDt2blLgUjHtualqlCwdSTzJyYwk4oswGGDk6E48X7LXpzuhtR8TYTOi2REN0uuTbO/slFBRw+CaYUnD0LjB9p2lb8ndcdV9adzBKmwPxiOtlOELQ=="
   }
 }

apps/isa-app/src/config/config.json

@@ -1,14 +1,18 @@
 {
     "title": "ISA - Local",
+    "silentRefresh": {
+        "interval": 300000
+    },
+    "debug": true,
     "@cdn/product-image": {
         "url": "https://produktbilder.paragon-data.net"
     },
     "@core/auth": {
         "issuer": "https://sso-test.paragon-data.de",
-        "clientId": "hug-isa",
-        "responseType": "id_token token",
-        "oidc": true,
-        "scope": "openid profile cmf_user isa-isa-webapi isa-checkout-webapi isa-cat-webapi isa-ava-webapi isa-crm-webapi isa-review-webapi isa-kpi-webapi isa-oms-webapi isa-nbo-webapi isa-print-webapi eis-service isa-inv-webapi isa-wws-webapi"
+        "clientId": "isa-client",
+        "responseType": "code",
+        "scope": "openid profile cmf_user isa-isa-webapi isa-checkout-webapi isa-cat-webapi isa-ava-webapi isa-crm-webapi isa-review-webapi isa-kpi-webapi isa-oms-webapi isa-nbo-webapi isa-print-webapi eis-service isa-inv-webapi isa-wws-webapi",
+        "showDebugInformation": true
     },
     "@core/logger": {
         "logLevel": "debug"
@@ -38,7 +42,7 @@
         "rootUrl": "https://filialinformationsystem-test.paragon-systems.de/eiswebapi/v1"
     },
     "@swagger/remi": {
-        "rootUrl": "https://isa-test.paragon-data.net/inv/v1"
+        "rootUrl": "https://isa-test.paragon-data.net/inv/v6"
     },
     "@swagger/wws": {
         "rootUrl": "https://isa-test.paragon-data.net/wws/v1"
@@ -60,11 +64,12 @@
             "goodsIn": 2000,
             "taskCalendar": 3000,
             "remission": 4000,
-            "packageInspection": 5000
+            "packageInspection": 5000,
+            "assortment": 6000
         }
     },
     "checkForUpdates": 3600000,
     "licence": {
-        "scandit": "AQZyKCc+BEkNL00Y3h3FjawGLF+INUj7cVb0My91hl8ffiW873T8FTV1k4TIZJx5RwcJlYxhgsxHVcnM4AJgSwJhbAfxJmP/3XGijLlLp3XUIRjQwFtf7UlZAFZ7Vrt1/WSf7kxxrFQ2SE2AQwLqPg9DL+hHEfd4xT/15n8p2q7qUlCKLsV6jF12Pd7koFNSWNL3ZIkRtd1ma99/321dnwAJHFGXqWg5nprJ7sYtqUqNQ8Er9SlvKbhnw3AipHzKpz0O3oNfUsr6NlZivRBhMhCZLo5WpXo1m9uIU8zLEWMNDJ+wGUctcGxE3eCptP2zLXUgxxjB+0EXOUtT/GWUc/Ip61CMiyUf7Paz026E2eYil2yWgfkTP5CUgDMNGZFuAA1T5PhB9FRW51CjAIvwOKVMCvfixJiVoUsXHnWH2ZnXqtbDR/uEZBE7OKoBlaPL4G3Lvgdqym5EjROAztUXb6wOmVDiGzzqgizyZnIcxFBSKJAownGj9Vh4/Y/Ag1xzGzNtjz3ngSRfMfIIq/q2Q51uiLiv7mBVliPvPWMUTfTjnqnK/OSBlR2ID+COJqnUKpQMedPyOT3IMznmM6gQCmyYO5KE0MkfhFh6+pdNi6oJM2iZsxK1Z1V+GRSOIwrJEoajjDJkh439XjXk8NExFvplrLjK/oL/dsHIZiG6U5GVWW92kGkuXkJCeUz1CET3paxbGqwrd53r5d6gFABbC12CtcP2JeH4YYCpHYyPQacf0prj9Hdq3wDztShC9tH+4UQS/GbaDHKcS1ANIyPuTxHmBFtPuCJ9Uagy5QBEc8eAz2nfsbfaUxYzco6u/zhNsFbqp6zgQIxs5OcqDQ=="
+        "scandit": "AZ7zLw2eLmFWHbYP4RDq8VAEgAxmNGYcPU8YpOc3DryEXj4zMzYQFrQuUm0YewGQYEESXjpRwGX1NYmKY3pXHnAn2DeqIzh2an+FUu9socQlbQnJiHJHoWBAqcqWSua+P12tc95P3s9aaEEYvSjUy7Md88f7N+sk6zZbUmqbMXeXqmZwdkmRoUY/2w0CiiiA4gBFHgu4sMeNQ9dWyfxKTUPf5AnsxnuYpCt5KLxJWSYDv8HHj0mx8DCJTe1m2ony97Lge3JbJ5Dd+Zz6SCwqik7fv53Qole9s/3m66lYFWKAzWRKkHN1zts78CmPxPb+AAHVoqlBM3duvYmnCxxGOmlXabKUNuDR2ExaMu/nlo532jqqy25Cet/FP1UAs96ZGRgzEcHxGPp6kA53lJ15zd+cxz6G93E83AmYJkhddXBQElWEaGtQRfrEzRGmvcksR+V8MMYjGmhkVbQxGGqpnfP4IxbuEFcef6bxxTiulzo75gXoqZTt+7C1qpDcrMM3Yp0Z8RBw3JlV2tLk4FYFZpxY8QrXIcjvRYKExtQ9e5sSbST4Vx95YhEUd6iX0SBPDzcmgR4/Ef6gvJfoWgz68+rqhBGckphdHi2Mf/pYuAlh2jbwtrkErE2xWARBejR/UcU/A3F7k9RkFd5/QZC7qhsE6bZH7uhpkptIbi5XkXagwYy1oJD7yJs4VLOJteYWferRm8h1auxXew5tL8VLHciF+lLj6h8PTUDt2blLgUjHtualqlCwdSTzJyYwk4oswGGDk6E48X7LXpzuhtR8TYTOi2REN0uuTbO/slFBRw+CaYUnD0LjB9p2lb8ndcdV9adzBKmwPxiOtlOELQ=="
     }
 }

apps/isa-app/src/config/config.production.json

@@ -1,5 +1,8 @@
 {
   "title": "ISA - Production",
+  "silentRefresh": {
+    "interval": 300000
+  },
   "@cdn/product-image": {
     "url": "https://produktbilder.paragon-data.net"
   },
@@ -8,7 +11,7 @@
     "clientId": "hug-isa",
     "responseType": "id_token token",
     "oidc": true,
-    "scope": "openid profile cmf_user isa-isa-webapi isa-checkout-webapi isa-cat-webapi isa-ava-webapi isa-crm-webapi isa-review-webapi isa-kpi-webapi isa-oms-webapi isa-nbo-webapi isa-print-webapi eis-service isa-inv-webapi"
+    "scope": "openid profile cmf_user isa-isa-webapi isa-checkout-webapi isa-cat-webapi isa-ava-webapi isa-crm-webapi isa-review-webapi isa-kpi-webapi isa-oms-webapi isa-nbo-webapi isa-print-webapi eis-service isa-inv-webapi isa-wws-webapi"
   },
   "@core/logger": {
     "logLevel": "debug"
@@ -38,10 +41,10 @@
     "rootUrl": "https://filialinformationsystem.paragon-systems.de/eiswebapi/v1"
   },
   "@swagger/remi": {
-    "rootUrl": "https://isa.paragon-systems.de/inv/v1"
+    "rootUrl": "https://isa.paragon-systems.de/inv/v6"
   },
   "@swagger/wws": {
-    "rootUrl": "https://isa.paragon-data.net/wws/v1"
+    "rootUrl": "https://isa.paragon-systems.de/wws/v1"
   },
   "hubs": {
     "notifications": {
@@ -60,11 +63,12 @@
       "goodsIn": 2000,
       "taskCalendar": 3000,
       "remission": 4000,
-      "packageInspection": 5000
+      "packageInspection": 5000,
+      "assortment": 6000
     }
   },
   "checkForUpdates": 3600000,
   "licence": {
-    "scandit": ""
+    "scandit": "AZZzfQ+eLFl3Dzf1QSBag1lDibIoOPh4W33erRIRe3SDUMkHDX8eczEjd2TnfRMWoE5lXOBGtESCWICN9EbrmI1S9Lu5APsvvEOD+K54ADwIVawx0HNZRAc8/+9Vf/izcEGOFQFGBQJyR6vzdzFv5HcjznhxI9E3LiF+uVQPtCqsVYzpkMWIrC5VCg2uwNrj9Bw6f8zYi/lZPrDMS5yVKVcajeK7sh9QAq17dR0opjIIuP5t5nDEJ7hnITwtTR5HaM6cX/KhKpTILOgKexvLYqrK6QJWpU85sDwqwn6T7av4V68qL3XrUo60dScop4QsvraQe1HkRsffl6DkAEoX0RNMS5qVWjGerW7lvA/DQd9hsAO3jWFDR9hVDyt2VvmzzFKnHYqTYxC5qG4bCEJ0RJjy6tEP5Q7vL5SxWygVadmjPv+TwDOCS7DxzxIjcO+BXQY7gW6qn0hx9fXzyvO3avrGWqyImMlgEApZq+36ANqtRcPD/stEe4i0N9dSPhYoHPcc/9/9jpts43FozlgfY4wY8Wt5ybB3X0caISMmB/klFIJKKN7num439z3+Xk7ENB/Xvb0XAtnOt/cuxQYsGQ7fb62GOO/7Va5fdE9ZfaIJsS5ToE6oIbV04pLUssJf9cUMsyPFVELYSJmyGPQQFRz0TTxxRvPapIWrfa2x5x3hYUpNTAdY3v0fN9l/1ZqNSBmIBLH/LoXaVJQ2DydGD1/QFZ2Z/S7zTYKg5/cSEpUgiYtbwutNZSjRH29ucSizC524k+Zst95T8G7LJaWCT8SQAcKXqCnjpiEGWzD++h0jXjn6BWjUnIHi0te+27vF/z6UQL00sWco5hUIqF66EiU="
   }
 }

apps/isa-app/src/config/config.staging.json

@@ -1,5 +1,8 @@
 {
   "title": "ISA - Staging",
+  "silentRefresh": {
+    "interval": 300000
+  },
   "@cdn/product-image": {
     "url": "https://produktbilder.paragon-data.net"
   },
@@ -8,7 +11,7 @@
     "clientId": "hug-isa",
     "responseType": "id_token token",
     "oidc": true,
-    "scope": "openid profile cmf_user isa-isa-webapi isa-checkout-webapi isa-cat-webapi isa-ava-webapi isa-crm-webapi isa-review-webapi isa-kpi-webapi isa-oms-webapi isa-nbo-webapi isa-print-webapi eis-service isa-inv-webapi"
+    "scope": "openid profile cmf_user isa-isa-webapi isa-checkout-webapi isa-cat-webapi isa-ava-webapi isa-crm-webapi isa-review-webapi isa-kpi-webapi isa-oms-webapi isa-nbo-webapi isa-print-webapi eis-service isa-inv-webapi isa-wws-webapi"
   },
   "@core/logger": {
     "logLevel": "debug"
@@ -38,10 +41,10 @@
     "rootUrl": "https://filialinformationsystem-staging.paragon-systems.de/eiswebapi/v1"
   },
   "@swagger/remi": {
-    "rootUrl": "https://isa-staging.paragon-systems.de/inv/v1"
+    "rootUrl": "https://isa-staging.paragon-systems.de/inv/v6"
   },
   "@swagger/wws": {
-    "rootUrl": "https://isa-staging.paragon-data.net/wws/v1"
+    "rootUrl": "https://isa-staging.paragon-systems.de/wws/v1"
   },
   "hubs": {
     "notifications": {
@@ -60,11 +63,12 @@
       "goodsIn": 2000,
       "taskCalendar": 3000,
       "remission": 4000,
-      "packageInspection": 5000
+      "packageInspection": 5000,
+      "assortment": 6000
     }
   },
   "checkForUpdates": 3600000,
   "licence": {
-    "scandit": ""
+    "scandit": "AZZzfQ+eLFl3Dzf1QSBag1lDibIoOPh4W33erRIRe3SDUMkHDX8eczEjd2TnfRMWoE5lXOBGtESCWICN9EbrmI1S9Lu5APsvvEOD+K54ADwIVawx0HNZRAc8/+9Vf/izcEGOFQFGBQJyR6vzdzFv5HcjznhxI9E3LiF+uVQPtCqsVYzpkMWIrC5VCg2uwNrj9Bw6f8zYi/lZPrDMS5yVKVcajeK7sh9QAq17dR0opjIIuP5t5nDEJ7hnITwtTR5HaM6cX/KhKpTILOgKexvLYqrK6QJWpU85sDwqwn6T7av4V68qL3XrUo60dScop4QsvraQe1HkRsffl6DkAEoX0RNMS5qVWjGerW7lvA/DQd9hsAO3jWFDR9hVDyt2VvmzzFKnHYqTYxC5qG4bCEJ0RJjy6tEP5Q7vL5SxWygVadmjPv+TwDOCS7DxzxIjcO+BXQY7gW6qn0hx9fXzyvO3avrGWqyImMlgEApZq+36ANqtRcPD/stEe4i0N9dSPhYoHPcc/9/9jpts43FozlgfY4wY8Wt5ybB3X0caISMmB/klFIJKKN7num439z3+Xk7ENB/Xvb0XAtnOt/cuxQYsGQ7fb62GOO/7Va5fdE9ZfaIJsS5ToE6oIbV04pLUssJf9cUMsyPFVELYSJmyGPQQFRz0TTxxRvPapIWrfa2x5x3hYUpNTAdY3v0fN9l/1ZqNSBmIBLH/LoXaVJQ2DydGD1/QFZ2Z/S7zTYKg5/cSEpUgiYtbwutNZSjRH29ucSizC524k+Zst95T8G7LJaWCT8SQAcKXqCnjpiEGWzD++h0jXjn6BWjUnIHi0te+27vF/z6UQL00sWco5hUIqF66EiU="
   }
 }

apps/isa-app/src/config/config.test.json

@@ -1,14 +1,18 @@
 {
     "title": "ISA - Test",
+    "silentRefresh": {
+        "interval": 300000
+    },
+    "debug": true,
     "@cdn/product-image": {
         "url": "https://produktbilder.paragon-data.net"
     },
     "@core/auth": {
         "issuer": "https://sso-test.paragon-data.de",
-        "clientId": "hug-isa",
-        "responseType": "id_token token",
-        "oidc": true,
-        "scope": "openid profile cmf_user isa-isa-webapi isa-checkout-webapi isa-cat-webapi isa-ava-webapi isa-crm-webapi isa-review-webapi isa-kpi-webapi isa-oms-webapi isa-nbo-webapi isa-print-webapi eis-service isa-inv-webapi"
+        "clientId": "isa-client",
+        "responseType": "code",
+        "scope": "openid profile cmf_user isa-isa-webapi isa-checkout-webapi isa-cat-webapi isa-ava-webapi isa-crm-webapi isa-review-webapi isa-kpi-webapi isa-oms-webapi isa-nbo-webapi isa-print-webapi eis-service isa-inv-webapi isa-wws-webapi",
+        "showDebugInformation": true
     },
     "@core/logger": {
         "logLevel": "debug"
@@ -38,7 +42,7 @@
         "rootUrl": "https://filialinformationsystem-test.paragon-systems.de/eiswebapi/v1"
     },
     "@swagger/remi": {
-        "rootUrl": "https://isa-test.paragon-data.net/inv/v1"
+        "rootUrl": "https://isa-test.paragon-data.net/inv/v6"
     },
     "@swagger/wws": {
         "rootUrl": "https://isa-test.paragon-data.net/wws/v1"
@@ -60,11 +64,12 @@
             "goodsIn": 2000,
             "taskCalendar": 3000,
             "remission": 4000,
-            "packageInspection": 5000
+            "packageInspection": 5000,
+            "assortment": 6000
         }
     },
     "checkForUpdates": 3600000,
     "licence": {
-        "scandit": "AQZyKCc+BEkNL00Y3h3FjawGLF+INUj7cVb0My91hl8ffiW873T8FTV1k4TIZJx5RwcJlYxhgsxHVcnM4AJgSwJhbAfxJmP/3XGijLlLp3XUIRjQwFtf7UlZAFZ7Vrt1/WSf7kxxrFQ2SE2AQwLqPg9DL+hHEfd4xT/15n8p2q7qUlCKLsV6jF12Pd7koFNSWNL3ZIkRtd1ma99/321dnwAJHFGXqWg5nprJ7sYtqUqNQ8Er9SlvKbhnw3AipHzKpz0O3oNfUsr6NlZivRBhMhCZLo5WpXo1m9uIU8zLEWMNDJ+wGUctcGxE3eCptP2zLXUgxxjB+0EXOUtT/GWUc/Ip61CMiyUf7Paz026E2eYil2yWgfkTP5CUgDMNGZFuAA1T5PhB9FRW51CjAIvwOKVMCvfixJiVoUsXHnWH2ZnXqtbDR/uEZBE7OKoBlaPL4G3Lvgdqym5EjROAztUXb6wOmVDiGzzqgizyZnIcxFBSKJAownGj9Vh4/Y/Ag1xzGzNtjz3ngSRfMfIIq/q2Q51uiLiv7mBVliPvPWMUTfTjnqnK/OSBlR2ID+COJqnUKpQMedPyOT3IMznmM6gQCmyYO5KE0MkfhFh6+pdNi6oJM2iZsxK1Z1V+GRSOIwrJEoajjDJkh439XjXk8NExFvplrLjK/oL/dsHIZiG6U5GVWW92kGkuXkJCeUz1CET3paxbGqwrd53r5d6gFABbC12CtcP2JeH4YYCpHYyPQacf0prj9Hdq3wDztShC9tH+4UQS/GbaDHKcS1ANIyPuTxHmBFtPuCJ9Uagy5QBEc8eAz2nfsbfaUxYzco6u/zhNsFbqp6zgQIxs5OcqDQ=="
+        "scandit": "AZ7zLw2eLmFWHbYP4RDq8VAEgAxmNGYcPU8YpOc3DryEXj4zMzYQFrQuUm0YewGQYEESXjpRwGX1NYmKY3pXHnAn2DeqIzh2an+FUu9socQlbQnJiHJHoWBAqcqWSua+P12tc95P3s9aaEEYvSjUy7Md88f7N+sk6zZbUmqbMXeXqmZwdkmRoUY/2w0CiiiA4gBFHgu4sMeNQ9dWyfxKTUPf5AnsxnuYpCt5KLxJWSYDv8HHj0mx8DCJTe1m2ony97Lge3JbJ5Dd+Zz6SCwqik7fv53Qole9s/3m66lYFWKAzWRKkHN1zts78CmPxPb+AAHVoqlBM3duvYmnCxxGOmlXabKUNuDR2ExaMu/nlo532jqqy25Cet/FP1UAs96ZGRgzEcHxGPp6kA53lJ15zd+cxz6G93E83AmYJkhddXBQElWEaGtQRfrEzRGmvcksR+V8MMYjGmhkVbQxGGqpnfP4IxbuEFcef6bxxTiulzo75gXoqZTt+7C1qpDcrMM3Yp0Z8RBw3JlV2tLk4FYFZpxY8QrXIcjvRYKExtQ9e5sSbST4Vx95YhEUd6iX0SBPDzcmgR4/Ef6gvJfoWgz68+rqhBGckphdHi2Mf/pYuAlh2jbwtrkErE2xWARBejR/UcU/A3F7k9RkFd5/QZC7qhsE6bZH7uhpkptIbi5XkXagwYy1oJD7yJs4VLOJteYWferRm8h1auxXew5tL8VLHciF+lLj6h8PTUDt2blLgUjHtualqlCwdSTzJyYwk4oswGGDk6E48X7LXpzuhtR8TYTOi2REN0uuTbO/slFBRw+CaYUnD0LjB9p2lb8ndcdV9adzBKmwPxiOtlOELQ=="
     }
 }

apps/isa-app/src/main.ts

@@ -5,12 +5,36 @@ import * as moment from 'moment';
 moment.locale('de');
 
 import { AppModule } from './app/app.module';
+import { DebugService } from './app/debug/debug.service';
 import { environment } from './environments/environment';
 
 if (environment.production) {
   enableProdMode();
 }
 
-platformBrowserDynamic()
+const debugService = new DebugService();
+
+const consoleLog = console.log;
+
+console.log = (...args) => {
+  debugService.add({ type: 'log', args });
+  consoleLog(...args);
+};
+
+const consoleWarn = console.warn;
+
+console.warn = (...args) => {
+  debugService.add({ type: 'warn', args });
+  consoleWarn(...args);
+};
+
+const consoleError = console.error;
+
+console.error = (...args) => {
+  debugService.add({ type: 'error', args });
+  consoleError(...args);
+};
+
+platformBrowserDynamic([{ provide: DebugService, useValue: debugService }])
   .bootstrapModule(AppModule)
   .catch((err) => console.error(err));

apps/isa-app/src/polyfills.ts

@@ -16,7 +16,14 @@
 
 /***************************************************************************************************
  * BROWSER POLYFILLS
- */ // Run `npm install --save web-animations-js`.
+ */
+
+/**
+ * Web Animations `@angular/platform-browser/animations`
+ * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
+ * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
+ */
+import 'web-animations-js'; // Run `npm install --save web-animations-js`.
 
 /**
  * By default, zone.js will patch all possible macroTask and DomEvents

apps/isa-app/src/silent-refresh.html

@@ -1,7 +1,29 @@
 <html>
   <body>
     <script>
-      parent.postMessage(location.hash, location.origin);
+      var checks = [/[\?|&|#]code=/, /[\?|&|#]error=/, /[\?|&|#]token=/, /[\?|&|#]id_token=/];
+
+      function isResponse(str) {
+        if (!str) return false;
+        for (var i = 0; i < checks.length; i++) {
+          if (str.match(checks[i])) return true;
+        }
+        return false;
+      }
+
+      var message = isResponse(location.hash) ? location.hash : '#' + location.search;
+
+      if (window.parent && window.parent !== window) {
+        // if loaded as an iframe during silent refresh
+        window.parent.postMessage(message, location.origin);
+      } else if (window.opener && window.opener !== window) {
+        // if loaded as a popup during initial login
+        window.opener.postMessage(message, location.origin);
+      } else {
+        // last resort for a popup which has been through redirects and can't use window.opener
+        localStorage.setItem('auth_hash', message);
+        localStorage.removeItem('auth_hash');
+      }
     </script>
   </body>
 </html>

apps/isa-app/src/styles.scss

@@ -32,7 +32,7 @@ body {
   }
 
   .desktop .scroll-bar::-webkit-scrollbar-track {
-    @apply my-4;
+    // @apply my-4;
     -webkit-box-shadow: inset 0 0 4px rgba(0, 0, 0, 0.1);
     border-radius: 10px;
     background-color: white;

apps/modal/availabilities/src/lib/availabilities.component.ts

@@ -7,6 +7,7 @@ import { combineLatest } from 'rxjs';
 import { filter, map, shareReplay, switchMap, tap } from 'rxjs/operators';
 import { geoDistance } from '@utils/common';
 import { BehaviorSubject } from 'rxjs';
+import { ApplicationService } from '@core/application';
 
 @Component({
   selector: 'modal-availabilities',
@@ -20,7 +21,11 @@ export class ModalAvailabilitiesComponent {
   stockFetching$ = new BehaviorSubject(true);
   item = this.modalRef.data.item;
   itemId = this.modalRef.data.itemId || this.modalRef.data.item.id;
-  userbranch$ = this.domainAvailabilityService.getDefaultBranch();
+  userbranch$ = combineLatest([
+    this.applicationService.getSelectedBranch$(this.applicationService.activatedProcessId),
+    this.domainAvailabilityService.getDefaultBranch(),
+  ]).pipe(map(([selectedBranch, defaultBranch]) => selectedBranch || defaultBranch));
+
   branches$ = this.domainAvailabilityService.getBranches();
 
   filteredBranches$ = combineLatest([this.branches$, this.userbranch$, this.search$]).pipe(
@@ -66,7 +71,8 @@ export class ModalAvailabilitiesComponent {
 
   constructor(
     private modalRef: UiModalRef<BranchDTO, { item: ItemDTO; itemId: number }>,
-    private domainAvailabilityService: DomainAvailabilityService
+    private domainAvailabilityService: DomainAvailabilityService,
+    private applicationService: ApplicationService
   ) {}
 
   filter(query: string) {

apps/modal/notifications/src/lib/notifications-list-item/notifications-list-item.component.html

@@ -1,8 +1,11 @@
-<div class="notification-headline">
-  <h1>{{ item.headline }}</h1>
-  <button class="notification-edit-cta" (click)="itemSelected.emit(item)">
-    Bearbeiten
-  </button>
+<div class="grid grid-cols-[1fr_auto] items-center gap-4">
+  <div class="grid grid-flow-row gap-4">
+    <h1 class="text-left font-bold text-lg">{{ item.headline }}</h1>
+    <div class="notification-text">{{ item.text }}</div>
+  </div>
+  <div>
+    <button *ngIf="editButton" class="notification-edit-cta text-brand font-bold text-lg px-4 py-3" (click)="itemSelected.emit(item)">
+      {{ editButtonLabel }}
+    </button>
+  </div>
 </div>
-
-<div class="notification-text">{{ item.text }}</div>

apps/modal/notifications/src/lib/notifications-list-item/notifications-list-item.component.ts

@@ -13,5 +13,11 @@ export class ModalNotificationsListItemComponent {
   @Output()
   itemSelected = new EventEmitter<MessageBoardItemDTO>();
 
+  @Input()
+  editButton = true;
+
+  @Input()
+  editButtonLabel = 'Bearbeiten';
+
   constructor() {}
 }

apps/modal/notifications/src/lib/notifications-package-inspection-group/notifications-package-inspection-group.component.html

@@ -0,0 +1,11 @@
+<div class="notification-list scroll-bar">
+  <ng-container *ngFor="let notification of notifications">
+    <modal-notifications-list-item
+      (click)="itemSelected(notification)"
+      [editButtonLabel]="'Packstück-Prüfung'"
+      [item]="notification"
+      (itemSelected)="itemSelected($event)"
+    ></modal-notifications-list-item>
+    <hr />
+  </ng-container>
+</div>

apps/modal/notifications/src/lib/notifications-package-inspection-group/notifications-package-inspection-group.component.spec.ts

@@ -0,0 +1,101 @@
+import { createComponentFactory, Spectator, SpyObject } from '@ngneat/spectator';
+import { CommonModule } from '@angular/common';
+import { RouterTestingModule } from '@angular/router/testing';
+import { UiIconModule } from '@ui/icon';
+import { Router } from '@angular/router';
+import { UiFilter } from '@ui/filter';
+import { MessageBoardItemDTO } from 'apps/hub/notifications/src/lib/defs';
+import { Component } from '@angular/core';
+import { ModalNotificationsListItemComponent } from '../notifications-list-item/notifications-list-item.component';
+import { ModalNotificationsRemissionGroupComponent } from './notifications-remission-group.component';
+
+// DummyComponent Class
+@Component({
+  selector: 'dummy-component',
+  template: '<div></div>',
+})
+class DummyComponent {
+  constructor() {}
+}
+
+describe('ModalNotificationsRemissionGroupComponent', () => {
+  let spectator: Spectator<ModalNotificationsRemissionGroupComponent>;
+  let uiFilterMock: SpyObject<UiFilter>;
+  let router: Router;
+
+  const createComponent = createComponentFactory({
+    component: ModalNotificationsRemissionGroupComponent,
+    declarations: [ModalNotificationsListItemComponent],
+    imports: [
+      CommonModule,
+      RouterTestingModule.withRoutes([
+        { path: 'filiale/goods/in/results', component: DummyComponent },
+        { path: 'filiale/remission/create', component: DummyComponent },
+      ]),
+      UiIconModule,
+    ],
+    providers: [],
+    mocks: [UiFilter],
+  });
+
+  beforeEach(() => {
+    spectator = createComponent({ props: { notifications: [] } });
+    router = spectator.inject(Router);
+    uiFilterMock = spectator.inject(UiFilter);
+  });
+
+  it('should create', () => {
+    expect(spectator.component).toBeTruthy();
+  });
+
+  describe('notifications input', () => {
+    it('should display the right notification-counter value based on the length of the input array', () => {
+      spectator.setInput({ notifications: [{}, {}, {}] });
+      expect(spectator.query('.notification-counter')).toHaveText('3');
+    });
+
+    it('should not display notification-counter if input array has length 0', () => {
+      spectator.setInput({ notifications: [] });
+      expect(spectator.query('.notification-counter')).toHaveText('');
+    });
+
+    it('should render modal-notifications-list-item based on the input array', () => {
+      const notifications = [{}, {}];
+      spectator.setInput({ notifications });
+      spectator.detectComponentChanges();
+      expect(spectator.queryAll('modal-notifications-list-item')).toHaveLength(notifications.length);
+    });
+  });
+
+  describe('itemSelected()', () => {
+    it('should navigate to results with queryParams from UiFilter.getQueryParamsFromQueryTokenDTO()', () => {
+      const item: MessageBoardItemDTO = { queryToken: { input: { main_qs: 'test' } } };
+      spyOn(UiFilter, 'getQueryParamsFromQueryTokenDTO').and.returnValue(item.queryToken.input);
+      spyOn(router, 'navigate');
+      spectator.component.itemSelected(item);
+      expect(router.navigate).toHaveBeenCalledWith(['/filiale/goods/in/results'], { queryParams: item.queryToken.input });
+    });
+
+    it('should emit the navigated event after select item', () => {
+      const item: MessageBoardItemDTO = { queryToken: { input: { main_qs: 'test' } } };
+      spyOn(spectator.component.navigated, 'emit');
+      spectator.component.itemSelected(item);
+      expect(spectator.component.navigated.emit).toHaveBeenCalled();
+    });
+  });
+
+  describe('actions CTA', () => {
+    it('should navigate to remission page after clicking the CTA', () => {
+      const cta = spectator.query('.cta-primary');
+      expect(cta).toHaveText('Zur Remission');
+      expect(cta).toHaveAttribute('href', '/filiale/remission/create');
+    });
+
+    it('should emit the navigated event after clicking the CTA', () => {
+      const cta = spectator.query('.cta-primary') as HTMLAnchorElement;
+      spyOn(spectator.component.navigated, 'emit');
+      spectator.click(cta);
+      expect(spectator.component.navigated.emit).toHaveBeenCalled();
+    });
+  });
+});

apps/modal/notifications/src/lib/notifications-package-inspection-group/notifications-package-inspection-group.component.ts

@@ -0,0 +1,23 @@
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+import { Router } from '@angular/router';
+import { MessageBoardItemDTO } from 'apps/hub/notifications/src/lib/defs';
+
+@Component({
+  selector: 'modal-notifications-package-inspection-group',
+  templateUrl: 'notifications-package-inspection-group.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class ModalNotificationsPackageInspectionGroupComponent {
+  @Input()
+  notifications: MessageBoardItemDTO[];
+
+  @Output()
+  navigated = new EventEmitter<void>();
+
+  constructor(private _router: Router) {}
+
+  itemSelected(item: MessageBoardItemDTO) {
+    this._router.navigate(['/filiale/package-inspection/packages']);
+    this.navigated.emit();
+  }
+}

apps/modal/notifications/src/lib/notifications-remission-group/notifications-remission-group.component.html

@@ -1,13 +1,3 @@
-<div class="header">
-  <div class="notification-icon">
-    <span class="notification-counter">{{ notifications.length }}</span>
-    <ui-icon icon="notification" size="26px"></ui-icon>
-  </div>
-
-  <h2>Remission</h2>
-</div>
-
-<hr />
 <div class="notification-list scroll-bar">
   <ng-container *ngFor="let notification of notifications">
     <modal-notifications-list-item [item]="notification" (itemSelected)="itemSelected($event)"></modal-notifications-list-item>

apps/modal/notifications/src/lib/notifications-reservation-group/notifications-reservation-group.component.html

@@ -1,13 +1,3 @@
-<div class="header">
-  <div class="notification-icon">
-    <div class="notification-counter">{{ notifications.length }}</div>
-    <ui-icon icon="notification" size="26px"></ui-icon>
-  </div>
-
-  <h2>Reservierungsanfragen</h2>
-</div>
-
-<hr />
 <div class="notification-list scroll-bar">
   <ng-container *ngFor="let notification of notifications">
     <modal-notifications-list-item [item]="notification" (itemSelected)="itemSelected($event)"></modal-notifications-list-item>

apps/modal/notifications/src/lib/notifications-task-calendar-group/notifications-task-calendar-group.component.html

@@ -1,13 +1,3 @@
-<div class="header">
-  <div class="notification-icon">
-    <span class="notification-counter">{{ notifications.length }}</span>
-    <ui-icon icon="notification" size="26px"></ui-icon>
-  </div>
-
-  <h2>Tätigkeitskalender</h2>
-</div>
-
-<hr />
 <div class="notification-list scroll-bar">
   <ng-container *ngFor="let notification of notifications">
     <modal-notifications-list-item [item]="notification" (itemSelected)="itemSelected($event)"></modal-notifications-list-item>

apps/modal/notifications/src/lib/notifications-update-group/notifications-update-group.component.html

@@ -1,13 +1,3 @@
-<div class="header">
-  <div class="notification-icon">
-    <span class="notification-counter">{{ notifications.length }}</span>
-    <ui-icon icon="notification" size="26px"></ui-icon>
-  </div>
-
-  <h2>ISA-Update</h2>
-</div>
-
-<hr />
 <div class="notification-list scroll-bar">
   <ng-container *ngFor="let notification of notifications">
     <div class="notification-headline">

apps/modal/notifications/src/lib/notifications.component.html

@@ -1,34 +1,39 @@
 <h1>Sie haben neue Nachrichten</h1>
 
-<ng-container *ngFor="let notification of groupedNotifications$ | async">
-  <button
-    *ngIf="notification.group !== (activeCard$ | async)"
-    type="button"
-    class="notification-card"
-    (click)="activeCard = notification.group"
-  >
-    {{ notification.group }}
+<ng-container *ngFor="let notification of notifications$ | async | keyvalue">
+  <button type="button" class="notification-card" (click)="selectArea(notification.key)">
+    <div class="notification-icon">
+      <div class="notification-counter">{{ notification.value?.length }}</div>
+      <ui-icon icon="notification" size="26px"></ui-icon>
+    </div>
+    <span>{{ notification.value?.[0]?.category }}</span>
   </button>
-</ng-container>
-
-<ng-container [ngSwitch]="activeCard$ | async">
-  <modal-notifications-update-group
-    *ngSwitchCase="'ISA-Update'"
-    [notifications]="activeNotifications$ | async"
-  ></modal-notifications-update-group>
-  <modal-notifications-reservation-group
-    *ngSwitchCase="'Reservierungsanfragen'"
-    [notifications]="activeNotifications$ | async"
-    (navigated)="close()"
-  ></modal-notifications-reservation-group>
-  <modal-notifications-remission-group
-    *ngSwitchCase="'Remission'"
-    [notifications]="activeNotifications$ | async"
-    (navigated)="close()"
-  ></modal-notifications-remission-group>
-  <modal-notifications-task-calendar-group
-    *ngSwitchCase="'Tätigkeitskalender'"
-    [notifications]="activeNotifications$ | async"
-    (navigated)="close()"
-  ></modal-notifications-task-calendar-group>
+  <hr class="-mx-4" />
+  <ng-container *ngIf="notification.key === selectedArea" [ngSwitch]="notification.value?.[0]?.category">
+    <modal-notifications-update-group
+      *ngSwitchCase="'ISA-Update'"
+      [notifications]="notifications[selectedArea]"
+    ></modal-notifications-update-group>
+    <modal-notifications-reservation-group
+      *ngSwitchCase="'Reservierungsanfragen'"
+      [notifications]="notifications[selectedArea]"
+      (navigated)="close()"
+    ></modal-notifications-reservation-group>
+    <modal-notifications-remission-group
+      *ngSwitchCase="'Remission'"
+      [notifications]="notifications[selectedArea]"
+      (navigated)="close()"
+    ></modal-notifications-remission-group>
+    <modal-notifications-task-calendar-group
+      *ngSwitchCase="'Tätigkeitskalender'"
+      [notifications]="notifications[selectedArea]"
+      (navigated)="close()"
+    ></modal-notifications-task-calendar-group>
+    <modal-notifications-package-inspection-group
+      *ngSwitchCase="'Wareneingang Lagerware'"
+      [notifications]="notifications[selectedArea]"
+      (navigated)="close()"
+    >
+    </modal-notifications-package-inspection-group>
+  </ng-container>
 </ng-container>

apps/modal/notifications/src/lib/notifications.component.scss

@@ -2,46 +2,44 @@ modal-notifications {
   @apply flex flex-col relative h-full;
 
   h1 {
-    @apply text-xl font-bold text-center mb-10;
+    @apply text-xl font-bold text-center;
   }
 
+  // .notification-card {
+  //   @apply text-center text-xl text-inactive-branch block bg-white rounded-t-card font-bold no-underline py-4 border-none outline-none shadow-card -ml-4;
+  //   width: calc(100% + 2rem);
+  // }
+
   .notification-card {
-    @apply text-center text-xl text-inactive-branch block bg-white rounded-t-card font-bold no-underline py-4 border-none outline-none shadow-card -ml-4;
-    width: calc(100% + 2rem);
+    @apply grid grid-flow-col items-center justify-center gap-4;
+    @apply text-inactive-branch bg-white;
+    @apply font-bold text-xl -mx-4 py-4;
+
+    .notification-icon {
+      @apply relative;
+
+      .notification-counter {
+        @apply absolute font-normal text-base -top-2 -right-1 bg-brand text-white rounded-full w-5 h-5 flex items-center justify-center;
+        z-index: 10;
+      }
+
+      ui-icon {
+        @apply text-inactive-branch;
+      }
+    }
+
+    h2 {
+      @apply font-bold text-2xl ml-4;
+    }
   }
 
   modal-notifications-remission-group,
   modal-notifications-reservation-group,
   modal-notifications-task-calendar-group,
-  modal-notifications-update-group {
+  modal-notifications-update-group,
+  modal-notifications-package-inspection-group {
     @apply flex flex-col relative pb-2;
 
-    .header {
-      @apply flex flex-row justify-center items-center mt-5;
-
-      .notification-icon {
-        @apply relative;
-
-        .notification-counter {
-          @apply absolute -top-2 -right-1 bg-brand text-white rounded-full w-5 h-5 flex items-center justify-center;
-          z-index: 10;
-        }
-
-        ui-icon {
-          @apply text-inactive-branch;
-        }
-      }
-
-      h2 {
-        @apply font-bold text-2xl ml-4;
-      }
-    }
-
-    hr {
-      @apply bg-disabled-branch h-px-2 -ml-4  my-4;
-      width: calc(100% + 2rem);
-    }
-
     .notification-list {
       @apply overflow-y-scroll -ml-4;
       max-height: calc(100vh - 450px);
@@ -60,7 +58,7 @@ modal-notifications {
 
   modal-notifications-list-item,
   modal-notifications-update-group {
-    @apply flex flex-col relative py-1 px-4;
+    @apply flex flex-col relative p-4;
 
     .notification-headline {
       @apply flex flex-row justify-between items-start;

apps/modal/notifications/src/lib/notifications.component.ts

@@ -1,14 +1,11 @@
 import { ChangeDetectionStrategy, Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { ComponentStore } from '@ngrx/component-store';
-import { Group, groupBy } from '@ui/common';
 import { UiModalRef } from '@ui/modal';
-import { EnvelopeDTO, MessageBoardItemDTO } from 'apps/hub/notifications/src/lib/defs';
-import { combineLatest } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { MessageBoardItemDTO } from 'apps/hub/notifications/src/lib/defs';
 
 interface ModalNotificationComponentState {
-  activeCard: string;
-  groupedNotifications: Group<string, MessageBoardItemDTO>[];
+  selectedArea: string;
+  notifications: Record<string, MessageBoardItemDTO[]>;
 }
 
 @Component({
@@ -18,44 +15,61 @@ interface ModalNotificationComponentState {
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
 })
-export class ModalNotificationsComponent extends ComponentStore<ModalNotificationComponentState> implements OnInit {
-  set activeCard(activeCard: string) {
-    if (this.activeCard !== activeCard) {
-      this.patchState({ activeCard });
+export class ModalNotificationsComponent extends ComponentStore<ModalNotificationComponentState> {
+  private _selectedAreaSelector = (state: ModalNotificationComponentState) => {
+    if (state.selectedArea) {
+      return state.selectedArea;
     }
+
+    const keys = Object.keys(state.notifications);
+
+    for (const key of keys) {
+      if (state.notifications[key]?.length > 0) {
+        return key;
+      }
+    }
+
+    return undefined;
+  };
+
+  get selectedArea() {
+    return this.get(this._selectedAreaSelector);
   }
 
-  activeCard$ = this.select((s) => s.activeCard);
+  selectedArea$ = this.select(this._selectedAreaSelector);
 
-  get activeCard() {
-    return this.get((s) => s.activeCard);
+  private _categorySelector = (state: ModalNotificationComponentState) => {
+    const selectedArea = this._selectedAreaSelector(state);
+    console.log('_categorySelector', state.notifications[selectedArea]?.[0]?.category);
+    return state.notifications[selectedArea]?.[0]?.category;
+  };
+
+  get category() {
+    return this.get(this._categorySelector);
   }
 
-  get groupedNotifications() {
-    return this.get((s) => s.groupedNotifications);
-  }
-  groupedNotifications$ = this.select((s) => s.groupedNotifications);
+  category$ = this.select(this._categorySelector);
 
-  set groupedNotifications(groupedNotifications: Group<string, MessageBoardItemDTO>[]) {
-    this.patchState({ groupedNotifications });
+  get notifications() {
+    return this.get((s) => s.notifications);
   }
 
-  activeNotifications$ = combineLatest([this.activeCard$, this.groupedNotifications$]).pipe(
-    map(([activeCard, notifications]) => notifications.find((n) => n.group === activeCard)?.items)
-  );
+  notifications$ = this.select((s) => s.notifications);
 
-  constructor(private _modalRef: UiModalRef<any, EnvelopeDTO<MessageBoardItemDTO[]>>) {
+  constructor(private _modalRef: UiModalRef<any, Record<string, MessageBoardItemDTO[]>>) {
     super({
-      activeCard: undefined,
-      groupedNotifications: groupBy(_modalRef.data.data, (item: MessageBoardItemDTO) => item.category),
+      selectedArea: undefined,
+      notifications: _modalRef.data,
     });
   }
 
-  ngOnInit() {
-    this.patchState({ activeCard: this.groupedNotifications?.find((_) => true)?.group });
-  }
-
   close() {
     this._modalRef.close();
   }
+
+  selectArea(area: string) {
+    this.patchState({
+      selectedArea: area,
+    });
+  }
 }

apps/modal/notifications/src/lib/notifications.module.ts

@@ -9,6 +9,7 @@ import { ModalNotificationsReservationGroupComponent } from './notifications-res
 import { ModalNotificationsTaskCalendarGroupComponent } from './notifications-task-calendar-group/notifications-task-calendar-group.component';
 import { ModalNotificationsUpdateGroupComponent } from './notifications-update-group/notifications-update-group.component';
 import { ModalNotificationsComponent } from './notifications.component';
+import { ModalNotificationsPackageInspectionGroupComponent } from './notifications-package-inspection-group/notifications-package-inspection-group.component';
 
 @NgModule({
   imports: [CommonModule, UiCommonModule, UiIconModule, RouterModule],
@@ -19,6 +20,7 @@ import { ModalNotificationsComponent } from './notifications.component';
     ModalNotificationsTaskCalendarGroupComponent,
     ModalNotificationsUpdateGroupComponent,
     ModalNotificationsListItemComponent,
+    ModalNotificationsPackageInspectionGroupComponent,
   ],
   exports: [
     ModalNotificationsComponent,
@@ -27,6 +29,7 @@ import { ModalNotificationsComponent } from './notifications.component';
     ModalNotificationsTaskCalendarGroupComponent,
     ModalNotificationsUpdateGroupComponent,
     ModalNotificationsListItemComponent,
+    ModalNotificationsPackageInspectionGroupComponent,
   ],
 })
 export class ModalNotificationsModule {}

apps/modal/reorder/src/lib/reorder.component.ts

@@ -1,4 +1,5 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ApplicationService } from '@core/application';
 import { DomainAvailabilityService } from '@domain/availability';
 import { DomainOmsService } from '@domain/oms';
 import { ComponentStore } from '@ngrx/component-store';
@@ -68,17 +69,15 @@ export class ReorderModalComponent extends ComponentStore<GoodsInListReorderModa
     )
   );
 
-  readonly currentBranch$ = this.domainAvailabilityService.getDefaultBranch();
-
-  readonly storeAvailabilities$ = combineLatest([this.orderItem$, this.currentBranch$]).pipe(
-    switchMap(([item, branch]) =>
+  readonly storeAvailabilities$ = this.orderItem$.pipe(
+    switchMap((item) =>
       this.domainAvailabilityService
         .getPickUpAvailabilities([
           {
             qty: item.quantity,
             ean: item.product.ean,
             itemId: item.product?.catalogProductNumber,
-            shopId: branch.id,
+            shopId: item?.targetBranchId,
             price: item.retailPrice,
           },
         ])
@@ -99,6 +98,7 @@ export class ReorderModalComponent extends ComponentStore<GoodsInListReorderModa
           eans: [item.product.ean],
           quantity: item.quantity,
           price: item.retailPrice,
+          branchId: item.targetBranchId,
         })
         .pipe(
           catchError(() => {
@@ -141,7 +141,8 @@ export class ReorderModalComponent extends ComponentStore<GoodsInListReorderModa
   constructor(
     public modalRef: UiModalRef<ReorderResult, { item: OrderItemListItemDTO; showReasons: boolean }>,
     private domainAvailabilityService: DomainAvailabilityService,
-    private _omsService: DomainOmsService
+    private _omsService: DomainOmsService,
+    private _applicationService: ApplicationService
   ) {
     super({
       orderItem: modalRef.data?.item,

apps/native-container/src/lib/native-container.service.ts

@@ -1,9 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Observable, fromEvent, Subject } from 'rxjs';
+import { Observable, fromEvent, Subject, ReplaySubject } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { WindowRef } from './window-ref.service';
 import { ScanRequestType } from './scan-request.type';
-import { EnvironmentService } from '@core/environment';
+import { Platform } from '@angular/cdk/platform';
 @Injectable({
   providedIn: 'root',
 })
@@ -11,11 +11,15 @@ export class NativeContainerService {
   private wm: Observable<any>;
   public windowMessages = new Subject<any>();
 
-  private webViewDetected = false;
   private webViewEventRecieved = false;
-  private browserDetected = false;
 
-  constructor(private windowRef: WindowRef, private _environmentService: EnvironmentService) {
+  private _init$ = new ReplaySubject<boolean>(1);
+
+  get isNative() {
+    return this.webViewEventRecieved;
+  }
+
+  constructor(private windowRef: WindowRef, private _platform: Platform) {
     this.defineWindowCallback();
 
     this.wm = fromEvent(this.windowRef.nativeWindow, 'message').pipe(
@@ -27,11 +31,16 @@ export class NativeContainerService {
     this.wm.subscribe((data) => {
       if (data.status === 'INIT') {
         this.webViewEventRecieved = true;
+        this._init$.next(true);
       }
       this.windowMessages.next(data);
     });
   }
 
+  init() {
+    return this._init$.asObservable();
+  }
+
   public openScanner(scanRequestType: ScanRequestType) {
     const scanRequest = {
       [scanRequestType]: true,
@@ -46,7 +55,6 @@ export class NativeContainerService {
     this.windowRef.nativeWindow.postMessage({ status: 'IN_PROGRESS', data: 'Scan Started' }, '*');
 
     try {
-      // if (this.isUiWebview() && this.isUiWebview().isNative) {
       (this.windowRef.nativeWindow as any).webkit.messageHandlers.scanRequest.postMessage(message);
     } catch (error) {
       this.windowRef.nativeWindow.postMessage({ status: 'ERROR', data: 'Not a WebView' }, '*');
@@ -54,30 +62,6 @@ export class NativeContainerService {
     }
   }
 
-  public isUiWebview() {
-    // const navigator = this.windowRef.nativeWindow.navigator as Navigator;
-    // alert(this.deviceDetector.browser);
-    // const standalone = (navigator as any).standalone,
-    //   userAgent = navigator.userAgent.toLowerCase(),
-    //   safari = /safari/.test(userAgent),
-    //   ios = /iphone|ipod|ipad/.test(userAgent),
-    //   chrome = /chrome/.test(userAgent) && /Google Inc/.test(navigator.vendor),
-    //   crios = /crios/.test(userAgent);
-
-    // this.webViewDetected = ios && !standalone && !safari;
-    // this.browserDetected = !standalone && (safari || chrome) && !crios;
-
-    return {
-      isSafari: this._environmentService.isSafari(),
-      isNative: this.webViewEventRecieved,
-    };
-  }
-
-  public isIpadMini6() {
-    const width = window.innerWidth > 0 ? window.innerWidth : screen.width;
-    return width === 744;
-  }
-
   private defineWindowCallback() {
     if (this.windowRef.nativeWindow['scanResults'] === undefined) {
       this.windowRef.nativeWindow['scanResults'] = (result) => window.postMessage(result, '*');
@@ -91,6 +75,7 @@ export class NativeContainerService {
     try {
       (this.windowRef.nativeWindow as any).webkit.messageHandlers.scanRequest.postMessage('PING');
     } catch (error) {
+      this._init$.next(false);
       this.windowRef.nativeWindow.postMessage({ status: 'ERROR', data: 'Not a WebView' }, '*');
       this.windowRef.nativeWindow.postMessage('PING', '*');
     }

apps/page/assortment/ng-package.json

@@ -0,0 +1,7 @@
+{
+    "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+    "dest": "../../../dist/page/yellow-pages",
+    "lib": {
+      "entryFile": "src/public-api.ts"
+    }
+  }

apps/page/assortment/src/lib/assortment.component.css

@@ -0,0 +1,3 @@
+:host {
+  @apply block;
+}

apps/page/assortment/src/lib/assortment.component.html

@@ -0,0 +1,3 @@
+<shared-breadcrumb class="my-4" [key]="breadcrumbKey"></shared-breadcrumb>
+
+<router-outlet></router-outlet>

apps/page/assortment/src/lib/assortment.component.spec.ts

@@ -0,0 +1,67 @@
+import { RouterTestingModule } from '@angular/router/testing';
+import { BreadcrumbService } from '@core/breadcrumb';
+import { Config } from '@core/config';
+import { Spectator, createComponentFactory } from '@ngneat/spectator';
+import { BreadcrumbComponent } from '@shared/components/breadcrumb';
+import { MockComponent } from 'ng-mocks';
+import { AssortmentComponent } from './assortment.component';
+
+describe('AssortmentComponent', () => {
+  let spectator: Spectator<AssortmentComponent>;
+  const createComponent = createComponentFactory({
+    component: AssortmentComponent,
+    imports: [RouterTestingModule],
+    mocks: [Config, BreadcrumbService],
+    declarations: [MockComponent(BreadcrumbComponent)],
+  });
+
+  let configMock: jasmine.SpyObj<Config>;
+  let breadcrumbServiceMock: jasmine.SpyObj<BreadcrumbService>;
+
+  beforeEach(async () => {
+    spectator = createComponent();
+    await spectator.fixture.whenStable();
+
+    configMock = spectator.inject(Config);
+    breadcrumbServiceMock = spectator.inject(BreadcrumbService);
+  });
+
+  it('should create', () => {
+    expect(spectator.component).toBeTruthy();
+  });
+
+  describe('get breadcrumbKey(): string', () => {
+    it('should call Config.get("process.ids.assortment") and return the result', () => {
+      const expected = 'expected';
+      configMock.get.and.returnValue(expected);
+
+      const actual = spectator.component.breadcrumbKey;
+
+      expect(configMock.get).toHaveBeenCalledWith('process.ids.assortment');
+      expect(actual).toBe(expected);
+    });
+  });
+
+  describe('ngOnInit()', () => {
+    it('should call createBreadcrumbIfNotExists()', () => {
+      const spy = spyOn(spectator.component, 'createBreadcrumbIfNotExists');
+
+      spectator.component.ngOnInit();
+
+      expect(spy).toHaveBeenCalled();
+    });
+  });
+
+  describe('template', () => {
+    it('should render the ShellBreadcrumbComponent and pass the breadcrumbKey as @Input() key', () => {
+      const expected = 'expected';
+      configMock.get.and.returnValue(expected);
+
+      spectator.detectComponentChanges();
+
+      const shellBreadcrumb = spectator.query(BreadcrumbComponent);
+      expect(shellBreadcrumb).toBeTruthy();
+      expect(shellBreadcrumb.key).toBe(expected);
+    });
+  });
+});

apps/page/assortment/src/lib/assortment.component.ts

@@ -0,0 +1,33 @@
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { Breadcrumb, BreadcrumbService } from '@core/breadcrumb';
+import { Config } from '@core/config';
+
+@Component({
+  selector: 'page-assortment',
+  templateUrl: 'assortment.component.html',
+  styleUrls: ['assortment.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class AssortmentComponent implements OnInit {
+  get breadcrumbKey(): string {
+    return this._config.get('process.ids.assortment');
+  }
+
+  constructor(private _config: Config, private _breadcrumb: BreadcrumbService) {}
+
+  ngOnInit() {
+    this.createBreadcrumbIfNotExists();
+  }
+
+  async createBreadcrumbIfNotExists(): Promise<void> {
+    const crumb: Breadcrumb = {
+      key: this.breadcrumbKey,
+      name: 'Sortiment',
+      path: '/filiale/assortment',
+      section: 'branch',
+      tags: ['main'],
+    };
+
+    await this._breadcrumb.addBreadcrumbIfNotExists(crumb);
+  }
+}

apps/page/assortment/src/lib/assortment.module.ts

@@ -0,0 +1,16 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { BreadcrumbModule } from '@shared/components/breadcrumb';
+import { routes } from './routes';
+
+import { AssortmentComponent } from './assortment.component';
+import { PriceUpdateModule } from './price-update/price-update.module';
+
+@NgModule({
+  imports: [CommonModule, RouterModule.forChild(routes), BreadcrumbModule, PriceUpdateModule],
+  exports: [AssortmentComponent],
+  declarations: [AssortmentComponent],
+  providers: [],
+})
+export class AssortmentModule {}

apps/page/assortment/src/lib/price-update/index.ts

@@ -0,0 +1,7 @@
+// start:ng42.barrel
+export * from './price-update.component.state';
+export * from './price-update.component.store';
+export * from './price-update.component';
+export * from './price-update.module';
+export * from './price-update-list';
+// end:ng42.barrel

apps/page/assortment/src/lib/price-update/price-update-list/index.ts

@@ -0,0 +1,6 @@
+// start:ng42.barrel
+export * from './price-update-item-loader.component';
+export * from './price-update-item.component';
+export * from './price-update-list.component';
+export * from './price-update-list.module';
+// end:ng42.barrel

apps/page/assortment/src/lib/price-update/price-update-list/price-update-item-loader.component.css

@@ -0,0 +1,9 @@
+:host {
+  @apply flex flex-row items-center bg-white rounded px-4;
+  height: 53px;
+}
+
+.skeleton {
+  @apply block bg-gray-300 h-6;
+  animation: load 1s ease-in-out infinite;
+}