#4712 Removed isShippingEnabled check from availabilities modal

(cherry picked from commit d5b79dcf6f)
2025-12-31 09:37:15 +01:00 · 2024-03-20 14:08:25 +01:00
184 changed files with 10639 additions and 8428 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':
@@ -567,12 +567,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 +589,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/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/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/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;
    })
  );

@@ -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-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/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
@@ -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>
@@ -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>
--- 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
@@ -33,7 +33,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-review/details/checkout-review-details.component.html
+++ b/apps/page/checkout/src/lib/checkout-review/details/checkout-review-details.component.html
@@ -32,9 +32,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 +47,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/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
@@ -228,12 +228,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
@@ -33,7 +33,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 +135,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(
@@ -296,9 +294,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 +322,28 @@ 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',
+          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' });
+            }
          },
-        })
-        .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/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
@@ -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-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}`;

--- a/apps/page/customer-order/src/lib/customer-order.component.ts
+++ b/apps/page/customer-order/src/lib/customer-order.component.ts
@@ -30,7 +30,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/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-p4m-customer/create-p4m-customer.component.ts
+++ b/apps/page/customer/src/lib/create-customer/create-p4m-customer/create-p4m-customer.component.ts
@@ -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/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,7 +22,7 @@ export class UpdateP4MWebshopCustomerComponent extends AbstractCreateCustomer im

  agbValidatorFns = [Validators.requiredTrue];

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

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

--- 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
@@ -29,7 +29,7 @@ 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);

--- 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/apps/page/goods-in/src/lib/goods-in-cleanup-list/goods-in-cleanup-list.module.ts
+++ b/apps/page/goods-in/src/lib/goods-in-cleanup-list/goods-in-cleanup-list.module.ts
@@ -8,10 +8,9 @@ import { UiSpinnerModule } from 'apps/ui/spinner/src/lib/ui-spinner.module';
 import { GoodsInCleanupListComponent } from './goods-in-cleanup-list.component';
 import { GoodsInCleanupSelectablePipe } from './goods-in-cleanup-selectable.pipe';
 import { GoodsInCleanupSelectedPipe } from './goods-in-cleanup-selected.pipe';
-import { MatomoModule } from 'ngx-matomo-client';

@NgModule({
-  imports: [CommonModule, UiCommonModule, GoodsInOutOrderGroupModule, UiSpinnerModule, UiScrollContainerModule, RouterModule, MatomoModule],
+  imports: [CommonModule, UiCommonModule, GoodsInOutOrderGroupModule, UiSpinnerModule, UiScrollContainerModule, RouterModule],
  exports: [GoodsInCleanupListComponent],
  declarations: [GoodsInCleanupListComponent, GoodsInCleanupSelectablePipe, GoodsInCleanupSelectedPipe],
  providers: [],
--- a/apps/page/goods-in/src/lib/goods-in-list/goods-in-list-item/goods-in-list-item.component.html
+++ b/apps/page/goods-in/src/lib/goods-in-list/goods-in-list-item/goods-in-list-item.component.html
@@ -25,16 +25,14 @@
            type="text"
            [ngModel]="ssc"
            (ngModelChange)="sscChange($event)"
-            [matomoTracker]="['blur']"
-            matomoCategory="goods-in-list-item"
-            matomoAction="input"
-            matomoName="meldenummer"
          />

          <span class="ssc-text" [class.err]="sscInvalid$ | async">{{ sscText$ | async }}</span>
        </div>

-        <div class="err" *ngIf="supplierIdError$ | async">Kein Lieferant vorhanden</div>
+        <div class="err" *ngIf="supplierIdError$ | async">
+          Kein Lieferant vorhanden
+        </div>
      </ng-container>
    </div>
  </div>
@@ -44,7 +42,6 @@
      <img
        class="thumbnail"
        loading="lazy"
-        [productImageNavigation]="orderItem?.product?.ean"
        *ngIf="orderItem?.product?.ean | productImage; let productImage"
        [src]="productImage"
        [alt]="orderItem?.product?.name"
@@ -76,7 +73,7 @@
      </div>

      <div class="price">
-        <strong>{{ orderItem.price | currency: 'EUR' : 'code' }}</strong>
+        <strong>{{ orderItem.price | currency: 'EUR':'code' }}</strong>
      </div>
      <div class="status spec">
        <span>Status</span>
@@ -101,14 +98,7 @@
  </div>

  <div class="footer">
-    <button
-      class="cta-reorder"
-      (click)="showReorderModal(); $event.stopPropagation()"
-      [disabled]="editSsc$ | async"
-      matomoClickCategory="goods-in-list-item"
-      matomoClickAction="click"
-      matomoClickName="nachbestellen"
-    >
+    <button class="cta-reorder" (click)="showReorderModal(); $event.stopPropagation()" [disabled]="editSsc$ | async">
      Nachbestellen
    </button>
  </div>
--- a/apps/page/goods-in/src/lib/goods-in-list/goods-in-list-item/goods-in-list-item.component.ts
+++ b/apps/page/goods-in/src/lib/goods-in-list/goods-in-list-item/goods-in-list-item.component.ts
@@ -123,7 +123,7 @@ export class GoodsInListItemComponent extends ComponentStore<GoodsInListItemComp
    shareReplay()
  );

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

  constructor(
    private _omsService: DomainOmsService,
--- a/apps/page/goods-in/src/lib/goods-in-list/goods-in-list-item/goods-in-list-item.module.ts
+++ b/apps/page/goods-in/src/lib/goods-in-list/goods-in-list-item/goods-in-list-item.module.ts
@@ -1,24 +1,14 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { NavigateOnClickDirective, ProductImageModule } from 'apps/cdn/product-image/src/public-api';
+import { ProductImageModule } from 'apps/cdn/product-image/src/public-api';
 import { UiIconModule } from '@ui/icon';
 import { UiInputModule } from '@ui/input';
 import { FormsModule } from '@angular/forms';
 import { GoodsInListItemComponent } from './goods-in-list-item.component';
 import { PipesModule } from 'apps/shared/components/goods-in-out/src/lib/pipes/pipes.module';
-import { MatomoModule } from 'ngx-matomo-client';

@NgModule({
-  imports: [
-    CommonModule,
-    PipesModule,
-    UiIconModule,
-    ProductImageModule,
-    FormsModule,
-    UiInputModule,
-    NavigateOnClickDirective,
-    MatomoModule,
-  ],
+  imports: [CommonModule, PipesModule, UiIconModule, ProductImageModule, FormsModule, UiInputModule],
  exports: [GoodsInListItemComponent],
  declarations: [GoodsInListItemComponent],
  providers: [],
--- a/apps/page/goods-in/src/lib/goods-in-list/goods-in-list.component.html
+++ b/apps/page/goods-in/src/lib/goods-in-list/goods-in-list.component.html
@@ -1,5 +1,7 @@
 <div class="goods-in-list-headline">
-  <h1 class="goods-in-list-title">Wareneingangsliste</h1>
+  <h1 class="goods-in-list-title">
+    Wareneingangsliste
+  </h1>
  <p class="goods-in-list-paragraph">
    Vergeben Sie Meldenummern oder<br />
    bestellen Sie Artikel nach
@@ -43,36 +45,18 @@
 </ng-template>

 <div *ngIf="!(listEmpty$ | async)" class="actions">
-  <button
-    *ngIf="!editSsc"
-    class="cta-edit-ssc cta-action-primary"
-    (click)="editSsc = true"
-    matomoClickCategory="goods-in-list"
-    matomoClickAction="click"
-    matomoClickName="meldenummer-vergeben"
-  >
+  <button *ngIf="!editSsc" class="cta-edit-ssc cta-action-primary" (click)="editSsc = true">
    Meldenummern vergeben
  </button>

  <ng-container *ngIf="editSsc">
-    <button
-      class="cta-cancel-ssc cta-action-secondary"
-      (click)="cancelSsc()"
-      matomoClickCategory="goods-in-list"
-      matomoClickAction="click"
-      matomoClickName="meldenummer-vergeben-abbrechen"
-    >
+    <button class="cta-cancel-ssc cta-action-secondary" (click)="cancelSsc()">
      Abbrechen
    </button>
-    <button
-      class="cta-save-ssc cta-action-primary"
-      (click)="saveSsc()"
-      [disabled]="editSscDisabled$ | async"
-      matomoClickCategory="goods-in-list"
-      matomoClickAction="click"
-      matomoClickName="meldenummer-vergeben-speichern"
-    >
-      <ui-spinner [show]="showSaveSscSpinner$ | async"> Meldenummern speichern </ui-spinner>
+    <button class="cta-save-ssc cta-action-primary" (click)="saveSsc()" [disabled]="editSscDisabled$ | async">
+      <ui-spinner [show]="showSaveSscSpinner$ | async">
+        Meldenummern speichern
+      </ui-spinner>
    </button>
  </ng-container>
 </div>
--- a/apps/page/goods-in/src/lib/goods-in-list/goods-in-list.component.ts
+++ b/apps/page/goods-in/src/lib/goods-in-list/goods-in-list.component.ts
@@ -59,7 +59,7 @@ export class GoodsInListComponent implements OnInit, AfterViewInit, OnDestroy {

  showSaveSscSpinner$ = new BehaviorSubject<boolean>(false);

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

  private readonly SCROLL_POSITION_TOKEN = 'GOODS_IN_LIST_SCROLL_POSITION';

--- a/apps/page/goods-in/src/lib/goods-in-list/goods-in-list.module.ts
+++ b/apps/page/goods-in/src/lib/goods-in-list/goods-in-list.module.ts
@@ -8,7 +8,6 @@ import { UiSpinnerModule } from 'apps/ui/spinner/src/lib/ui-spinner.module';
 import { GoodsInListItemModule } from './goods-in-list-item/goods-in-list-item.module';

 import { GoodsInListComponent } from './goods-in-list.component';
-import { MatomoModule } from 'ngx-matomo-client';

@NgModule({
  imports: [
@@ -19,7 +18,6 @@ import { MatomoModule } from 'ngx-matomo-client';
    UiScrollContainerModule,
    UiOrderByFilterModule,
    UiSpinnerModule,
-    MatomoModule,
  ],
  exports: [],
  declarations: [GoodsInListComponent],
--- a/apps/page/goods-in/src/lib/goods-in-reservation/goods-in-reservation.component.html
+++ b/apps/page/goods-in/src/lib/goods-in-reservation/goods-in-reservation.component.html
@@ -1,6 +1,8 @@
 <div class="header">
  <div class="reservations-headline">
-    <h1 class="reservations-title">Reservierungsliste</h1>
+    <h1 class="reservations-title">
+      Reservierungsliste
+    </h1>
    <p class="reservations-paragraph">
      Hier sehen Sie alle zu<br />
      reservierenden Bestellposten.
@@ -29,17 +31,12 @@
            *ngFor="let item of compartmentCodeGroup.items; let firstItem = first"
            [item]="item"
            [showCompartmentCode]="firstItem"
-            (selectedChange)="
-              setSelectedItem(item, $event);
-              tracker.trackEvent({ category: 'goods-in-reservation', action: 'select', name: 'order-item', value: $event ? 1 : 0 })
-            "
-            [selectable]="item | goodsInReservationSelectable: selectionRules : selectedItems"
+            (selectedChange)="setSelectedItem(item, $event)"
+            [selectable]="item | goodsInReservationSelectable: selectionRules:selectedItems"
            [selected]="item | goodsInReservationSelected: selectedOrderItemSubsetIds"
            [showInStock]="takeAwayAvailabilities$ | async"
            (click)="navigateToDetails(item)"
            [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>
@@ -52,7 +49,9 @@
 </ui-scroll-container>

 <ng-template #emptyMessage>
-  <div class="empty-message">Es sind derzeit keine Reservierungen offen.</div>
+  <div class="empty-message">
+    Es sind derzeit keine Reservierungen offen.
+  </div>
 </ng-template>

 <div class="actions" *ngIf="actions$ | async; let actions">
@@ -63,9 +62,6 @@
    [class.cta-action-primary]="action.selected"
    [class.cta-action-secondary]="!action.selected"
    (click)="handleAction(action)"
-    matomoClickCategory="goods-in-reservation"
-    matomoClickAction="click"
-    [matomoClickName]="action.label"
  >
    <ui-spinner [show]="(changeActionLoader$ | async) || (loading$ | async)">{{ action.label }}</ui-spinner>
  </button>
--- a/apps/page/goods-in/src/lib/goods-in-reservation/goods-in-reservation.module.ts
+++ b/apps/page/goods-in/src/lib/goods-in-reservation/goods-in-reservation.module.ts
@@ -8,10 +8,9 @@ import { GoodsInReservationSelectablePipe } from './goods-in-reservation-selecta
 import { GoodsInReservationSelectedPipe } from './goods-in-reservation-selected.pipe';

 import { GoodsInReservationComponent } from './goods-in-reservation.component';
-import { MatomoModule } from 'ngx-matomo-client';

@NgModule({
-  imports: [CommonModule, UiCommonModule, UiScrollContainerModule, GoodsInOutOrderGroupModule, UiSpinnerModule, MatomoModule],
+  imports: [CommonModule, UiCommonModule, UiScrollContainerModule, GoodsInOutOrderGroupModule, UiSpinnerModule],
  exports: [GoodsInReservationComponent],
  declarations: [GoodsInReservationComponent, GoodsInReservationSelectablePipe, GoodsInReservationSelectedPipe],
 })
--- a/apps/page/goods-out/src/lib/goods-out-details/goods-out-details.component.ts
+++ b/apps/page/goods-out/src/lib/goods-out-details/goods-out-details.component.ts
@@ -59,7 +59,7 @@ export class GoodsOutDetailsComponent extends ComponentStore<GoodsOutDetailsComp

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

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

  constructor(
    private _activatedRoute: ActivatedRoute,
--- a/apps/page/goods-out/src/lib/goods-out-search/goods-out-search-filter/goods-out-search-filter.component.ts
+++ b/apps/page/goods-out/src/lib/goods-out-search/goods-out-search-filter/goods-out-search-filter.component.ts
@@ -37,7 +37,7 @@ export class GoodsOutSearchFilterComponent implements OnInit, OnDestroy {
  @Input()
  processId: number;

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

  @ViewChild(UiFilterComponent, { static: false })
  uiFilter: UiFilterComponent;
--- a/apps/page/goods-out/src/lib/goods-out-search/goods-out-search.component.ts
+++ b/apps/page/goods-out/src/lib/goods-out-search/goods-out-search.component.ts
@@ -30,7 +30,7 @@ import { GoodsOutSearchMainAutocompleteProvider } from './providers/goods-out-se
  ],
 })
 export class GoodsOutSearchComponent implements OnInit, OnDestroy {
-  private _onDestroy$ = new Subject<void>();
+  private _onDestroy$ = new Subject();

  hasFilter$ = combineLatest([this._goodsOutSearchStore.filter$, this._goodsOutSearchStore.defaultSettings$]).pipe(
    map(([filter, defaultFilter]) => !isEqual(filter?.getQueryParams(), UiFilter.create(defaultFilter).getQueryParams()))
--- a/apps/page/goods-out/src/lib/goods-out-search/search-results/goods-out-search-results.component.ts
+++ b/apps/page/goods-out/src/lib/goods-out-search/search-results/goods-out-search-results.component.ts
@@ -70,7 +70,7 @@ export class GoodsOutSearchResultsComponent extends ComponentStore<GoodsOutSearc

  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}`;

--- a/apps/page/package-inspection/src/lib/package-details/package-details.component.css
+++ b/apps/page/package-inspection/src/lib/package-details/package-details.component.css
@@ -5,7 +5,3 @@
 .action-wrapper {
  @apply grid grid-flow-col gap-4 justify-center my-6 fixed bottom-24 inset-x-0;
 }
-
-.annotation-layout {
-  @apply col-span-2;
-}
--- a/apps/page/package-inspection/src/lib/package-details/package-details.component.html
+++ b/apps/page/package-inspection/src/lib/package-details/package-details.component.html
@@ -3,7 +3,33 @@
 </div>
 <ng-container *ngIf="packageDetails$ | async; else loader; let packageDetails" (sharedOnInit)="calculateListHeight()">
  <div class="bg-background-liste">
-    <div class="bg-white text-center text-xl py-10" [innerText]="packageDetails?.package?.features?.['description'] ?? ''"></div>
+    <div #handlungsAnweisung [ngSwitch]="packageDetails.package.arrivalStatus | arrivalStatus">
+      <div class="bg-white" *ngSwitchCase="'Falsche Filiale'">
+        <p class="text-center text-xl py-10">
+          Stellen Sie dieses Packstück für die andere Filiale bereit. <br />
+          Der Spediteur holt es zum nächstmöglichen Zeitpunkt ab.
+        </p>
+      </div>
+      <div class="bg-white" *ngSwitchCase="'Offen'">
+        <p class="text-center text-xl py-10" *ngIf="!(childActions$ | async)">
+          Können Sie sich erinnern, dass Sie dieses Packstück <br />
+          ausgepackt haben?
+        </p>
+        <p class="text-center text-xl py-10" *ngIf="!!(childActions$ | async)">
+          Prüfen Sie bitte stichprobenartig den Filialbestand des <br />
+          dargestellten Artikels. Ist der angezeigte Filialbestand <br />
+          korrekt?
+        </p>
+      </div>
+      <div class="bg-white" *ngSwitchCase="'Fehlt'">
+        <p class="text-center text-xl py-10">
+          Prüfen Sie bitte stichprobenartig den Filialbestand <br />
+          des dargestellten Artikels. Ist der angezeigte Filialbestand <br />
+          korrekt?
+        </p>
+      </div>
+      <div class="pt-3" *ngSwitchDefault></div>
+    </div>

    <div class="bg-white rounded-t shadow-card grid grid-flow-row p-4 gap-2">
      <div class="grid grid-cols-6">
@@ -12,7 +38,7 @@
          <span *ngIf="packageDetails.package.packageNumber && packageDetails.package.deliveryNoteNumber"> | </span>
          {{ packageDetails.package.deliveryNoteNumber }}
        </div>
-        <div class="col-span-3" [class.annotation-layout]="packageDetails?.package?.features?.['annotation']">
+        <div class="col-span-3">
          <ng-container *ngIf="packageDetails.package.arrivalStatus !== 8; else irrlauferTmplt">
            Filialstopp
            <span class="font-bold ml-2">
@@ -26,7 +52,7 @@
            </span>
          </ng-template>
        </div>
-        <div data-which="Statusmeldung" class="text-right" *ngIf="!packageDetails?.package?.features?.['annotation']; else annotationTmpl">
+        <div class="text-right">
          <ng-container *ngIf="(packageDetails.package.arrivalStatus | arrivalStatus) === 'Fehlt'">
            <button
              class="isa-icon-button mr-2"
@@ -52,16 +78,10 @@
          <div
            class="isa-label text-white font-bold page-package-details__arrival-status"
            [class]="packageDetails.package.arrivalStatus | arrivalStatusColorClass"
-            data-what="arrival-status"
          >
            {{ packageDetails.package.arrivalStatus | arrivalStatus }}
          </div>
        </div>
-        <ng-template #annotationTmpl>
-          <div class="page-package-details__annotation text-right text-[#5A728A] col-span-2" data-what="annotation">
-            {{ packageDetails?.package?.features?.['annotation'] }}
-          </div>
-        </ng-template>
      </div>
      <div class="grid grid-cols-6">
        <div class="col-span-2">
--- a/apps/page/package-inspection/src/lib/package-details/package-details.component.ts
+++ b/apps/page/package-inspection/src/lib/package-details/package-details.component.ts
@@ -148,7 +148,7 @@ export class PackageDetailsComponent {

  @HostListener('window:resize')
  calculateListHeight() {
-    const handlungsAnweisungHeight = this.handlungsAnweisung?.nativeElement?.offsetHeight ?? 0;
+    const handlungsAnweisungHeight = this.handlungsAnweisung?.nativeElement.offsetHeight;
    const windowHeight = window.innerHeight;
    this.detailsListHeight = windowHeight - handlungsAnweisungHeight - 516;
    this._cdr.markForCheck();
--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-base.component.ts
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-base.component.ts
@@ -5,13 +5,14 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { Breadcrumb, BreadcrumbService } from '@core/breadcrumb';
 import { take } from 'rxjs/operators';
 import { NavigationRoute } from '@shared/services';
-import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString, ListResponseArgsOfDBHOrderItemListItemDTO } from '@swagger/oms';
+import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString } from '@swagger/oms';
 import { isEmpty } from 'lodash';
 import { Observable } from 'rxjs';
 import { RunCheckTrigger } from './trigger';
 import { OrderItemsContext } from '@domain/oms';
 import { ActionHandlerService } from './services/action-handler.service';
 import { Config } from '@core/config';
+import { debounce } from '@utils/common';

 export type GetNameForBreadcrumbData = {
  processId: number;
@@ -116,8 +117,31 @@ export abstract class PickupShelfBaseComponent implements OnInit {
    return queryParams;
  }

-  // Fix Ticket #4688 Navigation behaves different based on section PickUpShelfOut and PickUpShelfIn
-  abstract regsiterFetchListResponseHandler(): void | Promise<void>;
+  regsiterFetchListResponseHandler() {
+    this.listStore.fetchListResponse$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(async ({ processId, queryParams, response }) => {
+      /**
+       * Wenn die Suche erfolgreich war, wird der Benutzer auf die Liste oder Detailseite des gefundenen Artikels weitergeleitet.
+       */
+      const filterQueryParams = this.listStore.filter.getQueryParams();
+
+      // Only Update QueryParams if the user is already on the details, edit or history page
+      // const view: string = this.activatedRoute.snapshot.data.view;
+      // if (['filter', 'details', 'edit', 'history'].includes(view)) {
+      //   await this.router.navigate([], { queryParams: { ...queryParams, ...filterQueryParams }, skipLocationChange: true });
+      //   return;
+      // }
+
+      if (response.hits === 1) {
+        const detailsPath = await this.getPathForDetail(response.result[0]).pipe(take(1)).toPromise();
+        await this.router.navigate(detailsPath.path, { queryParams: { ...queryParams, ...filterQueryParams, ...detailsPath.queryParams } });
+      } else if (response.hits > 1) {
+        const listPath = await this.getPathFoListBreadcrumb({ processId, queryParams });
+        await this.router.navigate(listPath.path, { queryParams: { ...queryParams, ...filterQueryParams, ...listPath.queryParams } });
+      } else {
+        await this.router.navigate([], { queryParams: { ...queryParams, ...filterQueryParams } });
+      }
+    });
+  }

  /**
   * Sucht die Breadcrumb anhand des Tags.
--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-details-base.component.ts
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-details-base.component.ts
@@ -43,7 +43,6 @@ export abstract class PickupShelfDetailsBaseComponent {
        this.store.resetCoverItems();
      }
      this.store.fetchOrder({ orderId: Number(params.orderId) });
-
      this.store.fetchOrderItems({
        orderNumber: params.orderNumber ? decodeURIComponent(params.orderNumber) : undefined,
        compartmentCode: params.compartmentCode ? decodeURIComponent(params.compartmentCode) : undefined,
@@ -125,7 +124,6 @@ export abstract class PickupShelfDetailsBaseComponent {
          processingStatus: updatedItem.processingStatus,
          compartmentCode: updatedItem.compartmentCode,
          compartmentInfo: updatedItem.compartmentInfo,
-          quantity: updatedItem.quantity,
        },
      });
    });
--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.html
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.html
@@ -36,22 +36,12 @@

      <page-pickup-shelf-details-tags class="mb-px-2" *ngIf="showTagsComponent$ | async"></page-pickup-shelf-details-tags>

-      <ng-container *ngIf="fetchingCoverItems$ | async; else coverItemsTmpl">
-        <div class="bg-white grid grid-flow-col gap-5 justify-center items-center h-40">
-          <shared-skeleton-loader class="h-16 w-12"></shared-skeleton-loader>
-          <shared-skeleton-loader class="h-16 w-12"></shared-skeleton-loader>
-          <shared-skeleton-loader class="h-16 w-12"></shared-skeleton-loader>
-        </div>
-      </ng-container>
-
-      <ng-template #coverItemsTmpl>
-        <page-pickup-shelf-details-covers
-          *ngIf="(coverOrderItems$ | async)?.length > 0"
-          [coverItems]="coverOrderItems$ | async"
-          [selectedOrderItem]="selectedItem$ | async"
-          (coverClick)="coverClick($event)"
-        ></page-pickup-shelf-details-covers>
-      </ng-template>
+      <page-pickup-shelf-details-covers
+        *ngIf="(coverOrderItems$ | async)?.length > 0"
+        [coverItems]="coverOrderItems$ | async"
+        [selectedOrderItem]="selectedItem$ | async"
+        (coverClick)="coverClick($event)"
+      ></page-pickup-shelf-details-covers>
    </div>

    <div class="page-pickup-shelf-in-details__action-wrapper">
@@ -61,10 +51,7 @@
        [class.cta-action-primary]="action.selected"
        [class.cta-action-secondary]="!action.selected"
        *ngFor="let action of mainActions$ | async"
-        (click)="handleAction({ action })"
-        matomoClickCategory="pickup-shelf-in-details"
-        matomoClickAction="click"
-        [matomoClickName]="action.label"
+        (click)="handleAction({action})"
      >
        <ui-spinner [show]="(changeActionLoader$ | async) === action.command">{{ action.label }}</ui-spinner>
      </button>
@@ -76,13 +63,7 @@
          class="cta-action shadow-action"
          [class.cta-action-primary]="action.selected"
          [class.cta-action-secondary]="!action.selected"
-          (click)="
-            handleAction({
-              action,
-              latestCompartmentCode: latestCompartmentInfos?.latestCompartmentCode,
-              latestCompartmentInfo: latestCompartmentInfos?.latestCompartmentInfo,
-            })
-          "
+          (click)="handleAction({action, latestCompartmentCode: latestCompartmentInfos?.latestCompartmentCode, latestCompartmentInfo: latestCompartmentInfos?.latestCompartmentInfo })"
        >
          <ui-spinner [show]="(changeActionLoader$ | async) === action.command"
            >{{ latestDisplayedCompartmentInfos$ | async | addToPreviousCompartmentCodeLabelPipe }} zubuchen</ui-spinner
--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.ts
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.ts
@@ -10,16 +10,13 @@ import { UiSpinnerModule } from '@ui/spinner';
 import { OnInitDirective } from '@shared/directives/element-lifecycle';
 import { PickupShelfInNavigationService } from '@shared/services';
 import { BehaviorSubject, asapScheduler, combineLatest } from 'rxjs';
-import { distinctUntilChanged, map, shareReplay } from 'rxjs/operators';
+import { map, shareReplay } from 'rxjs/operators';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString } from '@swagger/oms';
 import { UiErrorModalComponent, UiModalService } from '@ui/modal';
 import { ActivatedRoute } from '@angular/router';
 import { RunCheckTrigger } from '../../trigger';
 import { PickUpShelfDetailsItemsGroupComponent } from '../../shared/pickup-shelf-details-items-group/pickup-shelf-details-items-group.component';
-import { isEqual } from 'lodash';
-import { SkeletonLoaderComponent } from '@shared/components/loader';
-import { MatomoModule } from 'ngx-matomo-client';

@Component({
  selector: 'page-pickup-shelf-in-details',
@@ -40,8 +37,6 @@ import { MatomoModule } from 'ngx-matomo-client';
    PickupShelfAddToPreviousCompartmentCodeLabelPipe,
    UiSpinnerModule,
    OnInitDirective,
-    SkeletonLoaderComponent,
-    MatomoModule,
  ],
 })
 export class PickupShelfInDetailsComponent extends PickupShelfDetailsBaseComponent implements OnInit, AfterViewInit {
@@ -54,16 +49,16 @@ export class PickupShelfInDetailsComponent extends PickupShelfDetailsBaseCompone

  order$ = this.store.order$;

-  orderItems$ = this.store.orderItems$.pipe(shareReplay(1));
+  orderItems$ = this.store.orderItems$.pipe(shareReplay());

  noOrderItemsFound$ = this.store.noOrderItemsFound$;

-  fetchingOrder$ = this.store.fetchingOrder$;
+  fetching$ = this.store.fetchingOrder$;
  fetchingItems$ = this.store.fetchingOrderItems$;
  fetchingCoverItems$ = this.store.fetchingCoverOrderItems$;

-  viewFetching$ = combineLatest([this.fetchingItems$, this.orderItems$]).pipe(
-    map(([fetchingItems, orderItems]) => fetchingItems && orderItems.length === 0),
+  viewFetching$ = combineLatest([this.fetching$, this.fetchingItems$, this.fetchingCoverItems$]).pipe(
+    map(([fetching, fetchingItems, fetchingCoverItems]) => fetching || fetchingItems || fetchingCoverItems)
  );

  selectedCompartmentInfo = this.store.selectedCompartmentInfo;
@@ -95,42 +90,33 @@ export class PickupShelfInDetailsComponent extends PickupShelfDetailsBaseCompone
        return `${latestCompartmentInfos?.latestCompartmentCode}_${latestCompartmentInfos?.latestCompartmentInfo}`;
      }
      return latestCompartmentInfos?.latestCompartmentCode;
-    }),
+    })
  );

  addToPreviousCompartmentActionDisabled$ = combineLatest([this.displayedCompartmentInfo$, this.changeActionDisabled$]).pipe(
-    map(([compartmentInfo, changeActionDisabled]) => !!compartmentInfo || changeActionDisabled),
+    map(([compartmentInfo, changeActionDisabled]) => !!compartmentInfo || changeActionDisabled)
  );

-  constructor(
-    private _uiModal: UiModalService,
-    private _activatedRoute: ActivatedRoute,
-  ) {
+  constructor(private _uiModal: UiModalService, private _activatedRoute: ActivatedRoute) {
    super();
  }

  ngOnInit() {
-    combineLatest([this._activatedRoute.params.pipe(distinctUntilChanged(isEqual)), this.orderItems$.pipe(distinctUntilChanged(isEqual))])
+    combineLatest([this._activatedRoute.params, this.orderItems$])
      .pipe(takeUntilDestroyed(this.destroyRef))
      .subscribe(([params, items]) => {
        const orderItemSubsetId = +params?.orderItemSubsetId;
        const selectedItem: DBHOrderItemListItemDTO = items?.find(
-          (item: DBHOrderItemListItemDTO) => item?.orderItemSubsetId === orderItemSubsetId,
+          (item: DBHOrderItemListItemDTO) => item?.orderItemSubsetId === orderItemSubsetId
        );

        // Trigger functions only if a new item gets selected
        if (!!selectedItem && this.store.selectPreviousSelectedOrderItemSubsetId !== orderItemSubsetId) {
          this.store.setPreviousSelectedOrderItemSubsetId(orderItemSubsetId); // Wichtig das die ID im Store vorhanden bleibt um z.B. für die Filter eine zurücknavigation zu ermöglichen
          this.store.selectOrderItem(selectedItem, true); // Wird automatisch unselected wenn die Details Seite verlassen wird
+          this.store.fetchCoverOrderItems();
        }
      });
-
-    // Fix #4696 - Always Fetch Cover Order Items
-    this._activatedRoute.params.pipe(distinctUntilChanged(isEqual), takeUntilDestroyed(this.destroyRef)).subscribe((_) => {
-      if (!this.store.coverOrderItems || this.store.coverOrderItems.length === 0) {
-        this.store.fetchCoverOrderItems();
-      }
-    });
  }

  ngAfterViewInit() {
@@ -155,14 +141,11 @@ export class PickupShelfInDetailsComponent extends PickupShelfDetailsBaseCompone
    try {
      this.changeActionLoader$.next(action.command);
      this.store.setDisableHeaderStatusDropdown(true);
+
      const context = await this.execAction({ action, latestCompartmentCode, latestCompartmentInfo });

      if (!!context) {
-        if (
-          action.command.includes('ARRIVED') ||
-          action.command.includes('PRINT_PRICEDIFFQRCODELABEL') ||
-          action.command.includes('BACKTOSTOCK')
-        ) {
+        if (action.command.includes('ARRIVED') || action.command.includes('PRINT_PRICEDIFFQRCODELABEL')) {
          asapScheduler.schedule(async () => {
            await this.navigateBasedOnCurrentView();
          }, 100);
@@ -181,7 +164,7 @@ export class PickupShelfInDetailsComponent extends PickupShelfDetailsBaseCompone
                },
                side: false,
              }).path,
-              { queryParamsHandling: 'preserve' },
+              { queryParamsHandling: 'preserve' }
            );
            this.listStore.patchOrderItem({
              orderItemSubsetId: item.orderItemSubsetId,
@@ -225,21 +208,20 @@ export class PickupShelfInDetailsComponent extends PickupShelfDetailsBaseCompone
  }

  updateDate({ date, type }: { date: Date; type?: 'delivery' | 'pickup' | 'preferred' }) {
-    this.store.updateOrderItemSubsetLoading(true);
    switch (type) {
      case 'delivery':
-        this.store.selectedOrderItems.forEach((item) =>
-          this.store.patchOrderItemSubset({ item, changes: { estimatedShippingDate: date.toISOString() } }),
+        this.store.orderItems.forEach((item) =>
+          this.store.patchOrderItemSubset({ item, changes: { estimatedShippingDate: date.toISOString() } })
        );
        break;
      case 'pickup':
-        this.store.selectedOrderItems.forEach((item) =>
-          this.store.patchOrderItemSubset({ item, changes: { compartmentStop: date.toISOString() } }),
+        this.store.orderItems.forEach((item) =>
+          this.store.patchOrderItemSubset({ item, changes: { compartmentStop: date.toISOString() } })
        );
        break;
      case 'preferred':
-        this.store.selectedOrderItems.forEach((item) =>
-          this.store.patchOrderItemSubset({ item, changes: { preferredPickUpDate: date.toISOString() } }),
+        this.store.orderItems.forEach((item) =>
+          this.store.patchOrderItemSubset({ item, changes: { preferredPickUpDate: date.toISOString() } })
        );
        break;
      default:
@@ -263,9 +245,9 @@ export class PickupShelfInDetailsComponent extends PickupShelfDetailsBaseCompone
          orderItemSubsetId: orderItem.orderItemSubsetId,
          compartmentInfo: orderItem.compartmentInfo,
        },
-        { side: this.side },
+        { side: this.side }
      ).path,
-      { queryParams: { buyerNumber: orderItem?.buyerNumber }, queryParamsHandling: 'merge' },
+      { queryParams: { buyerNumber: orderItem?.buyerNumber }, queryParamsHandling: 'merge' }
    );
  }

@@ -280,9 +262,9 @@ export class PickupShelfInDetailsComponent extends PickupShelfDetailsBaseCompone
          orderItemSubsetId: orderItem.orderItemSubsetId,
          compartmentInfo: orderItem.compartmentInfo,
        },
-        { side: this.side },
+        { side: this.side }
      ).path,
-      { queryParams: { orderItemSubsetId: orderItem.orderItemSubsetId }, queryParamsHandling: 'merge' },
+      { queryParams: { orderItemSubsetId: orderItem.orderItemSubsetId }, queryParamsHandling: 'merge' }
    );
  }

@@ -306,7 +288,7 @@ export class PickupShelfInDetailsComponent extends PickupShelfDetailsBaseCompone
          },
          side: this.side,
        }).path,
-        { queryParamsHandling: 'preserve' },
+        { queryParamsHandling: 'preserve' }
      );
    } else {
      if (orderItems.every((item) => item.processingStatus === 128)) {
--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-edit/pickup-shelf-in-edit.component.html
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-edit/pickup-shelf-in-edit.component.html
@@ -1,7 +1,5 @@
-<ng-container *ngIf="store.selectedOrderItem$ | async; let item">
-  <shared-goods-in-out-order-edit
-    *ngIf="item"
-    (navigation)="navigateToShelfInDetailsPage($event)"
-    [items]="[item]"
-  ></shared-goods-in-out-order-edit>
-</ng-container>
+<shared-goods-in-out-order-edit
+  *ngIf="store.orderItems$ | async; let items"
+  (navigation)="navigateToShelfInDetailsPage($event)"
+  [items]="items"
+></shared-goods-in-out-order-edit>
--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-edit/pickup-shelf-in-edit.component.ts
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-edit/pickup-shelf-in-edit.component.ts
@@ -20,23 +20,15 @@ export class PickupShelfInEditComponent extends PickupShelfDetailsBaseComponent

  constructor() {
    super();
-  }

+    this.listStore;
+  }
  async navigateToShelfInDetailsPage(changes?: Partial<DBHOrderItemListItemDTO>) {
    const orderId = (await this.store.orderItems$.pipe(first()).toPromise())?.find((_) => true)?.orderId;
-    const orderNumber = decodeURIComponent(this.activatedRoute?.snapshot?.params?.orderNumber);
-    let compartmentCode = changes?.compartmentCode ?? this.activatedRoute?.snapshot?.params?.compartmentCode;
+    const orderNumber = this.activatedRoute?.snapshot?.params?.orderNumber;
+    const compartmentCode = changes?.compartmentCode ?? this.activatedRoute?.snapshot?.params?.compartmentCode;
    const processingStatus = changes?.processingStatus ?? this.activatedRoute.snapshot.params.orderItemProcessingStatus;
-    let compartmentInfo = changes?.compartmentInfo ?? this.activatedRoute.snapshot.params.compartmentInfo;
-    const item = this.store?.selectedOrderItem;
-
-    if (compartmentCode) {
-      compartmentCode = decodeURIComponent(compartmentCode);
-    }
-
-    if (compartmentInfo) {
-      compartmentInfo = decodeURIComponent(compartmentInfo);
-    }
+    const compartmentInfo = changes?.compartmentInfo ?? this.activatedRoute.snapshot.params.compartmentInfo;

    await this.router.navigate(
      this.shelfInNavigation.detailRoute({
@@ -46,11 +38,11 @@ export class PickupShelfInEditComponent extends PickupShelfDetailsBaseComponent
          compartmentCode,
          processingStatus,
          compartmentInfo,
-          orderItemSubsetId: item?.orderItemSubsetId,
+          orderItemSubsetId: this.store?.selectPreviousSelectedOrderItemSubsetId,
        },
        side: this.side,
      }).path,
-      { queryParamsHandling: 'preserve' },
+      { queryParamsHandling: 'preserve' }
    );
  }
 }
--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-list/pickup-shelf-in-list.component.ts
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-list/pickup-shelf-in-list.component.ts
@@ -28,7 +28,6 @@ import { CacheService } from '@core/cache';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { PickupShelfListItemLoaderComponent } from '../../shared/pickup-shelf-list-item/pickup-shelf-list-item-loader.component';
 import { ScrollContainerDirective } from '@shared/directives/scroll-container';
-import { MatomoModule } from 'ngx-matomo-client';

@Component({
  selector: 'page-pickup-shelf-in-list',
@@ -77,7 +76,7 @@ export class PickUpShelfInListComponent implements OnInit, AfterViewInit {
    map(([filter, defaultFilter]) => {
      const filterQueryParams = filter?.getQueryParams();
      return !isEqual(filterQueryParams, Filter.create(defaultFilter).getQueryParams());
-    }),
+    })
  );

  fetching$: Observable<boolean> = this.store.fetchingList$;
@@ -118,7 +117,7 @@ export class PickUpShelfInListComponent implements OnInit, AfterViewInit {
    private _activatedRoute: ActivatedRoute,
    private _pickUpShelfInNavigation: PickupShelfInNavigationService,
    private _cache: CacheService,
-    private _router: Router,
+    private _router: Router
  ) {}

  ngOnInit() {
--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-main-side-view/pickup-shelf-in-main-side-view.component.html
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-main-side-view/pickup-shelf-in-main-side-view.component.html
@@ -26,8 +26,6 @@
        (click)="showFilter.emit()"
        class="page-pickup-shelf-in-main__filter w-[6.75rem] h-14 rounded font-bold px-5 mb-4 text-lg bg-[#AEB7C1] flex flex-row flex-nowrap items-center justify-center"
        [class.active]="hasFilter$ | async"
-        matomoClickAction="open"
-        matomoClickCategory="filter"
      >
        <shared-icon class="mr-2" icon="filter-variant"></shared-icon>
        Filter
--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-main-side-view/pickup-shelf-in-main-side-view.component.ts
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-main-side-view/pickup-shelf-in-main-side-view.component.ts
@@ -7,7 +7,6 @@ import { isEqual } from 'lodash';
 import { Observable, combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { PickupShelfStore } from '../../store';
-import { MatomoModule } from 'ngx-matomo-client';

@Component({
  selector: 'page-pickup-shelf-in-main-side-view',
@@ -16,7 +15,7 @@ import { MatomoModule } from 'ngx-matomo-client';
  standalone: true,
  changeDetection: ChangeDetectionStrategy.OnPush,
  host: { class: 'page-pickup-shelf-in-main-side-view' },
-  imports: [FilterModule, AsyncPipe, NgIf, IconModule, MatomoModule],
+  imports: [FilterModule, AsyncPipe, NgIf, IconModule],
 })
 export class PickUpShelfInMainSideViewComponent implements OnInit {
  @Output() showFilter = new EventEmitter<void>();
@@ -36,7 +35,7 @@ export class PickUpShelfInMainSideViewComponent implements OnInit {
    map(([filter, defaultFilter]) => {
      const filterQueryParams = filter?.getQueryParams();
      return !isEqual(filterQueryParams, Filter.create(defaultFilter).getQueryParams());
-    }),
+    })
  );

  fetching$: Observable<boolean> = this.store.fetchingList$;
--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in.component.ts
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in.component.ts
@@ -16,7 +16,6 @@ import { map, take } from 'rxjs/operators';
 import { ApplicationService } from '@core/application';
 import { FilterAutocompleteProvider } from '@shared/components/filter';
 import { PickUpShelfInAutocompleteProvider } from './providers/pickup-shelf-in-autocomplete.provider';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';

@Component({
  selector: 'page-pickup-shelf-in',
@@ -216,23 +215,4 @@ export class PickupShelfInComponent extends PickupShelfBaseComponent {
  async getNameForHistoryBreadcrumb(data: GetNameForBreadcrumbData): Promise<string> {
    return 'Historie';
  }
-
-  async regsiterFetchListResponseHandler() {
-    this.listStore.fetchListResponse$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(async ({ processId, queryParams, response }) => {
-      /**
-       * Wenn die Suche erfolgreich war, wird der Benutzer auf die Liste oder Detailseite des gefundenen Artikels weitergeleitet.
-       */
-      const filterQueryParams = this.listStore.filter.getQueryParams();
-
-      if (response.hits === 1) {
-        const detailsPath = await this.getPathForDetail(response.result[0]).pipe(take(1)).toPromise();
-        await this.router.navigate(detailsPath.path, { queryParams: { ...queryParams, ...filterQueryParams, ...detailsPath.queryParams } });
-      } else if (response.hits > 1) {
-        const listPath = await this.getPathFoListBreadcrumb({ processId, queryParams });
-        await this.router.navigate(listPath.path, { queryParams: { ...queryParams, ...filterQueryParams, ...listPath.queryParams } });
-      } else {
-        await this.router.navigate([], { queryParams: { ...queryParams, ...filterQueryParams } });
-      }
-    });
-  }
 }
--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-in/routes.ts
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-in/routes.ts
@@ -8,7 +8,6 @@ import { PickUpShelfInMainSideViewComponent } from './pickup-shelf-in-main-side-
 import { PickUpShelfInMainComponent } from './pickup-shelf-in-main/pickup-shelf-in-main.component';
 import { PickUpShelfInListComponent } from './pickup-shelf-in-list/pickup-shelf-in-list.component';
 import { PickupShelfInEditComponent } from './pickup-shelf-in-edit/pickup-shelf-in-edit.component';
-import { MatomoRouteData } from 'ngx-matomo-client';

 export const routes: Routes = [
  {
@@ -19,125 +18,53 @@ export const routes: Routes = [
    },
    runGuardsAndResolvers: 'always',
    children: [
-      {
-        path: 'main',
-        component: PickUpShelfInMainComponent,
-        data: {
-          view: 'main',
-          matomo: {
-            title: 'Abholfach',
-          } as MatomoRouteData,
-        },
-      },
-      {
-        path: 'list',
-        component: PickUpShelfInListComponent,
-        data: {
-          view: 'list',
-          matomo: {
-            title: 'Abholfach - Trefferliste',
-          } as MatomoRouteData,
-        },
-      },
-      {
-        path: 'list/filter',
-        component: PickupShelfFilterComponent,
-        data: {
-          view: 'filter',
-          matomo: {
-            title: 'Abholfach - Filter',
-          } as MatomoRouteData,
-        },
-      },
+      { path: 'main', component: PickUpShelfInMainComponent, data: { view: 'main' } },
+      { path: 'list', component: PickUpShelfInListComponent, data: { view: 'list' } },
+      { path: 'list/filter', component: PickupShelfFilterComponent, data: { view: 'filter' } },
      {
        path: 'order/:orderId/:orderNumber/item/status/:orderItemProcessingStatus/:orderItemSubsetId/edit',
        component: PickupShelfInEditComponent,
-        data: {
-          view: 'edit',
-          matomo: {
-            title: 'Abholfach - Bearbeiten',
-          } as MatomoRouteData,
-        },
+        data: { view: 'edit' },
      },
      {
        path: 'order/:orderId/compartment/:compartmentCode/:orderItemSubsetId/edit',
        component: PickupShelfInEditComponent,
-        data: {
-          view: 'edit',
-          matomo: {
-            title: 'Abholfach - Bearbeiten',
-          } as MatomoRouteData,
-        },
+        data: { view: 'edit' },
      },
      {
        path: 'order/:orderId/compartment/:compartmentCode/:compartmentInfo/:orderItemSubsetId/edit',
        component: PickupShelfInEditComponent,
-        data: {
-          view: 'edit',
-          matomo: {
-            title: 'Abholfach - Bearbeiten',
-          } as MatomoRouteData,
-        },
+        data: { view: 'edit' },
      },
      {
        path: 'order/:orderId/:orderNumber/item/status/:orderItemProcessingStatus/:orderItemSubsetId/history',
        component: PickUpShelfHistoryComponent,
-        data: {
-          view: 'history',
-          matomo: {
-            title: 'Abholfach - Historie',
-          } as MatomoRouteData,
-        },
+        data: { view: 'history' },
      },
      {
        path: 'order/:orderId/compartment/:compartmentCode/:orderItemSubsetId/history',
        component: PickUpShelfHistoryComponent,
-        data: {
-          view: 'history',
-          matomo: {
-            title: 'Abholfach - Historie',
-          } as MatomoRouteData,
-        },
+        data: { view: 'history' },
      },
      {
        path: 'order/:orderId/compartment/:compartmentCode/:compartmentInfo/:orderItemSubsetId/history',
        component: PickUpShelfHistoryComponent,
-        data: {
-          view: 'history',
-          matomo: {
-            title: 'Abholfach - Historie',
-          } as MatomoRouteData,
-        },
+        data: { view: 'history' },
      },
      {
        path: 'order/:orderId/:orderNumber/item/status/:orderItemProcessingStatus/:orderItemSubsetId',
        component: PickupShelfInDetailsComponent,
-        data: {
-          view: 'details',
-          matomo: {
-            title: 'Abholfach - Details',
-          } as MatomoRouteData,
-        },
+        data: { view: 'details' },
      },
      {
        path: 'order/:orderId/compartment/:compartmentCode/:orderItemSubsetId',
        component: PickupShelfInDetailsComponent,
-        data: {
-          view: 'details',
-          matomo: {
-            title: 'Abholfach - Details',
-          } as MatomoRouteData,
-        },
+        data: { view: 'details' },
      },
      {
        path: 'order/:orderId/compartment/:compartmentCode/:compartmentInfo/:orderItemSubsetId',
        component: PickupShelfInDetailsComponent,
-        data: {
-          view: 'details',
-          matomo: {
-            title: 'Abholfach - Details',
-          } as MatomoRouteData,
-        },
+        data: { view: 'details' },
      },
      { path: 'search', component: PickUpShelfInMainSideViewComponent, outlet: 'side' },
      { path: 'list', component: PickUpShelfInListComponent, data: { view: 'list' }, outlet: 'side' },
--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-out/pickup-shelf-out-details/pickup-shelf-out-details.component.html
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-out/pickup-shelf-out-details/pickup-shelf-out-details.component.html
@@ -47,9 +47,6 @@
        [class.cta-action-secondary]="!action.selected"
        *ngFor="let action of mainActions$ | async"
        (click)="handleAction(action)"
-        matomoClickCategory="pickup-shelf-out-details"
-        matomoClickAction="click"
-        [matomoClickName]="action.label"
      >
        <ui-spinner [show]="(changeActionLoader$ | async) === action.command">{{ action.label }}</ui-spinner>
      </button>
--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-out/pickup-shelf-out-details/pickup-shelf-out-details.component.ts
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-out/pickup-shelf-out-details/pickup-shelf-out-details.component.ts
@@ -14,7 +14,6 @@ import { OnInitDirective } from '@shared/directives/element-lifecycle';
 import { FormsModule } from '@angular/forms';
 import { RunCheckTrigger } from '../../trigger';
 import { PickUpShelfDetailsItemsGroupComponent } from '../../shared/pickup-shelf-details-items-group/pickup-shelf-details-items-group.component';
-import { MatomoModule } from 'ngx-matomo-client';

@Component({
  selector: 'page-pickup-shelf-out-details',
@@ -34,7 +33,6 @@ import { MatomoModule } from 'ngx-matomo-client';
    UiSpinnerModule,
    OnInitDirective,
    FormsModule,
-    MatomoModule,
  ],
  providers: [],
 })
@@ -48,9 +46,7 @@ export class PickupShelfOutDetailsComponent extends PickupShelfDetailsBaseCompon

  order$ = this.store.order$;

-  orderItems$ = this.store.orderItems$;
-
-  groupedItems$: Observable<Array<{ type: string; items: DBHOrderItemListItemDTO[] }>> = this.orderItems$.pipe(
+  groupedItems$: Observable<Array<{ type: string; items: DBHOrderItemListItemDTO[] }>> = this.store.orderItems$.pipe(
    map((items) => {
      const groups: Array<{ type: string; items: DBHOrderItemListItemDTO[] }> = [];

@@ -67,15 +63,13 @@ export class PickupShelfOutDetailsComponent extends PickupShelfDetailsBaseCompon
      }

      return groups;
-    }),
+    })
  );

-  fetchingOrder$ = this.store.fetchingOrder$;
+  fetching$ = this.store.fetchingOrder$;
  fetchingItems$ = this.store.fetchingOrderItems$;

-  viewFetching$ = combineLatest([this.orderItems$, this.fetchingItems$]).pipe(
-    map(([orderItems, fetchingItems]) => orderItems?.length === 0 && fetchingItems),
-  );
+  viewFetching$ = combineLatest([this.fetching$, this.fetchingItems$]).pipe(map(([fetching, fetchingItems]) => fetching || fetchingItems));

  selectedCompartmentInfo = this.store.selectedCompartmentInfo;

@@ -90,7 +84,7 @@ export class PickupShelfOutDetailsComponent extends PickupShelfDetailsBaseCompon

  addToPreviousCompartmentAction$ = this.store.addToPreviousCompartmentAction$;

-  mainActions$ = this.store.mainShelfOutActions$;
+  mainActions$ = this.store.mainActions$;

  trackByFnGroupDBHOrderItemListItemDTO = (index: number, group: { type: string; items: DBHOrderItemListItemDTO[] }) => group.type;

@@ -111,11 +105,7 @@ export class PickupShelfOutDetailsComponent extends PickupShelfDetailsBaseCompon
      const context = await this.execAction({ action });

      if (!!context) {
-        if (
-          action.command.includes('ARRIVED') ||
-          action.command.includes('PRINT_PRICEDIFFQRCODELABEL') ||
-          action.command.includes('BACKTOSTOCK')
-        ) {
+        if (action.command.includes('ARRIVED') || action.command.includes('PRINT_PRICEDIFFQRCODELABEL')) {
          const nav = this._pickupShelfOutNavigationService.defaultRoute({ processId: this.processId });
          await this.router.navigate(nav.path, { queryParams: nav.queryParams, queryParamsHandling: 'preserve' });
        } else {
@@ -131,7 +121,7 @@ export class PickupShelfOutDetailsComponent extends PickupShelfDetailsBaseCompon
                compartmentInfo: item.compartmentInfo,
              },
            }).path,
-            { queryParamsHandling: 'preserve' },
+            { queryParamsHandling: 'preserve' }
          );
        }
      }
@@ -154,21 +144,20 @@ export class PickupShelfOutDetailsComponent extends PickupShelfDetailsBaseCompon
  }

  updateDate({ date, type }: { date: Date; type?: 'delivery' | 'pickup' | 'preferred' }) {
-    this.store.updateOrderItemSubsetLoading(true);
    switch (type) {
      case 'delivery': // vsl. Lieferdatum
        this.store.orderItems.forEach((item) =>
-          this.store.patchOrderItemSubset({ item, changes: { estimatedShippingDate: date.toISOString() } }),
+          this.store.patchOrderItemSubset({ item, changes: { estimatedShippingDate: date.toISOString() } })
        );
        break;
      case 'pickup': // Abholfrist
        this.store.orderItems.forEach((item) =>
-          this.store.patchOrderItemSubset({ item, changes: { compartmentStop: date.toISOString() } }),
+          this.store.patchOrderItemSubset({ item, changes: { compartmentStop: date.toISOString() } })
        );
        break;
      case 'preferred': // Zurücklegen bis
        this.store.orderItems.forEach((item) =>
-          this.store.patchOrderItemSubset({ item, changes: { preferredPickUpDate: date.toISOString() } }),
+          this.store.patchOrderItemSubset({ item, changes: { preferredPickUpDate: date.toISOString() } })
        );
        break;
      default:
@@ -193,7 +182,7 @@ export class PickupShelfOutDetailsComponent extends PickupShelfDetailsBaseCompon
          compartmentInfo: orderItem.compartmentInfo,
        },
      }).path,
-      { queryParams: { buyerNumber: orderItem?.buyerNumber }, queryParamsHandling: 'merge' },
+      { queryParams: { buyerNumber: orderItem?.buyerNumber }, queryParamsHandling: 'merge' }
    );
  }

@@ -209,7 +198,7 @@ export class PickupShelfOutDetailsComponent extends PickupShelfDetailsBaseCompon
          compartmentInfo: orderItem.compartmentInfo,
        },
      }).path,
-      { queryParams: { orderItemSubsetId: orderItem.orderItemSubsetId }, queryParamsHandling: 'merge' },
+      { queryParams: { orderItemSubsetId: orderItem.orderItemSubsetId }, queryParamsHandling: 'merge' }
    );
  }

--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-out/pickup-shelf-out-edit/pickup-shelf-out-edit.component.ts
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-out/pickup-shelf-out-edit/pickup-shelf-out-edit.component.ts
@@ -26,18 +26,10 @@ export class PickupShelfOutEditComponent extends PickupShelfDetailsBaseComponent

  async navigateToShelfOutDetailsPage(changes: Partial<DBHOrderItemListItemDTO>) {
    const orderId = (await this.store.orderItems$.pipe(first()).toPromise())?.find((_) => true)?.orderId;
-    const orderNumber = decodeURIComponent(this.activatedRoute?.snapshot?.params?.orderNumber);
-    let compartmentCode = changes?.compartmentCode ?? this.activatedRoute?.snapshot?.params?.compartmentCode;
+    const orderNumber = this.activatedRoute?.snapshot?.params?.orderNumber;
+    const compartmentCode = changes?.compartmentCode ?? this.activatedRoute?.snapshot?.params?.compartmentCode;
    const processingStatus = changes?.processingStatus ?? this.activatedRoute.snapshot.params.orderItemProcessingStatus;
-    let compartmentInfo = changes?.compartmentInfo ?? this.activatedRoute.snapshot.params.compartmentInfo;
-
-    if (compartmentCode) {
-      compartmentCode = decodeURIComponent(compartmentCode);
-    }
-
-    if (compartmentInfo) {
-      compartmentInfo = decodeURIComponent(compartmentInfo);
-    }
+    const compartmentInfo = changes?.compartmentInfo ?? this.activatedRoute.snapshot.params.compartmentInfo;

    await this.router.navigate(
      this.shelfOutNavigation.detailRoute({
--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-out/pickup-shelf-out-list/pickup-shelf-out-list.component.html
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-out/pickup-shelf-out-list/pickup-shelf-out-list.component.html
@@ -34,7 +34,8 @@
    class="page-pickup-shelf-out-list__items-count inline-flex flex-row items-center pr-5 text-p3"
    [class.mb-4]="primaryOutletActive$ | async"
  >
-    {{ hits ?? 0 }}
+    {{ hits ??
+      0 }}
    Titel
  </div>
 </div>
@@ -88,9 +89,6 @@
      [class.cta-action-primary]="action.selected"
      [class.cta-action-secondary]="!action.selected"
      (click)="handleAction(action)"
-      matomoClickCategory="pickup-shelf-out-list"
-      matomoClickAction="click"
-      [matomoClickName]="action.label"
    >
      <ui-spinner [show]="(loadingFetchedActionButton$ | async) || (fetching$ | async)">{{ action.label }}</ui-spinner>
    </button>
--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-out/pickup-shelf-out-list/pickup-shelf-out-list.component.ts
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-out/pickup-shelf-out-list/pickup-shelf-out-list.component.ts
@@ -30,7 +30,6 @@ import { ActionHandlerService } from '../../services/action-handler.service';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { CacheService } from '@core/cache';
 import { ScrollContainerDirective } from '@shared/directives/scroll-container';
-import { MatomoModule } from 'ngx-matomo-client';

@Component({
  selector: 'page-pcikup-shelf-out-list',
@@ -51,7 +50,6 @@ import { MatomoModule } from 'ngx-matomo-client';
    GroupByPipe,
    UiSpinnerModule,
    PickupShelfListItemLoaderComponent,
-    MatomoModule,
  ],
 })
 export class PickupShelfOutListComponent implements OnInit, AfterViewInit {
@@ -82,7 +80,7 @@ export class PickupShelfOutListComponent implements OnInit, AfterViewInit {
    map(([filter, defaultFilter]) => {
      const filterQueryParams = filter?.getQueryParams();
      return !isEqual(filterQueryParams, Filter.create(defaultFilter).getQueryParams());
-    }),
+    })
  );

  fetching$: Observable<boolean> = this.store.fetchingList$;
@@ -122,9 +120,9 @@ export class PickupShelfOutListComponent implements OnInit, AfterViewInit {

  actions$ = combineLatest([this.list$, this.selectedIds$]).pipe(
    map(([items, selectedIds]) =>
-      items?.find((item) => selectedIds.find((orderItemSubsetId) => item.orderItemSubsetId === orderItemSubsetId)),
+      items?.find((item) => selectedIds.find((orderItemSubsetId) => item.orderItemSubsetId === orderItemSubsetId))
    ),
-    map((item) => item?.actions?.filter((action) => this.selectionRules(action))),
+    map((item) => item?.actions?.filter((action) => this.selectionRules(action)))
  );

  loadingFetchedActionButton$ = new BehaviorSubject<boolean>(false);
@@ -137,7 +135,7 @@ export class PickupShelfOutListComponent implements OnInit, AfterViewInit {
    private _uiModal: UiModalService,
    private _pickUpShelfOutNavigation: PickUpShelfOutNavigationService,
    private _cache: CacheService,
-    private _router: Router,
+    private _router: Router
  ) {}

  ngOnInit() {
@@ -192,7 +190,7 @@ export class PickupShelfOutListComponent implements OnInit, AfterViewInit {

  getSelectedItem$(item: DBHOrderItemListItemDTO) {
    return this.store.selectedListItems$.pipe(
-      map((selectedListItems) => selectedListItems?.find((i) => i?.orderItemSubsetId === item?.orderItemSubsetId)),
+      map((selectedListItems) => selectedListItems?.find((i) => i?.orderItemSubsetId === item?.orderItemSubsetId))
    );
  }

@@ -206,7 +204,7 @@ export class PickupShelfOutListComponent implements OnInit, AfterViewInit {
        } else {
          return item?.actions?.some((action) => this.selectionRules(action));
        }
-      }),
+      })
    );
  }

--- a/apps/page/pickup-shelf/src/lib/pickup-shelf-out/pickup-shelf-out.component.ts
+++ b/apps/page/pickup-shelf/src/lib/pickup-shelf-out/pickup-shelf-out.component.ts
@@ -15,7 +15,6 @@ import { ActionHandlerServices } from '@domain/oms';
 import { ActionHandlerService } from '../services/action-handler.service';
 import { FilterAutocompleteProvider } from '@shared/components/filter';
 import { PickUpShelfOutAutocompleteProvider } from './providers/pickup-shelf-out-autocomplete.provider';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';

@Component({
  selector: 'page-pickup-shelf-out',
@@ -204,33 +203,4 @@ export class PickupShelfOutComponent extends PickupShelfBaseComponent {
  async getNameForHistoryBreadcrumb(data: GetNameForBreadcrumbData): Promise<string> {
    return 'Historie';
  }
-
-  async regsiterFetchListResponseHandler() {
-    this.listStore.fetchListResponse$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(async ({ processId, queryParams, response }) => {
-      /**
-       * Wenn die Suche erfolgreich war, wird der Benutzer auf die Liste oder Detailseite des gefundenen Artikels weitergeleitet.
-       */
-      const filterQueryParams = this.listStore.filter.getQueryParams();
-
-      if (response.hits === 1) {
-        const detailsPath = await this.getPathForDetail(response.result[0]).pipe(take(1)).toPromise();
-        await this.router.navigate(detailsPath.path, { queryParams: { ...queryParams, ...filterQueryParams, ...detailsPath.queryParams } });
-      } else if (response.hits > 1) {
-        const listPath = await this.getPathFoListBreadcrumb({ processId, queryParams });
-        await this.router.navigate(listPath.path, { queryParams: { ...queryParams, ...filterQueryParams, ...listPath.queryParams } });
-      } else {
-        await this.router.navigate([], { queryParams: { ...queryParams, ...filterQueryParams } });
-      }
-    });
-  }
-
-  // Ticket 4720 WA // Trefferliste wird übersprungen - Bei mehreren Bestellposten pro Bestellung soll IMMER auf Trefferliste navigiert werden
-  // Damit werden #4684 und #4688 überflüssig
-
-  // REMOVED: Fix Ticket #4684 Navigate on Details if items contain same OrderNumber
-  // private _hasSameOrderNumber(response: ListResponseArgsOfDBHOrderItemListItemDTO) {
-  //   if (response.hits === 0) return false;
-  //   const orderNumbers = new Set(response.result.map((item) => item.orderNumber));
-  //   return orderNumbers.size === 1;
-  // }
 }
--- a/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-header-nav-menu/pickup-shelf-details-header-nav-menu.component.html
+++ b/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-header-nav-menu/pickup-shelf-details-header-nav-menu.component.html
@@ -19,9 +19,6 @@
        [routerLink]="customerDetailsRoute.path"
        [queryParams]="customerDetailsRoute.queryParams"
        [queryParamsHandling]="'merge'"
-        matomoClickCategory="pickup-shelf-details-header-nav-menu"
-        matomoClickAction="click"
-        matomoClickName="customer-details"
        >Kundendetails</a
      >
      <a
@@ -30,9 +27,6 @@
        [routerLink]="ordersRoute.path"
        [queryParams]="ordersRoute.queryParams"
        [queryParamsHandling]="'merge'"
-        matomoClickCategory="pickup-shelf-details-header-nav-menu"
-        matomoClickAction="click"
-        matomoClickName="customer-orders"
        >Bestellungen</a
      >
    </shared-menu>
--- a/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-header-nav-menu/pickup-shelf-details-header-nav-menu.component.ts
+++ b/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-header-nav-menu/pickup-shelf-details-header-nav-menu.component.ts
@@ -8,7 +8,6 @@ import { IconComponent } from '@shared/components/icon';
 import { SharedMenuModule } from '@shared/components/menu';
 import { CustomerSearchNavigation } from '@shared/services';
 import { CustomerInfoDTO } from '@swagger/crm';
-import { MatomoModule } from 'ngx-matomo-client';
 import { combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';

@@ -24,7 +23,7 @@ export interface PickUpShelfDetailsHeaderNavMenuComponentState {
  standalone: true,
  host: { class: 'page-pickup-shelf-details-header-nav-menu' },
  changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [CdkMenuModule, SharedMenuModule, IconComponent, RouterLink, NgIf, AsyncPipe, MatomoModule],
+  imports: [CdkMenuModule, SharedMenuModule, IconComponent, RouterLink, NgIf, AsyncPipe],
 })
 export class PickUpShelfDetailsHeaderNavMenuComponent extends ComponentStore<PickUpShelfDetailsHeaderNavMenuComponentState> {
  @Input() set customer(value: CustomerInfoDTO) {
@@ -40,14 +39,14 @@ export class PickUpShelfDetailsHeaderNavMenuComponent extends ComponentStore<Pic
  readonly showCustomerDetails$ = this.select((state) => state.showCustomerDetails);

  ordersRoute$ = this.customer$.pipe(
-    map((customer) => !!customer && this._navigation.ordersRoute({ processId: Date.now(), customerId: customer?.id, customer })),
+    map((customer) => !!customer && this._navigation.ordersRoute({ processId: Date.now(), customerId: customer?.id, customer }))
  );

  customerDetailsRoute$ = combineLatest([this.showCustomerDetails$, this.customer$]).pipe(
    map(
      ([showCustomerDetails, customer]) =>
-        showCustomerDetails && !!customer && this._navigation.detailsRoute({ processId: Date.now(), customerId: customer?.id, customer }),
-    ),
+        showCustomerDetails && !!customer && this._navigation.detailsRoute({ processId: Date.now(), customerId: customer?.id, customer })
+    )
  );

  constructor(private _navigation: CustomerSearchNavigation) {
--- a/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-header/pickup-shelf-details-header.component.html
+++ b/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-header/pickup-shelf-details-header.component.html
@@ -1,13 +1,11 @@
 <ng-container *ngIf="orderItem$ | async; let orderItem">
  <div class="grid grid-flow-row gap-px-2">
    <div class="bg-[#F5F7FA] flex flex-row justify-between items-center p-4 rounded-t">
-      <div class="grid grid-flow-col gap-[0.4375rem] items-center" *ngIf="fetchingCustomerDone$ | async; else featureLoading">
-        <ng-container *ngIf="features$ | async; let features">
-          <shared-icon *ngIf="features?.length > 0" [size]="24" icon="person"></shared-icon>
-          <div class="grid grid-flow-col gap-2 items-center font-bold text-p2" *ngFor="let feature of features">
-            {{ feature?.description }}
-          </div>
-        </ng-container>
+      <div class="grid grid-flow-col gap-[0.4375rem] items-center" *ngIf="features$ | async; let features; else: featureLoading">
+        <shared-icon *ngIf="features?.length > 0" [size]="24" icon="person"></shared-icon>
+        <div class="grid grid-flow-col gap-2 items-center font-bold text-p2" *ngFor="let feature of features">
+          {{ feature?.description }}
+        </div>
      </div>

      <button
@@ -15,9 +13,6 @@
        class="page-pickup-shelf-details-header__edit-cta bg-transparent text-brand font-bold border-none text-p1"
        *ngIf="editClick.observers.length"
        (click)="editClick.emit(orderItem)"
-        matomoClickCategory="pickup-shelf-details-header"
-        matomoClickAction="click"
-        matomoClickName="edit"
      >
        Bearbeiten
      </button>
@@ -79,9 +74,6 @@
                [uiOverlayTrigger]="statusDropdown"
                [disabled]="changeStatusDisabled$ | async"
                #dropdown="uiOverlayTrigger"
-                matomoClickCategory="pickup-shelf-details-header"
-                matomoClickAction="click"
-                matomoClickName="status-dropdown"
              >
                <div class="mr-[0.375rem]">
                  {{ orderItem?.processingStatus | processingStatus }}
@@ -94,14 +86,7 @@
                ></shared-icon>
              </button>
              <ui-dropdown #statusDropdown yPosition="below" xPosition="after" [xOffset]="8">
-                <button
-                  uiDropdownItem
-                  *ngFor="let action of statusActions$ | async"
-                  (click)="handleActionClick(action)"
-                  matomoClickCategory="pickup-shelf-details-header"
-                  matomoClickAction="select"
-                  [matomoClickName]="action.label"
-                >
+                <button uiDropdownItem *ngFor="let action of statusActions$ | async" (click)="handleActionClick(action)">
                  {{ action.label }}
                </button>
              </ui-dropdown>
@@ -111,12 +96,7 @@
        </div>
        <div class="flex flex-row page-pickup-shelf-details-header__order-source" data-detail-id="Bestellkanal">
          <div class="min-w-[9rem]">Bestellkanal</div>
-          <div class="flex flex-row font-bold">
-            <shared-skeleton-loader class="w-32" *ngIf="fetchingOrder$ | async; else orderSourceTmpl"></shared-skeleton-loader>
-            <ng-template #orderSourceTmpl>
-              {{ order()?.features?.orderSource }}
-            </ng-template>
-          </div>
+          <div class="flex flex-row font-bold">{{ order?.features?.orderSource }}</div>
        </div>
        <div
          class="flex flex-row page-pickup-shelf-details-header__change-date justify-between"
@@ -157,29 +137,29 @@
            data-detail-id="Benachrichtigung"
          >
            <div class="min-w-[9rem]">Benachrichtigung</div>
-            <div class="flex flex-row font-bold">
-              <shared-skeleton-loader class="w-32" *ngIf="fetchingOrder$ | async; else notificationsChannelTpl"></shared-skeleton-loader>
-              <ng-template #notificationsChannelTpl>
-                {{ (notificationsChannel$ | async | notificationsChannel) || '-' }}
-              </ng-template>
-            </div>
+            <div class="flex flex-row font-bold">{{ (notificationsChannel$ | async | notificationsChannel) || '-' }}</div>
          </div>
        </div>
      </div>
    </div>
  </div>

+  <ng-template #featureLoading>
+    <div class="fetch-wrapper">
+      <div class="fetching"></div>
+      <div class="fetching"></div>
+      <div class="fetching"></div>
+    </div>
+  </ng-template>
+
  <ng-template #abholfrist>
    <div class="min-w-[9rem]">Abholfrist</div>
-    <div *ngIf="!(orderItemSubsetLoading$ | async); else featureLoading" class="flex flex-row font-bold">
+    <div *ngIf="!(changeDateLoader$ | async)" class="flex flex-row font-bold">
      <button
        [uiOverlayTrigger]="deadlineDatepicker"
        #deadlineDatepickerTrigger="uiOverlayTrigger"
        [disabled]="!isKulturpass && (!!orderItem?.features?.paid || (changeDateDisabled$ | async))"
        class="cta-pickup-deadline"
-        matomoClickCategory="pickup-shelf-details-header"
-        matomoClickAction="click"
-        matomoClickName="pickup-deadline"
      >
        <strong class="border-r border-[#AEB7C1] pr-4">
          {{ orderItem?.pickUpDeadline | date: 'dd.MM.yy' }}
@@ -198,19 +178,17 @@
      >
      </ui-datepicker>
    </div>
+    <ui-spinner *ngIf="changeDateLoader$ | async; let loader" class="flex flex-row font-bold loader" [show]="loader"></ui-spinner>
  </ng-template>

  <ng-template #preferredPickUpDate>
    <div class="min-w-[9rem]">Zurücklegen bis</div>
-    <div *ngIf="!(orderItemSubsetLoading$ | async); else featureLoading" class="flex flex-row font-bold">
+    <div *ngIf="!(changePreferredDateLoader$ | async)" class="flex flex-row font-bold">
      <button
        [uiOverlayTrigger]="preferredPickUpDatePicker"
        #preferredPickUpDatePickerTrigger="uiOverlayTrigger"
        [disabled]="(!isKulturpass && !!orderItem?.features?.paid) || (changeDateDisabled$ | async)"
        class="cta-pickup-preferred"
-        matomoClickCategory="pickup-shelf-details-header"
-        matomoClickAction="click"
-        matomoClickName="pickup-preferred"
      >
        <strong class="border-r border-[#AEB7C1] pr-4" *ngIf="findLatestPreferredPickUpDate$ | async; let pickUpDate; else: selectTemplate">
          {{ pickUpDate | date: 'dd.MM.yy' }}
@@ -232,19 +210,17 @@
      >
      </ui-datepicker>
    </div>
+    <ui-spinner *ngIf="changePreferredDateLoader$ | async; let loader" class="flex flex-row font-bold loader" [show]="loader"> </ui-spinner>
  </ng-template>

  <ng-template #vslLieferdatum>
    <div class="min-w-[9rem]">vsl. Lieferdatum</div>
-    <div *ngIf="!(orderItemSubsetLoading$ | async); else featureLoading" class="flex flex-row font-bold">
+    <div *ngIf="!(changeDateLoader$ | async)" class="flex flex-row font-bold">
      <button
        class="cta-datepicker"
        [disabled]="changeDateDisabled$ | async"
        [uiOverlayTrigger]="uiDatepicker"
        #datepicker="uiOverlayTrigger"
-        matomoClickCategory="pickup-shelf-details-header"
-        matomoClickAction="click"
-        matomoClickName="vsl-lieferdatum"
      >
        <span class="border-r border-[#AEB7C1] pr-4">
          {{ orderItem?.estimatedShippingDate | date: 'dd.MM.yy' }}
@@ -263,9 +239,6 @@
      >
      </ui-datepicker>
    </div>
+    <ui-spinner *ngIf="changeDateLoader$ | async; let loader" class="flex flex-row font-bold loader" [show]="loader"></ui-spinner>
  </ng-template>
 </ng-container>
-
-<ng-template #featureLoading>
-  <shared-skeleton-loader class="w-64 h-6"></shared-skeleton-loader>
-</ng-template>
--- a/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-header/pickup-shelf-details-header.component.ts
+++ b/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-header/pickup-shelf-details-header.component.ts
@@ -2,7 +2,7 @@ import { AsyncPipe, DatePipe, NgFor, NgIf, NgSwitch, NgSwitchCase, NgTemplateOut
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, Output, inject } from '@angular/core';
 import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString, NotificationChannel, OrderDTO } from '@swagger/oms';
 import { PickupShelfDetailsStore } from '../../store';
-import { map, shareReplay, tap, withLatestFrom } from 'rxjs/operators';
+import { map, shareReplay, withLatestFrom } from 'rxjs/operators';
 import { BehaviorSubject, Observable, combineLatest } from 'rxjs';
 import { DateAdapter, UiCommonModule } from '@ui/common';
 import { IconModule } from '@shared/components/icon';
@@ -12,9 +12,6 @@ import { PickupShelfNotificationsChannelPipe } from '../pipes/notifications-chan
 import { PickupShelfProcessingStatusPipe } from '../pipes/processing-status.pipe';
 import { UiDatepickerModule } from '@ui/datepicker';
 import { PickUpShelfDetailsHeaderNavMenuComponent } from '../pickup-shelf-details-header-nav-menu/pickup-shelf-details-header-nav-menu.component';
-import { SkeletonLoaderComponent } from '@shared/components/loader';
-import { toSignal } from '@angular/core/rxjs-interop';
-import { MatomoModule } from 'ngx-matomo-client';

@Component({
  selector: 'page-pickup-shelf-details-header',
@@ -39,8 +36,6 @@ import { MatomoModule } from 'ngx-matomo-client';
    UiCommonModule,
    UiDatepickerModule,
    PickUpShelfDetailsHeaderNavMenuComponent,
-    SkeletonLoaderComponent,
-    MatomoModule,
  ],
 })
 export class PickUpShelfDetailsHeaderComponent {
@@ -55,13 +50,13 @@ export class PickUpShelfDetailsHeaderComponent {
  @Output()
  updateDate = new EventEmitter<{ date: Date; type?: 'delivery' | 'pickup' | 'preferred' }>();

-  orderItemSubsetLoading$ = this._store.orderItemSubsetLoading$;
+  get order$(): Observable<OrderDTO> {
+    return this._store.order$;
+  }

-  fetchingOrder$ = this._store.fetchingOrder$;
-
-  order$ = this._store.order$;
-
-  order = toSignal(this.order$);
+  get order(): OrderDTO {
+    return this._store.order;
+  }

  findLatestPreferredPickUpDate$: Observable<Date> = this.order$.pipe(
    withLatestFrom(this._store.selectedOrderItemIds$),
@@ -77,12 +72,12 @@ export class PickUpShelfDetailsHeaderComponent {
        latestDate = new Date(
          subsetItems?.reduce((a, b) => {
            return new Date(a.data.preferredPickUpDate) > new Date(b.data.preferredPickUpDate) ? a : b;
-          })?.data?.preferredPickUpDate,
+          })?.data?.preferredPickUpDate
        );
      }

      return latestDate;
-    }),
+    })
  );

  notificationsChannel$: Observable<NotificationChannel> = this.order$.pipe(map((order) => order?.notificationChannels ?? 0));
@@ -91,17 +86,13 @@ export class PickUpShelfDetailsHeaderComponent {
  processId?: number;

  get isKulturpass() {
-    return this.order()?.features?.orderSource === 'KulturPass';
+    return this.order?.features?.orderSource === 'KulturPass';
  }

  minDateDatepicker = this.dateAdapter.addCalendarDays(this.dateAdapter.today(), -1);
  today = this.dateAdapter.today();

-  // Daten die im Header Angezeigt werden sollen
-  orderItem$ = combineLatest([
-    this._store.selectedOrderItem$, // Wenn man im Abholfach ist muss das ausgewählte OrderItem genommen werden
-    this._store.selectedOrderItems$.pipe(map((orderItems) => orderItems?.find((_) => true))), // Wenn man in der Warenausgabe ist muss man das erste OrderItem nehmen
-  ]).pipe(map(([selectedOrderItem, selectedOrderItems]) => selectedOrderItem || selectedOrderItems));
+  orderItem$ = this._store.orderItems$.pipe(map((orderItems) => orderItems?.find((_) => true)));

  changeDateLoader$ = new BehaviorSubject<boolean>(false);
  changePreferredDateLoader$ = new BehaviorSubject<boolean>(false);
@@ -110,14 +101,12 @@ export class PickUpShelfDetailsHeaderComponent {

  changeDateDisabled$ = this.changeStatusDisabled$;

-  fetchingCustomerDone$ = this._store.fetchingCustomer$.pipe(map((fetchingCustomer) => !fetchingCustomer));
-
  customer$ = this._store.customer$;

  features$ = this.customer$.pipe(
    map((customer) => customer?.features || []),
    map((features) => features.filter((f) => f.enabled && !!f.description)),
-    shareReplay(),
+    shareReplay()
  );

  statusActions$ = this.orderItem$.pipe(map((orderItem) => orderItem?.actions?.filter((action) => action.enabled === false)));
@@ -125,17 +114,14 @@ export class PickUpShelfDetailsHeaderComponent {
  crudaUpdate$ = this.orderItem$.pipe(map((orederItem) => !!(orederItem?.cruda & 4)));

  editButtonDisabled$ = combineLatest([this.changeStatusLoader$, this.crudaUpdate$]).pipe(
-    map(([changeStatusLoader, crudaUpdate]) => changeStatusLoader || !crudaUpdate),
+    map(([changeStatusLoader, crudaUpdate]) => changeStatusLoader || !crudaUpdate)
  );

  canEditStatus$ = combineLatest([this.statusActions$, this.crudaUpdate$]).pipe(
-    map(([statusActions, crudaUpdate]) => statusActions?.length > 0 && crudaUpdate),
+    map(([statusActions, crudaUpdate]) => statusActions?.length > 0 && crudaUpdate)
  );

-  constructor(
-    private dateAdapter: DateAdapter,
-    private cdr: ChangeDetectorRef,
-  ) {}
+  constructor(private dateAdapter: DateAdapter, private cdr: ChangeDetectorRef) {}

  async handleActionClick(action?: KeyValueDTOOfStringAndString) {
    this.changeStatusLoader$.next(true);
--- a/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-item/pickup-shelf-details-item.component.html
+++ b/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-item/pickup-shelf-details-item.component.html
@@ -32,11 +32,7 @@
  </div>
  <div class="page-pickup-shelf-details-item__item-container">
    <div class="page-pickup-shelf-details-item__thumbnail">
-      <img
-        [productImageNavigation]="orderItem?.product?.ean"
-        [src]="orderItem.product?.ean | productImage"
-        [alt]="orderItem.product?.name"
-      />
+      <img [src]="orderItem.product?.ean | productImage" [alt]="orderItem.product?.name" />
    </div>
    <div class="page-pickup-shelf-details-item__details">
      <div class="flex flex-row justify-between items-start mb-[1.3125rem]">
@@ -50,24 +46,16 @@
          <div>{{ orderItem.product?.name }}</div>
        </h3>
        <div class="history-wrapper flex flex-col items-end justify-center">
-          <button class="cta-history text-p1" (click)="historyClick.emit(orderItem)">Historie</button>
+          <button class="cta-history text-p1" (click)="historyClick.emit(orderItem)">
+            Historie
+          </button>

          <input
            *ngIf="selectable$ | async"
            [ngModel]="selected$ | async"
-            (ngModelChange)="
-              setSelected($event);
-              tracker.trackEvent({
-                category: 'pickup-shelf-list-item',
-                action: 'select',
-                name: orderItem?.product?.name,
-                value: $event ? 1 : 0,
-              })
-            "
+            (ngModelChange)="setSelected($event)"
            class="isa-select-bullet mt-4"
            type="checkbox"
-            matomoTracker
-            #tracker="matomo"
          />
        </div>
      </div>
@@ -80,12 +68,7 @@
            [showTrash]="false"
            [range]="orderItem?.quantity"
            [(ngModel)]="quantity"
-            (ngModelChange)="
-              tracker.trackEvent({ category: 'pickup-shelf-list-item', action: 'quantity', name: orderItem?.product?.name, value: $event })
-            "
            [showSpinner]="false"
-            matomoTracker
-            #tracker="matomo"
          >
          </ui-quantity-dropdown>
          <span class="overall-quantity">(von {{ orderItem?.overallQuantity }})</span>
@@ -270,9 +253,6 @@
              type="submit"
              *ngIf="specialCommentControl?.enabled && specialCommentControl.dirty"
              (click)="saveSpecialComment()"
-              matomoClickCategory="pickup-shelf-details-item"
-              matomoClickAction="save"
-              matomoClickName="special-comment"
            >
              Speichern
            </button>
--- a/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-item/pickup-shelf-details-item.component.ts
+++ b/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-item/pickup-shelf-details-item.component.ts
@@ -12,7 +12,7 @@ import {
  inject,
 } from '@angular/core';
 import { FormsModule, ReactiveFormsModule, UntypedFormControl } from '@angular/forms';
-import { NavigateOnClickDirective, ProductImageModule } from '@cdn/product-image';
+import { ProductImageModule } from '@cdn/product-image';
 import { DBHOrderItemListItemDTO, OrderDTO, ReceiptDTO } from '@swagger/oms';
 import { UiCommonModule } from '@ui/common';
 import { UiTooltipModule } from '@ui/tooltip';
@@ -25,7 +25,6 @@ import { Subject, combineLatest } from 'rxjs';
 import { PickupShelfDetailsStore } from '../../store';
 import { UiQuantityDropdownModule } from '@ui/quantity-dropdown';
 import { NotificationTypePipe } from './notification-type.pipe';
-import { MatomoModule } from 'ngx-matomo-client';

 export interface PickUpShelfDetailsItemComponentState {
  orderItem?: DBHOrderItemListItemDTO;
@@ -58,8 +57,6 @@ export interface PickUpShelfDetailsItemComponentState {
    IconModule,
    UiQuantityDropdownModule,
    NotificationTypePipe,
-    NavigateOnClickDirective,
-    MatomoModule,
  ],
 })
 export class PickUpShelfDetailsItemComponent extends ComponentStore<PickUpShelfDetailsItemComponentState> implements OnInit {
@@ -80,10 +77,7 @@ export class PickUpShelfDetailsItemComponent extends ComponentStore<PickUpShelfD
  set orderItem(orderItem: DBHOrderItemListItemDTO) {
    if (!isEqual(this.orderItem, orderItem)) {
      // Remove Prev OrderItem from selected list
-      if (this.orderItem?.orderItemSubsetId !== orderItem?.orderItemSubsetId) {
-        this._store.selectOrderItem(this.orderItem, false);
-      }
-
+      this._store.selectOrderItem(this.orderItem, false);
      this.patchState({ orderItem, quantity: orderItem?.quantity, more: false });
      this.specialCommentControl.reset(orderItem?.specialComment);
      // Add New OrderItem to selected list if selected was set to true by its input
@@ -106,7 +100,7 @@ export class PickUpShelfDetailsItemComponent extends ComponentStore<PickUpShelfD
  readonly orderItem$ = this.select((s) => s.orderItem);

  emailNotificationDates$ = this.orderItem$.pipe(
-    switchMap((orderItem) => this._store.getEmailNotificationDate$(orderItem?.orderItemSubsetId)),
+    switchMap((orderItem) => this._store.getEmailNotificationDate$(orderItem?.orderItemSubsetId))
  );

  hasEmailNotification$ = this.emailNotificationDates$.pipe(map((dates) => dates?.length > 0));
@@ -116,7 +110,7 @@ export class PickUpShelfDetailsItemComponent extends ComponentStore<PickUpShelfD
  hasSmsNotification$ = this.smsNotificationDates$.pipe(map((dates) => dates?.length > 0));

  canChangeQuantity$ = combineLatest([this.orderItem$, this._store.fetchPartial$]).pipe(
-    map(([item, partialPickup]) => ([16, 8192].includes(item?.processingStatus) || partialPickup) && item.quantity > 1),
+    map(([item, partialPickup]) => ([16, 8192].includes(item?.processingStatus) || partialPickup) && item.quantity > 1)
  );

  get quantity() {
@@ -143,7 +137,7 @@ export class PickUpShelfDetailsItemComponent extends ComponentStore<PickUpShelfD
  }

  readonly selected$ = combineLatest([this.orderItem$, this._store.selectedOrderItemIds$]).pipe(
-    map(([orderItem, selectedItems]) => selectedItems.includes(orderItem?.orderItemSubsetId)),
+    map(([orderItem, selectedItems]) => selectedItems.includes(orderItem?.orderItemSubsetId))
  );

  @Output()
@@ -158,7 +152,7 @@ export class PickUpShelfDetailsItemComponent extends ComponentStore<PickUpShelfD
  }

  readonly selectable$ = combineLatest([this._store.orderItems$, this._store.fetchPartial$]).pipe(
-    map(([orderItems, fetchPartial]) => orderItems.length > 1 && this.isItemSelectable && fetchPartial),
+    map(([orderItems, fetchPartial]) => orderItems.length > 1 && this.isItemSelectable && fetchPartial)
  );

  get receipts() {
@@ -177,7 +171,7 @@ export class PickUpShelfDetailsItemComponent extends ComponentStore<PickUpShelfD

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

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

  expanded: boolean = false;

--- a/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-tags/pickup-shelf-details-tags.component.html
+++ b/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-tags/pickup-shelf-details-tags.component.html
@@ -5,10 +5,6 @@
    [class.selected]="tag === (selected$ | async) && !inputFocus.focused"
    *ngFor="let tag of defaultTags"
    (click)="setCompartmentInfo(tag)"
-    matomoClickCategory="pickup-shelf-details-tags"
-    matomoClickAction="click"
-    [matomoClickName]="tag"
-    [matomoClickValue]="(selected$ | async) === tag ? 0 : 1"
  >
    {{ tag }}
  </button>
@@ -27,10 +23,6 @@
      placeholder="..."
      [size]="controlSize$ | async"
      maxlength="15"
-      [matomoTracker]="['blur']"
-      matomoCategory="pickup-shelf-details-tags"
-      matomoAction="blur"
-      matomoName="tag-input"
    />
  </button>
 </div>
--- a/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-tags/pickup-shelf-details-tags.component.ts
+++ b/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-tags/pickup-shelf-details-tags.component.ts
@@ -2,7 +2,6 @@ import { AsyncPipe, NgFor } from '@angular/common';
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit, forwardRef } from '@angular/core';
 import { ControlValueAccessor, FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { UiCommonModule } from '@ui/common';
-import { MatomoModule } from 'ngx-matomo-client';
 import { BehaviorSubject, Subscription } from 'rxjs';
 import { first, map } from 'rxjs/operators';

@@ -13,7 +12,7 @@ import { first, map } from 'rxjs/operators';
  changeDetection: ChangeDetectionStrategy.OnPush,
  host: { class: 'page-pickup-shelf-details-tags' },
  standalone: true,
-  imports: [NgFor, UiCommonModule, FormsModule, AsyncPipe, MatomoModule],
+  imports: [NgFor, UiCommonModule, FormsModule, AsyncPipe],
  providers: [{ provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => PickUpShelfDetailsTagsComponent), multi: true }],
 })
 export class PickUpShelfDetailsTagsComponent implements OnInit, OnDestroy, ControlValueAccessor {
@@ -60,7 +59,7 @@ export class PickUpShelfDetailsTagsComponent implements OnInit, OnDestroy, Contr

  ngOnInit() {
    this.subscription.add(
-      this.selected$.pipe(map((selected) => (this.defaultTags.includes(selected) ? '' : selected))).subscribe(this.inputValueSubject),
+      this.selected$.pipe(map((selected) => (this.defaultTags.includes(selected) ? '' : selected))).subscribe(this.inputValueSubject)
    );
  }

--- a/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-history/pickup-shelf-history.component.html
+++ b/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-history/pickup-shelf-history.component.html
@@ -4,7 +4,7 @@
      *ngIf="historyItem$ | async; let item"
      class="self-end"
      type="button"
-      (click)="listStore.processId !== 7000 ? navigateToShelfOutDetailsPage(item) : navigateToShelfInDetailsPage(item)"
+      (click)="store.processId !== 7000 ? navigateToShelfOutDetailsPage(item) : navigateToShelfInDetailsPage(item)"
    >
      <shared-icon icon="close" [size]="26"></shared-icon>
    </button>
--- a/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-history/pickup-shelf-history.component.ts
+++ b/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-history/pickup-shelf-history.component.ts
@@ -1,5 +1,5 @@
 import { AsyncPipe, NgIf } from '@angular/common';
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { DomainOmsService } from '@domain/oms';
 import { PickupShelfIOService } from '@domain/pickup-shelf';
@@ -9,8 +9,8 @@ import { PickUpShelfOutNavigationService, PickupShelfInNavigationService } from
 import { DBHOrderItemListItemDTO } from '@swagger/oms';
 import { Observable, combineLatest } from 'rxjs';
 import { map, shareReplay, switchMap, take } from 'rxjs/operators';
+import { PickupShelfStore } from '../../store';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
-import { PickupShelfDetailsBaseComponent } from '../../pickup-shelf-details-base.component';

@Component({
  selector: 'page-pickup-shelf-history',
@@ -21,7 +21,9 @@ import { PickupShelfDetailsBaseComponent } from '../../pickup-shelf-details-base
  host: { class: 'page-pickup-shelf-history' },
  imports: [AsyncPipe, NgIf, SharedHistoryListModule, IconModule],
 })
-export class PickUpShelfHistoryComponent extends PickupShelfDetailsBaseComponent {
+export class PickUpShelfHistoryComponent {
+  store = inject(PickupShelfStore);
+
  compartmentCode$: Observable<string> = this._activatedRoute.params.pipe(
    map((params) => decodeURIComponent(params?.compartmentCode ?? '') || undefined)
  );
@@ -60,14 +62,12 @@ export class PickUpShelfHistoryComponent extends PickupShelfDetailsBaseComponent
    private _shelfInNavigation: PickupShelfInNavigationService,
    private _omsService: DomainOmsService,
    private _pickupShelfIOService: PickupShelfIOService
-  ) {
-    super();
-  }
+  ) {}

  async navigateToShelfOutDetailsPage(item: DBHOrderItemListItemDTO) {
    await this._router.navigate(
      this._shelfOutNavigation.detailRoute({
-        processId: this.listStore.processId,
+        processId: this.store.processId,
        item: {
          compartmentCode: item.compartmentCode,
          orderId: item.orderId,
--- a/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-list-item/pickup-shelf-list-item.component.html
+++ b/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-list-item/pickup-shelf-list-item.component.html
@@ -3,7 +3,7 @@
  [routerLink]="itemDetailsLink"
  [routerLinkActive]="!isTablet && !primaryOutletActive ? 'active' : ''"
  queryParamsHandling="preserve"
-  (click)="onDetailsClick()"
+  (click)="isDesktopLarge ? scrollIntoView() : ''"
 >
  <div
    class="page-pickup-shelf-list-item__item-grid-container"
@@ -15,7 +15,6 @@
        class="page-pickup-shelf-list-item__item-image w-[3.125rem] max-h-[4.9375rem]"
        loading="lazy"
        *ngIf="item?.product?.ean | productImage; let productImage"
-        [productImageNavigation]="item?.product?.ean"
        [src]="productImage"
        [alt]="item?.product?.name"
      />
@@ -104,14 +103,9 @@
      <input
        (click)="$event.stopPropagation()"
        [ngModel]="selectedItem"
-        (ngModelChange)="
-          setSelected();
-          tracker.trackEvent({ category: 'pickup-shelf-list-item', action: 'select', name: item?.product?.name, value: $event ? 1 : 0 })
-        "
+        (ngModelChange)="setSelected()"
        class="isa-select-bullet"
        type="checkbox"
-        matomoTracker
-        #tracker="matomo"
      />
    </div>

--- a/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-list-item/pickup-shelf-list-item.component.ts
+++ b/apps/page/pickup-shelf/src/lib/shared/pickup-shelf-list-item/pickup-shelf-list-item.component.ts
@@ -1,7 +1,7 @@
 import { CurrencyPipe, DatePipe, NgFor, NgIf } from '@angular/common';
 import { ChangeDetectionStrategy, Component, ElementRef, Input, inject } from '@angular/core';
 import { RouterLink, RouterLinkActive } from '@angular/router';
-import { NavigateOnClickDirective, ProductImageModule } from '@cdn/product-image';
+import { ProductImageModule } from '@cdn/product-image';
 import { EnvironmentService } from '@core/environment';
 import { IconModule } from '@shared/components/icon';
 import { DBHOrderItemListItemDTO } from '@swagger/oms';
@@ -10,8 +10,6 @@ import { PickupShelfProcessingStatusPipe } from '../pipes/processing-status.pipe
 import { FormsModule } from '@angular/forms';
 import { PickupShelfStore } from '../../store';
 import { map } from 'rxjs/operators';
-import { CacheService } from '@core/cache';
-import { MatomoModule } from 'ngx-matomo-client';

@Component({
  selector: 'page-pickup-shelf-list-item',
@@ -32,14 +30,10 @@ import { MatomoModule } from 'ngx-matomo-client';
    ProductImageModule,
    UiCommonModule,
    PickupShelfProcessingStatusPipe,
-    NavigateOnClickDirective,
-    MatomoModule,
  ],
  providers: [PickupShelfProcessingStatusPipe],
 })
 export class PickUpShelfListItemComponent {
-  private cache = inject(CacheService);
-
  store = inject(PickupShelfStore);

  @Input() item: DBHOrderItemListItemDTO;
@@ -82,54 +76,15 @@ export class PickUpShelfListItemComponent {
  }

  selected$ = this.store.selectedListItems$.pipe(
-    map((selectedListItems) => selectedListItems?.find((item) => item?.orderItemSubsetId === this.item?.orderItemSubsetId)),
+    map((selectedListItems) => selectedListItems?.find((item) => item?.orderItemSubsetId === this.item?.orderItemSubsetId))
  );

  constructor(
    private _elRef: ElementRef,
    private _environment: EnvironmentService,
-    private _processingStatusPipe: PickupShelfProcessingStatusPipe,
+    private _processingStatusPipe: PickupShelfProcessingStatusPipe
  ) {}

-  onDetailsClick() {
-    if (this.isDesktopLarge) {
-      this.scrollIntoView();
-    }
-
-    if (!this.hasOrderItemInCache()) {
-      this.addOrderItemIntoCache();
-    }
-  }
-
-  hasOrderItemInCache() {
-    const items =
-      this.cache.get<DBHOrderItemListItemDTO[]>({
-        name: 'orderItems',
-        orderId: this.item.orderId,
-        compartmentCode: this.item.compartmentCode,
-        compartmentInfo: this.item.compartmentInfo,
-        orderItemProcessingStatus: this.item.processingStatus,
-        store: 'PickupShelfDetailsStore',
-      }) ?? [];
-
-    return items.some((i) => i.orderItemSubsetId === this.item.orderItemSubsetId);
-  }
-
-  addOrderItemIntoCache() {
-    this.cache.set(
-      {
-        name: 'orderItems',
-        orderId: this.item.orderId,
-        compartmentCode: this.item.compartmentCode,
-        compartmentInfo: this.item.compartmentInfo,
-        orderItemProcessingStatus: this.item.processingStatus,
-        store: 'PickupShelfDetailsStore',
-      },
-      [this.item],
-      { persist: false, ttl: 1000 },
-    );
-  }
-
  scrollIntoView() {
    this._elRef.nativeElement.scrollIntoView({ behavior: 'smooth', block: 'center' });
  }
--- a/Show More
+++ b/Show More