#4524 Page Article Search Improved Order by Filter Handling

2025-12-31 09:37:15 +01:00 · 2023-12-29 16:58:49 +01:00
282 changed files with 11084 additions and 9199 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.

-.matomo
-
 # compiled output
 /dist
 /tmp
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1 +0,0 @@
-npm run pretty-quick
--- a/TASKS.md
+++ b/TASKS.md
@@ -0,0 +1,4 @@
+- Neue Icon Module (z.B. mit SVG sprites)
+- Breadcrumb Navigation (Neu)
+- Remissions Produkt Liste (Refactoring / Neu)
+- Angular Version (Upgrade)
--- a/angular.json
+++ b/angular.json
@@ -2,7 +2,6 @@
  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
  "version": 1,
  "newProjectRoot": "apps",
-  
  "projects": {
    "@swagger/availability": {
      "root": "apps/swagger/availability",
@@ -960,10 +959,10 @@
          "builder": "@angular-devkit/build-angular:dev-server",
          "configurations": {
            "production": {
-              "buildTarget": "isa-app:build:production"
+              "browserTarget": "isa-app:build:production"
            },
            "development": {
-              "buildTarget": "isa-app:build:development"
+              "browserTarget": "isa-app:build:development"
            }
          },
          "defaultConfiguration": "development"
@@ -971,7 +970,7 @@
        "extract-i18n": {
          "builder": "@angular-devkit/build-angular:extract-i18n",
          "options": {
-            "buildTarget": "isa-app:build"
+            "browserTarget": "isa-app:build"
          }
        },
        "test": {
@@ -1471,6 +1470,39 @@
          }
        }
      }
+    },
+    "shell": {
+      "projectType": "library",
+      "root": "apps/shell",
+      "sourceRoot": "apps/shell/src",
+      "prefix": "shell",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:ng-packagr",
+          "options": {
+            "project": "apps/shell/ng-package.json"
+          },
+          "configurations": {
+            "production": {
+              "tsConfig": "apps/shell/tsconfig.lib.prod.json"
+            },
+            "development": {
+              "tsConfig": "apps/shell/tsconfig.lib.json"
+            }
+          },
+          "defaultConfiguration": "production"
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "tsConfig": "apps/shell/tsconfig.spec.json",
+            "polyfills": [
+              "zone.js",
+              "zone.js/testing"
+            ]
+          }
+        }
+      }
    }
  },
  "cli": {
--- a/apps/cdn/product-image/src/lib/product-image-navigation.directive.ts
+++ b/apps/cdn/product-image/src/lib/product-image-navigation.directive.ts
@@ -1,31 +0,0 @@
-import { Directive, HostListener, Input } from '@angular/core';
-import { ProductCatalogNavigationService } from '@shared/services';
-
-@Directive({
-  selector: '[productImageNavigation]',
-  standalone: true,
-})
-export class NavigateOnClickDirective {
-  @Input('productImageNavigation') ean: string;
-
-  constructor(private readonly _productCatalogNavigation: ProductCatalogNavigationService) {}
-
-  @HostListener('click', ['$event'])
-  async onClick(event: MouseEvent) {
-    event.preventDefault();
-    event.stopPropagation();
-    if (this.ean) {
-      await this._navigateToProductSearchDetails();
-    }
-  }
-
-  private async _navigateToProductSearchDetails() {
-    await this._productCatalogNavigation
-      .getArticleDetailsPathByEan({
-        processId: Date.now(),
-        ean: this.ean,
-        extras: { queryParams: { main_qs: this.ean } },
-      })
-      .navigate();
-  }
-}
--- a/apps/cdn/product-image/src/public-api.ts
+++ b/apps/cdn/product-image/src/public-api.ts
@@ -5,5 +5,4 @@
 export * from './lib/product-image.service';
 export * from './lib/product-image.module';
 export * from './lib/product-image.pipe';
-export * from './lib/product-image-navigation.directive';
 export * from './lib/tokens';
--- a/apps/domain/availability/src/lib/availability.service.ts
+++ b/apps/domain/availability/src/lib/availability.service.ts
@@ -36,7 +36,7 @@ export class DomainAvailabilityService {
    private _logisticanService: LogisticianService,
    private _stockService: StockService,
    private _supplierService: StoreCheckoutSupplierService,
-    private _branchService: StoreCheckoutBranchService,
+    private _branchService: StoreCheckoutBranchService
  ) {}

  @memorize({ ttl: 10000 })
@@ -48,7 +48,7 @@ export class DomainAvailabilityService {
  getSuppliers(): Observable<SupplierDTO[]> {
    return this._supplierService.StoreCheckoutSupplierGetSuppliers({}).pipe(
      map((response) => response.result),
-      shareReplay(1),
+      shareReplay(1)
    );
  }

@@ -56,7 +56,7 @@ export class DomainAvailabilityService {
  getTakeAwaySupplier(): Observable<SupplierDTO> {
    return this._supplierService.StoreCheckoutSupplierGetSuppliers({}).pipe(
      map(({ result }) => result?.find((supplier) => supplier?.supplierNumber === 'F')),
-      shareReplay(1),
+      shareReplay(1)
    );
  }

@@ -64,7 +64,7 @@ export class DomainAvailabilityService {
  getBranches(): Observable<BranchDTO[]> {
    return this._branchService.StoreCheckoutBranchGetBranches({}).pipe(
      map((response) => response.result),
-      shareReplay(1),
+      shareReplay(1)
    );
  }

@@ -73,7 +73,7 @@ export class DomainAvailabilityService {
    return this._stockService.StockGetStocksByBranch({ branchId }).pipe(
      map((response) => response.result),
      map((result) => result?.find((_) => true)),
-      shareReplay(1),
+      shareReplay(1)
    );
  }

@@ -81,7 +81,7 @@ export class DomainAvailabilityService {
  getDefaultStock(): Observable<StockDTO> {
    return this._stockService.StockCurrentStock().pipe(
      map((response) => response.result),
-      shareReplay(1),
+      shareReplay(1)
    );
  }

@@ -105,7 +105,7 @@ export class DomainAvailabilityService {
        status: response.result.status,
        version: response.result.version,
      })),
-      shareReplay(1),
+      shareReplay(1)
    );
  }

@@ -113,7 +113,7 @@ export class DomainAvailabilityService {
  getLogisticians(): Observable<LogisticianDTO> {
    return this._logisticanService.LogisticianGetLogisticians({}).pipe(
      map((response) => response.result?.find((l) => l.logisticianNumber === '2470')),
-      shareReplay(1),
+      shareReplay(1)
    );
  }

@@ -146,7 +146,7 @@ export class DomainAvailabilityService {
        });
        return availabilities;
      }),
-      shareReplay(1),
+      shareReplay(1)
    );
  }

@@ -167,13 +167,13 @@ export class DomainAvailabilityService {
          this._stockService.StockInStock({ articleIds: [item.itemId], stockId: s.id }),
          this.getTakeAwaySupplier(),
          this.getDefaultBranch(),
-        ]),
+        ])
      ),
      map(([response, supplier, defaultBranch]) => {
        const price = item?.price;
        return this._mapToTakeAwayAvailability({ response, supplier, branchId: branch?.id ?? defaultBranch?.id, quantity, price });
      }),
-      shareReplay(1),
+      shareReplay(1)
    );
  }

@@ -196,7 +196,7 @@ export class DomainAvailabilityService {
      map(([response, supplier]) => {
        return this._mapToTakeAwayAvailability({ response, supplier, branchId: branch.id, quantity, price });
      }),
-      shareReplay(1),
+      shareReplay(1)
    );
  }

@@ -218,7 +218,7 @@ export class DomainAvailabilityService {
      map(([response, supplier, defaultBranch]) => {
        return this._mapToTakeAwayAvailability({ response, supplier, branchId: branchId ?? defaultBranch.id, quantity, price });
      }),
-      shareReplay(1),
+      shareReplay(1)
    );
  }

@@ -228,7 +228,7 @@ export class DomainAvailabilityService {
      switchMap((s) => this._stockService.StockInStockByEAN({ eans: eansFiltered, stockId: s.id })),
      withLatestFrom(this.getTakeAwaySupplier(), this.getDefaultBranch()),
      map((response) => response[0].result),
-      shareReplay(1),
+      shareReplay(1)
    );
  }

@@ -254,7 +254,7 @@ export class DomainAvailabilityService {
      ])
      .pipe(
        map((r) => this._mapToPickUpAvailability(r.result)?.find((_) => true)),
-        shareReplay(1),
+        shareReplay(1)
      );
  }

@@ -270,7 +270,7 @@ export class DomainAvailabilityService {
    ]).pipe(
      timeout(5000),
      map((r) => this._mapToShippingAvailability(r.result)?.find((_) => true)),
-      shareReplay(1),
+      shareReplay(1)
    );
  }

@@ -305,7 +305,7 @@ export class DomainAvailabilityService {
          priceMaintained: preferred?.priceMaintained,
        };
      }),
-      shareReplay(1),
+      shareReplay(1)
    );
  }

@@ -329,12 +329,12 @@ export class DomainAvailabilityService {
        this.getPickUpAvailability({ item, quantity, branch: branch ?? defaultBranch }).pipe(
          mergeMap((availability) =>
            logistician$.pipe(
-              map((logistician) => ({ ...(availability?.length > 0 ? availability[0] : []), logistician: { id: logistician.id } })),
-            ),
+              map((logistician) => ({ ...(availability?.length > 0 ? availability[0] : []), logistician: { id: logistician.id } }))
+            )
          ),
-          shareReplay(1),
-        ),
-      ),
+          shareReplay(1)
+        )
+      )
    );
  }

@@ -367,7 +367,7 @@ export class DomainAvailabilityService {
          priceMaintained: preferred?.priceMaintained,
        };
      }),
-      shareReplay(1),
+      shareReplay(1)
    );
  }

@@ -378,7 +378,7 @@ export class DomainAvailabilityService {
      switchMap((stockId) =>
        stockId
          ? this._stockService.StockInStock({ articleIds: items.map((i) => i.id), stockId })
-          : of({ result: [] } as ResponseArgsOfIEnumerableOfStockInfoDTO),
+          : of({ result: [] } as ResponseArgsOfIEnumerableOfStockInfoDTO)
      ),
      timeout(20000),
      withLatestFrom(this.getTakeAwaySupplier()),
@@ -389,10 +389,10 @@ export class DomainAvailabilityService {
            supplier,
            quantity: 1,
            price: items?.find((i) => i.id === stockInfo.itemId)?.price,
-          }),
+          })
        );
      }),
-      shareReplay(1),
+      shareReplay(1)
    );
  }

@@ -400,7 +400,7 @@ export class DomainAvailabilityService {
  getPickUpAvailabilities(payload: AvailabilityRequestDTO[], preferred?: boolean) {
    return this._availabilityService.AvailabilityStoreAvailability(payload).pipe(
      timeout(20000),
-      map((response) => (preferred ? this._mapToPickUpAvailability(response.result) : response.result)),
+      map((response) => (preferred ? this._mapToPickUpAvailability(response.result) : response.result))
    );
  }

@@ -408,7 +408,7 @@ export class DomainAvailabilityService {
  getDeliveryAvailabilities(payload: AvailabilityRequestDTO[]) {
    return this.memorizedAvailabilityShippingAvailability(payload).pipe(
      timeout(20000),
-      map((response) => this._mapToShippingAvailability(response.result)),
+      map((response) => this._mapToShippingAvailability(response.result))
    );
  }

@@ -416,7 +416,7 @@ export class DomainAvailabilityService {
  getDigDeliveryAvailabilities(payload: AvailabilityRequestDTO[]) {
    return this.memorizedAvailabilityShippingAvailability(payload).pipe(
      timeout(20000),
-      map((response) => this._mapToShippingAvailability(response.result)),
+      map((response) => this._mapToShippingAvailability(response.result))
    );
  }

@@ -427,16 +427,16 @@ export class DomainAvailabilityService {
    return this.getPickUpAvailabilities(payload, true).pipe(
      timeout(20000),
      switchMap((availability) =>
-        logistician$.pipe(map((logistician) => ({ availability: [...availability], logistician: { id: logistician.id } }))),
+        logistician$.pipe(map((logistician) => ({ availability: [...availability], logistician: { id: logistician.id } })))
      ),
-      shareReplay(1),
+      shareReplay(1)
    );
  }

  getPriceForAvailability(
    purchasingOption: string,
    catalogAvailability: CatAvailabilityDTO | AvailabilityDTO,
-    availability: AvailabilityDTO,
+    availability: AvailabilityDTO
  ): PriceDTO {
    switch (purchasingOption) {
      case 'take-away':
@@ -458,6 +458,10 @@ export class DomainAvailabilityService {
    return [2, 32, 256, 1024, 2048, 4096].some((code) => availability?.availabilityType === code);
  }

+  private _priceIsEmpty(price: PriceDTO) {
+    return isEmpty(price?.value) || isEmpty(price?.vat);
+  }
+
  private _mapToTakeAwayAvailability({
    response,
    supplier,
@@ -478,7 +482,7 @@ export class DomainAvailabilityService {
      inStock: inStock,
      supplierSSC: quantity <= inStock ? '999' : '',
      supplierSSCText: quantity <= inStock ? 'Filialentnahme' : '',
-      price: stockInfo?.retailPrice ?? price, // #4553 Es soll nun immer der retailPrice aus der InStock Abfrage verwendet werden, egal ob "price" empty ist oder nicht
+      price: this._priceIsEmpty(price) ? stockInfo?.retailPrice : price,
      supplier: { id: supplier?.id },
      // TODO: Change after API Update
      // LH: 2021-03-09 preis Property hat nun ein Fallback auf retailPrice
@@ -567,12 +571,12 @@ export class DomainAvailabilityService {
    if (!params.branchId) {
      branchId$ = this.getDefaultBranch().pipe(
        first(),
-        map((b) => b.id),
+        map((b) => b.id)
      );
    }

    const stock$ = branchId$.pipe(
-      mergeMap((branchId) => this._stockService.StockGetStocksByBranch({ branchId }).pipe(map((response) => response.result?.[0]))),
+      mergeMap((branchId) => this._stockService.StockGetStocksByBranch({ branchId }).pipe(map((response) => response.result?.[0])))
    );

    return stock$.pipe(
@@ -589,17 +593,17 @@ export class DomainAvailabilityService {
              acc[stockInfo.ean] = stockInfo;
              return acc;
            }, {});
-          }),
-        ),
-      ),
+          })
+        )
+      )
    );
  }

  getInStock({ itemIds, branchId }: { itemIds: number[]; branchId: number }): Observable<StockInfoDTO[]> {
    return this.getStockByBranch(branchId).pipe(
      mergeMap((stock) =>
-        this._stockService.StockInStock({ articleIds: itemIds, stockId: stock.id }).pipe(map((response) => response.result)),
-      ),
+        this._stockService.StockInStock({ articleIds: itemIds, stockId: stock.id }).pipe(map((response) => response.result))
+      )
    );
  }
 }
--- a/apps/domain/catalog/src/lib/thumbnail-url.pipe.ts
+++ b/apps/domain/catalog/src/lib/thumbnail-url.pipe.ts
@@ -11,7 +11,7 @@ export class ThumbnailUrlPipe implements PipeTransform, OnDestroy {
  private input$ = new BehaviorSubject<{ width?: number; height?: number; ean?: string }>(undefined);
  private result: string;

-  private onDestroy$ = new Subject<void>();
+  private onDestroy$ = new Subject();

  constructor(private domainCatalogThumbnailService: DomainCatalogThumbnailService, private cdr: ChangeDetectorRef) {}

--- a/apps/domain/checkout/src/lib/checkout.service.ts
+++ b/apps/domain/checkout/src/lib/checkout.service.ts
@@ -1021,11 +1021,7 @@ export class DomainCheckoutService {

  //#region Common

-  // Fix für Ticket #4619 Versand Artikel im Warenkob -> keine Änderung bei Kundendaten erfassen
-  // Auskommentiert, da dieser Aufruf oftmals mit gleichen Parametern aufgerufen wird (ohne ausgewählten Kunden nur ein leeres Objekt bei customerFeatures)
-  // memorize macht keinen deepCompare von Objekten und denkt hier, dass immer der gleiche Return Wert zurückkommt, allerdings ist das hier oft nicht der Fall
-  // und der Decorator memorized dann fälschlicherweise
-  // @memorize()
+  @memorize()
  canSetCustomer({
    processId,
    customerFeatures,
--- a/apps/domain/oms/src/lib/action-handlers/print-compartment-label.action-handler.ts
+++ b/apps/domain/oms/src/lib/action-handlers/print-compartment-label.action-handler.ts
@@ -1,60 +1,37 @@
 import { Injectable } from '@angular/core';
 import { ActionHandler } from '@core/command';
-import { DomainPrinterService, Printer } from '@domain/printer';
+import { DomainPrinterService } from '@domain/printer';
 import { PrintModalComponent, PrintModalData } from '@modal/printer';
 import { UiModalService } from '@ui/modal';
 import { NativeContainerService } from 'native-container';
 import { OrderItemsContext } from './order-items.context';
-import { EnvironmentService } from '@core/environment';

@Injectable()
 export class PrintCompartmentLabelActionHandler extends ActionHandler<OrderItemsContext> {
  constructor(
    private uiModal: UiModalService,
    private domainPrinterService: DomainPrinterService,
-    private nativeContainerService: NativeContainerService,
-    private _environmentSerivce: EnvironmentService
+    private nativeContainerService: NativeContainerService
  ) {
    super('PRINT_COMPARTMENTLABEL');
  }
-  printCompartmentLabelHelper(printer: string, orderItemSubsetIds: number[]) {
-    return this.domainPrinterService
-      .printCompartmentLabel({
-        printer,
-        orderItemSubsetIds,
-      })
-      .toPromise();
-  }

  async handler(data: OrderItemsContext): Promise<OrderItemsContext> {
-    const printerList = await this.domainPrinterService.getAvailableLabelPrinters().toPromise();
-    let printer: Printer;
+    await this.uiModal
+      .open({
+        content: PrintModalComponent,
+        config: { showScrollbarY: false },
+        data: {
+          printImmediately: !this.nativeContainerService.isNative,
+          printerType: 'Label',
+          print: (printer) =>
+            this.domainPrinterService
+              .printCompartmentLabel({ printer, orderItemSubsetIds: data.items.map((item) => item.orderItemSubsetId) })
+              .toPromise(),
+        } as PrintModalData,
+      })
+      .afterClosed$.toPromise();

-    if (Array.isArray(printerList)) {
-      printer = printerList.find((printer) => printer.selected === true);
-    }
-    if (!printer || this._environmentSerivce.matchTablet()) {
-      await this.uiModal
-        .open({
-          content: PrintModalComponent,
-          config: { showScrollbarY: false },
-          data: {
-            printImmediately: !this._environmentSerivce.matchTablet(),
-            printerType: 'Label',
-            print: (printer) =>
-              this.printCompartmentLabelHelper(
-                printer,
-                data.items.map((item) => item.orderItemSubsetId)
-              ),
-          } as PrintModalData,
-        })
-        .afterClosed$.toPromise();
-    } else {
-      await this.printCompartmentLabelHelper(
-        printer.key,
-        data.items.map((item) => item.orderItemSubsetId)
-      );
-    }
    return data;
  }
 }
--- a/apps/domain/oms/src/lib/action-handlers/print-shipping-note.action-handler.ts
+++ b/apps/domain/oms/src/lib/action-handlers/print-shipping-note.action-handler.ts
@@ -6,60 +6,45 @@ import { UiModalService } from '@ui/modal';
 import { PrintModalComponent, PrintModalData } from '@modal/printer';
 import { groupBy } from '@ui/common';
 import { NativeContainerService } from 'native-container';
-import { ReceiptDTO } from '@swagger/oms';
-import { EnvironmentService } from '@core/environment';

@Injectable()
 export class PrintShippingNoteActionHandler extends ActionHandler<OrderItemsContext> {
  constructor(
    private uiModal: UiModalService,
    private domainPrinterService: DomainPrinterService,
-    private nativeContainerService: NativeContainerService,
-    private _environmentSerivce: EnvironmentService
+    private nativeContainerService: NativeContainerService
  ) {
    super('PRINT_SHIPPINGNOTE');
  }

-  async printShippingNoteHelper(printer: string, receipts: ReceiptDTO[]) {
-    try {
-      for (const group of groupBy(receipts, (receipt) => receipt?.buyer?.buyerNumber)) {
-        await this.domainPrinterService.printShippingNote({ printer, receipts: group?.items?.map((r) => r?.id) }).toPromise();
-      }
-      return {
-        error: false,
-      };
-    } catch (error) {
-      console.error(error);
-      return {
-        error: true,
-        message: error?.message || error,
-      };
-    }
-  }
-
  async handler(data: OrderItemsContext): Promise<OrderItemsContext> {
-    const printerList = await this.domainPrinterService.getAvailableLabelPrinters().toPromise();
-    const receipts = data?.receipts?.filter((r) => r?.receiptType & 1);
-    let printer: Printer;
-
-    if (Array.isArray(printerList)) {
-      printer = printerList.find((printer) => printer.selected === true);
-    }
-    if (!printer || this._environmentSerivce.matchTablet()) {
-      await this.uiModal
-        .open({
-          content: PrintModalComponent,
-          config: { showScrollbarY: false },
-          data: {
-            printImmediately: !this.nativeContainerService.isNative,
-            printerType: 'Label',
-            print: async (printer) => await this.printShippingNoteHelper(printer, receipts),
-          } as PrintModalData,
-        })
-        .afterClosed$.toPromise();
-    } else {
-      await this.printShippingNoteHelper(printer.key, receipts);
-    }
+    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 & 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 {
+                error: false,
+              };
+            } catch (error) {
+              console.error(error);
+              return {
+                error: true,
+                message: error?.message || error,
+              };
+            }
+          },
+        } as PrintModalData,
+      })
+      .afterClosed$.toPromise();

    return data;
  }
--- a/apps/domain/pickup-shelf/src/lib/pickup-shelf-out.service.ts
+++ b/apps/domain/pickup-shelf/src/lib/pickup-shelf-out.service.ts
@@ -35,7 +35,7 @@ export class PickupShelfOutService extends PickupShelfIOService {
      );
    }

-    const { orderdate, supplier_id } = args.filter?.getQueryToken()?.filter ?? {};
+    const { orderdate } = args.filter?.getQueryToken()?.filter ?? {};

    return this._abholfachService.AbholfachWarenausgabe({
      input: {
@@ -45,7 +45,6 @@ export class PickupShelfOutService extends PickupShelfIOService {
        archive: String(true),
        all_branches: String(true),
        orderdate,
-        supplier_id,
      },
    });
  }
--- a/apps/isa-app/src/app/app-routing.module.ts
+++ b/apps/isa-app/src/app/app-routing.module.ts
@@ -1,4 +1,4 @@
-import { isDevMode, NgModule } from '@angular/core';
+import { inject, isDevMode, NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import {
  CanActivateCartGuard,
@@ -8,6 +8,8 @@ import {
  CanActivateCustomerOrdersWithProcessIdGuard,
  CanActivateCustomerWithProcessIdGuard,
  CanActivateGoodsInGuard,
+  CanActivateGoodsOutGuard,
+  CanActivateGoodsOutWithProcessIdGuard,
  CanActivateProductGuard,
  CanActivateProductWithProcessIdGuard,
  CanActivateRemissionGuard,
@@ -20,9 +22,9 @@ import { MainComponent } from './main.component';
 import { PreviewComponent } from './preview';
 import { BranchSectionResolver, CustomerSectionResolver, ProcessIdResolver } from './resolvers';
 import { TokenLoginComponent, TokenLoginModule } from './token-login';
+import { ApplicationService } from '@core/application';
 import { ProcessIdGuard } from './guards/process-id.guard';
 import { ActivateProcessIdGuard, ActivateProcessIdWithConfigKeyGuard } from './guards/activate-process-id.guard';
-import { MatomoRouteData } from 'ngx-matomo-client';

 const routes: Routes = [
  {
@@ -43,11 +45,6 @@ const routes: Routes = [
          {
            path: 'dashboard',
            loadChildren: () => import('@page/dashboard').then((m) => m.DashboardModule),
-            data: {
-              matomo: {
-                title: 'Dashboard',
-              } as MatomoRouteData,
-            },
          },
          {
            path: 'product',
--- a/apps/isa-app/src/app/app-store.module.ts
+++ b/apps/isa-app/src/app/app-store.module.ts
@@ -28,7 +28,7 @@ export const metaReducers: MetaReducer<RootState>[] = !environment.production ?
  imports: [
    StoreModule.forRoot(rootReducer, { metaReducers }),
    EffectsModule.forRoot([]),
-    StoreDevtoolsModule.instrument({ name: 'ISA Ngrx Application Store', connectInZone: true }),
+    StoreDevtoolsModule.instrument({ name: 'ISA Ngrx Application Store' }),
  ],
 })
 export class AppStoreModule {}
--- a/apps/isa-app/src/app/app.component.ts
+++ b/apps/isa-app/src/app/app.component.ts
@@ -1,17 +1,18 @@
 import { DOCUMENT } from '@angular/common';
 import { Component, HostListener, Inject, OnInit, Renderer2 } from '@angular/core';
 import { Title } from '@angular/platform-browser';
-import { SwUpdate } from '@angular/service-worker';
+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 { asapScheduler, interval, Subscription } from 'rxjs';
+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',
@@ -20,6 +21,7 @@ import { UiMessageModalComponent, UiModalService } from '@ui/modal';
 })
 export class AppComponent implements OnInit {
  private _checkForUpdates: number = this._config.get('checkForUpdates');
+  updateAvailableObs: Observable<UpdateAvailableEvent>;

  get checkForUpdates(): number {
    return this._checkForUpdates;
--- a/apps/isa-app/src/app/app.module.ts
+++ b/apps/isa-app/src/app/app.module.ts
@@ -37,8 +37,6 @@ import { NativeContainerService } from 'native-container';
 import { ShellModule } from '@shared/shell';
 import { MainComponent } from './main.component';
 import { IconModule } from '@shared/components/icon';
-import { provideMatomo } from 'ngx-matomo-client';
-import { withRouter, withRouteData } from 'ngx-matomo-client';

 registerLocaleData(localeDe, localeDeExtra);
 registerLocaleData(localeDe, 'de', localeDeExtra);
@@ -48,7 +46,7 @@ export function _appInitializerFactory(
  auth: AuthService,
  injector: Injector,
  scanAdapter: ScanAdapterService,
-  nativeContainer: NativeContainerService,
+  nativeContainer: NativeContainerService
 ) {
  return async () => {
    const statusElement = document.querySelector('#init-status');
@@ -137,7 +135,6 @@ export function _notificationsHubOptionsFactory(config: Config, auth: AuthServic
      useClass: IsaErrorHandler,
    },
    { provide: LOCALE_ID, useValue: 'de-DE' },
-    provideMatomo({ trackerUrl: 'http://localhost:8080', siteId: '1' }, withRouter(), withRouteData()),
  ],
  bootstrap: [AppComponent],
 })
--- a/apps/isa-app/src/app/store/root-state.service.ts
+++ b/apps/isa-app/src/app/store/root-state.service.ts
@@ -2,26 +2,23 @@ import { Injectable } from '@angular/core';
 import { Logger, LogLevel } from '@core/logger';
 import { Store } from '@ngrx/store';
 import { UserStateService } from '@swagger/isa';
-import { debounceTime, switchMap, takeUntil } from 'rxjs/operators';
+import { debounceTime, switchMap } from 'rxjs/operators';
 import { RootState } from './root.state';
 import packageInfo from 'package';
 import { environment } from '../../environments/environment';
-import { Subject } from 'rxjs';

@Injectable({ providedIn: 'root' })
 export class RootStateService {
  static LOCAL_STORAGE_KEY = 'ISA_APP_INITIALSTATE';

-  private _cancelSave = new Subject<void>();
-
  constructor(private readonly _userStateService: UserStateService, private _logger: Logger, private _store: Store) {
    if (!environment.production) {
      console.log('Die UserState kann in der Konsole mit der Funktion "clearUserState()" geleert werden.');
-    }

-    window['clearUserState'] = () => {
-      this.clear();
-    };
+      window['clearUserState'] = () => {
+        this.clear();
+      };
+    }
  }

  async init() {
@@ -34,8 +31,7 @@ export class RootStateService {
    this._store
      .select((state) => state)
      .pipe(
-        takeUntil(this._cancelSave),
-        debounceTime(1000),
+        debounceTime(500),
        switchMap((state) => {
          const raw = JSON.stringify({ ...state, version: packageInfo.version });
          RootStateService.SaveToLocalStorageRaw(raw);
@@ -68,17 +64,13 @@ export class RootStateService {
    return false;
  }

-  async clear() {
-    try {
-      this._cancelSave.next();
-      await this._userStateService.UserStateResetUserState().toPromise();
-      await new Promise((resolve) => setTimeout(resolve, 100));
-      RootStateService.RemoveFromLocalStorage();
-      await new Promise((resolve) => setTimeout(resolve, 100));
-      window.location.reload();
-    } catch (error) {
-      this._logger.log(LogLevel.ERROR, error);
-    }
+  clear() {
+    this._userStateService
+      .UserStateResetUserState()
+      .toPromise()
+      .catch((error) => this._logger.log(LogLevel.ERROR, error));
+    RootStateService.RemoveFromLocalStorage();
+    window.location.reload();
  }

  static SaveToLocalStorage(state: RootState) {
--- a/apps/isa-app/src/assets/icons.json
+++ b/apps/isa-app/src/assets/icons.json
@@ -280,11 +280,6 @@
            "name": "apps",
            "data": "M226-160q-28 0-47-19t-19-47q0-28 19-47t47-19q28 0 47 19t19 47q0 28-19 47t-47 19Zm254 0q-28 0-47-19t-19-47q0-28 19-47t47-19q28 0 47 19t19 47q0 28-19 47t-47 19Zm254 0q-28 0-47-19t-19-47q0-28 19-47t47-19q28 0 47 19t19 47q0 28-19 47t-47 19ZM226-414q-28 0-47-19t-19-47q0-28 19-47t47-19q28 0 47 19t19 47q0 28-19 47t-47 19Zm254 0q-28 0-47-19t-19-47q0-28 19-47t47-19q28 0 47 19t19 47q0 28-19 47t-47 19Zm254 0q-28 0-47-19t-19-47q0-28 19-47t47-19q28 0 47 19t19 47q0 28-19 47t-47 19ZM226-668q-28 0-47-19t-19-47q0-28 19-47t47-19q28 0 47 19t19 47q0 28-19 47t-47 19Zm254 0q-28 0-47-19t-19-47q0-28 19-47t47-19q28 0 47 19t19 47q0 28-19 47t-47 19Zm254 0q-28 0-47-19t-19-47q0-28 19-47t47-19q28 0 47 19t19 47q0 28-19 47t-47 19Z",
            "viewBox": "0 -960 960 960"
-        },
-        {
-            "name": "gift",
-            "data": "M2 21V10H0V4H5.2C5.11667 3.85 5.0625 3.69167 5.0375 3.525C5.0125 3.35833 5 3.18333 5 3C5 2.16667 5.29167 1.45833 5.875 0.875C6.45833 0.291667 7.16667 0 8 0C8.38333 0 8.74167 0.0708333 9.075 0.2125C9.40833 0.354167 9.71667 0.55 10 0.8C10.2833 0.533333 10.5917 0.333333 10.925 0.2C11.2583 0.0666667 11.6167 0 12 0C12.8333 0 13.5417 0.291667 14.125 0.875C14.7083 1.45833 15 2.16667 15 3C15 3.18333 14.9833 3.35417 14.95 3.5125C14.9167 3.67083 14.8667 3.83333 14.8 4H20V10H18V21H2ZM12 2C11.7167 2 11.4792 2.09583 11.2875 2.2875C11.0958 2.47917 11 2.71667 11 3C11 3.28333 11.0958 3.52083 11.2875 3.7125C11.4792 3.90417 11.7167 4 12 4C12.2833 4 12.5208 3.90417 12.7125 3.7125C12.9042 3.52083 13 3.28333 13 3C13 2.71667 12.9042 2.47917 12.7125 2.2875C12.5208 2.09583 12.2833 2 12 2ZM7 3C7 3.28333 7.09583 3.52083 7.2875 3.7125C7.47917 3.90417 7.71667 4 8 4C8.28333 4 8.52083 3.90417 8.7125 3.7125C8.90417 3.52083 9 3.28333 9 3C9 2.71667 8.90417 2.47917 8.7125 2.2875C8.52083 2.09583 8.28333 2 8 2C7.71667 2 7.47917 2.09583 7.2875 2.2875C7.09583 2.47917 7 2.71667 7 3ZM2 6V8H9V6H2ZM9 19V10H4V19H9ZM11 19H16V10H11V19ZM18 8V6H11V8H18Z",
-            "viewBox": "0 0 20 21"
        }
        
    ],
--- a/apps/isa-app/src/assets/images/bookmark_responsive.svg
+++ b/apps/isa-app/src/assets/images/bookmark_responsive.svg
@@ -1,5 +0,0 @@
-<svg width="48" height="51" viewBox="0 0 48 51" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 4.47368C8 2.01878 9.99009 0 12.445 0L43.555 0C46.0099 0 48 2.01878 48 4.47368H8Z" fill="#172062"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0 4.445C0 1.99009 1.99009 0 4.445 0L42.7807 0V43.4808C42.7807 46.7878 39.2981 48.9368 36.3423 47.4537L23.376 40.948C22.1212 40.3183 20.6426 40.3186 19.3879 40.9486L6.4397 47.4505C3.48377 48.9348 0 46.7859 0 43.4782L0 4.445Z" fill="#0556B4"/>
-<rect x="19" y="19" width="18" height="17" fill="#0556B4"/>
-</svg>
--- a/apps/isa-app/src/config/config.feature.json
+++ b/apps/isa-app/src/config/config.feature.json
@@ -75,12 +75,6 @@
    "licence": {
        "scandit": "Ae7z0WDdRDFqG6oYuAXzesYGJpDLDqt+xWtQHOESiOjaSkB7IEIDJAk534U+cg1zGnk++4hOEK9hXEGR01NLTjh76w1fDL0U63OUjo50EHBXIUvzAVSur3pRY+1ER7SvSEWaT0hDOLYvYrTpdECtt1graN9yMvJzXD38VJKUfssT92p+YENV2Hul3eXIvaVjHqXE/yvupF+MlOMMUMhX0/Km/yTU9H9SjBdsXYihZmYWbt2JotO3Zs1ojXb0+3La10xb01S1q0XdDN6El3XMVilEtdmrP3WoGois8vpQBvOCEvduxCfILFAqjeWXTZvXSut9u+kQKpK8uHW4rVV6iVClpZfPYqKJqTh78AI9gpnfb/zO9GfQEDS3g7wI5WbQKqaNRzhTVowFRri4Ep9R5TRC1bnd00RC4zVaMkbu5kBOA7YoRjgUiYWHKJpi/VokZWyN6u1lsi5mTUbQkm1ZWfX5I/iUVYBgyHZYl+8kfFkwLPXGZNrF4xqubjKiCZRQj0oyNjHOBeHqvAekzhk7scX2g/NN+liRQv4ur413b+uXacSiiYIrLhtGgzrz1KRrtu19uB5odk3LoerDoiYXat7wEg9zUYT/+uBfO2X+uS7L5LW0PMI3hV+joQVpDk5SlA2868Nx0KWtPWmMf7xCuFIhDskfBsXZNRTblqxkk0RzzSqtjx9ihGr+/Tuzm8Pm0s4OQqV7b+++/Zn+Vo4rCqMTwutjOO7dqhah5hbOT1MqY/6VcjCXyDad3BXXr+WYU4GtYTe8Ytjkm/ZTG3fImoDbMchEcqnCw3oxG5e/gkdurE8g/mZlFOtzAN7KkqIsg6qLaC5COjfLPXsi/A=="
    },
-    "gender": {
-        "0": "Keine Anrede",
-        "1": "Enby",
-        "2": "Herr",
-        "4": "Frau"
-    },
    "@shared/icon": "/assets/icons.json"

 }
--- a/apps/isa-app/src/config/config.integration.json
+++ b/apps/isa-app/src/config/config.integration.json
@@ -74,11 +74,5 @@
  "licence": {
    "scandit": "Ae7z0WDdRDFqG6oYuAXzesYGJpDLDqt+xWtQHOESiOjaSkB7IEIDJAk534U+cg1zGnk++4hOEK9hXEGR01NLTjh76w1fDL0U63OUjo50EHBXIUvzAVSur3pRY+1ER7SvSEWaT0hDOLYvYrTpdECtt1graN9yMvJzXD38VJKUfssT92p+YENV2Hul3eXIvaVjHqXE/yvupF+MlOMMUMhX0/Km/yTU9H9SjBdsXYihZmYWbt2JotO3Zs1ojXb0+3La10xb01S1q0XdDN6El3XMVilEtdmrP3WoGois8vpQBvOCEvduxCfILFAqjeWXTZvXSut9u+kQKpK8uHW4rVV6iVClpZfPYqKJqTh78AI9gpnfb/zO9GfQEDS3g7wI5WbQKqaNRzhTVowFRri4Ep9R5TRC1bnd00RC4zVaMkbu5kBOA7YoRjgUiYWHKJpi/VokZWyN6u1lsi5mTUbQkm1ZWfX5I/iUVYBgyHZYl+8kfFkwLPXGZNrF4xqubjKiCZRQj0oyNjHOBeHqvAekzhk7scX2g/NN+liRQv4ur413b+uXacSiiYIrLhtGgzrz1KRrtu19uB5odk3LoerDoiYXat7wEg9zUYT/+uBfO2X+uS7L5LW0PMI3hV+joQVpDk5SlA2868Nx0KWtPWmMf7xCuFIhDskfBsXZNRTblqxkk0RzzSqtjx9ihGr+/Tuzm8Pm0s4OQqV7b+++/Zn+Vo4rCqMTwutjOO7dqhah5hbOT1MqY/6VcjCXyDad3BXXr+WYU4GtYTe8Ytjkm/ZTG3fImoDbMchEcqnCw3oxG5e/gkdurE8g/mZlFOtzAN7KkqIsg6qLaC5COjfLPXsi/A=="
  },
-  "gender": {
-    "0": "Keine Anrede",
-    "1": "Enby",
-    "2": "Herr",
-    "4": "Frau"
-  },
  "@shared/icon": "/assets/icons.json"
 }
--- a/apps/isa-app/src/config/config.json
+++ b/apps/isa-app/src/config/config.json
@@ -76,11 +76,5 @@
    "licence": {
        "scandit": "Ae7z0WDdRDFqG6oYuAXzesYGJpDLDqt+xWtQHOESiOjaSkB7IEIDJAk534U+cg1zGnk++4hOEK9hXEGR01NLTjh76w1fDL0U63OUjo50EHBXIUvzAVSur3pRY+1ER7SvSEWaT0hDOLYvYrTpdECtt1graN9yMvJzXD38VJKUfssT92p+YENV2Hul3eXIvaVjHqXE/yvupF+MlOMMUMhX0/Km/yTU9H9SjBdsXYihZmYWbt2JotO3Zs1ojXb0+3La10xb01S1q0XdDN6El3XMVilEtdmrP3WoGois8vpQBvOCEvduxCfILFAqjeWXTZvXSut9u+kQKpK8uHW4rVV6iVClpZfPYqKJqTh78AI9gpnfb/zO9GfQEDS3g7wI5WbQKqaNRzhTVowFRri4Ep9R5TRC1bnd00RC4zVaMkbu5kBOA7YoRjgUiYWHKJpi/VokZWyN6u1lsi5mTUbQkm1ZWfX5I/iUVYBgyHZYl+8kfFkwLPXGZNrF4xqubjKiCZRQj0oyNjHOBeHqvAekzhk7scX2g/NN+liRQv4ur413b+uXacSiiYIrLhtGgzrz1KRrtu19uB5odk3LoerDoiYXat7wEg9zUYT/+uBfO2X+uS7L5LW0PMI3hV+joQVpDk5SlA2868Nx0KWtPWmMf7xCuFIhDskfBsXZNRTblqxkk0RzzSqtjx9ihGr+/Tuzm8Pm0s4OQqV7b+++/Zn+Vo4rCqMTwutjOO7dqhah5hbOT1MqY/6VcjCXyDad3BXXr+WYU4GtYTe8Ytjkm/ZTG3fImoDbMchEcqnCw3oxG5e/gkdurE8g/mZlFOtzAN7KkqIsg6qLaC5COjfLPXsi/A=="
    },
-    "gender": {
-        "0": "Keine Anrede",
-        "1": "Enby",
-        "2": "Herr",
-        "4": "Frau"
-    },
    "@shared/icon": "/assets/icons.json"
 }
--- a/apps/isa-app/src/config/config.production.json
+++ b/apps/isa-app/src/config/config.production.json
@@ -75,11 +75,5 @@
  "licence": {
    "scandit": "AVljxT/dG+TAIDDL2jTxm843juR2OtZ6lHLxRpYR7x9uYiSvY2IAHdRx8tjsf9KU7wK0F5cAeb/nLMHF6Vor9ps79wvuBQw6G3N0IW978b78ZUgPOFzxHUAMuD8dbkDZlX8r9y1cOd9sT3UNEwGrQ4siUt2oCkigyTxJAgYs1ijnjQid7q42hHk3tMXywrAYeu5MhF0TV1H77DRDMxPHD/xiR0zhFQRB2Dtnm1+e3LHKCyQjZ/zknEpQB6HS7UbCBoEDj4tohb83E6oqmQFWwt85/Jk9f49gxXakIcNODnQI5H63kSqpEmV9Al1a5L+WGZ6Bq1gwBbnD8FBXlVqxoooiFXW7jzzBa9LNmQiQ5J8yEkIsPeyOHec7F4ERvVONSMYwWyH39ZweSiRsZRM1UsFPhN96bCT5MEwkjPFn4gji6TPGEceJZvV3HwsiCT5Bgjla4bvDsZ2jYvAr9tSij8kIii9dHvsWlrimt+szHJLSz+8uNI6jAvXyr2f3oRxZD/F9osZHVWkgtAc+vVWqkxVJCqmpmoHOXI6TFSqSjYHddhZyU5r2lgQt0+NI6k/bV3iN7Le1RJCP/wuSDCTZjzsU1igB7UnIN2Y70CqCjIeVH9qlxaI1YAC9lwFv1FZvsiueYeJP1n39mmXCSELVtzxgIBEX5yaIHNbbGXd+e8JUgcO8vJ2JA2kJudaU+xfYR5SY//+J1kPsNSbnBnM25LL+LjeRB3QTfqV5sFq8ORWcIMITvkEaRfP3PVcOzb+hO4Ren4ezhJuyADulmvG8a9Kxxk6ymzBbE7a93SGVbxp7OQNEmvTn5+B9wJ7/l1mtvZL2TilrDZBQVMYWrGuUGpA="
  },
-  "gender": {
-    "0": "Keine Anrede",
-    "1": "Enby",
-    "2": "Herr",
-    "4": "Frau"
-  },
 "@shared/icon": "/assets/icons.json"
 }
--- a/apps/isa-app/src/config/config.staging.json
+++ b/apps/isa-app/src/config/config.staging.json
@@ -75,11 +75,5 @@
  "licence": {
    "scandit": "AVljxT/dG+TAIDDL2jTxm843juR2OtZ6lHLxRpYR7x9uYiSvY2IAHdRx8tjsf9KU7wK0F5cAeb/nLMHF6Vor9ps79wvuBQw6G3N0IW978b78ZUgPOFzxHUAMuD8dbkDZlX8r9y1cOd9sT3UNEwGrQ4siUt2oCkigyTxJAgYs1ijnjQid7q42hHk3tMXywrAYeu5MhF0TV1H77DRDMxPHD/xiR0zhFQRB2Dtnm1+e3LHKCyQjZ/zknEpQB6HS7UbCBoEDj4tohb83E6oqmQFWwt85/Jk9f49gxXakIcNODnQI5H63kSqpEmV9Al1a5L+WGZ6Bq1gwBbnD8FBXlVqxoooiFXW7jzzBa9LNmQiQ5J8yEkIsPeyOHec7F4ERvVONSMYwWyH39ZweSiRsZRM1UsFPhN96bCT5MEwkjPFn4gji6TPGEceJZvV3HwsiCT5Bgjla4bvDsZ2jYvAr9tSij8kIii9dHvsWlrimt+szHJLSz+8uNI6jAvXyr2f3oRxZD/F9osZHVWkgtAc+vVWqkxVJCqmpmoHOXI6TFSqSjYHddhZyU5r2lgQt0+NI6k/bV3iN7Le1RJCP/wuSDCTZjzsU1igB7UnIN2Y70CqCjIeVH9qlxaI1YAC9lwFv1FZvsiueYeJP1n39mmXCSELVtzxgIBEX5yaIHNbbGXd+e8JUgcO8vJ2JA2kJudaU+xfYR5SY//+J1kPsNSbnBnM25LL+LjeRB3QTfqV5sFq8ORWcIMITvkEaRfP3PVcOzb+hO4Ren4ezhJuyADulmvG8a9Kxxk6ymzBbE7a93SGVbxp7OQNEmvTn5+B9wJ7/l1mtvZL2TilrDZBQVMYWrGuUGpA="
  },
-  "gender": {
-    "0": "Keine Anrede",
-    "1": "Enby",
-    "2": "Herr",
-    "4": "Frau"
-  },
  "@shared/icon": "/assets/icons.json"
 }
--- a/apps/isa-app/src/config/config.test.json
+++ b/apps/isa-app/src/config/config.test.json
@@ -76,11 +76,5 @@
    "licence": {
        "scandit": "Ae7z0WDdRDFqG6oYuAXzesYGJpDLDqt+xWtQHOESiOjaSkB7IEIDJAk534U+cg1zGnk++4hOEK9hXEGR01NLTjh76w1fDL0U63OUjo50EHBXIUvzAVSur3pRY+1ER7SvSEWaT0hDOLYvYrTpdECtt1graN9yMvJzXD38VJKUfssT92p+YENV2Hul3eXIvaVjHqXE/yvupF+MlOMMUMhX0/Km/yTU9H9SjBdsXYihZmYWbt2JotO3Zs1ojXb0+3La10xb01S1q0XdDN6El3XMVilEtdmrP3WoGois8vpQBvOCEvduxCfILFAqjeWXTZvXSut9u+kQKpK8uHW4rVV6iVClpZfPYqKJqTh78AI9gpnfb/zO9GfQEDS3g7wI5WbQKqaNRzhTVowFRri4Ep9R5TRC1bnd00RC4zVaMkbu5kBOA7YoRjgUiYWHKJpi/VokZWyN6u1lsi5mTUbQkm1ZWfX5I/iUVYBgyHZYl+8kfFkwLPXGZNrF4xqubjKiCZRQj0oyNjHOBeHqvAekzhk7scX2g/NN+liRQv4ur413b+uXacSiiYIrLhtGgzrz1KRrtu19uB5odk3LoerDoiYXat7wEg9zUYT/+uBfO2X+uS7L5LW0PMI3hV+joQVpDk5SlA2868Nx0KWtPWmMf7xCuFIhDskfBsXZNRTblqxkk0RzzSqtjx9ihGr+/Tuzm8Pm0s4OQqV7b+++/Zn+Vo4rCqMTwutjOO7dqhah5hbOT1MqY/6VcjCXyDad3BXXr+WYU4GtYTe8Ytjkm/ZTG3fImoDbMchEcqnCw3oxG5e/gkdurE8g/mZlFOtzAN7KkqIsg6qLaC5COjfLPXsi/A=="
    },
-    "gender": {
-        "0": "Keine Anrede",
-        "1": "Enby",
-        "2": "Herr",
-        "4": "Frau"
-      },
    "@shared/icon": "/assets/icons.json"
 }
--- a/apps/isa-app/src/polyfills.ts
+++ b/apps/isa-app/src/polyfills.ts
@@ -23,7 +23,7 @@
 * 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`.
+import 'web-animations-js'; // Run `npm install --save web-animations-js`.

 /**
 * By default, zone.js will patch all possible macroTask and DomEvents
@@ -57,3 +57,4 @@ import 'zone.js'; // Included with Angular CLI.
 /***************************************************************************************************
 * APPLICATION IMPORTS
 */
+import 'hammerjs';
--- a/apps/isa/remission/src/lib/mock/mock-remission.service.ts
+++ b/apps/isa/remission/src/lib/mock/mock-remission.service.ts
@@ -47,7 +47,7 @@ export class MockRemissionService extends RemissionService {
  >();
  private remissionSubjectIdRef = new Map<number, number>();

-  private reloadProductsSubject = new Subject<void>();
+  private reloadProductsSubject = new Subject();
  private productSubject = new BehaviorSubject<RemissionProduct[]>(
    remissionProducts
  );
--- a/apps/modal/availabilities/src/lib/availabilities.component.html
+++ b/apps/modal/availabilities/src/lib/availabilities.component.html
@@ -35,11 +35,7 @@
      </div>

      <div class="branch-actions">
-        <button
-          *ngIf="(branch.id | stockInfo: (inStock$ | async))?.availableQuantity > 0 && branch?.isShippingEnabled"
-          class="cta-reserve"
-          (click)="reserve(branch)"
-        >
+        <button *ngIf="(branch.id | stockInfo: (inStock$ | async))?.availableQuantity > 0" class="cta-reserve" (click)="reserve(branch)">
          Reservieren
        </button>

--- a/apps/modal/availabilities/src/lib/availabilities.component.ts
+++ b/apps/modal/availabilities/src/lib/availabilities.component.ts
@@ -37,7 +37,7 @@ export class ModalAvailabilitiesComponent {
          (branch) =>
            branch &&
            branch?.isOnline &&
-            // branch?.isShippingEnabled && ------ Rausgenommen aufgrund des Tickets #4712
+            branch?.isShippingEnabled &&
            branch?.isOrderingEnabled &&
            branch?.id !== userbranch?.id &&
            branch?.branchType === 1
--- a/apps/page/assortment/src/lib/price-update/price-update-list/price-update-item.component.html
+++ b/apps/page/assortment/src/lib/price-update/price-update-list/price-update-item.component.html
@@ -10,7 +10,7 @@
 <div class="page-price-update-item__item-card p-5 h-[212px] bg-white">
  <div class="page-price-update-item__item-thumbnail text-center mr-4 w-[47px] h-[73px]">
    <img
-      class="page-price-update-item__item-image w-[47px] max-h-[73px]"
+      class="page-price-update-item__item-image w-[47px] h-[73px]"
      loading="lazy"
      *ngIf="item?.product?.ean | productImage; let productImage"
      [src]="productImage"
--- a/apps/page/catalog/src/lib/article-details/article-details.component.html
+++ b/apps/page/catalog/src/lib/article-details/article-details.component.html
@@ -1,7 +1,7 @@
 <div class="page-article-details__wrapper">
  <div #detailsContainer class="page-article-details__container px-5" *ngIf="store.item$ | async; let item">
    <div class="page-article-details__product-details mb-3">
-      <div class="page-article-details__product-bookmark flex fixed justify-self-end">
+      <div class="page-article-details__product-bookmark justify-self-end">
        <div *ngIf="showArchivBadge$ | async" class="archiv-badge">
          <button [uiOverlayTrigger]="archivTooltip" class="p-0 m-0 outline-none border-none bg-transparent relative -top-[0.3125rem]">
            <img src="/assets/images/bookmark_benachrichtigung_archiv.svg" alt="Archiv Badge" />
@@ -9,7 +9,9 @@
              <ng-container *ngIf="isAvailable$ | async; else notAvailable">
                Archivtitel. Wird nicht mehr gedruckt. Artikel ist bestellbar, weil lieferbar.
              </ng-container>
-              <ng-template #notAvailable> Archivtitel. Wird nicht mehr gedruckt. Nicht bestellbar. </ng-template>
+              <ng-template #notAvailable>
+                Archivtitel. Wird nicht mehr gedruckt. Nicht bestellbar.
+              </ng-template>
            </ui-tooltip>
          </button>
        </div>
@@ -28,9 +30,9 @@
        </div>
        <div *ngIf="showPromotionBadge$ | async" class="promotion-badge">
          <button [uiOverlayTrigger]="promotionTooltip" class="p-0 m-0 outline-none border-none bg-transparent relative -top-[0.3125rem]">
-            <shared-icon-badge icon="gift" alt="Prämienkatalog Badge"></shared-icon-badge>
+            <ui-icon-badge icon="gift" alt="Prämienkatalog Badge"></ui-icon-badge>
            <ui-tooltip yPosition="above" xPosition="after" [yOffset]="-11" [xOffset]="-8" #promotionTooltip [closeable]="true">
-              Der Artikel ist als Prämie für {{ promotionPoints$ | async }} Punkte erhältlich.
+              Dieser Artikel befindet sich im Prämienkatalog.
            </ui-tooltip>
          </button>
        </div>
@@ -42,7 +44,7 @@
            <img
              class="max-h-[19.6875rem] max-w-[12.1875rem] rounded"
              (load)="loadImage()"
-              [src]="item.imageId | productImage: 195 : 315 : true"
+              [src]="item.imageId | productImage: 195:315:true"
              alt="product image"
            />
            <ui-icon
@@ -105,7 +107,7 @@

      <div class="page-article-details__product-price-info flex flex-col mb-4 flex-nowrap self-end">
        <div class="page-article-details__product-price font-bold text-xl self-end" *ngIf="price$ | async; let price">
-          {{ price?.value?.value | currency: price?.value?.currency : 'code' }}
+          {{ price?.value?.value | currency: price?.value?.currency:'code' }}
        </div>
        <div *ngIf="price$ | async; let price" class="page-article-details__product-price-bound self-end">
          {{ price?.vat?.vatType | vat: (priceMaintained$ | async) }}
@@ -347,9 +349,6 @@
      *ngIf="store.item$ | async; let item"
      class="shadow-[#dce2e9_0px_-2px_18px_0px] mb-5 border-none outline-none flex items-center px-5 h-14 min-h-[3.5rem] bg-white w-full"
      (click)="showRecommendations = true"
-      matomoClickCategory="prodict-details"
-      matomoClickAction="click"
-      matomoClickName="recommendations"
    >
      <span class="uppercase text-[#0556B4] font-bold text-p3">Empfehlungen</span>
      <img class="absolute right-5 -top-[0.125rem] h-12" src="assets/images/recommendation_tag.png" alt="recommendation icon" />
@@ -365,9 +364,6 @@
    *ngIf="!(store.isDownload$ | async)"
    class="text-brand border-2 border-brand bg-white font-bold text-lg px-[1.375rem] py-4 rounded-full mr-[1.875rem]"
    (click)="showAvailabilities()"
-    matomoClickCategory="prodict-details"
-    matomoClickAction="click"
-    matomoClickName="bestaende-in-anderen-filialen"
  >
    Bestände in anderen Filialen
  </button>
@@ -375,9 +371,6 @@
    class="text-white bg-brand border-brand font-bold text-lg px-[1.375rem] py-4 rounded-full border-none no-underline"
    (click)="showPurchasingModal()"
    [disabled]="!(isAvailable$ | async) || (fetchingAvailabilities$ | async) || (item?.features && (item?.features)[0]?.key === 'PFO')"
-    matomoClickCategory="prodict-details"
-    matomoClickAction="click"
-    matomoClickName="in-den-Warenkorb"
  >
    In den Warenkorb
  </button>
--- a/apps/page/catalog/src/lib/article-details/article-details.component.ts
+++ b/apps/page/catalog/src/lib/article-details/article-details.component.ts
@@ -76,12 +76,7 @@ export class ArticleDetailsComponent implements OnInit, OnDestroy {

  showSubscriptionBadge$ = this.store.item$.pipe(map((item) => item?.features?.find((i) => i.key === 'PFO')));

-  hasPromotionFeature$ = this.store.item$.pipe(map((item) => !!item?.features?.find((i) => i.key === 'Promotion')));
-  promotionPoints$ = this.store.item$.pipe(map((item) => item?.redemptionPoints));
-
-  showPromotionBadge$ = combineLatest([this.hasPromotionFeature$, this.promotionPoints$]).pipe(
-    map(([hasPromotionFeature, promotionPoints]) => hasPromotionFeature && promotionPoints > 0)
-  );
+  showPromotionBadge$ = this.store.item$.pipe(map((item) => item?.features?.find((i) => i.key === 'Promotion')));

  showArchivBadge$ = this.store.item$.pipe(map((item) => item?.features?.find((i) => i.key === 'ARC')));

@@ -141,7 +136,7 @@ export class ArticleDetailsComponent implements OnInit, OnDestroy {
    this.store.deliveryB2BAvailability$,
  ]).pipe(
    map((availabilities) => {
-      return availabilities?.some((availability) => (availability as any)?.priceMaintained) ?? false;
+      return availabilities?.some((availability) => availability?.priceMaintained) ?? false;
    })
  );

@@ -343,7 +338,7 @@ export class ArticleDetailsComponent implements OnInit, OnDestroy {
    const item = await this.store.item$.pipe(first()).toPromise();
    const modal = this.uiModal.open<BranchDTO>({
      content: ModalAvailabilitiesComponent,
-      title: 'Bestände in anderen Filialen',
+      title: 'Weitere Verfügbarkeiten',
      data: {
        item,
      },
@@ -439,10 +434,11 @@ export class ArticleDetailsComponent implements OnInit, OnDestroy {
  async navigateToResultList() {
    const processId = this.applicationService.activatedProcessId;
    let crumbs = await this.breadcrumb
-      .getBreadcrumbsByKeyAndTags$(this.applicationService.activatedProcessId, ['catalog', 'details'])
+      .getBreadcrumbsByKeyAndTags$(this.applicationService.activatedProcessId, ['catalog'])
      .pipe(first())
      .toPromise();

+    crumbs = crumbs.filter((crumb) => !crumb.tags?.includes('details'));
    const crumb = crumbs[crumbs.length - 1];
    if (!!crumb) {
      await this._navigationService.getArticleSearchResultsPath(processId, { queryParams: crumb.params }).navigate();
--- a/apps/page/catalog/src/lib/article-details/article-details.module.ts
+++ b/apps/page/catalog/src/lib/article-details/article-details.module.ts
@@ -13,8 +13,6 @@ import { UiCommonModule } from '@ui/common';
 import { OrderDeadlinePipeModule } from '@shared/pipes/order-deadline';
 import { IconModule } from '@shared/components/icon';
 import { ArticleDetailsTextComponent } from './article-details-text/article-details-text.component';
-import { IconBadgeComponent } from 'apps/shared/components/icon/src/lib/badge/icon-badge.component';
-import { MatomoModule } from 'ngx-matomo-client';

@NgModule({
  imports: [
@@ -30,8 +28,6 @@ import { MatomoModule } from 'ngx-matomo-client';
    PipesModule,
    OrderDeadlinePipeModule,
    ArticleDetailsTextComponent,
-    IconBadgeComponent,
-    MatomoModule,
  ],
  exports: [ArticleDetailsComponent, ArticleRecommendationsComponent],
  declarations: [ArticleDetailsComponent, ArticleRecommendationsComponent],
--- a/apps/page/catalog/src/lib/article-details/recommendations/article-recommendations.component.html
+++ b/apps/page/catalog/src/lib/article-details/recommendations/article-recommendations.component.html
@@ -9,7 +9,7 @@
  <p>Neben dem Titel "{{ item.product?.name }}" gibt es noch andere Artikel, die Sie interessieren könnten.</p>

  <div class="articles">
-    <span class="label mb-2">
+    <span class="label">
      <ui-icon icon="recommendation" size="20px"></ui-icon>
      Artikel
    </span>
@@ -28,10 +28,9 @@
          (click)="close.emit()"
        >
          <img [src]="recommendation.product?.ean | productImage: 195:315:true" alt="product-image" />
-          <div class="flex flex-col">
-            <span class="format">{{ recommendation.product?.formatDetail }}</span>
-            <span class="price">{{ recommendation.catalogAvailability?.price?.value?.value | currency: ' ' }} EUR</span>
-          </div>
+
+          <span class="format">{{ recommendation.product?.formatDetail }}</span>
+          <span class="price">{{ recommendation.catalogAvailability?.price?.value?.value | currency: ' ' }} EUR</span>
        </a>
      </ui-slider>
    </ng-container>
--- a/apps/page/catalog/src/lib/article-details/recommendations/article-recommendations.component.scss
+++ b/apps/page/catalog/src/lib/article-details/recommendations/article-recommendations.component.scss
@@ -29,12 +29,12 @@ p {
  }

  .article {
-    @apply flex flex-col mr-7 mt-4 no-underline text-black h-full min-w-[11rem] justify-between;
+    @apply flex flex-col mr-7 mt-4 no-underline text-black;

    img {
      @apply rounded-xl;
-      max-height: 19.6875rem;
-      max-width: 11rem;
+      height: 315px;
+      max-width: 195px;
      box-shadow: 0 0 15px #949393;
    }

--- a/apps/page/catalog/src/lib/article-search/article-search.component.ts
+++ b/apps/page/catalog/src/lib/article-search/article-search.component.ts
@@ -24,7 +24,7 @@ import { FilterAutocompleteProvider } from '@shared/components/filter';
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ArticleSearchComponent implements OnInit, OnDestroy {
-  private _onDestroy$ = new Subject<void>();
+  private _onDestroy$ = new Subject();
  private _processId$: Observable<number>;

  constructor(
--- a/apps/page/catalog/src/lib/article-search/article-search.module.ts
+++ b/apps/page/catalog/src/lib/article-search/article-search.module.ts
@@ -6,10 +6,12 @@ import { ArticleSearchComponent } from './article-search.component';
 import { SearchResultsModule } from './search-results/search-results.module';
 import { SearchMainModule } from './search-main/search-main.module';
 import { SearchFilterModule } from './search-filter/search-filter.module';
+import { ArticleSearchService } from './article-search.store';

@NgModule({
  imports: [CommonModule, RouterModule, UiIconModule, SearchResultsModule, SearchMainModule, SearchFilterModule],
  exports: [ArticleSearchComponent],
  declarations: [ArticleSearchComponent],
+  providers: [ArticleSearchService],
 })
 export class ArticleSearchModule {}
--- a/apps/page/catalog/src/lib/article-search/search-filter/search-filter.component.ts
+++ b/apps/page/catalog/src/lib/article-search/search-filter/search-filter.component.ts
@@ -58,7 +58,7 @@ export class ArticleSearchFilterComponent implements OnInit, OnDestroy {
    }
  }

-  private _onDestroy$ = new Subject<void>();
+  private _onDestroy$ = new Subject();

  constructor(
    private articleSearch: ArticleSearchService,
--- a/apps/page/catalog/src/lib/article-search/search-main/search-main.component.html
+++ b/apps/page/catalog/src/lib/article-search/search-main/search-main.component.html
@@ -1,6 +1,8 @@
 <div class="bg-white rounded py-10 px-4 text-center shadow-[0_-2px_24px_0_#dce2e9] h-full">
  <h1 class="text-h3 text-[1.625rem] font-bold mb-[0.375rem]">Artikelsuche</h1>
-  <p class="text-lg mb-10">Welchen Artikel suchen Sie?</p>
+  <p class="text-lg mb-10">
+    Welchen Artikel suchen Sie?
+  </p>
  <ng-container *ngIf="filter$ | async; let filter">
    <shared-filter-filter-group-main
      class="mb-8 w-full"
@@ -36,9 +38,6 @@
          <button
            class="flex flex-row items-center outline-none border-none bg-white text-black text-p2 m-0 p-0"
            (click)="setQueryHistory(filter, recentQuery.friendlyName)"
-            matomoClickCategory="search"
-            matomoClickAction="click"
-            matomoClickName="recent-search"
          >
            <shared-icon
              class="flex w-8 h-8 justify-center items-center mr-3 rounded-full text-black bg-[#edeff0]"
--- a/apps/page/catalog/src/lib/article-search/search-main/search-main.module.ts
+++ b/apps/page/catalog/src/lib/article-search/search-main/search-main.module.ts
@@ -4,10 +4,9 @@ import { ArticleSearchMainComponent } from './search-main.component';
 import { FilterModule } from '@shared/components/filter';
 import { RouterModule } from '@angular/router';
 import { IconComponent, IconModule } from '@shared/components/icon';
-import { MatomoModule } from 'ngx-matomo-client';

@NgModule({
-  imports: [CommonModule, RouterModule, IconComponent, FilterModule, IconModule, MatomoModule],
+  imports: [CommonModule, RouterModule, IconComponent, FilterModule, IconModule],
  exports: [ArticleSearchMainComponent],
  declarations: [ArticleSearchMainComponent],
  providers: [],
--- a/apps/page/catalog/src/lib/article-search/search-results/search-result-item.component.html
+++ b/apps/page/catalog/src/lib/article-search/search-results/search-result-item.component.html
@@ -5,7 +5,7 @@
 >
  <div class="page-search-result-item__item-thumbnail text-center mr-4 w-[3.125rem] h-[4.9375rem]">
    <img
-      class="page-search-result-item__item-image w-[3.125rem] max-h-[4.9375rem]"
+      class="page-search-result-item__item-image w-[3.125rem] h-[4.9375rem]"
      loading="lazy"
      *ngIf="item?.imageId | thumbnailUrl; let thumbnailUrl"
      [src]="thumbnailUrl"
@@ -67,7 +67,7 @@
      class="page-search-result-item__item-price desktop-small:text-p3 font-bold justify-self-end"
      [class.page-search-result-item__item-price-primary]="primaryOutletActive"
    >
-      {{ item?.catalogAvailability?.price?.value?.value | currency: 'EUR' : 'code' }}
+      {{ item?.catalogAvailability?.price?.value?.value | currency: 'EUR':'code' }}
    </div>

    <div class="page-search-result-item__item-select-bullet justify-self-end">
@@ -75,14 +75,9 @@
        *ngIf="selectable"
        (click)="$event.stopPropagation()"
        [ngModel]="selected"
-        (ngModelChange)="
-          setSelected();
-          tracker.trackEvent({ category: 'Trefferliste', action: 'select', name: item.product.name, value: selected ? 1 : 0 })
-        "
+        (ngModelChange)="setSelected()"
        class="isa-select-bullet"
        type="checkbox"
-        matomoTracker
-        #tracker="matomo"
      />
    </div>

--- a/apps/page/catalog/src/lib/article-search/search-results/search-results.component.html
+++ b/apps/page/catalog/src/lib/article-search/search-results/search-results.component.html
@@ -11,7 +11,7 @@
      [hint]="searchboxHint$ | async"
      [loading]="fetching$ | async"
      [inputGroup]="filter?.input | group: 'main'"
-      (search)="search({ filter, clear: true })"
+      (search)="search({filter, clear: true})"
      [showDescription]="false"
      [scanner]="true"
    ></shared-filter-input-group-main>
@@ -32,7 +32,8 @@
    class="page-search-results__items-count inline-flex flex-row items-center pr-5 text-p3"
    [class.mb-4]="primaryOutletActive$ | async"
  >
-    {{ hits ?? 0 }}
+    {{ hits ??
+      0 }}
    Titel
  </div>
 </div>
@@ -47,7 +48,7 @@
 </div>

 <ng-container *ngIf="primaryOutletActive$ | async; else sideOutlet">
-  <cdk-virtual-scroll-viewport class="product-list" [itemSize]="103 * (scale$ | async)" (scrolledIndexChange)="scrolledIndexChange($event)">
+  <cdk-virtual-scroll-viewport class="product-list" [itemSize]="106 * (scale$ | async)" (scrolledIndexChange)="scrolledIndexChange($event)">
    <a
      *cdkVirtualFor="let item of results$ | async; let i = index; trackBy: trackByItemId"
      [routerLink]="getDetailsPath(item.id)"
@@ -74,9 +75,6 @@
      *ngIf="(selectedItemIds$ | async)?.length > 0"
      class="cta-cart cta-action-primary"
      (click)="addToCart()"
-      matomoClickCategory="Trefferliste"
-      matomoClickAction="click"
-      matomoClickName="In den Warenkorb legen"
    >
      <ui-spinner [show]="loading$ | async">In den Warenkorb legen</ui-spinner>
    </button>
@@ -84,7 +82,7 @@
 </ng-container>

 <ng-template #sideOutlet>
-  <cdk-virtual-scroll-viewport class="product-list" [itemSize]="191 * (scale$ | async)" (scrolledIndexChange)="scrolledIndexChange($event)">
+  <cdk-virtual-scroll-viewport class="product-list" [itemSize]="222 * (scale$ | async)" (scrolledIndexChange)="scrolledIndexChange($event)">
    <a
      *cdkVirtualFor="let item of results$ | async; let i = index; trackBy: trackByItemId"
      [routerLink]="getDetailsPath(item.id)"
--- a/apps/page/catalog/src/lib/article-search/search-results/search-results.component.ts
+++ b/apps/page/catalog/src/lib/article-search/search-results/search-results.component.ts
@@ -155,7 +155,7 @@ export class ArticleSearchResultsComponent implements OnInit, OnDestroy, AfterVi

          const cleanQueryParams = this.cleanupQueryParams(queryParams);

-          if (processChanged) {
+          if (this.route.outlet === 'primary' && processChanged) {
            this.scrollToItem(this._getScrollIndexFromCache());
          }

@@ -209,6 +209,7 @@ export class ArticleSearchResultsComponent implements OnInit, OnDestroy, AfterVi
            if (searchCompleted.state.hits === 1) {
              const item = searchCompleted.state.items.find((f) => f);
              const ean = this.route?.snapshot?.params?.ean;
+              const itemId = this.route?.snapshot?.params?.id ? Number(this.route?.snapshot?.params?.id) : item.id; // Nicht zum ersten Item der Liste springen wenn bereits eines selektiert ist

              // Navigation from Cart uses ean
              if (!!ean) {
@@ -223,7 +224,7 @@ export class ArticleSearchResultsComponent implements OnInit, OnDestroy, AfterVi
                await this._navigationService
                  .getArticleDetailsPath({
                    processId,
-                    itemId: item.id,
+                    itemId,
                    extras: { queryParams: params },
                  })
                  .navigate();
@@ -271,7 +272,7 @@ export class ArticleSearchResultsComponent implements OnInit, OnDestroy, AfterVi
  }

  private _getScrollIndexFromCache(): number {
-    return this.cache.get<number>({ processId: this.getProcessId(), token: this.SCROLL_INDEX_TOKEN }) ?? 0;
+    return this.cache.get<number>({ processId: this.getProcessId(), token: this.SCROLL_INDEX_TOKEN });
  }

  scrollToItem(i?: number) {
--- a/apps/page/catalog/src/lib/article-search/search-results/search-results.module.ts
+++ b/apps/page/catalog/src/lib/article-search/search-results/search-results.module.ts
@@ -19,7 +19,6 @@ import { FilterAutocompleteProvider, FilterModule, OrderByFilterModule } from '@
 import { FocusSearchboxEvent } from '../focus-searchbox.event';
 import { ArticleSearchMainAutocompleteProvider } from '../providers';
 import { IconComponent } from '@shared/components/icon';
-import { MatomoModule } from 'ngx-matomo-client';

@NgModule({
  imports: [
@@ -36,7 +35,6 @@ import { MatomoModule } from 'ngx-matomo-client';
    UiTooltipModule,
    FilterModule,
    IconComponent,
-    MatomoModule,
  ],
  exports: [ArticleSearchResultsComponent, SearchResultItemComponent],
  declarations: [
--- a/apps/page/catalog/src/lib/page-catalog-routing.module.ts
+++ b/apps/page/catalog/src/lib/page-catalog-routing.module.ts
@@ -6,45 +6,24 @@ import { ArticleSearchFilterComponent } from './article-search/search-filter/sea
 import { ArticleSearchMainComponent } from './article-search/search-main/search-main.component';
 import { ArticleSearchResultsComponent } from './article-search/search-results/search-results.component';
 import { PageCatalogComponent } from './page-catalog.component';
-import { MatomoRouteData } from 'ngx-matomo-client';

 const routes: Routes = [
  {
    path: '',
    component: PageCatalogComponent,
-    data: {
-      matomo: {
-        title: 'Artikelsuche',
-      } as MatomoRouteData,
-    },
    children: [
      {
        path: 'filter',
        component: ArticleSearchFilterComponent,
-        data: {
-          matomo: {
-            title: 'Artikelsuche - Filter',
-          } as MatomoRouteData,
-        },
      },
      {
        path: 'filter/:id',
        component: ArticleSearchFilterComponent,
-        data: {
-          matomo: {
-            title: 'Artikelsuche - Filter',
-          } as MatomoRouteData,
-        },
      },
      {
        path: 'search',
        component: ArticleSearchComponent,
        outlet: 'side',
-        data: {
-          matomo: {
-            title: 'Artikelsuche',
-          } as MatomoRouteData,
-        },
        children: [
          {
            path: '',
@@ -55,59 +34,29 @@ const routes: Routes = [
      {
        path: 'results',
        component: ArticleSearchResultsComponent,
-        data: {
-          matomo: {
-            title: 'Artikelsuche - Trefferliste',
-          } as MatomoRouteData,
-        },
      },
      {
        path: 'results',
        component: ArticleSearchResultsComponent,
        outlet: 'side',
-        data: {
-          matomo: {
-            title: 'Artikelsuche - Trefferliste',
-          } as MatomoRouteData,
-        },
      },
      {
        path: 'results/:id',
        component: ArticleSearchResultsComponent,
        outlet: 'side',
-        data: {
-          matomo: {
-            title: 'Artikelsuche - Artikeldetails',
-          } as MatomoRouteData,
-        },
      },
      {
        path: 'results/:ean/ean',
        component: ArticleSearchResultsComponent,
        outlet: 'side',
-        data: {
-          matomo: {
-            title: 'Artikelsuche - Artikeldetails (EAN)',
-          } as MatomoRouteData,
-        },
      },
      {
        path: 'details/:id',
        component: ArticleDetailsComponent,
-        data: {
-          matomo: {
-            title: 'Artikelsuche - Artikeldetails (ID)',
-          } as MatomoRouteData,
-        },
      },
      {
        path: 'details/:ean/ean',
        component: ArticleDetailsComponent,
-        data: {
-          matomo: {
-            title: 'Artikelsuche - Artikeldetails (EAN)',
-          } as MatomoRouteData,
-        },
      },
      {
        path: '',
--- a/apps/page/catalog/src/lib/page-catalog.component.ts
+++ b/apps/page/catalog/src/lib/page-catalog.component.ts
@@ -11,14 +11,12 @@ import { combineLatest, fromEvent, Observable, Subject } from 'rxjs';
 import { first, map, switchMap, takeUntil, withLatestFrom } from 'rxjs/operators';
 import { ActionsSubject } from '@ngrx/store';
 import { DomainAvailabilityService } from '@domain/availability';
-import { provideComponentStore } from '@ngrx/component-store';
-import { ArticleSearchService } from './article-search/article-search.store';

@Component({
  selector: 'page-catalog',
  templateUrl: 'page-catalog.component.html',
  styleUrls: ['page-catalog.component.scss'],
-  providers: [provideComponentStore(ArticleSearchService)],
+  providers: [],
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class PageCatalogComponent implements OnInit, AfterViewInit, OnDestroy {
@@ -33,7 +31,7 @@ export class PageCatalogComponent implements OnInit, AfterViewInit, OnDestroy {
    return `${this.breadcrumbRef?.nativeElement?.clientWidth}px`;
  }

-  _onDestroy$ = new Subject<void>();
+  _onDestroy$ = new Subject<boolean>();

  get isTablet$() {
    return this._environmentService.matchTablet$;
--- a/apps/page/checkout/src/lib/checkout-dummy/checkout-dummy-data.ts
+++ b/apps/page/checkout/src/lib/checkout-dummy/checkout-dummy-data.ts
@@ -1,5 +1,3 @@
 import { ShoppingCartItemDTO } from '@swagger/checkout';

-export interface CheckoutDummyData extends ShoppingCartItemDTO {
-  changeDataFromCart?: boolean;
-}
+export interface CheckoutDummyData extends ShoppingCartItemDTO {}
--- a/apps/page/checkout/src/lib/checkout-dummy/checkout-dummy.component.ts
+++ b/apps/page/checkout/src/lib/checkout-dummy/checkout-dummy.component.ts
@@ -1,5 +1,6 @@
 import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { Router } from '@angular/router';
 import { ApplicationService } from '@core/application';
 import { ItemDTO } from '@swagger/cat';
 import { DateAdapter } from '@ui/common';
@@ -8,8 +9,7 @@ import { Subject } from 'rxjs';
 import { first, shareReplay, takeUntil } from 'rxjs/operators';
 import { CheckoutDummyData } from './checkout-dummy-data';
 import { CheckoutDummyStore } from './checkout-dummy.store';
-import { CheckoutNavigationService, CustomerSearchNavigation } from '@shared/services';
-import { Router } from '@angular/router';
+import { CheckoutNavigationService } from '@shared/services';

@Component({
  selector: 'page-checkout-dummy',
@@ -38,15 +38,14 @@ export class CheckoutDummyComponent implements OnInit, OnDestroy {
  _onDestroy$ = new Subject<void>();

  constructor(
+    private _router: Router,
    private _fb: UntypedFormBuilder,
    private _dateAdapter: DateAdapter,
    private _modal: UiModalService,
    private _store: CheckoutDummyStore,
    private _ref: UiModalRef<any, CheckoutDummyData>,
    private readonly _applicationService: ApplicationService,
-    private readonly _checkoutNavigationService: CheckoutNavigationService,
-    private readonly _customerNavigationService: CustomerSearchNavigation,
-    private _router: Router
+    private readonly _checkoutNavigationService: CheckoutNavigationService
  ) {}

  ngOnInit() {
@@ -59,7 +58,7 @@ export class CheckoutDummyComponent implements OnInit, OnDestroy {
      }
    });

-    if (this.hasShoppingCartItemToUpdate()) {
+    if (!!this._ref?.data && Object.keys(this._ref?.data).length !== 0) {
      const data = this._ref?.data;
      this._store.patchState({ shoppingCartItem: data });
      this.populateFormFromModalData(data);
@@ -150,14 +149,6 @@ export class CheckoutDummyComponent implements OnInit, OnDestroy {
    this.control.markAsUntouched();
  }

-  hasShoppingCartItemToUpdate(): boolean {
-    const hasShoppingCartItem = !!this._ref.data?.id;
-    if (!!this._ref?.data && hasShoppingCartItem) {
-      return true;
-    }
-    return false;
-  }
-
  async nextItem() {
    if (this.control.invalid || this.control.disabled) {
      this.control.enable();
@@ -167,7 +158,7 @@ export class CheckoutDummyComponent implements OnInit, OnDestroy {

    try {
      const branch = await this._store.currentBranch$.pipe(first()).toPromise();
-      if (this.hasShoppingCartItemToUpdate()) {
+      if (!!this._ref?.data && Object.keys(this._ref?.data).length !== 0) {
        await this._store.createAddToCartItem(this.control, branch, true);
        this._store.updateCart(() => {});
      } else {
@@ -196,17 +187,16 @@ export class CheckoutDummyComponent implements OnInit, OnDestroy {

    try {
      const branch = await this._store.currentBranch$.pipe(first()).toPromise();
-      if (this.hasShoppingCartItemToUpdate()) {
+      if (!!this._ref?.data && Object.keys(this._ref?.data).length !== 0) {
        await this._store.createAddToCartItem(this.control, branch, true);
        this._store.updateCart(async () => {
          // Set filter for navigation to customer search if customer is not set
          const customer = await this._store.customer$.pipe(first()).toPromise();
          const customerFilter = await this._store.customerFilter$.pipe(first()).toPromise();
          let filter: { [key: string]: string };
-          if (!customer && !this._ref?.data?.changeDataFromCart) {
+          if (!customer) {
            filter = customerFilter;
-            const path = this._customerNavigationService.defaultRoute({ processId: this._applicationService.activatedProcessId }).path;
-            await this._router.navigate(path, {
+            this._router.navigate(['/kunde', this._applicationService.activatedProcessId, 'customer', 'search'], {
              queryParams: { customertype: filter.customertype },
            });
          } else {
@@ -221,10 +211,9 @@ export class CheckoutDummyComponent implements OnInit, OnDestroy {
          const customer = await this._store.customer$.pipe(first()).toPromise();
          const customerFilter = await this._store.customerFilter$.pipe(first()).toPromise();
          let filter: { [key: string]: string };
-          if (!customer && !this._ref?.data?.changeDataFromCart) {
+          if (!customer) {
            filter = customerFilter;
-            const path = this._customerNavigationService.defaultRoute({ processId: this._applicationService.activatedProcessId }).path;
-            await this._router.navigate(path, {
+            this._router.navigate(['/kunde', this._applicationService.activatedProcessId, 'customer', 'search'], {
              queryParams: { customertype: filter.customertype },
            });
          } else {
--- a/apps/page/checkout/src/lib/checkout-review/checkout-review.component.html
+++ b/apps/page/checkout/src/lib/checkout-review/checkout-review.component.html
@@ -14,7 +14,7 @@

      <div class="btn-wrapper">
        <a class="cta-primary" [routerLink]="productSearchBasePath">Artikel suchen</a>
-        <button class="cta-secondary" (click)="openDummyModal({})">Neuanlage</button>
+        <button class="cta-secondary" (click)="openDummyModal()">Neuanlage</button>
      </div>
    </div>
  </div>
@@ -54,7 +54,7 @@
              <button
                *ngIf="group.orderType === 'Dummy'"
                class="text-brand border-none font-bold text-p1 outline-none pl-4"
-                (click)="openDummyModal({ changeDataFromCart: true })"
+                (click)="openDummyModal()"
              >
                Hinzufügen
              </button>
--- a/apps/page/checkout/src/lib/checkout-review/checkout-review.component.ts
+++ b/apps/page/checkout/src/lib/checkout-review/checkout-review.component.ts
@@ -292,15 +292,15 @@ export class CheckoutReviewComponent implements OnInit, OnDestroy, AfterViewInit
    this._store.notificationsControl = undefined;
  }

-  openDummyModal({ data, changeDataFromCart = false }: { data?: CheckoutDummyData; changeDataFromCart?: boolean }) {
+  openDummyModal(data?: CheckoutDummyData) {
    this.uiModal.open({
      content: CheckoutDummyComponent,
-      data: { ...data, changeDataFromCart },
+      data,
    });
  }

  changeDummyItem({ shoppingCartItem }: { shoppingCartItem: ShoppingCartItemDTO }) {
-    this.openDummyModal({ data: shoppingCartItem, changeDataFromCart: true });
+    this.openDummyModal(shoppingCartItem);
  }

  async changeItem({ shoppingCartItem }: { shoppingCartItem: ShoppingCartItemDTO }) {
--- a/apps/page/checkout/src/lib/checkout-review/details/checkout-review-details.component.html
+++ b/apps/page/checkout/src/lib/checkout-review/details/checkout-review-details.component.html
@@ -5,10 +5,14 @@
 <ng-container *ngIf="buyer$ | async; let buyer">
  <div *ngIf="!(showAddresses$ | async)" class="flex flex-row items-start justify-between p-5">
    <div class="flex flex-row flex-wrap pr-4">
-      <ng-container *ngIf="getNameFromBuyer(buyer); let name">
-        <div class="mr-3">{{ name.label }}</div>
-        <div class="font-bold">{{ name.value }}</div>
+      <ng-container *ngIf="!!buyer?.lastName && !!buyer?.firstName; else organisation">
+        <div class="mr-3">Nachname, Vorname</div>
+        <div class="font-bold">{{ buyer?.lastName }}, {{ buyer?.firstName }}</div>
      </ng-container>
+      <ng-template #organisation>
+        <div class="mr-3">Firmenname</div>
+        <div class="font-bold">{{ buyer?.organisation?.name }}</div>
+      </ng-template>
    </div>

    <button (click)="changeAddress()" class="text-p1 font-bold text-[#F70400]">
@@ -32,9 +36,9 @@

 <ng-container *ngIf="payer$ | async; let payer">
  <div *ngIf="showAddresses$ | async" class="flex flex-row items-start justify-between p-5 pt-0">
-    <div class="flex flex-row flex-wrap pr-4" data-address-type="Rechnungsadresse" data-which="Rechnungsadresse">
-      <div class="mr-3" data-what="title">Rechnungsadresse</div>
-      <div class="font-bold" data-what="address">
+    <div class="flex flex-row flex-wrap pr-4" data-address-type="Rechnungsadresse">
+      <div class="mr-3">Rechnungsadresse</div>
+      <div class="font-bold">
        {{ payer | payerAddress }}
      </div>
    </div>
@@ -47,9 +51,9 @@

 <ng-container *ngIf="payer$ | async; let payer">
  <div *ngIf="showAddresses$ | async" class="flex flex-row items-start justify-between px-5">
-    <div class="flex flex-row flex-wrap pr-4" data-address-type="Lieferadresse" data-which="Lieferadresse">
-      <div class="mr-3" data-what="title">Lieferadresse</div>
-      <div class="font-bold" data-what="address">
+    <div class="flex flex-row flex-wrap pr-4" data-address-type="Lieferadresse">
+      <div class="mr-3">Lieferadresse</div>
+      <div class="font-bold">
        {{ shippingAddress$ | async | shippingAddress }}
      </div>
    </div>
--- a/apps/page/checkout/src/lib/checkout-review/details/checkout-review-details.component.ts
+++ b/apps/page/checkout/src/lib/checkout-review/details/checkout-review-details.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, OnInit, inject } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { emailNotificationValidator, mobileNotificationValidator } from '@shared/components/notification-channel-control';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
 import { combineLatest } from 'rxjs';
@@ -7,8 +7,7 @@ import { first, map, switchMap, takeUntil, withLatestFrom } from 'rxjs/operators
 import { ApplicationService } from '@core/application';
 import { DomainCheckoutService } from '@domain/checkout';
 import { Router } from '@angular/router';
-import { BuyerDTO, NotificationChannel } from '@swagger/checkout';
-import { CustomerSearchNavigation } from '@shared/services';
+import { NotificationChannel } from '@swagger/checkout';

@Component({
  selector: 'page-checkout-review-details',
@@ -17,8 +16,6 @@ import { CustomerSearchNavigation } from '@shared/services';
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CheckoutReviewDetailsComponent implements OnInit {
-  customerNavigation = inject(CustomerSearchNavigation);
-
  control: UntypedFormGroup;

  customerFeatures$ = this._store.customerFeatures$;
@@ -26,6 +23,20 @@ export class CheckoutReviewDetailsComponent implements OnInit {
  payer$ = this._store.payer$;
  buyer$ = this._store.buyer$;

+  showAddresses$ = this._store.shoppingCartItems$.pipe(
+    takeUntil(this._store.orderCompleted),
+    withLatestFrom(this.customerFeatures$),
+    map(
+      ([items, customerFeatures]) =>
+        items.some(
+          (item) =>
+            item.features?.orderType === 'Versand' ||
+            item.features?.orderType === 'B2B-Versand' ||
+            item.features?.orderType === 'DIG-Versand'
+        ) || !!customerFeatures?.b2b
+    )
+  );
+
  showNotificationChannels$ = combineLatest([this._store.shoppingCartItems$, this.payer$, this.buyer$]).pipe(
    takeUntil(this._store.orderCompleted),
    map(
@@ -54,22 +65,6 @@ export class CheckoutReviewDetailsComponent implements OnInit {
    switchMap((processId) => this._domainCheckoutService.getShippingAddress({ processId }))
  );

-  showAddresses$ = this._store.shoppingCartItems$.pipe(
-    takeUntil(this._store.orderCompleted),
-    withLatestFrom(this.customerFeatures$, this.payer$, this.shippingAddress$),
-    map(([items, customerFeatures, payer, shippingAddress]) => {
-      const hasShippingOrBillingAddresses = !!payer?.address || !!shippingAddress;
-      const hasShippingFeature = items.some(
-        (item) =>
-          item.features?.orderType === 'Versand' || item.features?.orderType === 'B2B-Versand' || item.features?.orderType === 'DIG-Versand'
-      );
-
-      const isB2bCustomer = !!customerFeatures?.b2b;
-
-      return hasShippingOrBillingAddresses && (hasShippingFeature || isB2bCustomer);
-    })
-  );
-
  notificationChannelLoading$ = this._store.notificationChannelLoading$;

  constructor(
@@ -123,20 +118,6 @@ export class CheckoutReviewDetailsComponent implements OnInit {
    this._store.onNotificationChange(notificationChannels);
  }

-  getNameFromBuyer(buyer: BuyerDTO): { value: string; label: string } {
-    if (buyer?.lastName && buyer?.firstName) {
-      return { value: `${buyer?.lastName}, ${buyer?.firstName}`, label: 'Nachname, Vorname' };
-    } else if (buyer?.lastName) {
-      return { value: buyer?.lastName, label: 'Nachname, Vorname' };
-    } else if (buyer?.firstName) {
-      return { value: buyer?.firstName, label: 'Nachname, Vorname' };
-    } else if (buyer?.organisation?.name) {
-      return { value: buyer?.organisation?.name, label: 'Firmenname' };
-    } else {
-      return;
-    }
-  }
-
  async changeAddress() {
    const processId = this._application.activatedProcessId;
    const customer = await this._domainCheckoutService.getBuyer({ processId }).pipe(first()).toPromise();
@@ -145,8 +126,7 @@ export class CheckoutReviewDetailsComponent implements OnInit {
      return;
    }
    const customerId = customer.source;
-    await this.customerNavigation.navigateToDetails({ processId, customerId, customer: { customerNumber: customer.buyerNumber } });
-    // this._router.navigate(['/kunde', this._application.activatedProcessId, 'customer', 'search', `${customerId}`]);
+    this._router.navigate(['/kunde', this._application.activatedProcessId, 'customer', 'search', `${customerId}`]);
  }

  async navigateToCustomerSearch(processId: number) {
--- a/apps/page/checkout/src/lib/checkout-review/shopping-cart-item/shopping-cart-item.component.scss
+++ b/apps/page/checkout/src/lib/checkout-review/shopping-cart-item/shopping-cart-item.component.scss
@@ -17,7 +17,7 @@ button {
  grid-area: item-thumbnail;
  @apply mr-8 w-[3.75rem] h-[5.9375rem];
  img {
-    @apply w-[3.75rem] max-h-[5.9375rem] rounded shadow-cta;
+    @apply w-[3.75rem] h-[5.9375rem] rounded shadow-cta;
  }
 }

--- a/apps/page/checkout/src/lib/checkout-review/special-comment/special-comment.component.html
+++ b/apps/page/checkout/src/lib/checkout-review/special-comment/special-comment.component.html
@@ -19,14 +19,17 @@
      placeholder="Eine Anmerkung hinzufügen"
      [(ngModel)]="value"
      [rows]="rows"
-      (ngModelChange)="updateValue()"
-      (blur)="updateValue()"
+      (ngModelChange)="check()"
+      (blur)="save()"
    ></textarea>

    <div class="comment-actions py-4">
      <button type="reset" class="clear pl-4" *ngIf="!disabled && !!value" (click)="clear(); triggerResize()">
        <shared-icon icon="close" [size]="24"></shared-icon>
      </button>
+      <button class="cta-save ml-4" type="submit" *ngIf="!disabled && isDirty" (click)="save()">
+        Speichern
+      </button>
    </div>
  </div>

--- a/apps/page/checkout/src/lib/checkout-review/special-comment/special-comment.component.ts
+++ b/apps/page/checkout/src/lib/checkout-review/special-comment/special-comment.component.ts
@@ -61,7 +61,7 @@ export class SpecialCommentComponent implements ControlValueAccessor {

  clear() {
    this.value = '';
-    this.updateValue();
+    this.save();
  }

  check() {
@@ -80,12 +80,11 @@ export class SpecialCommentComponent implements ControlValueAccessor {
    this.cdr.markForCheck();
  }

-  updateValue() {
+  save() {
    this.initialValue = this.value;
    this.onChange(this.value);
    this.check();
  }
-
  setIsDirty(isDirty: boolean) {
    this.isDirty = isDirty;
    this.isDirtyChange.emit(isDirty);
--- a/apps/page/checkout/src/lib/checkout-summary/checkout-summary.component.html
+++ b/apps/page/checkout/src/lib/checkout-summary/checkout-summary.component.html
@@ -55,8 +55,6 @@
              <span class="w-32">Vorgangs-ID</span>
              <ng-container *ngIf="customer$ | async; let customer">
                <a
-                  data-which="Vorgangs-ID"
-                  data-what="link"
                  *ngIf="customer$ | async; let customer"
                  class="font-bold text-[#0556B4] no-underline"
                  [routerLink]="['/kunde', processId, 'customer', 'search', customer?.id, 'orders', displayOrder.id]"
@@ -104,7 +102,7 @@
          >
            <div class="page-checkout-summary__items-thumbnail flex flex-row">
              <a [routerLink]="getProductSearchDetailsPath(order?.product?.ean)" [queryParams]="getProductSearchDetailsQueryParams(order)">
-                <img class="w-[3.125rem] max-h-20 mr-2" [src]="order.product?.ean | productImage: 195:315:true" />
+                <img class="w-[3.125rem] h-20 mr-2" [src]="order.product?.ean | productImage: 195:315:true" />
              </a>
            </div>

@@ -228,12 +226,11 @@
  <div class="absolute left-1/2 bottom-10 inline-grid grid-flow-col gap-4 justify-center transform -translate-x-1/2">
    <button
      *ifRole="'Store'"
-      [disabled]="isPrinting$ | async"
      type="button"
-      class="px-6 py-2 rounded-full border-2 border-solid border-brand text-brand bg-white font-bold text-lg whitespace-nowrap h-14 flex flex-row items-center justify-center print-button"
+      class="px-6 py-2 rounded-full border-2 border-solid border-brand text-brand bg-white font-bold text-lg whitespace-nowrap h-14"
      (click)="printOrderConfirmation()"
    >
-      <ui-spinner class="min-h-4 min-w-4" [show]="isPrinting$ | async"> Bestellbestätigung drucken </ui-spinner>
+      Bestellbestätigung drucken
    </button>

    <button
--- a/apps/page/checkout/src/lib/checkout-summary/checkout-summary.component.scss
+++ b/apps/page/checkout/src/lib/checkout-summary/checkout-summary.component.scss
@@ -96,12 +96,6 @@ hr {
  }
 }

-.print-button {
-  &:disabled {
-    @apply bg-inactive-branch border-solid border-inactive-branch text-white cursor-not-allowed;
-  }
-}
-
 .last {
  @apply pb-5;
 }
--- a/apps/page/checkout/src/lib/checkout-summary/checkout-summary.component.ts
+++ b/apps/page/checkout/src/lib/checkout-summary/checkout-summary.component.ts
@@ -16,6 +16,7 @@ import { DateAdapter } from '@ui/common';
 import { CheckoutNavigationService, PickUpShelfOutNavigationService, ProductCatalogNavigationService } from '@shared/services';
 import { EnvironmentService } from '@core/environment';
 import { SendOrderConfirmationModalService } from '@shared/modals/send-order-confirmation-modal';
+import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { ToasterService } from '@shared/shell';

@Component({
@@ -33,7 +34,7 @@ export class CheckoutSummaryComponent implements OnInit, OnDestroy {

  private _toaster = inject(ToasterService);

-  private _onDestroy$ = new Subject<void>();
+  private _onDestroy$ = new Subject();
  processId = Date.now();
  selectedDate = this.dateAdapter.today();
  minDateDatepicker = this.dateAdapter.addCalendarDays(this.dateAdapter.today(), -1);
@@ -135,8 +136,6 @@ export class CheckoutSummaryComponent implements OnInit, OnDestroy {
    )
  );

-  isPrinting$ = new BehaviorSubject(false);
-
  totalPriceCurrency$ = this.displayOrders$.pipe(map((displayOrders) => displayOrders[0]?.items[0]?.price?.value?.currency));

  containsDeliveryOrder$ = this.displayOrders$.pipe(
@@ -162,10 +161,6 @@ export class CheckoutSummaryComponent implements OnInit, OnDestroy {
    return this._environmentService.matchDesktopLarge$;
  }

-  get isTablet() {
-    return this._environmentService.matchTablet();
-  }
-
  expanded: boolean[] = [];

  constructor(
@@ -296,9 +291,22 @@ export class CheckoutSummaryComponent implements OnInit, OnDestroy {
    if (takeNowOrders.length != 1) return;

    try {
-      await this.router.navigate(this._shelfOutNavigationService.listRoute({ processId: Date.now() }).path, {
-        queryParams: { main_qs: takeNowOrders[0].orderNumber, filter_supplier_id: '16' },
-      });
+      for (const takeNowOrder of takeNowOrders) {
+        for (const orderItem of takeNowOrder.items.filter((item) => item.features?.orderType === 'Rücklage')) {
+          await this.omsService
+            .changeOrderStatus(takeNowOrder.id, orderItem.id, orderItem.subsetItems[0]?.id, {
+              processingStatus: 128,
+            })
+            .toPromise();
+        }
+      }
+
+      await this.router.navigate(
+        this._shelfOutNavigationService.detailRoute({
+          processId: Date.now(),
+          item: { orderId: takeNowOrders[0].id, orderNumber: takeNowOrders[0].orderNumber, processingStatus: 128 },
+        }).path
+      );
    } catch (e) {
      console.error(e);
    }
@@ -311,57 +319,27 @@ export class CheckoutSummaryComponent implements OnInit, OnDestroy {
  }

  async printOrderConfirmation() {
-    this.isPrinting$.next(true);
    const orders = await this.displayOrders$.pipe(first()).toPromise();
-    const selectedPrinter = await this.domainPrinterService
-      .getAvailableLabelPrinters()
-      .pipe(
-        first(),
-        map((printers) => {
-          if (Array.isArray(printers)) return printers.find((printer) => printer.selected === true);
-        })
-      )
-      .toPromise();
-
-    console.log(selectedPrinter);
-    if (!selectedPrinter || this.isTablet) {
-      await this.uiModal
-        .open({
-          content: PrintModalComponent,
-          data: {
-            printerType: 'Label',
-            printImmediately: !this.isTablet,
-            print: async (printer) => {
-              try {
-                const result = await this.domainPrinterService.printOrder({ orderIds: orders.map((o) => o.id), printer }).toPromise();
-                this._toaster.open({ type: 'success', message: 'Bestellbestätigung wurde gedruckt' });
-                return result;
-              } catch (error) {
-                this._toaster.open({ type: 'danger', message: 'Fehler beim Drucken der Bestellbestätigung' });
-              } finally {
-                this.isPrinting$.next(false);
-              }
-            },
-          } as PrintModalData,
-          config: {
-            panelClass: [],
-            showScrollbarY: false,
+    await this.uiModal
+      .open({
+        content: PrintModalComponent,
+        data: {
+          printerType: 'Label',
+          print: async (printer) => {
+            try {
+              const result = await this.domainPrinterService.printOrder({ orderIds: orders.map((o) => o.id), printer }).toPromise();
+              this._toaster.open({ type: 'success', message: 'Bestellbestätigung wurde gedruckt' });
+              return result;
+            } catch (error) {
+              this._toaster.open({ type: 'danger', message: 'Fehler beim Drucken der Bestellbestätigung' });
+            }
          },
-        })
-        .afterClosed$.toPromise();
-      this.isPrinting$.next(false);
-    } else {
-      try {
-        const result = await this.domainPrinterService
-          .printOrder({ orderIds: orders.map((o) => o.id), printer: selectedPrinter.key })
-          .toPromise();
-        this._toaster.open({ type: 'success', message: 'Bestellbestätigung wurde gedruckt' });
-        return result;
-      } catch (error) {
-        this._toaster.open({ type: 'danger', message: 'Fehler beim Drucken der Bestellbestätigung' });
-      } finally {
-        this.isPrinting$.next(false);
-      }
-    }
+        } as PrintModalData,
+        config: {
+          panelClass: [],
+          showScrollbarY: false,
+        },
+      })
+      .afterClosed$.toPromise();
  }
 }
--- a/apps/page/checkout/src/lib/shared/key-navigation/key-navigation.directive.ts
+++ b/apps/page/checkout/src/lib/shared/key-navigation/key-navigation.directive.ts
@@ -0,0 +1,58 @@
+import { Directive, HostListener, Input, Output, EventEmitter, OnInit } from '@angular/core';
+import { BranchDTO } from '@swagger/checkout';
+import { PurchasingOptionsModalStore } from '../../modals/purchasing-options-modal/purchasing-options-modal.store';
+
+/* tslint:disable: directive-selector */
+@Directive({ selector: '[keyNavigation]' })
+export class KeyNavigationDirective implements OnInit {
+  @Input() element: any;
+  @Input('keyNavigation') data: BranchDTO[];
+  @Output() closeDropdown = new EventEmitter<void>();
+  @Output() preselectBranch = new EventEmitter<BranchDTO>();
+  selectedData: BranchDTO;
+  position = 0;
+  posMarker = 0;
+
+  @HostListener('window:keyup', ['$event'])
+  keyEvent(event: KeyboardEvent) {
+    if (event.key === 'ArrowUp') {
+      if (this.position > 0) {
+        this.position--;
+      }
+
+      if (this.position <= this.posMarker - 4) {
+        this.element.scrollTop -= 44;
+      }
+
+      this.selectedData = this.data[this.position];
+      this.preselectBranch.emit(this.selectedData);
+    }
+
+    if (event.key === 'ArrowDown') {
+      if (this.position < this.data.length - 1) {
+        this.position++;
+      }
+
+      if (this.position >= 4) {
+        this.posMarker = this.position;
+        this.element.scrollTop += 44;
+      }
+
+      this.selectedData = this.data[this.position];
+      this.preselectBranch.emit(this.selectedData);
+    }
+
+    if (event.key === 'Enter') {
+      this.purchasingOptionsModalStore.setBranch(this.selectedData);
+      this.position = 0;
+      this.closeDropdown.emit();
+    }
+  }
+
+  constructor(private purchasingOptionsModalStore: PurchasingOptionsModalStore) {}
+
+  ngOnInit() {
+    this.selectedData = this.data[this.position];
+    this.preselectBranch.emit(this.selectedData);
+  }
+}
--- a/apps/page/checkout/src/lib/shared/key-navigation/key-navigation.module.ts
+++ b/apps/page/checkout/src/lib/shared/key-navigation/key-navigation.module.ts
@@ -0,0 +1,12 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { KeyNavigationDirective } from './key-navigation.directive';
+
+@NgModule({
+  imports: [CommonModule],
+  exports: [KeyNavigationDirective],
+  declarations: [KeyNavigationDirective],
+  providers: [],
+})
+export class KeyNavigationModule {}
--- a/apps/page/customer-order/src/lib/customer-order-details/customer-order-details-item/customer-order-details-item.component.html
+++ b/apps/page/customer-order/src/lib/customer-order-details/customer-order-details-item/customer-order-details-item.component.html
@@ -140,19 +140,6 @@
          </ng-container>
        </ng-template>
      </div>
-      <div class="page-customer-order-details-item__tracking-details" *ngIf="getOrderItemTrackingData(orderItem); let trackingData">
-        <div class="label">{{ trackingData.length > 1 ? 'Sendungsnummern' : 'Sendungsnummer' }}</div>
-        <ng-container *ngFor="let tracking of trackingData">
-          <ng-container *ngIf="tracking.trackingProvider === 'DHL' && !isNative; else noTrackingLink">
-            <a class="value text-[#0556B4]" [href]="getTrackingNumberLink(tracking.trackingNumber)" target="_blank"
-              >{{ tracking.trackingProvider }}: {{ tracking.trackingNumber }}</a
-            >
-          </ng-container>
-          <ng-template #noTrackingLink>
-            <p class="value">{{ tracking.trackingProvider }}: {{ tracking.trackingNumber }}</p>
-          </ng-template>
-        </ng-container>
-      </div>

      <hr class="border-[#EDEFF0] border-t-2 my-4" />

--- a/apps/page/customer-order/src/lib/customer-order-details/customer-order-details-item/customer-order-details-item.component.scss
+++ b/apps/page/customer-order/src/lib/customer-order-details/customer-order-details-item/customer-order-details-item.component.scss
@@ -22,7 +22,7 @@ button {

 .page-customer-order-details-item__thumbnail {
  img {
-    @apply rounded shadow-cta w-[3.625rem] max-h-[5.9375rem];
+    @apply rounded shadow-cta w-[3.625rem] h-[5.9375rem];
  }
 }

@@ -55,18 +55,6 @@ button {
  }
 }

-.page-customer-order-details-item__tracking-details {
-  @apply flex gap-x-7;
-
-  .label {
-    @apply w-[8.125rem];
-  }
-
-  .value {
-    @apply flex flex-row items-center font-bold;
-  }
-}
-
 .page-customer-order-details-item__comment {
  textarea {
    @apply w-full flex-grow rounded bg-[#EDEFF0] border-[#AEB7C1] border border-solid outline-none text-p2 p-4;
--- a/apps/page/customer-order/src/lib/customer-order-details/customer-order-details-item/customer-order-details-item.component.ts
+++ b/apps/page/customer-order/src/lib/customer-order-details/customer-order-details-item/customer-order-details-item.component.ts
@@ -18,7 +18,6 @@ import { isEqual } from 'lodash';
 import { combineLatest, NEVER, Subject, Observable } from 'rxjs';
 import { catchError, filter, first, map, switchMap, withLatestFrom } from 'rxjs/operators';
 import { CustomerOrderDetailsStore } from '../customer-order-details.store';
-import { EnvironmentService } from '@core/environment';

 export interface CustomerOrderDetailsItemComponentState {
  orderItem?: OrderItemListItemDTO;
@@ -141,18 +140,13 @@ export class CustomerOrderDetailsItemComponent extends ComponentStore<CustomerOr

  more$ = this.select((s) => s.more);

-  private _onDestroy$ = new Subject<void>();
-
-  get isNative() {
-    return this._environment.isNative();
-  }
+  private _onDestroy$ = new Subject();

  constructor(
    private _store: CustomerOrderDetailsStore,
    private _domainReceiptService: DomainReceiptService,
    private _omsService: DomainOmsService,
-    private _cdr: ChangeDetectorRef,
-    private _environment: EnvironmentService
+    private _cdr: ChangeDetectorRef
  ) {
    super({
      more: false,
@@ -237,35 +231,6 @@ export class CustomerOrderDetailsItemComponent extends ComponentStore<CustomerOr
    return orderItems?.find((orderItem) => orderItem.data.id === orderItemListItem.orderItemId)?.data?.features?.orderType;
  }

-  getOrderItemTrackingData(orderItemListItem: OrderItemListItemDTO): Array<{ trackingProvider: string; trackingNumber: string }> {
-    const orderItems = this.order?.items;
-    const completeTrackingInformation = orderItems
-      ?.find((orderItem) => orderItem.data.id === orderItemListItem.orderItemId)
-      ?.data?.subsetItems?.find((subsetItem) => subsetItem.id === orderItemListItem.orderItemSubsetId)?.data?.trackingNumber;
-
-    if (!completeTrackingInformation) {
-      return;
-    }
-
-    // Beispielnummer: 'DHL: 124124' - Bei mehreren Tracking-Informationen muss noch ein Splitter eingebaut werden, je nach dem welcher Trenner verwendet wird
-    const trackingInformationPairs = completeTrackingInformation.split(':').map((obj) => obj.trim());
-    return this._trackingTransformationHelper(trackingInformationPairs);
-  }
-
-  // Macht aus einem String Array ein Array von Objekten mit den keys trackingProvider und trackingNumber
-  private _trackingTransformationHelper(trackingInformationPairs: string[]): Array<{ trackingProvider: string; trackingNumber: string }> {
-    return trackingInformationPairs.reduce((acc, current, index, array) => {
-      if (index % 2 === 0) {
-        acc.push({ trackingProvider: current, trackingNumber: array[index + 1] });
-      }
-      return acc;
-    }, [] as { trackingProvider: string; trackingNumber: string }[]);
-  }
-
-  getTrackingNumberLink(trackingNumber: string) {
-    return `https://www.dhl.de/de/privatkunden/dhl-sendungsverfolgung.html?piececode=${trackingNumber}`;
-  }
-
  triggerResize() {
    this.autosize.reset();
  }
--- a/apps/page/customer-order/src/lib/customer-order-details/customer-order-details.component.ts
+++ b/apps/page/customer-order/src/lib/customer-order-details/customer-order-details.component.ts
@@ -345,7 +345,7 @@ export class CustomerOrderDetailsComponent implements OnInit, AfterViewInit, OnD
      if (action.command.includes('ARRIVED')) {
        navigateTo = await this.arrivedActionNavigation();
      }
-      if (action.command.includes('PRINT_PRICEDIFFQRCODELABEL') || action.command.includes('BACKTOSTOCK')) {
+      if (action.command.includes('PRINT_PRICEDIFFQRCODELABEL')) {
        navigateTo = 'main';
      }

--- a/apps/page/customer-order/src/lib/customer-order-search/customer-order-search-filter/customer-order-search-filter.component.ts
+++ b/apps/page/customer-order/src/lib/customer-order-search/customer-order-search-filter/customer-order-search-filter.component.ts
@@ -22,7 +22,7 @@ export class CustomerOrderSearchFilterComponent implements OnInit, OnDestroy {

  processId = Number(this._activatedRoute?.parent?.snapshot?.data?.processId);

-  private _onDestroy$ = new Subject<void>();
+  private _onDestroy$ = new Subject();

  @ViewChild(FilterComponent, { static: false })
  uiFilter: FilterComponent;
--- a/apps/page/customer-order/src/lib/customer-order-search/customer-order-search.component.ts
+++ b/apps/page/customer-order/src/lib/customer-order-search/customer-order-search.component.ts
@@ -23,7 +23,7 @@ import { CustomerOrdersNavigationService } from '@shared/services';
  ],
 })
 export class CustomerOrderSearchComponent implements OnInit, OnDestroy {
-  private _onDestroy$ = new Subject<void>();
+  private _onDestroy$ = new Subject();
  private _processId$: Observable<number>;

  get isTablet() {
--- a/apps/page/customer-order/src/lib/customer-order-search/customer-order-search.store.ts
+++ b/apps/page/customer-order/src/lib/customer-order-search/customer-order-search.store.ts
@@ -201,8 +201,8 @@ export class CustomerOrderSearchStore extends ComponentStore<CustomerOrderSearch

  search = this.effect((options$: Observable<{ clear?: boolean; siletReload?: boolean }>) =>
    options$.pipe(
-      tap((opt) => {
-        this.searchStarted.next(opt);
+      tap((_) => {
+        this.searchStarted.next();
        this.patchState({ message: undefined });
      }),
      withLatestFrom(this.results$, this.filter$, this.selectedBranch$),
--- a/apps/page/customer-order/src/lib/customer-order-search/search-results/customer-order-item.component.html
+++ b/apps/page/customer-order/src/lib/customer-order-search/search-results/customer-order-item.component.html
@@ -12,7 +12,7 @@
  >
    <div class="page-customer-order-item__item-thumbnail text-center mr-4 w-[3.125rem] h-[4.9375rem]">
      <img
-        class="page-customer-order-item__item-image w-[3.125rem] max-h-[4.9375rem]"
+        class="page-customer-order-item__item-image w-[3.125rem] h-[4.9375rem]"
        loading="lazy"
        *ngIf="item?.product?.ean | productImage; let productImage"
        [src]="productImage"
--- a/apps/page/customer-order/src/lib/customer-order-search/search-results/customer-order-search-results.component.ts
+++ b/apps/page/customer-order/src/lib/customer-order-search/search-results/customer-order-search-results.component.ts
@@ -99,7 +99,7 @@ export class CustomerOrderSearchResultsComponent extends ComponentStore<Customer

  processId$ = this._activatedRoute.parent.data.pipe(map((data) => +data.processId));

-  private _onDestroy$ = new Subject<void>();
+  private _onDestroy$ = new Subject();

  trackByFn: TrackByFunction<OrderItemListItemDTO> = (index, item) => `${item.orderId}${item.orderItemId}${item.orderItemSubsetId}`;

@@ -170,9 +170,10 @@ export class CustomerOrderSearchResultsComponent extends ComponentStore<Customer
    );

    this._searchResultSubscription.add(
-      combineLatest([this.processId$, this._activatedRoute.queryParams])
+      this.processId$
        .pipe(
          debounceTime(150),
+          withLatestFrom(this._activatedRoute.queryParams),
          switchMap(([processId, params]) =>
            this._application.getSelectedBranch$(processId).pipe(map((selectedBranch) => ({ processId, params, selectedBranch })))
          )
@@ -184,6 +185,16 @@ export class CustomerOrderSearchResultsComponent extends ComponentStore<Customer

          if (processChanged) {
            if (!!this._customerOrderSearchStore.processId && this._customerOrderSearchStore.filter instanceof Filter) {
+              const queryToken = {
+                ...this._customerOrderSearchStore.filter?.getQueryParams(),
+                processId,
+                branchId: String(selectedBranch?.id),
+              };
+              this._customerOrderSearchStore.setCache({
+                queryToken,
+                hits: this._customerOrderSearchStore.hits,
+                results: this._customerOrderSearchStore.results,
+              });
              await this.updateBreadcrumb(processId, this._customerOrderSearchStore.filter?.getQueryParams());
            }
            this._customerOrderSearchStore.patchState({ processId });
@@ -201,7 +212,6 @@ export class CustomerOrderSearchResultsComponent extends ComponentStore<Customer

          if (!isEqual(cleanQueryParams, this.cleanupQueryParams(this._customerOrderSearchStore.filter.getQueryParams()))) {
            this._customerOrderSearchStore.setQueryParams(params);
-
            const queryToken = {
              ...this._customerOrderSearchStore.filter.getQueryParams(),
              processId,
@@ -278,13 +288,13 @@ export class CustomerOrderSearchResultsComponent extends ComponentStore<Customer
          ...this.cleanupQueryParams(this._customerOrderSearchStore?.filter?.getQueryParams()),
          main_qs: this.sharedFilterInputGroupMain?.uiInput?.value,
        };
+
        this._customerOrderSearchStore?.setQueryParams(queryParams);
      })
    );

    this._router.events.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((event) => {
      if (event instanceof NavigationStart) {
-        this.cacheResults();
        this._addScrollPositionToCache();
      }
    });
@@ -325,6 +335,18 @@ export class CustomerOrderSearchResultsComponent extends ComponentStore<Customer
    this._onDestroy$.complete();

    this._searchResultSubscription.unsubscribe();
+
+    const queryToken = {
+      ...this._customerOrderSearchStore.filter?.getQueryParams(),
+      processId: this._customerOrderSearchStore.processId,
+      branchId: String(this._customerOrderSearchStore.selectedBranch?.id),
+    };
+    this._customerOrderSearchStore.setCache({
+      queryToken,
+      hits: this._customerOrderSearchStore.hits,
+      results: this._customerOrderSearchStore.results,
+    });
+
    await this.updateBreadcrumb(this._customerOrderSearchStore.processId, this._customerOrderSearchStore.filter?.getQueryParams());
  }

@@ -394,20 +416,6 @@ export class CustomerOrderSearchResultsComponent extends ComponentStore<Customer
    }
  }

-  cacheResults() {
-    const queryToken = {
-      ...this._customerOrderSearchStore.filter?.getQueryParams(),
-      processId: this._customerOrderSearchStore.processId,
-      branchId: String(this._customerOrderSearchStore.selectedBranch?.id),
-    };
-
-    this._customerOrderSearchStore.setCache({
-      queryToken,
-      hits: this._customerOrderSearchStore.hits,
-      results: this._customerOrderSearchStore.results,
-    });
-  }
-
  getBreadcrumbName(params: Record<string, string>) {
    const input = params?.main_qs;

@@ -427,8 +435,8 @@ export class CustomerOrderSearchResultsComponent extends ComponentStore<Customer
  search({ filter, clear = false }: { filter?: Filter; clear?: boolean }) {
    if (!!filter) {
      this.sharedFilterInputGroupMain.cancelAutocomplete();
-      this._customerOrderSearchStore.setQueryParams(filter?.getQueryParams());
    }
+
    this._customerOrderSearchStore.search({ clear });
  }

--- a/apps/page/customer-order/src/lib/customer-order.component.ts
+++ b/apps/page/customer-order/src/lib/customer-order.component.ts
@@ -3,7 +3,6 @@ import { ActivatedRoute } from '@angular/router';
 import { ApplicationService } from '@core/application';
 import { AuthService } from '@core/auth';
 import { EnvironmentService } from '@core/environment';
-import { provideComponentStore } from '@ngrx/component-store';
 import { BranchSelectorComponent } from '@shared/components/branch-selector';
 import { BreadcrumbComponent } from '@shared/components/breadcrumb';
 import { BranchDTO } from '@swagger/checkout';
@@ -17,7 +16,7 @@ import { CustomerOrderSearchStore } from './customer-order-search';
  templateUrl: 'customer-order.component.html',
  styleUrls: ['customer-order.component.scss'],
  changeDetection: ChangeDetectionStrategy.OnPush,
-  providers: [provideComponentStore(CustomerOrderSearchStore)],
+  providers: [CustomerOrderSearchStore],
 })
 export class CustomerOrderComponent implements OnInit {
  @ViewChild(BreadcrumbComponent, { read: ElementRef }) breadcrumbRef: ElementRef<HTMLElement>;
@@ -30,7 +29,7 @@ export class CustomerOrderComponent implements OnInit {
    return `${this.breadcrumbRef?.nativeElement?.clientWidth}px`;
  }

-  _onDestroy$ = new Subject<void>();
+  _onDestroy$ = new Subject<boolean>();

  get isTablet$() {
    return this._environmentService.matchTablet$;
--- a/apps/page/customer/src/lib/components/customer-type-selector/customer-type-selector.component.ts
+++ b/apps/page/customer/src/lib/components/customer-type-selector/customer-type-selector.component.ts
@@ -197,7 +197,7 @@ export class CustomerTypeSelectorComponent extends ComponentStore<CustomerTypeSe
  setValue(value: { p4mUser?: boolean; customerType?: string } | string) {
    const initial = { p4mUser: this.p4mUser, customerType: this.customerType };

-    if (typeof value === 'string') {
+    if (isString(value)) {
      this.value = value;
    } else {
      if (isBoolean(value.p4mUser)) {
--- a/apps/page/customer/src/lib/components/form-blocks/deviating-address/deviating-address-form-block.component.html
+++ b/apps/page/customer/src/lib/components/form-blocks/deviating-address/deviating-address-form-block.component.html
@@ -38,6 +38,7 @@
      (onInit)="addAddressGroup($event)"
      (onDestroy)="removeAddressGroup()"
      [data]="data?.address"
+      [tabIndexStart]="nameFormBlock?.tabIndexEnd + 1"
      [requiredMarks]="addressRequiredMarks"
      [validatorFns]="addressValidatorFns"
      [readonly]="readonly"
--- a/apps/page/customer/src/lib/components/form-blocks/name/name-form-block.component.html
+++ b/apps/page/customer/src/lib/components/form-blocks/name/name-form-block.component.html
@@ -7,7 +7,8 @@
      [tabindex]="tabIndexStart"
      [autofocus]="focusAfterInit"
    >
-      <shared-select-option *ngFor="let gender of genderSettings.genders" [value]="gender.value">{{ gender.label }}</shared-select-option>
+      <shared-select-option [value]="2">Herr</shared-select-option>
+      <shared-select-option [value]="4">Frau</shared-select-option>
    </shared-select>
  </shared-form-control>

--- a/apps/page/customer/src/lib/components/form-blocks/name/name-form-block.component.ts
+++ b/apps/page/customer/src/lib/components/form-blocks/name/name-form-block.component.ts
@@ -2,7 +2,7 @@ import { Component, ChangeDetectionStrategy } from '@angular/core';
 import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
 import { FormBlockGroup } from '../form-block';
 import { NameFormBlockData } from './name-form-block-data';
-import { GenderSettingsService } from '@shared/services';
+import { Gender } from '@swagger/crm';

@Component({
  selector: 'app-name-form-block',
@@ -15,7 +15,18 @@ export class NameFormBlockComponent extends FormBlockGroup<NameFormBlockData> {
    return this.tabIndexStart + 3;
  }

-  constructor(public genderSettings: GenderSettingsService) {
+  displayGenderNameFn = (gender: Gender) => {
+    if (gender == 2) {
+      return 'Herr';
+    }
+    if (gender == 4) {
+      return 'Frau';
+    }
+
+    return undefined;
+  };
+
+  constructor() {
    super();
  }

--- a/apps/page/customer/src/lib/create-customer/abstract-create-customer.ts
+++ b/apps/page/customer/src/lib/create-customer/abstract-create-customer.ts
@@ -1,13 +1,13 @@
 import { HttpErrorResponse } from '@angular/common/http';
 import { ChangeDetectorRef, Directive, OnDestroy, OnInit, ViewChild, inject } from '@angular/core';
-import { AbstractControl, AsyncValidatorFn, UntypedFormControl, UntypedFormGroup, ValidationErrors, ValidatorFn } from '@angular/forms';
+import { AbstractControl, AsyncValidatorFn, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { BreadcrumbService } from '@core/breadcrumb';
 import { CrmCustomerService } from '@domain/crm';
-import { AddressDTO, CustomerDTO, PayerDTO, ShippingAddressDTO } from '@swagger/crm';
+import { AddressDTO, CustomerDTO, CustomerInfoDTO, PayerDTO, ShippingAddressDTO } from '@swagger/crm';
 import { UiErrorModalComponent, UiModalService } from '@ui/modal';
 import { UiValidators } from '@ui/validators';
-import { isNull } from 'lodash';
+import { isNull, merge } from 'lodash';
 import { BehaviorSubject, Observable, of, Subject } from 'rxjs';
 import {
  first,
@@ -106,8 +106,7 @@ export abstract class AbstractCreateCustomer implements OnInit, OnDestroy {
  }

  ngOnDestroy(): void {
-    // Fix für #4676 - Breadcrumb wurde beim Schließen des Prozesses neu erstellt und nicht korrekt gelöscht
-    // this.updateBreadcrumb(this.latestProcessId, this.formData);
+    this.updateBreadcrumb(this.latestProcessId, this.formData);
    this.onDestroy$.next();
    this.onDestroy$.complete();
    this.busy$.complete();
@@ -190,47 +189,6 @@ export abstract class AbstractCreateCustomer implements OnInit, OnDestroy {
    this.cdr.markForCheck();
  }

-  minBirthDateValidator = (): ValidatorFn => {
-    return (control: AbstractControl): ValidationErrors | null => {
-      const minAge = 18; // 18 years
-
-      if (!control.value) {
-        return null;
-      }
-
-      const controlBirthDate = new Date(control.value);
-      const minBirthDate = new Date();
-      minBirthDate.setFullYear(minBirthDate.getFullYear() - minAge);
-
-      // Check if customer is over 18 years old
-      if (this._checkIfAgeOver18(controlBirthDate, minBirthDate)) {
-        return null;
-      } else {
-        return { minBirthDate: `Teilnahme ab ${minAge} Jahren` };
-      }
-    };
-  };
-
-  private _checkIfAgeOver18(inputDate: Date, minBirthDate: Date): boolean {
-    // Check year
-    if (inputDate.getFullYear() < minBirthDate.getFullYear()) {
-      return true;
-    }
-    // Check Year + Month
-    else if (inputDate.getFullYear() === minBirthDate.getFullYear() && inputDate.getMonth() < minBirthDate.getMonth()) {
-      return true;
-    }
-    // Check Year + Month + Day
-    else if (
-      inputDate.getFullYear() === minBirthDate.getFullYear() &&
-      inputDate.getMonth() === minBirthDate.getMonth() &&
-      inputDate.getDate() <= minBirthDate.getDate()
-    ) {
-      return true;
-    }
-    return false;
-  }
-
  emailExistsValidator: AsyncValidatorFn = (control) => {
    return of(control.value).pipe(
      tap((_) => this.customerExists$.next(false)),
@@ -419,7 +377,7 @@ export abstract class AbstractCreateCustomer implements OnInit, OnDestroy {
        } catch (error) {
          this.form.enable();
          setTimeout(() => {
-            this.deviatingDeliveryAddressFormBlock.setAddressValidationError(error.error.invalidProperties);
+            this.addressFormBlock.setAddressValidationError(error.error.invalidProperties);
          }, 10);

          return;
--- a/apps/page/customer/src/lib/create-customer/create-b2b-customer/create-b2b-customer.component.ts
+++ b/apps/page/customer/src/lib/create-customer/create-b2b-customer/create-b2b-customer.component.ts
@@ -41,7 +41,7 @@ export class CreateB2BCustomerComponent extends AbstractCreateCustomer {
  deviatingNameRequiredMarks: (keyof NameFormBlockData)[] = ['gender', 'firstName', 'lastName'];

  deviatingNameValidationFns: Record<string, ValidatorFn[]> = {
-    gender: [Validators.required],
+    gender: [Validators.required, Validators.min(1)],
    firstName: [Validators.required],
    lastName: [Validators.required],
  };
--- a/apps/page/customer/src/lib/create-customer/create-guest-customer/create-guest-customer.component.ts
+++ b/apps/page/customer/src/lib/create-customer/create-guest-customer/create-guest-customer.component.ts
@@ -25,7 +25,7 @@ export class CreateGuestCustomerComponent extends AbstractCreateCustomer {
  nameValidationFns: Record<keyof NameFormBlockData, ValidatorFn[]> = {
    firstName: [Validators.required],
    lastName: [Validators.required],
-    gender: [Validators.required],
+    gender: [Validators.required, Validators.min(1)],
    title: [],
  };

@@ -44,7 +44,7 @@ export class CreateGuestCustomerComponent extends AbstractCreateCustomer {
  deviatingNameRequiredMarks: (keyof NameFormBlockData)[] = ['gender', 'firstName', 'lastName'];

  deviatingNameValidationFns: Record<string, ValidatorFn[]> = {
-    gender: [Validators.required],
+    gender: [Validators.required, Validators.min(1)],
    firstName: [Validators.required],
    lastName: [Validators.required],
  };
--- a/apps/page/customer/src/lib/create-customer/create-p4m-customer/create-p4m-customer.component.html
+++ b/apps/page/customer/src/lib/create-customer/create-p4m-customer/create-p4m-customer.component.html
@@ -64,12 +64,6 @@
  >
  </app-name-form-block>

-  <p class="info" *ngIf="customerType === 'webshop-p4m'">
-    Wir werden Ihnen Werbung zu ähnlichen Produkten oder Dienstleistungen aus unserem Sortiment per E-Mail zusenden. Sie können der
-    Verwendung Ihrer Daten jederzeit z.B. mittels der in den E-Mails enthaltenen Abmeldelinks widersprechen, ohne dass hierfür andere als
-    die Übermittlungskosten nach den Basistarifen entstehen.
-  </p>
-
  <app-email-form-block
    class="flex-grow"
    #email
--- a/apps/page/customer/src/lib/create-customer/create-p4m-customer/create-p4m-customer.component.ts
+++ b/apps/page/customer/src/lib/create-customer/create-p4m-customer/create-p4m-customer.component.ts
@@ -36,7 +36,7 @@ export class CreateP4MCustomerComponent extends AbstractCreateCustomer implement
  nameValidationFns: Record<keyof NameFormBlockData, ValidatorFn[]> = {
    firstName: [Validators.required],
    lastName: [Validators.required],
-    gender: [Validators.required],
+    gender: [Validators.required, Validators.min(1)],
    title: [],
  };

@@ -70,9 +70,9 @@ export class CreateP4MCustomerComponent extends AbstractCreateCustomer implement

  agbValidatorFns = [Validators.requiredTrue];

-  birthDateValidatorFns = [];
+  birthDateValidatorFns = [Validators.required];

-  existingCustomer$: Observable<CustomerInfoDTO | CustomerDTO | null>;
+  existingCustomer$: Observable<CustomerInfoDTO | null>;

  ngOnInit(): void {
    super.ngOnInit();
@@ -138,7 +138,6 @@ export class CreateP4MCustomerComponent extends AbstractCreateCustomer implement

  initMarksAndValidators() {
    this.asyncLoyaltyCardValidatorFn = [this.checkLoyalityCardValidator];
-    this.birthDateValidatorFns = [Validators.required, this.minBirthDateValidator()];
    if (this._customerType === 'webshop') {
      this.emailRequiredMark = true;
      this.emailValidatorFn = [Validators.required, Validators.email, validateEmail];
--- a/apps/page/customer/src/lib/create-customer/create-store-customer/create-store-customer.component.ts
+++ b/apps/page/customer/src/lib/create-customer/create-store-customer/create-store-customer.component.ts
@@ -36,7 +36,7 @@ export class CreateStoreCustomerComponent extends AbstractCreateCustomer {

  nameValidationFns: Record<string, ValidatorFn[]> = {
    title: [],
-    gender: [Validators.required],
+    gender: [Validators.required, Validators.min(1)],
    firstName: [Validators.required],
    lastName: [Validators.required],
  };
--- a/apps/page/customer/src/lib/create-customer/create-webshop-customer/create-webshop-customer.component.ts
+++ b/apps/page/customer/src/lib/create-customer/create-webshop-customer/create-webshop-customer.component.ts
@@ -25,7 +25,7 @@ export class CreateWebshopCustomerComponent extends AbstractCreateCustomer {
  nameValidationFns: Record<keyof NameFormBlockData, ValidatorFn[]> = {
    firstName: [Validators.required],
    lastName: [Validators.required],
-    gender: [Validators.required],
+    gender: [Validators.required, Validators.min(1)],
    title: [],
  };

--- a/apps/page/customer/src/lib/create-customer/update-p4m-webshop-customer/update-p4m-webshop-customer.component.ts
+++ b/apps/page/customer/src/lib/create-customer/update-p4m-webshop-customer/update-p4m-webshop-customer.component.ts
@@ -22,14 +22,14 @@ export class UpdateP4MWebshopCustomerComponent extends AbstractCreateCustomer im

  agbValidatorFns = [Validators.requiredTrue];

-  birthDateValidatorFns = [Validators.required, this.minBirthDateValidator()];
+  birthDateValidatorFns = [Validators.required];

  nameRequiredMarks: (keyof NameFormBlockData)[] = ['gender', 'firstName', 'lastName'];

  nameValidationFns: Record<keyof NameFormBlockData, ValidatorFn[]> = {
    firstName: [Validators.required],
    lastName: [Validators.required],
-    gender: [Validators.required],
+    gender: [Validators.required, Validators.min(1)],
    title: [],
  };

--- a/apps/page/customer/src/lib/customer-search/add-billing-address-main-view/add-billing-address-main-view.component.html
+++ b/apps/page/customer/src/lib/customer-search/add-billing-address-main-view/add-billing-address-main-view.component.html
@@ -13,7 +13,8 @@
 <form [formGroup]="formGroup" (ngSubmit)="save()">
  <shared-form-control label="Anrede">
    <shared-select formControlName="gender" placeholder="Anrede" tabindex="1" [autofocus]="true">
-      <shared-select-option *ngFor="let gender of genderSettings.genders" [value]="gender.value">{{ gender.label }}</shared-select-option>
+      <shared-select-option [value]="2">Herr</shared-select-option>
+      <shared-select-option [value]="4">Frau</shared-select-option>
    </shared-select>
  </shared-form-control>

--- a/apps/page/customer/src/lib/customer-search/add-billing-address-main-view/add-billing-address-main-view.component.ts
+++ b/apps/page/customer/src/lib/customer-search/add-billing-address-main-view/add-billing-address-main-view.component.ts
@@ -9,7 +9,7 @@ import { map } from 'rxjs/operators';
 import { AsyncPipe, NgForOf, NgIf } from '@angular/common';
 import { AddressSelectionModalService } from '@shared/modals/address-selection-modal';
 import { CustomerSearchStore } from '../store';
-import { CustomerSearchNavigation, GenderSettingsService } from '@shared/services';
+import { CustomerSearchNavigation } from '@shared/services';
 import { IconComponent } from '@shared/components/icon';
 import { combineLatest } from 'rxjs';
 import { RouterLink } from '@angular/router';
@@ -35,7 +35,7 @@ import { RouterLink } from '@angular/router';
 })
 export class AddBillingAddressMainViewComponent {
  formGroup = new FormGroup({
-    gender: new FormControl<Gender>(undefined, [Validators.required]),
+    gender: new FormControl<Gender>(0, [Validators.required, Validators.min(1)]),
    title: new FormControl<string>(undefined),
    firstName: new FormControl<string>(undefined, [Validators.required]),
    lastName: new FormControl<string>(undefined, [Validators.required]),
@@ -59,8 +59,7 @@ export class AddBillingAddressMainViewComponent {
    private _customerService: CrmCustomerService,
    private _addressSelection: AddressSelectionModalService,
    private _store: CustomerSearchStore,
-    private _navigation: CustomerSearchNavigation,
-    public genderSettings: GenderSettingsService
+    private _navigation: CustomerSearchNavigation
  ) {}

  async save() {
--- a/apps/page/customer/src/lib/customer-search/add-shipping-address-main-view/add-shipping-address-main-view.component.html
+++ b/apps/page/customer/src/lib/customer-search/add-shipping-address-main-view/add-shipping-address-main-view.component.html
@@ -27,7 +27,8 @@

  <shared-form-control label="Anrede">
    <shared-select formControlName="gender" placeholder="Anrede" tabindex="4" [autofocus]="true">
-      <shared-select-option *ngFor="let gender of genderSettings.genders" [value]="gender.value">{{ gender.label }}</shared-select-option>
+      <shared-select-option [value]="2">Herr</shared-select-option>
+      <shared-select-option [value]="4">Frau</shared-select-option>
    </shared-select>
  </shared-form-control>

--- a/apps/page/customer/src/lib/customer-search/add-shipping-address-main-view/add-shipping-address-main-view.component.ts
+++ b/apps/page/customer/src/lib/customer-search/add-shipping-address-main-view/add-shipping-address-main-view.component.ts
@@ -9,7 +9,7 @@ import { map, takeUntil } from 'rxjs/operators';
 import { AsyncPipe, NgForOf, NgIf } from '@angular/common';
 import { AddressSelectionModalService } from '@shared/modals/address-selection-modal';
 import { CustomerSearchStore } from '../store';
-import { CustomerSearchNavigation, GenderSettingsService } from '@shared/services';
+import { CustomerSearchNavigation } from '@shared/services';
 import { Subject, combineLatest } from 'rxjs';
 import { RouterLink } from '@angular/router';
 import { IconComponent } from '@shared/components/icon';
@@ -41,7 +41,7 @@ export class AddShippingAddressMainViewComponent implements OnInit, OnDestroy {
  );

  formGroup = new FormGroup({
-    gender: new FormControl<Gender>(undefined, [Validators.required]),
+    gender: new FormControl<Gender>(0, [Validators.required, Validators.min(1)]),
    title: new FormControl<string>(undefined),
    firstName: new FormControl<string>(undefined, [Validators.required]),
    lastName: new FormControl<string>(undefined, [Validators.required]),
@@ -65,8 +65,7 @@ export class AddShippingAddressMainViewComponent implements OnInit, OnDestroy {
    private _customerService: CrmCustomerService,
    private _addressSelection: AddressSelectionModalService,
    private _store: CustomerSearchStore,
-    private _navigation: CustomerSearchNavigation,
-    public genderSettings: GenderSettingsService
+    private _navigation: CustomerSearchNavigation
  ) {}

  ngOnInit() {
--- a/apps/page/customer/src/lib/customer-search/details-main-view/details-main-view.component.html
+++ b/apps/page/customer/src/lib/customer-search/details-main-view/details-main-view.component.html
@@ -39,9 +39,7 @@
    <div class="customer-details-customer-main-data px-5 py-3 grid grid-flow-row gap-3">
      <div class="flex flex-row">
        <div class="data-label">Erstellungsdatum</div>
-        <div *ngIf="created$ | async; let created" class="data-value">
-          {{ created | date: 'dd.MM.yyyy' }} | {{ created | date: 'HH:mm' }} Uhr
-        </div>
+        <div class="data-value">{{ created$ | async | date: 'dd.MM.yyyy' }} | {{ created$ | async | date: 'HH:mm' }} Uhr</div>
      </div>
      <div class="flex flex-row">
        <div class="data-label">Kundennummer</div>
@@ -113,7 +111,7 @@
    </div>
    <div class="customer-details-customer-main-row">
      <div class="data-label">Land</div>
-      <div *ngIf="country$ | async; let country" class="data-value">{{ country | country }}</div>
+      <div class="data-value">{{ country$ | async | country }}</div>
    </div>
    <div class="customer-details-customer-main-row">
      <div class="data-label">Festnetznr.</div>
@@ -125,16 +123,6 @@
    </div>

    <ng-container *ngIf="!(isBusinessKonto$ | async)">
-      <div class="customer-details-customer-main-row">
-        <div class="data-label">Geburtstag</div>
-        <div class="data-value">{{ dateOfBirth$ | async | date: 'dd.MM.yyyy' }}</div>
-      </div>
-    </ng-container>
-    <ng-container *ngIf="!(isBusinessKonto$ | async) && (organisationName$ | async)">
-      <div class="customer-details-customer-main-row">
-        <div class="data-label">Firmenname</div>
-        <div class="data-value">{{ organisationName$ | async }}</div>
-      </div>
      <div class="customer-details-customer-main-row">
        <div class="data-label">Abteilung</div>
        <div class="data-value">{{ department$ | async }}</div>
--- a/apps/page/customer/src/lib/customer-search/details-main-view/details-main-view.component.ts
+++ b/apps/page/customer/src/lib/customer-search/details-main-view/details-main-view.component.ts
@@ -1,7 +1,7 @@
 import { Component, ChangeDetectionStrategy, OnInit, OnDestroy, inject } from '@angular/core';
 import { Subject, combineLatest } from 'rxjs';
 import { first, map, switchMap, takeUntil } from 'rxjs/operators';
-import { CustomerSearchNavigation, GenderSettingsService } from '@shared/services';
+import { CustomerSearchNavigation } from '@shared/services';
 import { CustomerSearchStore } from '../store';
 import { ShippingAddressDTO, NotificationChannel, ShoppingCartDTO, PayerDTO, BuyerDTO } from '@swagger/checkout';
 import { DomainCheckoutService } from '@domain/checkout';
@@ -10,11 +10,16 @@ import { UiModalService } from '@ui/modal';
 import { ComponentStore } from '@ngrx/component-store';
 import { ApplicationService } from '@core/application';
 import { CheckoutNavigationService, ProductCatalogNavigationService } from '@shared/services';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import { log, logAsync } from '@utils/common';
 import { CrmCustomerService } from '@domain/crm';
 import { MessageModalComponent, MessageModalData } from '@shared/modals/message-modal';

+const GENDER_MAP = {
+  2: 'Herr',
+  4: 'Frau',
+};
+
 export interface CustomerDetailsViewMainState {
  isBusy: boolean;
  shoppingCart: ShoppingCartDTO;
@@ -29,13 +34,11 @@ export interface CustomerDetailsViewMainState {
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CustomerDetailsViewMainComponent extends ComponentStore<CustomerDetailsViewMainState> implements OnInit, OnDestroy {
-  private _onDestroy$ = new Subject<void>();
+  private _onDestroy$ = new Subject();

  customerService = inject(CrmCustomerService);

-  fetching$ = combineLatest([this._store.fetchingCustomer$, this._store.fetchingCustomerList$]).pipe(
-    map(([fetchingCustomer, fetchingList]) => fetchingCustomer || fetchingList)
-  );
+  fetching$ = this._store.fetchingCustomer$;

  isBusy$ = this.select((s) => s.isBusy);

@@ -83,7 +86,7 @@ export class CustomerDetailsViewMainComponent extends ComponentStore<CustomerDet

  customerNumberBeeline$ = this._store.select((s) => s.customer?.linkedRecords?.find((r) => r.repository === 'beeline')?.number);

-  gender$ = this._store.select((s) => this._genderSettings.getGenderByValue(s.customer?.gender));
+  gender$ = this._store.select((s) => GENDER_MAP[s.customer?.gender]);

  title$ = this._store.select((s) => s.customer?.title);

@@ -121,8 +124,6 @@ export class CustomerDetailsViewMainComponent extends ComponentStore<CustomerDet

  shoppingCartHasNoItems$ = this.shoppingCartHasItems$.pipe(map((hasItems) => !hasItems));

-  dateOfBirth$ = this._store.select((s) => s.customer?.dateOfBirth);
-
  get isBusy() {
    return this.get((s) => s.isBusy);
  }
@@ -180,10 +181,6 @@ export class CustomerDetailsViewMainComponent extends ComponentStore<CustomerDet
    return this.get((s) => s.payer);
  }

-  get snapshot() {
-    return this._activatedRoute.snapshot;
-  }
-
  constructor(
    private _store: CustomerSearchStore,
    private _navigation: CustomerSearchNavigation,
@@ -192,9 +189,7 @@ export class CustomerDetailsViewMainComponent extends ComponentStore<CustomerDet
    private _application: ApplicationService,
    private _catalogNavigation: ProductCatalogNavigationService,
    private _checkoutNavigation: CheckoutNavigationService,
-    private _router: Router,
-    private _activatedRoute: ActivatedRoute,
-    private _genderSettings: GenderSettingsService
+    private _router: Router
  ) {
    super({ isBusy: false, shoppingCart: undefined, shippingAddress: undefined, payer: undefined });
  }
@@ -227,21 +222,6 @@ export class CustomerDetailsViewMainComponent extends ComponentStore<CustomerDet
      .subscribe((shoppingCart) => {
        this.patchState({ shoppingCart });
      });
-
-    // #4564 Fix - Da der Kunde bei einer erneuten Suche auf undefined gesetzt wird, muss man diesen erneut nach erfolgreicher Suche setzen.
-    // Dies geschieht bereits in der customer-search.component.ts immer wenn eine Navigation ausgeführt wird (sprich für Fälle in denen ein neuer Kunde gesetzt wird).
-    // Falls aber nach exakt dem gleichen Kunden gesucht wird, muss man diesen hier manuell erneut setzen, ansonsten bleibt dieser im Store auf undefined.
-    // Da dies nur für die Detailansicht relevant ist, wird hier auch auf hits 1 überprüft, ansonsten befindet man sich sowieso in der Trefferliste.
-    this._store.customerListResponse$.pipe(takeUntil(this._onDestroy$)).subscribe(([result]) => {
-      if (result.hits === 1) {
-        const customerId = result?.result[0].id;
-        const selectedCustomerId = +this.snapshot.params.customerId;
-
-        if (customerId === selectedCustomerId) {
-          this._store.selectCustomer({ customerId });
-        }
-      }
-    });
  }

  ngOnDestroy() {
@@ -429,12 +409,12 @@ export class CustomerDetailsViewMainComponent extends ComponentStore<CustomerDet

  @log
  _patchProcessName() {
-    let name = `${this.customer.firstName ?? ''} ${this.customer.lastName ?? ''}`;
+    let name = `${this.customer.firstName} ${this.customer.lastName}`;

    // Ticket #4458 Es kann vorkommen, dass B2B Konten keinen Firmennamen hinterlegt haben
    // zusätzlich kanne es bei Mitarbeiter Konten vorkommen, dass die Namen in der Organisation statt im Kundennamen hinterlegt sind
    if ((this._store.isBusinessKonto && this.customer.organisation?.name) || (!this.customer.firstName && !this.customer.lastName)) {
-      name = `${this.customer.organisation?.name ?? ''}`;
+      name = `${this.customer.organisation?.name}`;
    }

    this._application.patchProcess(this.processId, {
--- a/apps/page/customer/src/lib/customer-search/edit-billing-address-main-view/edit-billing-address-main-view.component.html
+++ b/apps/page/customer/src/lib/customer-search/edit-billing-address-main-view/edit-billing-address-main-view.component.html
@@ -13,7 +13,8 @@
 <form [formGroup]="formGroup" (ngSubmit)="save()">
  <shared-form-control label="Anrede">
    <shared-select formControlName="gender" placeholder="Anrede" tabindex="1" [autofocus]="true">
-      <shared-select-option *ngFor="let gender of genderSettings.genders" [value]="gender.value">{{ gender.label }}</shared-select-option>
+      <shared-select-option [value]="2">Herr</shared-select-option>
+      <shared-select-option [value]="4">Frau</shared-select-option>
    </shared-select>
  </shared-form-control>

--- a/apps/page/customer/src/lib/customer-search/edit-billing-address-main-view/edit-billing-address-main-view.component.ts
+++ b/apps/page/customer/src/lib/customer-search/edit-billing-address-main-view/edit-billing-address-main-view.component.ts
@@ -9,7 +9,7 @@ import { map, switchMap, takeUntil } from 'rxjs/operators';
 import { AsyncPipe, NgForOf } from '@angular/common';
 import { AddressSelectionModalService } from '@shared/modals/address-selection-modal';
 import { CustomerSearchStore } from '../store';
-import { CustomerSearchNavigation, GenderSettingsService } from '@shared/services';
+import { CustomerSearchNavigation } from '@shared/services';
 import { ComponentStore } from '@ngrx/component-store';
 import { Subject, combineLatest } from 'rxjs';
 import { ActivatedRoute, RouterLink } from '@angular/router';
@@ -39,7 +39,7 @@ export class EditBillingAddressMainViewComponent extends ComponentStore<EditBill
  private _cdr = inject(ChangeDetectorRef);

  formGroup = new FormGroup({
-    gender: new FormControl<Gender>(undefined, [Validators.required]),
+    gender: new FormControl<Gender>(0, [Validators.required, Validators.min(1)]),
    title: new FormControl<string>(undefined),
    firstName: new FormControl<string>(undefined, [Validators.required]),
    lastName: new FormControl<string>(undefined, [Validators.required]),
@@ -74,8 +74,7 @@ export class EditBillingAddressMainViewComponent extends ComponentStore<EditBill
    private _store: CustomerSearchStore,
    private _navigation: CustomerSearchNavigation,
    private _activatedRoute: ActivatedRoute,
-    private _modal: UiModalService,
-    public genderSettings: GenderSettingsService
+    private _modal: UiModalService
  ) {
    super({ payer: undefined });
  }
--- a/apps/page/customer/src/lib/customer-search/edit-main-view/customer-data-edit-b2b.component.html
+++ b/apps/page/customer/src/lib/customer-search/edit-main-view/customer-data-edit-b2b.component.html
@@ -28,7 +28,8 @@

  <ui-form-control [clearable]="true" label="Anrede" variant="inline">
    <ui-select formControlName="gender" tabindex="4">
-      <ui-select-option *ngFor="let gender of genderSettings.genders" [value]="gender.value" [label]="gender.label"></ui-select-option>
+      <ui-select-option [value]="2" label="Herr"></ui-select-option>
+      <ui-select-option [value]="4" label="Frau"></ui-select-option>
    </ui-select>
  </ui-form-control>
  <ui-form-control [clearable]="true" label="Titel" variant="inline">
--- a/apps/page/customer/src/lib/customer-search/edit-main-view/customer-data-edit-b2c.component.html
+++ b/apps/page/customer/src/lib/customer-search/edit-main-view/customer-data-edit-b2c.component.html
@@ -16,7 +16,8 @@
 <form *ngIf="control" [formGroup]="control" (ngSubmit)="submit()">
  <ui-form-control [clearable]="true" label="Anrede" variant="inline">
    <ui-select formControlName="gender" tabindex="1">
-      <ui-select-option *ngFor="let gender of genderSettings.genders" [value]="gender.value" [label]="gender.label"></ui-select-option>
+      <ui-select-option [value]="2" label="Herr"></ui-select-option>
+      <ui-select-option [value]="4" label="Frau"></ui-select-option>
    </ui-select>
  </ui-form-control>
  <ui-form-control [clearable]="true" label="Titel" variant="inline">
--- a/apps/page/customer/src/lib/customer-search/edit-main-view/customer-data-edit.component.ts
+++ b/apps/page/customer/src/lib/customer-search/edit-main-view/customer-data-edit.component.ts
@@ -12,7 +12,7 @@ import { validateEmail } from '../../validators/email-validator';
 import { genderLastNameValidator } from '../../validators/gender-b2b-validator';
 import { camelCase } from 'lodash';
 import { CustomerSearchStore } from '../store';
-import { CustomerSearchNavigation, GenderSettingsService, NavigationRoute } from '@shared/services';
+import { CustomerSearchNavigation, NavigationRoute } from '@shared/services';

@Component({ template: '' })
 export abstract class CustomerDataEditComponent implements OnInit {
@@ -41,8 +41,7 @@ export abstract class CustomerDataEditComponent implements OnInit {
    private cdr: ChangeDetectorRef,
    private location: Location,
    private _store: CustomerSearchStore,
-    private _navigation: CustomerSearchNavigation,
-    public genderSettings: GenderSettingsService
+    private _navigation: CustomerSearchNavigation
  ) {}

  ngOnInit() {
@@ -91,7 +90,7 @@ export abstract class CustomerDataEditComponent implements OnInit {

    this.control = fb.group(
      {
-        gender: fb.control(customerDTO?.gender, [isBranch ? Validators.required : () => null]),
+        gender: fb.control(customerDTO?.gender, [isBranch ? Validators.min(1) : () => null, isBranch ? Validators.required : () => null]),
        title: fb.control(customerDTO?.title),
        lastName: fb.control(customerDTO?.lastName, [Validators.required]),
        firstName: fb.control(customerDTO?.firstName, [Validators.required]),
--- a/apps/page/customer/src/lib/customer-search/edit-shipping-address-main-view/edit-shipping-address-main-view.component.html
+++ b/apps/page/customer/src/lib/customer-search/edit-shipping-address-main-view/edit-shipping-address-main-view.component.html
@@ -27,7 +27,8 @@

  <shared-form-control label="Anrede">
    <shared-select formControlName="gender" placeholder="Anrede" tabindex="4" [autofocus]="true">
-      <shared-select-option *ngFor="let gender of genderSettings.genders" [value]="gender.value">{{ gender.label }}</shared-select-option>
+      <shared-select-option [value]="2">Herr</shared-select-option>
+      <shared-select-option [value]="4">Frau</shared-select-option>
    </shared-select>
  </shared-form-control>

--- a/apps/page/customer/src/lib/customer-search/edit-shipping-address-main-view/edit-shipping-address-main-view.component.ts
+++ b/apps/page/customer/src/lib/customer-search/edit-shipping-address-main-view/edit-shipping-address-main-view.component.ts
@@ -9,7 +9,7 @@ import { map, switchMap, takeUntil } from 'rxjs/operators';
 import { AsyncPipe, NgForOf, NgIf } from '@angular/common';
 import { AddressSelectionModalService } from '@shared/modals/address-selection-modal';
 import { CustomerSearchStore } from '../store';
-import { CustomerSearchNavigation, GenderSettingsService } from '@shared/services';
+import { CustomerSearchNavigation } from '@shared/services';
 import { Subject, combineLatest } from 'rxjs';
 import { IconComponent } from '@shared/components/icon';
 import { ActivatedRoute, RouterLink } from '@angular/router';
@@ -50,7 +50,7 @@ export class EditShippingAddressMainViewComponent extends ComponentStore<EditShi
  );

  formGroup = new FormGroup({
-    gender: new FormControl<Gender>(undefined, [Validators.required]),
+    gender: new FormControl<Gender>(0, [Validators.required, Validators.min(1)]),
    title: new FormControl<string>(undefined),
    firstName: new FormControl<string>(undefined, [Validators.required]),
    lastName: new FormControl<string>(undefined, [Validators.required]),
@@ -83,8 +83,7 @@ export class EditShippingAddressMainViewComponent extends ComponentStore<EditShi
    private _customerService: CrmCustomerService,
    private _addressSelection: AddressSelectionModalService,
    private _store: CustomerSearchStore,
-    private _navigation: CustomerSearchNavigation,
-    public genderSettings: GenderSettingsService
+    private _navigation: CustomerSearchNavigation
  ) {
    super({ shippingAddress: undefined });
  }
--- a/apps/page/customer/src/lib/customer-search/store/customer-search.store.ts
+++ b/apps/page/customer/src/lib/customer-search/store/customer-search.store.ts
@@ -8,6 +8,7 @@ import { CrmCustomerService } from '@domain/crm';
 import { Result } from '@domain/defs';
 import { CustomerDTO, ListResponseArgsOfCustomerInfoDTO, QuerySettingsDTO } from '@swagger/crm';
 import { Filter } from '@shared/components/filter';
+import { isEmpty } from 'lodash';
 import { DomainOmsService } from '@domain/oms';
 import { OrderDTO, OrderListItemDTO } from '@swagger/oms';
 import { hash } from '@utils/common';
@@ -303,10 +304,7 @@ export class CustomerSearchStore extends ComponentStore<CustomerSearchState> imp
      ),
      withLatestFrom(this.filter$, this.processId$),
      map(([a1, a2, a3]) => {
-        // #4564 Setze "customer" undefined immer wenn neu gesucht wird,
-        // da sonst Änderungen einer zweiten ISA am Kunden, selbst nach erneuter Suche, nicht geupdated werden,
-        // da noch der alte Kundendatensatz im Store gespeichert ist
-        this.patchState({ fetchingCustomerList: true, customerList: [], customer: undefined, customerListCount: 0, message: '' });
+        this.patchState({ fetchingCustomerList: true, customerList: [], customerListCount: 0, message: '' });

        let retored = false;
        if (a1.ignoreRestore) {
--- a/apps/page/customer/src/lib/validators/gender-b2b-validator.ts
+++ b/apps/page/customer/src/lib/validators/gender-b2b-validator.ts
@@ -5,8 +5,8 @@ export function genderLastNameValidator(isB2b: boolean): ValidatorFn | null {
    return (control: UntypedFormGroup): ValidationErrors | null => {
      const gender = control.get('gender').value;
      const lastName = control.get('lastName').value;
-      if (!!lastName) {
-        control.get('gender').setValidators([Validators.required]);
+      if (!!lastName && gender === 0) {
+        control.get('gender').setValidators([Validators.required, Validators.min(1)]);
        return { genderNotSet: true };
      } else {
        control.get('gender').setValidators(null);
--- a/apps/page/customer/src/lib/validators/organisation-delivery-b2b-validator.ts
+++ b/apps/page/customer/src/lib/validators/organisation-delivery-b2b-validator.ts
@@ -16,7 +16,7 @@ export function organisationB2bDeliveryValidator(): ValidatorFn | null {
      lastName = control.get('shippingAddress').get('lastName');
      organisation = control.get('shippingAddress').get('organisation').get('name');
      isOrganisationSet = !!organisation.value;
-      isNameSet = !!firstName.value && !!lastName.value;
+      isNameSet = gender.value !== 0 && !!firstName.value && !!lastName.value;

      if (control.get('differentShippingAddress').value === true) {
        return validate(gender, firstName, lastName, organisation, isOrganisationSet, isNameSet);
@@ -28,14 +28,14 @@ export function organisationB2bDeliveryValidator(): ValidatorFn | null {
      lastName = control.get('lastName');
      organisation = control.get('organisation').get('name');
      isOrganisationSet = !!organisation.value;
-      isNameSet = !!firstName.value && !!lastName.value;
+      isNameSet = gender.value !== 0 && !!firstName.value && !!lastName.value;
      return validate(gender, firstName, lastName, organisation, isOrganisationSet, isNameSet);
    }
  };
 }

 function setNameValidation(gender: AbstractControl, firstName: AbstractControl, lastName: AbstractControl) {
-  gender.setValidators([Validators.required]);
+  gender.setValidators([Validators.required, Validators.min(1)]);
  firstName.setValidators([Validators.required]);
  lastName.setValidators([Validators.required]);
 }
--- a/apps/page/dashboard/src/lib/products-card/product-card.component.scss
+++ b/apps/page/dashboard/src/lib/products-card/product-card.component.scss
@@ -16,7 +16,7 @@
 ui-slider {
  img {
    @apply rounded cursor-pointer;
-    max-height: 160px;
+    height: 160px;

    // max-width: aut;
  }
--- a/apps/page/goods-in/src/lib/goods-in-cleanup-list/goods-in-cleanup-list.component.html
+++ b/apps/page/goods-in/src/lib/goods-in-cleanup-list/goods-in-cleanup-list.component.html
@@ -1,6 +1,8 @@
 <div class="header">
  <div class="cleanup-headline">
-    <h1 class="cleanup-title">Abholfachbereinigung</h1>
+    <h1 class="cleanup-title">
+      Abholfachbereinigung
+    </h1>
    <p class="cleanup-paragraph">
      Bitte nehmen Sie die<br />
      Artikel auf die Fläche.
@@ -28,17 +30,12 @@
            *ngFor="let item of compartmentCodeGroup.items; let firstItem = first"
            [item]="item"
            [showCompartmentCode]="firstItem"
-            (selectedChange)="
-              setSelectedItem(item, $event);
-              tracker.trackEvent({ category: 'goods-in-cleanup', action: 'select', name: 'order-item', value: $event ? 1 : 0 })
-            "
-            [selectable]="item | goodsInCleanupSelectable: selectionRules : selectedItems"
+            (selectedChange)="setSelectedItem(item, $event)"
+            [selectable]="item | goodsInCleanupSelectable: selectionRules:selectedItems"
            [selected]="item | goodsInCleanupSelected: selectedOrderItemSubsetIds"
            (click)="navigateToDetails(item)"
            [showSupplier]="true"
            [quantityEditable]="item.overallQuantity > 1 && (selectedOrderItemSubsetIds$ | async)?.includes(item.orderItemSubsetId)"
-            matomoTracker
-            #tracker="matomo"
          >
          </shared-goods-in-out-order-group-item>
          <div class="divider" *ngIf="!lastCompartmentCode"></div>
@@ -66,9 +63,6 @@
      [class.cta-action-primary]="action.selected"
      [class.cta-action-secondary]="!action.selected"
      (click)="handleAction(action)"
-      matomoClickCategory="goods-in-cleanup"
-      matomoClickAction="click"
-      [matomoClickName]="action.label"
    >
      <ui-spinner [show]="(changeActionLoader$ | async) || (loading$ | async)">{{ action.label }}</ui-spinner>
    </button>
--- a/Show More
+++ b/Show More