Merge branch 'release/2.1'

#3613 Wannennummer Scannen - Dialog erweitert

.npmrc

@@ -1,3 +1 @@
-@isa:registry=https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel%40Local/npm/registry/
-@cmf:registry=https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel%40Local/npm/registry/
-always-auth=true
+@paragondata:registry=https://npm.pkg.github.com

angular.json

@@ -3629,6 +3629,37 @@
           }
         }
       }
+    },
+    "@ui/form-field": {
+      "projectType": "library",
+      "root": "apps/ui/form-field",
+      "sourceRoot": "apps/ui/form-field/src",
+      "prefix": "lib",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:ng-packagr",
+          "options": {
+            "project": "apps/ui/form-field/ng-package.json"
+          },
+          "configurations": {
+            "production": {
+              "tsConfig": "apps/ui/form-field/tsconfig.lib.prod.json"
+            },
+            "development": {
+              "tsConfig": "apps/ui/form-field/tsconfig.lib.json"
+            }
+          },
+          "defaultConfiguration": "production"
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "apps/ui/form-field/src/test.ts",
+            "tsConfig": "apps/ui/form-field/tsconfig.spec.json",
+            "karmaConfig": "apps/ui/form-field/karma.conf.js"
+          }
+        }
+      }
     }
   },
   "defaultProject": "isa-app"

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

@@ -31,7 +31,11 @@ export class AuthService {
     this._oAuthService.tokenValidationHandler = new JwksValidationHandler();
 
     this._oAuthService.setupAutomaticSilentRefresh();
-    await this._oAuthService.loadDiscoveryDocumentAndTryLogin();
+    try {
+      await this._oAuthService.loadDiscoveryDocumentAndTryLogin();
+    } catch (error) {
+      this.login();
+    }
 
     this._initialized.next(true);
   }

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

@@ -1,10 +1,10 @@
-import { Injectable, Injector } from '@angular/core';
+import { Injectable, Injector, Optional, SkipSelf } from '@angular/core';
 import { ActionHandler } from './action-handler.interface';
 import { FEATURE_ACTION_HANDLERS, ROOT_ACTION_HANDLERS } from './tokens';
 
 @Injectable()
 export class CommandService {
-  constructor(private injector: Injector) {}
+  constructor(private injector: Injector, @Optional() @SkipSelf() private _parent: CommandService) {}
 
   async handleCommand<T>(command: string, data?: T): Promise<T> {
     const actions = this.getActions(command);
@@ -15,7 +15,7 @@ export class CommandService {
         console.error('CommandService.handleCommand', 'Action Handler does not exist', { action });
         throw new Error('Action Handler does not exist');
       }
-      console.log('handle command', handler, data);
+
       data = await handler.handler(data);
     }
     return data;
@@ -25,10 +25,16 @@ export class CommandService {
     return command?.split('|') || [];
   }
 
-  getActionHandler(action: string): ActionHandler {
+  getActionHandler(action: string): ActionHandler | undefined {
     const featureActionHandlers: ActionHandler[] = this.injector.get(FEATURE_ACTION_HANDLERS, []);
     const rootActionHandlers: ActionHandler[] = this.injector.get(ROOT_ACTION_HANDLERS, []);
 
-    return [...featureActionHandlers, ...rootActionHandlers].find((handler) => handler.action === action);
+    let handler = [...featureActionHandlers, ...rootActionHandlers].find((handler) => handler.action === action);
+
+    if (this._parent && !handler) {
+      handler = this._parent.getActionHandler(action);
+    }
+
+    return handler;
   }
 }

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

@@ -1,34 +1,42 @@
 import { Injectable } from '@angular/core';
 import { ItemDTO } from '@swagger/cat';
-import { AvailabilityDTO, BranchDTO, OLAAvailabilityDTO, StoreCheckoutService, SupplierDTO } from '@swagger/checkout';
+import {
+  AvailabilityDTO,
+  BranchDTO,
+  OLAAvailabilityDTO,
+  StoreCheckoutBranchService,
+  StoreCheckoutSupplierService,
+  SupplierDTO,
+} from '@swagger/checkout';
 import { combineLatest, Observable, of } from 'rxjs';
 import {
   AvailabilityRequestDTO,
-  AvailabilityService as SwaggerAvailabilityService,
+  AvailabilityService,
   AvailabilityDTO as SwaggerAvailabilityDTO,
   AvailabilityType,
 } from '@swagger/availability';
 import { AvailabilityDTO as CatAvailabilityDTO } from '@swagger/cat';
 import { map, shareReplay, switchMap, withLatestFrom, mergeMap, timeout } from 'rxjs/operators';
 import { isArray, memorize } from '@utils/common';
-import { OrderService } from '@swagger/oms';
+import { LogisticianDTO, LogisticianService } from '@swagger/oms';
 import { ResponseArgsOfIEnumerableOfStockInfoDTO, StockDTO, StockInfoDTO, StockService } from '@swagger/remi';
-import { ItemData } from './defs/item-data.model';
 import { PriceDTO } from '@swagger/availability';
-import { AvailabilityByBranchDTO } from './defs/availability-by-branch-dto.model';
+import { AvailabilityByBranchDTO, ItemData } from './defs';
+import { Availability } from './defs/availability';
 
 @Injectable()
 export class DomainAvailabilityService {
   constructor(
-    private swaggerAvailabilityService: SwaggerAvailabilityService,
-    private storeCheckoutService: StoreCheckoutService,
-    private orderService: OrderService,
-    private _stock: StockService
+    private _availabilityService: AvailabilityService,
+    private _logisticanService: LogisticianService,
+    private _stockService: StockService,
+    private _supplierService: StoreCheckoutSupplierService,
+    private _branchService: StoreCheckoutBranchService
   ) {}
 
   @memorize()
   getSuppliers(): Observable<SupplierDTO[]> {
-    return this.storeCheckoutService.StoreCheckoutGetSuppliers({}).pipe(
+    return this._supplierService.StoreCheckoutSupplierGetSuppliers({}).pipe(
       map((response) => response.result),
       shareReplay()
     );
@@ -36,7 +44,7 @@ export class DomainAvailabilityService {
 
   @memorize()
   getTakeAwaySupplier(): Observable<SupplierDTO> {
-    return this.storeCheckoutService.StoreCheckoutGetSuppliers({}).pipe(
+    return this._supplierService.StoreCheckoutSupplierGetSuppliers({}).pipe(
       map(({ result }) => result?.find((supplier) => supplier?.supplierNumber === 'F')),
       shareReplay()
     );
@@ -44,7 +52,7 @@ export class DomainAvailabilityService {
 
   @memorize()
   getBranches(): Observable<BranchDTO[]> {
-    return this.storeCheckoutService.StoreCheckoutGetBranches({}).pipe(
+    return this._branchService.StoreCheckoutBranchGetBranches({}).pipe(
       map((response) => response.result),
       shareReplay()
     );
@@ -52,7 +60,7 @@ export class DomainAvailabilityService {
 
   @memorize()
   getCurrentStock(): Observable<StockDTO> {
-    return this._stock.StockCurrentStock().pipe(
+    return this._stockService.StockCurrentStock().pipe(
       map((response) => response.result),
       shareReplay()
     );
@@ -60,7 +68,7 @@ export class DomainAvailabilityService {
 
   @memorize()
   getCurrentBranch(): Observable<BranchDTO> {
-    return this._stock.StockCurrentBranch().pipe(
+    return this._stockService.StockCurrentBranch().pipe(
       map((response) => ({
         id: response.result.id,
         name: response.result.name,
@@ -83,8 +91,8 @@ export class DomainAvailabilityService {
   }
 
   @memorize({})
-  getLogisticians() {
-    return this.orderService.OrderGetLogisticians({}).pipe(
+  getLogisticians(): Observable<LogisticianDTO> {
+    return this._logisticanService.LogisticianGetLogisticians({}).pipe(
       map((response) => response.result?.find((l) => l.logisticianNumber === '2470')),
       shareReplay()
     );
@@ -101,7 +109,7 @@ export class DomainAvailabilityService {
     price: PriceDTO;
     quantity: number;
   }): Observable<AvailabilityByBranchDTO[]> {
-    return this._stock.StockStockRequest({ stockRequest: { branchIds, itemId } }).pipe(
+    return this._stockService.StockStockRequest({ stockRequest: { branchIds, itemId } }).pipe(
       map((response) => response.result),
       withLatestFrom(this.getTakeAwaySupplier()),
       map(([result, supplier]) => {
@@ -127,7 +135,7 @@ export class DomainAvailabilityService {
     return this.getCurrentStock().pipe(
       switchMap((s) =>
         combineLatest([
-          this._stock.StockInStock({ articleIds: [item.itemId], stockId: s.id }),
+          this._stockService.StockInStock({ articleIds: [item.itemId], stockId: s.id }),
           this.getTakeAwaySupplier(),
           this.getCurrentBranch(),
         ])
@@ -153,7 +161,7 @@ export class DomainAvailabilityService {
     quantity: number;
   }): Observable<AvailabilityDTO> {
     return combineLatest([
-      this._stock.StockStockRequest({ stockRequest: { branchIds: [branch.id], itemId } }),
+      this._stockService.StockStockRequest({ stockRequest: { branchIds: [branch.id], itemId } }),
       this.getTakeAwaySupplier(),
     ]).pipe(
       map(([response, supplier]) => {
@@ -173,7 +181,7 @@ export class DomainAvailabilityService {
     quantity: number;
   }): Observable<AvailabilityDTO> {
     return this.getCurrentStock().pipe(
-      switchMap((s) => this._stock.StockInStockByEAN({ eans, stockId: s.id })),
+      switchMap((s) => this._stockService.StockInStockByEAN({ eans, stockId: s.id })),
       withLatestFrom(this.getTakeAwaySupplier(), this.getCurrentBranch()),
       map(([response, supplier, branch]) => {
         return this._mapToTakeAwayAvailability({ response, supplier, branch, quantity, price });
@@ -185,7 +193,7 @@ export class DomainAvailabilityService {
   getTakeAwayAvailabilitiesByEans({ eans }: { eans: string[] }): Observable<StockInfoDTO[]> {
     const eansFiltered = Array.from(new Set(eans));
     return this.getCurrentStock().pipe(
-      switchMap((s) => this._stock.StockInStockByEAN({ eans: eansFiltered, stockId: s.id })),
+      switchMap((s) => this._stockService.StockInStockByEAN({ eans: eansFiltered, stockId: s.id })),
       withLatestFrom(this.getTakeAwaySupplier(), this.getCurrentBranch()),
       map((response) => response[0].result),
       shareReplay()
@@ -193,8 +201,16 @@ export class DomainAvailabilityService {
   }
 
   @memorize({ ttl: 10000 })
-  getPickUpAvailability({ item, branch, quantity }: { item: ItemData; quantity: number; branch: BranchDTO }): Observable<AvailabilityDTO> {
-    return this.swaggerAvailabilityService
+  getPickUpAvailability({
+    item,
+    branch,
+    quantity,
+  }: {
+    item: ItemData;
+    quantity: number;
+    branch: BranchDTO;
+  }): Observable<Availability<AvailabilityDTO, SwaggerAvailabilityDTO>> {
+    return this._availabilityService
       .AvailabilityStoreAvailability([
         {
           qty: quantity,
@@ -212,7 +228,7 @@ export class DomainAvailabilityService {
 
   @memorize({ ttl: 10000 })
   getDeliveryAvailability({ item, quantity }: { item: ItemData; quantity: number }): Observable<AvailabilityDTO> {
-    return this.swaggerAvailabilityService
+    return this._availabilityService
       .AvailabilityShippingAvailability([
         {
           ean: item?.ean,
@@ -230,7 +246,7 @@ export class DomainAvailabilityService {
 
   @memorize({ ttl: 10000 })
   getDigDeliveryAvailability({ item, quantity }: { item: ItemData; quantity: number }): Observable<AvailabilityDTO> {
-    return this.swaggerAvailabilityService
+    return this._availabilityService
       .AvailabilityShippingAvailability([
         {
           qty: quantity,
@@ -275,7 +291,11 @@ export class DomainAvailabilityService {
       timeout(5000),
       mergeMap((branch) =>
         this.getPickUpAvailability({ item, quantity, branch }).pipe(
-          mergeMap((availability) => logistician$.pipe(map((logistician) => ({ ...availability, logistician: { id: logistician.id } })))),
+          mergeMap((availability) =>
+            logistician$.pipe(
+              map((logistician) => ({ ...(availability?.length > 0 ? availability[0] : []), logistician: { id: logistician.id } }))
+            )
+          ),
           shareReplay()
         )
       )
@@ -284,7 +304,7 @@ export class DomainAvailabilityService {
 
   @memorize({ ttl: 10000 })
   getDownloadAvailability({ item }: { item: ItemData }): Observable<AvailabilityDTO> {
-    return this.swaggerAvailabilityService
+    return this._availabilityService
       .AvailabilityShippingAvailability([
         {
           ean: item?.ean,
@@ -319,11 +339,11 @@ export class DomainAvailabilityService {
 
   @memorize({ ttl: 10000 })
   getTakeAwayAvailabilities(items: { id: number; price: PriceDTO }[], branchId: number) {
-    return this._stock.StockGetStocksByBranch({ branchId }).pipe(
+    return this._stockService.StockGetStocksByBranch({ branchId }).pipe(
       map((req) => req.result?.find((_) => true)?.id),
       switchMap((stockId) =>
         stockId
-          ? this._stock.StockInStock({ articleIds: items.map((i) => i.id), stockId })
+          ? this._stockService.StockInStock({ articleIds: items.map((i) => i.id), stockId })
           : of({ result: [] } as ResponseArgsOfIEnumerableOfStockInfoDTO)
       ),
       timeout(20000),
@@ -344,7 +364,7 @@ export class DomainAvailabilityService {
 
   @memorize({ ttl: 10000 })
   getPickUpAvailabilities(payload: AvailabilityRequestDTO[], preferred?: boolean) {
-    return this.swaggerAvailabilityService.AvailabilityStoreAvailability(payload).pipe(
+    return this._availabilityService.AvailabilityStoreAvailability(payload).pipe(
       timeout(20000),
       map((response) => (preferred ? this._mapToPickUpAvailability(response.result) : response.result))
     );
@@ -352,7 +372,7 @@ export class DomainAvailabilityService {
 
   @memorize({ ttl: 10000 })
   getDeliveryAvailabilities(payload: AvailabilityRequestDTO[]) {
-    return this.swaggerAvailabilityService.AvailabilityShippingAvailability(payload).pipe(
+    return this._availabilityService.AvailabilityShippingAvailability(payload).pipe(
       timeout(20000),
       map((response) => this._mapToShippingAvailability(response.result))
     );
@@ -360,7 +380,7 @@ export class DomainAvailabilityService {
 
   @memorize({ ttl: 10000 })
   getDigDeliveryAvailabilities(payload: AvailabilityRequestDTO[]) {
-    return this.swaggerAvailabilityService.AvailabilityShippingAvailability(payload).pipe(
+    return this._availabilityService.AvailabilityShippingAvailability(payload).pipe(
       timeout(20000),
       map((response) => this._mapToShippingAvailability(response.result))
     );
@@ -386,7 +406,7 @@ export class DomainAvailabilityService {
   ): PriceDTO {
     switch (purchasingOption) {
       case 'take-away':
-        return availability?.price || availability?.retailPrice;
+        return availability?.price || catalogAvailability?.price;
       case 'delivery':
       case 'dig-delivery':
         if (catalogAvailability?.price?.value?.value < availability?.price?.value?.value) {
@@ -447,9 +467,11 @@ export class DomainAvailabilityService {
       inStock: inStock,
       supplierSSC: quantity <= inStock ? '999' : '',
       supplierSSCText: quantity <= inStock ? 'Filialentnahme' : '',
-      price,
+      price: price ?? stockInfo?.retailPrice,
       supplier: { id: supplier?.id },
-      retailPrice: (stockInfo as any)?.retailPrice, // TODO: Change after API Update
+      // TODO: Change after API Update
+      // LH: 2021-03-09 preis Property hat nun ein Fallback auf retailPrice
+      // retailPrice: (stockInfo as any)?.retailPrice,
     };
     return availability;
   }
@@ -479,26 +501,29 @@ export class DomainAvailabilityService {
     return availability;
   }
 
-  private _mapToPickUpAvailability(availabilities: SwaggerAvailabilityDTO[]) {
+  private _mapToPickUpAvailability(availabilities: SwaggerAvailabilityDTO[]): Availability<AvailabilityDTO, SwaggerAvailabilityDTO>[] {
     if (isArray(availabilities)) {
       const preferred = availabilities.filter((f) => f.preferred === 1);
       const totalAvailable = availabilities.reduce((sum, av) => sum + (av?.qty || 0), 0);
 
       return preferred.map((p) => {
-        return {
-          availabilityType: p?.status,
-          ssc: p?.ssc,
-          sscText: p?.sscText,
-          supplier: { id: p?.supplierId },
-          isPrebooked: p?.isPrebooked,
-          estimatedShippingDate: p?.requestStatusCode === '32' ? p?.altAt : p?.at,
-          price: p?.price,
-          inStock: totalAvailable,
-          supplierProductNumber: p?.supplierProductNumber,
-          supplierInfo: p?.requestStatusCode,
-          lastRequest: p?.requested,
-          itemId: p.itemId,
-        };
+        return [
+          {
+            availabilityType: p?.status,
+            ssc: p?.ssc,
+            sscText: p?.sscText,
+            supplier: { id: p?.supplierId },
+            isPrebooked: p?.isPrebooked,
+            estimatedShippingDate: p?.requestStatusCode === '32' ? p?.altAt : p?.at,
+            price: p?.price,
+            inStock: totalAvailable,
+            supplierProductNumber: p?.supplierProductNumber,
+            supplierInfo: p?.requestStatusCode,
+            lastRequest: p?.requested,
+            itemId: p.itemId,
+          },
+          p,
+        ];
       });
     }
   }

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

@@ -0,0 +1 @@
+export type Availability<T, S> = [T, S];

apps/domain/availability/src/lib/defs/index.ts

@@ -1,3 +1,3 @@
-// start:ng42.barrel
-export * from './item-data.model';
-// end:ng42.barrel
+export * from './availability-by-branch-dto';
+export * from './availability';
+export * from './item-data';

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

@@ -21,8 +21,13 @@ import {
   UpdateShoppingCartItemDTO,
   InputDTO,
   ItemPayload,
+  StoreCheckoutShoppingCartService,
+  StoreCheckoutPaymentService,
+  StoreCheckoutBuyerService,
+  StoreCheckoutPayerService,
+  StoreCheckoutBranchService,
 } from '@swagger/checkout';
-import { DisplayOrderDTO, OrderCheckoutService, ReorderValues } from '@swagger/oms';
+import { DisplayOrderDTO, DisplayOrderItemDTO, OrderCheckoutService, ReorderValues } 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';
@@ -32,6 +37,7 @@ import * as DomainCheckoutActions from './store/domain-checkout.actions';
 import { DomainAvailabilityService } from '@domain/availability';
 import { HttpErrorResponse } from '@angular/common/http';
 import { ApplicationService } from '@core/application';
+import { CustomerDTO, EntityDTOContainerOfAttributeDTO } from '@swagger/crm';
 
 @Injectable()
 export class DomainCheckoutService {
@@ -40,7 +46,12 @@ export class DomainCheckoutService {
     private applicationService: ApplicationService,
     private storeCheckoutService: StoreCheckoutService,
     private orderCheckoutService: OrderCheckoutService,
-    private availabilityService: DomainAvailabilityService
+    private availabilityService: DomainAvailabilityService,
+    private _shoppingCartService: StoreCheckoutShoppingCartService,
+    private _paymentService: StoreCheckoutPaymentService,
+    private _buyerService: StoreCheckoutBuyerService,
+    private _payerService: StoreCheckoutPayerService,
+    private _branchService: StoreCheckoutBranchService
   ) {}
 
   //#region shoppingcart
@@ -53,8 +64,8 @@ export class DomainCheckoutService {
           return false;
         } else if (cart && _latest) {
           _latest = false;
-          this.storeCheckoutService
-            .StoreCheckoutGetShoppingCart({
+          this._shoppingCartService
+            .StoreCheckoutShoppingCartGetShoppingCart({
               shoppingCartId: cart.id,
             })
             .pipe(
@@ -77,7 +88,7 @@ export class DomainCheckoutService {
   }
 
   createShoppingCart({ processId }: { processId: number }): Observable<ShoppingCartDTO> {
-    return this.storeCheckoutService.StoreCheckoutCreateShoppingCart().pipe(
+    return this._shoppingCartService.StoreCheckoutShoppingCartCreateShoppingCart().pipe(
       map((response) => response.result),
       tap((shoppingCart) =>
         this.store.dispatch(
@@ -94,8 +105,8 @@ export class DomainCheckoutService {
     return this.getShoppingCart({ processId }).pipe(
       first(),
       mergeMap((cart) =>
-        this.storeCheckoutService
-          .StoreCheckoutAddItemToShoppingCart({
+        this._shoppingCartService
+          .StoreCheckoutShoppingCartAddItemToShoppingCart({
             items,
             shoppingCartId: cart.id,
           })
@@ -125,8 +136,8 @@ export class DomainCheckoutService {
     return this.getShoppingCart({ processId }).pipe(
       first(),
       mergeMap((shoppingCart) =>
-        this.storeCheckoutService
-          .StoreCheckoutSetLogisticianOnDestinationsByBuyer({
+        this._shoppingCartService
+          .StoreCheckoutShoppingCartSetLogisticianOnDestinationsByBuyer({
             shoppingCartId: shoppingCart?.id,
             payload: { customerFeatures },
           })
@@ -139,7 +150,7 @@ export class DomainCheckoutService {
     return this.getShoppingCart({ processId }).pipe(
       first(),
       mergeMap((cart) =>
-        this.storeCheckoutService.StoreCheckoutCanAddDestination({
+        this._shoppingCartService.StoreCheckoutShoppingCartCanAddDestination({
           shoppingCartId: cart.id,
           payload: destinationDTO,
         })
@@ -166,8 +177,8 @@ export class DomainCheckoutService {
       first(),
       withLatestFrom(this.store.select(DomainCheckoutSelectors.selectCustomerFeaturesByProcessId, { processId })),
       mergeMap(([shoppingCart, customerFeatures]) =>
-        this.storeCheckoutService
-          .StoreCheckoutCanAddItem({
+        this._shoppingCartService
+          .StoreCheckoutShoppingCartCanAddItem({
             shoppingCartId: shoppingCart?.id,
             payload: {
               customerFeatures,
@@ -199,8 +210,8 @@ export class DomainCheckoutService {
             orderType,
           };
         });
-        return this.storeCheckoutService
-          .StoreCheckoutCanAddItems({
+        return this._shoppingCartService
+          .StoreCheckoutShoppingCartCanAddItems({
             shoppingCartId: shoppingCart.id,
             payload,
           })
@@ -222,7 +233,7 @@ export class DomainCheckoutService {
     shoppingCartItemId: number;
     availability: AvailabilityDTO;
   }) {
-    return this.storeCheckoutService.StoreCheckoutUpdateShoppingCartItemAvailability({
+    return this._shoppingCartService.StoreCheckoutShoppingCartUpdateShoppingCartItemAvailability({
       shoppingCartId,
       shoppingCartItemId,
       availability,
@@ -241,8 +252,8 @@ export class DomainCheckoutService {
     return this.getShoppingCart({ processId }).pipe(
       first(),
       mergeMap((shoppingCart) =>
-        this.storeCheckoutService
-          .StoreCheckoutUpdateShoppingCartItem({
+        this._shoppingCartService
+          .StoreCheckoutShoppingCartUpdateShoppingCartItem({
             shoppingCartId: shoppingCart.id,
             shoppingCartItemId,
             values: update,
@@ -318,8 +329,8 @@ export class DomainCheckoutService {
     return this.getCheckout({ processId }).pipe(
       first(),
       mergeMap((checkout) =>
-        this.storeCheckoutService
-          .StoreCheckoutGetCheckoutPayment({
+        this._paymentService
+          .StoreCheckoutPaymentGetCheckoutPayment({
             checkoutId: checkout.id,
           })
           .pipe(map((response) => response.result))
@@ -335,8 +346,8 @@ export class DomainCheckoutService {
     return this.getCheckout({ processId }).pipe(
       first(),
       mergeMap((checkout) =>
-        this.storeCheckoutService
-          .StoreCheckoutSetPaymentType({
+        this._paymentService
+          .StoreCheckoutPaymentSetPaymentType({
             checkoutId: checkout?.id,
             paymentType,
           })
@@ -352,8 +363,8 @@ export class DomainCheckoutService {
     return this.getCheckout({ processId }).pipe(
       first(),
       mergeMap((checkout) =>
-        this.storeCheckoutService
-          .StoreCheckoutSetBuyer({
+        this._buyerService
+          .StoreCheckoutBuyerSetBuyerPOST({
             checkoutId: checkout?.id,
             buyerDTO: buyer,
           })
@@ -369,8 +380,8 @@ export class DomainCheckoutService {
     return this.getCheckout({ processId }).pipe(
       first(),
       mergeMap((checkout) =>
-        this.storeCheckoutService
-          .StoreCheckoutSetPayer({
+        this._payerService
+          .StoreCheckoutPayerSetPayerPOST({
             checkoutId: checkout?.id,
             payerDTO: payer,
           })
@@ -389,7 +400,7 @@ export class DomainCheckoutService {
       mergeMap((cart) =>
         concat(
           ...cart.items.map((item) =>
-            this.storeCheckoutService.StoreCheckoutUpdateShoppingCartItem({
+            this._shoppingCartService.StoreCheckoutShoppingCartUpdateShoppingCartItem({
               shoppingCartId: cart.id,
               shoppingCartItemId: item.id,
               values: { specialComment },
@@ -650,7 +661,7 @@ export class DomainCheckoutService {
       first(),
       mergeMap((checkout) =>
         this.orderCheckoutService
-          .OrderCheckoutCreateOrder({
+          .OrderCheckoutCreateOrderPOST({
             checkoutId: checkout.id,
           })
           .pipe(
@@ -734,8 +745,8 @@ export class DomainCheckoutService {
     return this.getShoppingCart({ processId }).pipe(
       first(),
       mergeMap((shoppingCart) =>
-        this.storeCheckoutService
-          .StoreCheckoutCanAddBuyer({
+        this._shoppingCartService
+          .StoreCheckoutShoppingCartCanAddBuyer({
             shoppingCartId: shoppingCart.id,
             payload: { customerFeatures },
           })
@@ -771,35 +782,39 @@ export class DomainCheckoutService {
     return this.canSetCustomer({ processId, customerFeatures: undefined }).pipe(
       map((res) => {
         let setableTypes: { [key: string]: boolean } = {
-          store: true,
-          guest: true,
-          webshop: true,
-          b2b: true,
+          store: false,
+          guest: false,
+          webshop: false,
+          b2b: false,
         };
 
-        if (Object.keys(res.filter).length === 0) {
-          return setableTypes;
-        }
+        res.create?.options?.values?.forEach((option) => {
+          setableTypes[option.value] = option.enabled !== false;
+        });
 
-        const customerTypes = res.filter?.customertype?.split(';') || [];
-        const customerAttributes = res.filter?.customerattributes?.split(';') || [];
+        // if (Object.keys(res.filter).length === 0) {
+        //   return setableTypes;
+        // }
 
-        const typesAndAttributes = [...customerTypes, ...customerAttributes];
-        if (typesAndAttributes.includes('webshop') && !typesAndAttributes.includes('!guest')) {
-          typesAndAttributes.push('guest');
-        }
+        // const customerTypes = res.filter?.customertype?.split(';') || [];
+        // const customerAttributes = res.filter?.customerattributes?.split(';') || [];
 
-        for (const key in setableTypes) {
-          if (Object.prototype.hasOwnProperty.call(setableTypes, key)) {
-            if (typesAndAttributes.includes(key)) {
-              setableTypes[key] = true;
-            } else if (typesAndAttributes.includes(`!${key}`)) {
-              setableTypes[key] = false;
-            } else {
-              setableTypes[key] = false;
-            }
-          }
-        }
+        // const typesAndAttributes = [...customerTypes, ...customerAttributes];
+        // if (typesAndAttributes.includes('webshop') && !typesAndAttributes.includes('!guest')) {
+        //   typesAndAttributes.push('guest');
+        // }
+
+        // for (const key in setableTypes) {
+        //   if (Object.prototype.hasOwnProperty.call(setableTypes, key)) {
+        //     if (typesAndAttributes.includes(key)) {
+        //       setableTypes[key] = true;
+        //     } else if (typesAndAttributes.includes(`!${key}`)) {
+        //       setableTypes[key] = false;
+        //     } else {
+        //       setableTypes[key] = false;
+        //     }
+        //   }
+        // }
 
         return setableTypes;
       })
@@ -808,8 +823,8 @@ export class DomainCheckoutService {
 
   @memorize()
   getBranches(): Observable<BranchDTO[]> {
-    return this.storeCheckoutService
-      .StoreCheckoutGetBranches({
+    return this._branchService
+      .StoreCheckoutBranchGetBranches({
         take: 999,
       })
       .pipe(
@@ -828,10 +843,6 @@ export class DomainCheckoutService {
       .pipe(map((response) => response.result));
   }
 
-  setCustomerFeatures({ processId, customerFeatures }: { processId: number; customerFeatures: { [key: string]: string } }) {
-    this.store.dispatch(DomainCheckoutActions.setCustomerFeatures({ processId, customerFeatures }));
-  }
-
   setOlaErrors({ processId, errorIds }: { processId: number; errorIds: number[] }) {
     this.store.dispatch(
       DomainCheckoutActions.setOlaError({
@@ -857,6 +868,14 @@ export class DomainCheckoutService {
     this.store.dispatch(DomainCheckoutActions.removeProcess({ processId }));
   }
 
+  setCustomer({ processId, customerDto }: { processId: number; customerDto: CustomerDTO }) {
+    this.store.dispatch(DomainCheckoutActions.setCustomer({ processId, customer: customerDto }));
+  }
+
+  getCustomer({ processId }: { processId: number }): Observable<CustomerDTO> {
+    return this.store.select(DomainCheckoutSelectors.selectCustomerByProcessId, { processId });
+  }
+
   setPayer({ processId, payer }: { processId: number; payer: PayerDTO }) {
     this.store.dispatch(DomainCheckoutActions.setPayer({ processId, payer }));
   }
@@ -877,6 +896,10 @@ export class DomainCheckoutService {
     return this.store.select(DomainCheckoutSelectors.selectOrders);
   }
 
+  updateOrderItem(item: DisplayOrderItemDTO) {
+    this.store.dispatch(DomainCheckoutActions.updateOrderItem({ item }));
+  }
+
   removeAllOrders() {
     this.store.dispatch(DomainCheckoutActions.removeAllOrders());
   }

apps/domain/checkout/src/lib/store/defs/checkout.entity.ts

@@ -1,11 +1,12 @@
 import { BuyerDTO, CheckoutDTO, NotificationChannel, PayerDTO, ShippingAddressDTO, ShoppingCartDTO } from '@swagger/checkout';
+import { CustomerDTO } from '@swagger/crm';
 import { DisplayOrderDTO } from '@swagger/oms';
 
 export interface CheckoutEntity {
   processId: number;
   checkout: CheckoutDTO;
   shoppingCart: ShoppingCartDTO;
-  customerFeatures: { [key: string]: string };
+  customer: CustomerDTO;
   payer: PayerDTO;
   buyer: BuyerDTO;
   shippingAddress: ShippingAddressDTO;

apps/domain/checkout/src/lib/store/domain-checkout.actions.ts

@@ -8,7 +8,8 @@ import {
   BuyerDTO,
   PayerDTO,
 } from '@swagger/checkout';
-import { DisplayOrderDTO } from '@swagger/oms';
+import { CustomerDTO } from '@swagger/crm';
+import { DisplayOrderDTO, DisplayOrderItemDTO } from '@swagger/oms';
 
 const prefix = '[DOMAIN-CHECKOUT]';
 
@@ -38,11 +39,6 @@ export const setCheckoutDestination = createAction(
   props<{ processId: number; destination: DestinationDTO }>()
 );
 
-export const setCustomerFeatures = createAction(
-  `${prefix} Set Customer Features`,
-  props<{ processId: number; customerFeatures: { [key: string]: string } }>()
-);
-
 export const setShippingAddress = createAction(
   `${prefix} Set Shipping Address`,
   props<{ processId: number; shippingAddress: ShippingAddressDTO }>()
@@ -52,6 +48,8 @@ export const removeProcess = createAction(`${prefix} Remove Process`, props<{ pr
 
 export const setOrders = createAction(`${prefix} Add Orders`, props<{ orders: DisplayOrderDTO[] }>());
 
+export const updateOrderItem = createAction(`${prefix} Update Orders`, props<{ item: DisplayOrderItemDTO }>());
+
 export const removeAllOrders = createAction(`${prefix} Remove All Orders`);
 
 export const setBuyer = createAction(`${prefix} Set Buyer`, props<{ processId: number; buyer: BuyerDTO }>());
@@ -61,3 +59,5 @@ export const setPayer = createAction(`${prefix} Set Payer`, props<{ processId: n
 export const setSpecialComment = createAction(`${prefix} Set Agent Comment`, props<{ processId: number; agentComment: string }>());
 
 export const setOlaError = createAction(`${prefix} Set Ola Error`, props<{ processId: number; olaErrorIds: number[] }>());
+
+export const setCustomer = createAction(`${prefix} Set Customer`, props<{ processId: number; customer: CustomerDTO }>());

apps/domain/checkout/src/lib/store/domain-checkout.reducer.ts

@@ -46,11 +46,6 @@ const _domainCheckoutReducer = createReducer(
     };
     return storeCheckoutAdapter.setOne(entity, s);
   }),
-  on(DomainCheckoutActions.setCustomerFeatures, (s, { processId, customerFeatures }) => {
-    const entity = getOrCreateCheckoutEntity({ processId, entities: s.entities });
-    entity.customerFeatures = customerFeatures;
-    return storeCheckoutAdapter.setOne(entity, s);
-  }),
   on(DomainCheckoutActions.setShippingAddress, (s, { processId, shippingAddress }) => {
     const entity = getOrCreateCheckoutEntity({ processId, entities: s.entities });
     entity.shippingAddress = shippingAddress;
@@ -73,6 +68,25 @@ const _domainCheckoutReducer = createReducer(
   }),
   on(DomainCheckoutActions.removeProcess, (s, { processId }) => storeCheckoutAdapter.removeOne(processId, s)),
   on(DomainCheckoutActions.setOrders, (s, { orders }) => ({ ...s, orders: [...s.orders, ...orders] })),
+  on(DomainCheckoutActions.updateOrderItem, (s, { item }) => {
+    const orders = [...s.orders];
+
+    const orderToUpdate = orders?.find((order) => order.items?.find((i) => i.id === item?.id));
+    const orderToUpdateIndex = orders?.indexOf(orderToUpdate);
+
+    const orderItemToUpdate = orderToUpdate?.items?.find((i) => i.id === item?.id);
+    const orderItemToUpdateIndex = orderToUpdate?.items?.indexOf(orderItemToUpdate);
+
+    const items = [...orderToUpdate?.items];
+    items[orderItemToUpdateIndex] = item;
+
+    orders[orderToUpdateIndex] = {
+      ...orderToUpdate,
+      items: [...items],
+    };
+
+    return { ...s, orders: [...orders] };
+  }),
   on(DomainCheckoutActions.removeAllOrders, (s) => ({
     ...s,
     orders: [],
@@ -81,6 +95,11 @@ const _domainCheckoutReducer = createReducer(
     const entity = getOrCreateCheckoutEntity({ processId, entities: s.entities });
     entity.olaErrorIds = olaErrorIds;
     return storeCheckoutAdapter.setOne(entity, s);
+  }),
+  on(DomainCheckoutActions.setCustomer, (s, { processId, customer }) => {
+    const entity = getOrCreateCheckoutEntity({ processId, entities: s.entities });
+    entity.customer = customer;
+    return storeCheckoutAdapter.setOne(entity, s);
   })
 );
 
@@ -96,7 +115,6 @@ function getOrCreateCheckoutEntity({ entities, processId }: { entities: Dictiona
       processId,
       checkout: undefined,
       shoppingCart: undefined,
-      customerFeatures: undefined,
       shippingAddress: undefined,
       orders: [],
       payer: undefined,
@@ -104,6 +122,7 @@ function getOrCreateCheckoutEntity({ entities, processId }: { entities: Dictiona
       specialComment: '',
       notificationChannels: 0,
       olaErrorIds: [],
+      customer: undefined,
     };
   }
 

apps/domain/checkout/src/lib/store/domain-checkout.selectors.ts

@@ -1,5 +1,6 @@
 import { Dictionary } from '@ngrx/entity';
 import { createSelector } from '@ngrx/store';
+import { CustomerDTO } from '@swagger/crm';
 import { CheckoutEntity } from './defs/checkout.entity';
 import { storeCheckoutAdapter, storeFeatureSelector } from './domain-checkout.state';
 
@@ -22,7 +23,7 @@ export const selectCheckoutByProcessId = createSelector(
 
 export const selectCustomerFeaturesByProcessId = createSelector(
   selectEntities,
-  (entities: Dictionary<CheckoutEntity>, { processId }: { processId: number }) => entities[processId]?.customerFeatures
+  (entities: Dictionary<CheckoutEntity>, { processId }: { processId: number }) => getCusomterFeatures(entities[processId]?.customer)
 );
 
 export const selectShippingAddressByProcessId = createSelector(
@@ -61,3 +62,19 @@ export const selectOlaErrorsByProcessId = createSelector(
   selectEntities,
   (entities: Dictionary<CheckoutEntity>, { processId }: { processId: number }) => entities[processId]?.olaErrorIds
 );
+
+export const selectCustomerByProcessId = createSelector(
+  selectEntities,
+  (entities: Dictionary<CheckoutEntity>, { processId }: { processId: number }) => entities[processId]?.customer
+);
+
+function getCusomterFeatures(custoemr: CustomerDTO): { [key: string]: string } {
+  const customerFeatures = custoemr?.features ?? [];
+  const features: { [key: string]: string } = {};
+
+  for (const feature of customerFeatures) {
+    features[feature.key] = feature.key;
+  }
+
+  return features;
+}

apps/domain/crm/src/lib/crm-customer.service.ts

@@ -1,21 +1,26 @@
 import { Injectable } from '@angular/core';
 import {
   AddressDTO,
+  AddressService,
   AssignedPayerDTO,
   AutocompleteDTO,
   CommunicationDetailsDTO,
   CountryDTO,
+  CountryService,
   CustomerDTO,
   CustomerInfoDTO,
   CustomerService,
   InputDTO,
+  KeyValueDTOOfStringAndString,
   ListResponseArgsOfCustomerInfoDTO,
+  LoyaltyCardService,
   NotificationChannel,
   PayerDTO,
   PayerService,
   ResponseArgsOfHistoryDTO,
   ResponseArgsOfIEnumerableOfBonusCardInfoDTO,
   ShippingAddressDTO,
+  ShippingAddressService,
 } from '@swagger/crm';
 import { isArray } from '@utils/common';
 import { PagedResult, Result } from 'apps/domain/defs/src/public-api';
@@ -24,7 +29,14 @@ import { catchError, map, mergeMap, retry } from 'rxjs/operators';
 
 @Injectable({ providedIn: 'root' })
 export class CrmCustomerService {
-  constructor(private customerService: CustomerService, private payerService: PayerService) {}
+  constructor(
+    private customerService: CustomerService,
+    private payerService: PayerService,
+    private addressService: AddressService,
+    private countryService: CountryService,
+    private shippingAddressService: ShippingAddressService,
+    private loyaltyCardService: LoyaltyCardService
+  ) {}
 
   complete(queryString: string, filter?: { [key: string]: string }): Observable<Result<AutocompleteDTO[]>> {
     return this.customerService.CustomerCustomerAutocomplete({
@@ -66,10 +78,6 @@ export class CrmCustomerService {
     return this.customerService.CustomerGetAssignedPayersByCustomerId(params);
   }
 
-  getFilters(): Observable<Result<InputDTO[]>> {
-    return this.customerService.CustomerQueryCustomerFilter();
-  }
-
   /* @internal */
   getNotificationChannelForCommunicationDetails({
     communicationDetails,
@@ -96,12 +104,23 @@ export class CrmCustomerService {
     return this.customerService.CustomerPatchCustomer({ customerId, customer: { ...customer, notificationChannels } });
   }
 
-  createB2BCustomer(customer: CustomerDTO) {
+  createB2BCustomer(customer: CustomerDTO): Promise<Result<CustomerDTO>> {
     const notificationChannels = this.getNotificationChannelForCommunicationDetails({
       communicationDetails: customer?.communicationDetails,
     });
 
-    return this.customerService.CustomerCreateCustomer({ ...customer, customerType: 16, notificationChannels });
+    const payload: CustomerDTO = { ...customer, customerType: 16, notificationChannels };
+
+    payload.shippingAddresses = payload.shippingAddresses ?? [];
+
+    payload.payers = payload.payers ?? [];
+
+    return this.customerService
+      .CustomerCreateCustomer({
+        customer: payload,
+        modifiers: [{ key: 'b2b', group: 'customertype' }],
+      })
+      .toPromise();
   }
 
   createOnlineCustomer(customer: CustomerDTO): Observable<Result<CustomerDTO>> {
@@ -148,63 +167,253 @@ export class CrmCustomerService {
       ];
     }
 
-    return this.customerService.CustomerCreateOnlineCustomer({ ...payload, notificationChannels });
+    const p4mUser = customer.features.find((f) => f.key === 'p4mUser')?.value;
+
+    const modifiers: KeyValueDTOOfStringAndString[] = [{ key: 'webshop', group: 'customertype' }];
+
+    if (p4mUser) {
+      modifiers.push({ key: 'add-loyalty-card', value: p4mUser });
+    }
+
+    return this.customerService.CustomerCreateCustomer({
+      customer: { ...payload, notificationChannels },
+      modifiers,
+    });
   }
 
-  createGuestCustomer(customer: CustomerDTO): Observable<Result<CustomerDTO>> {
+  mapCustomerToPayer(customer: CustomerDTO): PayerDTO {
+    return {
+      address: customer.address,
+      communicationDetails: customer.communicationDetails,
+      firstName: customer.firstName,
+      lastName: customer.lastName,
+      organisation: customer.organisation,
+      title: customer.title,
+      payerType: 1,
+      gender: customer.gender,
+    };
+  }
+
+  mapCustomerToShippingAddress(customer: CustomerDTO): ShippingAddressDTO {
+    return {
+      address: customer.address,
+      communicationDetails: customer.communicationDetails,
+      firstName: customer.firstName,
+      gender: customer.gender,
+      lastName: customer.lastName,
+      organisation: customer.organisation,
+      title: customer.title,
+      type: 1,
+    };
+  }
+
+  async updateToOnlineCustomer(customer: CustomerDTO): Promise<Result<CustomerDTO>> {
+    const payload: CustomerDTO = { shippingAddresses: [], payers: [], ...customer, customerType: 8, hasOnlineAccount: true };
+
+    const notificationChannels = this.getNotificationChannelForCommunicationDetails({
+      communicationDetails: payload?.communicationDetails,
+    });
+
+    const shippingAddressesToAdd = payload.shippingAddresses?.filter((sa) => !sa.id)?.map((m) => m.data) ?? [];
+    payload.shippingAddresses = payload.shippingAddresses?.filter((sa) => !!sa.id) ?? [];
+
+    if (payload.shippingAddresses.length === 0) {
+      shippingAddressesToAdd.unshift(this.mapCustomerToShippingAddress(payload));
+    }
+
+    const payersToAdd = payload.payers?.filter((p) => !p.assignedToCustomer)?.map((p) => p.payer?.data) ?? [];
+    payload.payers = payload.payers?.filter((p) => !!p.assignedToCustomer) ?? [];
+
+    if (payload.payers.length === 0) {
+      payersToAdd.unshift({
+        ...this.mapCustomerToPayer(payload),
+        payerType: payload.customerType,
+      });
+    }
+
+    const modifiers: KeyValueDTOOfStringAndString[] = [{ key: 'webshop', group: 'customertype' }];
+
+    const res = await this.customerService
+      .CustomerUpdateCustomer({
+        customerId: customer.id,
+        payload: {
+          modifiers,
+          customer: { ...payload, notificationChannels },
+        },
+      })
+      .toPromise();
+
+    for (let shippingAddress of shippingAddressesToAdd) {
+      await this.createShippingAddress(res.result.id, shippingAddress, true);
+    }
+
+    for (let payer of payersToAdd) {
+      await this.createPayer(res.result.id, payer, true);
+    }
+
+    return res;
+  }
+
+  async updateToP4MOnlineCustomer(customer: CustomerDTO): Promise<Result<CustomerDTO>> {
+    const shippingAddressesToAdd = customer.shippingAddresses?.filter((sa) => !sa.id)?.map((m) => m.data) ?? [];
+    customer.shippingAddresses = customer.shippingAddresses?.filter((sa) => !!sa.id) ?? [];
+
+    if (customer.shippingAddresses.length === 0) {
+      shippingAddressesToAdd.unshift(this.mapCustomerToShippingAddress(customer));
+    }
+
+    const payersToAdd = customer.payers?.filter((p) => !p.assignedToCustomer)?.map((p) => p.payer?.data) ?? [];
+    customer.payers = customer.payers?.filter((p) => !!p.assignedToCustomer) ?? [];
+
+    if (customer.payers.length === 0) {
+      payersToAdd.unshift({
+        ...this.mapCustomerToPayer(customer),
+        payerType: customer.customerType,
+      });
+    }
+
+    const p4mUser = customer.features.find((f) => f.key === 'p4mUser')?.value;
+
+    const modifiers: KeyValueDTOOfStringAndString[] = [{ key: 'webshop', group: 'customertype' }];
+
+    if (p4mUser) {
+      modifiers.push({ key: 'add-loyalty-card', value: p4mUser });
+    }
+
+    const res = await this.customerService
+      .CustomerUpdateCustomer({
+        customerId: customer.id,
+        payload: {
+          customer,
+          modifiers,
+        },
+      })
+      .toPromise();
+
+    for (let shippingAddress of shippingAddressesToAdd) {
+      await this.createShippingAddress(res.result.id, shippingAddress, true);
+    }
+
+    for (let payer of payersToAdd) {
+      await this.createPayer(res.result.id, payer, true);
+    }
+
+    return res;
+  }
+
+  async updateStoreP4MToWebshopP4M(customer: CustomerDTO): Promise<Result<CustomerDTO>> {
+    const shippingAddressesToAdd = customer.shippingAddresses?.filter((sa) => !sa.id)?.map((m) => m.data) ?? [];
+    customer.shippingAddresses = customer.shippingAddresses?.filter((sa) => !!sa.id) ?? [];
+
+    if (customer.shippingAddresses.length === 0) {
+      shippingAddressesToAdd.unshift(this.mapCustomerToShippingAddress(customer));
+    }
+
+    const payersToAdd = customer.payers?.filter((p) => !p.assignedToCustomer)?.map((p) => p.payer?.data) ?? [];
+    customer.payers = customer.payers?.filter((p) => !!p.assignedToCustomer) ?? [];
+
+    if (customer.payers.length === 0) {
+      payersToAdd.unshift({
+        ...this.mapCustomerToPayer(customer),
+        payerType: customer.customerType,
+      });
+    }
+
+    const modifiers: KeyValueDTOOfStringAndString[] = [{ key: 'webshop', group: 'customertype' }];
+
+    const res = await this.customerService
+      .CustomerUpdateCustomer({
+        customerId: customer.id,
+        payload: {
+          customer,
+          modifiers,
+        },
+      })
+      .toPromise();
+
+    for (let shippingAddress of shippingAddressesToAdd) {
+      await this.createShippingAddress(res.result.id, shippingAddress, true);
+    }
+
+    for (let payer of payersToAdd) {
+      await this.createPayer(res.result.id, payer, true);
+    }
+
+    return res;
+  }
+
+  async createGuestCustomer(customer: CustomerDTO): Promise<Result<CustomerDTO>> {
     const notificationChannels = this.getNotificationChannelForCommunicationDetails({
       communicationDetails: customer?.communicationDetails,
     });
     const payload: CustomerDTO = { ...customer, customerType: 8, isGuestAccount: true, notificationChannels };
 
-    if (!(isArray(payload.shippingAddresses) && payload.shippingAddresses.length > 0)) {
-      payload.shippingAddresses = [
-        {
-          data: {
-            address: payload.address,
-            communicationDetails: payload.communicationDetails,
-            firstName: payload.firstName,
-            gender: payload.gender,
-            lastName: payload.lastName,
-            organisation: payload.organisation,
-            title: payload.title,
-            type: 1,
-          },
-        },
-      ];
-    }
+    payload.shippingAddresses = customer.shippingAddresses ?? [];
 
-    if (!(isArray(payload.payers) && payload.payers.length > 0)) {
-      payload.payers = [
-        {
-          payer: {
-            data: {
-              address: payload.address,
-              communicationDetails: payload.communicationDetails,
-              firstName: payload.firstName,
-              gender: payload.gender,
-              lastName: payload.lastName,
-              organisation: payload.organisation,
-              title: payload.title,
-              payerType: payload.customerType,
-            },
-          },
-        },
-      ];
-    }
+    payload.shippingAddresses.push({
+      data: this.mapCustomerToShippingAddress(customer),
+    });
 
-    return this.customerService.CustomerCreateOnlineCustomer(payload);
+    payload.payers = customer.payers ?? [];
+
+    payload.payers.push({
+      payer: {
+        data: {
+          ...this.mapCustomerToPayer(customer),
+          payerType: payload.customerType,
+        },
+      },
+    });
+
+    const res = await this.customerService
+      .CustomerCreateCustomer({
+        customer: payload,
+        modifiers: [{ key: 'webshop', group: 'customertype' }],
+      })
+      .toPromise();
+
+    return res;
   }
 
-  createBranchCustomer(customer: CustomerDTO): Observable<Result<CustomerDTO>> {
+  createStoreCustomer(customer: CustomerDTO): Observable<Result<CustomerDTO>> {
     const notificationChannels = this.getNotificationChannelForCommunicationDetails({
       communicationDetails: customer?.communicationDetails,
     });
-    return this.customerService.CustomerCreateCustomer({ ...customer, customerType: 8, notificationChannels });
+
+    const p4mUser = customer.features.find((f) => f.key === 'p4mUser')?.value;
+
+    const modifiers: KeyValueDTOOfStringAndString[] = [{ key: 'store', group: 'customertype' }];
+
+    if (p4mUser) {
+      modifiers.push({ key: 'add-loyalty-card', value: p4mUser });
+    }
+
+    return this.customerService.CustomerCreateCustomer({
+      customer: { ...customer, customerType: 8, notificationChannels },
+      modifiers,
+    });
   }
 
   validateAddress(address: AddressDTO): Observable<Result<AddressDTO[]>> {
-    return this.customerService.CustomerValidateAddress(address);
+    return this.addressService.AddressValidateAddress(address);
+  }
+
+  getOnlineCustomerByEmail(email: string): Observable<CustomerInfoDTO | null> {
+    return this.getCustomers(email, {
+      take: 1,
+      filter: {
+        customertype: 'webshop',
+      },
+    }).pipe(
+      map((r) => {
+        if (r.hits === 1) {
+          return r.result[0];
+        } else {
+          return null;
+        }
+      }),
+      catchError((err) => [null])
+    );
   }
 
   private cachedCountriesFailed = false;
@@ -213,8 +422,8 @@ export class CrmCustomerService {
     if (!this.cachedCountries || this.cachedCountriesFailed) {
       this.cachedCountriesFailed = false;
       this.cachedCountries = new ReplaySubject();
-      this.customerService
-        .CustomerGetCountries({})
+      this.countryService
+        .CountryGetCountries({})
         .pipe(
           retry(3),
           catchError((err) => {
@@ -235,22 +444,28 @@ export class CrmCustomerService {
     return this.customerService.CustomerEmailExists(email);
   }
 
-  createPayer(customerId: number, payer: PayerDTO, isDefault?: boolean): Observable<[Result<PayerDTO>, Result<AssignedPayerDTO>]> {
-    return this.getCustomer(customerId).pipe(
-      mergeMap((customerResponse) =>
-        this.payerService
-          .PayerCreatePayer({ ...payer, payerType: customerResponse.result.customerType })
-          .pipe(
-            mergeMap((payerResponse) =>
-              this.customerService
-                .CustomerAddPayerReference({ customerId: customerId, payerId: payerResponse.result.id, isDefault: isDefault })
-                .pipe(
-                  map((assigendPayerResponse) => [payerResponse, assigendPayerResponse] as [Result<PayerDTO>, Result<AssignedPayerDTO>])
-                )
+  checkLoyaltyCard({ loyaltyCardNumber, customerId }: { loyaltyCardNumber: string; customerId?: number }) {
+    return this.loyaltyCardService.LoyaltyCardCheckLoyaltyCard({ loyaltyCardNumber, customerId });
+  }
+
+  createPayer(customerId: number, payer: PayerDTO, isDefault?: boolean): Promise<[Result<PayerDTO>, Result<AssignedPayerDTO>]> {
+    return this.getCustomer(customerId)
+      .pipe(
+        mergeMap((customerResponse) =>
+          this.payerService
+            .PayerCreatePayer({ ...payer, payerType: customerResponse.result.customerType })
+            .pipe(
+              mergeMap((payerResponse) =>
+                this.customerService
+                  .CustomerAddPayerReference({ customerId: customerId, payerId: payerResponse.result.id, isDefault: isDefault })
+                  .pipe(
+                    map((assigendPayerResponse) => [payerResponse, assigendPayerResponse] as [Result<PayerDTO>, Result<AssignedPayerDTO>])
+                  )
+              )
             )
-          )
+        )
       )
-    );
+      .toPromise();
   }
 
   updatePayer(customerId: number, payerId: number, payer: PayerDTO, isDefault?: boolean): Observable<Result<PayerDTO>> {
@@ -263,11 +478,7 @@ export class CrmCustomerService {
     return this.customerService.CustomerModifyPayerReference({ payerId, customerId, isDefault });
   }
 
-  createShippingAddress(
-    customerId: number,
-    shippingAddress: ShippingAddressDTO,
-    isDefault?: boolean
-  ): Observable<Result<ShippingAddressDTO>> {
+  createShippingAddress(customerId: number, shippingAddress: ShippingAddressDTO, isDefault?: boolean): Promise<Result<ShippingAddressDTO>> {
     const data: ShippingAddressDTO = { ...shippingAddress };
     if (isDefault) {
       data.isDefault = new Date().toJSON();
@@ -275,7 +486,7 @@ export class CrmCustomerService {
       delete data.isDefault;
     }
 
-    return this.customerService.CustomerCreateShippingAddress({ customerId, shippingAddress: data });
+    return this.shippingAddressService.ShippingAddressCreateShippingAddress({ customerId, shippingAddress: data }).toPromise();
   }
 
   updateShippingAddress(
@@ -283,7 +494,7 @@ export class CrmCustomerService {
     shippingAddressId: number,
     shippingAddress: ShippingAddressDTO,
     isDefault?: boolean
-  ): Observable<Result<ShippingAddressDTO>> {
+  ): Promise<Result<ShippingAddressDTO>> {
     const data: ShippingAddressDTO = { ...shippingAddress };
 
     if (isDefault) {
@@ -292,15 +503,17 @@ export class CrmCustomerService {
       delete data.isDefault;
     }
 
-    return this.customerService.CustomerUpdateShippingAddress({ shippingAddressId, shippingAddress: data, customerId });
+    return this.shippingAddressService
+      .ShippingAddressUpdateShippingAddress({ shippingAddressId, shippingAddress: data, customerId })
+      .toPromise();
   }
 
   getShippingAddress(shippingAddressId: number): Observable<Result<ShippingAddressDTO>> {
-    return this.customerService.CustomerGetShippingaddress(shippingAddressId);
+    return this.shippingAddressService.ShippingAddressGetShippingaddress(shippingAddressId);
   }
 
-  getShippingAddresses(params: CustomerService.CustomerGetShippingAddressesParams): Observable<Result<ShippingAddressDTO[]>> {
-    return this.customerService.CustomerGetShippingAddresses(params);
+  getShippingAddresses(params: ShippingAddressService.ShippingAddressGetShippingAddressesParams): Observable<Result<ShippingAddressDTO[]>> {
+    return this.shippingAddressService.ShippingAddressGetShippingAddresses(params);
   }
 
   getPayer(payerId: number): Observable<Result<PayerDTO>> {

apps/domain/defs/src/lib/models/result.ts

@@ -1,3 +1,5 @@
+import { DialogOfString } from '@swagger/crm';
+
 export interface Result<T> {
   /**  Ergebnis */
   result?: T;
@@ -13,4 +15,6 @@ export interface Result<T> {
 
   /** Fehlerhafte Daten  */
   invalidProperties?: { [key: string]: string };
+
+  dialog?: DialogOfString;
 }

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

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import {
+  BranchService,
   ChangeStockStatusCodeValues,
   HistoryDTO,
   NotificationChannel,
@@ -11,8 +12,10 @@ import {
   OrderService,
   ReceiptService,
   StatusValues,
+  StockStatusCodeService,
   ValueTupleOfLongAndReceiptTypeAndEntityDTOContainerOfReceiptDTO,
   ValueTupleOfOrderItemSubsetDTOAndOrderItemSubsetDTO,
+  VATService,
 } from '@swagger/oms';
 import { memorize } from '@utils/common';
 import { Observable } from 'rxjs';
@@ -23,6 +26,9 @@ export class DomainOmsService {
   constructor(
     private orderService: OrderService,
     private receiptService: ReceiptService,
+    private branchService: BranchService,
+    private vatService: VATService,
+    private stockStatusCodeService: StockStatusCodeService,
     private _orderCheckoutService: OrderCheckoutService
   ) {}
 
@@ -37,7 +43,7 @@ export class DomainOmsService {
   }
 
   getBranches() {
-    return this.orderService.OrderGetBranches({});
+    return this.branchService.BranchGetBranches({});
   }
 
   getHistory(orderItemSubsetId: number): Observable<HistoryDTO> {
@@ -62,13 +68,13 @@ export class DomainOmsService {
 
   @memorize()
   getVATs() {
-    return this.orderService.OrderGetVATs({}).pipe(map((response) => response.result));
+    return this.vatService.VATGetVATs({}).pipe(map((response) => response.result));
   }
 
   // ttl 4 Stunden
   @memorize({ ttl: 14400000 })
   getStockStatusCodes({ supplierId, eagerLoading = 0 }: { supplierId: number; eagerLoading?: number }) {
-    return this.orderService.OrderGetStockStatusCodes({ supplierId, eagerLoading }).pipe(
+    return this.stockStatusCodeService.StockStatusCodeGetStockStatusCodes({ supplierId, eagerLoading }).pipe(
       map((response) => response.result),
       shareReplay()
     );
@@ -152,6 +158,10 @@ export class DomainOmsService {
       .pipe(map((response) => response.result));
   }
 
+  setPreferredPickUpDate({ data }: { data: { [key: string]: string } }) {
+    return this.orderService.OrderSetPreferredPickUpDate({ data });
+  }
+
   changeOrderItemStatus(data: OrderService.OrderChangeStatusParams) {
     return this.orderService.OrderChangeStatus(data);
   }

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

@@ -11,6 +11,7 @@ import {
   PrintRequestOfIEnumerableOfPriceQRCodeDTO,
   PrintService,
   ResponseArgs,
+  LoyaltyCardPrintService,
 } from '@swagger/print';
 import { Observable, of } from 'rxjs';
 import { catchError, filter, map, switchMap, timeout } from 'rxjs/operators';
@@ -25,7 +26,8 @@ export class DomainPrinterService {
     private oMSPrintService: OMSPrintService,
     private catalogPrintService: CatalogPrintService,
     private checkoutPrintService: CheckoutPrintService,
-    private eisPublicDocumentService: EISPublicDocumentService
+    private eisPublicDocumentService: EISPublicDocumentService,
+    private _loyaltyCardPrintService: LoyaltyCardPrintService
   ) {}
 
   getAvailablePrinters(): Observable<Printer[] | { error: string }> {
@@ -143,6 +145,13 @@ export class DomainPrinterService {
     });
   }
 
+  printKubiAgb({ p4mCode, printer }: { p4mCode: string; printer: string }) {
+    return this._loyaltyCardPrintService.LoyaltyCardPrintPrintLoyaltyCardAGB({
+      printer,
+      data: p4mCode,
+    });
+  }
+
   printProduct({ item, printer }: { item: ItemDTO; printer: string }): Observable<ResponseArgs> {
     const params = <PrintRequestOfIEnumerableOfItemDTO>{
       printer: printer,

apps/domain/task-calendar/src/lib/task-calendar.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { EISPublicService, FileDTO, ProcessingStatus, QueryTokenDTO } from '@swagger/eis';
+import { DisplayInfoDTO, EISPublicService, FileDTO, ProcessingStatus, QueryTokenDTO } from '@swagger/eis';
 import { DateAdapter } from '@ui/common';
 import { memorize } from '@utils/common';
 import { map, shareReplay, switchMap } from 'rxjs/operators';
@@ -279,4 +279,80 @@ export class DomainTaskCalendarService {
       )
     );
   }
+
+  moveRemovedToEnd(a: DisplayInfoDTO, b: DisplayInfoDTO) {
+    const statusA = this.getProcessingStatusList(a)?.includes('Removed');
+    const statusB = this.getProcessingStatusList(b)?.includes('Removed');
+
+    if (statusA && statusB) {
+      return 0;
+    } else if (statusA && !statusB) {
+      return 1;
+    } else if (!statusA && statusB) {
+      return -1;
+    }
+
+    return 0;
+  }
+
+  /**
+   * Returns an Array of DisplayInfoDTO, sorted by ProcessingStatus
+   * Ignores Overdue if Task is already Completed
+   * Compared DisploayInfoDTO is of Type Task and Info Or PreInfo then sort by Type
+   * @param items DisplayInfoDTO Array to sort
+   * @param order Processing Status Order
+   * @returns DisplayInfoDTO Array ordered by Processing Status anf Type
+   */
+  sort(items: DisplayInfoDTO[], order: ProcessingStatusList) {
+    let result = [...items];
+    const reversedOrder = [...order].reverse();
+
+    for (const status of reversedOrder) {
+      result = result?.sort((a, b) => {
+        const statusA = this.getProcessingStatusList(a);
+        const statusB = this.getProcessingStatusList(b);
+
+        // Ignore Overdue when it is already Completed
+        if (status === 'Overdue' && statusA.includes('Completed')) {
+          return 0;
+        }
+
+        const aHasStatus = statusA.includes(status);
+        const bHasStatus = statusB.includes(status);
+
+        if (aHasStatus && bHasStatus) {
+          // If it has the same ProcessingStatus then Sort by Type
+          const aType = this.getInfoType(a);
+          const bType = this.getInfoType(b);
+          if (aType !== bType) {
+            if (aType === 'Info' || aType === 'PreInfo') {
+              return -1;
+            } else {
+              return 1;
+            }
+          }
+
+          if (statusB.includes('Completed')) {
+            return -1;
+          }
+
+          return 0;
+        } else if (aHasStatus && !bHasStatus) {
+          return -1;
+        } else if (!aHasStatus && bHasStatus) {
+          return 1;
+        }
+
+        return 0;
+      });
+    }
+
+    return result;
+  }
+
+  getDateGroupKey(d: string) {
+    // Get Date as string key to ignore time for grouping
+    const date = new Date(d);
+    return date.toISOString().split('T')[0];
+  }
 }

apps/isa-app/src/app/app.module.ts

@@ -6,6 +6,7 @@ import { PlatformModule } from '@angular/cdk/platform';
 
 import { Config, ConfigModule, JsonConfigLoader } from '@core/config';
 import { AuthModule, AuthService } from '@core/auth';
+import { CoreCommandModule } from '@core/command';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
@@ -30,6 +31,8 @@ import { IsaLogProvider } from './providers';
 import { IsaErrorHandler } from './providers/isa.error-handler';
 import { ScanAdapterModule } from '@adapter/scan';
 import { RootStateService } from './store/root-state.service';
+import * as Commands from './commands';
+import { UiIconModule } from '@ui/icon';
 
 registerLocaleData(localeDe, localeDeExtra);
 registerLocaleData(localeDe, 'de', localeDeExtra);
@@ -70,6 +73,7 @@ export function _notificationsHubOptionsFactory(config: Config, auth: AuthServic
       useConfigLoader: JsonConfigLoader,
       jsonConfigLoaderUrl: '/config/config.json',
     }),
+    CoreCommandModule.forRoot(Object.values(Commands)),
     CoreLoggerModule.forRoot(),
     AppStoreModule,
     AuthModule.forRoot(),
@@ -83,6 +87,12 @@ export function _notificationsHubOptionsFactory(config: Config, auth: AuthServic
     }),
     ScanAdapterModule.forRoot(!environment.production),
     PlatformModule,
+    UiIconModule.forRoot({
+      aliases: [
+        { alias: 'd-account', name: 'account' },
+        { alias: 'd-no-account', name: 'package-variant-closed' },
+      ],
+    }),
   ],
   providers: [
     {

apps/isa-app/src/app/commands/close.command.ts

@@ -0,0 +1,14 @@
+import { Injectable } from '@angular/core';
+import { ActionHandler } from '@core/command';
+
+/** Dummy Command um Fehlermeldungen aus dem Diloag zu verhinden */
+@Injectable()
+export class CloseCommand extends ActionHandler<any> {
+  constructor() {
+    super('CLOSE');
+  }
+
+  handler(ctx: any): any {
+    return ctx;
+  }
+}

apps/isa-app/src/app/commands/create-customer.command.ts

@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+import { ApplicationService } from '@core/application';
+import { ActionHandler } from '@core/command';
+import { Result } from '@domain/defs';
+import { CustomerInfoDTO } from '@swagger/crm';
+
+@Injectable()
+export class CreateCustomerCommand extends ActionHandler<Result<CustomerInfoDTO[]>> {
+  constructor(private _router: Router, private _application: ApplicationService) {
+    super('CREATE_CUSTOMER');
+  }
+
+  async handler(data: Result<CustomerInfoDTO[]>): Promise<Result<CustomerInfoDTO[]>> {
+    let customerType: string;
+    if (data.result.length > 0) {
+      const customerInfo = data.result[0];
+      if (customerInfo.features) {
+        if (customerInfo.features.some((f) => f.key === 'store')) {
+          customerType = 'store';
+        }
+        if (customerInfo.features.some((f) => f.key === 'webshop')) {
+          customerType = 'webshop';
+        }
+      }
+    }
+
+    if (!customerType) {
+      customerType = 'store';
+    }
+
+    await this._router.navigate(['/kunde', this._application.activatedProcessId, 'customer', 'create', customerType]);
+    return data;
+  }
+}

apps/isa-app/src/app/commands/create-kubi-customer.command.ts

@@ -0,0 +1,45 @@
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+import { ApplicationService } from '@core/application';
+import { ActionHandler } from '@core/command';
+import { Result } from '@domain/defs';
+import { CustomerInfoDTO } from '@swagger/crm';
+import { encodeFormData, mapCustomerInfoDtoToCustomerCreateFormData } from 'apps/page/customer/src/lib/create-customer';
+
+@Injectable()
+export class CreateKubiCustomerCommand extends ActionHandler<Result<CustomerInfoDTO[]>> {
+  constructor(private _router: Router, private _application: ApplicationService) {
+    super('CREATE_KUBI_CUSTOMER');
+  }
+
+  async handler(data: Result<CustomerInfoDTO[]>): Promise<Result<CustomerInfoDTO[]>> {
+    let customerType: string;
+    let formData: string;
+    if (data.result.length > 0) {
+      const customerInfo = data.result[0];
+      const fd = mapCustomerInfoDtoToCustomerCreateFormData(customerInfo);
+      formData = encodeFormData({
+        ...fd,
+        agb: true,
+      });
+
+      if (customerInfo.features) {
+        if (customerInfo.features.some((f) => f.key === 'store')) {
+          customerType = 'store';
+        }
+        if (customerInfo.features.some((f) => f.key === 'webshop')) {
+          customerType = 'webshop';
+        }
+      }
+    }
+
+    if (!customerType) {
+      customerType = 'store';
+    }
+
+    await this._router.navigate(['/kunde', this._application.activatedProcessId, 'customer', 'create', `${customerType}-p4m`], {
+      queryParams: { formData },
+    });
+    return data;
+  }
+}

apps/isa-app/src/app/commands/index.ts

@@ -0,0 +1,5 @@
+export * from './close.command';
+export * from './create-customer.command';
+export * from './create-kubi-customer.command';
+export * from './print-kubi-agb.command';
+export * from './remit.command';

apps/isa-app/src/app/commands/print-kubi-agb.command.ts

@@ -0,0 +1,34 @@
+import { Injectable } from '@angular/core';
+import { ActionHandler } from '@core/command';
+import { Result } from '@domain/defs';
+import { DomainPrinterService } from '@domain/printer';
+import { PrintModalComponent, PrintModalData } from '@modal/printer';
+import { CustomerInfoDTO } from '@swagger/crm';
+import { UiModalService } from '@ui/modal';
+
+@Injectable()
+export class PrintKubiCustomerCommand extends ActionHandler<Result<CustomerInfoDTO[]>> {
+  constructor(private _uiModal: UiModalService, private _printerService: DomainPrinterService) {
+    super('PRINT_KUBI_AGB');
+  }
+
+  async handler(data: Result<CustomerInfoDTO[]>): Promise<Result<CustomerInfoDTO[]>> {
+    const customerInfo = data.result ? data.result[0] : undefined;
+    let p4mCode: string;
+    if (customerInfo) {
+      p4mCode = customerInfo.features.find((f) => f.key === 'p4mUser').value;
+    }
+
+    await this._uiModal
+      .open({
+        content: PrintModalComponent,
+        config: { showScrollbarY: false },
+        data: {
+          printerType: 'Label',
+          print: (printer) => this._printerService.printKubiAgb({ printer, p4mCode }).toPromise(),
+        } as PrintModalData,
+      })
+      .afterClosed$.toPromise();
+    return data;
+  }
+}

apps/isa-app/src/app/commands/remit.command.ts

@@ -0,0 +1,14 @@
+import { Injectable } from '@angular/core';
+import { ActionHandler } from '@core/command';
+
+/** Dummy Command um Fehlermeldungen aus dem Diloag zu verhinden */
+@Injectable()
+export class RemitCommand extends ActionHandler<any> {
+  constructor() {
+    super('remit');
+  }
+
+  handler(ctx: any): any {
+    return ctx;
+  }
+}

apps/isa-app/src/app/interceptors/http-error.interceptor.spec.ts

@@ -1,8 +1,9 @@
 import { HttpErrorInterceptor } from './http-error.interceptor';
 import { createServiceFactory, SpectatorService } from '@ngneat/spectator';
-import { UiErrorModalComponent, UiMessageModalComponent, UiModalService } from '@ui/modal';
-import { throwError } from 'rxjs';
+import { UiMessageModalComponent, UiModalResult, UiModalService } from '@ui/modal';
+import { of, Subject, throwError } from 'rxjs';
 import { HttpErrorResponse } from '@angular/common/http';
+import { AuthService } from '@core/auth';
 
 describe('HttpErrorInterceptor', () => {
   let spectator: SpectatorService<HttpErrorInterceptor>;
@@ -11,13 +12,17 @@ describe('HttpErrorInterceptor', () => {
 
   const createService = createServiceFactory({
     service: HttpErrorInterceptor,
-    mocks: [UiModalService],
+    mocks: [UiModalService, AuthService],
   });
 
   beforeEach(() => {
     spectator = createService();
     httpErrorInterceptor = spectator.service;
     modalMock = spectator.inject(UiModalService);
+
+    modalMock.open.and.returnValue({
+      afterClosed$: of({} as UiModalResult<any>),
+    } as any);
   });
 
   it('should be created', () => {
@@ -31,6 +36,7 @@ describe('HttpErrorInterceptor', () => {
         statusText: '',
         url: '',
       });
+
       const handleErrorSpy = spyOn(httpErrorInterceptor, 'handleError').and.callThrough();
       httpErrorInterceptor.intercept(null, { handle: () => throwError(error) }).subscribe({
         error: () => {

apps/isa-app/src/app/interceptors/http-error.interceptor.ts

@@ -2,11 +2,12 @@ import { Injectable } from '@angular/core';
 import { HttpInterceptor, HttpEvent, HttpHandler, HttpRequest, HttpErrorResponse } from '@angular/common/http';
 import { Observable, throwError } from 'rxjs';
 import { UiMessageModalComponent, UiModalService } from '@ui/modal';
-import { catchError } from 'rxjs/operators';
+import { catchError, mergeMap, tap } from 'rxjs/operators';
+import { AuthService } from '@core/auth';
 
 @Injectable()
 export class HttpErrorInterceptor implements HttpInterceptor {
-  constructor(private _modal: UiModalService) {}
+  constructor(private _modal: UiModalService, private _auth: AuthService) {}
 
   intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
     return next.handle(req).pipe(catchError((error: HttpErrorResponse, caught: any) => this.handleError(error)));
@@ -14,11 +15,26 @@ export class HttpErrorInterceptor implements HttpInterceptor {
 
   handleError(error: HttpErrorResponse): Observable<any> {
     if (error.status === 0) {
-      this._modal.open({
-        content: UiMessageModalComponent,
-        title: 'Sie sind offline, keine Verbindung zum Netzwerk',
-        data: { message: 'Bereits geladene Inhalte werden angezeigt. Interaktionen sind aktuell nicht möglich.' },
-      });
+      return this._modal
+        .open({
+          content: UiMessageModalComponent,
+          title: 'Sie sind offline, keine Verbindung zum Netzwerk',
+          data: { message: 'Bereits geladene Inhalte werden angezeigt. Interaktionen sind aktuell nicht möglich.' },
+        })
+        .afterClosed$.pipe(mergeMap(() => throwError(error)));
+    } else if (error.status === 401) {
+      return this._modal
+        .open({
+          content: UiMessageModalComponent,
+          title: 'Sie sind nicht mehr angemeldet',
+          data: { message: 'Sie werden neu angemeldet' },
+        })
+        .afterClosed$.pipe(
+          tap(() => {
+            this._auth.login();
+          }),
+          mergeMap(() => throwError(error))
+        );
     }
 
     return throwError(error);

apps/isa-app/src/app/providers/isa.error-handler.ts

@@ -1,7 +1,7 @@
 import { HttpErrorResponse } from '@angular/common/http';
 import { ErrorHandler, Injectable } from '@angular/core';
 import { AuthService } from '@core/auth';
-import { UiDialogModalComponent, UiErrorModalComponent, UiModalService } from '@ui/modal';
+import { DialogModel, UiDialogModalComponent, UiErrorModalComponent, UiModalService } from '@ui/modal';
 
 @Injectable()
 export class IsaErrorHandler implements ErrorHandler {
@@ -22,9 +22,10 @@ export class IsaErrorHandler implements ErrorHandler {
           content: UiDialogModalComponent,
           title: 'Sitzung abgelaufen',
           data: {
+            handleCommand: false,
             content: 'Sie waren zu lange nicht in der ISA aktiv. Bitte melden Sie sich erneut an',
             actions: [{ command: 'CLOSE', selected: true, label: 'Erneut anmelden' }],
-          },
+          } as DialogModel,
         })
         .afterClosed$.toPromise();
 

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

@@ -3,7 +3,7 @@ import { ApplicationProcess, ApplicationService } from '@core/application';
 import { first, map, shareReplay, switchMap, tap } from 'rxjs/operators';
 import { NotificationsHub } from '@hub/notifications';
 import { ModalNotificationsComponent } from '@modal/notifications';
-import { ConfirmModalData, UiConfirmModalComponent, UiModalService } from '@ui/modal';
+import { UiModalService } from '@ui/modal';
 import { Router } from '@angular/router';
 import { BreadcrumbService } from '@core/breadcrumb';
 import { combineLatest } from 'rxjs';

apps/isa-app/src/assets/fonts/fonts.css

@@ -0,0 +1,219 @@
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: normal;
+  src: url('./Open_Sans-400-cyrillic-ext1.woff2') format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+/* cyrillic */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: normal;
+  src: url('./Open_Sans-400-cyrillic2.woff2') format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* greek-ext */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: normal;
+  src: url('./Open_Sans-400-greek-ext3.woff2') format('woff2');
+  unicode-range: U+1F00-1FFF;
+}
+/* greek */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: normal;
+  src: url('./Open_Sans-400-greek4.woff2') format('woff2');
+  unicode-range: U+0370-03FF;
+}
+/* hebrew */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: normal;
+  src: url('./Open_Sans-400-hebrew5.woff2') format('woff2');
+  unicode-range: U+0590-05FF, U+200C-2010, U+20AA, U+25CC, U+FB1D-FB4F;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: normal;
+  src: url('./Open_Sans-400-vietnamese6.woff2') format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: normal;
+  src: url('./Open_Sans-400-latin-ext7.woff2') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: normal;
+  src: url('./Open_Sans-400-latin8.woff2') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193,
+    U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-stretch: normal;
+  src: url('./Open_Sans-600-cyrillic-ext9.woff2') format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+/* cyrillic */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-stretch: normal;
+  src: url('./Open_Sans-600-cyrillic10.woff2') format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* greek-ext */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-stretch: normal;
+  src: url('./Open_Sans-600-greek-ext11.woff2') format('woff2');
+  unicode-range: U+1F00-1FFF;
+}
+/* greek */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-stretch: normal;
+  src: url('./Open_Sans-600-greek12.woff2') format('woff2');
+  unicode-range: U+0370-03FF;
+}
+/* hebrew */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-stretch: normal;
+  src: url('./Open_Sans-600-hebrew13.woff2') format('woff2');
+  unicode-range: U+0590-05FF, U+200C-2010, U+20AA, U+25CC, U+FB1D-FB4F;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-stretch: normal;
+  src: url('./Open_Sans-600-vietnamese14.woff2') format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-stretch: normal;
+  src: url('./Open_Sans-600-latin-ext15.woff2') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-stretch: normal;
+  src: url('./Open_Sans-600-latin16.woff2') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193,
+    U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  font-stretch: normal;
+  src: url('./Open_Sans-700-cyrillic-ext17.woff2') format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+/* cyrillic */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  font-stretch: normal;
+  src: url('./Open_Sans-700-cyrillic18.woff2') format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* greek-ext */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  font-stretch: normal;
+  src: url('./Open_Sans-700-greek-ext19.woff2') format('woff2');
+  unicode-range: U+1F00-1FFF;
+}
+/* greek */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  font-stretch: normal;
+  src: url('./Open_Sans-700-greek20.woff2') format('woff2');
+  unicode-range: U+0370-03FF;
+}
+/* hebrew */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  font-stretch: normal;
+  src: url('./Open_Sans-700-hebrew21.woff2') format('woff2');
+  unicode-range: U+0590-05FF, U+200C-2010, U+20AA, U+25CC, U+FB1D-FB4F;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  font-stretch: normal;
+  src: url('./Open_Sans-700-vietnamese22.woff2') format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  font-stretch: normal;
+  src: url('./Open_Sans-700-latin-ext23.woff2') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  font-stretch: normal;
+  src: url('./Open_Sans-700-latin24.woff2') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193,
+    U+2212, U+2215, U+FEFF, U+FFFD;
+}

apps/isa-app/src/assets/icons.svg

@@ -212,4 +212,7 @@
     <g id="shiiping_document" transform="matrix(1.11057,0,0,1.11057,2.2921,-1.02614)">
         <path d="M20.713,0.924L2.151,0.924C1.824,0.924 1.517,1.048 1.288,1.283C1.06,1.512 0.936,1.819 0.936,2.139L0.936,25.634C0.936,26.307 1.478,26.849 2.151,26.849C2.151,26.849 2.758,26.849 2.758,26.849C2.758,26.849 2.758,28.523 2.758,28.523C2.758,29.196 3.3,29.738 3.973,29.738L22.535,29.738C23.208,29.738 23.75,29.196 23.75,28.523L23.75,5.028C23.75,4.361 23.202,3.819 22.535,3.819C22.535,3.819 21.928,3.819 21.928,3.819C21.928,3.819 21.928,2.139 21.928,2.139C21.928,1.466 21.386,0.924 20.713,0.924ZM22.471,5.098L22.471,28.459L4.037,28.459L4.037,26.849C4.037,26.849 20.713,26.849 20.713,26.849C21.341,26.849 21.855,26.371 21.921,25.766L21.928,25.64C21.928,25.64 21.828,25.734 21.828,25.734L21.928,25.634L21.928,5.098L22.471,5.098ZM2.215,2.197L2.215,25.57L20.649,25.57L20.649,2.197L2.215,2.197ZM9.403,22.1L3.397,22.1C3.042,22.1 2.758,22.384 2.758,22.739C2.758,23.094 3.042,23.379 3.397,23.379C3.397,23.379 9.403,23.379 9.403,23.379C9.758,23.379 10.043,23.094 10.043,22.739C10.043,22.384 9.758,22.1 9.403,22.1ZM14.522,19.469L3.277,19.469C2.996,19.469 2.758,19.747 2.758,20.108C2.758,20.469 2.996,20.747 3.277,20.747L14.522,20.747C14.803,20.747 15.041,20.469 15.041,20.108C15.041,19.747 14.803,19.469 14.522,19.469ZM12.352,16.843L3.397,16.843C3.042,16.843 2.758,17.127 2.758,17.483C2.758,17.838 3.042,18.122 3.397,18.122C3.397,18.122 12.352,18.122 12.352,18.122C12.707,18.122 12.992,17.838 12.992,17.483C12.992,17.127 12.707,16.843 12.352,16.843ZM14.478,14.212L3.322,14.212C3.013,14.212 2.758,14.492 2.758,14.851C2.758,15.211 3.013,15.491 3.322,15.491C3.322,15.491 14.478,15.491 14.478,15.491C14.786,15.491 15.041,15.211 15.041,14.851C15.041,14.492 14.786,14.212 14.478,14.212ZM9.593,11.587L3.298,11.587C3.004,11.587 2.758,11.866 2.758,12.226C2.758,12.587 3.004,12.866 3.298,12.866C3.298,12.866 9.593,12.866 9.593,12.866C9.887,12.866 10.133,12.587 10.133,12.226C10.133,11.866 9.887,11.587 9.593,11.587ZM15.163,3.657C12.86,3.657 10.987,5.53 10.987,7.833C10.987,10.136 12.86,12.009 15.163,12.009C17.466,12.009 19.345,10.136 19.345,7.833C19.345,5.53 17.472,3.657 15.163,3.657ZM15.163,4.936C16.762,4.936 18.066,6.234 18.066,7.833C18.066,9.432 16.768,10.73 15.163,10.73C13.564,10.73 12.266,9.432 12.266,7.833C12.266,6.234 13.564,4.936 15.163,4.936ZM9.525,8.956L3.366,8.956C3.03,8.956 2.758,9.238 2.758,9.595C2.758,9.952 3.03,10.234 3.366,10.234L9.525,10.234C9.861,10.234 10.133,9.952 10.133,9.595C10.133,9.238 9.861,8.956 9.525,8.956ZM14.821,7.954L14.61,7.634C14.459,7.403 14.127,7.319 13.867,7.453C13.596,7.593 13.507,7.902 13.664,8.142C13.664,8.142 14.228,9.011 14.228,9.011C14.313,9.141 14.457,9.233 14.626,9.251C14.651,9.256 14.676,9.256 14.701,9.256C14.846,9.256 14.984,9.207 15.087,9.116C15.087,9.116 17.248,7.196 17.248,7.196C17.469,6.999 17.469,6.68 17.248,6.483C17.037,6.291 16.693,6.291 16.481,6.479L14.821,7.954ZM2.164,2.197C2.16,2.197 2.157,2.197 2.154,2.197C2.152,2.197 2.151,2.197 2.151,2.197L2.164,2.197ZM2.151,2.097L2.151,2.097L2.151,2.197L2.151,2.097Z" style="fill:rgb(0,4,0);"/>
     </g>
+    <g  id="filter_new" transform="matrix(1.77778,0,0,2,0.000431998,3.99944)">
+        <path d="M7,12L11,12L11,10L7,10L7,12ZM0,0L0,2L18,2L18,0L0,0ZM3,7L15,7L15,5L3,5L3,7Z" style="fill-rule:nonzero;"/>
+    </g>
 </svg>

apps/isa-app/src/assets/icons/icons.css

@@ -0,0 +1,20 @@
+@font-face {
+  font-family: 'Material Symbols Outlined';
+  font-style: normal;
+  font-weight: 100 700;
+  src: url(./materials-icons-outlined.woff2) format('woff2');
+}
+
+@font-face {
+  font-family: 'Material Symbols Rounded';
+  font-style: normal;
+  font-weight: 100 700;
+  src: url(./materials-icons-rounded.woff2) format('woff2');
+}
+
+@font-face {
+  font-family: 'Material Symbols Sharp';
+  font-style: normal;
+  font-weight: 100 700;
+  src: url(./materials-icons-sharp.woff2) format('woff2');
+}

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

@@ -17,19 +17,19 @@
         "rootUrl": "https://isa-test.paragon-data.net/isa/v1"
     },
     "@swagger/cat": {
-        "rootUrl": "https://isa-test.paragon-data.net/catsearch/v5"
+        "rootUrl": "https://isa-test.paragon-data.net/catsearch/v6"
     },
     "@swagger/av": {
-        "rootUrl": "https://isa-test.paragon-data.net/ava/v4"
+        "rootUrl": "https://isa-test.paragon-data.net/ava/v6"
     },
     "@swagger/checkout": {
-        "rootUrl": "https://isa-test.paragon-data.net/checkout/v3"
+        "rootUrl": "https://isa-test.paragon-data.net/checkout/v6"
     },
     "@swagger/crm": {
-        "rootUrl": "https://isa-test.paragon-data.net/crm/v3"
+        "rootUrl": "https://isa-test.paragon-data.net/crm/v6"
     },
     "@swagger/oms": {
-        "rootUrl": "https://isa-test.paragon-data.net/oms/v4"
+        "rootUrl": "https://isa-test.paragon-data.net/oms/v6"
     },
     "@swagger/print": {
         "rootUrl": "https://isa-test.paragon-data.net/print/v1"

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

@@ -17,19 +17,19 @@
     "rootUrl": "https://isa-integration.paragon-data.net/isa/v1"
   },
   "@swagger/cat": {
-    "rootUrl": "https://isa-integration.paragon-data.net/catsearch/v5"
+    "rootUrl": "https://isa-integration.paragon-data.net/catsearch/v6"
   },
   "@swagger/av": {
-    "rootUrl": "https://isa-integration.paragon-data.net/ava/v4"
+    "rootUrl": "https://isa-integration.paragon-data.net/ava/v6"
   },
   "@swagger/checkout": {
-    "rootUrl": "https://isa-integration.paragon-data.net/checkout/v3"
+    "rootUrl": "https://isa-integration.paragon-data.net/checkout/v6"
   },
   "@swagger/crm": {
-    "rootUrl": "https://isa-integration.paragon-data.net/crm/v3"
+    "rootUrl": "https://isa-integration.paragon-data.net/crm/v6"
   },
   "@swagger/oms": {
-    "rootUrl": "https://isa-integration.paragon-data.net/oms/v4"
+    "rootUrl": "https://isa-integration.paragon-data.net/oms/v6"
   },
   "@swagger/print": {
     "rootUrl": "https://isa-integration.paragon-data.net/print/v1"

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

@@ -17,19 +17,19 @@
         "rootUrl": "https://isa-test.paragon-data.net/isa/v1"
     },
     "@swagger/cat": {
-        "rootUrl": "https://isa-test.paragon-data.net/catsearch/v5"
+        "rootUrl": "https://isa-test.paragon-data.net/catsearch/v6"
     },
     "@swagger/av": {
-        "rootUrl": "https://isa-test.paragon-data.net/ava/v4"
+        "rootUrl": "https://isa-test.paragon-data.net/ava/v6"
     },
     "@swagger/checkout": {
-        "rootUrl": "https://isa-test.paragon-data.net/checkout/v3"
+        "rootUrl": "https://isa-test.paragon-data.net/checkout/v6"
     },
     "@swagger/crm": {
-        "rootUrl": "https://isa-test.paragon-data.net/crm/v3"
+        "rootUrl": "https://isa-test.paragon-data.net/crm/v6"
     },
     "@swagger/oms": {
-        "rootUrl": "https://isa-test.paragon-data.net/oms/v4"
+        "rootUrl": "https://isa-test.paragon-data.net/oms/v6"
     },
     "@swagger/print": {
         "rootUrl": "https://isa-test.paragon-data.net/print/v1"
@@ -60,4 +60,4 @@
         }
     },
     "checkForUpdates": 3600000
-}
+}

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

@@ -17,19 +17,19 @@
     "rootUrl": "https://isa.paragon-systems.de/isa/v1"
   },
   "@swagger/cat": {
-    "rootUrl": "https://isa.paragon-systems.de/catsearch/v5"
+    "rootUrl": "https://isa.paragon-systems.de/catsearch/v6"
   },
   "@swagger/av": {
-    "rootUrl": "https://isa.paragon-systems.de/ava/v4"
+    "rootUrl": "https://isa.paragon-systems.de/ava/v6"
   },
   "@swagger/checkout": {
-    "rootUrl": "https://isa.paragon-systems.de/checkout/v3"
+    "rootUrl": "https://isa.paragon-systems.de/checkout/v6"
   },
   "@swagger/crm": {
-    "rootUrl": "https://isa.paragon-systems.de/crm/v3"
+    "rootUrl": "https://isa.paragon-systems.de/crm/v6"
   },
   "@swagger/oms": {
-    "rootUrl": "https://isa.paragon-systems.de/oms/v4"
+    "rootUrl": "https://isa.paragon-systems.de/oms/v6"
   },
   "@swagger/print": {
     "rootUrl": "https://isa.paragon-systems.de/print/v1"

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

@@ -17,19 +17,19 @@
     "rootUrl": "https://isa-staging.paragon-systems.de/isa/v1"
   },
   "@swagger/cat": {
-    "rootUrl": "https://isa-staging.paragon-systems.de/catsearch/v5"
+    "rootUrl": "https://isa-staging.paragon-systems.de/catsearch/v6"
   },
   "@swagger/av": {
-    "rootUrl": "https://isa-staging.paragon-systems.de/ava/v4"
+    "rootUrl": "https://isa-staging.paragon-systems.de/ava/v6"
   },
   "@swagger/checkout": {
-    "rootUrl": "https://isa-staging.paragon-systems.de/checkout/v3"
+    "rootUrl": "https://isa-staging.paragon-systems.de/checkout/v6"
   },
   "@swagger/crm": {
-    "rootUrl": "https://isa-staging.paragon-systems.de/crm/v3"
+    "rootUrl": "https://isa-staging.paragon-systems.de/crm/v6"
   },
   "@swagger/oms": {
-    "rootUrl": "https://isa-staging.paragon-systems.de/oms/v4"
+    "rootUrl": "https://isa-staging.paragon-systems.de/oms/v6"
   },
   "@swagger/print": {
     "rootUrl": "https://isa-staging.paragon-systems.de/print/v1"

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

@@ -17,19 +17,19 @@
         "rootUrl": "https://isa-test.paragon-data.net/isa/v1"
     },
     "@swagger/cat": {
-        "rootUrl": "https://isa-test.paragon-data.net/catsearch/v5"
+        "rootUrl": "https://isa-test.paragon-data.net/catsearch/v6"
     },
     "@swagger/av": {
-        "rootUrl": "https://isa-test.paragon-data.net/ava/v4"
+        "rootUrl": "https://isa-test.paragon-data.net/ava/v6"
     },
     "@swagger/checkout": {
-        "rootUrl": "https://isa-test.paragon-data.net/checkout/v3"
+        "rootUrl": "https://isa-test.paragon-data.net/checkout/v6"
     },
     "@swagger/crm": {
-        "rootUrl": "https://isa-test.paragon-data.net/crm/v3"
+        "rootUrl": "https://isa-test.paragon-data.net/crm/v6"
     },
     "@swagger/oms": {
-        "rootUrl": "https://isa-test.paragon-data.net/oms/v4"
+        "rootUrl": "https://isa-test.paragon-data.net/oms/v6"
     },
     "@swagger/print": {
         "rootUrl": "https://isa-test.paragon-data.net/print/v1"

apps/isa-app/src/index.html

@@ -6,10 +6,12 @@
     <base href="/" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0" />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600,700" rel="stylesheet" />
+    <link href="/assets/fonts/fonts.css" rel="stylesheet" />
+    <link href="/assets/icons/icons.css" rel="stylesheet" />
     <link rel="manifest" href="manifest.webmanifest" />
     <meta name="theme-color" content="#1976d2" />
   </head>
+
   <body>
     <app-root>
       <div class="grid place-items-center h-screen">

apps/isa-app/src/main.ts

@@ -1,5 +1,8 @@
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import * as moment from 'moment';
+
+moment.locale('de');
 
 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';

apps/isa-app/src/scss/_components.scss

@@ -0,0 +1 @@
+@import './components/icon';

apps/isa-app/src/scss/components/_icon.scss

@@ -0,0 +1,121 @@
+@layer components {
+  .icon {
+    --icon-fill: 0;
+    --icon-weight: 400;
+    --icon-grade: 0;
+    --icon-optical-size: 48;
+  }
+
+  .icon,
+  .icon-outlined {
+    font-family: 'Material Symbols Outlined';
+    font-weight: normal;
+    font-style: normal;
+    font-size: 24px;
+    line-height: 1;
+    letter-spacing: normal;
+    text-transform: none;
+    display: inline-block;
+    white-space: nowrap;
+    word-wrap: normal;
+    direction: ltr;
+    -webkit-font-feature-settings: 'liga';
+    -webkit-font-smoothing: antialiased;
+  }
+
+  .icon-rounded {
+    font-family: 'Material Symbols Rounded';
+    font-weight: normal;
+    font-style: normal;
+    font-size: 24px;
+    line-height: 1;
+    letter-spacing: normal;
+    text-transform: none;
+    display: inline-block;
+    white-space: nowrap;
+    word-wrap: normal;
+    direction: ltr;
+    -webkit-font-feature-settings: 'liga';
+    -webkit-font-smoothing: antialiased;
+  }
+
+  .icon-sharp {
+    font-family: 'Material Symbols Sharp';
+    font-weight: normal;
+    font-style: normal;
+    font-size: 24px;
+    line-height: 1;
+    letter-spacing: normal;
+    text-transform: none;
+    display: inline-block;
+    white-space: nowrap;
+    word-wrap: normal;
+    direction: ltr;
+    -webkit-font-feature-settings: 'liga';
+    -webkit-font-smoothing: antialiased;
+  }
+
+  .icon-fill {
+    --icon-fill: 1;
+  }
+
+  .icon-weight-100 {
+    --icon-weight: 100;
+  }
+
+  .icon-weight-200 {
+    --icon-weight: 200;
+  }
+
+  .icon-weight-300 {
+    --icon-weight: 300;
+  }
+
+  .icon-weight-400 {
+    --icon-weight: 400;
+  }
+
+  .icon-weight-500 {
+    --icon-weight: 500;
+  }
+
+  .icon-weight-600 {
+    --icon-weight: 600;
+  }
+
+  .icon-weight-700 {
+    --icon-weight: 700;
+  }
+
+  .icon-grade {
+    --icon-grade: 0;
+  }
+
+  .icon-grade-200 {
+    --icon-grade: 200;
+  }
+
+  .icon-grade--25 {
+    --icon-grade: -25;
+  }
+
+  .icon-optical-size-20 {
+    --icon-optical-size: 20;
+  }
+
+  .icon-optical-size-24 {
+    --icon-optical-size: 24;
+  }
+
+  .icon-optical-size-40 {
+    --icon-optical-size: 40;
+  }
+
+  .icon-optical-size-48 {
+    --icon-optical-size: 48;
+  }
+
+  .icon {
+    font-variation-settings: 'FILL' var(--icon-fill), 'wght' var(--icon-weight), 'GRAD' var(--icon-grade), 'opsz' var(--icon-optical-size);
+  }
+}

apps/isa-app/src/styles.scss

@@ -1,9 +1,11 @@
 /* You can add global styles to this file, and also import other style files */
 @import '~@angular/cdk/overlay-prebuilt.css';
 
-@import 'tailwindcss/base';
-@import 'tailwindcss/components';
-@import 'tailwindcss/utilities';
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+@import './scss/components';
 
 @import './scss/root';
 @import './scss/customer';

apps/modal/availabilities/src/lib/in-stock.pipe.ts

@@ -1,5 +1,5 @@
 import { Pipe, PipeTransform } from '@angular/core';
-import { AvailabilityByBranchDTO } from 'apps/domain/availability/src/lib/defs/availability-by-branch-dto.model';
+import { AvailabilityByBranchDTO } from '@domain/availability';
 
 @Pipe({
   name: 'inStock',

apps/modal/availabilities/src/lib/stock-info.pipe.ts

@@ -1,5 +1,5 @@
 import { Pipe, PipeTransform } from '@angular/core';
-import { AvailabilityByBranchDTO } from 'apps/domain/availability/src/lib/defs/availability-by-branch-dto.model';
+import { AvailabilityByBranchDTO } from '@domain/availability';
 
 @Pipe({
   name: 'stockInfo',

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

@@ -86,7 +86,7 @@
               <div class="availability-icons">
                 <div class="fetching xsmall" *ngIf="store.fetchingTakeAwayAvailability$ | async; else showAvailabilityTakeAwayIcon"></div>
                 <ng-template #showAvailabilityTakeAwayIcon>
-                  <ui-icon *ngIf="store.isTakeAwayAvailabilityAvailable$ | async" icon="shopping_bag" size="18px"></ui-icon>
+                  <ui-icon *ngIf="store.isTakeAwayAvailabilityAvailable$ | async" icon="shopping_bag" size="18px"> </ui-icon>
                 </ng-template>
 
                 <div class="fetching xsmall" *ngIf="store.fetchingPickUpAvailability$ | async; else showAvailabilityPickUpIcon"></div>
@@ -104,7 +104,7 @@
                   *ngIf="store.fetchingDeliveryB2BAvailability$ | async; else showAvailabilityDeliveryB2BIcon"
                 ></div>
                 <ng-template #showAvailabilityDeliveryB2BIcon>
-                  <ui-icon *ngIf="showDeliveryB2BTruck$ | async" class="truck_b2b" icon="truck_b2b" size="40px"></ui-icon>
+                  <ui-icon *ngIf="showDeliveryB2BTruck$ | async" class="truck_b2b" icon="truck_b2b" size="40px"> </ui-icon>
                 </ng-template>
 
                 <span *ngIf="store.isDownload$ | async" class="download-icon">

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

@@ -259,7 +259,7 @@
   max-width: 916px;
 
   .product-button {
-    @apply flex flex-row justify-center items-center w-full text-xl bg-white text-ucla-blue font-bold border-none outline-none bg-transparent rounded-t-card;
+    @apply flex flex-row justify-center items-center w-full text-xl bg-white text-ucla-blue font-bold border-none outline-none rounded-t-card;
     box-shadow: 0 -2px 24px 0 #dce2e9;
     height: 60px;
   }

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

@@ -2,6 +2,7 @@ import { Component, ChangeDetectionStrategy, OnInit, OnDestroy, ElementRef } fro
 import { ActivatedRoute } from '@angular/router';
 import { ApplicationService } from '@core/application';
 import { DomainPrinterService } from '@domain/printer';
+import { ItemDTO as PrinterItemDTO } from '@swagger/print';
 import { PrintModalComponent, PrintModalData } from '@modal/printer';
 import { AvailabilityDTO, BranchDTO } from '@swagger/checkout';
 import { UiModalService } from '@ui/modal';
@@ -148,7 +149,8 @@ export class ArticleDetailsComponent implements OnInit, OnDestroy {
       content: PrintModalComponent,
       data: {
         printerType: 'Label',
-        print: (printer) => this.domainPrinterService.printProduct({ item, printer }).toPromise(),
+        // TODO: remove item: item as PrinterItemDTO when the backend is fixed
+        print: (printer) => this.domainPrinterService.printProduct({ item: item as PrinterItemDTO, printer }).toPromise(),
       } as PrintModalData,
       config: {
         panelClass: [],

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

@@ -6,7 +6,9 @@ import { DomainAvailabilityService, ItemData } from '@domain/availability';
 import { DomainCatalogService } from '@domain/catalog';
 import { ComponentStore, tapResponse } from '@ngrx/component-store';
 import { ItemDTO, ResponseArgsOfItemDTO } from '@swagger/cat';
+import { AvailabilityDTO } from '@swagger/checkout';
 import { UiErrorModalComponent, UiModalService } from '@ui/modal';
+import { isEmpty } from 'lodash';
 import { combineLatest, Observable, of } from 'rxjs';
 import { catchError, filter, first, map, shareReplay, switchMap, tap } from 'rxjs/operators';
 
@@ -113,11 +115,24 @@ export class ArticleDetailsStore extends ComponentStore<ArticleDetailsState> {
 
   //#region Abholung
   readonly fetchingPickUpAvailability$ = this.select((s) => s.fetchingPickUpAvailability);
-  readonly pickUpAvailability$ = combineLatest([this.itemData$, this.branch$, this.isDownload$]).pipe(
+  readonly pickUpAvailability$: Observable<AvailabilityDTO> = combineLatest([this.itemData$, this.branch$, this.isDownload$]).pipe(
     tap(() => this.patchState({ fetchingPickUpAvailability: true, fetchingPickUpAvailabilityError: undefined })),
     switchMap(([item, branch, isDownload]) =>
       !!item && !!branch && !isDownload
         ? this.domainAvailabilityService.getPickUpAvailability({ item, branch, quantity: 1 }).pipe(
+            map((av) => {
+              if (av?.length > 0) {
+                if (av[1].availableFor) {
+                  if ((av[1].availableFor & 2) === 2) {
+                    return av[0];
+                  } else {
+                    return undefined;
+                  }
+                } else {
+                  return av[0];
+                }
+              }
+            }),
             catchError((err) => {
               console.error('getPickUpAvailability failed.', err);
               this.patchState({ fetchingPickUpAvailabilityError: 'Fehler beim laden der Abholung.' });
@@ -224,22 +239,42 @@ export class ArticleDetailsStore extends ComponentStore<ArticleDetailsState> {
   readonly isDeliveryB2BAvailabilityAvailable$ = this.select(this.deliveryB2BAvailability$, (availability) =>
     this.domainAvailabilityService.isAvailable({ availability })
   );
-  //#endregion
+  //#endregion#
 
   readonly sscText$ = combineLatest([
     this.item$,
     this.isDownload$,
     this.pickUpAvailability$,
     this.deliveryDigAvailability$,
+    this.deliveryB2BAvailability$,
     this.downloadAvailability$,
   ]).pipe(
-    map(([item, isDownload, pickupAvailability, deliveryDigAvailability, downloadAvailability]) => {
-      const availability = isDownload ? downloadAvailability : pickupAvailability || deliveryDigAvailability;
-      return item?.catalogAvailability?.supplier === 'S' && !isDownload
-        ? `${item?.catalogAvailability?.ssc} - ${item?.catalogAvailability?.sscText}`
-        : availability?.ssc || availability?.sscText
-        ? `${availability?.ssc} - ${availability?.sscText}`
-        : 'Keine Lieferanten vorhanden';
+    map(([item, isDownload, pickupAvailability, deliveryDigAvailability, deliveryB2BAvailability, downloadAvailability]) => {
+      // const availability = isDownload ? downloadAvailability : pickupAvailability || deliveryDigAvailability || deliveryB2BAvailability;
+
+      let availability: AvailabilityDTO;
+
+      if (isDownload) {
+        availability = downloadAvailability;
+      } else {
+        if (pickupAvailability?.sscText) {
+          availability = pickupAvailability;
+        } else if (deliveryDigAvailability?.sscText) {
+          availability = deliveryDigAvailability;
+        } else if (deliveryB2BAvailability?.sscText) {
+          availability = deliveryB2BAvailability;
+        }
+      }
+
+      if (item?.catalogAvailability?.supplier === 'S' && !isDownload) {
+        return [item?.catalogAvailability?.ssc, item?.catalogAvailability?.sscText].filter((f) => !!f).join(' - ');
+      }
+
+      if (availability?.ssc || availability?.sscText) {
+        return [availability?.ssc, availability?.sscText].filter((f) => !!f).join(' - ');
+      }
+
+      return 'Keine Lieferanten vorhanden';
     })
   );
 

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

@@ -251,6 +251,7 @@ export class ArticleSearchResultsComponent implements OnInit, OnDestroy {
           catalogProductNumber: String(item?.id),
           ...item?.product,
         },
+        itemType: item.type,
         promotion: { points: item?.promoPoints },
       };
 

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

@@ -54,9 +54,9 @@
           [min]="minDate"
           [disabledDaysOfWeek]="[0]"
           [selected]="estimatedShippingDate$ | async"
+          saveLabel="Übernehmen"
           (save)="changeEstimatedShippingDate($event); uiDatepicker.close()"
         >
-          <ng-container #content>Übernehmen</ng-container>
         </ui-datepicker>
       </ui-form-control>
     </div>

apps/page/checkout/src/lib/checkout-dummy/checkout-dummy.store.ts

@@ -305,6 +305,7 @@ export class CheckoutDummyStore extends ComponentStore<CheckoutDummyState> {
       destination: {
         data: { target: 1, targetBranch: { id: branch.id } },
       },
+      itemType: this.item.type,
     };
 
     if (update) {

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

@@ -526,9 +526,17 @@ export class CheckoutReviewComponent extends ComponentStore<CheckoutReviewCompon
       availabilities['download'] = downloadAvailability;
     }
 
-    if (pickupAvailability && this.availabilityService.isAvailable({ availability: pickupAvailability })) {
-      availableOptions.push('pick-up');
-      availabilities['pick-up'] = pickupAvailability;
+    if (pickupAvailability && this.availabilityService.isAvailable({ availability: pickupAvailability[0] })) {
+      if (pickupAvailability[1].availableFor) {
+        if ((pickupAvailability[1].availableFor & 2) === 2) {
+          availableOptions.push('pick-up');
+          availabilities['pick-up'] = pickupAvailability[0];
+        }
+      } else {
+        availableOptions.push('pick-up');
+        availabilities['pick-up'] = pickupAvailability[0];
+      }
+
       if (!customerFeatures?.webshop && this.availabilityService.isAvailable({ availability: b2bAvailability })) {
         availableOptions.push('b2b-delivery');
         availabilities['b2b-delivery'] = b2bAvailability;
@@ -648,6 +656,7 @@ export class CheckoutReviewComponent extends ComponentStore<CheckoutReviewCompon
                 },
                 quantity,
               })
+              .pipe(map((av) => av[0]))
               .toPromise();
             break;
           case 'Versand':
@@ -714,13 +723,17 @@ export class CheckoutReviewComponent extends ComponentStore<CheckoutReviewCompon
         .toPromise();
       this.setQuantityError(shoppingCartItem, availability, false);
     } else if (availability) {
+      // Wenn das Ergebnis der Availability Abfrage keinen Preis zurückliefert (z.B. HFI Geschenkkarte), wird der Preis aus der
+      // Availability vor der Abfrage verwendet
+      const updateAvailability = availability?.price ? availability : { ...availability, price: shoppingCartItem.availability?.price };
+
       await this.domainCheckoutService
         .updateItemInShoppingCart({
           processId: this.applicationService.activatedProcessId,
           shoppingCartItemId: shoppingCartItem.id,
           update: {
             quantity,
-            availability: this.compareDeliveryAndCatalogPrice(availability, orderType, shoppingCartItemPrice),
+            availability: this.compareDeliveryAndCatalogPrice(updateAvailability, orderType, shoppingCartItemPrice),
           },
         })
         .toPromise();

apps/page/checkout/src/lib/checkout-review/shopping-cart-item/shopping-cart-item.component.html

@@ -45,7 +45,8 @@
   <div class="item-date" *ngIf="orderType === 'Abholung'">Abholung ab {{ item?.availability?.estimatedShippingDate | date }}</div>
   <div class="item-date" *ngIf="orderType === 'Versand' || orderType === 'B2B-Versand' || orderType === 'DIG-Versand'">
     <ng-container *ngIf="item?.availability?.estimatedDelivery; else estimatedShippingDate">
-      Zustellung zwischen {{ (item?.availability?.estimatedDelivery?.start | date: 'EEE, dd.MM.')?.replace('.', '') }} und
+      Zustellung zwischen {{ (item?.availability?.estimatedDelivery?.start | date: 'EEE, dd.MM.')?.replace('.', '') }}
+      und
       {{ (item?.availability?.estimatedDelivery?.stop | date: 'EEE, dd.MM.')?.replace('.', '') }}
     </ng-container>
     <ng-template #estimatedShippingDate> Versand {{ item?.availability?.estimatedShippingDate | date }} </ng-template>
@@ -90,7 +91,7 @@
   <button
     [disabled]="(loadingOnQuantityChangeById$ | async) === item?.id || (loadingOnItemChangeById$ | async) === item?.id"
     (click)="onChangeItem()"
-    *ngIf="(isDummy$ | async) || (hasOrderType$ | async)"
+    *ngIf="canEdit$ | async"
   >
     <ui-spinner [show]="(loadingOnItemChangeById$ | async) === item?.id">
       Ändern

apps/page/checkout/src/lib/checkout-review/shopping-cart-item/shopping-cart-item.component.ts

@@ -3,7 +3,7 @@ import { ApplicationService } from '@core/application';
 import { DomainAvailabilityService } from '@domain/availability';
 import { DomainCheckoutService } from '@domain/checkout';
 import { ComponentStore } from '@ngrx/component-store';
-import { ShoppingCartItemDTO } from '@swagger/checkout';
+import { ItemType, ShoppingCartItemDTO } from '@swagger/checkout';
 import { combineLatest } from 'rxjs';
 import { filter, first, map, shareReplay, switchMap } from 'rxjs/operators';
 
@@ -83,6 +83,15 @@ export class ShoppingCartItemComponent extends ComponentStore<ShoppingCartItemCo
     shareReplay()
   );
 
+  canEdit$ = combineLatest([this.isDummy$, this.hasOrderType$, this.item$]).pipe(
+    map(([isDummy, hasOrderType, item]) => {
+      if (item.itemType === (66560 as ItemType)) {
+        return false;
+      }
+      return isDummy || hasOrderType;
+    })
+  );
+
   quantityRange$ = combineLatest([this.orderType$, this.item$]).pipe(
     map(([orderType, item]) => (orderType === 'Rücklage' ? item.availability?.inStock : 999))
   );

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

@@ -83,7 +83,20 @@
             <ng-container *ngSwitchCase="'Abholung'">
               <span class="supplier">{{ (order?.subsetItems)[0].supplierLabel }}</span>
               <span class="separator">|</span>
-              <span class="order-type">Abholung ab {{ (order?.subsetItems)[0]?.estimatedShippingDate | date }}</span>
+              <span class="order-type"
+                >Abholung ab {{ (order?.subsetItems)[0]?.estimatedShippingDate | date }}
+                <ng-container [ngTemplateOutlet]="abholfrist" [ngTemplateOutletContext]="{ order: order }"> </ng-container>
+              </span>
+            </ng-container>
+            <ng-container *ngSwitchCase="'Rücklage'">
+              <ng-container *ngIf="(order?.subsetItems)[0].supplierLabel; let supplierLabel">
+                <span class="supplier">{{ supplierLabel }}</span>
+                <span class="separator">|</span>
+              </ng-container>
+              <span class="order-type"
+                >{{ order?.features?.orderType }}
+                <ng-container [ngTemplateOutlet]="abholfrist" [ngTemplateOutletContext]="{ order: order }"> </ng-container>
+              </span>
             </ng-container>
             <ng-container *ngSwitchCase="['Versand', 'B2B-Versand', 'DIG-Versand'].indexOf(order?.features?.orderType) > -1">
               <span class="supplier">{{ (order?.subsetItems)[0].supplierLabel }}</span>
@@ -135,3 +148,34 @@
     </div>
   </div>
 </div>
+
+<ng-template #abholfrist let-order="order">
+  <div *ngIf="!(updatingPreferredPickUpDate$ | async)[(order?.subsetItems)[0].id]" class="inline-flex">
+    <button [uiOverlayTrigger]="deadlineDatepicker" #deadlineDatepickerTrigger="uiOverlayTrigger" class="cta-pickup-deadline">
+      <span class="mx-2">bis</span>
+      <strong>
+        {{ ((order?.subsetItems)[0]?.preferredPickUpDate | date: 'dd.MM.yy') || 'Auswählen' }}
+      </strong>
+      <ui-icon class="ml-2" [rotate]="deadlineDatepickerTrigger.opened ? '270deg' : '90deg'" icon="arrow_head"> </ui-icon>
+    </button>
+    <ui-datepicker
+      #deadlineDatepicker
+      yPosition="below"
+      xPosition="after"
+      [xOffset]="8"
+      [min]="minDateDatepicker"
+      [disabledDaysOfWeek]="[0]"
+      [(selected)]="selectedDate"
+    >
+      <div #content class="grid grid-flow-row gap-2">
+        <button
+          class="rounded-full font-bold text-white bg-brand py-px-15 px-px-25"
+          (click)="updatePreferredPickUpDate(undefined, selectedDate); deadlineDatepickerTrigger.close()"
+        >
+          Für den Warenkorb festlegen
+        </button>
+      </div>
+    </ui-datepicker>
+  </div>
+  <div class="fetching" *ngIf="!!(updatingPreferredPickUpDate$ | async)[(order?.subsetItems)[0].id]"></div>
+</ng-template>

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

@@ -2,6 +2,23 @@
   @apply block box-border;
 }
 
+@keyframes load {
+  0% {
+    opacity: 0;
+  }
+  30% {
+    opacity: 0.5;
+  }
+  100% {
+    opacity: 0;
+  }
+}
+
+.fetching {
+  @apply w-28 h-px-20 bg-wild-blue-yonder ml-4;
+  animation: load 1s linear infinite;
+}
+
 .card {
   @apply bg-white rounded-card shadow-card overflow-scroll;
   height: calc(100vh - 410px);
@@ -72,6 +89,30 @@
   }
 }
 
+.cta-pickup-deadline {
+  @apply flex flex-row items-center;
+}
+
+.abholfrist-wrapper {
+  @apply flex flex-row my-1;
+
+  .label {
+    width: 145px;
+  }
+
+  .value {
+    @apply flex flex-row font-bold;
+
+    ui-icon {
+      @apply flex items-center;
+    }
+  }
+
+  .loader {
+    width: 130px;
+  }
+}
+
 .top-line {
   @apply mt-8;
 }
@@ -96,7 +137,7 @@
 
 .product-details {
   @apply flex flex-col whitespace-nowrap overflow-ellipsis overflow-hidden;
-  width: 320px;
+  width: 390px;
 
   .info-row {
     @apply flex items-center whitespace-nowrap overflow-ellipsis overflow-hidden;
@@ -119,7 +160,7 @@
 
 .delivery-row {
   .order-type {
-    @apply w-px-100 font-bold;
+    @apply font-bold inline-flex flex-wrap;
   }
 
   .supplier {

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

@@ -1,8 +1,8 @@
-import { Component, ChangeDetectionStrategy, OnDestroy } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnDestroy } from '@angular/core';
 import { DomainCheckoutService } from '@domain/checkout';
-import { UiModalService } from '@ui/modal';
+import { UiErrorModalComponent, UiModalService } from '@ui/modal';
 import { PrintModalComponent, PrintModalData } from '@modal/printer';
-import { debounceTime, first, map, shareReplay, switchMap } from 'rxjs/operators';
+import { first, map, shareReplay, switchMap } from 'rxjs/operators';
 import { CrmCustomerService } from '@domain/crm';
 import { ActivatedRoute, Router } from '@angular/router';
 import { DomainOmsService } from '@domain/oms';
@@ -11,7 +11,8 @@ import { DisplayOrderDTO, DisplayOrderItemDTO } from '@swagger/oms';
 import { BreadcrumbService } from '@core/breadcrumb';
 import { ApplicationService } from '@core/application';
 import { DomainPrinterService } from '@domain/printer';
-import { combineLatest, NEVER } from 'rxjs';
+import { BehaviorSubject, combineLatest, NEVER, of, Subject } from 'rxjs';
+import { DateAdapter } from '@ui/common';
 
 @Component({
   selector: 'page-checkout-summary',
@@ -20,7 +21,12 @@ import { combineLatest, NEVER } from 'rxjs';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CheckoutSummaryComponent implements OnDestroy {
+  private _onDestroy$ = new Subject();
   processId = Date.now();
+  selectedDate = of(this.dateAdapter.today());
+  minDateDatepicker = this.dateAdapter.addCalendarDays(this.dateAdapter.today(), -1);
+
+  updatingPreferredPickUpDate$ = new BehaviorSubject<Record<string, string>>({});
 
   displayOrders$ = combineLatest([this.domainCheckoutService.getOrders(), this._route.params]).pipe(
     map(([orders, params]) => {
@@ -97,7 +103,7 @@ export class CheckoutSummaryComponent implements OnDestroy {
     switchMap((o) =>
       this.customerService
         .getCustomers(o[0].buyerNumber, { take: 5 })
-        .pipe(map((customers) => customers.result[0].features?.find((f) => f.enabled && f.key === 'b2b') != null))
+        .pipe(map((customers) => customers.result[0].features?.find((f) => f.key === 'b2b') != null))
     )
   );
 
@@ -115,7 +121,8 @@ export class CheckoutSummaryComponent implements OnDestroy {
     private uiModal: UiModalService,
     private breadcrumb: BreadcrumbService,
     public applicationService: ApplicationService,
-    private domainPrinterService: DomainPrinterService
+    private domainPrinterService: DomainPrinterService,
+    private dateAdapter: DateAdapter
   ) {
     this.breadcrumb
       .getBreadcrumbsByKeyAndTags$(this.applicationService.activatedProcessId, ['checkout'])
@@ -144,6 +151,9 @@ export class CheckoutSummaryComponent implements OnDestroy {
     if (!checkoutProcess) {
       this.domainCheckoutService.removeAllOrders();
     }
+
+    this._onDestroy$.next();
+    this._onDestroy$.complete();
   }
 
   openPrintModal(id: number) {
@@ -160,6 +170,54 @@ export class CheckoutSummaryComponent implements OnDestroy {
     });
   }
 
+  async updatePreferredPickUpDate(item: DisplayOrderItemDTO, date: Date) {
+    const data: Record<string, string> = {};
+
+    try {
+      const items = item ? [item] : await this.getAllOrderItems();
+      const subsetItems = items
+        .filter((item) => ['Rücklage', 'Abholung'].includes(item.features.orderType))
+        .flatMap((item) => item.subsetItems);
+      subsetItems.forEach((item) => (data[`${item.id}`] = date?.toISOString()));
+
+      try {
+        this.updatingPreferredPickUpDate$.next(data);
+        await this.omsService.setPreferredPickUpDate({ data }).toPromise();
+      } catch (error) {
+        this.uiModal.open({
+          content: UiErrorModalComponent,
+          title: 'Fehler beim setzen des Wunschdatums',
+          data: error,
+        });
+      } finally {
+        this.updatingPreferredPickUpDate$.next({});
+      }
+
+      items.forEach((item) => {
+        this.updateDisplayOrderItem({
+          ...item,
+          subsetItems: subsetItems.map((subsetItem) => {
+            return {
+              ...subsetItem,
+              preferredPickUpDate: date?.toISOString(),
+            };
+          }),
+        });
+      });
+    } catch (error) {
+      console.error(error);
+    }
+  }
+
+  async getAllOrderItems() {
+    const orders = await this.displayOrders$.pipe(first()).toPromise();
+    return orders.flatMap((order) => order.items);
+  }
+
+  async updateDisplayOrderItem(item: DisplayOrderItemDTO) {
+    this.domainCheckoutService.updateOrderItem(item);
+  }
+
   async navigateToGoodsOut() {
     let takeNowOrders = await this.takeNowOrders$.pipe(first()).toPromise();
     if (takeNowOrders.length != 1) return;

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

@@ -7,9 +7,22 @@ import { PageCheckoutPipeModule } from '../pipes/page-checkout-pipe.module';
 import { ProductImageModule } from 'apps/cdn/product-image/src/public-api';
 import { ModalPrinterModule } from '@modal/printer';
 import { RouterModule } from '@angular/router';
+import { UiCommonModule } from '@ui/common';
+import { UiSpinnerModule } from '@ui/spinner';
+import { UiDatepickerModule } from '@ui/datepicker';
 
 @NgModule({
-  imports: [CommonModule, RouterModule, UiIconModule, PageCheckoutPipeModule, ProductImageModule, ModalPrinterModule],
+  imports: [
+    CommonModule,
+    RouterModule,
+    UiIconModule,
+    PageCheckoutPipeModule,
+    ProductImageModule,
+    ModalPrinterModule,
+    UiCommonModule,
+    UiSpinnerModule,
+    UiDatepickerModule,
+  ],
   exports: [CheckoutSummaryComponent],
   declarations: [CheckoutSummaryComponent],
 })

apps/page/checkout/src/lib/modals/purchasing-options-list-modal/purchasing-options-list-item/purchasing-options-list-item.component.ts

@@ -105,6 +105,7 @@ export class PurchasingOptionsListItemComponent {
     ),
     map(([[_, option], takeAway, pickUp, delivery, deliveryDig, deliveryB2b]) => {
       let availability;
+
       switch (option) {
         case 'take-away':
           availability = takeAway;
@@ -118,13 +119,14 @@ export class PurchasingOptionsListItemComponent {
           } else {
             availability = deliveryB2b;
             option = 'b2b-delivery';
+            availability.p;
           }
           break;
         default:
-          return this.item.availability?.price;
+          return this.item.availability?.price ?? this.item.unitPrice;
       }
 
-      return this._availabilityService.getPriceForAvailability(option, this.item.availability, availability);
+      return this._availabilityService.getPriceForAvailability(option, this.item.availability, availability) ?? this.item.unitPrice;
     })
   );
 

apps/page/checkout/src/lib/modals/purchasing-options-list-modal/purchasing-options-list-modal.component.ts

@@ -207,9 +207,9 @@ export class PurchasingOptionsListModalComponent implements OnInit {
           quantity: item.quantity,
           availability: {
             ...availability,
-            price,
+            price: price ? price : item.unitPrice,
           },
-          promotion: { points: item.promotion.points },
+          promotion: item?.promotion?.points ? { points: item.promotion.points } : undefined,
         };
 
         switch (this._store.selectedFilterOption) {
@@ -252,6 +252,7 @@ export class PurchasingOptionsListModalComponent implements OnInit {
         this._modalRef.close();
       }
     } catch (error) {
+      console.error(error);
       this._modal.open({ content: UiErrorModalComponent, data: error, title: 'Fehler beim Hinzufügen zum Warenkorb' });
     } finally {
       this.addItemsLoader$.next(false);

apps/page/checkout/src/lib/modals/purchasing-options-list-modal/purchasing-options-list-modal.store.ts

@@ -184,6 +184,19 @@ export class PurchasingOptionsListModalStore extends ComponentStore<PurchasingOp
             quantity: options.item.quantity,
           })
           .pipe(
+            map((av) => {
+              if (av?.length > 0) {
+                if (av[1].availableFor) {
+                  if ((av[1].availableFor & 2) === 2) {
+                    return av[0];
+                  } else {
+                    return undefined;
+                  }
+                } else {
+                  return av[0];
+                }
+              }
+            }),
             tapResponse(
               (availability) => {
                 this.setAvailabilityFetching({

apps/page/checkout/src/lib/modals/purchasing-options-modal/price-input/purchasing-options-modal-price-input.component.html

@@ -1,11 +1,11 @@
 <form *ngIf="control" [formGroup]="control">
-  <ui-form-control label="MwSt" variant="default">
+  <ui-form-control label="MwSt" variant="default" *ngIf="!hideVat">
     <ui-select formControlName="vat">
-      <ui-select-option *ngFor="let vat of vats$ | async" [label]="vat.name + '%'" [value]="vat.vatType"></ui-select-option>
+      <ui-select-option *ngFor="let vat of vats$ | async" [label]="vat.name + '%'" [value]="vat.vatType"> </ui-select-option>
     </ui-select>
   </ui-form-control>
 
   <ui-form-control class="price" label="Preis" variant="default">
-    <input uiInput formControlName="price" />
+    <input uiInput formControlName="price" [max]="maxValue" maxLength="6" />
   </ui-form-control>
 </form>

apps/page/checkout/src/lib/modals/purchasing-options-modal/price-input/purchasing-options-modal-price-input.component.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, OnInit, Output } from '@angular/core';
+import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { DomainOmsService } from '@domain/oms';
 import { VATDTO } from '@swagger/oms';
@@ -25,6 +25,12 @@ export class PurchasingOptionsModalPriceInputComponent implements OnInit {
 
   private _subscriptions = new Subscription();
 
+  @Input()
+  hideVat = false;
+
+  @Input()
+  maxValue = 99999;
+
   constructor(private _omsService: DomainOmsService, private _fb: FormBuilder) {}
 
   ngOnInit() {
@@ -34,8 +40,8 @@ export class PurchasingOptionsModalPriceInputComponent implements OnInit {
   initForm() {
     const fb = this._fb;
     this.control = fb.group({
-      price: fb.control(undefined, [Validators.required, Validators.pattern(/^\d+([\,]\d{1,2})?$/), Validators.max(99999)]),
-      vat: fb.control(undefined, [Validators.required]),
+      price: fb.control(undefined, [Validators.required, Validators.pattern(/^\d+([\,]\d{1,2})?$/), Validators.max(this.maxValue)]),
+      vat: fb.control(0, [Validators.required]),
     });
 
     this._subscriptions.add(

apps/page/checkout/src/lib/modals/purchasing-options-modal/purchasing-options-modal.component.html

@@ -83,9 +83,12 @@
     </div>
     <div class="custom-price" *ngIf="showCustomPrice$ | async">
       <page-purchasing-options-modal-price-input
+        [hideVat]="item.type === 66560"
+        [maxValue]="item.type === 66560 ? 200 : 99999"
         (priceChanged)="changeCustomPrice($event)"
         (vatChanged)="changeCustomVat($event)"
-      ></page-purchasing-options-modal-price-input>
+      >
+      </page-purchasing-options-modal-price-input>
     </div>
     <hr />
     <div class="summary-row" *ngIf="quantity$ | async; let quantity">
@@ -112,7 +115,7 @@
       Weiter einkaufen
     </button>
     <button *ngIf="canUpgrade$ | async" class="cta-upgrade-customer" (click)="continue('add-customer-data')">
-      Kundendaten hinzufügen
+      Kundendaten erfassen
     </button>
     <button
       *ngIf="showTakeAwayButton$ | async"

apps/page/checkout/src/lib/modals/purchasing-options-modal/purchasing-options-modal.component.scss

@@ -98,7 +98,7 @@ img.thumbnail {
   }
 
   &:disabled {
-    @apply text-inactive-branch border-inactive-branch;
+    @apply text-inactive-branch border-inactive-branch cursor-not-allowed;
   }
 }
 
@@ -107,7 +107,7 @@ img.thumbnail {
   @apply text-white bg-brand font-bold text-lg px-4 py-2 rounded-full border-none ml-4 no-underline;
 
   &:disabled {
-    @apply bg-inactive-branch;
+    @apply bg-inactive-branch cursor-not-allowed;
   }
 }
 

apps/page/checkout/src/lib/modals/purchasing-options-modal/purchasing-options-modal.component.ts

@@ -10,6 +10,11 @@ import { PurchasingOptionsModalData } from './purchasing-options-modal.data';
 import { PurchasingOptionsModalStore } from './purchasing-options-modal.store';
 import { DomainCatalogService } from '@domain/catalog';
 import { BreadcrumbService } from '@core/breadcrumb';
+import {
+  encodeFormData,
+  mapCustomerDtoToCustomerCreateFormData,
+} from 'apps/page/customer/src/lib/create-customer/customer-create-form-data';
+import { isNumber } from '@utils/common';
 
 @Component({
   selector: 'page-purchasing-options-modal',
@@ -47,14 +52,27 @@ export class PurchasingOptionsModalComponent {
 
   readonly showCustomPrice$ = this.purchasingOptionsModalStore.selectAvailabilities.pipe(
     withLatestFrom(this.option$),
-    map(([availabilities, option]) => !(availabilities[option]?.price?.value?.value || availabilities[option]?.retailPrice?.value?.value))
+    map(([availabilities, option]) => !availabilities[option]?.price?.value?.value)
   );
 
   readonly customPriceInvalid$ = combineLatest([
+    this.item$,
     this.showCustomPrice$,
     this.purchasingOptionsModalStore.selectCustomPrice,
     this.purchasingOptionsModalStore.selectCustomVat,
-  ]).pipe(map(([showCustomPrice, customPrice, customVat]) => showCustomPrice && (!customPrice || !customVat)));
+  ]).pipe(
+    map(([item, showCustomPrice, customPrice, customVat]) => {
+      if (!showCustomPrice) {
+        return false;
+      }
+
+      if ((item.type as any) === 66560) {
+        return !isNumber(customPrice) || customPrice < 1 || customPrice > 200;
+      }
+
+      return !customPrice || !customVat;
+    })
+  );
 
   readonly showTakeAwayButton$ = combineLatest([
     this.option$,
@@ -111,10 +129,7 @@ export class PurchasingOptionsModalComponent {
     switchMap((processId) => this.checkoutService.getCustomerFeatures({ processId }))
   );
 
-  readonly customerId$ = this.application.activatedProcessId$.pipe(
-    switchMap((processId) => this.checkoutService.getBuyer({ processId })),
-    map((buyer) => buyer.source)
-  );
+  readonly customer$ = this.application.activatedProcessId$.pipe(switchMap((processId) => this.checkoutService.getCustomer({ processId })));
 
   price$ = combineLatest([
     this.purchasingOptionsModalStore.selectAvailabilities,
@@ -126,7 +141,7 @@ export class PurchasingOptionsModalComponent {
         if (availabilities[option]?.price?.value?.value) {
           return availabilities[option]?.price?.value?.value;
         }
-        return availabilities[option]?.retailPrice?.value?.value ?? customPrice;
+        return availabilities[option]?.price?.value?.value ?? customPrice;
       } else {
         const key = Object.keys(availabilities).find((key) => !!availabilities[key]?.price?.value?.value);
         return availabilities[key]?.price?.value?.value ?? customPrice;
@@ -144,7 +159,7 @@ export class PurchasingOptionsModalComponent {
         if (availabilities[option]?.price?.vat?.vatType) {
           return availabilities[option]?.price?.vat?.vatType;
         }
-        return availabilities[option]?.retailPrice?.vat?.vatType ?? customVat;
+        return availabilities[option]?.price?.vat?.vatType ?? customVat;
       } else {
         const key = Object.keys(availabilities).find((key) => !!availabilities[key]?.price?.vat?.vatType);
         return availabilities[key]?.price?.vat?.vatType ?? customVat;
@@ -228,7 +243,7 @@ export class PurchasingOptionsModalComponent {
     this.activeSpinner = navigate ? 'continue-shopping' : 'continue';
     try {
       const processId = await this.purchasingOptionsModalStore.selectProcessId.pipe(first()).toPromise();
-      const customer = await this.checkoutService.getBuyer({ processId }).pipe(first()).toPromise();
+      const buyer = await this.checkoutService.getBuyer({ processId }).pipe(first()).toPromise();
       const item = await this.item$.pipe(first()).toPromise();
       const quantity = await this.quantity$.pipe(first()).toPromise();
       const availability = await this.availability$.pipe(first()).toPromise();
@@ -237,7 +252,8 @@ export class PurchasingOptionsModalComponent {
       const shoppingCartItem = await this.purchasingOptionsModalStore.selectShoppingCartItem.pipe(first()).toPromise();
       const canAdd = await this.canAdd$.pipe(first()).toPromise();
       const customPrice = await this.purchasingOptionsModalStore.selectCustomPrice.pipe(first()).toPromise();
-      const customVat = await this.purchasingOptionsModalStore.selectCustomVat.pipe(first()).toPromise();
+      const customVat = (await this.purchasingOptionsModalStore.selectCustomVat.pipe(first()).toPromise()) ?? 0;
+      const customer = await this.checkoutService.getCustomer({ processId }).pipe(first()).toPromise();
 
       if (canAdd || navigate === 'add-customer-data') {
         const newItem: AddToShoppingCartDTO = {
@@ -248,6 +264,7 @@ export class PurchasingOptionsModalComponent {
             ...item.product,
           },
           promotion: { points: item.promoPoints },
+          itemType: item.type,
         };
 
         newItem.product.catalogProductNumber = String(item.id);
@@ -340,7 +357,7 @@ export class PurchasingOptionsModalComponent {
       } else if (navigate === 'continue') {
         // Set filter for navigation to customer search if customer is not set
         let filter: { [key: string]: string };
-        if (!customer) {
+        if (!buyer) {
           filter = await this.customerFeatures$
             .pipe(
               first(),
@@ -357,10 +374,15 @@ export class PurchasingOptionsModalComponent {
           this.router.navigate(['/kunde', this.application.activatedProcessId, 'cart', 'review']);
         }
       } else if (navigate === 'add-customer-data') {
-        const upgradeCustomerId = await this.customerId$.pipe(first()).toPromise();
-        this.router.navigate(['/kunde', this.application.activatedProcessId, 'customer', 'create', 'webshop'], {
-          queryParams: { upgradeCustomerId },
-        });
+        if (customer?.attributes.some((attr) => attr.data.key === 'p4mUser')) {
+          this.router.navigate(['/kunde', this.application.activatedProcessId, 'customer', 'create', 'webshop-p4m'], {
+            queryParams: { formData: encodeFormData(mapCustomerDtoToCustomerCreateFormData(customer)) },
+          });
+        } else {
+          this.router.navigate(['/kunde', this.application.activatedProcessId, 'customer', 'create', 'webshop'], {
+            queryParams: { formData: encodeFormData(mapCustomerDtoToCustomerCreateFormData(customer)) },
+          });
+        }
       }
     } catch (error) {
       console.log('PurchasingOptionsModalComponent.continue', error);

apps/page/checkout/src/lib/modals/purchasing-options-modal/purchasing-options-modal.store.ts

@@ -376,11 +376,27 @@ export class PurchasingOptionsModalStore extends ComponentStore<PurchasingOption
               break;
             case 'pick-up':
               if (!isNullOrUndefined(branch)) {
-                availability$ = this.availabilityService.getPickUpAvailability({
-                  item: { itemId: item.id, ean: item.product.ean, price: item.catalogAvailability.price },
-                  quantity,
-                  branch,
-                });
+                availability$ = this.availabilityService
+                  .getPickUpAvailability({
+                    item: { itemId: item.id, ean: item.product.ean, price: item.catalogAvailability.price },
+                    quantity,
+                    branch,
+                  })
+                  .pipe(
+                    map((av) => {
+                      if (av?.length > 0) {
+                        if (av[1].availableFor) {
+                          if ((av[1].availableFor & 2) === 2) {
+                            return av[0];
+                          } else {
+                            undefined;
+                          }
+                        } else {
+                          return av[0];
+                        }
+                      }
+                    })
+                  );
               }
               break;
             case 'delivery':

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

@@ -0,0 +1,413 @@
+import { HttpErrorResponse } from '@angular/common/http';
+import { ChangeDetectorRef, Directive, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { AbstractControl, AsyncValidatorFn, FormControl, FormGroup } from '@angular/forms';
+import { ActivatedRoute, Router } from '@angular/router';
+import { BreadcrumbService } from '@core/breadcrumb';
+import { CrmCustomerService } from '@domain/crm';
+import { AddressDTO, CustomerDTO, PayerDTO, ShippingAddressDTO } from '@swagger/crm';
+import { UiErrorModalComponent, UiModalService } from '@ui/modal';
+import { UiValidators } from '@ui/validators';
+import { isNull } from 'lodash';
+import { BehaviorSubject, Observable, of, Subject } from 'rxjs';
+import {
+  first,
+  map,
+  distinctUntilChanged,
+  shareReplay,
+  delay,
+  mergeMap,
+  catchError,
+  tap,
+  bufferCount,
+  startWith,
+  takeUntil,
+} from 'rxjs/operators';
+import { AddressFormBlockComponent, DeviatingAddressFormBlockComponent, DeviatingAddressFormBlockData } from '../form-blocks';
+import { FormBlock } from '../form-blocks/form-block';
+import { AddressSelectionModalService } from '../modals/address-selection-modal/address-selection-modal.service';
+import { CustomerCreateFormData, decodeFormData, encodeFormData } from './customer-create-form-data';
+
+@Directive()
+export abstract class AbstractCreateCustomer implements OnInit, OnDestroy {
+  protected onDestroy$ = new Subject<void>();
+
+  abstract validateAddress?: boolean;
+  abstract validateShippingAddress?: boolean;
+
+  private _formData = new BehaviorSubject<CustomerCreateFormData>({});
+
+  formData$ = this._formData.asObservable();
+
+  get formData() {
+    return this._formData.getValue();
+  }
+
+  form = new FormGroup({});
+
+  latestProcessId: number;
+
+  processId$: Observable<number>;
+
+  busy$ = new BehaviorSubject(false);
+
+  customerExists$ = new Subject<boolean>();
+
+  @ViewChild(DeviatingAddressFormBlockComponent)
+  deviatingDeliveryAddressFormBlock: DeviatingAddressFormBlockComponent;
+
+  @ViewChild(AddressFormBlockComponent)
+  addressFormBlock: AddressFormBlockComponent;
+
+  abstract customerType: string;
+
+  constructor(
+    protected activatedRoute: ActivatedRoute,
+    protected router: Router,
+    protected customerService: CrmCustomerService,
+    protected addressVlidationModal: AddressSelectionModalService,
+    protected modal: UiModalService,
+    protected breadcrumb: BreadcrumbService,
+    protected cdr: ChangeDetectorRef
+  ) {
+    this._initProcessId$();
+  }
+
+  ngOnInit() {}
+
+  private _initProcessId$(): void {
+    this.processId$ = this.activatedRoute.parent.parent.data.pipe(
+      map((data) => +data.processId),
+      tap((processId) => (this.latestProcessId = processId)),
+      distinctUntilChanged(),
+      shareReplay(1)
+    );
+
+    this.processId$
+      .pipe(startWith(undefined), bufferCount(2, 1), takeUntil(this.onDestroy$), delay(100))
+      .subscribe(async ([previous, current]) => {
+        if (previous === undefined) {
+          await this._initFormData();
+          await this.updateBreadcrumb(current, this.formData);
+        } else if (previous !== current) {
+          await this.updateBreadcrumb(previous, this.formData);
+          await this._initFormData();
+          await this.updateBreadcrumb(current, this.formData);
+        }
+      });
+  }
+
+  ngOnDestroy(): void {
+    this.updateBreadcrumb(this.latestProcessId, this.formData);
+    this.onDestroy$.next();
+    this.onDestroy$.complete();
+    this.busy$.complete();
+    this._formData.complete();
+  }
+
+  private async _initFormData() {
+    const formData = await this.activatedRoute.queryParams
+      .pipe(
+        map((params) => params['formData']),
+        first()
+      )
+      .toPromise();
+
+    if (formData) {
+      const parsedFormData = decodeFormData(formData);
+      this._formData.next(parsedFormData);
+    }
+  }
+
+  async updateBreadcrumb(processId: number, formData: CustomerCreateFormData) {
+    await this.cleanupBreadcrumb(processId);
+    await this.addOrUpdateBreadcrumb(processId, formData);
+  }
+
+  async cleanupBreadcrumb(processId: number) {
+    const crumbs = await this.breadcrumb.getBreadcrumbsByKeyAndTags$(processId, ['customer', 'main']).pipe(first()).toPromise();
+    for (const crumb of crumbs) {
+      await this.breadcrumb.removeBreadcrumbsAfter(crumb.id);
+    }
+  }
+
+  async addOrUpdateBreadcrumb(processId: number, formData: CustomerCreateFormData) {
+    await this.breadcrumb.addOrUpdateBreadcrumbIfNotExists({
+      key: processId,
+      name: 'Kundendaten erfassen',
+      path: this.getPath(processId),
+      params: this.getQueryParams(formData),
+      tags: ['customer', 'create'],
+      section: 'customer',
+    });
+  }
+
+  getPath(processId: number) {
+    return ['/kunde', processId, 'customer', 'create', this.customerType].join('/');
+  }
+
+  getQueryParams(formData: CustomerCreateFormData): Record<string, string> {
+    const param = formData ? encodeFormData(formData) : undefined;
+    return { ...this.activatedRoute.snapshot.queryParams, formData: param };
+  }
+
+  async customerTypeChanged(customerType: string) {
+    const processId = await this.processId$.pipe(first()).toPromise();
+    this.router.navigate(['/kunde', processId, 'customer', 'create', customerType], {
+      queryParams: this.getQueryParams(this.formData),
+    });
+  }
+
+  addFormBlock(key: keyof CustomerCreateFormData, block: FormBlock<any, AbstractControl>) {
+    this.form.addControl(key, block.control);
+    this.cdr.markForCheck();
+  }
+
+  patchFormData(key: keyof CustomerCreateFormData, value: any) {
+    this._formData.next({ ...this.formData, [key]: value });
+    this.cdr.markForCheck();
+  }
+
+  emailExistsValidator: AsyncValidatorFn = (control) => {
+    return of(control.value).pipe(
+      tap((_) => this.customerExists$.next(false)),
+      delay(500),
+      mergeMap((value) => {
+        return this.customerService.emailExists(value).pipe(
+          map((response) => {
+            if (response?.result) {
+              return { exists: response?.message };
+            }
+            return null;
+          }),
+          catchError((error) => {
+            if (error instanceof HttpErrorResponse) {
+              if (error?.error?.invalidProperties?.email) {
+                return of({ invalid: error.error.invalidProperties.email });
+              } else {
+                return of({ invalid: 'E-Mail ist ungültig' });
+              }
+            }
+          })
+        );
+      }),
+      tap((error) => {
+        if (error) {
+          this.customerExists$.next(true);
+        }
+        control.markAsTouched();
+        this.cdr.markForCheck();
+      })
+    );
+  };
+
+  checkLoyalityCardValidator: AsyncValidatorFn = (control) => {
+    return of(control.value).pipe(
+      delay(500),
+      mergeMap((value) => {
+        const customerId = this.formData?._meta?.customerDto?.id ?? this.formData?._meta?.customerInfoDto?.id;
+        return this.customerService.checkLoyaltyCard({ loyaltyCardNumber: value, customerId }).pipe(
+          map((response) => {
+            return !response?.error && response?.result === 1 ? null : { invalid: 'Kundenkartencode ist ungültig' };
+          }),
+          catchError((error) => {
+            if (error instanceof HttpErrorResponse) {
+              if (error?.error?.invalidProperties?.loyaltyCardNumber) {
+                return of({ invalid: error.error.invalidProperties.loyaltyCardNumber });
+              } else {
+                return of({ invalid: 'Kundenkartencode ist ungültig' });
+              }
+            }
+          })
+        );
+      }),
+      tap(() => {
+        control.markAsTouched();
+        this.cdr.markForCheck();
+      })
+    );
+  };
+
+  async navigateToCustomerDetails(customer: CustomerDTO) {
+    const processId = await this.processId$.pipe(first()).toPromise();
+    return this.router.navigate(['/kunde', processId, 'customer', customer.id]);
+  }
+
+  async validateAddressData(address: AddressDTO): Promise<AddressDTO> {
+    const addressValidationResult = await this.addressVlidationModal.validateAddress(address);
+
+    if (addressValidationResult !== undefined && addressValidationResult !== 'continue') {
+      address = addressValidationResult;
+    }
+
+    return address;
+  }
+
+  async getCustomerFromFormData(): Promise<CustomerDTO> {
+    const data: CustomerCreateFormData = this.form.value;
+
+    const customer: CustomerDTO = {
+      communicationDetails: {},
+      attributes: [],
+      features: [],
+    };
+
+    if (data.name) {
+      customer.gender = data.name.gender;
+      customer.title = data.name.title;
+      customer.firstName = data.name.firstName;
+      customer.lastName = data.name.lastName;
+    }
+
+    if (data.organisation) {
+      customer.organisation = data.organisation;
+    }
+
+    if (data.email) {
+      customer.communicationDetails.email = data.email;
+    }
+
+    if (data.phoneNumbers) {
+      customer.communicationDetails.mobile = data.phoneNumbers.mobile;
+      customer.communicationDetails.phone = data.phoneNumbers.phone;
+    }
+
+    if (data.address) {
+      customer.address = data.address;
+
+      if (this.validateAddress) {
+        try {
+          const address = await this.validateAddressData(customer.address);
+          this.addressFormBlock.data = address;
+          customer.address = address;
+        } catch (error) {
+          this.form.enable();
+          setTimeout(() => {
+            this.addressFormBlock.setAddressValidationError(error.error.invalidProperties);
+          }, 10);
+
+          return;
+        }
+      }
+    }
+
+    if (data.birthDate && isNull(UiValidators.date(new FormControl(data.birthDate)))) {
+      customer.dateOfBirth = data.birthDate;
+    }
+
+    if (data.billingAddress?.deviatingAddress) {
+      const billingAddress = this.mapToBillingAddress(data.billingAddress);
+
+      if (this.validateShippingAddress) {
+        try {
+          billingAddress.address = await this.validateAddressData(billingAddress.address);
+        } catch (error) {
+          this.form.enable();
+          setTimeout(() => {
+            this.addressFormBlock.setAddressValidationError(error.error.invalidProperties);
+          }, 10);
+
+          return;
+        }
+      }
+
+      customer.payers = [
+        {
+          payer: { data: billingAddress },
+          isDefault: new Date().toISOString(),
+        },
+      ];
+    }
+
+    if (data.deviatingDeliveryAddress?.deviatingAddress) {
+      const shippingAddress = this.mapToShippingAddress(data.deviatingDeliveryAddress);
+
+      if (this.validateShippingAddress) {
+        try {
+          shippingAddress.address = await this.validateAddressData(shippingAddress.address);
+        } catch (error) {
+          this.form.enable();
+          setTimeout(() => {
+            this.addressFormBlock.setAddressValidationError(error.error.invalidProperties);
+          }, 10);
+
+          return;
+        }
+      }
+
+      customer.shippingAddresses = [
+        {
+          data: { ...shippingAddress, isDefault: new Date().toISOString() },
+        },
+      ];
+    }
+
+    return customer;
+  }
+
+  mapToShippingAddress({ name, address, email, organisation, phoneNumbers }: DeviatingAddressFormBlockData): ShippingAddressDTO {
+    return {
+      gender: name?.gender,
+      title: name?.title,
+      firstName: name?.firstName,
+      lastName: name?.lastName,
+      address,
+      communicationDetails: {
+        email: email ? email : null,
+        mobile: phoneNumbers?.mobile ? phoneNumbers.mobile : null,
+        phone: phoneNumbers?.phone ? phoneNumbers.phone : null,
+      },
+      organisation,
+      isDefault: new Date().toJSON(),
+    };
+  }
+
+  mapToBillingAddress({ name, address, email, organisation, phoneNumbers }: DeviatingAddressFormBlockData): PayerDTO {
+    return {
+      gender: name?.gender,
+      title: name?.title,
+      firstName: name?.firstName,
+      lastName: name?.lastName,
+      address,
+      communicationDetails: {
+        email: email ? email : null,
+        mobile: phoneNumbers?.mobile ? phoneNumbers.mobile : null,
+        phone: phoneNumbers?.phone ? phoneNumbers.phone : null,
+      },
+      organisation,
+    };
+  }
+
+  async save() {
+    if (this.form.invalid) {
+      this.form.markAllAsTouched();
+      return;
+    }
+
+    try {
+      this.busy$.next(true);
+      this.form.disable();
+      const customer: CustomerDTO = await this.getCustomerFromFormData();
+
+      if (!customer) {
+        this.form.enable();
+        return;
+      }
+
+      const response = await this.saveCustomer(customer);
+
+      if (!!response) {
+        this.navigateToCustomerDetails(response);
+      }
+    } catch (error) {
+      this.form.enable();
+      this.modal.open({
+        content: UiErrorModalComponent,
+        data: error,
+      });
+    } finally {
+      this.busy$.next(false);
+    }
+  }
+
+  abstract saveCustomer(customer: CustomerDTO): Promise<CustomerDTO>;
+}

apps/page/customer/src/lib/create-customer/create-b2b-customer/create-b2b-customer.component.html

@@ -0,0 +1,91 @@
+<form *ngIf="formData$ | async; let data" (keydown.enter)="$event.preventDefault()">
+  <h1 class="title">Kundendaten erfassen</h1>
+  <p class="description">
+    Um Ihnen den ausgewählten Service zu <br />
+    ermöglichen, legen wir Ihnen gerne <br />
+    ein Kundenkonto an.
+  </p>
+
+  <app-customer-type-selector
+    [processId]="processId$ | async"
+    [p4mUser]="false"
+    customerType="b2b"
+    (valueChanges)="customerTypeChanged($event)"
+  >
+  </app-customer-type-selector>
+
+  <app-organisation-form-block
+    #orga
+    [tabIndexStart]="1"
+    [data]="data.organisation"
+    (dataChanges)="patchFormData('organisation', $event)"
+    (onInit)="addFormBlock('organisation', $event)"
+    [requiredMarks]="organisationFormBlockRequiredMarks"
+    [validatorFns]="organisationFormBlockValidators"
+  >
+  </app-organisation-form-block>
+
+  <app-name-form-block
+    #name
+    [tabIndexStart]="orga.tabIndexEnd + 1"
+    [data]="data.name"
+    (dataChanges)="patchFormData('name', $event)"
+    (onInit)="addFormBlock('name', $event)"
+  >
+  </app-name-form-block>
+
+  <app-address-form-block
+    #address
+    [tabIndexStart]="name.tabIndexEnd + 1"
+    [data]="data.address"
+    (dataChanges)="patchFormData('address', $event)"
+    (onInit)="addFormBlock('address', $event)"
+    [requiredMarks]="addressRequiredMarks"
+    [validatorFns]="addressValidators"
+    [defaults]="{ country: 'DEU' }"
+  >
+  </app-address-form-block>
+
+  <app-email-form-block
+    #email
+    [tabIndexStart]="address.tabIndexEnd + 1"
+    [data]="data.email"
+    (dataChanges)="patchFormData('email', $event)"
+    [validatorFns]="emailFormBlockValidators"
+    (onInit)="addFormBlock('email', $event)"
+  >
+  </app-email-form-block>
+
+  <app-phone-numbers-form-block
+    #phoneNumbers
+    [tabIndexStart]="email.tabIndexEnd + 1"
+    [data]="data.phoneNumbers"
+    (dataChanges)="patchFormData('phoneNumbers', $event)"
+    (onInit)="addFormBlock('phoneNumbers', $event)"
+  >
+  </app-phone-numbers-form-block>
+
+  <app-deviating-address-form-block
+    [tabIndexStart]="phoneNumbers.tabIndexEnd + 1"
+    [data]="data.deviatingDeliveryAddress"
+    (dataChanges)="patchFormData('deviatingDeliveryAddress', $event)"
+    (onInit)="addFormBlock('deviatingDeliveryAddress', $event)"
+    [nameRequiredMarks]="deviatingNameRequiredMarks"
+    [nameValidatorFns]="deviatingNameValidationFns"
+    [addressRequiredMarks]="addressRequiredMarks"
+    [addressValidatorFns]="addressValidators"
+    [organisationRequiredMarks]="organisationFormBlockRequiredMarks"
+    [organisationValidatorFns]="organisationFormBlockValidators"
+    [defaults]="{ address: { country: 'DEU' } }"
+    [organisation]="true"
+    [email]="true"
+    [phoneNumbers]="true"
+  >
+    Die Lieferadresse weicht von der Rechnungsadresse ab
+  </app-deviating-address-form-block>
+
+  <div class="spacer"></div>
+  <button class="cta-submit" type="button" (click)="save()" [disabled]="form.invalid || form.pending">
+    <ui-spinner [show]="busy$ | async">Speichern</ui-spinner>
+  </button>
+</form>

apps/page/customer/src/lib/create-customer/create-b2b-customer/create-b2b-customer.component.ts

@@ -0,0 +1,52 @@
+import { Component, ChangeDetectionStrategy } from '@angular/core';
+import { ValidatorFn, Validators } from '@angular/forms';
+import { CustomerDTO } from '@swagger/crm';
+import { map } from 'rxjs/operators';
+import { validateEmail } from '../../validators/email-validator';
+import { AbstractCreateCustomer } from '../abstract-create-customer';
+
+@Component({
+  selector: 'app-create-b2b-customer',
+  templateUrl: 'create-b2b-customer.component.html',
+  styleUrls: ['../create-customer.scss', 'create-b2b-customer.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class CreateB2BCustomerComponent extends AbstractCreateCustomer {
+  customerType = 'b2b';
+
+  validateAddress = true;
+
+  validateShippingAddress = true;
+
+  organisationFormBlockRequiredMarks = ['name'];
+
+  organisationFormBlockValidators: Record<string, ValidatorFn[]> = {
+    name: [Validators.required],
+  };
+
+  addressRequiredMarks = ['street', 'streetNumber', 'zipCode', 'city', 'country'];
+
+  addressValidators: Record<string, ValidatorFn[]> = {
+    street: [Validators.required],
+    streetNumber: [Validators.required],
+    zipCode: [Validators.required],
+    city: [Validators.required],
+    country: [Validators.required],
+  };
+
+  emailFormBlockValidators = [Validators.email, validateEmail];
+
+  deviatingNameRequiredMarks = ['gender', 'firstName', 'lastName'];
+
+  deviatingNameValidationFns: Record<string, ValidatorFn[]> = {
+    gender: [Validators.required],
+    firstName: [Validators.required],
+    lastName: [Validators.required],
+  };
+
+  async saveCustomer(customer: CustomerDTO): Promise<CustomerDTO> {
+    const res = await this.customerService.createB2BCustomer(customer);
+
+    return res.result;
+  }
+}