#4691 Small Fixes Customer Create

#4688 Change PickUpShelf Navigation based on Area In or Out

apps/domain/pickup-shelf/src/lib/pickup-shelf-out.service.ts

@@ -35,7 +35,7 @@ export class PickupShelfOutService extends PickupShelfIOService {
       );
     }
 
-    const { orderdate } = args.filter?.getQueryToken()?.filter ?? {};
+    const { orderdate, supplier_id } = args.filter?.getQueryToken()?.filter ?? {};
 
     return this._abholfachService.AbholfachWarenausgabe({
       input: {
@@ -45,6 +45,7 @@ export class PickupShelfOutService extends PickupShelfIOService {
         archive: String(true),
         all_branches: String(true),
         orderdate,
+        supplier_id,
       },
     });
   }

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

@@ -296,22 +296,9 @@ 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.detailRoute({
-          processId: Date.now(),
-          item: { orderId: takeNowOrders[0].id, orderNumber: takeNowOrders[0].orderNumber, processingStatus: 128 },
-        }).path
-      );
+      await this.router.navigate(this._shelfOutNavigationService.listRoute({ processId: Date.now() }).path, {
+        queryParams: { main_qs: takeNowOrders[0].orderNumber, filter_supplier_id: '16' },
+      });
     } catch (e) {
       console.error(e);
     }

apps/page/customer-order/src/lib/customer-order-details/customer-order-details-item/customer-order-details-item.component.html

@@ -140,9 +140,18 @@
           </ng-container>
         </ng-template>
       </div>
-      <div class="detail" *ngIf="getOrderItemTrackingNumber(orderItem); let trackingNumber">
-        <div class="label">Sendungsnummer</div>
-        <a class="value text-[#0556B4]" [href]="getTrackingNumberLink(trackingNumber)" target="_blank">{{ trackingNumber }}</a>
+      <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" />

apps/page/customer-order/src/lib/customer-order-details/customer-order-details-item/customer-order-details-item.component.scss

@@ -55,6 +55,18 @@ 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;

apps/page/customer-order/src/lib/customer-order-details/customer-order-details-item/customer-order-details-item.component.ts

@@ -18,6 +18,7 @@ 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;
@@ -142,11 +143,16 @@ export class CustomerOrderDetailsItemComponent extends ComponentStore<CustomerOr
 
   private _onDestroy$ = new Subject();
 
+  get isNative() {
+    return this._environment.isNative();
+  }
+
   constructor(
     private _store: CustomerOrderDetailsStore,
     private _domainReceiptService: DomainReceiptService,
     private _omsService: DomainOmsService,
-    private _cdr: ChangeDetectorRef
+    private _cdr: ChangeDetectorRef,
+    private _environment: EnvironmentService
   ) {
     super({
       more: false,
@@ -231,11 +237,29 @@ export class CustomerOrderDetailsItemComponent extends ComponentStore<CustomerOr
     return orderItems?.find((orderItem) => orderItem.data.id === orderItemListItem.orderItemId)?.data?.features?.orderType;
   }
 
-  getOrderItemTrackingNumber(orderItemListItem: OrderItemListItemDTO): string {
+  getOrderItemTrackingData(orderItemListItem: OrderItemListItemDTO): Array<{ trackingProvider: string; trackingNumber: string }> {
     const orderItems = this.order?.items;
-    return orderItems
+    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) {

apps/page/customer/src/lib/components/form-blocks/deviating-address/deviating-address-form-block.component.html

@@ -38,7 +38,6 @@
       (onInit)="addAddressGroup($event)"
       (onDestroy)="removeAddressGroup()"
       [data]="data?.address"
-      [tabIndexStart]="nameFormBlock?.tabIndexEnd + 1"
       [requiredMarks]="addressRequiredMarks"
       [validatorFns]="addressValidatorFns"
       [readonly]="readonly"

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

@@ -378,7 +378,7 @@ export abstract class AbstractCreateCustomer implements OnInit, OnDestroy {
         } catch (error) {
           this.form.enable();
           setTimeout(() => {
-            this.addressFormBlock.setAddressValidationError(error.error.invalidProperties);
+            this.deviatingDeliveryAddressFormBlock.setAddressValidationError(error.error.invalidProperties);
           }, 10);
 
           return;

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;
@@ -117,31 +116,8 @@ export abstract class PickupShelfBaseComponent implements OnInit {
     return queryParams;
   }
 
-  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 } });
-      }
-    });
-  }
+  // Fix Ticket #4688 Navigation behaves different based on section PickUpShelfOut and PickUpShelfIn
+  abstract regsiterFetchListResponseHandler(): void | Promise<void>;
 
   /**
    * Sucht die Breadcrumb anhand des Tags.

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

@@ -125,6 +125,7 @@ export abstract class PickupShelfDetailsBaseComponent {
           processingStatus: updatedItem.processingStatus,
           compartmentCode: updatedItem.compartmentCode,
           compartmentInfo: updatedItem.compartmentInfo,
+          quantity: updatedItem.quantity,
         },
       });
     });

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

@@ -16,6 +16,7 @@ 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',
@@ -205,4 +206,23 @@ 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 } });
+      }
+    });
+  }
 }

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

@@ -84,7 +84,7 @@ export class PickupShelfOutDetailsComponent extends PickupShelfDetailsBaseCompon
 
   addToPreviousCompartmentAction$ = this.store.addToPreviousCompartmentAction$;
 
-  mainActions$ = this.store.mainActions$;
+  mainActions$ = this.store.mainShelfOutActions$;
 
   trackByFnGroupDBHOrderItemListItemDTO = (index: number, group: { type: string; items: DBHOrderItemListItemDTO[] }) => group.type;
 

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

@@ -7,7 +7,7 @@ import { PickupShelfIOService, PickupShelfOutService } from '@domain/pickup-shel
 import { GetNameForBreadcrumbData, GetPathForBreadcrumbData, PickupShelfBaseComponent } from '../pickup-shelf-base.component';
 import { NavigationRoute, PickUpShelfOutNavigationService } from '@shared/services';
 import { AsyncPipe } from '@angular/common';
-import { DBHOrderItemListItemDTO } from '@swagger/oms';
+import { DBHOrderItemListItemDTO, ListResponseArgsOfDBHOrderItemListItemDTO } from '@swagger/oms';
 import { Observable, of } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { provideActionHandlers } from '@core/command';
@@ -15,6 +15,7 @@ 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',
@@ -203,4 +204,30 @@ 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 || 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) {
+        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 } });
+      }
+    });
+  }
+
+  // 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;
+  }
 }

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

@@ -1,5 +1,5 @@
 import { PickupShelfDetailsState } from './pickup-shelf-details.state';
-import { DBHOrderItemListItemDTO } from '@swagger/oms';
+import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString } from '@swagger/oms';
 
 export const selectOrder = (s: PickupShelfDetailsState) => s.order;
 
@@ -245,6 +245,26 @@ export const selectMainActions = (s: PickupShelfDetailsState) => {
     ?.filter((action) => (fetchPartial ? !action.command.includes('FETCHED_PARTIAL') : true));
 };
 
+export const selectShelfOutMainActions = (s: PickupShelfDetailsState) => {
+  const items = selectOrderItems(s);
+  const fetchPartial = selectFetchPartial(s);
+
+  // Ticket #4690 Consider every Item for selecting the main actions in Details View - Only for PickUpShelfOut
+  const actions: KeyValueDTOOfStringAndString[] = [];
+  for (const item of items) {
+    const actionsFromItem = item?.actions
+      ?.filter((action) => typeof action?.enabled !== 'boolean')
+      ?.filter((action) => (fetchPartial ? !action.command.includes('FETCHED_PARTIAL') : true));
+    for (const action of actionsFromItem) {
+      if (!actions.find((a) => a.command === action.command)) {
+        actions.push(action);
+      }
+    }
+  }
+
+  return actions;
+};
+
 export const selectCustomerNumber = (s: PickupShelfDetailsState) => {
   const order = selectOrder(s);
   return order?.buyer?.buyerNumber;

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

@@ -212,6 +212,12 @@ export class PickupShelfDetailsStore extends ComponentStore<PickupShelfDetailsSt
     return this.get(Selectors.selectMainActions);
   }
 
+  mainShelfOutActions$ = this.select(Selectors.selectShelfOutMainActions);
+
+  get mainShelfOutActions() {
+    return this.get(Selectors.selectShelfOutMainActions);
+  }
+
   customerNumber$ = this.select(Selectors.selectCustomerNumber);
 
   get customerNumber() {

apps/shared/services/src/lib/navigation/pickup-shelf-out-navigation.service.ts

@@ -2,6 +2,7 @@ import { Injectable, inject } from '@angular/core';
 import { NavigationRoute } from './defs/navigation-route';
 import { Router } from '@angular/router';
 import { OrderItemProcessingStatusValue } from '@swagger/oms';
+import { isBoolean } from 'lodash';
 
 @Injectable({ providedIn: 'root' })
 export class PickUpShelfOutNavigationService {