#4516 Fix Also Show Details Items Group in Pick Up Shelf In

#4541 Added Errorhandling to Customer Search Store

apps/page/customer/src/lib/customer-search/store/customer-search.store.ts

@@ -12,6 +12,7 @@ import { isEmpty } from 'lodash';
 import { DomainOmsService } from '@domain/oms';
 import { OrderDTO, OrderListItemDTO } from '@swagger/oms';
 import { hash } from '@utils/common';
+import { UiModalService } from '@ui/modal';
 
 @Injectable()
 export class CustomerSearchStore extends ComponentStore<CustomerSearchState> implements OnStoreInit, OnDestroy {
@@ -163,7 +164,7 @@ export class CustomerSearchStore extends ComponentStore<CustomerSearchState> imp
 
   selectedOrderItem$ = this.select(S.selectSelectedOrderItem);
 
-  constructor(private _customerService: CrmCustomerService, private _omsService: DomainOmsService) {
+  constructor(private _customerService: CrmCustomerService, private _omsService: DomainOmsService, private _modal: UiModalService) {
     super({ customerListCount: 0 });
   }
 
@@ -205,7 +206,8 @@ export class CustomerSearchStore extends ComponentStore<CustomerSearchState> imp
   };
 
   handleSelectCustomerError = (err: any) => {
-    console.error(err);
+    this._modal.error('Fehler beim Auswählen des Kundens', err);
+    this.patchState({ fetchingCustomer: false });
   };
 
   handleSelectCustomerComplete = () => {
@@ -230,7 +232,8 @@ export class CustomerSearchStore extends ComponentStore<CustomerSearchState> imp
   };
 
   handleSelectOrderError = (err: any) => {
-    console.error(err);
+    this._modal.error('Fehler beim Auswählen der Bestellung', err);
+    this.patchState({ fetchingOrder: false });
   };
 
   handleSelectOrderComplete = () => {
@@ -259,7 +262,8 @@ export class CustomerSearchStore extends ComponentStore<CustomerSearchState> imp
   };
 
   handleFetchCustomerOrdersError = (err: any) => {
-    console.error(err);
+    this._modal.error('Fehler beim Laden der Kundenbestellungen', err);
+    this.patchState({ fetchingCustomerOrders: false });
   };
 
   handleFetchCustomerOrdersComplete = () => {
@@ -282,7 +286,8 @@ export class CustomerSearchStore extends ComponentStore<CustomerSearchState> imp
   };
 
   handleFetchFilterError = (err: any) => {
-    console.error(err);
+    this._modal.error('Fehler beim Laden der Filter', err);
+    this.patchState({ fetchingFilter: false });
   };
 
   handleFetchFilterComplete = () => {
@@ -341,7 +346,8 @@ export class CustomerSearchStore extends ComponentStore<CustomerSearchState> imp
   };
 
   handleSearchError = (err: any) => {
-    console.error(err);
+    this._modal.error('Fehler beim Laden der Liste', err);
+    this.patchState({ fetchingCustomerList: false });
   };
 
   handleSearchComplete = () => {

apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.html

@@ -17,17 +17,25 @@
         (updateDate)="updateDate($event)"
         (editClick)="navigateToEditPage($event)"
       ></page-pickup-shelf-details-header>
-      <page-pickup-shelf-details-item
-        *ngIf="selectedItem$ | async; let item"
-        class="mb-px-2"
-        [orderItem]="item"
-        [selected]="true"
-        (historyClick)="navigateToHistoryPage($event)"
-        [order]="order$ | async"
-        (specialCommentChanged)="updateSpecialComment(item, $event)"
-        (sharedOnInit)="fetchNotifications(item)"
-      ></page-pickup-shelf-details-item>
+
+      <ng-container *ngIf="selectedItem$ | async; let item">
+        <page-pickup-shelf-details-items-group
+          [orderType]="selectedItemOrderType$ | async"
+          [groupedItems]="[item]"
+        ></page-pickup-shelf-details-items-group>
+        <page-pickup-shelf-details-item
+          class="mb-px-2"
+          [orderItem]="item"
+          [selected]="true"
+          (historyClick)="navigateToHistoryPage($event)"
+          [order]="order$ | async"
+          (specialCommentChanged)="updateSpecialComment(item, $event)"
+          (sharedOnInit)="fetchNotifications(item)"
+        ></page-pickup-shelf-details-item>
+      </ng-container>
+
       <page-pickup-shelf-details-tags class="mb-px-2" *ngIf="showTagsComponent$ | async"></page-pickup-shelf-details-tags>
+
       <page-pickup-shelf-details-covers
         *ngIf="(coverOrderItems$ | async)?.length > 0"
         [coverItems]="coverOrderItems$ | async"

apps/page/pickup-shelf/src/lib/pickup-shelf-in/pickup-shelf-in-details/pickup-shelf-in-details.component.ts

@@ -16,6 +16,7 @@ import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString } from '@swagger/
 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';
 
 @Component({
   selector: 'page-pickup-shelf-in-details',
@@ -32,6 +33,7 @@ import { RunCheckTrigger } from '../../trigger';
     PickUpShelfDetailsItemComponent,
     PickUpShelfDetailsTagsComponent,
     PickUpShelfDetailsCoversComponent,
+    PickUpShelfDetailsItemsGroupComponent,
     PickupShelfAddToPreviousCompartmentCodeLabelPipe,
     UiSpinnerModule,
     OnInitDirective,
@@ -74,6 +76,8 @@ export class PickupShelfInDetailsComponent extends PickupShelfDetailsBaseCompone
 
   selectedItem$ = this.store.selectedOrderItem$;
 
+  selectedItemOrderType$ = this.selectedItem$.pipe(map((item) => item?.features?.orderType));
+
   coverOrderItems$ = this.store.coverOrderItems$;
 
   displayedCompartmentInfo$ = this.store.compartmentInfo$;

apps/page/pickup-shelf/src/lib/pickup-shelf-out/pickup-shelf-out-details/pickup-shelf-out-details.component.html

@@ -14,16 +14,24 @@
         (updateDate)="updateDate($event)"
         (editClick)="navigateToEditPage($event)"
       ></page-pickup-shelf-details-header>
-      <page-pickup-shelf-details-item
-        class="mb-px-2"
-        *ngFor="let item of orderItems$ | async; trackBy: trackByFnDBHOrderItemListItemDTO"
-        [orderItem]="item"
-        [selected]="true"
-        (historyClick)="navigateToHistoryPage($event)"
-        [order]="order$ | async"
-        (specialCommentChanged)="updateSpecialComment(item, $event)"
-        (sharedOnInit)="fetchNotifications(item)"
-      ></page-pickup-shelf-details-item>
+
+      <ng-container *ngFor="let group of groupedItems$ | async; trackBy: trackByFnGroupDBHOrderItemListItemDTO">
+        <page-pickup-shelf-details-items-group
+          [orderType]="group.type"
+          [groupedItems]="group.items"
+        ></page-pickup-shelf-details-items-group>
+        <page-pickup-shelf-details-item
+          class="mb-px-2"
+          *ngFor="let item of group.items; trackBy: trackByFnDBHOrderItemListItemDTO"
+          [orderItem]="item"
+          [selected]="true"
+          (historyClick)="navigateToHistoryPage($event)"
+          [order]="order$ | async"
+          (specialCommentChanged)="updateSpecialComment(item, $event)"
+          (sharedOnInit)="fetchNotifications(item)"
+        ></page-pickup-shelf-details-item>
+      </ng-container>
+
       <page-pickup-shelf-details-tags
         *ngIf="showTagsComponent$ | async"
         [ngModel]="selectedCompartmentInfo$ | async"

apps/page/pickup-shelf/src/lib/pickup-shelf-out/pickup-shelf-out-details/pickup-shelf-out-details.component.ts

@@ -3,9 +3,9 @@ import { PickupShelfDetailsBaseComponent } from '../../pickup-shelf-details-base
 import { AsyncPipe, NgFor, NgIf } from '@angular/common';
 import { PickUpShelfDetailsHeaderComponent } from '../../shared/pickup-shelf-details-header/pickup-shelf-details-header.component';
 import { PickUpShelfDetailsItemComponent } from '../../shared/pickup-shelf-details-item/pickup-shelf-details-item.component';
-import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString, OrderItemProcessingStatusValue } from '@swagger/oms';
+import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString } from '@swagger/oms';
 import { PickUpShelfOutNavigationService } from '@shared/services';
-import { BehaviorSubject, asapScheduler, combineLatest } from 'rxjs';
+import { BehaviorSubject, Observable, asapScheduler, combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { PickUpShelfDetailsTagsComponent } from '../../shared/pickup-shelf-details-tags/pickup-shelf-details-tags.component';
 import { UiSpinnerModule } from '@ui/spinner';
@@ -13,6 +13,7 @@ import { UiErrorModalComponent, UiModalService } from '@ui/modal';
 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';
 
 @Component({
   selector: 'page-pickup-shelf-out-details',
@@ -28,6 +29,7 @@ import { RunCheckTrigger } from '../../trigger';
     PickUpShelfDetailsHeaderComponent,
     PickUpShelfDetailsItemComponent,
     PickUpShelfDetailsTagsComponent,
+    PickUpShelfDetailsItemsGroupComponent,
     UiSpinnerModule,
     OnInitDirective,
     FormsModule,
@@ -44,7 +46,25 @@ export class PickupShelfOutDetailsComponent extends PickupShelfDetailsBaseCompon
 
   order$ = this.store.order$;
 
-  orderItems$ = this.store.orderItems$;
+  groupedItems$: Observable<Array<{ type: string; items: DBHOrderItemListItemDTO[] }>> = this.store.orderItems$.pipe(
+    map((items) => {
+      const groups: Array<{ type: string; items: DBHOrderItemListItemDTO[] }> = [];
+
+      // New Set to remove duplicates
+      const types = Array.from(new Set(items.map((item) => item?.features?.orderType)));
+
+      for (let type of types) {
+        const filteredItemsByType = items.filter((item) => item?.features?.orderType === type);
+
+        if (!!type && filteredItemsByType.length > 0) {
+          // Add items to matching orderType group
+          groups.push({ type, items: filteredItemsByType });
+        }
+      }
+
+      return groups;
+    })
+  );
 
   fetching$ = this.store.fetchingOrder$;
   fetchingItems$ = this.store.fetchingOrderItems$;
@@ -66,6 +86,8 @@ export class PickupShelfOutDetailsComponent extends PickupShelfDetailsBaseCompon
 
   mainActions$ = this.store.mainActions$;
 
+  trackByFnGroupDBHOrderItemListItemDTO = (index: number, group: { type: string; items: DBHOrderItemListItemDTO[] }) => group.type;
+
   trackByFnDBHOrderItemListItemDTO = (index: number, item: DBHOrderItemListItemDTO) => item.orderItemSubsetId;
 
   get processId() {

apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-header/pickup-shelf-details-header.component.html

@@ -145,96 +145,6 @@
         </div>
       </div>
     </div>
-
-    <div class="flex flex-row items-center relative bg-[#F5F7FA] p-4 rounded-t">
-      <div *ngIf="showFeature" class="flex flex-row items-center mr-3">
-        <ng-container [ngSwitch]="order.features.orderType">
-          <ng-container *ngSwitchCase="'Versand'">
-            <div class="flex items-center justify-center bg-[#D8DFE5] w-[2.25rem] h-[2.25rem] rounded rounded-br-none mr-2">
-              <shared-icon [size]="24" icon="isa-truck"></shared-icon>
-            </div>
-            <p class="font-bold text-p1">Versand</p>
-          </ng-container>
-          <ng-container *ngSwitchCase="'DIG-Versand'">
-            <div class="flex items-center justify-center bg-[#D8DFE5] w-[2.25rem] h-[2.25rem] rounded rounded-br-none mr-2">
-              <shared-icon [size]="24" icon="isa-truck"></shared-icon>
-            </div>
-            <p class="font-bold text-p1">Versand</p>
-          </ng-container>
-          <ng-container *ngSwitchCase="'B2B-Versand'">
-            <div class="flex items-center justify-center bg-[#D8DFE5] w-[2.25rem] h-[2.25rem] rounded rounded-br-none mr-2">
-              <shared-icon [size]="24" icon="isa-b2b-truck"></shared-icon>
-            </div>
-            <p class="font-bold text-p1">B2B-Versand</p>
-          </ng-container>
-          <ng-container *ngSwitchCase="'Abholung'">
-            <div class="flex items-center justify-center bg-[#D8DFE5] w-[2.25rem] h-[2.25rem] rounded rounded-br-none mr-2">
-              <shared-icon [size]="24" icon="isa-box-out"></shared-icon>
-            </div>
-            <p class="font-bold text-p1 mr-3">Abholung</p>
-            {{ orderItem.targetBranch }}
-          </ng-container>
-          <ng-container *ngSwitchCase="'Rücklage'">
-            <div class="flex items-center justify-center bg-[#D8DFE5] w-[2.25rem] h-[2.25rem] rounded rounded-br-none mr-2">
-              <shared-icon [size]="24" icon="isa-shopping-bag"></shared-icon>
-            </div>
-            <p class="font-bold text-p1">Rücklage</p>
-          </ng-container>
-          <ng-container *ngSwitchCase="'Download'">
-            <div class="flex items-center justify-center bg-[#D8DFE5] w-[2.25rem] h-[2.25rem] rounded rounded-br-none mr-2">
-              <shared-icon [size]="24" icon="isa-download"></shared-icon>
-            </div>
-            <p class="font-bold text-p1">Download</p>
-          </ng-container>
-        </ng-container>
-      </div>
-
-      <div class="page-pickup-shelf-details-header__additional-addresses" *ngIf="showAddresses">
-        <button (click)="openAddresses = !openAddresses" class="text-[#0556B4]">
-          Lieferadresse / Rechnungsadresse {{ openAddresses ? 'ausblenden' : 'anzeigen' }}
-        </button>
-
-        <div class="page-pickup-shelf-details-header__addresses-popover" *ngIf="openAddresses">
-          <button (click)="openAddresses = !openAddresses" class="close">
-            <shared-icon icon="close" [size]="24"></shared-icon>
-          </button>
-
-          <div class="page-pickup-shelf-details-header__addresses-popover-data">
-            <div *ngIf="order.shipping" class="page-pickup-shelf-details-header__addresses-popover-delivery">
-              <p>Lieferadresse</p>
-              <div class="page-pickup-shelf-details-header__addresses-popover-delivery-data">
-                <ng-container *ngIf="order.shipping?.data?.organisation">
-                  <p>{{ order.shipping?.data?.organisation?.name }}</p>
-                  <p>{{ order.shipping?.data?.organisation?.department }}</p>
-                </ng-container>
-                <p>{{ order.shipping?.data?.firstName }} {{ order.shipping?.data?.lastName }}</p>
-                <p>{{ order.shipping?.data?.address?.info }}</p>
-                <p>{{ order.shipping?.data?.address?.street }} {{ order.shipping?.data?.address?.streetNumber }}</p>
-                <p>{{ order.shipping?.data?.address?.zipCode }} {{ order.shipping?.data?.address?.city }}</p>
-              </div>
-            </div>
-            <div *ngIf="order.billing" class="page-pickup-shelf-details-header__addresses-popover-billing">
-              <p>Rechnungsadresse</p>
-              <div class="page-pickup-shelf-details-header__addresses-popover-billing-data">
-                <ng-container *ngIf="order.billing?.data?.organisation">
-                  <p>{{ order.billing?.data?.organisation?.name }}</p>
-                  <p>{{ order.billing?.data?.organisation?.department }}</p>
-                </ng-container>
-                <p>{{ order.billing?.data?.firstName }} {{ order.billing?.data?.lastName }}</p>
-                <p>{{ order.billing?.data?.address?.info }}</p>
-                <p>{{ order.billing?.data?.address?.street }} {{ order.billing?.data?.address?.streetNumber }}</p>
-                <p>{{ order.billing?.data?.address?.zipCode }} {{ order.billing?.data?.address?.city }}</p>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div class="page-pickup-shelf-details-header__select grow" *ngIf="showMultiselect$ | async">
-        <button class="cta-select-all" (click)="selectAll()">Alle auswählen</button>
-        {{ selectedOrderItemCount$ | async }} von {{ orderItemCount$ | async }} Titeln
-      </div>
-    </div>
   </div>
 
   <ng-template #featureLoading>

apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-header/pickup-shelf-details-header.component.scss

@@ -81,51 +81,6 @@
   }
 }
 
-.page-pickup-shelf-details-header__select {
-  @apply flex flex-col items-end;
-}
-
-.page-pickup-shelf-details-header__additional-addresses {
-  .page-pickup-shelf-details-header__addresses-popover {
-    @apply absolute inset-x-0 top-16 bottom-0 z-popover;
-
-    .close {
-      @apply bg-white absolute right-0 p-6;
-    }
-
-    .page-pickup-shelf-details-header__addresses-popover-data {
-      @apply flex flex-col bg-white p-6 z-popover min-h-[200px];
-      box-shadow: 0px 6px 24px rgba(206, 212, 219, 0.8);
-
-      .page-pickup-shelf-details-header__addresses-popover-delivery {
-        @apply grid mb-6;
-        grid-template-columns: 9.5625rem auto;
-
-        .page-pickup-shelf-details-header__addresses-popover-delivery-data {
-          p {
-            @apply font-bold;
-          }
-        }
-      }
-
-      .page-pickup-shelf-details-header__addresses-popover-billing {
-        @apply grid;
-        grid-template-columns: 9.5625rem auto;
-
-        .page-pickup-shelf-details-header__addresses-popover-billing-data {
-          p {
-            @apply font-bold;
-          }
-        }
-      }
-    }
-  }
-}
-
-.cta-select-all {
-  @apply text-brand bg-transparent text-p2 font-bold outline-none border-none;
-}
-
 .fetch-wrapper {
   @apply grid grid-flow-col gap-4;
 }

apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-header/pickup-shelf-details-header.component.ts

@@ -92,10 +92,6 @@ export class PickUpShelfDetailsHeaderComponent {
   minDateDatepicker = this.dateAdapter.addCalendarDays(this.dateAdapter.today(), -1);
   today = this.dateAdapter.today();
 
-  selectedOrderItemCount$ = this._store.selectedOrderItemIds$.pipe(map((ids) => ids?.length ?? 0));
-
-  orderItemCount$ = this._store.orderItems$.pipe(map((items) => items?.length ?? 0));
-
   orderItem$ = this._store.orderItems$.pipe(map((orderItems) => orderItems?.find((_) => true)));
 
   changeDateLoader$ = new BehaviorSubject<boolean>(false);
@@ -115,14 +111,6 @@ export class PickUpShelfDetailsHeaderComponent {
 
   statusActions$ = this.orderItem$.pipe(map((orderItem) => orderItem?.actions?.filter((action) => action.enabled === false)));
 
-  get isItemSelectable() {
-    return this._store.orderItems?.some((item) => !!item?.actions && item?.actions?.length > 0);
-  }
-
-  showMultiselect$ = combineLatest([this._store.orderItems$, this._store.fetchPartial$]).pipe(
-    map(([orderItems, fetchPartial]) => this.isItemSelectable && fetchPartial && orderItems?.length > 1)
-  );
-
   crudaUpdate$ = this.orderItem$.pipe(map((orederItem) => !!(orederItem?.cruda & 4)));
 
   editButtonDisabled$ = combineLatest([this.changeStatusLoader$, this.crudaUpdate$]).pipe(
@@ -133,20 +121,6 @@ export class PickUpShelfDetailsHeaderComponent {
     map(([statusActions, crudaUpdate]) => statusActions?.length > 0 && crudaUpdate)
   );
 
-  openAddresses: boolean = false;
-
-  get digOrderNumber(): string {
-    return this.order?.linkedRecords?.find((_) => true)?.number;
-  }
-
-  get showAddresses(): boolean {
-    return (this.order?.orderType === 2 || this.order?.orderType === 4) && (!!this.order?.shipping || !!this.order?.billing);
-  }
-
-  get showFeature(): boolean {
-    return !!this.order?.features && !!this.order?.features?.orderType;
-  }
-
   constructor(private dateAdapter: DateAdapter, private cdr: ChangeDetectorRef) {}
 
   async handleActionClick(action?: KeyValueDTOOfStringAndString) {
@@ -156,10 +130,6 @@ export class PickUpShelfDetailsHeaderComponent {
     this.cdr.markForCheck();
   }
 
-  selectAll() {
-    this._store.selectAllOrderItemIds();
-  }
-
   updatePickupDeadline(date: Date) {
     this.updateDate.emit({ date, type: 'pickup' });
   }

apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-items-group/pickup-shelf-details-items-group.component.html

@@ -0,0 +1,89 @@
+<div class="flex flex-row items-center relative bg-[#F5F7FA] p-4 rounded-t mb-[0.125rem]">
+  <div *ngIf="showFeature" class="flex flex-row items-center mr-3">
+    <ng-container [ngSwitch]="orderType">
+      <ng-container *ngSwitchCase="'Versand'">
+        <div class="flex items-center justify-center bg-[#D8DFE5] w-[2.25rem] h-[2.25rem] rounded rounded-br-none mr-2">
+          <shared-icon [size]="24" icon="isa-truck"></shared-icon>
+        </div>
+        <p class="font-bold text-p1">Versand</p>
+      </ng-container>
+      <ng-container *ngSwitchCase="'DIG-Versand'">
+        <div class="flex items-center justify-center bg-[#D8DFE5] w-[2.25rem] h-[2.25rem] rounded rounded-br-none mr-2">
+          <shared-icon [size]="24" icon="isa-truck"></shared-icon>
+        </div>
+        <p class="font-bold text-p1">Versand</p>
+      </ng-container>
+      <ng-container *ngSwitchCase="'B2B-Versand'">
+        <div class="flex items-center justify-center bg-[#D8DFE5] w-[2.25rem] h-[2.25rem] rounded rounded-br-none mr-2">
+          <shared-icon [size]="24" icon="isa-b2b-truck"></shared-icon>
+        </div>
+        <p class="font-bold text-p1">B2B-Versand</p>
+      </ng-container>
+      <ng-container *ngSwitchCase="'Abholung'">
+        <div class="flex items-center justify-center bg-[#D8DFE5] w-[2.25rem] h-[2.25rem] rounded rounded-br-none mr-2">
+          <shared-icon [size]="24" icon="isa-box-out"></shared-icon>
+        </div>
+        <p class="font-bold text-p1 mr-3">Abholung</p>
+        {{ targetBranches }}
+      </ng-container>
+      <ng-container *ngSwitchCase="'Rücklage'">
+        <div class="flex items-center justify-center bg-[#D8DFE5] w-[2.25rem] h-[2.25rem] rounded rounded-br-none mr-2">
+          <shared-icon [size]="24" icon="isa-shopping-bag"></shared-icon>
+        </div>
+        <p class="font-bold text-p1">Rücklage</p>
+      </ng-container>
+      <ng-container *ngSwitchCase="'Download'">
+        <div class="flex items-center justify-center bg-[#D8DFE5] w-[2.25rem] h-[2.25rem] rounded rounded-br-none mr-2">
+          <shared-icon [size]="24" icon="isa-download"></shared-icon>
+        </div>
+        <p class="font-bold text-p1">Download</p>
+      </ng-container>
+    </ng-container>
+  </div>
+
+  <div class="page-pickup-shelf-details-items-group__additional-addresses" *ngIf="showAddresses">
+    <button (click)="openAddresses = !openAddresses" class="text-[#0556B4]">
+      Lieferadresse / Rechnungsadresse {{ openAddresses ? 'ausblenden' : 'anzeigen' }}
+    </button>
+
+    <div class="page-pickup-shelf-details-items-group__addresses-popover" *ngIf="openAddresses">
+      <button (click)="openAddresses = !openAddresses" class="close">
+        <shared-icon icon="close" [size]="24"></shared-icon>
+      </button>
+
+      <div class="page-pickup-shelf-details-items-group__addresses-popover-data">
+        <div *ngIf="order.shipping" class="page-pickup-shelf-details-items-group__addresses-popover-delivery">
+          <p>Lieferadresse</p>
+          <div class="page-pickup-shelf-details-items-group__addresses-popover-delivery-data">
+            <ng-container *ngIf="order.shipping?.data?.organisation">
+              <p>{{ order.shipping?.data?.organisation?.name }}</p>
+              <p>{{ order.shipping?.data?.organisation?.department }}</p>
+            </ng-container>
+            <p>{{ order.shipping?.data?.firstName }} {{ order.shipping?.data?.lastName }}</p>
+            <p>{{ order.shipping?.data?.address?.info }}</p>
+            <p>{{ order.shipping?.data?.address?.street }} {{ order.shipping?.data?.address?.streetNumber }}</p>
+            <p>{{ order.shipping?.data?.address?.zipCode }} {{ order.shipping?.data?.address?.city }}</p>
+          </div>
+        </div>
+        <div *ngIf="order.billing" class="page-pickup-shelf-details-items-group__addresses-popover-billing">
+          <p>Rechnungsadresse</p>
+          <div class="page-pickup-shelf-details-items-group__addresses-popover-billing-data">
+            <ng-container *ngIf="order.billing?.data?.organisation">
+              <p>{{ order.billing?.data?.organisation?.name }}</p>
+              <p>{{ order.billing?.data?.organisation?.department }}</p>
+            </ng-container>
+            <p>{{ order.billing?.data?.firstName }} {{ order.billing?.data?.lastName }}</p>
+            <p>{{ order.billing?.data?.address?.info }}</p>
+            <p>{{ order.billing?.data?.address?.street }} {{ order.billing?.data?.address?.streetNumber }}</p>
+            <p>{{ order.billing?.data?.address?.zipCode }} {{ order.billing?.data?.address?.city }}</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="page-pickup-shelf-details-items-group__select grow" *ngIf="showMultiselect$ | async">
+    <button class="cta-select-all" (click)="selectAll()">Alle auswählen</button>
+    {{ selectedOrderItemCount$ | async }} von {{ groupedItems.length }} Titeln
+  </div>
+</div>

apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-items-group/pickup-shelf-details-items-group.component.scss

@@ -0,0 +1,48 @@
+:host {
+  @apply grid grid-flow-row;
+}
+
+.page-pickup-shelf-details-items-group__select {
+  @apply flex flex-col items-end;
+}
+
+.page-pickup-shelf-details-items-group__additional-addresses {
+  .page-pickup-shelf-details-items-group__addresses-popover {
+    @apply absolute inset-x-0 top-16 bottom-0 z-popover;
+
+    .close {
+      @apply bg-white absolute right-0 p-6;
+    }
+
+    .page-pickup-shelf-details-items-group__addresses-popover-data {
+      @apply flex flex-col bg-white p-6 z-popover min-h-[200px];
+      box-shadow: 0px 6px 24px rgba(206, 212, 219, 0.8);
+
+      .page-pickup-shelf-details-items-group__addresses-popover-delivery {
+        @apply grid mb-6;
+        grid-template-columns: 9.5625rem auto;
+
+        .page-pickup-shelf-details-items-group__addresses-popover-delivery-data {
+          p {
+            @apply font-bold;
+          }
+        }
+      }
+
+      .page-pickup-shelf-details-items-group__addresses-popover-billing {
+        @apply grid;
+        grid-template-columns: 9.5625rem auto;
+
+        .page-pickup-shelf-details-items-group__addresses-popover-billing-data {
+          p {
+            @apply font-bold;
+          }
+        }
+      }
+    }
+  }
+}
+
+.cta-select-all {
+  @apply text-brand bg-transparent text-p2 font-bold outline-none border-none;
+}

apps/page/pickup-shelf/src/lib/shared/pickup-shelf-details-items-group/pickup-shelf-details-items-group.component.ts

@@ -0,0 +1,65 @@
+import { ChangeDetectionStrategy, Component, Input, OnInit, inject } from '@angular/core';
+import { PickupShelfDetailsStore } from '../../store';
+import { map } from 'rxjs/operators';
+import { DBHOrderItemListItemDTO, OrderDTO } from '@swagger/oms';
+import { AsyncPipe, NgFor, NgIf, NgSwitch, NgSwitchCase } from '@angular/common';
+import { IconModule } from '@shared/components/icon';
+
+@Component({
+  selector: 'page-pickup-shelf-details-items-group',
+  templateUrl: 'pickup-shelf-details-items-group.component.html',
+  styleUrls: ['pickup-shelf-details-items-group.component.scss'],
+  standalone: true,
+  host: { class: 'page-pickup-shelf-details-items-group' },
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [NgIf, NgFor, NgSwitch, NgSwitchCase, IconModule, AsyncPipe],
+})
+export class PickUpShelfDetailsItemsGroupComponent implements OnInit {
+  private _store = inject(PickupShelfDetailsStore);
+
+  get order(): OrderDTO {
+    return this._store.order;
+  }
+
+  @Input() orderType: string;
+
+  @Input() groupedItems: DBHOrderItemListItemDTO[];
+
+  get firstGroupedItem() {
+    return this.groupedItems?.find((_) => true);
+  }
+
+  openAddresses: boolean = false;
+
+  get showAddresses(): boolean {
+    return (this.order?.orderType === 2 || this.order?.orderType === 4) && (!!this.order?.shipping || !!this.order?.billing);
+  }
+
+  get showFeature(): boolean {
+    return !!this.firstGroupedItem?.features && !!this.firstGroupedItem?.features?.orderType;
+  }
+
+  get targetBranches(): string {
+    return Array.from(new Set(this.groupedItems?.map((item) => item?.targetBranch))).join('; ');
+  }
+
+  get isItemSelectable() {
+    return this.groupedItems?.some((item) => !!item?.actions && item?.actions?.length > 0);
+  }
+
+  showMultiselect$ = this._store.fetchPartial$.pipe(
+    map((fetchPartial) => this.isItemSelectable && fetchPartial && this.groupedItems?.length > 1)
+  );
+
+  selectedOrderItemCount$ = this._store.selectedOrderItemIds$.pipe(
+    map((ids) => this.groupedItems?.filter((groupedItem) => ids?.includes(groupedItem?.orderItemSubsetId))?.length ?? 0)
+  );
+
+  constructor() {}
+
+  ngOnInit() {}
+
+  selectAll() {
+    this._store.selectAllOrderItemIds();
+  }
+}