Merge branch 'hotfix/4270-4269-Archiv-Artikel'

(cherry picked from commit 1d865c47d7)

angular.json

@@ -1635,5 +1635,8 @@
         }
       }
     }
+  },
+  "cli": {
+    "analytics": false
   }
 }

apps/adapter/scan/src/lib/dev.scan-adapter.ts

@@ -11,13 +11,9 @@ export class DevScanAdapter implements ScanAdapter {
   constructor(private _modal: UiModalService, private _environmentService: EnvironmentService) {}
 
   async init(): Promise<boolean> {
-    if (this._environmentService.isTablet()) {
-      return new Promise((resolve, reject) => {
-        resolve(isDevMode());
-      });
-    }
-
-    return false;
+    return new Promise((resolve, reject) => {
+      resolve(isDevMode());
+    });
   }
 
   scan(): Observable<string> {

apps/adapter/scan/src/lib/scan.service.ts

@@ -14,7 +14,6 @@ export class ScanAdapterService {
   async init(): Promise<void> {
     for (const adapter of this.scanAdapters) {
       const isReady = await adapter.init();
-      console.log('ScanAdapterService.init', adapter.name, isReady);
       this._readyAdapters[adapter.name] = isReady;
     }
   }
@@ -24,42 +23,30 @@ export class ScanAdapterService {
   }
 
   getAdapter(name: string): ScanAdapter | undefined {
-    return this.scanAdapters.find((adapter) => adapter.name === name);
+    return this._readyAdapters[name] && this.scanAdapters.find((adapter) => adapter.name === name);
   }
 
-  // return true if at least one adapter is ready
   isReady(): boolean {
     return Object.values(this._readyAdapters).some((ready) => ready);
   }
 
-  scan(ops: { use?: string; include?: string[]; exclude?: string[] } = { exclude: ['Dev'] }): Observable<string> {
+  scan(): Observable<string> {
+    const adapterOrder = ['Native', 'Scandit', 'Dev'];
+
     let adapter: ScanAdapter;
 
-    if (ops.use == undefined) {
-      // get the first adapter that is ready to use
-      adapter = this.scanAdapters
-        .filter((adapter) => {
-          if (ops.include?.length) {
-            return ops.include.includes(adapter.name);
-          } else if (ops.exclude?.length) {
-            return !ops.exclude.includes(adapter.name);
-          } else {
-            return true;
-          }
-        })
-        .find((adapter) => this._readyAdapters[adapter.name]);
-    } else {
-      adapter = this.getAdapter(ops.use);
+    for (const name of adapterOrder) {
+      adapter = this.getAdapter(name);
+
+      if (adapter) {
+        break;
+      }
     }
 
     if (!adapter) {
       return throwError('No adapter found');
     }
 
-    if (this._readyAdapters[adapter.name] == false) {
-      return throwError('Adapter is not ready');
-    }
-
     return adapter.scan();
   }
 }

apps/core/command/src/lib/action-handler.interface.ts

@@ -1,4 +1,6 @@
+import { CommandService } from './command.service';
+
 export abstract class ActionHandler<T = any> {
   constructor(readonly action: string) {}
-  abstract handler(data: T): Promise<T>;
+  abstract handler(data: T, service?: CommandService): Promise<T>;
 }

apps/core/command/src/lib/command.module.ts

@@ -1,8 +1,12 @@
-import { ModuleWithProviders, NgModule, Type } from '@angular/core';
+import { ModuleWithProviders, NgModule, Provider, Type } from '@angular/core';
 import { ActionHandler } from './action-handler.interface';
 import { CommandService } from './command.service';
 import { FEATURE_ACTION_HANDLERS, ROOT_ACTION_HANDLERS } from './tokens';
 
+export function provideActionHandlers(actionHandlers: Type<ActionHandler>[]): Provider[] {
+  return [CommandService, actionHandlers.map((handler) => ({ provide: FEATURE_ACTION_HANDLERS, useClass: handler, multi: true }))];
+}
+
 @NgModule({})
 export class CoreCommandModule {
   static forRoot(actionHandlers: Type<ActionHandler>[]): ModuleWithProviders<CoreCommandModule> {

apps/core/command/src/lib/command.service.ts

@@ -16,7 +16,7 @@ export class CommandService {
         throw new Error('Action Handler does not exist');
       }
 
-      data = await handler.handler(data);
+      data = await handler.handler(data, this);
     }
     return data;
   }

apps/domain/availability/src/lib/availability.service.ts

@@ -23,6 +23,7 @@ import { ResponseArgsOfIEnumerableOfStockInfoDTO, StockDTO, StockInfoDTO, StockS
 import { PriceDTO } from '@swagger/availability';
 import { AvailabilityByBranchDTO, ItemData } from './defs';
 import { Availability } from './defs/availability';
+import { isEmpty } from 'lodash';
 
 @Injectable()
 export class DomainAvailabilityService {
@@ -145,6 +146,7 @@ export class DomainAvailabilityService {
     );
   }
 
+  @memorize({ ttl: 10000 })
   getTakeAwayAvailability({
     item,
     quantity,
@@ -165,7 +167,7 @@ export class DomainAvailabilityService {
       ),
       map(([response, supplier, defaultBranch]) => {
         const price = item?.price;
-        return this._mapToTakeAwayAvailability({ response, supplier, branchId: branch.id ?? defaultBranch.id, quantity, price });
+        return this._mapToTakeAwayAvailability({ response, supplier, branchId: branch?.id ?? defaultBranch?.id, quantity, price });
       }),
       shareReplay(1)
     );
@@ -478,6 +480,10 @@ export class DomainAvailabilityService {
     };
   }
 
+  private _priceIsEmpty(price: PriceDTO) {
+    return isEmpty(price?.value) || isEmpty(price?.vat);
+  }
+
   private _mapToTakeAwayAvailability({
     response,
     supplier,
@@ -498,7 +504,7 @@ export class DomainAvailabilityService {
       inStock: inStock,
       supplierSSC: quantity <= inStock ? '999' : '',
       supplierSSCText: quantity <= inStock ? 'Filialentnahme' : '',
-      price: price ?? stockInfo?.retailPrice,
+      price: this._priceIsEmpty(price) ? stockInfo?.retailPrice : price,
       supplier: { id: supplier?.id },
       // TODO: Change after API Update
       // LH: 2021-03-09 preis Property hat nun ein Fallback auf retailPrice
@@ -540,6 +546,7 @@ export class DomainAvailabilityService {
       return preferred.map((p) => {
         return [
           {
+            orderDeadline: p?.orderDeadline,
             availabilityType: p?.status,
             ssc: p?.ssc,
             sscText: p?.sscText,
@@ -561,7 +568,6 @@ export class DomainAvailabilityService {
 
   private _mapToShippingAvailability(availabilities: SwaggerAvailabilityDTO[]) {
     const preferred = availabilities.filter((f) => f.preferred === 1);
-
     return preferred.map((p) => {
       return {
         availabilityType: p?.status,
@@ -575,6 +581,7 @@ export class DomainAvailabilityService {
         supplierInfo: p?.requestStatusCode,
         lastRequest: p?.requested,
         itemId: p.itemId,
+        priceMaintained: p.priceMaintained,
       };
     });
   }

apps/domain/checkout/src/lib/checkout.service.ts

@@ -28,7 +28,13 @@ import {
   StoreCheckoutBranchService,
   ItemsResult,
 } from '@swagger/checkout';
-import { DisplayOrderDTO, DisplayOrderItemDTO, OrderCheckoutService, ReorderValues } from '@swagger/oms';
+import {
+  DisplayOrderDTO,
+  DisplayOrderItemDTO,
+  OrderCheckoutService,
+  ReorderValues,
+  ResponseArgsOfValueTupleOfIEnumerableOfDisplayOrderDTOAndIEnumerableOfKeyValueDTOOfStringAndString,
+} from '@swagger/oms';
 import { isNullOrUndefined, memorize } from '@utils/common';
 import { combineLatest, Observable, of, concat, isObservable, throwError } from 'rxjs';
 import { bufferCount, catchError, filter, first, map, mergeMap, shareReplay, switchMap, tap, withLatestFrom } from 'rxjs/operators';
@@ -372,8 +378,9 @@ export class DomainCheckoutService {
   _setBuyer({ processId, buyer }: { processId: number; buyer: BuyerDTO }): Observable<CheckoutDTO> {
     return this.getCheckout({ processId }).pipe(
       first(),
-      mergeMap((checkout) =>
-        this._buyerService
+      mergeMap((checkout) => {
+        console.log('checkout', checkout, processId);
+        return this._buyerService
           .StoreCheckoutBuyerSetBuyerPOST({
             checkoutId: checkout?.id,
             buyerDTO: buyer,
@@ -381,8 +388,8 @@ export class DomainCheckoutService {
           .pipe(
             map((response) => response.result),
             tap((checkout) => this.store.dispatch(DomainCheckoutActions.setCheckout({ processId, checkout })))
-          )
-      )
+          );
+      })
     );
   }
 
@@ -710,6 +717,47 @@ export class DomainCheckoutService {
       .pipe(mergeMap((_) => completeOrder$.pipe(tap(console.log.bind(window, 'completeOrder$')))));
   }
 
+  completeKulturpassOrder({
+    processId,
+    orderItemSubsetId,
+  }: {
+    processId: number;
+    orderItemSubsetId: number;
+  }): Observable<ResponseArgsOfValueTupleOfIEnumerableOfDisplayOrderDTOAndIEnumerableOfKeyValueDTOOfStringAndString> {
+    const refreshShoppingCart$ = this.getShoppingCart({ processId, latest: true }).pipe(first());
+    const refreshCheckout$ = this.getCheckout({ processId, refresh: true }).pipe(first());
+
+    const setBuyer$ = this.getBuyer({ processId }).pipe(
+      first(),
+      mergeMap((buyer) => this._setBuyer({ processId, buyer }))
+    );
+
+    const setPayer$ = this.getPayer({ processId }).pipe(
+      first(),
+      mergeMap((payer) => this._setPayer({ processId, payer }))
+    );
+
+    const checkAvailabilities$ = this.checkAvailabilities({ processId });
+
+    const updateAvailabilities$ = this.updateAvailabilities({ processId });
+
+    return refreshShoppingCart$.pipe(
+      mergeMap((_) => refreshCheckout$),
+      mergeMap((_) => checkAvailabilities$),
+      mergeMap((_) => updateAvailabilities$),
+      mergeMap((_) => setBuyer$),
+      mergeMap((_) => setPayer$),
+      mergeMap((checkout) =>
+        this.orderCheckoutService.OrderCheckoutCreateKulturPassOrder({
+          payload: {
+            checkoutId: checkout.id,
+            orderItemSubsetId: String(orderItemSubsetId),
+          },
+        })
+      )
+    );
+  }
+
   updateDestination({
     processId,
     destinationId,

apps/domain/oms/src/lib/action-handlers/collect-on-deliverynote.action-handler.ts

@@ -21,6 +21,7 @@ export class CollectOnDeliveryNoteActionHandler extends ActionHandler<OrderItems
     const response = await this.orderService
       .OrderCollectOnDeliveryNote({
         data,
+        eagerLoading: 1,
       })
       .toPromise();
 
@@ -29,7 +30,7 @@ export class CollectOnDeliveryNoteActionHandler extends ActionHandler<OrderItems
 
     return {
       ...context,
-      receipts: response.result,
+      receipts: response.result.map((r) => r.data),
     };
   }
 }

apps/domain/oms/src/lib/action-handlers/collect-with-smallamountinvoice.action-handler.ts

@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import { ActionHandler } from '@core/command';
+import { OrderService } from '@swagger/oms';
+import { OrderItemsContext } from './order-items.context';
+
+@Injectable()
+export class CollectWithSmallAmountinvoiceActionHandler extends ActionHandler<OrderItemsContext> {
+  constructor(private orderService: OrderService) {
+    super('COLLECT_WITH_SMALLAMOUNTINVOICE');
+  }
+
+  async handler(context: OrderItemsContext): Promise<OrderItemsContext> {
+    const data: Record<number, number> = {};
+
+    context.items.forEach((orderItemSubsetId) => {
+      data[orderItemSubsetId.orderItemSubsetId] =
+        context.itemQuantity?.get(orderItemSubsetId.orderItemSubsetId) ?? orderItemSubsetId.quantity;
+    });
+
+    const response = await this.orderService
+      .OrderCollectWithSmallAmountInvoice({
+        data,
+        eagerLoading: 1,
+      })
+      .toPromise();
+
+    // Für korrekte Navigation nach Aufruf, da ProcessingStatus Serverseitig auf abgeholt gesetzt wird
+    context.items?.forEach((i) => (i.processingStatus = 256));
+
+    return {
+      ...context,
+      receipts: response.result.map((r) => r.data),
+    };
+  }
+}

apps/domain/oms/src/lib/action-handlers/index.ts

@@ -1,4 +1,3 @@
-// start:ng42.barrel
 export * from './accepted.action-handler';
 export * from './arrived.action-handler';
 export * from './assembled.action-handler';
@@ -7,6 +6,10 @@ export * from './back-to-stock.action-handler';
 export * from './canceled-by-buyer.action-handler';
 export * from './canceled-by-retailer.action-handler';
 export * from './canceled-by-supplier.action-handler';
+export * from './change-order-item-status-base.action-handler';
+export * from './collect-on-deliverynote.action-handler';
+export * from './collect-with-smallamountinvoice.action-handler';
+export * from './create-returnitem.action-handler';
 export * from './create-shipping-note.action-handler';
 export * from './delivered.action-handler';
 export * from './determine-supplier.action-handler';
@@ -25,16 +28,15 @@ export * from './parked.action-handler';
 export * from './placed.action-handler';
 export * from './preperation-for-shipping.action-handler';
 export * from './print-compartment-label.action-handler';
+export * from './print-pricediffqrcodelabel.action-handler';
 export * from './print-shipping-note.action-handler';
-export * from './re-ordered.action-handler';
+export * from './print-smallamountinvoice.action-handler';
 export * from './re-order.action-handler';
+export * from './re-ordered.action-handler';
 export * from './redirected-internally.action-handler';
 export * from './requested.action-handler';
 export * from './reserved.action-handler';
 export * from './returned-by-buyer.action-handler';
 export * from './shipping-note.action-handler';
+export * from './shop-with-kulturpass.action-handler';
 export * from './supplier-temporarily-out-of-stock.action-handler copy';
-export * from './collect-on-deliverynote.action-handler';
-export * from './create-returnitem.action-handler';
-export * from './print-pricediffqrcodelabel.action-handler';
-// end:ng42.barrel

apps/domain/oms/src/lib/action-handlers/order-items.context.ts

@@ -1,4 +1,4 @@
-import { OrderItemListItemDTO, ReceiptDTO } from '@swagger/oms';
+import { OrderItemListItemDTO, ReceiptDTO, OrderDTO } from '@swagger/oms';
 
 export interface OrderItemsContext {
   items: OrderItemListItemDTO[];
@@ -12,4 +12,6 @@ export interface OrderItemsContext {
   receipts?: ReceiptDTO[];
 
   shippingDelayComment?: string;
+
+  order?: OrderDTO;
 }

apps/domain/oms/src/lib/action-handlers/print-shipping-note.action-handler.ts

@@ -27,7 +27,8 @@ export class PrintShippingNoteActionHandler extends ActionHandler<OrderItemsCont
           printerType: 'Label',
           print: async (printer) => {
             try {
-              for (const group of groupBy(data?.receipts, (receipt) => receipt?.buyer?.buyerNumber)) {
+              const receipts = data?.receipts?.filter((r) => r?.receiptType & 1);
+              for (const group of groupBy(receipts, (receipt) => receipt?.buyer?.buyerNumber)) {
                 await this.domainPrinterService.printShippingNote({ printer, receipts: group?.items?.map((r) => r?.id) }).toPromise();
               }
               return {

apps/domain/oms/src/lib/action-handlers/print-smallamountinvoice.action-handler.ts

@@ -0,0 +1,56 @@
+import { Injectable } from '@angular/core';
+import { ActionHandler } from '@core/command';
+import { OrderItemsContext } from './order-items.context';
+import { OMSPrintService } from '@swagger/print';
+import { UiModalService } from '@ui/modal';
+import { PrintModalComponent, PrintModalData } from '@modal/printer';
+import { NativeContainerService } from 'native-container';
+import { groupBy } from '@ui/common';
+
+@Injectable()
+export class PrintSmallamountinvoiceActionHandler extends ActionHandler<OrderItemsContext> {
+  constructor(
+    private uiModal: UiModalService,
+    private omsPrintService: OMSPrintService,
+    private nativeContainerService: NativeContainerService
+  ) {
+    super('PRINT_SMALLAMOUNTINVOICE');
+  }
+
+  async handler(data: OrderItemsContext): Promise<OrderItemsContext> {
+    await this.uiModal
+      .open({
+        content: PrintModalComponent,
+        config: { showScrollbarY: false },
+        data: {
+          printImmediately: !this.nativeContainerService.isNative,
+          printerType: 'Label',
+          print: async (printer) => {
+            try {
+              const receipts = data?.receipts?.filter((r) => r?.receiptType & 128);
+              for (const group of groupBy(receipts, (receipt) => receipt?.buyer?.buyerNumber)) {
+                await this.omsPrintService
+                  .OMSPrintKleinbetragsrechnung({
+                    data: group?.items?.map((r) => r?.id),
+                    printer,
+                  })
+                  .toPromise();
+              }
+              return {
+                error: false,
+              };
+            } catch (error) {
+              console.error(error);
+              return {
+                error: true,
+                message: error?.message || error,
+              };
+            }
+          },
+        } as PrintModalData,
+      })
+      .afterClosed$.toPromise();
+
+    return data;
+  }
+}

apps/domain/oms/src/lib/action-handlers/shop-with-kulturpass.action-handler.ts

@@ -0,0 +1,82 @@
+import { Injectable } from '@angular/core';
+import { OrderItemsContext } from './order-items.context';
+import { ActionHandler, CommandService } from '@core/command';
+import { KulturpassOrderModalService } from '@shared/modals/kulturpass-order-modal';
+import { DisplayOrderItemSubsetDTO, OrderItemListItemDTO, ReceiptDTO } from '@swagger/oms';
+import { DomainReceiptService } from '../receipt.service';
+import { DomainGoodsService } from '../goods.service';
+import { map } from 'rxjs/operators';
+
+@Injectable()
+export class ShopWithKulturpassActionHandler extends ActionHandler<OrderItemsContext> {
+  constructor(
+    private _modal: KulturpassOrderModalService,
+    private _receiptService: DomainReceiptService,
+    private _goodsService: DomainGoodsService
+  ) {
+    super('SHOP_WITH_KULTURPASS');
+  }
+
+  async handler(data: OrderItemsContext, service: CommandService): Promise<OrderItemsContext> {
+    const items: OrderItemListItemDTO[] = [];
+    const receipts: ReceiptDTO[] = [];
+
+    let command: string;
+    for (const item of data.items) {
+      const result = await this._modal.open({ orderItemListItem: item, order: data.order }).afterClosed$.toPromise();
+
+      if (result.data == null) {
+        return data;
+      }
+
+      const displayOrder = result.data[0];
+      command = result.data[1];
+
+      if (displayOrder) {
+        const subsetItems = displayOrder.items.reduce((acc, item) => [...acc, ...item.subsetItems], [] as DisplayOrderItemSubsetDTO[]);
+
+        const orderItems = await this.getItems(displayOrder.orderNumber);
+
+        items.push(...orderItems);
+
+        const subsetItemIds = subsetItems.map((item) => item.id);
+
+        const r = await this.getReceipts(subsetItemIds);
+
+        receipts.push(...r);
+      }
+    }
+
+    if (!command) {
+      return {
+        ...data,
+        items,
+        receipts,
+      };
+    } else {
+      return service.handleCommand(command, {
+        ...data,
+        items,
+        receipts,
+      });
+    }
+  }
+
+  getReceipts(ids: number[]) {
+    return this._receiptService
+      .getReceipts({
+        receiptType: 128,
+        eagerLoading: 1,
+        ids,
+      })
+      .pipe(map((res) => res.result.map((data) => data.item3.data).filter((data) => !!data)))
+      .toPromise();
+  }
+
+  getItems(orderNumber: string) {
+    return this._goodsService
+      .getWarenausgabeItemByOrderNumber(orderNumber, false)
+      .pipe(map((res) => res.result))
+      .toPromise();
+  }
+}

apps/domain/oms/src/lib/oms.service.ts

@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
 import {
-  AutocompleteTokenDTO,
   BranchService,
   ChangeStockStatusCodeValues,
   HistoryDTO,
@@ -11,9 +10,7 @@ import {
   OrderItemSubsetDTO,
   OrderListItemDTO,
   OrderService,
-  QueryTokenDTO,
   ReceiptService,
-  ResponseArgsOfIEnumerableOfHistoryDTO,
   StatusValues,
   StockStatusCodeService,
   ValueTupleOfLongAndReceiptTypeAndEntityDTOContainerOfReceiptDTO,
@@ -22,7 +19,7 @@ import {
 } from '@swagger/oms';
 import { memorize } from '@utils/common';
 import { Observable } from 'rxjs';
-import { map, mergeMap, shareReplay } from 'rxjs/operators';
+import { map, shareReplay } from 'rxjs/operators';
 
 @Injectable()
 export class DomainOmsService {
@@ -191,6 +188,10 @@ export class DomainOmsService {
     );
   }
 
+  getOrderSource(orderId: number): Observable<string> {
+    return this.getOrder(orderId).pipe(map((order) => order?.features?.orderSource));
+  }
+
   updateNotifications(orderId: number, changes: { selected: NotificationChannel; email: string; mobile: string }) {
     const communicationDetails = {
       email: changes.email,

apps/domain/package-inspection/src/lib/events.ts

@@ -0,0 +1,11 @@
+import { PackageArrivalStatusDTO } from '@swagger/wws';
+
+export abstract class PackageInspectionEvent {
+  constructor(public readonly type: string) {}
+}
+
+export class PackageStatusChangedEvent extends PackageInspectionEvent {
+  constructor(public readonly packageId: string, public readonly status: PackageArrivalStatusDTO) {
+    super('PackageStatusChangedEvent');
+  }
+}

apps/domain/package-inspection/src/lib/package-inspection.service.ts

@@ -1,10 +1,8 @@
 import { Injectable } from '@angular/core';
 import {
-  ListResponseArgsOfPackageDTO,
   ListResponseArgsOfPackageDTO2,
   PackageArrivalStatusDTO,
   PackageDetailResponseDTO,
-  PackageDTO,
   PackageDTO2,
   QuerySettingsDTO,
   QueryTokenDTO,
@@ -13,13 +11,18 @@ import {
   ResponseArgsOfQuerySettingsDTO,
   WareneingangService,
 } from '@swagger/wws';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Observable, Subject } from 'rxjs';
+import { map, tap } from 'rxjs/operators';
+import { PackageInspectionEvent, PackageStatusChangedEvent } from './events';
 
 @Injectable({
   providedIn: 'root',
 })
 export class DomainPackageInspectionService {
+  private _events = new Subject<PackageInspectionEvent>();
+
+  events = this._events.asObservable();
+
   constructor(private _wareneingang: WareneingangService) {}
 
   getQuerySettingsResponse(): Observable<ResponseArgsOfQuerySettingsDTO> {
@@ -47,23 +50,26 @@ export class DomainPackageInspectionService {
   }
 
   changePackageStatusResponse(pkg: PackageDTO2, modifier: string): Observable<ResponseArgsOfPackageArrivalStatusDTO> {
-    return this._wareneingang.WareneingangChangePackageStatus({
-      packageId: pkg.id,
-      payload: {
-        id: pkg.id,
-        annotation: pkg.annotation,
-        area: pkg.area,
-        arrivalChecked: pkg.arrivalChecked,
-        arrivalStatus: pkg.arrivalStatus,
-        deliveryNoteNumber: pkg.deliveryNoteNumber,
-        deliveryTarget: pkg.deliveryTarget,
-        estimatedDeliveryDate: pkg.estimatedDeliveryDate,
-        packageNumber: pkg.packageNumber,
-        supplier: pkg.supplier,
-        trackingNumber: pkg.trackingNumber,
-      },
-      modifier,
-    });
+    return this._wareneingang
+      .WareneingangChangePackageStatus({
+        packageId: pkg.id,
+        payload: {
+          id: pkg.id,
+          annotation: pkg.annotation,
+          area: pkg.area,
+          arrivalChecked: pkg.arrivalChecked,
+          arrivalStatus: pkg.arrivalStatus,
+          deliveryNoteNumber: pkg.deliveryNoteNumber,
+          deliveryTarget: pkg.deliveryTarget,
+          estimatedDeliveryDate: pkg.estimatedDeliveryDate,
+          packageNumber: pkg.packageNumber,
+          supplier: pkg.supplier,
+          trackingNumber: pkg.trackingNumber,
+          scanId: pkg.scanId,
+        },
+        modifier,
+      })
+      .pipe(tap((res) => this._events.next(new PackageStatusChangedEvent(pkg.id, res.result))));
   }
 
   changePackageStatus(pkg: PackageDTO2, modifier: string): Observable<PackageArrivalStatusDTO> {

apps/domain/package-inspection/src/public-api.ts

@@ -1,6 +1,6 @@
 /*
  * Public API Surface of package-inspection
  */
-
+export * from './lib/events';
 export * from './lib/package-inspection.service';
 export * from './lib/package-inspection.module';

apps/hub/notifications/src/lib/notifications.hub.ts

@@ -4,61 +4,118 @@ import { SignalrHub, SignalRHubOptions } from '@core/signalr';
 import { BehaviorSubject, merge, of } from 'rxjs';
 import { filter, map, shareReplay, tap, withLatestFrom } from 'rxjs/operators';
 import { EnvelopeDTO, MessageBoardItemDTO } from './defs';
+import { cloneDeep } from 'lodash';
 
 export const NOTIFICATIONS_HUB_OPTIONS = new InjectionToken<SignalRHubOptions>('hub.notifications.options');
 
 @Injectable()
 export class NotificationsHub extends SignalrHub {
-  updateNotification$ = new BehaviorSubject<MessageBoardItemDTO>(undefined);
-
   get branchNo() {
     return String(this._auth.getClaimByKey('branch_no') || this._auth.getClaimByKey('sub'));
   }
 
+  // get sessionStoragesessionStorageKey() {
+  //   return `NOTIFICATIONS_BOARD_${this.branchNo}`;
+  // }
+
   get sessionStoragesessionStorageKey() {
-    return `NOTIFICATIONS_BOARD_${this.branchNo}`;
+    return `NOTIFICATIONS_BOARD_AREA_${this.branchNo}`;
   }
 
+  messageBoardItems$ = new BehaviorSubject<Record<string, MessageBoardItemDTO[]>>({});
+
   constructor(@Inject(NOTIFICATIONS_HUB_OPTIONS) options: SignalRHubOptions, private _auth: AuthService) {
     super(options);
+
+    this.messageBoardItems$.next(this._getNotifications());
+
+    this.messageBoardItems$.subscribe((data) => {
+      this._storeNotifactions(data);
+    });
+
+    this.listen<EnvelopeDTO<MessageBoardItemDTO[]>>('messageBoard').subscribe((envelope) => {
+      if (envelope.action === 'refresh') {
+        this.refreshMessageBoardItems(envelope.target.area, envelope.data);
+      }
+    });
   }
 
-  notifications$ = merge(
-    of(this._getNotifications()).pipe(filter((f) => !!f)),
-    this.listen<EnvelopeDTO<MessageBoardItemDTO[]>>('messageBoard')
-  ).pipe(
-    withLatestFrom(this.updateNotification$),
-    map(([d, update]) => {
-      const data = d;
-      if (update && !!data && !data?.data?.find((message) => message?.category === 'ISA-Update')) {
-        data.data.push(update);
+  refreshMessageBoardItems(targetArea: string, messages: MessageBoardItemDTO[]) {
+    const current = cloneDeep(this.messageBoardItems$.value);
+
+    current[targetArea] = messages ?? [];
+
+    this.messageBoardItems$.next(current);
+  }
+
+  notifications$ = this.messageBoardItems$.asObservable().pipe(
+    map((data) => {
+      const messages = { ...data };
+      const keys = Object.keys(data);
+      for (let key of keys) {
+        if (data[key].length === 0 || data[key] === undefined) {
+          delete messages[key];
+        }
       }
-      return data;
-    }),
-    tap((data) => this._storeNotifactions(data)),
-    shareReplay(1)
+
+      return messages;
+    })
   );
 
-  private _storeNotifactions(data: EnvelopeDTO<MessageBoardItemDTO[]>) {
-    if (data) {
-      sessionStorage.setItem(this.sessionStoragesessionStorageKey, JSON.stringify(data));
-    }
-  }
+  // notifications$ = merge(
+  //   of(this._getNotifications()).pipe(filter((f) => !!f)),
+  //   this.listen<EnvelopeDTO<MessageBoardItemDTO[]>>('messageBoard')
+  // ).pipe(
+  //   withLatestFrom(this.updateNotification$),
+  //   map(([d, update]) => {
+  //     console.log('notifications$', d, update);
+  //     const data = d;
+  //     if (update && !!data && !data?.data?.find((message) => message?.category === 'ISA-Update')) {
+  //       data.data.push(update);
+  //     }
+  //     return data;
+  //   }),
+  //   tap((data) => this._storeNotifactions(data)),
+  //   shareReplay(1)
+  // );
 
-  private _getNotifications(): EnvelopeDTO<MessageBoardItemDTO[]> {
+  // private _storeNotifactions(data: EnvelopeDTO<MessageBoardItemDTO[]>) {
+  //   if (data) {
+  //     sessionStorage.setItem(this.sessionStoragesessionStorageKey, JSON.stringify(data));
+  //   }
+  // }
+
+  // private _getNotifications(): EnvelopeDTO<MessageBoardItemDTO[]> {
+  //   const stringData = sessionStorage.getItem(this.sessionStoragesessionStorageKey);
+  //   if (stringData) {
+  //     return JSON.parse(stringData);
+  //   }
+  //   return undefined;
+  // }
+
+  private _getNotifications(): Record<string, MessageBoardItemDTO[]> {
     const stringData = sessionStorage.getItem(this.sessionStoragesessionStorageKey);
     if (stringData) {
       return JSON.parse(stringData);
     }
-    return undefined;
+    return {};
+  }
+
+  private _storeNotifactions(data: Record<string, MessageBoardItemDTO[]>) {
+    if (data) {
+      delete data['messageBoard/isa-update'];
+      sessionStorage.setItem(this.sessionStoragesessionStorageKey, JSON.stringify(data));
+    }
   }
 
   updateNotification() {
-    this.updateNotification$.next({
-      category: 'ISA-Update',
-      type: 'update',
-      headline: 'Update Benachrichtigung',
-      text: 'Es steht eine aktuellere Version der ISA bereit. Bitte aktualisieren Sie die Anwendung.',
-    });
+    this.refreshMessageBoardItems('messageBoard/isa-update', [
+      {
+        category: 'ISA-Update',
+        type: 'update',
+        headline: 'Update Benachrichtigung',
+        text: 'Es steht eine aktuellere Version der ISA bereit. Bitte aktualisieren Sie die Anwendung.',
+      },
+    ]);
   }
 }

apps/isa-app/src/app/guards/is-authenticated.guard.ts

@@ -52,11 +52,7 @@ export class IsAuthenticatedGuard implements CanActivate {
       return undefined;
     }
 
-    const result = await this._scanService
-      .scan({
-        exclude: ['Dev'],
-      })
-      ?.toPromise();
+    const result = await this._scanService.scan()?.toPromise();
 
     if (typeof result === 'string') {
       try {

apps/isa-app/src/app/shell/shell.component.ts

@@ -29,7 +29,9 @@ export class ShellComponent {
 
   notifications$ = this._notificationsHub.notifications$;
 
-  notificationCount$ = this.notifications$.pipe(map((message) => message?.data?.length));
+  notificationCount$ = this.notifications$.pipe(
+    map((notifications) => Object.values(notifications).reduce((acc, val) => acc + val?.length ?? 0, 0))
+  );
 
   get activatedProcessId$() {
     return this._appService.getActivatedProcessId$().pipe(

apps/isa-app/src/assets/images/Icon_DR.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="18px" viewBox="0 0 22 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 52.2 (67145) - http://www.bohemiancoding.com/sketch -->
+    <title>Icon_HC</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Hugendubel_Icons" transform="translate(-29.000000, -177.000000)" fill="#000000" fill-rule="nonzero" stroke="#000000" stroke-width="0.3">
+            <path d="M32.725699,178.000628 C32.7430505,177.999791 32.7604307,177.999791 32.7777823,178.000628 L37.5260449,178.000628 C38.53109,178.000628 39.44018,178.547926 40.0000026,179.340692 C40.5598253,178.547926 41.4689153,178.000628 42.4739603,178.000628 L47.222223,178.000628 C47.529035,178.00066 47.7777477,178.256627 47.7777784,178.572389 L47.7777784,179.71591 L49.4444446,179.71591 C49.7512567,179.715942 49.9999694,179.971909 50,180.287671 L50,192.008763 C49.9999694,192.324524 49.7512567,192.580492 49.4444446,192.580523 L42.4739603,192.580523 C41.4766486,192.580523 40.8524541,192.949423 40.4947942,193.688309 C40.3998428,193.879608 40.208727,194 40.0000026,194 C39.7912783,194 39.6001624,193.879608 39.5052111,193.688309 C39.1475512,192.949423 38.5233566,192.580523 37.5260449,192.580523 L30.5555607,192.580523 C30.2487486,192.580492 30.0000359,192.324524 30.0000053,192.008763 L30.0000053,180.287671 C29.9987652,179.991708 30.2171687,179.743681 30.5034773,179.71591 C30.5208289,179.715072 30.5382091,179.715072 30.5555607,179.71591 L32.2222269,179.71591 L32.2222269,178.572389 C32.2209869,178.276426 32.4393904,178.028399 32.725699,178.000628 Z M33.3333377,179.14415 L33.3333377,189.43584 L36.6232674,189.43584 C37.6190746,189.43584 38.5547188,189.729711 39.2621556,190.356017 C39.3270606,190.413476 39.3849347,190.480265 39.4444472,190.543626 L39.4444472,180.957703 C39.4433388,180.936873 39.4433388,180.915996 39.4444472,180.895166 C39.4444472,180.068361 38.4768339,179.14415 37.5260449,179.14415 L33.3333377,179.14415 Z M42.4739603,179.14415 C41.5231714,179.14415 40.555558,180.068361 40.555558,180.895166 C40.5555806,180.898144 40.5555806,180.901122 40.555558,180.9041 L40.555558,190.543626 C40.6150705,190.480265 40.6729447,190.413476 40.7378497,190.356017 C41.4452864,189.729711 42.3809306,189.43584 43.3767379,189.43584 L46.6666675,189.43584 L46.6666675,179.14415 L42.4739603,179.14415 Z M31.1111161,180.859431 L31.1111161,191.437002 L37.5260449,191.437002 C38.0365968,191.437002 38.5189494,191.531483 38.9496557,191.713949 C38.8273679,191.527334 38.6888269,191.36055 38.5329891,191.222592 C38.0547048,190.799175 37.405738,190.579361 36.6232674,190.579361 L32.7777823,190.579361 C32.4709702,190.57933 32.2222575,190.323362 32.2222269,190.007601 L32.2222269,180.859431 L31.1111161,180.859431 Z M47.7777784,180.859431 L47.7777784,190.007601 C47.7777477,190.323362 47.529035,190.57933 47.222223,190.579361 L43.3767379,190.579361 C42.5942672,190.579361 41.9453004,190.799175 41.4670161,191.222592 C41.3107359,191.360944 41.1725734,191.526903 41.0503496,191.713949 C41.4810558,191.531483 41.9634085,191.437002 42.4739603,191.437002 L48.8888892,191.437002 L48.8888892,180.859431 L47.7777784,180.859431 Z M35.5,182.116677 L37.5,182.116677 C37.7761424,182.116677 38,182.340535 38,182.616677 L38,182.645847 C38,182.921989 37.7761424,183.145847 37.5,183.145847 L35.5,183.145847 C35.2238576,183.145847 35,182.921989 35,182.645847 L35,182.616677 C35,182.340535 35.2238576,182.116677 35.5,182.116677 Z M35.5,184.175016 L37.5,184.175016 C37.7761424,184.175016 38,184.398874 38,184.675016 L38,184.704185 C38,184.980328 37.7761424,185.204185 37.5,185.204185 L35.5,185.204185 C35.2238576,185.204185 35,184.980328 35,184.704185 L35,184.675016 C35,184.398874 35.2238576,184.175016 35.5,184.175016 Z M35.5,186.233355 L37.5,186.233355 C37.7761424,186.233355 38,186.457212 38,186.733355 L38,186.762524 C38,187.038666 37.7761424,187.262524 37.5,187.262524 L35.5,187.262524 C35.2238576,187.262524 35,187.038666 35,186.762524 L35,186.733355 C35,186.457212 35.2238576,186.233355 35.5,186.233355 Z M42.5,182.116677 L44.5,182.116677 C44.7761424,182.116677 45,182.340535 45,182.616677 L45,182.645847 C45,182.921989 44.7761424,183.145847 44.5,183.145847 L42.5,183.145847 C42.2238576,183.145847 42,182.921989 42,182.645847 L42,182.616677 C42,182.340535 42.2238576,182.116677 42.5,182.116677 Z M42.5,184.175016 L44.5,184.175016 C44.7761424,184.175016 45,184.398874 45,184.675016 L45,184.704185 C45,184.980328 44.7761424,185.204185 44.5,185.204185 L42.5,185.204185 C42.2238576,185.204185 42,184.980328 42,184.704185 L42,184.675016 C42,184.398874 42.2238576,184.175016 42.5,184.175016 Z M42.5,186.233355 L44.5,186.233355 C44.7761424,186.233355 45,186.457212 45,186.733355 L45,186.762524 C45,187.038666 44.7761424,187.262524 44.5,187.262524 L42.5,187.262524 C42.2238576,187.262524 42,187.038666 42,186.762524 L42,186.733355 C42,186.457212 42.2238576,186.233355 42.5,186.233355 Z" id="Icon_HC"></path>
+        </g>
+    </g>
+</svg>

apps/isa-app/src/assets/images/Icon_GEH.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="18px" viewBox="0 0 22 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 52.2 (67145) - http://www.bohemiancoding.com/sketch -->
+    <title>Icon_HC</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Hugendubel_Icons" transform="translate(-29.000000, -177.000000)" fill="#000000" fill-rule="nonzero" stroke="#000000" stroke-width="0.3">
+            <path d="M32.725699,178.000628 C32.7430505,177.999791 32.7604307,177.999791 32.7777823,178.000628 L37.5260449,178.000628 C38.53109,178.000628 39.44018,178.547926 40.0000026,179.340692 C40.5598253,178.547926 41.4689153,178.000628 42.4739603,178.000628 L47.222223,178.000628 C47.529035,178.00066 47.7777477,178.256627 47.7777784,178.572389 L47.7777784,179.71591 L49.4444446,179.71591 C49.7512567,179.715942 49.9999694,179.971909 50,180.287671 L50,192.008763 C49.9999694,192.324524 49.7512567,192.580492 49.4444446,192.580523 L42.4739603,192.580523 C41.4766486,192.580523 40.8524541,192.949423 40.4947942,193.688309 C40.3998428,193.879608 40.208727,194 40.0000026,194 C39.7912783,194 39.6001624,193.879608 39.5052111,193.688309 C39.1475512,192.949423 38.5233566,192.580523 37.5260449,192.580523 L30.5555607,192.580523 C30.2487486,192.580492 30.0000359,192.324524 30.0000053,192.008763 L30.0000053,180.287671 C29.9987652,179.991708 30.2171687,179.743681 30.5034773,179.71591 C30.5208289,179.715072 30.5382091,179.715072 30.5555607,179.71591 L32.2222269,179.71591 L32.2222269,178.572389 C32.2209869,178.276426 32.4393904,178.028399 32.725699,178.000628 Z M33.3333377,179.14415 L33.3333377,189.43584 L36.6232674,189.43584 C37.6190746,189.43584 38.5547188,189.729711 39.2621556,190.356017 C39.3270606,190.413476 39.3849347,190.480265 39.4444472,190.543626 L39.4444472,180.957703 C39.4433388,180.936873 39.4433388,180.915996 39.4444472,180.895166 C39.4444472,180.068361 38.4768339,179.14415 37.5260449,179.14415 L33.3333377,179.14415 Z M42.4739603,179.14415 C41.5231714,179.14415 40.555558,180.068361 40.555558,180.895166 C40.5555806,180.898144 40.5555806,180.901122 40.555558,180.9041 L40.555558,190.543626 C40.6150705,190.480265 40.6729447,190.413476 40.7378497,190.356017 C41.4452864,189.729711 42.3809306,189.43584 43.3767379,189.43584 L46.6666675,189.43584 L46.6666675,179.14415 L42.4739603,179.14415 Z M31.1111161,180.859431 L31.1111161,191.437002 L37.5260449,191.437002 C38.0365968,191.437002 38.5189494,191.531483 38.9496557,191.713949 C38.8273679,191.527334 38.6888269,191.36055 38.5329891,191.222592 C38.0547048,190.799175 37.405738,190.579361 36.6232674,190.579361 L32.7777823,190.579361 C32.4709702,190.57933 32.2222575,190.323362 32.2222269,190.007601 L32.2222269,180.859431 L31.1111161,180.859431 Z M47.7777784,180.859431 L47.7777784,190.007601 C47.7777477,190.323362 47.529035,190.57933 47.222223,190.579361 L43.3767379,190.579361 C42.5942672,190.579361 41.9453004,190.799175 41.4670161,191.222592 C41.3107359,191.360944 41.1725734,191.526903 41.0503496,191.713949 C41.4810558,191.531483 41.9634085,191.437002 42.4739603,191.437002 L48.8888892,191.437002 L48.8888892,180.859431 L47.7777784,180.859431 Z M35.5,182.116677 L37.5,182.116677 C37.7761424,182.116677 38,182.340535 38,182.616677 L38,182.645847 C38,182.921989 37.7761424,183.145847 37.5,183.145847 L35.5,183.145847 C35.2238576,183.145847 35,182.921989 35,182.645847 L35,182.616677 C35,182.340535 35.2238576,182.116677 35.5,182.116677 Z M35.5,184.175016 L37.5,184.175016 C37.7761424,184.175016 38,184.398874 38,184.675016 L38,184.704185 C38,184.980328 37.7761424,185.204185 37.5,185.204185 L35.5,185.204185 C35.2238576,185.204185 35,184.980328 35,184.704185 L35,184.675016 C35,184.398874 35.2238576,184.175016 35.5,184.175016 Z M35.5,186.233355 L37.5,186.233355 C37.7761424,186.233355 38,186.457212 38,186.733355 L38,186.762524 C38,187.038666 37.7761424,187.262524 37.5,187.262524 L35.5,187.262524 C35.2238576,187.262524 35,187.038666 35,186.762524 L35,186.733355 C35,186.457212 35.2238576,186.233355 35.5,186.233355 Z M42.5,182.116677 L44.5,182.116677 C44.7761424,182.116677 45,182.340535 45,182.616677 L45,182.645847 C45,182.921989 44.7761424,183.145847 44.5,183.145847 L42.5,183.145847 C42.2238576,183.145847 42,182.921989 42,182.645847 L42,182.616677 C42,182.340535 42.2238576,182.116677 42.5,182.116677 Z M42.5,184.175016 L44.5,184.175016 C44.7761424,184.175016 45,184.398874 45,184.675016 L45,184.704185 C45,184.980328 44.7761424,185.204185 44.5,185.204185 L42.5,185.204185 C42.2238576,185.204185 42,184.980328 42,184.704185 L42,184.675016 C42,184.398874 42.2238576,184.175016 42.5,184.175016 Z M42.5,186.233355 L44.5,186.233355 C44.7761424,186.233355 45,186.457212 45,186.733355 L45,186.762524 C45,187.038666 44.7761424,187.262524 44.5,187.262524 L42.5,187.262524 C42.2238576,187.262524 42,187.038666 42,186.762524 L42,186.733355 C42,186.457212 42.2238576,186.233355 42.5,186.233355 Z" id="Icon_HC"></path>
+        </g>
+    </g>
+</svg>

apps/isa-app/src/assets/images/Icon_PP.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="18px" viewBox="0 0 22 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 52.2 (67145) - http://www.bohemiancoding.com/sketch -->
+    <title>Icon_HC</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Hugendubel_Icons" transform="translate(-29.000000, -177.000000)" fill="#000000" fill-rule="nonzero" stroke="#000000" stroke-width="0.3">
+            <path d="M32.725699,178.000628 C32.7430505,177.999791 32.7604307,177.999791 32.7777823,178.000628 L37.5260449,178.000628 C38.53109,178.000628 39.44018,178.547926 40.0000026,179.340692 C40.5598253,178.547926 41.4689153,178.000628 42.4739603,178.000628 L47.222223,178.000628 C47.529035,178.00066 47.7777477,178.256627 47.7777784,178.572389 L47.7777784,179.71591 L49.4444446,179.71591 C49.7512567,179.715942 49.9999694,179.971909 50,180.287671 L50,192.008763 C49.9999694,192.324524 49.7512567,192.580492 49.4444446,192.580523 L42.4739603,192.580523 C41.4766486,192.580523 40.8524541,192.949423 40.4947942,193.688309 C40.3998428,193.879608 40.208727,194 40.0000026,194 C39.7912783,194 39.6001624,193.879608 39.5052111,193.688309 C39.1475512,192.949423 38.5233566,192.580523 37.5260449,192.580523 L30.5555607,192.580523 C30.2487486,192.580492 30.0000359,192.324524 30.0000053,192.008763 L30.0000053,180.287671 C29.9987652,179.991708 30.2171687,179.743681 30.5034773,179.71591 C30.5208289,179.715072 30.5382091,179.715072 30.5555607,179.71591 L32.2222269,179.71591 L32.2222269,178.572389 C32.2209869,178.276426 32.4393904,178.028399 32.725699,178.000628 Z M33.3333377,179.14415 L33.3333377,189.43584 L36.6232674,189.43584 C37.6190746,189.43584 38.5547188,189.729711 39.2621556,190.356017 C39.3270606,190.413476 39.3849347,190.480265 39.4444472,190.543626 L39.4444472,180.957703 C39.4433388,180.936873 39.4433388,180.915996 39.4444472,180.895166 C39.4444472,180.068361 38.4768339,179.14415 37.5260449,179.14415 L33.3333377,179.14415 Z M42.4739603,179.14415 C41.5231714,179.14415 40.555558,180.068361 40.555558,180.895166 C40.5555806,180.898144 40.5555806,180.901122 40.555558,180.9041 L40.555558,190.543626 C40.6150705,190.480265 40.6729447,190.413476 40.7378497,190.356017 C41.4452864,189.729711 42.3809306,189.43584 43.3767379,189.43584 L46.6666675,189.43584 L46.6666675,179.14415 L42.4739603,179.14415 Z M31.1111161,180.859431 L31.1111161,191.437002 L37.5260449,191.437002 C38.0365968,191.437002 38.5189494,191.531483 38.9496557,191.713949 C38.8273679,191.527334 38.6888269,191.36055 38.5329891,191.222592 C38.0547048,190.799175 37.405738,190.579361 36.6232674,190.579361 L32.7777823,190.579361 C32.4709702,190.57933 32.2222575,190.323362 32.2222269,190.007601 L32.2222269,180.859431 L31.1111161,180.859431 Z M47.7777784,180.859431 L47.7777784,190.007601 C47.7777477,190.323362 47.529035,190.57933 47.222223,190.579361 L43.3767379,190.579361 C42.5942672,190.579361 41.9453004,190.799175 41.4670161,191.222592 C41.3107359,191.360944 41.1725734,191.526903 41.0503496,191.713949 C41.4810558,191.531483 41.9634085,191.437002 42.4739603,191.437002 L48.8888892,191.437002 L48.8888892,180.859431 L47.7777784,180.859431 Z M35.5,182.116677 L37.5,182.116677 C37.7761424,182.116677 38,182.340535 38,182.616677 L38,182.645847 C38,182.921989 37.7761424,183.145847 37.5,183.145847 L35.5,183.145847 C35.2238576,183.145847 35,182.921989 35,182.645847 L35,182.616677 C35,182.340535 35.2238576,182.116677 35.5,182.116677 Z M35.5,184.175016 L37.5,184.175016 C37.7761424,184.175016 38,184.398874 38,184.675016 L38,184.704185 C38,184.980328 37.7761424,185.204185 37.5,185.204185 L35.5,185.204185 C35.2238576,185.204185 35,184.980328 35,184.704185 L35,184.675016 C35,184.398874 35.2238576,184.175016 35.5,184.175016 Z M35.5,186.233355 L37.5,186.233355 C37.7761424,186.233355 38,186.457212 38,186.733355 L38,186.762524 C38,187.038666 37.7761424,187.262524 37.5,187.262524 L35.5,187.262524 C35.2238576,187.262524 35,187.038666 35,186.762524 L35,186.733355 C35,186.457212 35.2238576,186.233355 35.5,186.233355 Z M42.5,182.116677 L44.5,182.116677 C44.7761424,182.116677 45,182.340535 45,182.616677 L45,182.645847 C45,182.921989 44.7761424,183.145847 44.5,183.145847 L42.5,183.145847 C42.2238576,183.145847 42,182.921989 42,182.645847 L42,182.616677 C42,182.340535 42.2238576,182.116677 42.5,182.116677 Z M42.5,184.175016 L44.5,184.175016 C44.7761424,184.175016 45,184.398874 45,184.675016 L45,184.704185 C45,184.980328 44.7761424,185.204185 44.5,185.204185 L42.5,185.204185 C42.2238576,185.204185 42,184.980328 42,184.704185 L42,184.675016 C42,184.398874 42.2238576,184.175016 42.5,184.175016 Z M42.5,186.233355 L44.5,186.233355 C44.7761424,186.233355 45,186.457212 45,186.733355 L45,186.762524 C45,187.038666 44.7761424,187.262524 44.5,187.262524 L42.5,187.262524 C42.2238576,187.262524 42,187.038666 42,186.762524 L42,186.733355 C42,186.457212 42.2238576,186.233355 42.5,186.233355 Z" id="Icon_HC"></path>
+        </g>
+    </g>
+</svg>

apps/isa-app/src/config/config.feature.json

@@ -69,6 +69,6 @@
     },
     "checkForUpdates": 3600000,
     "licence": {
-        "scandit": "AQZyKCc+BEkNL00Y3h3FjawGLF+INUj7cVb0My91hl8ffiW873T8FTV1k4TIZJx5RwcJlYxhgsxHVcnM4AJgSwJhbAfxJmP/3XGijLlLp3XUIRjQwFtf7UlZAFZ7Vrt1/WSf7kxxrFQ2SE2AQwLqPg9DL+hHEfd4xT/15n8p2q7qUlCKLsV6jF12Pd7koFNSWNL3ZIkRtd1ma99/321dnwAJHFGXqWg5nprJ7sYtqUqNQ8Er9SlvKbhnw3AipHzKpz0O3oNfUsr6NlZivRBhMhCZLo5WpXo1m9uIU8zLEWMNDJ+wGUctcGxE3eCptP2zLXUgxxjB+0EXOUtT/GWUc/Ip61CMiyUf7Paz026E2eYil2yWgfkTP5CUgDMNGZFuAA1T5PhB9FRW51CjAIvwOKVMCvfixJiVoUsXHnWH2ZnXqtbDR/uEZBE7OKoBlaPL4G3Lvgdqym5EjROAztUXb6wOmVDiGzzqgizyZnIcxFBSKJAownGj9Vh4/Y/Ag1xzGzNtjz3ngSRfMfIIq/q2Q51uiLiv7mBVliPvPWMUTfTjnqnK/OSBlR2ID+COJqnUKpQMedPyOT3IMznmM6gQCmyYO5KE0MkfhFh6+pdNi6oJM2iZsxK1Z1V+GRSOIwrJEoajjDJkh439XjXk8NExFvplrLjK/oL/dsHIZiG6U5GVWW92kGkuXkJCeUz1CET3paxbGqwrd53r5d6gFABbC12CtcP2JeH4YYCpHYyPQacf0prj9Hdq3wDztShC9tH+4UQS/GbaDHKcS1ANIyPuTxHmBFtPuCJ9Uagy5QBEc8eAz2nfsbfaUxYzco6u/zhNsFbqp6zgQIxs5OcqDQ=="
+        "scandit": "AZ7zLw2eLmFWHbYP4RDq8VAEgAxmNGYcPU8YpOc3DryEXj4zMzYQFrQuUm0YewGQYEESXjpRwGX1NYmKY3pXHnAn2DeqIzh2an+FUu9socQlbQnJiHJHoWBAqcqWSua+P12tc95P3s9aaEEYvSjUy7Md88f7N+sk6zZbUmqbMXeXqmZwdkmRoUY/2w0CiiiA4gBFHgu4sMeNQ9dWyfxKTUPf5AnsxnuYpCt5KLxJWSYDv8HHj0mx8DCJTe1m2ony97Lge3JbJ5Dd+Zz6SCwqik7fv53Qole9s/3m66lYFWKAzWRKkHN1zts78CmPxPb+AAHVoqlBM3duvYmnCxxGOmlXabKUNuDR2ExaMu/nlo532jqqy25Cet/FP1UAs96ZGRgzEcHxGPp6kA53lJ15zd+cxz6G93E83AmYJkhddXBQElWEaGtQRfrEzRGmvcksR+V8MMYjGmhkVbQxGGqpnfP4IxbuEFcef6bxxTiulzo75gXoqZTt+7C1qpDcrMM3Yp0Z8RBw3JlV2tLk4FYFZpxY8QrXIcjvRYKExtQ9e5sSbST4Vx95YhEUd6iX0SBPDzcmgR4/Ef6gvJfoWgz68+rqhBGckphdHi2Mf/pYuAlh2jbwtrkErE2xWARBejR/UcU/A3F7k9RkFd5/QZC7qhsE6bZH7uhpkptIbi5XkXagwYy1oJD7yJs4VLOJteYWferRm8h1auxXew5tL8VLHciF+lLj6h8PTUDt2blLgUjHtualqlCwdSTzJyYwk4oswGGDk6E48X7LXpzuhtR8TYTOi2REN0uuTbO/slFBRw+CaYUnD0LjB9p2lb8ndcdV9adzBKmwPxiOtlOELQ=="
     }
 }

apps/isa-app/src/config/config.integration.json

@@ -68,6 +68,6 @@
   },
   "checkForUpdates": 3600000,
   "licence": {
-    "scandit": "AQZyKCc+BEkNL00Y3h3FjawGLF+INUj7cVb0My91hl8ffiW873T8FTV1k4TIZJx5RwcJlYxhgsxHVcnM4AJgSwJhbAfxJmP/3XGijLlLp3XUIRjQwFtf7UlZAFZ7Vrt1/WSf7kxxrFQ2SE2AQwLqPg9DL+hHEfd4xT/15n8p2q7qUlCKLsV6jF12Pd7koFNSWNL3ZIkRtd1ma99/321dnwAJHFGXqWg5nprJ7sYtqUqNQ8Er9SlvKbhnw3AipHzKpz0O3oNfUsr6NlZivRBhMhCZLo5WpXo1m9uIU8zLEWMNDJ+wGUctcGxE3eCptP2zLXUgxxjB+0EXOUtT/GWUc/Ip61CMiyUf7Paz026E2eYil2yWgfkTP5CUgDMNGZFuAA1T5PhB9FRW51CjAIvwOKVMCvfixJiVoUsXHnWH2ZnXqtbDR/uEZBE7OKoBlaPL4G3Lvgdqym5EjROAztUXb6wOmVDiGzzqgizyZnIcxFBSKJAownGj9Vh4/Y/Ag1xzGzNtjz3ngSRfMfIIq/q2Q51uiLiv7mBVliPvPWMUTfTjnqnK/OSBlR2ID+COJqnUKpQMedPyOT3IMznmM6gQCmyYO5KE0MkfhFh6+pdNi6oJM2iZsxK1Z1V+GRSOIwrJEoajjDJkh439XjXk8NExFvplrLjK/oL/dsHIZiG6U5GVWW92kGkuXkJCeUz1CET3paxbGqwrd53r5d6gFABbC12CtcP2JeH4YYCpHYyPQacf0prj9Hdq3wDztShC9tH+4UQS/GbaDHKcS1ANIyPuTxHmBFtPuCJ9Uagy5QBEc8eAz2nfsbfaUxYzco6u/zhNsFbqp6zgQIxs5OcqDQ=="
+    "scandit": "AZ7zLw2eLmFWHbYP4RDq8VAEgAxmNGYcPU8YpOc3DryEXj4zMzYQFrQuUm0YewGQYEESXjpRwGX1NYmKY3pXHnAn2DeqIzh2an+FUu9socQlbQnJiHJHoWBAqcqWSua+P12tc95P3s9aaEEYvSjUy7Md88f7N+sk6zZbUmqbMXeXqmZwdkmRoUY/2w0CiiiA4gBFHgu4sMeNQ9dWyfxKTUPf5AnsxnuYpCt5KLxJWSYDv8HHj0mx8DCJTe1m2ony97Lge3JbJ5Dd+Zz6SCwqik7fv53Qole9s/3m66lYFWKAzWRKkHN1zts78CmPxPb+AAHVoqlBM3duvYmnCxxGOmlXabKUNuDR2ExaMu/nlo532jqqy25Cet/FP1UAs96ZGRgzEcHxGPp6kA53lJ15zd+cxz6G93E83AmYJkhddXBQElWEaGtQRfrEzRGmvcksR+V8MMYjGmhkVbQxGGqpnfP4IxbuEFcef6bxxTiulzo75gXoqZTt+7C1qpDcrMM3Yp0Z8RBw3JlV2tLk4FYFZpxY8QrXIcjvRYKExtQ9e5sSbST4Vx95YhEUd6iX0SBPDzcmgR4/Ef6gvJfoWgz68+rqhBGckphdHi2Mf/pYuAlh2jbwtrkErE2xWARBejR/UcU/A3F7k9RkFd5/QZC7qhsE6bZH7uhpkptIbi5XkXagwYy1oJD7yJs4VLOJteYWferRm8h1auxXew5tL8VLHciF+lLj6h8PTUDt2blLgUjHtualqlCwdSTzJyYwk4oswGGDk6E48X7LXpzuhtR8TYTOi2REN0uuTbO/slFBRw+CaYUnD0LjB9p2lb8ndcdV9adzBKmwPxiOtlOELQ=="
   }
 }

apps/isa-app/src/config/config.json

@@ -70,6 +70,6 @@
     },
     "checkForUpdates": 3600000,
     "licence": {
-        "scandit": "AQZyKCc+BEkNL00Y3h3FjawGLF+INUj7cVb0My91hl8ffiW873T8FTV1k4TIZJx5RwcJlYxhgsxHVcnM4AJgSwJhbAfxJmP/3XGijLlLp3XUIRjQwFtf7UlZAFZ7Vrt1/WSf7kxxrFQ2SE2AQwLqPg9DL+hHEfd4xT/15n8p2q7qUlCKLsV6jF12Pd7koFNSWNL3ZIkRtd1ma99/321dnwAJHFGXqWg5nprJ7sYtqUqNQ8Er9SlvKbhnw3AipHzKpz0O3oNfUsr6NlZivRBhMhCZLo5WpXo1m9uIU8zLEWMNDJ+wGUctcGxE3eCptP2zLXUgxxjB+0EXOUtT/GWUc/Ip61CMiyUf7Paz026E2eYil2yWgfkTP5CUgDMNGZFuAA1T5PhB9FRW51CjAIvwOKVMCvfixJiVoUsXHnWH2ZnXqtbDR/uEZBE7OKoBlaPL4G3Lvgdqym5EjROAztUXb6wOmVDiGzzqgizyZnIcxFBSKJAownGj9Vh4/Y/Ag1xzGzNtjz3ngSRfMfIIq/q2Q51uiLiv7mBVliPvPWMUTfTjnqnK/OSBlR2ID+COJqnUKpQMedPyOT3IMznmM6gQCmyYO5KE0MkfhFh6+pdNi6oJM2iZsxK1Z1V+GRSOIwrJEoajjDJkh439XjXk8NExFvplrLjK/oL/dsHIZiG6U5GVWW92kGkuXkJCeUz1CET3paxbGqwrd53r5d6gFABbC12CtcP2JeH4YYCpHYyPQacf0prj9Hdq3wDztShC9tH+4UQS/GbaDHKcS1ANIyPuTxHmBFtPuCJ9Uagy5QBEc8eAz2nfsbfaUxYzco6u/zhNsFbqp6zgQIxs5OcqDQ=="
+        "scandit": "AZ7zLw2eLmFWHbYP4RDq8VAEgAxmNGYcPU8YpOc3DryEXj4zMzYQFrQuUm0YewGQYEESXjpRwGX1NYmKY3pXHnAn2DeqIzh2an+FUu9socQlbQnJiHJHoWBAqcqWSua+P12tc95P3s9aaEEYvSjUy7Md88f7N+sk6zZbUmqbMXeXqmZwdkmRoUY/2w0CiiiA4gBFHgu4sMeNQ9dWyfxKTUPf5AnsxnuYpCt5KLxJWSYDv8HHj0mx8DCJTe1m2ony97Lge3JbJ5Dd+Zz6SCwqik7fv53Qole9s/3m66lYFWKAzWRKkHN1zts78CmPxPb+AAHVoqlBM3duvYmnCxxGOmlXabKUNuDR2ExaMu/nlo532jqqy25Cet/FP1UAs96ZGRgzEcHxGPp6kA53lJ15zd+cxz6G93E83AmYJkhddXBQElWEaGtQRfrEzRGmvcksR+V8MMYjGmhkVbQxGGqpnfP4IxbuEFcef6bxxTiulzo75gXoqZTt+7C1qpDcrMM3Yp0Z8RBw3JlV2tLk4FYFZpxY8QrXIcjvRYKExtQ9e5sSbST4Vx95YhEUd6iX0SBPDzcmgR4/Ef6gvJfoWgz68+rqhBGckphdHi2Mf/pYuAlh2jbwtrkErE2xWARBejR/UcU/A3F7k9RkFd5/QZC7qhsE6bZH7uhpkptIbi5XkXagwYy1oJD7yJs4VLOJteYWferRm8h1auxXew5tL8VLHciF+lLj6h8PTUDt2blLgUjHtualqlCwdSTzJyYwk4oswGGDk6E48X7LXpzuhtR8TYTOi2REN0uuTbO/slFBRw+CaYUnD0LjB9p2lb8ndcdV9adzBKmwPxiOtlOELQ=="
     }
 }

apps/isa-app/src/config/config.production.json

@@ -69,6 +69,6 @@
   },
   "checkForUpdates": 3600000,
   "licence": {
-    "scandit": "AfHi/mY+RbwJD5nC7SuWn3I14pFUOfSbQ2QG//4aV3zWQjwix30kHqsqraA8ZiipDBql8YlwIyV6VPBMUiAX4s9YHDxHHsWwq2BUB3ImzDEcU1jmMH/5yakGUYpCQ68D0iZ8SG9sS0QBb3iFdCHc1r9DFr1cMTxM7zOvb/AUoIVmieHZXnx9ioUgCvczsLiuX3hwvTW3lhbvJ4uUyqTWK4sWFVwoY4AIWSFrPwwrkV2DksMKT5fMJT3GWgPypvTIGwWvpRfLWwKlc1Z3ckyb84khsnaWD2wr+hdgu/K8YIMmgGszm5KIZ/G05YfDNZtQ4jby+5RZvQwWR8rxM35rJgf73OkMSpuL9jw3T0TTAlvpkGRLzVVuCw9VjlBLqfPNEZ6VsEwFuAla9IYUvFHCsjypg2J6UpxHXrTYmbsSu5Jm8frVfS5znPPTO9D/4rF6ZVv2PxY9PgUgJUvwMa/VMc/nse3RRRf8RGT4rUItfJDFO8pujD76vVEWq/KixQRoMdLgDLyxhsFVftkxqhZhyEfFZzsEy49LSojJ28vpHpBWLeCQBmnZ7JZ4C5yOQiqSQV/assBq2zJN2q+vCDp8qy5j1rED1SX5Ec7JpgpgnU4chLIf5Zn7bP/hNGT3pEYBuXeDXXN8ke1pcc3fc3m0FysDG0o56XVCUqImZ8Ezi8eujZciKDrWbtljhKTj7cnfuJx0sVHF6Bh5i4YfgA/Z+NL+MtH2EVIF67e6hEz6PWYTcoh3ybBaJfxb2FNvGJutNKg04GwMhYq6K2IddBt0fDiBt0SGM0oSBlUP3DKCUmXcf2a6ASbrcqv6Wz1jHt0pY4U8bEpg7qSbW3VDyvdPgyQ="
+    "scandit": "AZZzfQ+eLFl3Dzf1QSBag1lDibIoOPh4W33erRIRe3SDUMkHDX8eczEjd2TnfRMWoE5lXOBGtESCWICN9EbrmI1S9Lu5APsvvEOD+K54ADwIVawx0HNZRAc8/+9Vf/izcEGOFQFGBQJyR6vzdzFv5HcjznhxI9E3LiF+uVQPtCqsVYzpkMWIrC5VCg2uwNrj9Bw6f8zYi/lZPrDMS5yVKVcajeK7sh9QAq17dR0opjIIuP5t5nDEJ7hnITwtTR5HaM6cX/KhKpTILOgKexvLYqrK6QJWpU85sDwqwn6T7av4V68qL3XrUo60dScop4QsvraQe1HkRsffl6DkAEoX0RNMS5qVWjGerW7lvA/DQd9hsAO3jWFDR9hVDyt2VvmzzFKnHYqTYxC5qG4bCEJ0RJjy6tEP5Q7vL5SxWygVadmjPv+TwDOCS7DxzxIjcO+BXQY7gW6qn0hx9fXzyvO3avrGWqyImMlgEApZq+36ANqtRcPD/stEe4i0N9dSPhYoHPcc/9/9jpts43FozlgfY4wY8Wt5ybB3X0caISMmB/klFIJKKN7num439z3+Xk7ENB/Xvb0XAtnOt/cuxQYsGQ7fb62GOO/7Va5fdE9ZfaIJsS5ToE6oIbV04pLUssJf9cUMsyPFVELYSJmyGPQQFRz0TTxxRvPapIWrfa2x5x3hYUpNTAdY3v0fN9l/1ZqNSBmIBLH/LoXaVJQ2DydGD1/QFZ2Z/S7zTYKg5/cSEpUgiYtbwutNZSjRH29ucSizC524k+Zst95T8G7LJaWCT8SQAcKXqCnjpiEGWzD++h0jXjn6BWjUnIHi0te+27vF/z6UQL00sWco5hUIqF66EiU="
   }
 }

apps/isa-app/src/config/config.staging.json

@@ -69,6 +69,6 @@
   },
   "checkForUpdates": 3600000,
   "licence": {
-    "scandit": "AfHi/mY+RbwJD5nC7SuWn3I14pFUOfSbQ2QG//4aV3zWQjwix30kHqsqraA8ZiipDBql8YlwIyV6VPBMUiAX4s9YHDxHHsWwq2BUB3ImzDEcU1jmMH/5yakGUYpCQ68D0iZ8SG9sS0QBb3iFdCHc1r9DFr1cMTxM7zOvb/AUoIVmieHZXnx9ioUgCvczsLiuX3hwvTW3lhbvJ4uUyqTWK4sWFVwoY4AIWSFrPwwrkV2DksMKT5fMJT3GWgPypvTIGwWvpRfLWwKlc1Z3ckyb84khsnaWD2wr+hdgu/K8YIMmgGszm5KIZ/G05YfDNZtQ4jby+5RZvQwWR8rxM35rJgf73OkMSpuL9jw3T0TTAlvpkGRLzVVuCw9VjlBLqfPNEZ6VsEwFuAla9IYUvFHCsjypg2J6UpxHXrTYmbsSu5Jm8frVfS5znPPTO9D/4rF6ZVv2PxY9PgUgJUvwMa/VMc/nse3RRRf8RGT4rUItfJDFO8pujD76vVEWq/KixQRoMdLgDLyxhsFVftkxqhZhyEfFZzsEy49LSojJ28vpHpBWLeCQBmnZ7JZ4C5yOQiqSQV/assBq2zJN2q+vCDp8qy5j1rED1SX5Ec7JpgpgnU4chLIf5Zn7bP/hNGT3pEYBuXeDXXN8ke1pcc3fc3m0FysDG0o56XVCUqImZ8Ezi8eujZciKDrWbtljhKTj7cnfuJx0sVHF6Bh5i4YfgA/Z+NL+MtH2EVIF67e6hEz6PWYTcoh3ybBaJfxb2FNvGJutNKg04GwMhYq6K2IddBt0fDiBt0SGM0oSBlUP3DKCUmXcf2a6ASbrcqv6Wz1jHt0pY4U8bEpg7qSbW3VDyvdPgyQ="
+    "scandit": "AZZzfQ+eLFl3Dzf1QSBag1lDibIoOPh4W33erRIRe3SDUMkHDX8eczEjd2TnfRMWoE5lXOBGtESCWICN9EbrmI1S9Lu5APsvvEOD+K54ADwIVawx0HNZRAc8/+9Vf/izcEGOFQFGBQJyR6vzdzFv5HcjznhxI9E3LiF+uVQPtCqsVYzpkMWIrC5VCg2uwNrj9Bw6f8zYi/lZPrDMS5yVKVcajeK7sh9QAq17dR0opjIIuP5t5nDEJ7hnITwtTR5HaM6cX/KhKpTILOgKexvLYqrK6QJWpU85sDwqwn6T7av4V68qL3XrUo60dScop4QsvraQe1HkRsffl6DkAEoX0RNMS5qVWjGerW7lvA/DQd9hsAO3jWFDR9hVDyt2VvmzzFKnHYqTYxC5qG4bCEJ0RJjy6tEP5Q7vL5SxWygVadmjPv+TwDOCS7DxzxIjcO+BXQY7gW6qn0hx9fXzyvO3avrGWqyImMlgEApZq+36ANqtRcPD/stEe4i0N9dSPhYoHPcc/9/9jpts43FozlgfY4wY8Wt5ybB3X0caISMmB/klFIJKKN7num439z3+Xk7ENB/Xvb0XAtnOt/cuxQYsGQ7fb62GOO/7Va5fdE9ZfaIJsS5ToE6oIbV04pLUssJf9cUMsyPFVELYSJmyGPQQFRz0TTxxRvPapIWrfa2x5x3hYUpNTAdY3v0fN9l/1ZqNSBmIBLH/LoXaVJQ2DydGD1/QFZ2Z/S7zTYKg5/cSEpUgiYtbwutNZSjRH29ucSizC524k+Zst95T8G7LJaWCT8SQAcKXqCnjpiEGWzD++h0jXjn6BWjUnIHi0te+27vF/z6UQL00sWco5hUIqF66EiU="
   }
 }

apps/isa-app/src/config/config.test.json

@@ -70,6 +70,6 @@
     },
     "checkForUpdates": 3600000,
     "licence": {
-        "scandit": "AQZyKCc+BEkNL00Y3h3FjawGLF+INUj7cVb0My91hl8ffiW873T8FTV1k4TIZJx5RwcJlYxhgsxHVcnM4AJgSwJhbAfxJmP/3XGijLlLp3XUIRjQwFtf7UlZAFZ7Vrt1/WSf7kxxrFQ2SE2AQwLqPg9DL+hHEfd4xT/15n8p2q7qUlCKLsV6jF12Pd7koFNSWNL3ZIkRtd1ma99/321dnwAJHFGXqWg5nprJ7sYtqUqNQ8Er9SlvKbhnw3AipHzKpz0O3oNfUsr6NlZivRBhMhCZLo5WpXo1m9uIU8zLEWMNDJ+wGUctcGxE3eCptP2zLXUgxxjB+0EXOUtT/GWUc/Ip61CMiyUf7Paz026E2eYil2yWgfkTP5CUgDMNGZFuAA1T5PhB9FRW51CjAIvwOKVMCvfixJiVoUsXHnWH2ZnXqtbDR/uEZBE7OKoBlaPL4G3Lvgdqym5EjROAztUXb6wOmVDiGzzqgizyZnIcxFBSKJAownGj9Vh4/Y/Ag1xzGzNtjz3ngSRfMfIIq/q2Q51uiLiv7mBVliPvPWMUTfTjnqnK/OSBlR2ID+COJqnUKpQMedPyOT3IMznmM6gQCmyYO5KE0MkfhFh6+pdNi6oJM2iZsxK1Z1V+GRSOIwrJEoajjDJkh439XjXk8NExFvplrLjK/oL/dsHIZiG6U5GVWW92kGkuXkJCeUz1CET3paxbGqwrd53r5d6gFABbC12CtcP2JeH4YYCpHYyPQacf0prj9Hdq3wDztShC9tH+4UQS/GbaDHKcS1ANIyPuTxHmBFtPuCJ9Uagy5QBEc8eAz2nfsbfaUxYzco6u/zhNsFbqp6zgQIxs5OcqDQ=="
+        "scandit": "AZ7zLw2eLmFWHbYP4RDq8VAEgAxmNGYcPU8YpOc3DryEXj4zMzYQFrQuUm0YewGQYEESXjpRwGX1NYmKY3pXHnAn2DeqIzh2an+FUu9socQlbQnJiHJHoWBAqcqWSua+P12tc95P3s9aaEEYvSjUy7Md88f7N+sk6zZbUmqbMXeXqmZwdkmRoUY/2w0CiiiA4gBFHgu4sMeNQ9dWyfxKTUPf5AnsxnuYpCt5KLxJWSYDv8HHj0mx8DCJTe1m2ony97Lge3JbJ5Dd+Zz6SCwqik7fv53Qole9s/3m66lYFWKAzWRKkHN1zts78CmPxPb+AAHVoqlBM3duvYmnCxxGOmlXabKUNuDR2ExaMu/nlo532jqqy25Cet/FP1UAs96ZGRgzEcHxGPp6kA53lJ15zd+cxz6G93E83AmYJkhddXBQElWEaGtQRfrEzRGmvcksR+V8MMYjGmhkVbQxGGqpnfP4IxbuEFcef6bxxTiulzo75gXoqZTt+7C1qpDcrMM3Yp0Z8RBw3JlV2tLk4FYFZpxY8QrXIcjvRYKExtQ9e5sSbST4Vx95YhEUd6iX0SBPDzcmgR4/Ef6gvJfoWgz68+rqhBGckphdHi2Mf/pYuAlh2jbwtrkErE2xWARBejR/UcU/A3F7k9RkFd5/QZC7qhsE6bZH7uhpkptIbi5XkXagwYy1oJD7yJs4VLOJteYWferRm8h1auxXew5tL8VLHciF+lLj6h8PTUDt2blLgUjHtualqlCwdSTzJyYwk4oswGGDk6E48X7LXpzuhtR8TYTOi2REN0uuTbO/slFBRw+CaYUnD0LjB9p2lb8ndcdV9adzBKmwPxiOtlOELQ=="
     }
 }

apps/modal/notifications/src/lib/notifications-list-item/notifications-list-item.component.html

@@ -1,8 +1,11 @@
-<div class="notification-headline">
-  <h1>{{ item.headline }}</h1>
-  <button class="notification-edit-cta" (click)="itemSelected.emit(item)">
-    Bearbeiten
-  </button>
+<div class="grid grid-cols-[1fr_auto] items-center gap-4">
+  <div class="grid grid-flow-row gap-4">
+    <h1 class="text-left font-bold text-lg">{{ item.headline }}</h1>
+    <div class="notification-text">{{ item.text }}</div>
+  </div>
+  <div>
+    <button *ngIf="editButton" class="notification-edit-cta text-brand font-bold text-lg px-4 py-3" (click)="itemSelected.emit(item)">
+      {{ editButtonLabel }}
+    </button>
+  </div>
 </div>
-
-<div class="notification-text">{{ item.text }}</div>

apps/modal/notifications/src/lib/notifications-list-item/notifications-list-item.component.ts

@@ -13,5 +13,11 @@ export class ModalNotificationsListItemComponent {
   @Output()
   itemSelected = new EventEmitter<MessageBoardItemDTO>();
 
+  @Input()
+  editButton = true;
+
+  @Input()
+  editButtonLabel = 'Bearbeiten';
+
   constructor() {}
 }

apps/modal/notifications/src/lib/notifications-package-inspection-group/notifications-package-inspection-group.component.html

@@ -0,0 +1,11 @@
+<div class="notification-list scroll-bar">
+  <ng-container *ngFor="let notification of notifications">
+    <modal-notifications-list-item
+      (click)="itemSelected(notification)"
+      [editButtonLabel]="'Packstück-Prüfung'"
+      [item]="notification"
+      (itemSelected)="itemSelected($event)"
+    ></modal-notifications-list-item>
+    <hr />
+  </ng-container>
+</div>

apps/modal/notifications/src/lib/notifications-package-inspection-group/notifications-package-inspection-group.component.spec.ts

@@ -0,0 +1,101 @@
+import { createComponentFactory, Spectator, SpyObject } from '@ngneat/spectator';
+import { CommonModule } from '@angular/common';
+import { RouterTestingModule } from '@angular/router/testing';
+import { UiIconModule } from '@ui/icon';
+import { Router } from '@angular/router';
+import { UiFilter } from '@ui/filter';
+import { MessageBoardItemDTO } from 'apps/hub/notifications/src/lib/defs';
+import { Component } from '@angular/core';
+import { ModalNotificationsListItemComponent } from '../notifications-list-item/notifications-list-item.component';
+import { ModalNotificationsRemissionGroupComponent } from './notifications-remission-group.component';
+
+// DummyComponent Class
+@Component({
+  selector: 'dummy-component',
+  template: '<div></div>',
+})
+class DummyComponent {
+  constructor() {}
+}
+
+describe('ModalNotificationsRemissionGroupComponent', () => {
+  let spectator: Spectator<ModalNotificationsRemissionGroupComponent>;
+  let uiFilterMock: SpyObject<UiFilter>;
+  let router: Router;
+
+  const createComponent = createComponentFactory({
+    component: ModalNotificationsRemissionGroupComponent,
+    declarations: [ModalNotificationsListItemComponent],
+    imports: [
+      CommonModule,
+      RouterTestingModule.withRoutes([
+        { path: 'filiale/goods/in/results', component: DummyComponent },
+        { path: 'filiale/remission/create', component: DummyComponent },
+      ]),
+      UiIconModule,
+    ],
+    providers: [],
+    mocks: [UiFilter],
+  });
+
+  beforeEach(() => {
+    spectator = createComponent({ props: { notifications: [] } });
+    router = spectator.inject(Router);
+    uiFilterMock = spectator.inject(UiFilter);
+  });
+
+  it('should create', () => {
+    expect(spectator.component).toBeTruthy();
+  });
+
+  describe('notifications input', () => {
+    it('should display the right notification-counter value based on the length of the input array', () => {
+      spectator.setInput({ notifications: [{}, {}, {}] });
+      expect(spectator.query('.notification-counter')).toHaveText('3');
+    });
+
+    it('should not display notification-counter if input array has length 0', () => {
+      spectator.setInput({ notifications: [] });
+      expect(spectator.query('.notification-counter')).toHaveText('');
+    });
+
+    it('should render modal-notifications-list-item based on the input array', () => {
+      const notifications = [{}, {}];
+      spectator.setInput({ notifications });
+      spectator.detectComponentChanges();
+      expect(spectator.queryAll('modal-notifications-list-item')).toHaveLength(notifications.length);
+    });
+  });
+
+  describe('itemSelected()', () => {
+    it('should navigate to results with queryParams from UiFilter.getQueryParamsFromQueryTokenDTO()', () => {
+      const item: MessageBoardItemDTO = { queryToken: { input: { main_qs: 'test' } } };
+      spyOn(UiFilter, 'getQueryParamsFromQueryTokenDTO').and.returnValue(item.queryToken.input);
+      spyOn(router, 'navigate');
+      spectator.component.itemSelected(item);
+      expect(router.navigate).toHaveBeenCalledWith(['/filiale/goods/in/results'], { queryParams: item.queryToken.input });
+    });
+
+    it('should emit the navigated event after select item', () => {
+      const item: MessageBoardItemDTO = { queryToken: { input: { main_qs: 'test' } } };
+      spyOn(spectator.component.navigated, 'emit');
+      spectator.component.itemSelected(item);
+      expect(spectator.component.navigated.emit).toHaveBeenCalled();
+    });
+  });
+
+  describe('actions CTA', () => {
+    it('should navigate to remission page after clicking the CTA', () => {
+      const cta = spectator.query('.cta-primary');
+      expect(cta).toHaveText('Zur Remission');
+      expect(cta).toHaveAttribute('href', '/filiale/remission/create');
+    });
+
+    it('should emit the navigated event after clicking the CTA', () => {
+      const cta = spectator.query('.cta-primary') as HTMLAnchorElement;
+      spyOn(spectator.component.navigated, 'emit');
+      spectator.click(cta);
+      expect(spectator.component.navigated.emit).toHaveBeenCalled();
+    });
+  });
+});

apps/modal/notifications/src/lib/notifications-package-inspection-group/notifications-package-inspection-group.component.ts

@@ -0,0 +1,23 @@
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+import { Router } from '@angular/router';
+import { MessageBoardItemDTO } from 'apps/hub/notifications/src/lib/defs';
+
+@Component({
+  selector: 'modal-notifications-package-inspection-group',
+  templateUrl: 'notifications-package-inspection-group.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class ModalNotificationsPackageInspectionGroupComponent {
+  @Input()
+  notifications: MessageBoardItemDTO[];
+
+  @Output()
+  navigated = new EventEmitter<void>();
+
+  constructor(private _router: Router) {}
+
+  itemSelected(item: MessageBoardItemDTO) {
+    this._router.navigate(['/filiale/package-inspection/packages']);
+    this.navigated.emit();
+  }
+}

apps/modal/notifications/src/lib/notifications-remission-group/notifications-remission-group.component.html

@@ -1,13 +1,3 @@
-<div class="header">
-  <div class="notification-icon">
-    <span class="notification-counter">{{ notifications.length }}</span>
-    <ui-icon icon="notification" size="26px"></ui-icon>
-  </div>
-
-  <h2>Remission</h2>
-</div>
-
-<hr />
 <div class="notification-list scroll-bar">
   <ng-container *ngFor="let notification of notifications">
     <modal-notifications-list-item [item]="notification" (itemSelected)="itemSelected($event)"></modal-notifications-list-item>

apps/modal/notifications/src/lib/notifications-reservation-group/notifications-reservation-group.component.html

@@ -1,13 +1,3 @@
-<div class="header">
-  <div class="notification-icon">
-    <div class="notification-counter">{{ notifications.length }}</div>
-    <ui-icon icon="notification" size="26px"></ui-icon>
-  </div>
-
-  <h2>Reservierungsanfragen</h2>
-</div>
-
-<hr />
 <div class="notification-list scroll-bar">
   <ng-container *ngFor="let notification of notifications">
     <modal-notifications-list-item [item]="notification" (itemSelected)="itemSelected($event)"></modal-notifications-list-item>

apps/modal/notifications/src/lib/notifications-task-calendar-group/notifications-task-calendar-group.component.html

@@ -1,13 +1,3 @@
-<div class="header">
-  <div class="notification-icon">
-    <span class="notification-counter">{{ notifications.length }}</span>
-    <ui-icon icon="notification" size="26px"></ui-icon>
-  </div>
-
-  <h2>Tätigkeitskalender</h2>
-</div>
-
-<hr />
 <div class="notification-list scroll-bar">
   <ng-container *ngFor="let notification of notifications">
     <modal-notifications-list-item [item]="notification" (itemSelected)="itemSelected($event)"></modal-notifications-list-item>

apps/modal/notifications/src/lib/notifications-update-group/notifications-update-group.component.html

@@ -1,13 +1,3 @@
-<div class="header">
-  <div class="notification-icon">
-    <span class="notification-counter">{{ notifications.length }}</span>
-    <ui-icon icon="notification" size="26px"></ui-icon>
-  </div>
-
-  <h2>ISA-Update</h2>
-</div>
-
-<hr />
 <div class="notification-list scroll-bar">
   <ng-container *ngFor="let notification of notifications">
     <div class="notification-headline">

apps/modal/notifications/src/lib/notifications.component.html

@@ -1,34 +1,39 @@
 <h1>Sie haben neue Nachrichten</h1>
 
-<ng-container *ngFor="let notification of groupedNotifications$ | async">
-  <button
-    *ngIf="notification.group !== (activeCard$ | async)"
-    type="button"
-    class="notification-card"
-    (click)="activeCard = notification.group"
-  >
-    {{ notification.group }}
+<ng-container *ngFor="let notification of notifications$ | async | keyvalue">
+  <button type="button" class="notification-card" (click)="selectArea(notification.key)">
+    <div class="notification-icon">
+      <div class="notification-counter">{{ notification.value?.length }}</div>
+      <ui-icon icon="notification" size="26px"></ui-icon>
+    </div>
+    <span>{{ notification.value?.[0]?.category }}</span>
   </button>
-</ng-container>
-
-<ng-container [ngSwitch]="activeCard$ | async">
-  <modal-notifications-update-group
-    *ngSwitchCase="'ISA-Update'"
-    [notifications]="activeNotifications$ | async"
-  ></modal-notifications-update-group>
-  <modal-notifications-reservation-group
-    *ngSwitchCase="'Reservierungsanfragen'"
-    [notifications]="activeNotifications$ | async"
-    (navigated)="close()"
-  ></modal-notifications-reservation-group>
-  <modal-notifications-remission-group
-    *ngSwitchCase="'Remission'"
-    [notifications]="activeNotifications$ | async"
-    (navigated)="close()"
-  ></modal-notifications-remission-group>
-  <modal-notifications-task-calendar-group
-    *ngSwitchCase="'Tätigkeitskalender'"
-    [notifications]="activeNotifications$ | async"
-    (navigated)="close()"
-  ></modal-notifications-task-calendar-group>
+  <hr class="-mx-4" />
+  <ng-container *ngIf="notification.key === selectedArea" [ngSwitch]="notification.value?.[0]?.category">
+    <modal-notifications-update-group
+      *ngSwitchCase="'ISA-Update'"
+      [notifications]="notifications[selectedArea]"
+    ></modal-notifications-update-group>
+    <modal-notifications-reservation-group
+      *ngSwitchCase="'Reservierungsanfragen'"
+      [notifications]="notifications[selectedArea]"
+      (navigated)="close()"
+    ></modal-notifications-reservation-group>
+    <modal-notifications-remission-group
+      *ngSwitchCase="'Remission'"
+      [notifications]="notifications[selectedArea]"
+      (navigated)="close()"
+    ></modal-notifications-remission-group>
+    <modal-notifications-task-calendar-group
+      *ngSwitchCase="'Tätigkeitskalender'"
+      [notifications]="notifications[selectedArea]"
+      (navigated)="close()"
+    ></modal-notifications-task-calendar-group>
+    <modal-notifications-package-inspection-group
+      *ngSwitchCase="'Wareneingang Lagerware'"
+      [notifications]="notifications[selectedArea]"
+      (navigated)="close()"
+    >
+    </modal-notifications-package-inspection-group>
+  </ng-container>
 </ng-container>

apps/modal/notifications/src/lib/notifications.component.scss

@@ -2,46 +2,44 @@ modal-notifications {
   @apply flex flex-col relative h-full;
 
   h1 {
-    @apply text-xl font-bold text-center mb-10;
+    @apply text-xl font-bold text-center;
   }
 
+  // .notification-card {
+  //   @apply text-center text-xl text-inactive-branch block bg-white rounded-t-card font-bold no-underline py-4 border-none outline-none shadow-card -ml-4;
+  //   width: calc(100% + 2rem);
+  // }
+
   .notification-card {
-    @apply text-center text-xl text-inactive-branch block bg-white rounded-t-card font-bold no-underline py-4 border-none outline-none shadow-card -ml-4;
-    width: calc(100% + 2rem);
+    @apply grid grid-flow-col items-center justify-center gap-4;
+    @apply text-inactive-branch bg-white;
+    @apply font-bold text-xl -mx-4 py-4;
+
+    .notification-icon {
+      @apply relative;
+
+      .notification-counter {
+        @apply absolute font-normal text-base -top-2 -right-1 bg-brand text-white rounded-full w-5 h-5 flex items-center justify-center;
+        z-index: 10;
+      }
+
+      ui-icon {
+        @apply text-inactive-branch;
+      }
+    }
+
+    h2 {
+      @apply font-bold text-2xl ml-4;
+    }
   }
 
   modal-notifications-remission-group,
   modal-notifications-reservation-group,
   modal-notifications-task-calendar-group,
-  modal-notifications-update-group {
+  modal-notifications-update-group,
+  modal-notifications-package-inspection-group {
     @apply flex flex-col relative pb-2;
 
-    .header {
-      @apply flex flex-row justify-center items-center mt-5;
-
-      .notification-icon {
-        @apply relative;
-
-        .notification-counter {
-          @apply absolute -top-2 -right-1 bg-brand text-white rounded-full w-5 h-5 flex items-center justify-center;
-          z-index: 10;
-        }
-
-        ui-icon {
-          @apply text-inactive-branch;
-        }
-      }
-
-      h2 {
-        @apply font-bold text-2xl ml-4;
-      }
-    }
-
-    hr {
-      @apply bg-disabled-branch h-px-2 -ml-4  my-4;
-      width: calc(100% + 2rem);
-    }
-
     .notification-list {
       @apply overflow-y-scroll -ml-4;
       max-height: calc(100vh - 450px);
@@ -60,7 +58,7 @@ modal-notifications {
 
   modal-notifications-list-item,
   modal-notifications-update-group {
-    @apply flex flex-col relative py-1 px-4;
+    @apply flex flex-col relative p-4;
 
     .notification-headline {
       @apply flex flex-row justify-between items-start;

apps/modal/notifications/src/lib/notifications.component.ts

@@ -1,14 +1,11 @@
 import { ChangeDetectionStrategy, Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { ComponentStore } from '@ngrx/component-store';
-import { Group, groupBy } from '@ui/common';
 import { UiModalRef } from '@ui/modal';
-import { EnvelopeDTO, MessageBoardItemDTO } from 'apps/hub/notifications/src/lib/defs';
-import { combineLatest } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { MessageBoardItemDTO } from 'apps/hub/notifications/src/lib/defs';
 
 interface ModalNotificationComponentState {
-  activeCard: string;
-  groupedNotifications: Group<string, MessageBoardItemDTO>[];
+  selectedArea: string;
+  notifications: Record<string, MessageBoardItemDTO[]>;
 }
 
 @Component({
@@ -18,44 +15,61 @@ interface ModalNotificationComponentState {
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
 })
-export class ModalNotificationsComponent extends ComponentStore<ModalNotificationComponentState> implements OnInit {
-  set activeCard(activeCard: string) {
-    if (this.activeCard !== activeCard) {
-      this.patchState({ activeCard });
+export class ModalNotificationsComponent extends ComponentStore<ModalNotificationComponentState> {
+  private _selectedAreaSelector = (state: ModalNotificationComponentState) => {
+    if (state.selectedArea) {
+      return state.selectedArea;
     }
+
+    const keys = Object.keys(state.notifications);
+
+    for (const key of keys) {
+      if (state.notifications[key]?.length > 0) {
+        return key;
+      }
+    }
+
+    return undefined;
+  };
+
+  get selectedArea() {
+    return this.get(this._selectedAreaSelector);
   }
 
-  activeCard$ = this.select((s) => s.activeCard);
+  selectedArea$ = this.select(this._selectedAreaSelector);
 
-  get activeCard() {
-    return this.get((s) => s.activeCard);
+  private _categorySelector = (state: ModalNotificationComponentState) => {
+    const selectedArea = this._selectedAreaSelector(state);
+    console.log('_categorySelector', state.notifications[selectedArea]?.[0]?.category);
+    return state.notifications[selectedArea]?.[0]?.category;
+  };
+
+  get category() {
+    return this.get(this._categorySelector);
   }
 
-  get groupedNotifications() {
-    return this.get((s) => s.groupedNotifications);
-  }
-  groupedNotifications$ = this.select((s) => s.groupedNotifications);
+  category$ = this.select(this._categorySelector);
 
-  set groupedNotifications(groupedNotifications: Group<string, MessageBoardItemDTO>[]) {
-    this.patchState({ groupedNotifications });
+  get notifications() {
+    return this.get((s) => s.notifications);
   }
 
-  activeNotifications$ = combineLatest([this.activeCard$, this.groupedNotifications$]).pipe(
-    map(([activeCard, notifications]) => notifications.find((n) => n.group === activeCard)?.items)
-  );
+  notifications$ = this.select((s) => s.notifications);
 
-  constructor(private _modalRef: UiModalRef<any, EnvelopeDTO<MessageBoardItemDTO[]>>) {
+  constructor(private _modalRef: UiModalRef<any, Record<string, MessageBoardItemDTO[]>>) {
     super({
-      activeCard: undefined,
-      groupedNotifications: groupBy(_modalRef.data.data, (item: MessageBoardItemDTO) => item.category),
+      selectedArea: undefined,
+      notifications: _modalRef.data,
     });
   }
 
-  ngOnInit() {
-    this.patchState({ activeCard: this.groupedNotifications?.find((_) => true)?.group });
-  }
-
   close() {
     this._modalRef.close();
   }
+
+  selectArea(area: string) {
+    this.patchState({
+      selectedArea: area,
+    });
+  }
 }

apps/modal/notifications/src/lib/notifications.module.ts

@@ -9,6 +9,7 @@ import { ModalNotificationsReservationGroupComponent } from './notifications-res
 import { ModalNotificationsTaskCalendarGroupComponent } from './notifications-task-calendar-group/notifications-task-calendar-group.component';
 import { ModalNotificationsUpdateGroupComponent } from './notifications-update-group/notifications-update-group.component';
 import { ModalNotificationsComponent } from './notifications.component';
+import { ModalNotificationsPackageInspectionGroupComponent } from './notifications-package-inspection-group/notifications-package-inspection-group.component';
 
 @NgModule({
   imports: [CommonModule, UiCommonModule, UiIconModule, RouterModule],
@@ -19,6 +20,7 @@ import { ModalNotificationsComponent } from './notifications.component';
     ModalNotificationsTaskCalendarGroupComponent,
     ModalNotificationsUpdateGroupComponent,
     ModalNotificationsListItemComponent,
+    ModalNotificationsPackageInspectionGroupComponent,
   ],
   exports: [
     ModalNotificationsComponent,
@@ -27,6 +29,7 @@ import { ModalNotificationsComponent } from './notifications.component';
     ModalNotificationsTaskCalendarGroupComponent,
     ModalNotificationsUpdateGroupComponent,
     ModalNotificationsListItemComponent,
+    ModalNotificationsPackageInspectionGroupComponent,
   ],
 })
 export class ModalNotificationsModule {}

apps/page/assortment/src/lib/price-update/price-update-list/price-update-item.component.ts

@@ -59,8 +59,7 @@ export class PriceUpdateItemComponent {
         itemId: Number(item?.product?.catalogProductNumber),
         branchId: defaultBranch?.id,
       })
-    ),
-    shareReplay(1)
+    )
   );
 
   constructor(

apps/page/catalog/src/lib/article-details/article-details.component.html

@@ -51,16 +51,9 @@
             </div>
 
             <div class="right">
-              <div class="price" *ngIf="item.catalogAvailability?.price?.value?.value; else retailPrice">
-                {{ item.catalogAvailability?.price?.value?.value | currency: item.catalogAvailability?.price?.value?.currency:'code' }}
+              <div class="price" *ngIf="price$ | async; let price">
+                {{ price?.value?.value | currency: price?.value?.currency:'code' }}
               </div>
-              <ng-template #retailPrice>
-                <div class="price" *ngIf="store.takeAwayAvailability$ | async; let takeAwayAvailability">
-                  {{
-                    takeAwayAvailability?.retailPrice?.value?.value | currency: takeAwayAvailability?.retailPrice?.value?.currency:'code'
-                  }}
-                </div>
-              </ng-template>
               <div *ngIf="store.promotionPoints$ | async; let promotionPoints">{{ promotionPoints }} Lesepunkte</div>
             </div>
           </div>
@@ -94,7 +87,24 @@
 
                 <div class="fetching xsmall" *ngIf="store.fetchingPickUpAvailability$ | async; else showAvailabilityPickUpIcon"></div>
                 <ng-template #showAvailabilityPickUpIcon>
-                  <ui-icon *ngIf="store.isPickUpAvailabilityAvailable$ | async" icon="box_out" size="18px"></ui-icon>
+                  <ui-icon
+                    [uiOverlayTrigger]="orderDeadlineTooltip"
+                    *ngIf="store.isPickUpAvailabilityAvailable$ | async"
+                    icon="box_out"
+                    size="18px"
+                  ></ui-icon>
+
+                  <ui-tooltip
+                    [warning]="true"
+                    yPosition="above"
+                    xPosition="after"
+                    [yOffset]="-11"
+                    [xOffset]="8"
+                    #orderDeadlineTooltip
+                    [closeable]="true"
+                  >
+                    <b>{{ (store.pickUpAvailability$ | async)?.orderDeadline | orderDeadline }}</b>
+                  </ui-tooltip>
                 </ng-template>
 
                 <div class="fetching xsmall" *ngIf="store.fetchingDeliveryAvailability$ | async; else showAvailabilityDeliveryIcon"></div>

apps/page/catalog/src/lib/article-details/article-details.component.ts

@@ -20,6 +20,7 @@ import { DateAdapter } from '@ui/common';
 import { DatePipe } from '@angular/common';
 import { PurchaseOptionsModalService } from '@shared/modals/purchase-options-modal';
 import { DomainAvailabilityService } from '@domain/availability';
+import { DomainCheckoutService } from '@domain/checkout';
 
 @Component({
   selector: 'page-article-details',
@@ -65,6 +66,10 @@ export class ArticleDetailsComponent implements OnInit, OnDestroy {
     this.store.isDeliveryB2BAvailabilityAvailable$,
   ]).pipe(map(([digDelivery, b2bDelivery]) => b2bDelivery && !digDelivery));
 
+  customerFeatures$ = this.applicationService.activatedProcessId$.pipe(
+    switchMap((processId) => this._domainCheckoutService.getCustomerFeatures({ processId }))
+  );
+
   showSubscriptionBadge$ = this.store.item$.pipe(map((item) => item?.features?.find((i) => i.key === 'PFO')));
 
   showPromotionBadge$ = this.store.item$.pipe(map((item) => item?.features?.find((i) => i.key === 'Promotion')));
@@ -113,6 +118,38 @@ export class ArticleDetailsComponent implements OnInit, OnDestroy {
     shareReplay(1)
   );
 
+  price$ = combineLatest([
+    this.store.item$,
+    this.store.takeAwayAvailability$,
+    this.store.deliveryAvailability$,
+    this.store.deliveryDigAvailability$,
+    this.store.deliveryB2BAvailability$,
+  ]).pipe(
+    map(([item, takeAway, delivery, deliveryDig, deliveryB2B]) => {
+      if (item?.catalogAvailability?.price?.value?.value) {
+        return item?.catalogAvailability?.price;
+      }
+
+      if (takeAway?.price?.value?.value) {
+        return takeAway.price;
+      }
+
+      if (delivery?.price?.value?.value) {
+        return delivery.price;
+      }
+
+      if (deliveryDig?.price?.value?.value) {
+        return deliveryDig.price;
+      }
+
+      if (deliveryB2B?.price?.value?.value) {
+        return deliveryB2B.price;
+      }
+
+      return null;
+    })
+  );
+
   constructor(
     public readonly applicationService: ApplicationService,
     private activatedRoute: ActivatedRoute,
@@ -126,7 +163,8 @@ export class ArticleDetailsComponent implements OnInit, OnDestroy {
     public elementRef: ElementRef,
     private _purchaseOptionsModalService: PurchaseOptionsModalService,
     private _availability: DomainAvailabilityService,
-    private _router: Router
+    private _router: Router,
+    private _domainCheckoutService: DomainCheckoutService
   ) {}
 
   ngOnInit() {
@@ -270,14 +308,23 @@ export class ArticleDetailsComponent implements OnInit, OnDestroy {
         type: 'add',
         processId: this.applicationService.activatedProcessId,
         items: [item],
+        pickupBranch: selectedBranch,
+        inStoreBranch: selectedBranch,
+        preSelectOption: !!selectedBranch ? { option: 'in-store', showOptionOnly: true } : undefined,
       })
-      .afterClosed$.subscribe((result) => {
+      .afterClosed$.subscribe(async (result) => {
         if (result?.data === 'continue') {
-          this.navigateToShoppingCart();
-          console.log('continue');
+          const customer = await this._domainCheckoutService
+            .getBuyer({ processId: this.applicationService.activatedProcessId })
+            .pipe(first())
+            .toPromise();
+          if (customer) {
+            this.navigateToShoppingCart();
+          } else {
+            this.navigateToCustomerSearch();
+          }
         } else if (result?.data === 'continue-shopping') {
           this.navigateToResultList();
-          console.log('continue-shopping');
         }
       });
   }
@@ -286,6 +333,24 @@ export class ArticleDetailsComponent implements OnInit, OnDestroy {
     this._router.navigate([`/kunde/${this.applicationService.activatedProcessId}/cart/review`]);
   }
 
+  async navigateToCustomerSearch() {
+    try {
+      const response = await this.customerFeatures$
+        .pipe(
+          first(),
+          switchMap((customerFeatures) => {
+            return this._domainCheckoutService.canSetCustomer({ processId: this.applicationService.activatedProcessId, customerFeatures });
+          })
+        )
+        .toPromise();
+      this._router.navigate(['/kunde', this.applicationService.activatedProcessId, 'customer', 'search'], {
+        queryParams: { filter_customertype: response.filter.customertype },
+      });
+    } catch (error) {
+      this._router.navigate(['/kunde', this.applicationService.activatedProcessId, 'customer', 'search']);
+    }
+  }
+
   async navigateToResultList() {
     let crumbs = await this.breadcrumb
       .getBreadcrumbsByKeyAndTags$(this.applicationService.activatedProcessId, ['catalog'])

apps/page/catalog/src/lib/article-details/article-details.module.ts

@@ -10,6 +10,7 @@ import { ArticleRecommendationsComponent } from './recommendations/article-recom
 import { PipesModule } from '../shared/pipes/pipes.module';
 import { UiTooltipModule } from '@ui/tooltip';
 import { UiCommonModule } from '@ui/common';
+import { OrderDeadlinePipeModule } from '@shared/pipes/order-deadline';
 
 @NgModule({
   imports: [
@@ -22,6 +23,7 @@ import { UiCommonModule } from '@ui/common';
     UiCommonModule,
     UiTooltipModule,
     PipesModule,
+    OrderDeadlinePipeModule,
   ],
   exports: [ArticleDetailsComponent, ArticleRecommendationsComponent],
   declarations: [ArticleDetailsComponent, ArticleRecommendationsComponent],

apps/page/catalog/src/lib/article-details/article-details.store.ts

@@ -129,7 +129,11 @@ export class ArticleDetailsStore extends ComponentStore<ArticleDetailsState> {
 
   //#region Abholung
   readonly fetchingPickUpAvailability$ = this.select((s) => s.fetchingPickUpAvailability);
-  readonly pickUpAvailability$: Observable<AvailabilityDTO> = combineLatest([this.itemData$, this.branch$, this.isDownload$]).pipe(
+  readonly pickUpAvailability$: Observable<AvailabilityDTO & { orderDeadline?: string }> = combineLatest([
+    this.itemData$,
+    this.branch$,
+    this.isDownload$,
+  ]).pipe(
     tap(() => this.patchState({ fetchingPickUpAvailability: true, fetchingPickUpAvailabilityError: undefined })),
     switchMap(([item, branch, isDownload]) =>
       !!item && !!branch && !isDownload

apps/page/catalog/src/lib/article-search/search-filter/search-filter.component.html

@@ -1,10 +1,13 @@
 <ng-container *ngIf="filter$ | async; let filter">
   <div class="catalog-search-filter-content">
-    <button class="btn-close" type="button" (click)="close.emit()">
-      <ui-icon icon="close" size="20px"></ui-icon>
-    </button>
+    <div class="w-full flex flex-row justify-end items-center">
+      <button (click)="clearFilter(filter)" class="text-[#0556B4] mr-[0.8125rem]">Alle Filter entfernen</button>
+      <button class="text-cool-grey p-4 outline-none border-none bg-transparent" type="button" (click)="close.emit()">
+        <ui-icon icon="close" size="20px"></ui-icon>
+      </button>
+    </div>
 
-    <div class="catalog-search-filter-content-main">
+    <div class="catalog-search-filter-content-main -mt-8">
       <h1 class="text-3xl font-bold text-center py-4">Filter</h1>
       <ui-filter
         [filter]="filter"

apps/page/catalog/src/lib/article-search/search-filter/search-filter.component.scss

@@ -6,10 +6,6 @@
   @apply relative mx-auto p-4;
 }
 
-.btn-close {
-  @apply absolute text-cool-grey top-3 p-4 right-4 outline-none border-none bg-transparent;
-}
-
 .catalog-search-filter-content-main {
   h1.title {
     @apply text-center;

apps/page/catalog/src/lib/article-search/search-filter/search-filter.component.ts

@@ -58,4 +58,8 @@ export class ArticleSearchFilterComponent implements OnInit {
     const queryParams = { main_qs: value?.getQueryParams()?.main_qs || '' };
     this.articleSearch.setDefaultFilter(queryParams);
   }
+
+  clearFilter(value: UiFilter) {
+    value.unselectAll();
+  }
 }

apps/page/catalog/src/lib/article-search/search-results/search-result-item.component.ts

@@ -87,8 +87,7 @@ export class SearchResultItemComponent extends ComponentStore<SearchResultItemCo
     map(([defaultBranch, selectedBranch]) => {
       const branch = selectedBranch ?? defaultBranch;
       return branch.branchType !== 4;
-    }),
-    shareReplay(1)
+    })
   );
 
   stockTooltipText$ = combineLatest([this.defaultBranch$, this.selectedBranchId$]).pipe(
@@ -104,8 +103,7 @@ export class SearchResultItemComponent extends ComponentStore<SearchResultItemCo
         }
       }
       return '';
-    }),
-    shareReplay(1)
+    })
   );
 
   inStock$ = combineLatest([this.item$, this.selectedBranchId$, this.defaultBranch$]).pipe(
@@ -113,8 +111,7 @@ export class SearchResultItemComponent extends ComponentStore<SearchResultItemCo
     filter(([item, branch, defaultBranch]) => !!item && !!defaultBranch),
     switchMap(([item, branch, defaultBranch]) =>
       this._stockService.getInStock$({ itemId: item.id, branchId: branch?.id ?? defaultBranch?.id })
-    ),
-    shareReplay(1)
+    )
   );
 
   constructor(

apps/page/catalog/src/lib/article-search/search-results/search-results.component.ts

@@ -15,6 +15,7 @@ import { debounceTime, first, map, switchMap } from 'rxjs/operators';
 import { ArticleSearchService } from '../article-search.store';
 import { AddedToCartModalComponent } from './added-to-cart-modal/added-to-cart-modal.component';
 import { SearchResultItemComponent } from './search-result-item.component';
+import { DomainAvailabilityService, ItemData } from '@domain/availability';
 
 @Component({
   selector: 'page-search-results',
@@ -54,7 +55,8 @@ export class ArticleSearchResultsComponent implements OnInit, OnDestroy {
     private breadcrumb: BreadcrumbService,
     private cache: CacheService,
     private _uiModal: UiModalService,
-    private _checkoutService: DomainCheckoutService
+    private _checkoutService: DomainCheckoutService,
+    private _availability: DomainAvailabilityService
   ) {}
 
   ngOnInit() {
@@ -258,11 +260,12 @@ export class ArticleSearchResultsComponent implements OnInit, OnDestroy {
 
     for (const item of selectedItems) {
       const isDownload = item?.product?.format === 'EB' || item?.product?.format === 'DL';
+      const price = item?.catalogAvailability?.price;
       const shoppingCartItem: AddToShoppingCartDTO = {
         quantity: 1,
         availability: {
           availabilityType: item?.catalogAvailability?.status,
-          price: item?.catalogAvailability?.price,
+          price,
           supplierProductNumber: item?.ids?.dig ? String(item.ids?.dig) : item?.product?.supplierProductNumber,
         },
         product: {
@@ -274,7 +277,13 @@ export class ArticleSearchResultsComponent implements OnInit, OnDestroy {
       };
 
       if (isDownload) {
-        shoppingCartItem.destination = { data: { target: 16 } };
+        const itemId = item?.id;
+        const ean = item?.product?.ean;
+        const downloadItem: ItemData = { ean, itemId, price };
+
+        // #4180 Für Download Artikel muss hier immer zwingend der logistician gesetzt werden, da diese Artikel direkt zugeordnet dem Warenkorb hinzugefügt werden
+        const downloadAvailability = await this._availability.getDownloadAvailability({ item: downloadItem }).pipe(first()).toPromise();
+        shoppingCartItem.destination = { data: { target: 16, logistician: downloadAvailability?.logistician } };
         canAddItemsPayload.push({
           availabilities: [{ ...item.catalogAvailability, format: 'DL' }],
           id: item.product.catalogProductNumber,

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

@@ -643,6 +643,7 @@ export class CheckoutReviewComponent extends ComponentStore<CheckoutReviewCompon
           })
         )
         .toPromise();
+
       this.router.navigate(['/kunde', this.applicationService.activatedProcessId, 'customer', 'search'], {
         queryParams: { filter_customertype: response.filter.customertype },
       });

apps/page/customer-order/src/lib/customer-order-search/customer-order-search-filter/customer-order-search-filter.component.html

@@ -1,9 +1,12 @@
 <div class="goods-out-search-filter-content">
-  <button class="btn-close" type="button" (click)="close.emit()">
-    <ui-icon icon="close" size="20px"></ui-icon>
-  </button>
+  <div class="w-full flex flex-row justify-end items-center">
+    <button (click)="clearFilter(filter)" class="text-[#0556B4] mr-[0.8125rem]">Alle Filter entfernen</button>
+    <button class="text-cool-grey p-4 outline-none border-none bg-transparent" type="button" (click)="close.emit()">
+      <ui-icon icon="close" size="20px"></ui-icon>
+    </button>
+  </div>
 
-  <div class="goods-out-search-filter-content-main">
+  <div class="goods-out-search-filter-content-main -mt-8">
     <h1 class="title">Filter</h1>
     <ui-filter
       [filter]="filter"

apps/page/customer-order/src/lib/customer-order-search/customer-order-search-filter/customer-order-search-filter.component.scss

@@ -6,10 +6,6 @@
   @apply relative mx-auto;
 }
 
-.btn-close {
-  @apply absolute text-inactive-customer top-3 p-4 right-4 outline-none border-none bg-transparent;
-}
-
 .goods-out-search-filter-content-main {
   @apply px-4;
   h1.title {

apps/page/customer-order/src/lib/customer-order-search/customer-order-search-filter/customer-order-search-filter.component.ts

@@ -121,6 +121,10 @@ export class CustomerOrderSearchFilterComponent implements OnInit, OnDestroy {
     this.updateBreadcrumb();
   }
 
+  clearFilter(value: UiFilter) {
+    value.unselectAll();
+  }
+
   getDetailsPath(item: OrderItemListItemDTO) {
     return item?.compartmentCode
       ? `/kunde/${this.processId}/order/details/compartment/${encodeURIComponent(item?.compartmentCode)}/${item?.processingStatus}`

apps/page/customer-order/src/lib/customer-order-search/customer-order-search-filter/order-branch-id-input/order-branch-id-input.component.ts

@@ -25,18 +25,31 @@ export class OrderBranchIdInputComponent extends AbstractUiFilterInputDirective
   ngOnInit() {
     this.control.setValue({ id: Number(this.value) });
 
+    const uiInputChangesSub = this.uiInput?.changes?.subscribe((changes) => {
+      const controlValue = this.control?.value?.id;
+      const changesValue = Number(changes?.target?.value);
+      if (controlValue !== changesValue) {
+        this.control.setValue(changesValue && !isNaN(changesValue) ? { id: changesValue } : undefined);
+      }
+    });
+
     const onInputChangeSub = this.onUiInputChange$.subscribe((input) => {
-      if (this.control.value !== input.value) {
-        this.control.setValue(input.value ? { id: Number(input.value) } : undefined);
+      const controlValue = this.control?.value?.id;
+      const inputValue = Number(input?.value);
+      if (controlValue !== inputValue) {
+        this.control.setValue(inputValue && !isNaN(inputValue) ? { id: inputValue } : undefined);
       }
     });
 
     const onControlValueChangeSub = this.control.valueChanges.subscribe((value) => {
-      if (this.value !== value) {
-        this.setValue(value ? String(value?.id) : undefined);
+      if (!value) {
+        this.setValue(undefined);
+      } else if (this.value !== String(value?.id)) {
+        this.setValue(String(value?.id));
       }
     });
 
+    this._subscriptions.add(uiInputChangesSub);
     this._subscriptions.add(onInputChangeSub);
     this._subscriptions.add(onControlValueChangeSub);
   }

apps/page/customer-order/src/lib/customer-order.module.ts

@@ -39,6 +39,9 @@ import {
   ReOrderedActionHandler,
   CollectOnDeliveryNoteActionHandler,
   PrintPriceDiffQrCodeLabelActionHandler,
+  CollectWithSmallAmountinvoiceActionHandler,
+  PrintSmallamountinvoiceActionHandler,
+  ShopWithKulturpassActionHandler,
 } from '@domain/oms';
 import { CoreCommandModule } from '@core/command';
 import { CustomerOrderRoutingModule } from './customer-order-routing.module';
@@ -89,6 +92,9 @@ import { BreadcrumbModule } from '@shared/components/breadcrumb';
       SupplierTemporarilyOutOfStockActionHandler,
       CollectOnDeliveryNoteActionHandler,
       PrintPriceDiffQrCodeLabelActionHandler,
+      CollectWithSmallAmountinvoiceActionHandler,
+      PrintSmallamountinvoiceActionHandler,
+      ShopWithKulturpassActionHandler,
     ]),
   ],
   exports: [CustomerOrderComponent],

apps/page/customer/src/lib/customer-search/search-filter/search-filter.component.html

@@ -1,29 +1,30 @@
-<div class="customer-search-filter-content">
-  <button class="btn-close" type="button" (click)="close.emit()">
-    <ui-icon icon="close" size="20px"></ui-icon>
-  </button>
+<div *ngIf="filter$ | async; let filter" class="customer-search-filter-content">
+  <div class="w-full flex flex-row justify-end items-center">
+    <button (click)="clearFilter(filter)" class="text-[#0556B4] mr-[0.8125rem]">Alle Filter entfernen</button>
+    <button class="text-cool-grey p-4 outline-none border-none bg-transparent" type="button" (click)="close.emit()">
+      <ui-icon icon="close" size="20px"></ui-icon>
+    </button>
+  </div>
 
-  <h1 class="text-3xl font-bold text-center py-4">Filter</h1>
+  <h1 class="text-3xl font-bold text-center py-4 -mt-8">Filter</h1>
 
-  <ng-container *ngIf="filter$ | async; let filter">
-    <ui-filter
-      [filter]="filter"
-      [loading]="store.fetching$ | async"
-      (search)="applyFilter(filter)"
-      [hint]="store.message$ | async"
-      resizeInputOptionsToElement="page-customer-search-filter .sticky-cta-wrapper"
-      [scanner]="true"
-    ></ui-filter>
+  <ui-filter
+    [filter]="filter"
+    [loading]="store.fetching$ | async"
+    (search)="applyFilter(filter)"
+    [hint]="store.message$ | async"
+    resizeInputOptionsToElement="page-customer-search-filter .sticky-cta-wrapper"
+    [scanner]="true"
+  ></ui-filter>
 
-    <div class="sticky-cta-wrapper">
-      <button class="cta-reset-filter" (click)="resetFilter()" [disabled]="store.fetching$ | async">
-        Filter zurücksetzen
-      </button>
-      <button class="apply-filter" (click)="applyFilter(filter)" [disabled]="store.fetching$ | async">
-        <ui-spinner [show]="store.fetching$ | async">
-          Filter anwenden
-        </ui-spinner>
-      </button>
-    </div>
-  </ng-container>
+  <div class="sticky-cta-wrapper">
+    <button class="cta-reset-filter" (click)="resetFilter()" [disabled]="store.fetching$ | async">
+      Filter zurücksetzen
+    </button>
+    <button class="apply-filter" (click)="applyFilter(filter)" [disabled]="store.fetching$ | async">
+      <ui-spinner [show]="store.fetching$ | async">
+        Filter anwenden
+      </ui-spinner>
+    </button>
+  </div>
 </div>

apps/page/customer/src/lib/customer-search/search-filter/search-filter.component.scss

@@ -6,10 +6,6 @@
   @apply relative mx-auto p-4;
 }
 
-.btn-close {
-  @apply absolute text-cool-grey top-3 p-4 right-4 outline-none border-none bg-transparent;
-}
-
 .sticky-cta-wrapper {
   @apply fixed text-center inset-x-0 bottom-0;
   bottom: 30px;

apps/page/customer/src/lib/customer-search/search-filter/search-filter.component.ts

@@ -45,6 +45,10 @@ export class CustomerSearchFilterComponent implements OnInit, OnDestroy {
     });
   }
 
+  clearFilter(value: UiFilter) {
+    value.unselectAll();
+  }
+
   resetFilter() {
     this.store.setDefaultFilter();
   }

apps/page/customer/src/lib/shared/customer-type-selector/customer-type-selector.component.html

@@ -1,11 +1,14 @@
-<ui-checkbox
-  *ngIf="customerType !== 'b2b'"
-  [ngModel]="p4mUser"
-  (ngModelChange)="setValue({ p4mUser: !p4mUser })"
-  [disabled]="p4mReadonly || readonly"
->
-  Kundenkarte
-</ui-checkbox>
+<ng-container *ifRole="'Store'">
+  <ui-checkbox
+    *ngIf="customerType !== 'b2b'"
+    [ngModel]="p4mUser"
+    (ngModelChange)="setValue({ p4mUser: !p4mUser })"
+    [disabled]="p4mReadonly || readonly"
+  >
+    Kundenkarte
+  </ui-checkbox>
+</ng-container>
+
 <ng-container *ngFor="let option of filteredOptions$ | async">
   <ui-checkbox
     *ngIf="option?.enabled !== false"

apps/page/customer/src/lib/shared/customer-type-selector/customer-type-selector.module.ts

@@ -4,9 +4,10 @@ import { CommonModule } from '@angular/common';
 import { CustomerTypeSelectorComponent } from './customer-type-selector.component';
 import { FormsModule } from '@angular/forms';
 import { UiCheckboxModule } from '@ui/checkbox';
+import { AuthModule } from '@core/auth';
 
 @NgModule({
-  imports: [CommonModule, FormsModule, UiCheckboxModule],
+  imports: [CommonModule, FormsModule, UiCheckboxModule, AuthModule],
   exports: [CustomerTypeSelectorComponent],
   declarations: [CustomerTypeSelectorComponent],
 })

apps/page/goods-in/src/lib/goods-in.module.ts

@@ -41,6 +41,9 @@ import {
   CollectOnDeliveryNoteActionHandler,
   CreateReturnItemActionHandler,
   PrintPriceDiffQrCodeLabelActionHandler,
+  CollectWithSmallAmountinvoiceActionHandler,
+  PrintSmallamountinvoiceActionHandler,
+  ShopWithKulturpassActionHandler,
 } from '@domain/oms';
 @NgModule({
   declarations: [GoodsInComponent],
@@ -85,6 +88,9 @@ import {
       CollectOnDeliveryNoteActionHandler,
       CreateReturnItemActionHandler,
       PrintPriceDiffQrCodeLabelActionHandler,
+      CollectWithSmallAmountinvoiceActionHandler,
+      PrintSmallamountinvoiceActionHandler,
+      ShopWithKulturpassActionHandler,
     ]),
   ],
   exports: [GoodsInComponent],

apps/page/goods-out/src/lib/goods-out.module.ts

@@ -39,6 +39,9 @@ import {
   ReOrderedActionHandler,
   CollectOnDeliveryNoteActionHandler,
   PrintPriceDiffQrCodeLabelActionHandler,
+  CollectWithSmallAmountinvoiceActionHandler,
+  PrintSmallamountinvoiceActionHandler,
+  ShopWithKulturpassActionHandler,
 } from '@domain/oms';
 import { CoreCommandModule } from '@core/command';
 import { ShellBreadcrumbModule } from '@shell/breadcrumb';
@@ -87,6 +90,9 @@ import { GoodsInRoutingModule } from './good-out-routing.module';
       SupplierTemporarilyOutOfStockActionHandler,
       CollectOnDeliveryNoteActionHandler,
       PrintPriceDiffQrCodeLabelActionHandler,
+      CollectWithSmallAmountinvoiceActionHandler,
+      PrintSmallamountinvoiceActionHandler,
+      ShopWithKulturpassActionHandler,
     ]),
   ],
   exports: [GoodsOutComponent],

apps/page/package-inspection/src/lib/components/package-details-list/package-details-list-item.component.html

@@ -25,7 +25,7 @@
     </div>
 
     <div class="package-details-list-item__product-details-2" *ngIf="showStockInfos$ | async">
-      <div class="package-details-list-item__inventory-quantity py-2">
+      <div class="package-details-list-item__inventory-quantity">
         <div class="grow">
           <ng-container *ngIf="showStockInfoTooltip$ | async">
             <button
@@ -61,6 +61,7 @@
           <span class="liefermenge isa-label bg-white text-black px-2 font-bold">{{ item?.quantity }}x</span>
         </div>
       </div>
+      <div class="package-details-list-item__ssc-text" *ngIf="item?.quantity == 0 && (sscText$ | async)">MS: {{ sscText$ | async }}</div>
     </div>
   </div>
 </div>

apps/page/package-inspection/src/lib/components/package-details-list/package-details-list-item.component.scss

@@ -69,11 +69,15 @@
 }
 
 .package-details-list-item__inventory-quantity {
-  @apply leading-7 flex flex-row items-center;
+  @apply leading-8 flex flex-row items-center;
 }
 
 .package-details-list-item__package-quantity {
-  @apply leading-9 flex flex-row items-center;
+  @apply leading-8 flex flex-row items-center;
+}
+
+.package-details-list-item__ssc-text {
+  @apply leading-8 flex flex-row items-center;
 }
 
 :host.light {

apps/page/package-inspection/src/lib/components/package-details-list/package-details-list-item.component.ts

@@ -24,6 +24,8 @@ export class PackageDetailsListItemComponent implements OnChanges {
 
   inStock$ = this._itemSubject.pipe(switchMap((item) => this._store.getInStockByEan$(item.product.ean)));
 
+  sscText$ = this._itemSubject.pipe(switchMap((item) => this._store.getSscTextByEan$(item.product.ean)));
+
   showStockInfoTooltip$ = this._store.arrivalStatus$.pipe(map((arrivalStatus) => arrivalStatus === 0));
 
   showStockInfos$ = this._store.arrivalStatus$.pipe(map((arrivalStatus) => arrivalStatus !== 8));

apps/page/package-inspection/src/lib/components/package-details-list/package-details-list.store.ts

@@ -65,6 +65,10 @@ export class PackageDetailsListStore extends ComponentStore<PackageDetailsListSt
     }
   };
 
+  static SSC_TEXT_BY_EAN = (ean: string) => (state: PackageDetailsListState) => {
+    return state.items.find((i) => i.product.ean === ean)?.ssc;
+  };
+
   static COMPARTMENTY_BY_EAN = (ean: string) => (state: PackageDetailsListState) => {
     const stockInfoCompartment = PackageDetailsListStore.STOCKINFO_BY_EAN(ean)(state)?.compartment;
 
@@ -145,6 +149,10 @@ export class PackageDetailsListStore extends ComponentStore<PackageDetailsListSt
     return this.select(PackageDetailsListStore.IN_STOCK_BY_EAN_SELECTOR(ean));
   }
 
+  getSscTextByEan$(ean: string) {
+    return this.select(PackageDetailsListStore.SSC_TEXT_BY_EAN(ean));
+  }
+
   getCompartmentByEan(ean: string) {
     return this.get(PackageDetailsListStore.COMPARTMENTY_BY_EAN(ean));
   }

apps/page/package-inspection/src/lib/components/package-list/package-list-item.component.html

@@ -1,5 +1,5 @@
-<div class="w-80">
-  <span class="page-package-list-item__package-number">
+<div class="w-64">
+  <span class="page-package-list-item__package-number truncate">
     {{ package?.packageNumber }}
   </span>
   <span class="page-package-list-item__number-divider" *ngIf="package?.packageNumber && package?.deliveryNoteNumber"> | </span>
@@ -13,7 +13,7 @@
 <div class="w-32 page-package-list-item__items-count">{{ package?.items }} <span class="font-normal">Exemplare</span></div>
 <div class="text-right grow">
   <div
-    class="rounded inline-block px-4 text-white page-package-list-item__arrival-status"
+    class="rounded inline-block px-4 text-white page-package-list-item__arrival-status whitespace-nowrap"
     [class]="package?.arrivalStatus | arrivalStatusColorClass"
   >
     {{ package?.arrivalStatus | arrivalStatus }}

apps/page/package-inspection/src/lib/components/wrong-destination-modal/wrong-destination-modal.component.ts

@@ -37,7 +37,7 @@ export class WrongDestinationModalComponent {
   async done(): Promise<void> {
     let promises: Promise<PackageArrivalStatusDTO>[] = [];
     for (const pkg of this.packages) {
-      promises.push(this._packageInspectionService.changePackageStatus(pkg, '0').toPromise());
+      promises.push(this._packageInspectionService.changePackageStatus(pkg, '8').toPromise());
     }
 
     await Promise.all(promises);

apps/page/package-inspection/src/lib/package-details/package-details.component.html

@@ -21,7 +21,7 @@
           korrekt?
         </p>
       </div>
-      <div class="bg-white" *ngSwitchCa se="'Fehlt'">
+      <div class="bg-white" *ngSwitchCase="'Fehlt'">
         <p class="text-center text-xl py-10">
           Prüfen Sie bitte stichprobenartig den Filialbestand <br />
           des dargestellten Artikels. Ist der angezeigte Filialbestand <br />

apps/page/package-inspection/src/lib/package-result/package-result.component.store.ts

@@ -1,5 +1,5 @@
-import { Injectable } from '@angular/core';
-import { DomainPackageInspectionService } from '@domain/package-inspection';
+import { Injectable, OnDestroy } from '@angular/core';
+import { DomainPackageInspectionService, PackageStatusChangedEvent } from '@domain/package-inspection';
 import { ComponentStore, OnStoreInit, tapResponse } from '@ngrx/component-store';
 import { ListResponseArgsOfPackageDTO2, PackageDTO2, QuerySettingsDTO } from '@swagger/wws';
 import { UiFilter } from '@ui/filter';
@@ -9,11 +9,15 @@ import { debounceTime, filter, switchMap, takeUntil, tap, withLatestFrom } from
 import { INITIAL_RESULT_COMPONENT_STATE, PackageResultComponentState } from './package-result.component.state';
 
 @Injectable()
-export class PackageResultComponentStore extends ComponentStore<PackageResultComponentState> implements OnStoreInit {
+export class PackageResultComponentStore extends ComponentStore<PackageResultComponentState> implements OnStoreInit, OnDestroy {
   showFilter$ = this.select((state) => state.showFilter);
 
   fetching$ = this.select((state) => state.fetching);
 
+  get fetching(): boolean {
+    return this.get((f) => f.fetching);
+  }
+
   filter$ = this.select((state) => state.filter);
 
   get filter(): UiFilter {
@@ -48,6 +52,17 @@ export class PackageResultComponentStore extends ComponentStore<PackageResultCom
 
   ngrxOnStoreInit() {
     this.fetchSettings();
+
+    this._packageInspectionService.events.pipe(takeUntil(this.destroy$)).subscribe((event) => {
+      if (event instanceof PackageStatusChangedEvent) {
+        this.refresh();
+      }
+    });
+  }
+
+  ngOnDestroy() {
+    super.ngOnDestroy();
+    this.cancelFetchPackages();
   }
 
   setShowFilter = this.updater((state, showFilter: boolean) => ({ ...state, showFilter }));
@@ -66,6 +81,19 @@ export class PackageResultComponentStore extends ComponentStore<PackageResultCom
 
   setTotal = this.updater((state, total: number) => ({ ...state, total }));
 
+  refresh = this.effect(($) =>
+    $.pipe(
+      debounceTime(250),
+      withLatestFrom(this.filter$, this.packages$),
+      tap(() => this.cancelFetchPackages()),
+      switchMap(([_, filter, packages]) =>
+        this._packageInspectionService
+          .queryPackagesResponse({ ...filter.getQueryToken(), skip: 0, take: Math.max(packages.length, 50) })
+          .pipe(takeUntil(this._cancleFetchPackages$), tapResponse(this.onFetchPackagesResponse, this.onFetchError))
+      )
+    )
+  );
+
   fetchSettings = this.effect(($) =>
     $.pipe(
       switchMap((_) => this._packageInspectionService.getQuerySettings().pipe(tapResponse(this.onFetchSettingsResponse, this.onFetchError)))

apps/page/package-inspection/src/lib/package-result/package-result.component.ts

@@ -14,6 +14,7 @@ import { filter, first, map } from 'rxjs/operators';
 import { PackageListComponent } from '../components/package-list';
 import { PackageResultCacheData } from './package-result-cache-data';
 import { PackageResultComponentStore } from './package-result.component.store';
+import { PackageInspectionNavigationService } from '../services/package-inspection-navigation.service';
 
 @Component({
   selector: 'page-package-result',
@@ -53,7 +54,8 @@ export class PackageResultComponent implements OnInit, AfterViewInit, OnDestroy
     private _config: Config,
     private _breadcrumb: BreadcrumbService,
     private _router: Router,
-    private _cache: CacheService
+    private _cache: CacheService,
+    private _navigation: PackageInspectionNavigationService
   ) {}
 
   ngOnInit(): void {
@@ -84,7 +86,7 @@ export class PackageResultComponent implements OnInit, AfterViewInit, OnDestroy
     const filterSub = combineLatest([initialFilter$, queryParams$]).subscribe(([filter, queryParams]) => {
       const restoredFilter = this.restoreFilterFromQueryParams(filter, queryParams);
       const restoredData = this.restoreResultsFromCache(restoredFilter);
-      this.createBreadcrumbIfNotExists(this.store.filter);
+      this.createBreadcrumbIfNotExists(restoredFilter || this.store.filter);
       this.fetchPackages(restoredFilter, { keep: true, take: restoredData?.packages?.length });
     });
 
@@ -155,6 +157,8 @@ export class PackageResultComponent implements OnInit, AfterViewInit, OnDestroy
     if (response.result.length === 0) {
       this.hint$.next('Keine Pakete gefunden');
       return;
+    } else if (response.result.length === 1) {
+      this._navigation.details(response.result[0].id).navigate();
     }
 
     this.cacheData({});

apps/page/package-inspection/src/lib/services/package-inspection-navigation.service.ts

@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
 import { PackageInspectionModule } from '../package-inspection.module';
+import { Params, Router } from '@angular/router';
 
-@Injectable({ providedIn: PackageInspectionModule })
+export interface Navigation {
+  path: any[];
+  queryParams?: Params;
+  navigate: () => Promise<boolean>;
+}
+
+@Injectable({ providedIn: 'root' })
 export class PackageInspectionNavigationService {
-  constructor() {}
+  constructor(private _router: Router) {}
 
-  navigateToPackageList(): Promise<void> {
-    return Promise.resolve();
-  }
+  details(id: string): Navigation {
+    const path = [`/filiale/package-inspection/packages/${id}`];
 
-  navigateToPackageDetails(): Promise<void> {
-    return Promise.resolve();
+    return {
+      path,
+      navigate: () => this._router.navigate(path),
+    };
   }
 }

apps/page/remission/src/lib/finish-remission/finish-remission.component.ts

@@ -47,8 +47,13 @@ export class FinishRemissionComponent implements OnInit, OnDestroy {
       try {
         const returnDto = await this._remissionService.getReturn(returnId).toPromise();
         this.clearProcessData();
+
+        let queryParams = { ...this._activatedRoute.snapshot.queryParams };
+
+        delete queryParams['complete'];
+
         await this._router.navigate(['/filiale', 'remission', 'create', returnDto.returnGroup], {
-          queryParams: { ...this._activatedRoute.snapshot.queryParams },
+          queryParams,
         });
       } catch (err) {
         this._modal.open({

apps/page/remission/src/lib/finish-shipping-document/finish-shipping-document.component.html

@@ -11,5 +11,6 @@
     [hint]="hint$ | async"
     (scan)="search($event)"
     [scanner]="true"
+    (hintCleared)="clearHint()"
   ></ui-searchbox>
 </div>

apps/page/remission/src/lib/finish-shipping-document/finish-shipping-document.component.ts

@@ -1,3 +1,4 @@
+import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { ChangeDetectionStrategy, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { BreadcrumbService } from '@core/breadcrumb';
@@ -58,8 +59,12 @@ export class FinishShippingDocumentComponent implements OnInit, OnDestroy {
     this._onDestroy$.complete();
   }
 
-  search(query: string) {
+  clearHint() {
     this.hint$.next('');
+  }
+
+  search(query: string) {
+    query = query?.trim();
     if (!query) {
       this.hint$.next('Ungültige Eingabe');
       return;
@@ -85,7 +90,14 @@ export class FinishShippingDocumentComponent implements OnInit, OnDestroy {
     modal.afterClosed$.pipe(takeUntil(this._onDestroy$)).subscribe(async (result) => {
       if (result?.data === 'correct') {
         await this.createReceiptAndAssignPackageNumber(query);
-        await this.navigateToRemissionList(query);
+
+        if (coerceBooleanProperty(this._activatedRoute.snapshot.queryParams?.complete)) {
+          this._router.navigate(['/filiale', 'remission', this.returnId, 'shipping-document'], {
+            queryParams: { complete: true },
+          });
+        } else {
+          await this.navigateToRemissionList(query);
+        }
       } else if (result?.data === 'rescan') {
         this.searchboxComponent.clear();
       }

apps/page/remission/src/lib/shipping-document-list/shipping-document-details/shipping-document-details.component.html

@@ -15,25 +15,21 @@
   </p>
 
   <div class="text-center mt-8">
-    <a
-      [routerLink]="['/filiale', 'remission', returnId$ | async, packageNumber$ | async, 'list']"
-      class="bg-brand text-white font-bold text-lg outline-none rounded-full px-6 py-3"
-    >
+    <button (click)="continue()" class="bg-brand text-white font-bold text-lg outline-none rounded-full px-6 py-3">
       Warenbegleitschein öffnen
-    </a>
+    </button>
   </div>
 </ng-container>
 
 <div class="actions">
   <ng-container *ngIf="remissionStarted$ | async">
-    <a
-      [routerLink]="['/filiale', 'remission', returnId$ | async, packageNumber$ | async, 'list']"
-      [queryParams]="queryParams$ | async"
+    <button
+      (click)="continue(true)"
       class="flex items-center bg-white font-bold text-lg px-6 py-3 rounded-full shadow-cta whitespace-nowrap"
     >
       <ui-icon class="mr-2" icon="arrow_head" size="16px" rotate="180deg"></ui-icon>
       Warenbegleitschein befüllen
-    </a>
+    </button>
     <button
       [disabled]="finishShippingDocumentDisabled$ | async"
       (click)="complete()"

apps/page/remission/src/lib/shipping-document-list/shipping-document-details/shipping-document-details.component.ts

@@ -11,6 +11,7 @@ import { NEVER, Observable } from 'rxjs';
 import { catchError, filter, first, map, shareReplay, switchMap, tap, withLatestFrom } from 'rxjs/operators';
 import { ShortReceiptNumberPipe } from '../../pipes/short-receipt-number.pipe';
 import { RemissionListComponentStore } from '../../remission-list/remission-list.component-store';
+import { coerceBooleanProperty } from '@angular/cdk/coercion';
 
 export interface ShippingDocumentDetailsState {
   remissionStarted?: boolean;
@@ -159,8 +160,16 @@ export class ShippingDocumentDetailsComponent extends ComponentStore<ShippingDoc
   }
 
   async complete() {
-    if (await this.completeReceipt()) {
-      await this.completeReturn();
+    if (!this.get((s) => s.packageNumber)) {
+      const returnId = this.return.id;
+      const firstReceiptId = this.firstReceipt?.id;
+      this._router.navigate(['/filiale/remission', returnId, 'finish-shipping-document', firstReceiptId], {
+        queryParams: { complete: true },
+      });
+    } else {
+      if (await this.completeReceipt()) {
+        await this.completeReturn();
+      }
     }
   }
 
@@ -258,6 +267,10 @@ export class ShippingDocumentDetailsComponent extends ComponentStore<ShippingDoc
           this.setReturn(r);
 
           this.addOrUpdateBreadcrumbIfNotExists(r);
+
+          if (coerceBooleanProperty(this._activatedRoute.snapshot.queryParams?.complete)) {
+            this.complete();
+          }
         },
         (err) => {
           this.navigateBack();
@@ -280,4 +293,27 @@ export class ShippingDocumentDetailsComponent extends ComponentStore<ShippingDoc
     ...state,
     return: r,
   }));
+
+  continue(addQueryParams?: boolean) {
+    const packageNumber = this.get((s) => s.packageNumber);
+    const returnId = this.get((s) => s.return.id);
+
+    let queryParams = {};
+
+    if (addQueryParams) {
+      queryParams = this._activatedRoute.snapshot.queryParams;
+    }
+
+    if (!packageNumber) {
+      const receiptId = this.firstReceipt?.id;
+      this._router.navigate(['/filiale/remission', returnId, 'finish-shipping-document', receiptId], {
+        queryParams,
+      });
+    } else {
+      console.log('packageNumber', packageNumber);
+      this._router.navigate(['/filiale/remission', returnId, packageNumber, 'list'], {
+        queryParams,
+      });
+    }
+  }
 }

apps/shared/components/branch-selector/src/lib/branch-selector.component.ts

@@ -207,14 +207,18 @@ export class BranchSelectorComponent implements OnInit, OnDestroy, AfterViewInit
 
   clear() {
     this.setBranch();
-    this.emitValues();
     this.complete.next('');
+    this.onChange(undefined);
+    this.onTouched();
+    this.valueChange.emit(undefined);
   }
 
   emitValues(branch?: BranchDTO) {
-    this.onChange(branch);
-    this.onTouched();
-    this.valueChange.emit(branch);
+    if (!!branch) {
+      this.onChange(branch);
+      this.onTouched();
+      this.valueChange.emit(branch);
+    }
   }
 
   closeAndClearAutocomplete() {

apps/shared/components/goods-in-out/src/lib/goods-in-out-order-details/goods-in-out-order-details-header/goods-in-out-order-details-header.component.html

@@ -18,7 +18,7 @@
     </div>
 
     <div class="goods-in-out-header-details">
-      <h2 class="goods-in-out-header-details-header">
+      <h2 class="goods-in-out-header-details-header text-2xl">
         <div class="goods-in-out-header-details-header-name">
           {{ orderItem?.organisation }}
           <ng-container *ngIf="!!orderItem?.organisation && (!!orderItem?.firstName || !!orderItem?.lastName)"> - </ng-container>
@@ -30,10 +30,18 @@
         </div>
       </h2>
 
-      <div class="goods-in-out-header-details-paid-marker" *ngIf="orderItem?.features?.paid">
+      <div class="goods-in-out-header-details-paid-marker" *ngIf="orderItem?.features?.paid && !isKulturpass">
         <ui-icon size="12px" icon="check"></ui-icon>
         <strong> {{ orderItem?.features?.paid }} </strong>
       </div>
+      <div class="goods-in-out-header-details-paid-marker text-[#26830C]" *ngIf="isKulturpass">
+        <svg class="fill-current mr-2" xmlns="http://www.w3.org/2000/svg" height="22" viewBox="0 -960 960 960" width="22">
+          <path
+            d="M880-740v520q0 24-18 42t-42 18H140q-24 0-42-18t-18-42v-520q0-24 18-42t42-18h680q24 0 42 18t18 42ZM140-631h680v-109H140v109Zm0 129v282h680v-282H140Zm0 282v-520 520Z"
+          />
+        </svg>
+        <strong> Bezahlt über KulturPass </strong>
+      </div>
 
       <div class="goods-in-out-header-details-wrapper">
         <div class="detail" data-detail-id="VorgangId">
@@ -78,7 +86,7 @@
         </div>
         <div class="detail" data-detail-id="Bestellkanal">
           <div class="label">Bestellkanal</div>
-          <div class="value">{{ orderItem?.clientChannel | environmentChannel }}</div>
+          <div class="value">{{ order?.features?.orderSource }}</div>
         </div>
         <div class="detail justify-space-between" [ngSwitch]="orderItem.processingStatus" data-detail-id="Geaendert">
           <ng-container *ifRole="'Store'; else dateCallCenter">
@@ -251,7 +259,7 @@
       <button
         [uiOverlayTrigger]="deadlineDatepicker"
         #deadlineDatepickerTrigger="uiOverlayTrigger"
-        [disabled]="!!orderItem?.features?.paid || (changeDateDisabled$ | async)"
+        [disabled]="!isKulturpass && (!!orderItem?.features?.paid || (changeDateDisabled$ | async))"
         class="cta-pickup-deadline"
       >
         <strong>
@@ -280,7 +288,7 @@
       <button
         [uiOverlayTrigger]="preferredPickUpDatePicker"
         #preferredPickUpDatePickerTrigger="uiOverlayTrigger"
-        [disabled]="!!orderItem?.features?.paid || (changeDateDisabled$ | async)"
+        [disabled]="preferredPickUpDateDisabled$ | async"
         class="cta-pickup-preferred"
       >
         <strong *ngIf="preferredPickUpDate$ | async; let pickUpDate; else: selectTemplate">
@@ -311,7 +319,7 @@
     <div *ngIf="!(changeDateLoader$ | async)" class="value">
       <button
         class="cta-datepicker"
-        [disabled]="changeDateDisabled$ | async"
+        [disabled]="vslLieferdatumDisabled$ | async"
         [uiOverlayTrigger]="uiDatepicker"
         #datepicker="uiOverlayTrigger"
       >

apps/shared/components/goods-in-out/src/lib/goods-in-out-order-details/goods-in-out-order-details-header/goods-in-out-order-details-header.component.ts

@@ -12,12 +12,14 @@ import {
 import { CrmCustomerService } from '@domain/crm';
 import { DomainOmsService } from '@domain/oms';
 import { NotificationChannel } from '@swagger/checkout';
-import { KeyValueDTOOfStringAndString, OrderDTO, OrderItemListItemDTO } from '@swagger/oms';
+import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString, OrderDTO, OrderItemListItemDTO } from '@swagger/oms';
 import { DateAdapter } from '@ui/common';
 import { cloneDeep } from 'lodash';
 import { BehaviorSubject, combineLatest } from 'rxjs';
 import { filter, first, map, shareReplay, switchMap } from 'rxjs/operators';
 import { SharedGoodsInOutOrderDetailsComponent } from '../goods-in-out-order-details.component';
+import { Config } from '@core/config';
+import { coerceArray } from '@angular/cdk/coercion';
 
 @Component({
   selector: 'shared-goods-in-out-order-details-header',
@@ -27,7 +29,7 @@ import { SharedGoodsInOutOrderDetailsComponent } from '../goods-in-out-order-det
 })
 export class SharedGoodsInOutOrderDetailsHeaderComponent implements OnChanges {
   @Output()
-  editClick = new EventEmitter<OrderItemListItemDTO>();
+  editClick = new EventEmitter<DBHOrderItemListItemDTO>();
 
   @Input()
   order: OrderDTO;
@@ -35,6 +37,10 @@ export class SharedGoodsInOutOrderDetailsHeaderComponent implements OnChanges {
   @Input()
   selectedOrderItemId: number;
 
+  get isKulturpass() {
+    return this.order?.features?.orderSource === 'KulturPass';
+  }
+
   minDateDatepicker = this.dateAdapter.addCalendarDays(this.dateAdapter.today(), -1);
   today = this.dateAdapter.today();
 
@@ -96,12 +102,37 @@ export class SharedGoodsInOutOrderDetailsHeaderComponent implements OnChanges {
     return !!this.order?.features && !!this.order?.features?.orderType;
   }
 
+  preferredPickUpDateDisabled$ = combineLatest([this.changeDateDisabled$, this.orderItem$]).pipe(
+    map(([changeDateDisabled, orderItem]) => {
+      if (changeDateDisabled) {
+        return true;
+      }
+
+      if ((orderItem?.orderItemType & 1024) === 1024) {
+        return true;
+      }
+
+      return !this.isKulturpass && !!orderItem?.features?.paid;
+    })
+  );
+
+  vslLieferdatumDisabled$ = combineLatest([this.changeDateDisabled$, this.orderItem$]).pipe(
+    map(([changeDateDisabled, orderItem]) => {
+      if (changeDateDisabled) {
+        return true;
+      }
+
+      return (orderItem?.orderItemType & 1024) === 1024;
+    })
+  );
+
   constructor(
     @Host() private host: SharedGoodsInOutOrderDetailsComponent,
     private customerService: CrmCustomerService,
     private dateAdapter: DateAdapter,
     private omsService: DomainOmsService,
-    private cdr: ChangeDetectorRef
+    private cdr: ChangeDetectorRef,
+    private config: Config
   ) {}
 
   ngOnChanges(changes: SimpleChanges): void {

apps/shared/components/goods-in-out/src/lib/goods-in-out-order-details/goods-in-out-order-details-item/goods-in-out-order-details-item.component.ts

@@ -175,7 +175,7 @@ export class SharedGoodsInOutOrderDetailsItemComponent extends ComponentStore<Sh
       switchMap(([done, orderItem]) =>
         this._domainReceiptService
           .getReceipts({
-            receiptType: 65 as ReceiptType,
+            receiptType: (1 + 64 + 128) as ReceiptType,
             ids: [orderItem.orderItemSubsetId],
             eagerLoading: 1,
           })
@@ -184,7 +184,6 @@ export class SharedGoodsInOutOrderDetailsItemComponent extends ComponentStore<Sh
               (res) => {
                 const receipts = res.result.map((r) => r.item3?.data).filter((f) => !!f);
                 this.receipts = receipts;
-
                 if (typeof done === 'function') {
                   done?.(receipts);
                 }

apps/shared/components/goods-in-out/src/lib/goods-in-out-order-details/goods-in-out-order-details.component.ts

@@ -12,6 +12,7 @@ import { SharedGoodsInOutOrderDetailsCoversComponent } from './goods-in-out-orde
 import { SharedGoodsInOutOrderDetailsItemComponent } from './goods-in-out-order-details-item';
 import { SharedGoodsInOutOrderDetailsTagsComponent } from './goods-in-out-order-details-tags';
 import { SharedGoodsInOutOrderDetailsStore } from './goods-in-out-order-details.store';
+import { SharedGoodsInOutOrderDetailsHeaderComponent } from './goods-in-out-order-details-header';
 
 @Component({
   selector: 'shared-goods-in-out-order-details',
@@ -26,6 +27,9 @@ import { SharedGoodsInOutOrderDetailsStore } from './goods-in-out-order-details.
   ],
 })
 export class SharedGoodsInOutOrderDetailsComponent extends SharedGoodsInOutOrderDetailsStore implements AfterContentInit, OnDestroy {
+  @ContentChild(SharedGoodsInOutOrderDetailsHeaderComponent)
+  orderDetailsHeaderComponent: SharedGoodsInOutOrderDetailsHeaderComponent;
+
   @ContentChildren(SharedGoodsInOutOrderDetailsItemComponent)
   orderDetailsItemComponents: QueryList<SharedGoodsInOutOrderDetailsItemComponent>;
 
@@ -177,16 +181,15 @@ export class SharedGoodsInOutOrderDetailsComponent extends SharedGoodsInOutOrder
       return;
     }
     let receipts: ReceiptDTO[] = [];
-    if (action.command.includes('PRINT_SHIPPINGNOTE')) {
+    if (action.command.includes('PRINT_SHIPPINGNOTE') || action.command === 'PRINT_SMALLAMOUNTINVOICE') {
       const receiptsPromise = this.orderDetailsItemComponents.toArray().map(
-        (timeComponent) =>
+        (itemCmp) =>
           new Promise<ReceiptDTO[]>((resolve) => {
-            timeComponent.loadReceipts((r) => resolve(r));
+            itemCmp.loadReceipts((r) => resolve(r));
           })
       );
 
       receipts = await Promise.all(receiptsPromise).then((r) => r.reduce((acc, val) => acc.concat(val), []));
-
       receipts = unionBy(receipts, 'id');
     }
 
@@ -206,6 +209,7 @@ export class SharedGoodsInOutOrderDetailsComponent extends SharedGoodsInOutOrder
         action.command.includes('PRINT_PRICEDIFFQRCODELABEL') && !compartmentCode ? this.orderItems[0]?.compartmentCode : compartmentCode,
       itemQuantity: this.getItemQuantityMap(),
       receipts,
+      order: this.orderDetailsHeaderComponent?.order,
     };
     try {
       commandData = await this.commandService.handleCommand(command, commandData);

apps/shared/components/goods-in-out/src/lib/goods-in-out-order-details/goods-in-out-order-details.store.ts

@@ -1,13 +1,13 @@
 import { OnDestroy } from '@angular/core';
 import { ComponentStore } from '@ngrx/component-store';
-import { KeyValueDTOOfStringAndString, OrderItemListItemDTO, ReceiptDTO } from '@swagger/oms';
+import { DBHOrderItemListItemDTO, KeyValueDTOOfStringAndString, ReceiptDTO } from '@swagger/oms';
 import { isEqual } from 'lodash';
 import { combineLatest, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 export interface SharedGoodsInOutOrderDetailsComponentState {
-  orderItems: OrderItemListItemDTO[];
-  coverItems: OrderItemListItemDTO[];
+  orderItems: DBHOrderItemListItemDTO[];
+  coverItems: DBHOrderItemListItemDTO[];
   receipts: ReceiptDTO[];
   compartmentInfo?: string;
   latestCompartmentCode?: string;
@@ -26,7 +26,7 @@ export abstract class SharedGoodsInOutOrderDetailsStore extends ComponentStore<S
   get orderItems() {
     return this.get((s) => s.orderItems);
   }
-  set orderItems(orderItems: OrderItemListItemDTO[]) {
+  set orderItems(orderItems: DBHOrderItemListItemDTO[]) {
     if (!isEqual(this.orderItems, orderItems)) {
       this.patchState({ orderItems });
     }
@@ -37,7 +37,7 @@ export abstract class SharedGoodsInOutOrderDetailsStore extends ComponentStore<S
   get coverItems() {
     return this.get((s) => s.coverItems);
   }
-  set coverItems(coverItems: OrderItemListItemDTO[]) {
+  set coverItems(coverItems: DBHOrderItemListItemDTO[]) {
     if (!isEqual(this.coverItems, coverItems)) {
       this.patchState({ coverItems });
     }
@@ -162,7 +162,7 @@ export abstract class SharedGoodsInOutOrderDetailsStore extends ComponentStore<S
     });
   }
 
-  updateOrderItems(orderItems: OrderItemListItemDTO[]) {
+  updateOrderItems(orderItems: DBHOrderItemListItemDTO[]) {
     this.patchState({
       orderItems: this.orderItems.map((item) => {
         const newItem = orderItems.find((i) => i.orderItemSubsetId === item.orderItemSubsetId);
@@ -183,7 +183,7 @@ export abstract class SharedGoodsInOutOrderDetailsStore extends ComponentStore<S
     this.patchState({ selectedeOrderItemSubsetIds: this.orderItems?.map((item) => item.orderItemSubsetId) });
   }
 
-  selectOrderItem(item: OrderItemListItemDTO, selected: boolean) {
+  selectOrderItem(item: DBHOrderItemListItemDTO, selected: boolean) {
     const included = this.selectedeOrderItemSubsetIds.includes(item?.orderItemSubsetId);
 
     if (!included && selected) {

apps/shared/components/goods-in-out/src/lib/goods-in-out-order-edit/goods-in-out-order-edit.component.html

@@ -102,7 +102,7 @@
             <button
               [uiOverlayTrigger]="deadlineDatepicker"
               #deadlineDatepickerTrigger="uiOverlayTrigger"
-              [disabled]="!!items[i]?.features?.paid"
+              [disabled]="!isKulturpass(items[i]) && !!items[i]?.features?.paid"
               class="date-btn"
               type="button"
             >
@@ -154,7 +154,7 @@
         </div>
 
         <ui-form-control label="Vormerker" variant="inline">
-          <ui-select formControlName="isPrebooked">
+          <ui-select formControlName="isPrebooked" readonly="true">
             <ui-select-option label="Ja" [value]="true"></ui-select-option>
             <ui-select-option label="Nein" [value]="false"></ui-select-option>
           </ui-select>

apps/shared/components/goods-in-out/src/lib/goods-in-out-order-edit/goods-in-out-order-edit.component.ts

@@ -23,7 +23,6 @@ import { UiSelectOptionComponent } from '@ui/select';
 import { BehaviorSubject, Observable, Subscription } from 'rxjs';
 import { first, shareReplay } from 'rxjs/operators';
 import { ProcessingStatusNameMap } from '../constants/processing-status-name.map';
-import { EnvironmentChannelPipe } from '../pipes/environment-channel.pipe';
 import { ProcessingStatusPipe } from '../pipes/processing-status.pipe';
 import { validateSsc } from '../validators/ssc.validator';
 
@@ -32,7 +31,7 @@ import { validateSsc } from '../validators/ssc.validator';
   templateUrl: 'goods-in-out-order-edit.component.html',
   styleUrls: ['goods-in-out-order-edit.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
-  providers: [EnvironmentChannelPipe, ProcessingStatusPipe, DatePipe],
+  providers: [ProcessingStatusPipe, DatePipe],
 })
 export class SharedGoodsInOutOrderEditComponent implements OnChanges, OnDestroy {
   @ViewChildren('autosize') autosize: QueryList<CdkTextareaAutosize>;
@@ -77,7 +76,6 @@ export class SharedGoodsInOutOrderEditComponent implements OnChanges, OnDestroy
 
   constructor(
     private fb: UntypedFormBuilder,
-    private environmentChannelPipe: EnvironmentChannelPipe,
     private processingStatusPipe: ProcessingStatusPipe,
     private datePipe: DatePipe,
     private omsService: DomainOmsService,
@@ -101,7 +99,11 @@ export class SharedGoodsInOutOrderEditComponent implements OnChanges, OnDestroy
     }
   }
 
-  initForm(items: OrderItemListItemDTO[]) {
+  isKulturpass(item: OrderItemListItemDTO): boolean {
+    return item?.['externalRepositories']?.includes('kulturpass');
+  }
+
+  async initForm(items: OrderItemListItemDTO[]) {
     if (items.length === 0) {
       return;
     }
@@ -111,7 +113,7 @@ export class SharedGoodsInOutOrderEditComponent implements OnChanges, OnDestroy
       orderId: fb.control({ value: items[0].orderId, disabled: true }),
       orderNumber: fb.control({ value: items[0].orderNumber, disabled: true }),
       orderDate: fb.control({ value: this.datePipe.transform(items[0].orderDate), disabled: true }),
-      clientChannel: fb.control({ value: this.environmentChannelPipe.transform(items[0].clientChannel), disabled: true }),
+      clientChannel: fb.control({ value: (await this.getOrderSource()) ?? items[0].features?.orderSource, disabled: true }),
       buyerNumber: fb.control({ value: items[0].buyerNumber, disabled: true }),
       items: fb.array([]),
       notificationChannel: this.notificationsGroup,
@@ -172,8 +174,7 @@ export class SharedGoodsInOutOrderEditComponent implements OnChanges, OnDestroy
   }
 
   async updateNotificationsGroup() {
-    const control = this.control?.getRawValue();
-    const orderId = control?.orderId;
+    const orderId = this.items[0].orderId;
 
     try {
       if (orderId) {
@@ -192,6 +193,11 @@ export class SharedGoodsInOutOrderEditComponent implements OnChanges, OnDestroy
     await this.omsService.updateNotifications(orderId, this.notificationsGroup.getRawValue()).toPromise();
   }
 
+  async getOrderSource() {
+    const orderId = this.items[0].orderId;
+    return this.omsService.getOrderSource(+orderId).toPromise();
+  }
+
   changeEstimatedDeliveryDate(date: Date, item: OrderItemListItemDTO) {
     if (!date) {
       return;

apps/shared/components/goods-in-out/src/lib/goods-in-out-order-group/goods-in-out-order-group-item.component.html

@@ -2,10 +2,18 @@
   {{ item?.compartmentCode }}
   {{ item.compartmentInfo && '_' + item.compartmentInfo }}
 </div>
-<div class="goods-in-out-order-group-item-paid" *ngIf="item.features?.paid">
+<div class="goods-in-out-order-group-item-paid" *ngIf="item.features?.paid && !isKulturpass">
   <ui-icon size="12px" icon="check"></ui-icon>
   <strong> {{ item.features?.paid }} </strong>
 </div>
+<div class="goods-in-out-order-group-item-paid text-[#26830C]" *ngIf="isKulturpass">
+  <svg class="fill-current mr-2" xmlns="http://www.w3.org/2000/svg" height="22" viewBox="0 -960 960 960" width="22">
+    <path
+      d="M880-740v520q0 24-18 42t-42 18H140q-24 0-42-18t-18-42v-520q0-24 18-42t42-18h680q24 0 42 18t18 42ZM140-631h680v-109H140v109Zm0 129v282h680v-282H140Zm0 282v-520 520Z"
+    />
+  </svg>
+  <strong> Bezahlt über KulturPass </strong>
+</div>
 <div class="goods-in-out-order-group-item-details">
   <div class="goods-in-out-order-group-item-details-thumbnail">
     <img loading="lazy" *ngIf="item?.product?.ean | productImage; let productImage" [src]="productImage" [alt]="item?.product?.name" />

apps/shared/components/goods-in-out/src/lib/goods-in-out-order-group/goods-in-out-order-group-item.component.ts

@@ -84,6 +84,10 @@ export class GoodsInOutOrderGroupItemComponent extends ComponentStore<GoodsInOut
     return (this.item as any)?.cruda;
   }
 
+  get isKulturpass() {
+    return this.item?.['externalRepositories']?.includes('kulturpass');
+  }
+
   constructor() {
     super({
       selected: false,

apps/shared/components/goods-in-out/src/lib/pipes/environment-channel.pipe.ts

@@ -1,35 +0,0 @@
-import { Injectable, Pipe, PipeTransform } from '@angular/core';
-import { EnvironmentChannel } from '@swagger/oms';
-
-@Pipe({
-  name: 'environmentChannel',
-})
-@Injectable()
-export class EnvironmentChannelPipe implements PipeTransform {
-  channels = new Map([
-    [0, ''],
-    [2, 'Filiale'],
-    [4, 'HSC'],
-    [8, 'Online'],
-  ]);
-
-  transform(clientChannel: EnvironmentChannel = 0, join: string = ' '): any {
-    if (clientChannel === 0) {
-      return this.channels.get(0);
-    }
-
-    const channelOnlineMobileApp: number = clientChannel;
-    if (channelOnlineMobileApp === 8 || channelOnlineMobileApp === 16 || channelOnlineMobileApp === 24) {
-      return 'hugendubel.de';
-    }
-
-    const channels: string[] = [];
-    this.channels.forEach((value, key) => {
-      // tslint:disable-next-line: no-bitwise
-      if ((clientChannel | key) === key) {
-        channels.push(value);
-      }
-    });
-    return channels.join(join);
-  }
-}

apps/shared/components/goods-in-out/src/lib/pipes/pipes.module.ts

@@ -1,5 +1,4 @@
 import { NgModule } from '@angular/core';
-import { EnvironmentChannelPipe } from './environment-channel.pipe';
 import { ProcessingStatusOptionsKeyValuePipe, ProcessingStatusOptionsPipe } from './processing-status-options.pipe';
 import { PaymentTypePipe } from './payment-type.pipe';
 import { ProcessingStatusPipe } from './processing-status.pipe';
@@ -18,7 +17,6 @@ import { AddToPreviousCompartmentCodeLabelPipe } from './add-to-prevoius-compart
     ProcessingStatusPipe,
     TitlePipe,
     ShowCompartmentCodePipe,
-    EnvironmentChannelPipe,
     ProcessingStatusOptionsKeyValuePipe,
     PaymentTypePipe,
     ShowTagsPipe,
@@ -33,7 +31,6 @@ import { AddToPreviousCompartmentCodeLabelPipe } from './add-to-prevoius-compart
     ProcessingStatusPipe,
     TitlePipe,
     ShowCompartmentCodePipe,
-    EnvironmentChannelPipe,
     ProcessingStatusOptionsKeyValuePipe,
     PaymentTypePipe,
     ShowTagsPipe,

apps/shared/components/loader/ng-package.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}

apps/shared/components/loader/src/lib/loader.component.css

@@ -0,0 +1,11 @@
+.shared-loader {
+  @apply relative block h-full;
+}
+
+.shared-loader__spinner {
+  @apply absolute inset-0 flex items-center justify-center;
+}
+
+.shared-loader__background {
+  @apply bg-white bg-opacity-75;
+}

apps/shared/components/loader/src/lib/loader.component.html

@@ -0,0 +1,6 @@
+<div class="shared-loader__spinner" *ngIf="showLoader" [class.shared-loader__background]="showBackground">
+  <ui-icon class="animate-spin" icon="spinner" [size]="spinnerSizeInRem"></ui-icon>
+</div>
+<div [class.invisible]="showLoader && contentHidden">
+  <ng-content></ng-content>
+</div>

apps/shared/components/loader/src/lib/loader.component.ts

@@ -0,0 +1,43 @@
+import { BooleanInput, NumberInput, coerceBooleanProperty, coerceNumberProperty } from '@angular/cdk/coercion';
+import { NgIf } from '@angular/common';
+import { Component, ChangeDetectionStrategy, ViewEncapsulation, Input } from '@angular/core';
+import { UiIconModule } from '@ui/icon';
+
+@Component({
+  selector: 'shared-loader',
+  templateUrl: 'loader.component.html',
+  styleUrls: ['loader.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  encapsulation: ViewEncapsulation.None,
+  host: { class: 'shared-loader' },
+  standalone: true,
+  imports: [NgIf, UiIconModule],
+})
+export class LoaderComponent {
+  @Input() loading: BooleanInput;
+
+  @Input() background: BooleanInput;
+
+  @Input() spinnerSize: NumberInput = 24;
+
+  @Input() hideContent: BooleanInput;
+
+  get showLoader() {
+    console.log('showLoader', this.loading);
+    return coerceBooleanProperty(this.loading);
+  }
+
+  get showBackground() {
+    return coerceBooleanProperty(this.background);
+  }
+
+  get spinnerSizeInRem() {
+    return coerceNumberProperty(this.spinnerSize) / 16 + 'rem';
+  }
+
+  get contentHidden() {
+    return coerceBooleanProperty(this.hideContent);
+  }
+
+  constructor() {}
+}

apps/shared/components/loader/src/lib/loader.module.ts

@@ -0,0 +1,9 @@
+import { NgModule } from '@angular/core';
+
+import { LoaderComponent } from './loader.component';
+
+@NgModule({
+  imports: [LoaderComponent],
+  exports: [LoaderComponent],
+})
+export class LoaderModule {}