#4533 Removed unnessecary code and commented debounce out. Fixed Breadcrumb and Searchbox so that ORD doesnt show after Scan

#4541 Added Errorhandling to Customer Search Store

apps/page/checkout/src/lib/checkout-review/checkout-review.component.html

@@ -81,8 +81,11 @@
             *ngIf="group?.orderType !== undefined && (item.features?.orderType === 'Abholung' || item.features?.orderType === 'Rücklage')"
           >
             <ng-container *ngIf="item?.destination?.data?.targetBranch?.data; let targetBranch">
-              <ng-container *ngIf="i === 0 || targetBranch.id !== group.items[i - 1].destination?.data?.targetBranch?.data.id">
-                <div class="flex flex-row items-center px-5 pt-0 pb-[0.875rem] -mt-2 bg-[#F5F7FA]">
+              <ng-container *ngIf="i === 0 || checkIfMultipleDestinationsForOrderTypeExist(targetBranch, group, i)">
+                <div
+                  class="flex flex-row items-center px-5 pt-0 pb-[0.875rem] -mt-2 bg-[#F5F7FA]"
+                  [class.multiple-destinations]="checkIfMultipleDestinationsForOrderTypeExist(targetBranch, group, i)"
+                >
                   <span class="branch-name">{{ targetBranch?.name }} | {{ targetBranch | branchAddress }}</span>
                 </div>
                 <hr />

apps/page/checkout/src/lib/checkout-review/checkout-review.component.scss

@@ -105,6 +105,10 @@ h1 {
   }
 }
 
+.multiple-destinations {
+  @apply py-[0.875rem] mt-0;
+}
+
 .icon-order-type {
   @apply text-black mr-2;
 }

apps/page/checkout/src/lib/checkout-review/checkout-review.component.ts

@@ -14,7 +14,7 @@ import { Router } from '@angular/router';
 import { ApplicationService } from '@core/application';
 import { DomainAvailabilityService } from '@domain/availability';
 import { DomainCheckoutService } from '@domain/checkout';
-import { AvailabilityDTO, DestinationDTO, ShoppingCartItemDTO } from '@swagger/checkout';
+import { AvailabilityDTO, BranchDTO, DestinationDTO, ShoppingCartItemDTO } from '@swagger/checkout';
 import { UiMessageModalComponent, UiModalService } from '@ui/modal';
 import { PrintModalData, PrintModalComponent } from '@modal/printer';
 import { delay, first, map, switchMap, takeUntil, tap } from 'rxjs/operators';
@@ -254,6 +254,10 @@ export class CheckoutReviewComponent implements OnInit, OnDestroy, AfterViewInit
       });
   }
 
+  checkIfMultipleDestinationsForOrderTypeExist(targetBranch: BranchDTO, group: { items: ShoppingCartItemDTO[] }, i: number) {
+    return i === 0 ? false : targetBranch.id !== group.items[i - 1].destination?.data?.targetBranch?.data.id;
+  }
+
   async refreshAvailabilities() {
     this.checkingOla$.next(true);
 

apps/page/customer/src/lib/create-customer/abstract-create-customer.ts

@@ -7,7 +7,7 @@ import { CrmCustomerService } from '@domain/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,
@@ -229,7 +229,33 @@ export abstract class AbstractCreateCustomer implements OnInit, OnDestroy {
         const customerId = this.formData?._meta?.customerDto?.id ?? this.formData?._meta?.customerInfoDto?.id;
         return this.customerService.checkLoyaltyCard({ loyaltyCardNumber: value, customerId }).pipe(
           map((response) => {
-            return !response?.error && (response as any)?.result === 1 ? null : { invalid: 'Kundenkartencode ist ungültig' };
+            if (response.error) {
+              throw response.message;
+            }
+
+            /**
+             * #4485 Kubi // Verhalten mit angelegte aber nicht verknüpfte Kundenkartencode in Kundensuche und Kundendaten erfassen ist nicht gleich
+             * Fall1: Kundenkarte hat Daten in point4more:
+             * Sobald Kundenkartencode in Feld "Kundenkartencode" reingegeben wird- werden die Daten von point4more in Formular "Kundendaten Erfassen" eingefügt und ersetzen (im Ganzen, nicht inkremental) die Daten in Felder, falls welche schon reingetippt werden.
+             * Fall2: Kundenkarte hat keine Daten in point4more:
+             * Sobald Kundenkartencode in Feld "Kundenkartencode" reingegeben wird- bleiben die Daten in Formular "Kundendaten Erfassen" in Felder, falls welche schon reingetippt werden.
+             */
+            if (response.result && response.result.customer) {
+              const customer = response.result.customer;
+              const data = mapCustomerInfoDtoToCustomerCreateFormData(customer);
+
+              if (data.name.firstName && data.name.lastName) {
+                // Fall1
+                this._formData.next(data);
+              } else {
+                // Fall2 Hier müssen die Metadaten gesetzt werden um eine verknüfung zur kundenkarte zu ermöglichen.
+                const current = this.formData;
+                current._meta = data._meta;
+                current.p4m = data.p4m;
+              }
+            }
+
+            return null;
           }),
           catchError((error) => {
             if (error instanceof HttpErrorResponse) {
@@ -242,31 +268,13 @@ export abstract class AbstractCreateCustomer implements OnInit, OnDestroy {
           })
         );
       }),
-      tap(async (result) => {
+      tap(() => {
         control.markAsTouched();
         this.cdr.markForCheck();
-
-        if (result === null) {
-          const customerInfoDto = await this.getAnonymousCustomerForCode(control.value);
-          if (customerInfoDto) {
-            const data = mapCustomerInfoDtoToCustomerCreateFormData(customerInfoDto);
-            this._formData.next(data);
-          }
-        }
       })
     );
   };
 
-  async getAnonymousCustomerForCode(code: string): Promise<CustomerInfoDTO | undefined> {
-    try {
-      const res = await this.customerService.getCustomers(code).toPromise();
-
-      if (res.result.length > 0 && res.result[0].id < 0) {
-        return res.result[0];
-      }
-    } catch (error) {}
-  }
-
   async navigateToCustomerDetails(customer: CustomerDTO) {
     const processId = await this.processId$.pipe(first()).toPromise();
     const route = this.customerSearchNavigation.detailsRoute({ processId, customerId: customer.id, customer });

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-base.component.ts

@@ -12,6 +12,7 @@ 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;
@@ -64,6 +65,11 @@ export abstract class PickupShelfBaseComponent implements OnInit {
     this._runChecks();
   }
 
+  // der debounce soll verhindern, dass die breadcrumb zu oft aktualisiert,
+  // besonders bei asynchronen calls kommt es sonst zu fehlern
+  // @debounce(500)
+  // Auskommentiert, da es zu anderen Problemen führt, siehe z.B. Ticket #4538 oder #4540
+  // Ursprungsproblem des Tickets #4533 konnte anders gelöst werden, somit wird debounce hier nicht mehr benötigt
   private _runChecks() {
     const processId = this._checkAndUpdateProcessId();
     const queryParams = this._checkAndUpdateQueryParams();

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

@@ -14,9 +14,15 @@
         (updateDate)="updateDate($event)"
         (editClick)="navigateToEditPage($event)"
       ></page-pickup-shelf-details-header>
+
+      <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 orderItems$ | async; trackBy: trackByFnDBHOrderItemListItemDTO"
+          *ngFor="let item of group.items; trackBy: trackByFnDBHOrderItemListItemDTO"
           [orderItem]="item"
           [selected]="true"
           (historyClick)="navigateToHistoryPage($event)"
@@ -24,6 +30,8 @@
           (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-item/notification-type.pipe.ts

@@ -0,0 +1,22 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'notificationType',
+  standalone: true,
+})
+export class NotificationTypePipe implements PipeTransform {
+  transform(notificationType: string): string {
+    switch (notificationType) {
+      case 'NOTIFICATION_EMAIL':
+        return 'Benachrichtigung';
+      case 'REMINDER_EMAIL':
+        return 'Erinnerung';
+      case 'ORDERCONFIRMATION_EMAIL':
+        return 'Bestellbestätigung';
+      case 'NOTIFICATION_SMS':
+        return 'Benachrichtigung';
+      default:
+        return notificationType;
+    }
+  }
+}

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

@@ -11,8 +11,10 @@
       <img [uiOverlayTrigger]="emailTooltip" src="/assets/images/email_bookmark.svg" />
       <ui-tooltip yPosition="above" xPosition="after" [yOffset]="-11" [xOffset]="-8" #emailTooltip [closeable]="true">
         Per E-Mail benachrichtigt <br />
-        <ng-container *ngFor="let notification of emailNotificationDates$ | async">
-          {{ notification | date: 'dd.MM.yyyy | HH:mm' }} Uhr<br />
+        <ng-container *ngFor="let notifications of emailNotificationDates$ | async">
+          <ng-container *ngFor="let notificationDate of notifications.dates">
+            {{ notifications.type | notificationType }} {{ notificationDate | date: 'dd.MM.yyyy | HH:mm' }} Uhr<br />
+          </ng-container>
         </ng-container>
       </ui-tooltip>
     </ng-container>
@@ -20,8 +22,10 @@
       <img [uiOverlayTrigger]="smsTooltip" src="/assets/images/sms_bookmark.svg" />
       <ui-tooltip yPosition="above" xPosition="after" [yOffset]="-11" [xOffset]="-8" #smsTooltip [closeable]="true">
         Per SMS benachrichtigt <br />
-        <ng-container *ngFor="let notification of smsNotificationDates$ | async">
-          {{ notification | date: 'dd.MM.yyyy | HH:mm' }} Uhr<br />
+        <ng-container *ngFor="let notifications of smsNotificationDates$ | async">
+          <ng-container *ngFor="let notificationDate of notifications.dates">
+            {{ notificationDate | date: 'dd.MM.yyyy | HH:mm' }} Uhr<br />
+          </ng-container>
         </ng-container>
       </ui-tooltip>
     </ng-container>

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

@@ -24,6 +24,7 @@ import { map, switchMap } from 'rxjs/operators';
 import { Subject, combineLatest } from 'rxjs';
 import { PickupShelfDetailsStore } from '../../store';
 import { UiQuantityDropdownModule } from '@ui/quantity-dropdown';
+import { NotificationTypePipe } from './notification-type.pipe';
 
 export interface PickUpShelfDetailsItemComponentState {
   orderItem?: DBHOrderItemListItemDTO;
@@ -55,6 +56,7 @@ export interface PickUpShelfDetailsItemComponentState {
     PickupShelfPaymentTypePipe,
     IconModule,
     UiQuantityDropdownModule,
+    NotificationTypePipe,
   ],
 })
 export class PickUpShelfDetailsItemComponent extends ComponentStore<PickUpShelfDetailsItemComponentState> implements OnInit {

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();
+  }
+}

apps/page/pickup-shelf/src/lib/store/pickup-shelf-details.selectors.ts

@@ -166,22 +166,33 @@ export const selectNotifications = (orderItemSubsetId: number) => (s: PickupShel
     }, {} as Record<string, Date[]>);
 };
 
-export const selectLatestNotificationDatesFor = (orderItemSubsetId: number, key: string) => (s: PickupShelfDetailsState) => {
+export const selectLatestNotificationDatesFor = (orderItemSubsetId: number, keys: string[]) => (s: PickupShelfDetailsState) => {
   const notifications = selectNotifications(orderItemSubsetId)(s);
-  return (
-    notifications?.[key]?.filter((date) => {
+  let dates: Array<{ type: string; dates: Date[] }> = [];
+
+  for (const key of keys) {
+    const notification = notifications?.[key] ?? [];
+
+    const validDates = notification.filter((date) => {
       // check if curr is an invalid date
       return !isNaN(date.getTime());
-    }) ?? []
-  );
+    });
+
+    const mappedDates = { type: key, dates: validDates };
+
+    if (mappedDates.dates?.length > 0) {
+      dates.push(mappedDates);
+    }
+  }
+  return dates;
 };
 
 export const selectLatestEmailNotificationDates = (orderItemSubsetId: number) => (s: PickupShelfDetailsState) => {
-  return selectLatestNotificationDatesFor(orderItemSubsetId, 'NOTIFICATION_EMAIL')(s);
+  return selectLatestNotificationDatesFor(orderItemSubsetId, ['NOTIFICATION_EMAIL', 'REMINDER_EMAIL', 'ORDERCONFIRMATION_EMAIL'])(s);
 };
 
 export const selectLatestSmsNotificationDate2 = (orderItemSubsetId: number) => (s: PickupShelfDetailsState) => {
-  return selectLatestNotificationDatesFor(orderItemSubsetId, 'NOTIFICATION_SMS')(s);
+  return selectLatestNotificationDatesFor(orderItemSubsetId, ['NOTIFICATION_SMS'])(s);
 };
 
 export const selectCanSelectAction = (s: PickupShelfDetailsState) => {

apps/page/pickup-shelf/src/lib/store/pickup-shelf.store.ts

@@ -113,8 +113,14 @@ export class PickupShelfStore extends ComponentStore<PickupShelfState> implement
   }
 
   setQueryParams(queryParams: Record<string, string> | undefined) {
+    // #4533 Wenn ein Abholschein gescannt wird, soll ORD: nicht in der Suchbox stehen und somit auch nicht in der Breadcrumb enthalten sein
+    const isScannedPickUpCode = queryParams?.main_qs?.includes('ORD:');
+    if (isScannedPickUpCode) {
+      this.patchState({ queryParams: { ...queryParams, main_qs: queryParams?.main_qs?.replace('ORD:', '') } });
+    } else {
       this.patchState({ queryParams });
     }
+  }
 
   cancelListRequests() {
     this._cancelListRequests.next();

apps/swagger/crm/src/lib/models.ts

@@ -7,7 +7,6 @@ export { DialogOfString } from './models/dialog-of-string';
 export { DialogSettings } from './models/dialog-settings';
 export { DialogContentType } from './models/dialog-content-type';
 export { KeyValueDTOOfStringAndString } from './models/key-value-dtoof-string-and-string';
-export { IPublicUserInfo } from './models/ipublic-user-info';
 export { ProblemDetails } from './models/problem-details';
 export { ResponseArgsOfIEnumerableOfCountryDTO } from './models/response-args-of-ienumerable-of-country-dto';
 export { CountryDTO } from './models/country-dto';
@@ -15,6 +14,7 @@ export { EntityDTOBaseOfCountryDTOAndICountry } from './models/entity-dtobase-of
 export { EntityDTOBase } from './models/entity-dtobase';
 export { EntityDTO } from './models/entity-dto';
 export { EntityStatus } from './models/entity-status';
+export { CRUDA } from './models/cruda';
 export { ResponseArgsOfInputDTO } from './models/response-args-of-input-dto';
 export { InputDTO } from './models/input-dto';
 export { InputType } from './models/input-type';
@@ -92,5 +92,8 @@ export { DiffDTO } from './models/diff-dto';
 export { ResponseArgsOfIEnumerableOfEntityKeyValueDTOOfStringAndString } from './models/response-args-of-ienumerable-of-entity-key-value-dtoof-string-and-string';
 export { EntityKeyValueDTOOfStringAndString } from './models/entity-key-value-dtoof-string-and-string';
 export { ResponseArgsOfIEnumerableOfKeyValueDTOOfStringAndString } from './models/response-args-of-ienumerable-of-key-value-dtoof-string-and-string';
+export { ResponseArgsOfCheckLoyaltyCardResult } from './models/response-args-of-check-loyalty-card-result';
+export { CheckLoyaltyCardResult } from './models/check-loyalty-card-result';
+export { LoyaltyCardStatus } from './models/loyalty-card-status';
 export { ResponseArgsOfPayerDTO } from './models/response-args-of-payer-dto';
 export { ResponseArgsOfShippingAddressDTO } from './models/response-args-of-shipping-address-dto';

apps/swagger/crm/src/lib/models/check-loyalty-card-result.ts

@@ -0,0 +1,15 @@
+/* tslint:disable */
+import { CustomerInfoDTO } from './customer-info-dto';
+import { LoyaltyCardStatus } from './loyalty-card-status';
+export interface CheckLoyaltyCardResult {
+
+  /**
+   * Customer
+   */
+  customer?: CustomerInfoDTO;
+
+  /**
+   * Status
+   */
+  status: LoyaltyCardStatus;
+}

apps/swagger/crm/src/lib/models/cruda.ts

@@ -0,0 +1,2 @@
+/* tslint:disable */
+export type CRUDA = 0 | 1 | 2 | 4 | 8 | 16;

apps/swagger/crm/src/lib/models/entity-dto.ts

@@ -1,11 +1,14 @@
 /* tslint:disable */
 import { TouchedBase } from './touched-base';
+import { CRUDA } from './cruda';
 import { EntityStatus } from './entity-status';
 export interface EntityDTO extends TouchedBase{
   changed?: string;
   created?: string;
+  cruda?: CRUDA;
   id?: number;
   pId?: string;
   status?: EntityStatus;
+  uId?: string;
   version?: number;
 }

apps/swagger/crm/src/lib/models/entity-dtoreference-container.ts

@@ -8,4 +8,5 @@ export interface EntityDTOReferenceContainer extends TouchedBase{
   id?: number;
   pId?: string;
   selected?: boolean;
+  uId?: string;
 }

apps/swagger/crm/src/lib/models/ipublic-user-info.ts

@@ -1,7 +0,0 @@
-/* tslint:disable */
-export interface IPublicUserInfo {
-  alias?: string;
-  displayName?: string;
-  isAuthenticated: boolean;
-  username?: string;
-}

apps/swagger/crm/src/lib/models/loyalty-card-status.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+
+/**
+ * Kundenkartenstatus
+ */
+export type LoyaltyCardStatus = 0 | 1 | 2 | 4 | 8;

apps/swagger/crm/src/lib/models/response-args-of-check-loyalty-card-result.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { ResponseArgs } from './response-args';
+import { CheckLoyaltyCardResult } from './check-loyalty-card-result';
+export interface ResponseArgsOfCheckLoyaltyCardResult extends ResponseArgs{
+  result?: CheckLoyaltyCardResult;
+}

apps/swagger/crm/src/lib/models/response-args.ts

@@ -1,11 +1,9 @@
 /* tslint:disable */
 import { DialogOfString } from './dialog-of-string';
-import { IPublicUserInfo } from './ipublic-user-info';
 export interface ResponseArgs {
   dialog?: DialogOfString;
   error: boolean;
   invalidProperties?: {[key: string]: string};
   message?: string;
   requestId?: number;
-  userInfo?: IPublicUserInfo;
 }

apps/swagger/crm/src/lib/services/loyalty-card.service.ts

@@ -9,7 +9,7 @@ import { map as __map, filter as __filter } from 'rxjs/operators';
 
 import { ResponseArgsOfIEnumerableOfEntityKeyValueDTOOfStringAndString } from '../models/response-args-of-ienumerable-of-entity-key-value-dtoof-string-and-string';
 import { ResponseArgsOfIEnumerableOfKeyValueDTOOfStringAndString } from '../models/response-args-of-ienumerable-of-key-value-dtoof-string-and-string';
-import { ResponseArgsOfQuerySettingsDTO } from '../models/response-args-of-query-settings-dto';
+import { ResponseArgsOfCheckLoyaltyCardResult } from '../models/response-args-of-check-loyalty-card-result';
 @Injectable({
   providedIn: 'root',
 })
@@ -121,7 +121,7 @@ class LoyaltyCardService extends __BaseService {
    *
    * - `customerId`: PK Kunde (optional)
    */
-  LoyaltyCardCheckLoyaltyCardResponse(params: LoyaltyCardService.LoyaltyCardCheckLoyaltyCardParams): __Observable<__StrictHttpResponse<ResponseArgsOfQuerySettingsDTO>> {
+  LoyaltyCardCheckLoyaltyCardResponse(params: LoyaltyCardService.LoyaltyCardCheckLoyaltyCardParams): __Observable<__StrictHttpResponse<ResponseArgsOfCheckLoyaltyCardResult>> {
     let __params = this.newParams();
     let __headers = new HttpHeaders();
     let __body: any = null;
@@ -141,7 +141,7 @@ class LoyaltyCardService extends __BaseService {
     return this.http.request<any>(req).pipe(
       __filter(_r => _r instanceof HttpResponse),
       __map((_r) => {
-        return _r as __StrictHttpResponse<ResponseArgsOfQuerySettingsDTO>;
+        return _r as __StrictHttpResponse<ResponseArgsOfCheckLoyaltyCardResult>;
       })
     );
   }
@@ -155,9 +155,9 @@ class LoyaltyCardService extends __BaseService {
    *
    * - `customerId`: PK Kunde (optional)
    */
-  LoyaltyCardCheckLoyaltyCard(params: LoyaltyCardService.LoyaltyCardCheckLoyaltyCardParams): __Observable<ResponseArgsOfQuerySettingsDTO> {
+  LoyaltyCardCheckLoyaltyCard(params: LoyaltyCardService.LoyaltyCardCheckLoyaltyCardParams): __Observable<ResponseArgsOfCheckLoyaltyCardResult> {
     return this.LoyaltyCardCheckLoyaltyCardResponse(params).pipe(
-      __map(_r => _r.body as ResponseArgsOfQuerySettingsDTO)
+      __map(_r => _r.body as ResponseArgsOfCheckLoyaltyCardResult)
     );
   }
 }

apps/utils/common/src/lib/debounce.decorator.ts

@@ -0,0 +1,9 @@
+import { DebounceSettings, debounce as lodashDebounce } from 'lodash';
+
+export function debounce(wait: number, options?: DebounceSettings): MethodDecorator {
+  return (target: Object, propertyKey: string, descriptor: TypedPropertyDescriptor<any>): TypedPropertyDescriptor<any> => {
+    const currentMethod = descriptor.value;
+    descriptor.value = lodashDebounce(currentMethod, wait, options);
+    return descriptor;
+  };
+}

apps/utils/common/src/lib/index.ts

@@ -1,4 +1,5 @@
 export * from './contains-element';
+export * from './debounce.decorator';
 export * from './geo-distance';
 export * from './hash';
 export * from './is-array';