#4684 Routing to Pickup Shelf Out Update

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

@@ -296,18 +296,8 @@ export class CheckoutSummaryComponent implements OnInit, OnDestroy {
     if (takeNowOrders.length != 1) return;
 
     try {
-      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.listRoute({ processId: Date.now() }).path, {
-        queryParams: { main_qs: takeNowOrders[0].orderNumber },
+        queryParams: { main_qs: takeNowOrders[0].orderNumber, filter_ordersource: 'store' },
       });
     } catch (e) {
       console.error(e);

apps/page/pickup-shelf/src/lib/pickup-shelf-base.component.ts

@@ -5,14 +5,13 @@ 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 } from '@swagger/oms';
+import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString, ListResponseArgsOfDBHOrderItemListItemDTO } 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;
@@ -131,7 +130,7 @@ export abstract class PickupShelfBaseComponent implements OnInit {
       //   return;
       // }
 
-      if (response.hits === 1) {
+      if (response.hits === 1 || this._hasSameOrderNumber(response)) {
         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) {
@@ -143,6 +142,13 @@ export abstract class PickupShelfBaseComponent implements OnInit {
     });
   }
 
+  // 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;
+  }
+
   /**
    * Sucht die Breadcrumb anhand des Tags.
    * @param tag Der gesuchte Tag