feat: Enhance return process service and UI for printing receipts

- Updated StrictHttpResponse type definition for better clarity.
- Integrated OMSPrintService into ReturnProcessService for printing return receipts.
- Added print functionality in ReturnProcessItemComponent with printer selection.
- Enhanced HTML template to include printer dropdown and print button.
- Introduced new models for print API including AddresseeWithReferenceDTO, BuyerStatus, and various entity DTOs.
- Implemented additional entity base models for better structure and type safety.

apps/isa-app/src/app/guards/can-activate-goods-in.guard.ts

@@ -14,7 +14,10 @@ export class CanActivateGoodsInGuard {
 
   async canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
     const pid = this._config.get('process.ids.goodsIn', z.number());
-    const process = await this._applicationService.getProcessById$(pid).pipe(first()).toPromise();
+    const process = await this._applicationService
+      .getProcessById$(pid)
+      .pipe(first())
+      .toPromise();
     if (!process) {
       await this._applicationService.createProcess({
         id: this._config.get('process.ids.goodsIn'),
@@ -23,7 +26,9 @@ export class CanActivateGoodsInGuard {
         name: '',
       });
     }
-    this._applicationService.activateProcess(this._config.get('process.ids.goodsIn'));
+    this._applicationService.activateProcess(
+      this._config.get('process.ids.goodsIn'),
+    );
     return true;
   }
 }

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

@@ -17,7 +17,7 @@
   },
   "@domain/checkout": {
     "olaExpiration": "5m"
-},
+  },
   "@swagger/isa": {
     "rootUrl": "https://isa-integration.paragon-data.net/isa/v1"
   },
@@ -72,8 +72,8 @@
   },
   "checkForUpdates": 900000,
   "licence": {
-    "scandit": "Ae8F2Wx2RMq5Lvn7UUAlWzVFZTt2+ubMAF8XtDpmPlNkBeG/LWs1M7AbgDW0LQqYLnszClEENaEHS56/6Ts2vrJ1Ux03CXUjK3jUvZpF5OchXR1CpnmpepJ6WxPCd7LMVHUGG1BbwPLDTFjP3y8uT0caTSmmGrYQWAs4CZcEF+ZBabP0z7vfm+hCZF/ebj9qqCJZcW8nH/n19hohshllzYBjFXjh87P2lIh1s6yZS3OaQWWXo/o0AKdxx7T6CVyR0/G5zq6uYJWf6rs3euUBEhpzOZHbHZK86Lvy2AVBEyVkkcttlDW1J2fA4l1W1JV/Xibz8AQV6kG482EpGF42KEoK48paZgX3e1AQsqUtmqzw294dcP4zMVstnw5/WrwKKi/5E/nOOJT2txYP1ZufIjPrwNFsqTlv7xCQlHjMzFGYwT816yD5qLRLbwOtjrkUPXNZLZ06T4upvWwJDmm8XgdeoDqMjHdcO4lwji1bl9EiIYJ/2qnsk9yZ2FqSaHzn4cbiL0f5u2HFlNAP0GUujGRlthGhHi6o4dFU+WAxKsFMKVt+SfoQUazNKHFVQgiAklTIZxIc/HUVzRvOLMxf+wFDerraBtcqGJg+g/5mrWYqeDBGhCBHtKiYf6244IJ4afzNTiH1/30SJcRzXwbEa3A7q1fJTx9/nLTOfVPrJKBQs7f/OQs2dA7LDCel8mzXdbjvsNQaeU5+iCIAq6zbTNKy1xT8wwj+VZrQmtNJs+qeznD+u29nCM24h8xCmRpvNPo4/Mww/lrTNrrNwLBSn1pMIwsH7yS9hH0v0oNAM3A6bVtk1D9qEkbyw+xZa+MZGpMP0D0CdcsqHalPcm5r/Ik="
-},
+    "scandit": "ASq1ZCbuDs0nJ4cPGkFOSkQEBHSL/kuljVAq2ttwz2Q5CEwULWAlasJIkjsIe/nptzNx1IBSxwDPWh0gXmvF08BRBDTzDUELdX6q02N/HUddSHE4A1dMXoFg+I8of+iZQijQIogxmP5RfSpj6ixzD2cGV0w+BG6o9xRXG4lEv9vNAOC3+emfcuVj2Whmfbuzao4HcWweVSz4HJh8dcbxTPF10MH8qR4kkV7fNWIF+PaYww69relfuvrkgdbWPcLs4Xb7WW4AISX9pTmJmSuv2LvD9gMoPNlmhdTWi+qFcmgZiPRDb1I0Bldo7jKLdboylEXkVQVWF1D2fv3iO5BrijG+n52XQd3ew49/1ssJi6dWhxiZQMlN+mz7cfSPmGzJc0eqaf52tEA8PkIupXjly/6dckSVcqTsex+wHcQuTinyW2bu9/YY3ZTMCp5du+lFZBD+AQSsq7EALzzithpijNG3jQka/8yRSHPBP6JtfobMdbv7SlAESslnN5R5lKJms4HnSm4CwxBAX2sUrhQeuit74/5pwe8qI+CaEGzjKYfmcRhFXd+Kz/ySV3HyrVuieH6+6ytBjGh3EkwGvQ8Ovu4KsruWAyAjHwRyBdrFIRYyLWdou77VH8gSLwHi69QsMGshcnYaREpqDEb5LLR9Ok7jP5IjMyPzX4USS327G9f4I8ujTaCKXQ9a384yV/wP9IeSuJld4dgdGy80rDP2sWZ+NJ65cNWpAfi/Nmbm6ucjICoUHILtchyx/w/YNYUzfCWFjUWHn83TzG+31f3dkjWoI3XpCOg5RKREs55htHSAyZtYhYiQr1FxDVFNEQI2MrDR0fBt2qOeZB08yA=="
+  },
   "gender": {
     "0": "Keine Anrede",
     "1": "Enby",
@@ -81,4 +81,4 @@
     "4": "Frau"
   },
   "@shared/icon": "/assets/icons.json"
-}
+}

apps/isa-app/src/main.ts

@@ -1,8 +1,11 @@
 import { enableProdMode, isDevMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { CONFIG_DATA } from '@isa/core/config';
+import { setDefaultOptions } from 'date-fns';
+import { de } from 'date-fns/locale';
 import * as moment from 'moment';
 
+setDefaultOptions({ locale: de });
 moment.locale('de');
 
 import { AppModule } from './app/app.module';
@@ -16,7 +19,9 @@ async function bootstrap() {
 
   const config = await configRes.json();
 
-  platformBrowserDynamic([{ provide: CONFIG_DATA, useValue: config }]).bootstrapModule(AppModule);
+  platformBrowserDynamic([
+    { provide: CONFIG_DATA, useValue: config },
+  ]).bootstrapModule(AppModule);
 }
 
 try {
@@ -24,4 +29,3 @@ try {
 } catch (error) {
   console.error(error);
 }
-

apps/isa-app/src/page/customer/customer-search/add-shipping-address-main-view/add-shipping-address-main-view.component.html

@@ -12,22 +12,45 @@
 
 <form [formGroup]="formGroup" (ngSubmit)="save()">
   <ng-container *ngIf="isBusinessKonto$ | async">
-    <shared-form-control label="Firma" class="col-span-2">
-      <input class="input-control" placeholder="Firma" type="text" formControlName="organisation" tabindex="1" />
+    <shared-form-control
+      [label]="formGroup.controls.organisation.errors?.required ? 'Firma *' : 'Firma'"
+      class="col-span-2"
+    >
+      <input
+        class="input-control"
+        placeholder="Firma"
+        type="text"
+        formControlName="organisation"
+        tabindex="1"
+      />
     </shared-form-control>
 
     <shared-form-control label="Abteilung">
-      <input class="input-control" placeholder="Abteilung" type="text" formControlName="department" tabindex="2" />
+      <input
+        class="input-control"
+        placeholder="Abteilung"
+        type="text"
+        formControlName="department"
+        tabindex="2"
+      />
     </shared-form-control>
 
     <shared-form-control label="USt-ID">
-      <input class="input-control" placeholder="Abteilung" type="text" formControlName="vatId" tabindex="3" />
+      <input
+        class="input-control"
+        placeholder="Abteilung"
+        type="text"
+        formControlName="vatId"
+        tabindex="3"
+      />
     </shared-form-control>
   </ng-container>
 
   <shared-form-control label="Anrede">
     <shared-select formControlName="gender" placeholder="Anrede" tabindex="4" [autofocus]="true">
-      <shared-select-option *ngFor="let gender of genderSettings.genders" [value]="gender.value">{{ gender.label }}</shared-select-option>
+      <shared-select-option *ngFor="let gender of genderSettings.genders" [value]="gender.value">{{
+        gender.label
+      }}</shared-select-option>
     </shared-select>
   </shared-form-control>
 
@@ -42,50 +65,107 @@
     </shared-select>
   </shared-form-control>
 
-  <shared-form-control label="Nachname">
-    <input class="input-control" placeholder="Nachname" type="text" formControlName="lastName" tabindex="6" />
+  <shared-form-control
+    [label]="formGroup.controls.organisation.errors?.required ? 'Nachname *' : 'Nachname'"
+  >
+    <input
+      class="input-control"
+      placeholder="Nachname"
+      type="text"
+      formControlName="lastName"
+      tabindex="6"
+    />
   </shared-form-control>
 
-  <shared-form-control label="Vorname">
-    <input class="input-control" placeholder="Vorname" type="text" formControlName="firstName" tabindex="7" />
+  <shared-form-control
+    [label]="formGroup.controls.organisation.errors?.required ? 'Vorname *' : 'Vorname'"
+  >
+    <input
+      class="input-control"
+      placeholder="Vorname"
+      type="text"
+      formControlName="firstName"
+      tabindex="7"
+    />
   </shared-form-control>
 
   <ng-container *ngIf="!(isBusinessKonto$ | async)">
     <shared-form-control label="Firma" class="col-span-2">
-      <input class="input-control" placeholder="Firma" type="text" formControlName="organisation" tabindex="8" />
+      <input
+        class="input-control"
+        placeholder="Firma"
+        type="text"
+        formControlName="organisation"
+        tabindex="8"
+      />
     </shared-form-control>
   </ng-container>
 
   <shared-form-control label="Straße">
-    <input class="input-control" placeholder="Straße" type="text" formControlName="street" tabindex="9" />
+    <input
+      class="input-control"
+      placeholder="Straße"
+      type="text"
+      formControlName="street"
+      tabindex="9"
+    />
   </shared-form-control>
 
   <shared-form-control label="Hausnummer">
-    <input class="input-control" placeholder="Hausnummer" type="text" formControlName="streetNumber" tabindex="10" />
+    <input
+      class="input-control"
+      placeholder="Hausnummer"
+      type="text"
+      formControlName="streetNumber"
+      tabindex="10"
+    />
   </shared-form-control>
 
   <shared-form-control label="PLZ">
-    <input class="input-control" placeholder="PLZ" type="text" formControlName="zipCode" tabindex="11" />
+    <input
+      class="input-control"
+      placeholder="PLZ"
+      type="text"
+      formControlName="zipCode"
+      tabindex="11"
+    />
   </shared-form-control>
 
   <shared-form-control label="Ort">
-    <input class="input-control" placeholder="Ort" type="text" formControlName="city" tabindex="12" />
+    <input
+      class="input-control"
+      placeholder="Ort"
+      type="text"
+      formControlName="city"
+      tabindex="12"
+    />
   </shared-form-control>
 
   <shared-form-control label="Adresszusatz" class="col-span-2">
-    <input class="input-control" placeholder="Adresszusatz" type="text" formControlName="info" tabindex="13" />
+    <input
+      class="input-control"
+      placeholder="Adresszusatz"
+      type="text"
+      formControlName="info"
+      tabindex="13"
+    />
   </shared-form-control>
 
   <shared-form-control class="col-span-2" label="Land">
     <shared-select placeholder="Land" formControlName="country" tabindex="14">
-      <shared-select-option *ngFor="let country of countries$ | async" [value]="country.isO3166_A_3">
+      <shared-select-option
+        *ngFor="let country of countries$ | async"
+        [value]="country.isO3166_A_3"
+      >
         {{ country.name }}
       </shared-select-option>
     </shared-select>
   </shared-form-control>
 
   <div class="text-center col-span-2">
-    <shared-checkbox formControlName="isDefault">Diese Lieferadresse als Standard Adresse festlegen</shared-checkbox>
+    <shared-checkbox formControlName="isDefault"
+      >Diese Lieferadresse als Standard Adresse festlegen</shared-checkbox
+    >
   </div>
   <div class="mt-6 text-center col-span-2">
     <button
@@ -98,3 +178,4 @@
     </button>
   </div>
 </form>
+

apps/isa-app/src/page/customer/customer-search/add-shipping-address-main-view/add-shipping-address-main-view.component.ts

@@ -15,6 +15,7 @@ import { RouterLink } from '@angular/router';
 import { IconComponent } from '@shared/components/icon';
 import { zipCodeValidator } from '../../validators/zip-code-validator';
 import { GenderSettingsService } from '@shared/services/gender';
+import { validateCompanyOrPersonalInfoRequired } from '../../validators/gender-b2b-validator';
 
 @Component({
   selector: 'page-add-shipping-address-main-view',
@@ -70,10 +71,30 @@ export class AddShippingAddressMainViewComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this._store.customer$.pipe(takeUntil(this._onDestroy)).subscribe(() => {
+      // Dynamic validation rules based on account type
+      // For business accounts (isBusinessKonto), we apply different validation rules
+      // than for personal accounts
       if (this._store.isBusinessKonto) {
-        this.formGroup.controls.organisation.setValidators([Validators.required]);
+        // For business accounts:
+        // - Clear individual validators from personal info fields
+        // - Add a form-level validator that requires either company OR personal info
+        // - Make address fields optional to support different business address formats
+        this.formGroup.controls.organisation.setValidators([]);
+        this.formGroup.controls.gender.setValidators([]);
+        this.formGroup.controls.firstName.setValidators([]);
+        this.formGroup.controls.lastName.setValidators([]);
+        this.formGroup.setValidators([validateCompanyOrPersonalInfoRequired]);
+        this.formGroup.controls.street.setValidators([]);
+        this.formGroup.controls.streetNumber.setValidators([]);
       } else {
+        // For personal accounts:
+        // - Organization info is optional
+        // - First and last name are required
+        // - No special form-level validators needed
         this.formGroup.controls.organisation.clearValidators();
+        this.formGroup.controls.firstName.setValidators([Validators.required]);
+        this.formGroup.controls.lastName.setValidators([Validators.required]);
+        this.formGroup.setValidators([]);
       }
     });
   }
@@ -133,7 +154,10 @@ export class AddShippingAddressMainViewComponent implements OnInit, OnDestroy {
         formData.isDefault,
       );
 
-      this._navigation.navigateToDetails({ processId: this._store.processId, customerId: this._store.customerId });
+      this._navigation.navigateToDetails({
+        processId: this._store.processId,
+        customerId: this._store.customerId,
+      });
     } catch (error) {
       this.formGroup.enable();
     }

apps/isa-app/src/page/customer/customer-search/edit-main-view/customer-data-edit-b2b.component.ts

@@ -5,9 +5,10 @@ import { UiCommonModule } from '@ui/common';
 import { UiFormControlModule } from '@ui/form-control';
 import { UiSelectModule } from '@ui/select';
 import { UiIconModule } from '@ui/icon';
-import { ReactiveFormsModule } from '@angular/forms';
+import { FormGroup, ReactiveFormsModule } from '@angular/forms';
 import { RouterLink } from '@angular/router';
 import { UiDateInputDirective } from '@ui/input';
+import { validateCompanyOrPersonalInfoRequired } from '../../validators/gender-b2b-validator';
 
 @Component({
   selector: 'page-customer-data-edit-b2b',
@@ -26,8 +27,9 @@ import { UiDateInputDirective } from '@ui/input';
   ],
 })
 export class CustomerDataEditB2BComponent extends CustomerDataEditComponent {
-  afterInitForm = (control) => {
+  afterInitForm = (control: FormGroup) => {
     control.get('lastName').setValidators([]);
     control.get('firstName').setValidators([]);
+    control.setValidators([validateCompanyOrPersonalInfoRequired]);
   };
 }

apps/isa-app/src/page/customer/customer-search/edit-shipping-address-main-view/edit-shipping-address-main-view.component.html

@@ -12,22 +12,49 @@
 
 <form [formGroup]="formGroup" (ngSubmit)="save()">
   <ng-container *ngIf="isBusinessKonto$ | async">
-    <shared-form-control label="Firma" class="col-span-2">
-      <input class="input-control" placeholder="Firma" type="text" formControlName="organisation" tabindex="1" />
+    <shared-form-control
+      [label]="formGroup.controls.organisation.errors?.required ? 'Firma *' : 'Firma'"
+      class="col-span-2"
+      [hasRequiredMark]="
+        formGroup.controls.organisation.errors?.required ||
+        formGroup.errors?.eitherCompanyOrPersonalRequired
+      "
+    >
+      <input
+        class="input-control"
+        placeholder="Firma"
+        type="text"
+        formControlName="organisation"
+        tabindex="1"
+      />
     </shared-form-control>
 
     <shared-form-control label="Abteilung">
-      <input class="input-control" placeholder="Abteilung" type="text" formControlName="department" tabindex="2" />
+      <input
+        class="input-control"
+        placeholder="Abteilung"
+        type="text"
+        formControlName="department"
+        tabindex="2"
+      />
     </shared-form-control>
 
     <shared-form-control label="USt-ID">
-      <input class="input-control" placeholder="Abteilung" type="text" formControlName="vatId" tabindex="3" />
+      <input
+        class="input-control"
+        placeholder="Abteilung"
+        type="text"
+        formControlName="vatId"
+        tabindex="3"
+      />
     </shared-form-control>
   </ng-container>
 
   <shared-form-control label="Anrede">
     <shared-select formControlName="gender" placeholder="Anrede" tabindex="4" [autofocus]="true">
-      <shared-select-option *ngFor="let gender of genderSettings.genders" [value]="gender.value">{{ gender.label }}</shared-select-option>
+      <shared-select-option *ngFor="let gender of genderSettings.genders" [value]="gender.value">{{
+        gender.label
+      }}</shared-select-option>
     </shared-select>
   </shared-form-control>
 
@@ -42,50 +69,115 @@
     </shared-select>
   </shared-form-control>
 
-  <shared-form-control label="Nachname">
-    <input class="input-control" placeholder="Nachname" type="text" formControlName="lastName" tabindex="6" />
+  <shared-form-control
+    [label]="formGroup.controls.organisation.errors?.required ? 'Nachname *' : 'Nachname'"
+    [hasRequiredMark]="
+      formGroup.controls.lastName.errors?.required ||
+      formGroup.errors?.eitherCompanyOrPersonalRequired
+    "
+  >
+    <input
+      class="input-control"
+      placeholder="Nachname"
+      type="text"
+      formControlName="lastName"
+      tabindex="6"
+    />
   </shared-form-control>
 
-  <shared-form-control label="Vorname">
-    <input class="input-control" placeholder="Vorname" type="text" formControlName="firstName" tabindex="7" />
+  <shared-form-control
+    [label]="formGroup.controls.organisation.errors?.required ? 'Vorname *' : 'Vorname'"
+    [hasRequiredMark]="
+      formGroup.controls.firstName.errors?.required ||
+      formGroup.errors?.eitherCompanyOrPersonalRequired
+    "
+  >
+    <input
+      class="input-control"
+      placeholder="Vorname"
+      type="text"
+      formControlName="firstName"
+      tabindex="7"
+    />
   </shared-form-control>
 
   <ng-container *ngIf="!(isBusinessKonto$ | async)">
     <shared-form-control label="Firma" class="col-span-2">
-      <input class="input-control" placeholder="Firma" type="text" formControlName="organisation" tabindex="8" />
+      <input
+        class="input-control"
+        placeholder="Firma"
+        type="text"
+        formControlName="organisation"
+        tabindex="8"
+      />
     </shared-form-control>
   </ng-container>
 
   <shared-form-control label="Straße">
-    <input class="input-control" placeholder="Straße" type="text" formControlName="street" tabindex="9" />
+    <input
+      class="input-control"
+      placeholder="Straße"
+      type="text"
+      formControlName="street"
+      tabindex="9"
+    />
   </shared-form-control>
 
   <shared-form-control label="Hausnummer">
-    <input class="input-control" placeholder="Hausnummer" type="text" formControlName="streetNumber" tabindex="10" />
+    <input
+      class="input-control"
+      placeholder="Hausnummer"
+      type="text"
+      formControlName="streetNumber"
+      tabindex="10"
+    />
   </shared-form-control>
 
   <shared-form-control label="PLZ">
-    <input class="input-control" placeholder="PLZ" type="text" formControlName="zipCode" tabindex="11" />
+    <input
+      class="input-control"
+      placeholder="PLZ"
+      type="text"
+      formControlName="zipCode"
+      tabindex="11"
+    />
   </shared-form-control>
 
   <shared-form-control label="Ort">
-    <input class="input-control" placeholder="Ort" type="text" formControlName="city" tabindex="12" />
+    <input
+      class="input-control"
+      placeholder="Ort"
+      type="text"
+      formControlName="city"
+      tabindex="12"
+    />
   </shared-form-control>
 
   <shared-form-control label="Adresszusatz" class="col-span-2">
-    <input class="input-control" placeholder="Adresszusatz" type="text" formControlName="info" tabindex="13" />
+    <input
+      class="input-control"
+      placeholder="Adresszusatz"
+      type="text"
+      formControlName="info"
+      tabindex="13"
+    />
   </shared-form-control>
 
   <shared-form-control class="col-span-2" label="Land">
     <shared-select placeholder="Land" formControlName="country" tabindex="14">
-      <shared-select-option *ngFor="let country of countries$ | async" [value]="country.isO3166_A_3">
+      <shared-select-option
+        *ngFor="let country of countries$ | async"
+        [value]="country.isO3166_A_3"
+      >
         {{ country.name }}
       </shared-select-option>
     </shared-select>
   </shared-form-control>
 
   <div class="text-center col-span-2">
-    <shared-checkbox formControlName="isDefault">Diese Lieferadresse als Standard Adresse festlegen</shared-checkbox>
+    <shared-checkbox formControlName="isDefault"
+      >Diese Lieferadresse als Standard Adresse festlegen</shared-checkbox
+    >
   </div>
   <div class="mt-6 text-center col-span-2">
     <button
@@ -98,3 +190,4 @@
     </button>
   </div>
 </form>
+

apps/isa-app/src/page/customer/customer-search/edit-shipping-address-main-view/edit-shipping-address-main-view.component.ts

@@ -1,4 +1,11 @@
-import { Component, ChangeDetectionStrategy, OnInit, OnDestroy, inject, ChangeDetectorRef } from '@angular/core';
+import {
+  Component,
+  ChangeDetectionStrategy,
+  OnInit,
+  OnDestroy,
+  inject,
+  ChangeDetectorRef,
+} from '@angular/core';
 import { CheckboxComponent } from '@shared/components/checkbox';
 import { FormControl, FormGroup, Validators, ReactiveFormsModule } from '@angular/forms';
 import { SelectModule } from '@shared/components/select';
@@ -16,6 +23,7 @@ import { ActivatedRoute, RouterLink } from '@angular/router';
 import { ComponentStore } from '@ngrx/component-store';
 import { zipCodeValidator } from '../../validators/zip-code-validator';
 import { GenderSettingsService } from '@shared/services/gender';
+import { validateCompanyOrPersonalInfoRequired } from '../../validators/gender-b2b-validator';
 
 export interface EditShippingAddressMainViewState {
   shippingAddress?: ShippingAddressDTO;
@@ -102,9 +110,15 @@ export class EditShippingAddressMainViewComponent
 
     this._store.customer$.pipe(takeUntil(this._onDestroy)).subscribe(() => {
       if (this._store.isBusinessKonto) {
-        this.formGroup.controls.organisation.setValidators([Validators.required]);
+        this.formGroup.controls.organisation.setValidators([]);
+        this.formGroup.controls.firstName.setValidators([]);
+        this.formGroup.controls.lastName.setValidators([]);
+        this.formGroup.setValidators([validateCompanyOrPersonalInfoRequired]);
       } else {
         this.formGroup.controls.organisation.clearValidators();
+        this.formGroup.controls.firstName.setValidators([Validators.required]);
+        this.formGroup.controls.lastName.setValidators([Validators.required]);
+        this.formGroup.setValidators([]);
       }
     });
   }
@@ -185,7 +199,10 @@ export class EditShippingAddressMainViewComponent
         formData.isDefault,
       );
 
-      this._navigation.navigateToDetails({ processId: this._store.processId, customerId: this._store.customerId });
+      this._navigation.navigateToDetails({
+        processId: this._store.processId,
+        customerId: this._store.customerId,
+      });
     } catch (error) {
       this.formGroup.enable();
     }

apps/isa-app/src/page/customer/validators/gender-b2b-validator.ts

@@ -26,6 +26,8 @@ export function requireGenderWhenNameIsSet(control: UntypedFormGroup): Validatio
   const genderControl = control.get('gender');
   const nameControl = control.get('lastName');
 
+  genderControl?.setErrors(null);
+
   if (nameControl && !Validators.required(nameControl)) {
     const errors = Validators.min(1)(genderControl) ? { required: true } : null;
 
@@ -36,3 +38,62 @@ export function requireGenderWhenNameIsSet(control: UntypedFormGroup): Validatio
   }
   return null;
 }
+
+/**
+ * Angular form validator that implements mutual exclusivity between organisation name and personal details.
+ * Either:
+ * 1. Organisation name must be provided (company case), OR
+ * 2. Both first name and last name must be provided (individual case)
+ *
+ * @param control - The form group containing 'firstName', 'lastName', and nested 'organisation.name' controls
+ * @returns Validation errors if the mutual exclusivity rule is violated, null otherwise
+ */
+export function validateCompanyOrPersonalInfoRequired(
+  control: UntypedFormGroup,
+): ValidationErrors | null {
+  const firstNameControl = control.get('firstName');
+  const lastNameControl = control.get('lastName');
+  const organisationControl = control.get('organisation');
+
+  // Safely access the nested company name, with null checks
+  const companyNameControl = organisationControl?.get('name') ?? organisationControl;
+
+  if (!firstNameControl || !lastNameControl || !companyNameControl) {
+    // If any control is missing, we can't validate
+    return null;
+  }
+
+  const hasCompanyName = !!companyNameControl.value;
+  const hasFirstName = !!firstNameControl.value;
+  const hasLastName = !!lastNameControl.value;
+  const hasPersonalInfo = hasFirstName || hasLastName;
+
+  // Clear previous validation errors
+  firstNameControl.setErrors(null);
+  lastNameControl.setErrors(null);
+  companyNameControl.setErrors(null);
+
+  // Case 1: Neither company name nor personal info provided - require one of them
+  if (!hasCompanyName && !hasPersonalInfo) {
+    const errors = { required: true };
+    companyNameControl.setErrors(errors);
+    firstNameControl.setErrors(errors);
+    lastNameControl.setErrors(errors);
+    return { eitherCompanyOrPersonalRequired: true };
+  }
+
+  // Case 2: First name provided but last name missing
+  if (hasFirstName && !hasLastName) {
+    lastNameControl.setErrors({ required: true });
+    return { lastNameRequired: true };
+  }
+
+  // Case 3: Last name provided but first name missing
+  if (!hasFirstName && hasLastName) {
+    firstNameControl.setErrors({ required: true });
+    return { firstNameRequired: true };
+  }
+
+  // Valid: Either company name or complete personal info is provided
+  return null;
+}

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

@@ -1,20 +1,38 @@
 <form *ngIf="control" [formGroup]="control" (submit)="submit()">
   <div class="header">
     {{ items[0]?.organisation }}
-    <ng-container *ngIf="!!items[0]?.organisation && (!!items[0]?.firstName || !!items[0]?.lastName)">-</ng-container>
+    <ng-container
+      *ngIf="
+        !!items[0]?.organisation &&
+        (!!items[0]?.firstName || !!items[0]?.lastName)
+      "
+      >-</ng-container
+    >
     {{ items[0]?.lastName }}
     {{ items[0]?.firstName }}
   </div>
 
-  <ui-form-control label="Vorgang-ID" variant="inline" statusLabel="Nicht Änderbar">
+  <ui-form-control
+    label="Vorgang-ID"
+    variant="inline"
+    statusLabel="Nicht Änderbar"
+  >
     <input uiInput formControlName="orderNumber" />
   </ui-form-control>
 
-  <ui-form-control label="Bestelldatum" variant="inline" statusLabel="Nicht Änderbar">
+  <ui-form-control
+    label="Bestelldatum"
+    variant="inline"
+    statusLabel="Nicht Änderbar"
+  >
     <input uiInput formControlName="orderDate" />
   </ui-form-control>
 
-  <ui-form-control label="Bestellkanal" variant="inline" statusLabel="Nicht Änderbar">
+  <ui-form-control
+    label="Bestellkanal"
+    variant="inline"
+    statusLabel="Nicht Änderbar"
+  >
     <input uiInput formControlName="clientChannel" />
   </ui-form-control>
 
@@ -25,40 +43,81 @@
     formGroupName="notificationChannel"
   ></shared-notification-channel-control>
 
-  <ui-form-control label="Kundennummer" variant="inline" statusLabel="Nicht Änderbar">
+  <ui-form-control
+    label="Kundennummer"
+    variant="inline"
+    statusLabel="Nicht Änderbar"
+  >
     <input uiInput formControlName="buyerNumber" />
   </ui-form-control>
 
   <ng-container *ngIf="showNameFields">
-    <ui-form-control label="Name" variant="inline" [statusLabel]="canEditNameFields ? '' : 'Nicht Änderbar'">
-      <input uiInput formControlName="firstName" />
-    </ui-form-control>
-
-    <ui-form-control label="Vorname" variant="inline" [statusLabel]="canEditNameFields ? '' : 'Nicht Änderbar'">
+    <ui-form-control
+      label="Name"
+      variant="inline"
+      [statusLabel]="canEditNameFields ? '' : 'Nicht Änderbar'"
+    >
       <input uiInput formControlName="lastName" />
     </ui-form-control>
 
-    <ui-form-control *ngIf="isB2B" label="Firmenname" variant="inline" [statusLabel]="canEditNameFields ? '' : 'Nicht Änderbar'">
+    <ui-form-control
+      label="Vorname"
+      variant="inline"
+      [statusLabel]="canEditNameFields ? '' : 'Nicht Änderbar'"
+    >
+      <input uiInput formControlName="firstName" />
+    </ui-form-control>
+
+    <ui-form-control
+      *ngIf="isB2B"
+      label="Firmenname"
+      variant="inline"
+      [statusLabel]="canEditNameFields ? '' : 'Nicht Änderbar'"
+    >
       <input uiInput formControlName="organisation" />
     </ui-form-control>
   </ng-container>
 
   <div formArrayName="items">
-    <div *ngFor="let item of itemsControl.controls; index as i" [formGroupName]="i">
+    <div
+      *ngFor="let item of itemsControl.controls; index as i"
+      [formGroupName]="i"
+    >
       <div class="item-header-wrapper">
         <div class="item-header">
-          <img class="cover" *ngIf="item.value?.ean | productImage; let productImage" [src]="productImage" [alt]="item.value?.name" />
+          <img
+            class="cover"
+            *ngIf="item.value?.ean | productImage; let productImage"
+            [src]="productImage"
+            [alt]="item.value?.name"
+          />
           <span class="title">{{ item.value?.name }}</span>
         </div>
 
-        <button class="cta-expand" type="button" (click)="expanded[i] = !expanded[i]">
-          <ui-icon icon="arrow_head" size="16px" [rotate]="expanded[i] ? '90deg' : '270deg'"></ui-icon>
+        <button
+          class="cta-expand"
+          type="button"
+          (click)="expanded[i] = !expanded[i]"
+        >
+          <ui-icon
+            icon="arrow_head"
+            size="16px"
+            [rotate]="expanded[i] ? '90deg' : '270deg'"
+          ></ui-icon>
         </button>
       </div>
 
       <ng-container *ngIf="expanded[i]">
-        <ui-form-control label="Abholfachnummer" [clearable]="true" variant="inline">
-          <input pattern="^\d{3,4}_\d{4}_\d{1,5}$" uiInput formControlName="compartmentCode" />
+        <ui-form-control
+          label="Abholfachnummer"
+          [clearable]="true"
+          variant="inline"
+        >
+          <input
+            pattern="^\d{3,4}_\d{4}_\d{1,5}$"
+            uiInput
+            formControlName="compartmentCode"
+          />
         </ui-form-control>
 
         <shared-goods-in-out-order-details-tags
@@ -66,7 +125,11 @@
           formControlName="compartmentInfo"
         ></shared-goods-in-out-order-details-tags>
 
-        <ui-form-control label="Status" variant="inline" statusLabel="Nicht Änderbar">
+        <ui-form-control
+          label="Status"
+          variant="inline"
+          statusLabel="Nicht Änderbar"
+        >
           <input uiInput formControlName="processingStatus" />
         </ui-form-control>
 
@@ -82,19 +145,37 @@
           </ng-container>
           <ng-container *ngSwitchCase="16777216"></ng-container>
           <ng-container *ngSwitchDefault>
-            <ui-form-control class="datepicker" label="Geändert" variant="inline">
+            <ui-form-control
+              class="datepicker"
+              label="Geändert"
+              variant="inline"
+            >
               <input uiInput formControlName="processingStatusDate" />
             </ui-form-control>
           </ng-container>
         </div>
 
         <ng-template #vslLieferdatum>
-          <ui-form-control class="datepicker" label="vsl. Lieferdatum" variant="inline">
-            <button class="date-btn" type="button" [uiOverlayTrigger]="uiDatepicker" #datepicker="uiOverlayTrigger">
+          <ui-form-control
+            class="datepicker"
+            label="vsl. Lieferdatum"
+            variant="inline"
+          >
+            <button
+              class="date-btn"
+              type="button"
+              [uiOverlayTrigger]="uiDatepicker"
+              #datepicker="uiOverlayTrigger"
+            >
               <strong>
                 {{ items[i]?.estimatedShippingDate | date: 'dd.MM.yy' }}
               </strong>
-              <ui-icon icon="arrow_head" class="dp-button-icon" size="12px" [rotate]="datepicker.opened ? '270deg' : '90deg'"></ui-icon>
+              <ui-icon
+                icon="arrow_head"
+                class="dp-button-icon"
+                size="12px"
+                [rotate]="datepicker.opened ? '270deg' : '90deg'"
+              ></ui-icon>
             </button>
             <ui-datepicker
               formControlName="estimatedShippingDate"
@@ -105,13 +186,20 @@
               [disabledDaysOfWeek]="[0]"
               [selected]="items[i]?.estimatedShippingDate"
               saveLabel="Übernehmen"
-              (save)="changeEstimatedDeliveryDate($event, items[i]); uiDatepicker.close()"
+              (save)="
+                changeEstimatedDeliveryDate($event, items[i]);
+                uiDatepicker.close()
+              "
             ></ui-datepicker>
           </ui-form-control>
         </ng-template>
 
         <ng-template #abholfrist>
-          <ui-form-control class="datepicker" label="Abholfrist" variant="inline">
+          <ui-form-control
+            class="datepicker"
+            label="Abholfrist"
+            variant="inline"
+          >
             <button
               [uiOverlayTrigger]="deadlineDatepicker"
               #deadlineDatepickerTrigger="uiOverlayTrigger"
@@ -122,7 +210,11 @@
               <strong>
                 {{ items[i]?.pickUpDeadline | date: 'dd.MM.yy' }}
               </strong>
-              <ui-icon [rotate]="deadlineDatepickerTrigger.opened ? '270deg' : '90deg'" class="dp-button-icon" icon="arrow_head"></ui-icon>
+              <ui-icon
+                [rotate]="deadlineDatepickerTrigger.opened ? '270deg' : '90deg'"
+                class="dp-button-icon"
+                icon="arrow_head"
+              ></ui-icon>
             </button>
             <ui-datepicker
               formControlName="pickUpDeadline"
@@ -133,33 +225,66 @@
               [disabledDaysOfWeek]="[0]"
               [selected]="items[i]?.pickUpDeadline"
               saveLabel="Übernehmen"
-              (save)="changePickupDeadline($event, items[i]); deadlineDatepicker.close()"
+              (save)="
+                changePickupDeadline($event, items[i]);
+                deadlineDatepicker.close()
+              "
             ></ui-datepicker>
           </ui-form-control>
         </ng-template>
 
-        <ui-form-control label="Menge" variant="inline" statusLabel="Nicht Änderbar">
+        <ui-form-control
+          label="Menge"
+          variant="inline"
+          statusLabel="Nicht Änderbar"
+        >
           <input uiInput formControlName="quantity" />
         </ui-form-control>
 
-        <ui-form-control class="price" label="Preis" [clearable]="true" [suffix]="item.value?.currency" variant="inline" requiredMark=" *">
+        <ui-form-control
+          class="price"
+          label="Preis"
+          [clearable]="true"
+          [suffix]="item.value?.currency"
+          variant="inline"
+          requiredMark=" *"
+        >
           <input uiInput formControlName="price" />
         </ui-form-control>
 
-        <ui-form-control label="ISBN/EAN" [clearable]="true" variant="inline" requiredMark=" *">
+        <ui-form-control
+          label="ISBN/EAN"
+          [clearable]="true"
+          variant="inline"
+          requiredMark=" *"
+        >
           <input uiInput formControlName="ean" />
         </ui-form-control>
 
-        <ui-form-control label="Zielfiliale" variant="inline" statusLabel="Nicht Änderbar">
+        <ui-form-control
+          label="Zielfiliale"
+          variant="inline"
+          statusLabel="Nicht Änderbar"
+        >
           <input uiInput formControlName="targetBranch" />
         </ui-form-control>
 
-        <ui-form-control label="Lieferant" variant="inline" statusLabel="Nicht Änderbar">
+        <ui-form-control
+          label="Lieferant"
+          variant="inline"
+          statusLabel="Nicht Änderbar"
+        >
           <input uiInput formControlName="supplier" />
         </ui-form-control>
 
         <div class="ssc-wrapper">
-          <ui-form-control class="ssc" label="Meldenummer" [clearable]="true" variant="inline" requiredMark=" *">
+          <ui-form-control
+            class="ssc"
+            label="Meldenummer"
+            [clearable]="true"
+            variant="inline"
+            requiredMark=" *"
+          >
             <input class="ssc-input" uiInput formControlName="ssc" />
           </ui-form-control>
           <input class="ssc-text" uiInput formControlName="sscText" />
@@ -174,11 +299,21 @@
 
         <ui-form-control label="MwSt" variant="inline">
           <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="special-comment" label="Anmerkung" [clearable]="true" (cleared)="clearSpecialComment(i)" variant="inline">
+        <ui-form-control
+          class="special-comment"
+          label="Anmerkung"
+          [clearable]="true"
+          (cleared)="clearSpecialComment(i)"
+          variant="inline"
+        >
           <textarea
             matInput
             cdkTextareaAutosize
@@ -195,7 +330,15 @@
     </div>
   </div>
   <div class="actions">
-    <button class="cta-close" (click)="navigation.emit({})" type="button">Abbrechen</button>
-    <button class="cta-save" [disabled]="control.invalid || control.disabled" type="submit">Speichern</button>
+    <button class="cta-close" (click)="navigation.emit({})" type="button">
+      Abbrechen
+    </button>
+    <button
+      class="cta-save"
+      [disabled]="control.invalid || control.disabled"
+      type="submit"
+    >
+      Speichern
+    </button>
   </div>
 </form>

apps/isa-app/src/ui.scss

@@ -1,3 +1,4 @@
-@use "../../../libs/ui/buttons/src/buttons.scss";
-@use "../../../libs/ui/input-controls/src/input-controls.scss";
-@use "../../../libs/ui/progress-bar/src/lib/progress-bar.scss";
+@use '../../../libs/ui/buttons/src/buttons.scss';
+@use '../../../libs/ui/datepicker/src/datepicker.scss';
+@use '../../../libs/ui/input-controls/src/input-controls.scss';
+@use '../../../libs/ui/progress-bar/src/lib/progress-bar.scss';

apps/isa-app/stories/ui/datepicker/ui-datepicker.stories.ts

@@ -0,0 +1,33 @@
+import { Meta, StoryObj } from '@storybook/angular';
+import { DateRangeValue, RangeDatepickerComponent } from '@isa/ui/datepicker';
+
+interface DatepickerComponentInputs {
+  value: DateRangeValue;
+  min: Date;
+  max: Date;
+}
+
+const meta: Meta<RangeDatepickerComponent> = {
+  title: 'ui/datepicker/Datepicker',
+  component: RangeDatepickerComponent,
+  argTypes: {
+    value: { control: 'object' },
+    min: { control: 'date' },
+    max: { control: 'date' },
+  },
+  args: {
+    value: undefined,
+    min: new Date(2022, 0, 1),
+    max: new Date(2026, 11, 31),
+  },
+};
+
+export default meta;
+
+type Story = StoryObj<DatepickerComponentInputs>;
+
+export const Default: Story = {
+  args: {
+    value: [new Date(), new Date(Date.now() + 5 * 24 * 60 * 60 * 1000)], // Start: today, End: 5 days after today
+  },
+};

generated/swagger/oms-api/src/models.ts

@@ -246,6 +246,7 @@ export { ReceiptListItemDTO } from './models/receipt-list-item-dto';
 export { ListResponseArgsOfReceiptItemListItemDTO } from './models/list-response-args-of-receipt-item-list-item-dto';
 export { ResponseArgsOfIEnumerableOfReceiptItemListItemDTO } from './models/response-args-of-ienumerable-of-receipt-item-list-item-dto';
 export { ReceiptItemListItemDTO } from './models/receipt-item-list-item-dto';
+export { ReturnReceiptValuesDTO } from './models/return-receipt-values-dto';
 export { ResponseArgsOfIEnumerableOfValueTupleOfLongAndReceiptTypeAndEntityDTOContainerOfReceiptDTO } from './models/response-args-of-ienumerable-of-value-tuple-of-long-and-receipt-type-and-entity-dtocontainer-of-receipt-dto';
 export { ValueTupleOfLongAndReceiptTypeAndEntityDTOContainerOfReceiptDTO } from './models/value-tuple-of-long-and-receipt-type-and-entity-dtocontainer-of-receipt-dto';
 export { ReceiptOrderItemSubsetReferenceValues } from './models/receipt-order-item-subset-reference-values';

generated/swagger/oms-api/src/models/receipt-item-dto.ts

@@ -7,10 +7,10 @@ import { EntityDTOContainerOfLogisticianDTO } from './entity-dtocontainer-of-log
 import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto';
 import { OrderItemType } from './order-item-type';
 import { EntityReferenceTypeDTO } from './entity-reference-type-dto';
+import { ProductDTO } from './product-dto';
 import { EntityDTOContainerOfPackageDTO } from './entity-dtocontainer-of-package-dto';
 import { PaymentStatus } from './payment-status';
 import { OrderItemProcessingStatusValue } from './order-item-processing-status-value';
-import { ProductDTO } from './product-dto';
 import { PromotionDTO } from './promotion-dto';
 import { QuantityDTO } from './quantity-dto';
 import { EntityDTOContainerOfReceiptDTO } from './entity-dtocontainer-of-receipt-dto';
@@ -70,6 +70,21 @@ export interface ReceiptItemDTO extends EntityDTOBaseOfReceiptItemDTOAndIReceipt
    */
   features?: {[key: string]: string};
 
+  /**
+   * Details
+   */
+  handlingDetails?: string;
+
+  /**
+   * Reason / Grund
+   */
+  handlingReason?: string;
+
+  /**
+   * Item condition / Artikelzustand
+   */
+  itemCondition?: string;
+
   /**
    * Positionsnummer
    */
@@ -100,6 +115,11 @@ export interface ReceiptItemDTO extends EntityDTOBaseOfReceiptItemDTOAndIReceipt
    */
   origin?: EntityReferenceTypeDTO;
 
+  /**
+   * Produkt
+   */
+  otherProduct?: ProductDTO;
+
   /**
    * Packstück
    */

generated/swagger/oms-api/src/models/return-receipt-values-dto.ts

@@ -0,0 +1,44 @@
+/* tslint:disable */
+import { ProductDTO } from './product-dto';
+import { EntityDTOContainerOfReceiptItemDTO } from './entity-dtocontainer-of-receipt-item-dto';
+
+/**
+ * Return receipt values / Rücknahmebelegwerte
+ */
+export interface ReturnReceiptValuesDTO {
+
+  /**
+   * Comment / Anmerkung
+   */
+  comment?: string;
+
+  /**
+   * Item condition / Artikelzustand
+   */
+  itemCondition?: string;
+
+  /**
+   * Other product / Anderer Artikel
+   */
+  otherProduct?: ProductDTO;
+
+  /**
+   * Quantity / Menge
+   */
+  quantity: number;
+
+  /**
+   * Receipt item pk
+   */
+  receiptItem?: EntityDTOContainerOfReceiptItemDTO;
+
+  /**
+   * Return details / Rückgabedetails
+   */
+  returnDetails?: string;
+
+  /**
+   * Return reason / Rückgabegrund
+   */
+  returnReason?: string;
+}

generated/swagger/oms-api/src/services/receipt.service.ts

@@ -16,6 +16,7 @@ import { DateRange } from '../models/date-range';
 import { ListResponseArgsOfReceiptListItemDTO } from '../models/list-response-args-of-receipt-list-item-dto';
 import { QueryTokenDTO } from '../models/query-token-dto';
 import { ListResponseArgsOfReceiptItemListItemDTO } from '../models/list-response-args-of-receipt-item-list-item-dto';
+import { ReturnReceiptValuesDTO } from '../models/return-receipt-values-dto';
 import { ResponseArgsOfIEnumerableOfValueTupleOfLongAndReceiptTypeAndEntityDTOContainerOfReceiptDTO } from '../models/response-args-of-ienumerable-of-value-tuple-of-long-and-receipt-type-and-entity-dtocontainer-of-receipt-dto';
 import { ReceiptOrderItemSubsetReferenceValues } from '../models/receipt-order-item-subset-reference-values';
 @Injectable({
@@ -32,6 +33,7 @@ class ReceiptService extends __BaseService {
   static readonly ReceiptCreateShippingNote2Path = '/receipt/shippingnote/fromitems';
   static readonly ReceiptCreateInvoicePath = '/receipt/invoice/fromorder';
   static readonly ReceiptCreateInvoice2Path = '/receipt/invoice/fromitems';
+  static readonly ReceiptCreateReturnReceiptPath = '/receipt/return-receipt';
   static readonly ReceiptGetReceiptsByOrderItemSubsetPath = '/order/orderitem/orderitemsubset/receipts';
 
   constructor(
@@ -479,6 +481,56 @@ class ReceiptService extends __BaseService {
     );
   }
 
+  /**
+   * Create return receipt / Rücknahmebeleg erstellen
+   * @param params The `ReceiptService.ReceiptCreateReturnReceiptParams` containing the following parameters:
+   *
+   * - `payload`: Belegdaten
+   *
+   * - `locale`: Lokalisierung (optional)
+   *
+   * - `eagerLoading`: eagerLoading (optional)
+   */
+  ReceiptCreateReturnReceiptResponse(params: ReceiptService.ReceiptCreateReturnReceiptParams): __Observable<__StrictHttpResponse<ResponseArgsOfIEnumerableOfReceiptDTO>> {
+    let __params = this.newParams();
+    let __headers = new HttpHeaders();
+    let __body: any = null;
+    __body = params.payload;
+    if (params.locale != null) __params = __params.set('locale', params.locale.toString());
+    if (params.eagerLoading != null) __params = __params.set('eagerLoading', params.eagerLoading.toString());
+    let req = new HttpRequest<any>(
+      'POST',
+      this.rootUrl + `/receipt/return-receipt`,
+      __body,
+      {
+        headers: __headers,
+        params: __params,
+        responseType: 'json'
+      });
+
+    return this.http.request<any>(req).pipe(
+      __filter(_r => _r instanceof HttpResponse),
+      __map((_r) => {
+        return _r as __StrictHttpResponse<ResponseArgsOfIEnumerableOfReceiptDTO>;
+      })
+    );
+  }
+  /**
+   * Create return receipt / Rücknahmebeleg erstellen
+   * @param params The `ReceiptService.ReceiptCreateReturnReceiptParams` containing the following parameters:
+   *
+   * - `payload`: Belegdaten
+   *
+   * - `locale`: Lokalisierung (optional)
+   *
+   * - `eagerLoading`: eagerLoading (optional)
+   */
+  ReceiptCreateReturnReceipt(params: ReceiptService.ReceiptCreateReturnReceiptParams): __Observable<ResponseArgsOfIEnumerableOfReceiptDTO> {
+    return this.ReceiptCreateReturnReceiptResponse(params).pipe(
+      __map(_r => _r.body as ResponseArgsOfIEnumerableOfReceiptDTO)
+    );
+  }
+
   /**
    * Zugeordnete Belege
    * @param params The `ReceiptService.ReceiptGetReceiptsByOrderItemSubsetParams` containing the following parameters:
@@ -651,6 +703,27 @@ module ReceiptService {
     eagerLoading?: number;
   }
 
+  /**
+   * Parameters for ReceiptCreateReturnReceipt
+   */
+  export interface ReceiptCreateReturnReceiptParams {
+
+    /**
+     * Belegdaten
+     */
+    payload: Array<ReturnReceiptValuesDTO>;
+
+    /**
+     * Lokalisierung (optional)
+     */
+    locale?: null | string;
+
+    /**
+     * eagerLoading (optional)
+     */
+    eagerLoading?: number;
+  }
+
   /**
    * Parameters for ReceiptGetReceiptsByOrderItemSubset
    */

generated/swagger/print-api/src/base-service.ts

@@ -31,8 +31,9 @@ const PARAMETER_CODEC = new ParameterCodec();
 export class BaseService {
   constructor(
     protected config: PrintConfiguration,
-    protected http: HttpClient,
-  ) {}
+    protected http: HttpClient
+  ) {
+  }
 
   private _rootUrl: string = '';
 
@@ -56,7 +57,7 @@ export class BaseService {
    */
   protected newParams(): HttpParams {
     return new HttpParams({
-      encoder: PARAMETER_CODEC,
+      encoder: PARAMETER_CODEC
     });
   }
 }

generated/swagger/print-api/src/models.ts

@@ -1,5 +1,8 @@
 export { ResponseArgs } from './models/response-args';
-export { IPublicUserInfo } from './models/ipublic-user-info';
+export { DialogOfString } from './models/dialog-of-string';
+export { DialogSettings } from './models/dialog-settings';
+export { DialogContentType } from './models/dialog-content-type';
+export { KeyValueDTOOfStringAndString } from './models/key-value-dtoof-string-and-string';
 export { ProblemDetails } from './models/problem-details';
 export { PrintRequestOfIEnumerableOfItemDTO } from './models/print-request-of-ienumerable-of-item-dto';
 export { ItemDTO } from './models/item-dto';
@@ -8,6 +11,7 @@ export { ProductDTO } from './models/product-dto';
 export { SizeOfString } from './models/size-of-string';
 export { WeightOfAvoirdupois } from './models/weight-of-avoirdupois';
 export { Avoirdupois } from './models/avoirdupois';
+export { TouchedBase } from './models/touched-base';
 export { SpecDTO } from './models/spec-dto';
 export { TextDTO } from './models/text-dto';
 export { ImageDTO } from './models/image-dto';
@@ -23,7 +27,7 @@ export { ShelfInfoDTO } from './models/shelf-info-dto';
 export { ReviewDTO } from './models/review-dto';
 export { EntityDTO } from './models/entity-dto';
 export { EntityStatus } from './models/entity-status';
-export { TouchedBase } from './models/touched-base';
+export { CRUDA } from './models/cruda';
 export { PaperKind } from './models/paper-kind';
 export { PrintRequest } from './models/print-request';
 export { PrintRequestOfLong } from './models/print-request-of-long';
@@ -41,37 +45,31 @@ export { Gender } from './models/gender';
 export { OrganisationNamesDTO } from './models/organisation-names-dto';
 export { EntityDTOContainerOfTenantDTO } from './models/entity-dtocontainer-of-tenant-dto';
 export { TenantDTO } from './models/tenant-dto';
-export { ReadOnlyEntityDTOOfTenantDTOAndIReadOnlyTenant } from './models/read-only-entity-dtoof-tenant-dtoand-iread-only-tenant';
+export { EntityDTOBaseOfTenantDTOAndITenant } from './models/entity-dtobase-of-tenant-dtoand-itenant';
+export { EntityDTOBase } from './models/entity-dtobase';
 export { EntityDTOReferenceContainer } from './models/entity-dtoreference-container';
 export { ExternalReferenceDTO } from './models/external-reference-dto';
-export { EntityDTOOfContributorDTOAndIContributor } from './models/entity-dtoof-contributor-dtoand-icontributor';
-export { ReadOnlyEntityDTOOfContributorDTOAndIContributor } from './models/read-only-entity-dtoof-contributor-dtoand-icontributor';
+export { EntityDTOBaseOfContributorDTOAndIContributor } from './models/entity-dtobase-of-contributor-dtoand-icontributor';
 export { EntityDTOContainerOfCompanyDTO } from './models/entity-dtocontainer-of-company-dto';
 export { CompanyDTO } from './models/company-dto';
 export { AddressDTO } from './models/address-dto';
 export { GeoLocation } from './models/geo-location';
-export { EntityDTOOfCompanyDTOAndICompany } from './models/entity-dtoof-company-dtoand-icompany';
-export { ReadOnlyEntityDTOOfCompanyDTOAndICompany } from './models/read-only-entity-dtoof-company-dtoand-icompany';
+export { EntityDTOBaseOfCompanyDTOAndICompany } from './models/entity-dtobase-of-company-dtoand-icompany';
 export { EntityDTOContainerOfCategoryDTO } from './models/entity-dtocontainer-of-category-dto';
 export { CategoryDTO } from './models/category-dto';
-export { EntityDTOOfCategoryDTOAndICategory } from './models/entity-dtoof-category-dtoand-icategory';
-export { ReadOnlyEntityDTOOfCategoryDTOAndICategory } from './models/read-only-entity-dtoof-category-dtoand-icategory';
 export { EntityDTOContainerOfFileDTO } from './models/entity-dtocontainer-of-file-dto';
 export { FileDTO } from './models/file-dto';
-export { EntityDTOOfFileDTOAndIFile } from './models/entity-dtoof-file-dtoand-ifile';
-export { ReadOnlyEntityDTOOfFileDTOAndIFile } from './models/read-only-entity-dtoof-file-dtoand-ifile';
+export { EntityDTOBaseOfFileDTOAndIFile } from './models/entity-dtobase-of-file-dtoand-ifile';
 export { EntityDTOContainerOfTextDTO } from './models/entity-dtocontainer-of-text-dto';
 export { TextDTO2 } from './models/text-dto2';
-export { EntityDTOOfTextDTOAndIText } from './models/entity-dtoof-text-dtoand-itext';
-export { ReadOnlyEntityDTOOfTextDTOAndIText } from './models/read-only-entity-dtoof-text-dtoand-itext';
+export { EntityDTOBaseOfTextDTOAndIText } from './models/entity-dtobase-of-text-dtoand-itext';
 export { EntityDTOContainerOfComponentsDTO } from './models/entity-dtocontainer-of-components-dto';
 export { ComponentsDTO } from './models/components-dto';
 export { ComponentItemDTO } from './models/component-item-dto';
 export { QuantityUnitType } from './models/quantity-unit-type';
 export { ComponentItemDisplayType } from './models/component-item-display-type';
 export { SetType } from './models/set-type';
-export { EntityDTOOfComponentsDTOAndIComponents } from './models/entity-dtoof-components-dtoand-icomponents';
-export { ReadOnlyEntityDTOOfComponentsDTOAndIComponents } from './models/read-only-entity-dtoof-components-dtoand-icomponents';
+export { EntityDTOBaseOfComponentsDTOAndIComponents } from './models/entity-dtobase-of-components-dtoand-icomponents';
 export { ItemLabelDTO } from './models/item-label-dto';
 export { FoodDTO } from './models/food-dto';
 export { FoodLabel } from './models/food-label';
@@ -81,24 +79,22 @@ export { NutritionFactsDTO } from './models/nutrition-facts-dto';
 export { Rezeptmasz } from './models/rezeptmasz';
 export { NutritionFactDTO } from './models/nutrition-fact-dto';
 export { NutritionFactType } from './models/nutrition-fact-type';
-export { EntityDTOOfItemDTOAndIItem } from './models/entity-dtoof-item-dtoand-iitem';
-export { ReadOnlyEntityDTOOfItemDTOAndIItem } from './models/read-only-entity-dtoof-item-dtoand-iitem';
+export { EntityDTOBaseOfItemDTOAndIItem } from './models/entity-dtobase-of-item-dtoand-iitem';
 export { ImageDTO2 } from './models/image-dto2';
 export { UrlDTO } from './models/url-dto';
 export { AvailabilityDTO2 } from './models/availability-dto2';
+export { DateRangeDTO } from './models/date-range-dto';
 export { EntityDTOContainerOfSupplierDTO } from './models/entity-dtocontainer-of-supplier-dto';
 export { SupplierDTO } from './models/supplier-dto';
 export { SupplierType } from './models/supplier-type';
-export { EntityDTOOfSupplierDTOAndISupplier } from './models/entity-dtoof-supplier-dtoand-isupplier';
-export { ReadOnlyEntityDTOOfSupplierDTOAndISupplier } from './models/read-only-entity-dtoof-supplier-dtoand-isupplier';
+export { EntityDTOBaseOfSupplierDTOAndISupplier } from './models/entity-dtobase-of-supplier-dtoand-isupplier';
 export { EntityDTOContainerOfLogisticianDTO } from './models/entity-dtocontainer-of-logistician-dto';
 export { LogisticianDTO } from './models/logistician-dto';
-export { EntityDTOOfLogisticianDTOAndILogistician } from './models/entity-dtoof-logistician-dtoand-ilogistician';
-export { ReadOnlyEntityDTOOfLogisticianDTOAndILogistician } from './models/read-only-entity-dtoof-logistician-dtoand-ilogistician';
+export { EntityDTOBaseOfLogisticianDTOAndILogistician } from './models/entity-dtobase-of-logistician-dtoand-ilogistician';
 export { ShippingDTO } from './models/shipping-dto';
 export { ShippingType } from './models/shipping-type';
 export { TypeOfDelivery } from './models/type-of-delivery';
-export { ReadOnlyEntityDTOOfShopItemDTOAndIShopItem } from './models/read-only-entity-dtoof-shop-item-dtoand-ishop-item';
+export { EntityDTOBaseOfShopItemDTOAndIShopItem } from './models/entity-dtobase-of-shop-item-dtoand-ishop-item';
 export { EntityDTOContainerOfShoppingCartItemDTO } from './models/entity-dtocontainer-of-shopping-cart-item-dto';
 export { ShoppingCartItemStatus } from './models/shopping-cart-item-status';
 export { OrderItemType } from './models/order-item-type';
@@ -108,23 +104,20 @@ export { EntityDTOContainerOfBranchDTO } from './models/entity-dtocontainer-of-b
 export { BranchDTO } from './models/branch-dto';
 export { EntityDTOContainerOfLabelDTO } from './models/entity-dtocontainer-of-label-dto';
 export { LabelDTO } from './models/label-dto';
-export { ReadOnlyEntityDTOOfLabelDTOAndIReadOnlyLabel } from './models/read-only-entity-dtoof-label-dtoand-iread-only-label';
-export { Address } from './models/address';
+export { EntityDTOBaseOfLabelDTOAndILabel } from './models/entity-dtobase-of-label-dtoand-ilabel';
 export { BranchType } from './models/branch-type';
-export { ReadOnlyEntityDTOOfBranchDTOAndIReadOnlyBranch } from './models/read-only-entity-dtoof-branch-dtoand-iread-only-branch';
+export { EntityDTOBaseOfBranchDTOAndIBranch } from './models/entity-dtobase-of-branch-dtoand-ibranch';
 export { EntityDTOContainerOfCurrencyDTO } from './models/entity-dtocontainer-of-currency-dto';
 export { CurrencyDTO } from './models/currency-dto';
-export { EntityDTOOfCurrencyDTOAndICurrency } from './models/entity-dtoof-currency-dtoand-icurrency';
-export { ReadOnlyEntityDTOOfCurrencyDTOAndICurrency } from './models/read-only-entity-dtoof-currency-dtoand-icurrency';
+export { EntityDTOBaseOfCurrencyDTOAndICurrency } from './models/entity-dtobase-of-currency-dtoand-icurrency';
 export { EntityDTOContainerOfCountryDTO } from './models/entity-dtocontainer-of-country-dto';
 export { CountryDTO } from './models/country-dto';
-export { ReadOnlyEntityDTOOfCountryDTOAndIReadOnlyCountry } from './models/read-only-entity-dtoof-country-dtoand-iread-only-country';
+export { EntityDTOBaseOfCountryDTOAndICountry } from './models/entity-dtobase-of-country-dtoand-icountry';
 export { PaymentType } from './models/payment-type';
 export { ShippingTarget } from './models/shipping-target';
 export { CountryTargetDTO } from './models/country-target-dto';
 export { BranchTargetDTO } from './models/branch-target-dto';
-export { EntityDTOOfShopDTOAndIShop } from './models/entity-dtoof-shop-dtoand-ishop';
-export { ReadOnlyEntityDTOOfShopDTOAndIShop } from './models/read-only-entity-dtoof-shop-dtoand-ishop';
+export { EntityDTOBaseOfShopDTOAndIShop } from './models/entity-dtobase-of-shop-dtoand-ishop';
 export { EntityDTOContainerOfDestinationDTO } from './models/entity-dtocontainer-of-destination-dto';
 export { DestinationDTO } from './models/destination-dto';
 export { EntityDTOContainerOfCheckoutDTO } from './models/entity-dtocontainer-of-checkout-dto';
@@ -132,6 +125,8 @@ export { CheckoutDTO } from './models/checkout-dto';
 export { UserAccountDTO } from './models/user-account-dto';
 export { BuyerDTO } from './models/buyer-dto';
 export { BuyerType } from './models/buyer-type';
+export { BuyerStatus } from './models/buyer-status';
+export { AddresseeWithReferenceDTO } from './models/addressee-with-reference-dto';
 export { CommunicationDetailsDTO } from './models/communication-details-dto';
 export { OrganisationDTO } from './models/organisation-dto';
 export { EntityReferenceDTO } from './models/entity-reference-dto';
@@ -143,27 +138,25 @@ export { CheckoutDeliveryDTO } from './models/checkout-delivery-dto';
 export { TermsOfDeliveryDTO } from './models/terms-of-delivery-dto';
 export { EntityDTOContainerOfCheckoutItemDTO } from './models/entity-dtocontainer-of-checkout-item-dto';
 export { CheckoutItemDTO } from './models/checkout-item-dto';
-export { ReadOnlyEntityDTOOfCheckoutItemDTOAndICheckoutItem } from './models/read-only-entity-dtoof-checkout-item-dtoand-icheckout-item';
+export { EntityDTOBaseOfCheckoutItemDTOAndICheckoutItem } from './models/entity-dtobase-of-checkout-item-dtoand-icheckout-item';
 export { DisplayItemDTO } from './models/display-item-dto';
 export { PromotionDTO } from './models/promotion-dto';
-export { ReadOnlyEntityDTOOfCheckoutDeliveryDTOAndICheckoutDelivery } from './models/read-only-entity-dtoof-checkout-delivery-dtoand-icheckout-delivery';
+export { EntityDTOBaseOfCheckoutDeliveryDTOAndICheckoutDelivery } from './models/entity-dtobase-of-checkout-delivery-dtoand-icheckout-delivery';
 export { NotificationChannel } from './models/notification-channel';
 export { SelectionDTOOfShippingTarget } from './models/selection-dtoof-shipping-target';
 export { PaymentDTO } from './models/payment-dto';
 export { SelectionDTOOfPaymentType } from './models/selection-dtoof-payment-type';
 export { EntityDTOContainerOfVoucherDTO } from './models/entity-dtocontainer-of-voucher-dto';
 export { VoucherDTO } from './models/voucher-dto';
-export { ReadOnlyEntityDTOOfVoucherDTOAndIReadOnlyVoucher } from './models/read-only-entity-dtoof-voucher-dtoand-iread-only-voucher';
+export { EntityDTOBaseOfVoucherDTOAndIVoucher } from './models/entity-dtobase-of-voucher-dtoand-ivoucher';
 export { EntityDTOContainerOfCouponDTO } from './models/entity-dtocontainer-of-coupon-dto';
 export { CouponDTO } from './models/coupon-dto';
 export { CouponType } from './models/coupon-type';
-export { ReadOnlyEntityDTOOfCouponDTOAndICoupon } from './models/read-only-entity-dtoof-coupon-dtoand-icoupon';
-export { KeyValueDTOOfStringAndString } from './models/key-value-dtoof-string-and-string';
-export { ReadOnlyEntityDTOOfCheckoutDTOAndICheckout } from './models/read-only-entity-dtoof-checkout-dtoand-icheckout';
+export { EntityDTOBaseOfCouponDTOAndICoupon } from './models/entity-dtobase-of-coupon-dtoand-icoupon';
+export { EntityDTOBaseOfCheckoutDTOAndICheckout } from './models/entity-dtobase-of-checkout-dtoand-icheckout';
 export { ShippingAddressDTO } from './models/shipping-address-dto';
-export { EntityDTOOfDestinationDTOAndIDestination } from './models/entity-dtoof-destination-dtoand-idestination';
-export { ReadOnlyEntityDTOOfDestinationDTOAndIDestination } from './models/read-only-entity-dtoof-destination-dtoand-idestination';
-export { ReadOnlyEntityDTOOfShoppingCartItemDTOAndIShoppingCartItem } from './models/read-only-entity-dtoof-shopping-cart-item-dtoand-ishopping-cart-item';
+export { EntityDTOBaseOfDestinationDTOAndIDestination } from './models/entity-dtobase-of-destination-dtoand-idestination';
+export { EntityDTOBaseOfShoppingCartItemDTOAndIShoppingCartItem } from './models/entity-dtobase-of-shopping-cart-item-dtoand-ishopping-cart-item';
 export { PrintRequestOfString } from './models/print-request-of-string';
 export { PrintRequestOfIEnumerableOfLong } from './models/print-request-of-ienumerable-of-long';
 export { PrintRequestOfIEnumerableOfDisplayOrderDTO } from './models/print-request-of-ienumerable-of-display-order-dto';
@@ -171,19 +164,19 @@ export { DisplayOrderDTO } from './models/display-order-dto';
 export { OrderType } from './models/order-type';
 export { EnvironmentChannel } from './models/environment-channel';
 export { DisplayBranchDTO } from './models/display-branch-dto';
-export { ReadOnlyEntityDTOOfDisplayBranchDTOAndIReadOnlyBranch } from './models/read-only-entity-dtoof-display-branch-dtoand-iread-only-branch';
+export { EntityDTOBaseOfDisplayBranchDTOAndIBranch } from './models/entity-dtobase-of-display-branch-dtoand-ibranch';
 export { DisplayOrderItemDTO } from './models/display-order-item-dto';
 export { DisplayOrderItemSubsetDTO } from './models/display-order-item-subset-dto';
 export { OrderItemProcessingStatusValue } from './models/order-item-processing-status-value';
-export { ReadOnlyEntityDTOOfDisplayOrderItemSubsetDTOAndIOrderItemStatus } from './models/read-only-entity-dtoof-display-order-item-subset-dtoand-iorder-item-status';
-export { ReadOnlyEntityDTOOfDisplayOrderItemDTOAndIOrderItem } from './models/read-only-entity-dtoof-display-order-item-dtoand-iorder-item';
+export { EntityDTOBaseOfDisplayOrderItemSubsetDTOAndIOrderItemStatus } from './models/entity-dtobase-of-display-order-item-subset-dtoand-iorder-item-status';
+export { EntityDTOBaseOfDisplayOrderItemDTOAndIOrderItem } from './models/entity-dtobase-of-display-order-item-dtoand-iorder-item';
 export { DisplayAddresseeDTO } from './models/display-addressee-dto';
 export { DisplayLogisticianDTO } from './models/display-logistician-dto';
-export { ReadOnlyEntityDTOOfDisplayLogisticianDTOAndILogistician } from './models/read-only-entity-dtoof-display-logistician-dtoand-ilogistician';
+export { EntityDTOBaseOfDisplayLogisticianDTOAndILogistician } from './models/entity-dtobase-of-display-logistician-dtoand-ilogistician';
 export { DisplayOrderPaymentDTO } from './models/display-order-payment-dto';
-export { ReadOnlyEntityDTOOfDisplayOrderPaymentDTOAndIReadOnlyPayment } from './models/read-only-entity-dtoof-display-order-payment-dtoand-iread-only-payment';
-export { TermsOfDeliveryDTO2 } from './models/terms-of-delivery-dto2';
-export { ReadOnlyEntityDTOOfDisplayOrderDTOAndIOrder } from './models/read-only-entity-dtoof-display-order-dtoand-iorder';
+export { EntityDTOBaseOfDisplayOrderPaymentDTOAndIReadOnlyPayment } from './models/entity-dtobase-of-display-order-payment-dtoand-iread-only-payment';
+export { LinkedRecordDTO } from './models/linked-record-dto';
+export { EntityDTOBaseOfDisplayOrderDTOAndIOrder } from './models/entity-dtobase-of-display-order-dtoand-iorder';
 export { PrintRequestOfIEnumerableOfPriceQRCodeDTO } from './models/print-request-of-ienumerable-of-price-qrcode-dto';
 export { PriceQRCodeDTO } from './models/price-qrcode-dto';
 export { ResponseArgsOfIEnumerableOfString } from './models/response-args-of-ienumerable-of-string';

generated/swagger/print-api/src/models/address-dto.ts

@@ -1,6 +1,7 @@
 /* tslint:disable */
+import { TouchedBase } from './touched-base';
 import { GeoLocation } from './geo-location';
-export interface AddressDTO {
+export interface AddressDTO extends TouchedBase{
   apartment?: string;
   careOf?: string;
   city?: string;

generated/swagger/print-api/src/models/address.ts

@@ -1,17 +0,0 @@
-/* tslint:disable */
-import { GeoLocation } from './geo-location';
-export interface Address {
-  apartment?: string;
-  careOf?: string;
-  city?: string;
-  country?: string;
-  district?: string;
-  geoLocation?: GeoLocation;
-  info?: string;
-  po?: string;
-  region?: string;
-  state?: string;
-  street?: string;
-  streetNumber?: string;
-  zipCode?: string;
-}

generated/swagger/print-api/src/models/addressee-with-reference-dto.ts

@@ -0,0 +1,16 @@
+/* tslint:disable */
+import { EntityReferenceDTO } from './entity-reference-dto';
+import { AddressDTO } from './address-dto';
+import { CommunicationDetailsDTO } from './communication-details-dto';
+import { Gender } from './gender';
+import { OrganisationDTO } from './organisation-dto';
+export interface AddresseeWithReferenceDTO extends EntityReferenceDTO{
+  address?: AddressDTO;
+  communicationDetails?: CommunicationDetailsDTO;
+  firstName?: string;
+  gender?: Gender;
+  lastName?: string;
+  locale?: string;
+  organisation?: OrganisationDTO;
+  title?: string;
+}

generated/swagger/print-api/src/models/allergene-type.ts

@@ -1,43 +1,2 @@
 /* tslint:disable */
-export type AllergeneType =
-  | 0
-  | 1
-  | 2
-  | 4
-  | 6
-  | 8
-  | 16
-  | 32
-  | 64
-  | 128
-  | 256
-  | 512
-  | 1024
-  | 1536
-  | 2048
-  | 6144
-  | 10240
-  | 18432
-  | 34816
-  | 67584
-  | 133120
-  | 264192
-  | 526336
-  | 1048576
-  | 3145728
-  | 5242880
-  | 9437184
-  | 17825792
-  | 34603008
-  | 68157440
-  | 135266304
-  | 268435456
-  | 805306368
-  | 1342177280
-  | 2415919104
-  | 4563402752
-  | 8858370048
-  | 17448304640
-  | 34628173824
-  | 68987912192
-  | 137438953472;
+export type AllergeneType = 0 | 1 | 2 | 4 | 6 | 8 | 16 | 32 | 64 | 128 | 256 | 512 | 1024 | 1536 | 2048 | 6144 | 10240 | 18432 | 34816 | 67584 | 133120 | 264192 | 526336 | 1048576 | 3145728 | 5242880 | 9437184 | 17825792 | 34603008 | 68157440 | 135266304 | 268435456 | 805306368 | 1342177280 | 2415919104 | 4563402752 | 8858370048 | 17448304640 | 34628173824 | 68987912192 | 137438953472;

generated/swagger/print-api/src/models/availability-dto.ts

@@ -7,6 +7,7 @@ import { AvailabilityType } from './availability-type';
  * Verfügbarkeit
  */
 export interface AvailabilityDTO {
+
   /**
    * Voraussichtliches Lieferdatum
    */

generated/swagger/print-api/src/models/availability-dto2.ts

@@ -1,14 +1,18 @@
 /* tslint:disable */
+import { TouchedBase } from './touched-base';
 import { AvailabilityType } from './availability-type';
+import { DateRangeDTO } from './date-range-dto';
 import { EntityDTOContainerOfLogisticianDTO } from './entity-dtocontainer-of-logistician-dto';
 import { PriceDTO } from './price-dto';
 import { EntityDTOContainerOfShopItemDTO } from './entity-dtocontainer-of-shop-item-dto';
 import { EntityDTOContainerOfSupplierDTO } from './entity-dtocontainer-of-supplier-dto';
-export interface AvailabilityDTO2 {
-  availabilityType: AvailabilityType;
+export interface AvailabilityDTO2 extends TouchedBase{
+  availabilityType?: AvailabilityType;
+  estimatedDelivery?: DateRangeDTO;
   estimatedShippingDate?: string;
   inStock?: number;
   isPrebooked?: boolean;
+  lastRequest?: string;
   logistician?: EntityDTOContainerOfLogisticianDTO;
   price?: PriceDTO;
   requestReference?: string;
@@ -20,4 +24,5 @@ export interface AvailabilityDTO2 {
   supplierProductNumber?: string;
   supplierSSC?: string;
   supplierSSCText?: string;
+  supplyChannel?: string;
 }

generated/swagger/print-api/src/models/availability-type.ts

@@ -1,2 +1,2 @@
 /* tslint:disable */
-export type AvailabilityType = 0 | 1 | 2 | 32 | 256 | 512 | 1024 | 2048 | 4096 | 8192 | 16384;
+export type AvailabilityType = 0 | 1 | 2 | 32 | 256 | 512 | 1024 | 2048 | 4096 | 8192 | 16384;

generated/swagger/print-api/src/models/avoirdupois.ts

@@ -1,2 +1,2 @@
 /* tslint:disable */
-export type Avoirdupois = 0 | 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128 | 256 | 512 | 1024 | 2048 | 4096;
+export type Avoirdupois = 0 | 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128 | 256 | 512 | 1024 | 2048 | 4096;

generated/swagger/print-api/src/models/branch-dto.ts

@@ -1,12 +1,13 @@
 /* tslint:disable */
-import { ReadOnlyEntityDTOOfBranchDTOAndIReadOnlyBranch } from './read-only-entity-dtoof-branch-dtoand-iread-only-branch';
-import { Address } from './address';
+import { EntityDTOBaseOfBranchDTOAndIBranch } from './entity-dtobase-of-branch-dtoand-ibranch';
+import { AddressDTO } from './address-dto';
 import { BranchType } from './branch-type';
 import { EntityDTOContainerOfLabelDTO } from './entity-dtocontainer-of-label-dto';
-export interface BranchDTO extends ReadOnlyEntityDTOOfBranchDTOAndIReadOnlyBranch {
-  address?: Address;
+import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto';
+export interface BranchDTO extends EntityDTOBaseOfBranchDTOAndIBranch{
+  address?: AddressDTO;
   branchNumber?: string;
-  branchType: BranchType;
+  branchType?: BranchType;
   isDefault?: string;
   isOnline?: boolean;
   isOrderingEnabled?: boolean;
@@ -14,6 +15,6 @@ export interface BranchDTO extends ReadOnlyEntityDTOOfBranchDTOAndIReadOnlyBranc
   key?: string;
   label?: EntityDTOContainerOfLabelDTO;
   name?: string;
-  parent?: number;
+  parent?: EntityDTOContainerOfBranchDTO;
   shortName?: string;
 }

generated/swagger/print-api/src/models/branch-target-dto.ts

@@ -1,6 +1,7 @@
 /* tslint:disable */
+import { TouchedBase } from './touched-base';
 import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto';
-export interface BranchTargetDTO {
+export interface BranchTargetDTO extends TouchedBase{
   isDefault?: string;
   start?: string;
   stop?: string;

generated/swagger/print-api/src/models/branch-type.ts

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

generated/swagger/print-api/src/models/buyer-dto.ts

@@ -1,21 +1,11 @@
 /* tslint:disable */
-import { EntityReferenceDTO } from './entity-reference-dto';
-import { AddressDTO } from './address-dto';
+import { AddresseeWithReferenceDTO } from './addressee-with-reference-dto';
+import { BuyerStatus } from './buyer-status';
 import { BuyerType } from './buyer-type';
-import { CommunicationDetailsDTO } from './communication-details-dto';
-import { Gender } from './gender';
-import { OrganisationDTO } from './organisation-dto';
-export interface BuyerDTO extends EntityReferenceDTO {
-  address?: AddressDTO;
+export interface BuyerDTO extends AddresseeWithReferenceDTO{
   buyerNumber?: string;
-  buyerType: BuyerType;
-  communicationDetails?: CommunicationDetailsDTO;
+  buyerStatus?: BuyerStatus;
+  buyerType?: BuyerType;
   dateOfBirth?: string;
-  firstName?: string;
-  gender: Gender;
   isTemporaryAccount?: boolean;
-  lastName?: string;
-  locale?: string;
-  organisation?: OrganisationDTO;
-  title?: string;
 }

generated/swagger/print-api/src/models/buyer-status.ts

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

generated/swagger/print-api/src/models/buyer-type.ts

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

generated/swagger/print-api/src/models/category-dto.ts

@@ -1,8 +1,8 @@
 /* tslint:disable */
-import { EntityDTOOfCategoryDTOAndICategory } from './entity-dtoof-category-dtoand-icategory';
+import { EntityDTOBase } from './entity-dtobase';
 import { EntityDTOContainerOfCategoryDTO } from './entity-dtocontainer-of-category-dto';
 import { EntityDTOContainerOfTenantDTO } from './entity-dtocontainer-of-tenant-dto';
-export interface CategoryDTO extends EntityDTOOfCategoryDTOAndICategory {
+export interface CategoryDTO extends EntityDTOBase{
   key?: string;
   name?: string;
   parent?: EntityDTOContainerOfCategoryDTO;

generated/swagger/print-api/src/models/checkout-delivery-dto.ts

@@ -1,12 +1,12 @@
 /* tslint:disable */
-import { ReadOnlyEntityDTOOfCheckoutDeliveryDTOAndICheckoutDelivery } from './read-only-entity-dtoof-checkout-delivery-dtoand-icheckout-delivery';
+import { EntityDTOBaseOfCheckoutDeliveryDTOAndICheckoutDelivery } from './entity-dtobase-of-checkout-delivery-dtoand-icheckout-delivery';
 import { EntityDTOContainerOfCheckoutDTO } from './entity-dtocontainer-of-checkout-dto';
 import { EntityDTOContainerOfDestinationDTO } from './entity-dtocontainer-of-destination-dto';
 import { PriceValueDTO } from './price-value-dto';
 import { DisplayItemDTO } from './display-item-dto';
 import { EntityDTOContainerOfCheckoutItemDTO } from './entity-dtocontainer-of-checkout-item-dto';
 import { TermsOfDeliveryDTO } from './terms-of-delivery-dto';
-export interface CheckoutDeliveryDTO extends ReadOnlyEntityDTOOfCheckoutDeliveryDTOAndICheckoutDelivery {
+export interface CheckoutDeliveryDTO extends EntityDTOBaseOfCheckoutDeliveryDTOAndICheckoutDelivery{
   checkout?: EntityDTOContainerOfCheckoutDTO;
   destination?: EntityDTOContainerOfDestinationDTO;
   discount?: PriceValueDTO;

generated/swagger/print-api/src/models/checkout-dto.ts

@@ -1,5 +1,5 @@
 /* tslint:disable */
-import { ReadOnlyEntityDTOOfCheckoutDTOAndICheckout } from './read-only-entity-dtoof-checkout-dtoand-icheckout';
+import { EntityDTOBaseOfCheckoutDTOAndICheckout } from './entity-dtobase-of-checkout-dtoand-icheckout';
 import { KeyValueDTOOfStringAndString } from './key-value-dtoof-string-and-string';
 import { SelectionDTOOfShippingTarget } from './selection-dtoof-shipping-target';
 import { BuyerDTO } from './buyer-dto';
@@ -11,7 +11,7 @@ import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-d
 import { PayerDTO } from './payer-dto';
 import { PaymentDTO } from './payment-dto';
 import { UserAccountDTO } from './user-account-dto';
-export interface CheckoutDTO extends ReadOnlyEntityDTOOfCheckoutDTOAndICheckout {
+export interface CheckoutDTO extends EntityDTOBaseOfCheckoutDTOAndICheckout{
   agreements?: Array<KeyValueDTOOfStringAndString>;
   availableShippingTargets?: Array<SelectionDTOOfShippingTarget>;
   buyer?: BuyerDTO;
@@ -20,7 +20,7 @@ export interface CheckoutDTO extends ReadOnlyEntityDTOOfCheckoutDTOAndICheckout
   destinations?: Array<EntityDTOContainerOfDestinationDTO>;
   items?: Array<EntityDTOContainerOfCheckoutItemDTO>;
   label?: string;
-  notificationChannels: NotificationChannel;
+  notificationChannels?: NotificationChannel;
   orderBranch?: EntityDTOContainerOfBranchDTO;
   payer?: PayerDTO;
   payment?: PaymentDTO;

generated/swagger/print-api/src/models/checkout-item-dto.ts

@@ -1,10 +1,10 @@
 /* tslint:disable */
-import { ReadOnlyEntityDTOOfCheckoutItemDTOAndICheckoutItem } from './read-only-entity-dtoof-checkout-item-dtoand-icheckout-item';
+import { EntityDTOBaseOfCheckoutItemDTOAndICheckoutItem } from './entity-dtobase-of-checkout-item-dtoand-icheckout-item';
 import { EntityDTOContainerOfShoppingCartItemDTO } from './entity-dtocontainer-of-shopping-cart-item-dto';
 import { EntityDTOContainerOfCheckoutDTO } from './entity-dtocontainer-of-checkout-dto';
 import { EntityDTOContainerOfCheckoutDeliveryDTO } from './entity-dtocontainer-of-checkout-delivery-dto';
 import { PriceValueDTO } from './price-value-dto';
-export interface CheckoutItemDTO extends ReadOnlyEntityDTOOfCheckoutItemDTOAndICheckoutItem {
+export interface CheckoutItemDTO extends EntityDTOBaseOfCheckoutItemDTOAndICheckoutItem{
   accessories?: Array<EntityDTOContainerOfShoppingCartItemDTO>;
   checkout?: EntityDTOContainerOfCheckoutDTO;
   delivery?: EntityDTOContainerOfCheckoutDeliveryDTO;

generated/swagger/print-api/src/models/communication-details-dto.ts

@@ -1,5 +1,6 @@
 /* tslint:disable */
-export interface CommunicationDetailsDTO {
+import { TouchedBase } from './touched-base';
+export interface CommunicationDetailsDTO extends TouchedBase{
   email?: string;
   fax?: string;
   mobile?: string;

generated/swagger/print-api/src/models/company-dto.ts

@@ -1,9 +1,10 @@
 /* tslint:disable */
-import { EntityDTOOfCompanyDTOAndICompany } from './entity-dtoof-company-dtoand-icompany';
+import { EntityDTOBaseOfCompanyDTOAndICompany } from './entity-dtobase-of-company-dtoand-icompany';
 import { AddressDTO } from './address-dto';
 import { EntityDTOContainerOfCompanyDTO } from './entity-dtocontainer-of-company-dto';
-export interface CompanyDTO extends EntityDTOOfCompanyDTOAndICompany {
+export interface CompanyDTO extends EntityDTOBaseOfCompanyDTOAndICompany{
   address?: AddressDTO;
+  companyNumber?: string;
   costUnit?: string;
   department?: string;
   gln?: string;

generated/swagger/print-api/src/models/component-item-display-type.ts

@@ -1,2 +1,2 @@
 /* tslint:disable */
-export type ComponentItemDisplayType = 0 | 1 | 2;
+export type ComponentItemDisplayType = 0 | 1 | 2;

generated/swagger/print-api/src/models/component-item-dto.ts

@@ -1,16 +1,18 @@
 /* tslint:disable */
+import { TouchedBase } from './touched-base';
 import { EntityDTOContainerOfCategoryDTO } from './entity-dtocontainer-of-category-dto';
 import { ComponentItemDisplayType } from './component-item-display-type';
 import { EntityDTOContainerOfItemDTO } from './entity-dtocontainer-of-item-dto';
 import { QuantityUnitType } from './quantity-unit-type';
-export interface ComponentItemDTO {
+export interface ComponentItemDTO extends TouchedBase{
   category?: EntityDTOContainerOfCategoryDTO;
   description?: string;
-  displayType: ComponentItemDisplayType;
+  displayType?: ComponentItemDisplayType;
   item?: EntityDTOContainerOfItemDTO;
   name?: string;
   quantityMax?: number;
-  quantityUnitType: QuantityUnitType;
+  quantityMin?: number;
+  quantityUnitType?: QuantityUnitType;
   required?: boolean;
   start?: string;
   stop?: string;

generated/swagger/print-api/src/models/components-dto.ts

@@ -1,14 +1,14 @@
 /* tslint:disable */
-import { EntityDTOOfComponentsDTOAndIComponents } from './entity-dtoof-components-dtoand-icomponents';
+import { EntityDTOBaseOfComponentsDTOAndIComponents } from './entity-dtobase-of-components-dtoand-icomponents';
 import { ComponentItemDTO } from './component-item-dto';
 import { QuantityUnitType } from './quantity-unit-type';
 import { SetType } from './set-type';
-export interface ComponentsDTO extends EntityDTOOfComponentsDTOAndIComponents {
+export interface ComponentsDTO extends EntityDTOBaseOfComponentsDTOAndIComponents{
   items?: Array<ComponentItemDTO>;
   overallQuantityMax?: number;
   overallQuantityMin?: number;
-  quantityUnitType: QuantityUnitType;
+  quantityUnitType?: QuantityUnitType;
   referenceQuantity?: number;
-  type: SetType;
+  type?: SetType;
   unit?: string;
 }

generated/swagger/print-api/src/models/contributor-dto.ts

@@ -1,9 +1,9 @@
 /* tslint:disable */
-import { EntityDTOOfContributorDTOAndIContributor } from './entity-dtoof-contributor-dtoand-icontributor';
+import { EntityDTOBaseOfContributorDTOAndIContributor } from './entity-dtobase-of-contributor-dtoand-icontributor';
 import { OrganisationNamesDTO } from './organisation-names-dto';
 import { PersonNamesDTO } from './person-names-dto';
 import { EntityDTOContainerOfTenantDTO } from './entity-dtocontainer-of-tenant-dto';
-export interface ContributorDTO extends EntityDTOOfContributorDTOAndIContributor {
+export interface ContributorDTO extends EntityDTOBaseOfContributorDTOAndIContributor{
   friendlyName?: string;
   organisation?: OrganisationNamesDTO;
   person?: PersonNamesDTO;

generated/swagger/print-api/src/models/contributor-helper-dto.ts

@@ -1,6 +1,7 @@
 /* tslint:disable */
+import { TouchedBase } from './touched-base';
 import { EntityDTOContainerOfContributorDTO } from './entity-dtocontainer-of-contributor-dto';
-export interface ContributorHelperDTO {
+export interface ContributorHelperDTO extends TouchedBase{
   contributor?: EntityDTOContainerOfContributorDTO;
   type?: string;
 }

generated/swagger/print-api/src/models/country-dto.ts

@@ -1,6 +1,6 @@
 /* tslint:disable */
-import { ReadOnlyEntityDTOOfCountryDTOAndIReadOnlyCountry } from './read-only-entity-dtoof-country-dtoand-iread-only-country';
-export interface CountryDTO extends ReadOnlyEntityDTOOfCountryDTOAndIReadOnlyCountry {
+import { EntityDTOBaseOfCountryDTOAndICountry } from './entity-dtobase-of-country-dtoand-icountry';
+export interface CountryDTO extends EntityDTOBaseOfCountryDTOAndICountry{
   isDefault?: string;
   isO3166_A_3?: string;
   name?: string;

generated/swagger/print-api/src/models/country-target-dto.ts

@@ -1,6 +1,7 @@
 /* tslint:disable */
+import { TouchedBase } from './touched-base';
 import { EntityDTOContainerOfCountryDTO } from './entity-dtocontainer-of-country-dto';
-export interface CountryTargetDTO {
+export interface CountryTargetDTO extends TouchedBase{
   isDefault?: string;
   start?: string;
   stop?: string;

generated/swagger/print-api/src/models/coupon-dto.ts

@@ -1,8 +1,8 @@
 /* tslint:disable */
-import { ReadOnlyEntityDTOOfCouponDTOAndICoupon } from './read-only-entity-dtoof-coupon-dtoand-icoupon';
+import { EntityDTOBaseOfCouponDTOAndICoupon } from './entity-dtobase-of-coupon-dtoand-icoupon';
 import { CouponType } from './coupon-type';
 import { PriceValueDTO } from './price-value-dto';
-export interface CouponDTO extends ReadOnlyEntityDTOOfCouponDTOAndICoupon {
+export interface CouponDTO extends EntityDTOBaseOfCouponDTOAndICoupon{
   code?: string;
   couponType: CouponType;
   discount?: number;

generated/swagger/print-api/src/models/coupon-type.ts

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

generated/swagger/print-api/src/models/cruda.ts

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

generated/swagger/print-api/src/models/currency-dto.ts

@@ -1,6 +1,6 @@
 /* tslint:disable */
-import { EntityDTOOfCurrencyDTOAndICurrency } from './entity-dtoof-currency-dtoand-icurrency';
-export interface CurrencyDTO extends EntityDTOOfCurrencyDTOAndICurrency {
+import { EntityDTOBaseOfCurrencyDTOAndICurrency } from './entity-dtobase-of-currency-dtoand-icurrency';
+export interface CurrencyDTO extends EntityDTOBaseOfCurrencyDTOAndICurrency{
   isO4217?: string;
   name?: string;
   number?: number;

generated/swagger/print-api/src/models/date-range-dto.ts

@@ -0,0 +1,6 @@
+/* tslint:disable */
+import { TouchedBase } from './touched-base';
+export interface DateRangeDTO extends TouchedBase{
+  start?: string;
+  stop?: string;
+}

generated/swagger/print-api/src/models/declarable-food-additives.ts

@@ -1,20 +1,2 @@
 /* tslint:disable */
-export type DeclarableFoodAdditives =
-  | 0
-  | 1
-  | 2
-  | 4
-  | 8
-  | 16
-  | 32
-  | 64
-  | 128
-  | 256
-  | 512
-  | 1024
-  | 2048
-  | 4096
-  | 8192
-  | 16384
-  | 32768
-  | 65536;
+export type DeclarableFoodAdditives = 0 | 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128 | 256 | 512 | 1024 | 2048 | 4096 | 8192 | 16384 | 32768 | 65536;

generated/swagger/print-api/src/models/destination-dto.ts

@@ -1,11 +1,11 @@
 /* tslint:disable */
-import { EntityDTOOfDestinationDTOAndIDestination } from './entity-dtoof-destination-dtoand-idestination';
+import { EntityDTOBaseOfDestinationDTOAndIDestination } from './entity-dtobase-of-destination-dtoand-idestination';
 import { EntityDTOContainerOfCheckoutDTO } from './entity-dtocontainer-of-checkout-dto';
 import { EntityDTOContainerOfLogisticianDTO } from './entity-dtocontainer-of-logistician-dto';
 import { ShippingAddressDTO } from './shipping-address-dto';
 import { ShippingTarget } from './shipping-target';
 import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto';
-export interface DestinationDTO extends EntityDTOOfDestinationDTOAndIDestination {
+export interface DestinationDTO extends EntityDTOBaseOfDestinationDTOAndIDestination{
   checkout?: EntityDTOContainerOfCheckoutDTO;
   logistician?: EntityDTOContainerOfLogisticianDTO;
   shippingAddress?: ShippingAddressDTO;

generated/swagger/print-api/src/models/dialog-content-type.ts

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

generated/swagger/print-api/src/models/dialog-of-string.ts

@@ -0,0 +1,16 @@
+/* tslint:disable */
+import { KeyValueDTOOfStringAndString } from './key-value-dtoof-string-and-string';
+import { DialogContentType } from './dialog-content-type';
+import { DialogSettings } from './dialog-settings';
+export interface DialogOfString {
+  actions?: Array<KeyValueDTOOfStringAndString>;
+  actionsRequired?: number;
+  area?: string;
+  content?: string;
+  contentType: DialogContentType;
+  description?: string;
+  displayTimeout?: number;
+  settings: DialogSettings;
+  subtitle?: string;
+  title?: string;
+}

generated/swagger/print-api/src/models/dialog-settings.ts

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

generated/swagger/print-api/src/models/display-branch-dto.ts

@@ -1,8 +1,8 @@
 /* tslint:disable */
-import { ReadOnlyEntityDTOOfDisplayBranchDTOAndIReadOnlyBranch } from './read-only-entity-dtoof-display-branch-dtoand-iread-only-branch';
+import { EntityDTOBaseOfDisplayBranchDTOAndIBranch } from './entity-dtobase-of-display-branch-dtoand-ibranch';
 import { AddressDTO } from './address-dto';
 import { CommunicationDetailsDTO } from './communication-details-dto';
-export interface DisplayBranchDTO extends ReadOnlyEntityDTOOfDisplayBranchDTOAndIReadOnlyBranch {
+export interface DisplayBranchDTO extends EntityDTOBaseOfDisplayBranchDTOAndIBranch{
   address?: AddressDTO;
   branchNumber?: string;
   communicationDetails?: CommunicationDetailsDTO;

generated/swagger/print-api/src/models/display-logistician-dto.ts

@@ -1,6 +1,6 @@
 /* tslint:disable */
-import { ReadOnlyEntityDTOOfDisplayLogisticianDTOAndILogistician } from './read-only-entity-dtoof-display-logistician-dtoand-ilogistician';
-export interface DisplayLogisticianDTO extends ReadOnlyEntityDTOOfDisplayLogisticianDTOAndILogistician {
+import { EntityDTOBaseOfDisplayLogisticianDTOAndILogistician } from './entity-dtobase-of-display-logistician-dtoand-ilogistician';
+export interface DisplayLogisticianDTO extends EntityDTOBaseOfDisplayLogisticianDTOAndILogistician{
   gln?: string;
   logisticianNumber?: string;
   name?: string;

generated/swagger/print-api/src/models/display-order-dto.ts

@@ -1,16 +1,19 @@
 /* tslint:disable */
-import { ReadOnlyEntityDTOOfDisplayOrderDTOAndIOrder } from './read-only-entity-dtoof-display-order-dtoand-iorder';
+import { EntityDTOBaseOfDisplayOrderDTOAndIOrder } from './entity-dtobase-of-display-order-dtoand-iorder';
+import { KeyValueDTOOfStringAndString } from './key-value-dtoof-string-and-string';
 import { DisplayAddresseeDTO } from './display-addressee-dto';
 import { BuyerType } from './buyer-type';
 import { EnvironmentChannel } from './environment-channel';
 import { DisplayOrderItemDTO } from './display-order-item-dto';
+import { LinkedRecordDTO } from './linked-record-dto';
 import { DisplayLogisticianDTO } from './display-logistician-dto';
 import { NotificationChannel } from './notification-channel';
 import { DisplayBranchDTO } from './display-branch-dto';
 import { OrderType } from './order-type';
 import { DisplayOrderPaymentDTO } from './display-order-payment-dto';
-import { TermsOfDeliveryDTO2 } from './terms-of-delivery-dto2';
-export interface DisplayOrderDTO extends ReadOnlyEntityDTOOfDisplayOrderDTOAndIOrder {
+import { TermsOfDeliveryDTO } from './terms-of-delivery-dto';
+export interface DisplayOrderDTO extends EntityDTOBaseOfDisplayOrderDTOAndIOrder{
+  actions?: Array<KeyValueDTOOfStringAndString>;
   buyer?: DisplayAddresseeDTO;
   buyerComment?: string;
   buyerIsGuestAccount?: boolean;
@@ -18,9 +21,10 @@ export interface DisplayOrderDTO extends ReadOnlyEntityDTOOfDisplayOrderDTOAndIO
   buyerType?: BuyerType;
   clientChannel?: EnvironmentChannel;
   completedDate?: string;
-  features?: { [key: string]: string };
+  features?: {[key: string]: string};
   items?: Array<DisplayOrderItemDTO>;
   itemsCount?: number;
+  linkedRecords?: Array<LinkedRecordDTO>;
   logistician?: DisplayLogisticianDTO;
   notificationChannels?: NotificationChannel;
   orderBranch?: DisplayBranchDTO;
@@ -35,5 +39,5 @@ export interface DisplayOrderDTO extends ReadOnlyEntityDTOOfDisplayOrderDTOAndIO
   payment?: DisplayOrderPaymentDTO;
   shippingAddress?: DisplayAddresseeDTO;
   targetBranch?: DisplayBranchDTO;
-  termsOfDelivery?: TermsOfDeliveryDTO2;
+  termsOfDelivery?: TermsOfDeliveryDTO;
 }

generated/swagger/print-api/src/models/display-order-item-dto.ts

@@ -1,15 +1,15 @@
 /* tslint:disable */
-import { ReadOnlyEntityDTOOfDisplayOrderItemDTOAndIOrderItem } from './read-only-entity-dtoof-display-order-item-dtoand-iorder-item';
+import { EntityDTOBaseOfDisplayOrderItemDTOAndIOrderItem } from './entity-dtobase-of-display-order-item-dtoand-iorder-item';
 import { DisplayOrderDTO } from './display-order-dto';
 import { PriceDTO } from './price-dto';
 import { ProductDTO } from './product-dto';
 import { PromotionDTO } from './promotion-dto';
 import { QuantityUnitType } from './quantity-unit-type';
 import { DisplayOrderItemSubsetDTO } from './display-order-item-subset-dto';
-export interface DisplayOrderItemDTO extends ReadOnlyEntityDTOOfDisplayOrderItemDTOAndIOrderItem {
+export interface DisplayOrderItemDTO extends EntityDTOBaseOfDisplayOrderItemDTOAndIOrderItem{
   buyerComment?: string;
   description?: string;
-  features?: { [key: string]: string };
+  features?: {[key: string]: string};
   order?: DisplayOrderDTO;
   orderDate?: string;
   orderItemNumber?: string;

generated/swagger/print-api/src/models/display-order-item-subset-dto.ts

@@ -1,16 +1,19 @@
 /* tslint:disable */
-import { ReadOnlyEntityDTOOfDisplayOrderItemSubsetDTOAndIOrderItemStatus } from './read-only-entity-dtoof-display-order-item-subset-dtoand-iorder-item-status';
+import { EntityDTOBaseOfDisplayOrderItemSubsetDTOAndIOrderItemStatus } from './entity-dtobase-of-display-order-item-subset-dtoand-iorder-item-status';
+import { DateRangeDTO } from './date-range-dto';
 import { DisplayOrderItemDTO } from './display-order-item-dto';
 import { OrderItemProcessingStatusValue } from './order-item-processing-status-value';
-export interface DisplayOrderItemSubsetDTO extends ReadOnlyEntityDTOOfDisplayOrderItemSubsetDTOAndIOrderItemStatus {
+export interface DisplayOrderItemSubsetDTO extends EntityDTOBaseOfDisplayOrderItemSubsetDTOAndIOrderItemStatus{
   compartmentCode?: string;
   compartmentInfo?: string;
   compartmentStart?: string;
   compartmentStop?: string;
   description?: string;
+  estimatedDelivery?: DateRangeDTO;
   estimatedShippingDate?: string;
   orderItem?: DisplayOrderItemDTO;
   orderItemSubsetNumber?: string;
+  preferredPickUpDate?: string;
   processingStatus: OrderItemProcessingStatusValue;
   processingStatusDate?: string;
   quantity?: number;
@@ -19,5 +22,6 @@ export interface DisplayOrderItemSubsetDTO extends ReadOnlyEntityDTOOfDisplayOrd
   sscText?: string;
   supplierLabel?: string;
   supplierName?: string;
+  supplyChannel?: string;
   trackingNumber?: string;
 }

generated/swagger/print-api/src/models/display-order-payment-dto.ts

@@ -1,7 +1,7 @@
 /* tslint:disable */
-import { ReadOnlyEntityDTOOfDisplayOrderPaymentDTOAndIReadOnlyPayment } from './read-only-entity-dtoof-display-order-payment-dtoand-iread-only-payment';
+import { EntityDTOBaseOfDisplayOrderPaymentDTOAndIReadOnlyPayment } from './entity-dtobase-of-display-order-payment-dtoand-iread-only-payment';
 import { PaymentType } from './payment-type';
-export interface DisplayOrderPaymentDTO extends ReadOnlyEntityDTOOfDisplayOrderPaymentDTOAndIReadOnlyPayment {
+export interface DisplayOrderPaymentDTO extends EntityDTOBaseOfDisplayOrderPaymentDTOAndIReadOnlyPayment{
   cancelled?: string;
   completed?: string;
   currency?: string;

generated/swagger/print-api/src/models/entity-dto.ts

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

generated/swagger/print-api/src/models/entity-dtobase-of-branch-dtoand-ibranch.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfBranchDTOAndIBranch extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-checkout-delivery-dtoand-icheckout-delivery.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfCheckoutDeliveryDTOAndICheckoutDelivery extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-checkout-dtoand-icheckout.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfCheckoutDTOAndICheckout extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-checkout-item-dtoand-icheckout-item.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfCheckoutItemDTOAndICheckoutItem extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-company-dtoand-icompany.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfCompanyDTOAndICompany extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-components-dtoand-icomponents.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfComponentsDTOAndIComponents extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-contributor-dtoand-icontributor.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfContributorDTOAndIContributor extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-country-dtoand-icountry.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfCountryDTOAndICountry extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-coupon-dtoand-icoupon.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfCouponDTOAndICoupon extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-currency-dtoand-icurrency.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfCurrencyDTOAndICurrency extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-destination-dtoand-idestination.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfDestinationDTOAndIDestination extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-display-branch-dtoand-ibranch.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfDisplayBranchDTOAndIBranch extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-display-logistician-dtoand-ilogistician.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfDisplayLogisticianDTOAndILogistician extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-display-order-dtoand-iorder.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfDisplayOrderDTOAndIOrder extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-display-order-item-dtoand-iorder-item.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfDisplayOrderItemDTOAndIOrderItem extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-display-order-item-subset-dtoand-iorder-item-status.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfDisplayOrderItemSubsetDTOAndIOrderItemStatus extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-display-order-payment-dtoand-iread-only-payment.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfDisplayOrderPaymentDTOAndIReadOnlyPayment extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-file-dtoand-ifile.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfFileDTOAndIFile extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-item-dtoand-iitem.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfItemDTOAndIItem extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-label-dtoand-ilabel.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfLabelDTOAndILabel extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-logistician-dtoand-ilogistician.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfLogisticianDTOAndILogistician extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-shop-dtoand-ishop.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfShopDTOAndIShop extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-shop-item-dtoand-ishop-item.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfShopItemDTOAndIShopItem extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-shopping-cart-item-dtoand-ishopping-cart-item.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfShoppingCartItemDTOAndIShoppingCartItem extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-supplier-dtoand-isupplier.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfSupplierDTOAndISupplier extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-tenant-dtoand-itenant.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfTenantDTOAndITenant extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-text-dtoand-itext.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfTextDTOAndIText extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase-of-voucher-dtoand-ivoucher.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTOBase } from './entity-dtobase';
+export interface EntityDTOBaseOfVoucherDTOAndIVoucher extends EntityDTOBase{
+}

generated/swagger/print-api/src/models/entity-dtobase.ts

@@ -0,0 +1,4 @@
+/* tslint:disable */
+import { EntityDTO } from './entity-dto';
+export interface EntityDTOBase extends EntityDTO{
+}

generated/swagger/print-api/src/models/entity-dtocontainer-of-branch-dto.ts

@@ -1,6 +1,6 @@
 /* tslint:disable */
 import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
 import { BranchDTO } from './branch-dto';
-export interface EntityDTOContainerOfBranchDTO extends EntityDTOReferenceContainer {
+export interface EntityDTOContainerOfBranchDTO extends EntityDTOReferenceContainer{
   data?: BranchDTO;
 }

generated/swagger/print-api/src/models/entity-dtocontainer-of-category-dto.ts

@@ -1,6 +1,6 @@
 /* tslint:disable */
 import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
 import { CategoryDTO } from './category-dto';
-export interface EntityDTOContainerOfCategoryDTO extends EntityDTOReferenceContainer {
+export interface EntityDTOContainerOfCategoryDTO extends EntityDTOReferenceContainer{
   data?: CategoryDTO;
 }

generated/swagger/print-api/src/models/entity-dtocontainer-of-checkout-delivery-dto.ts

@@ -1,6 +1,6 @@
 /* tslint:disable */
 import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
 import { CheckoutDeliveryDTO } from './checkout-delivery-dto';
-export interface EntityDTOContainerOfCheckoutDeliveryDTO extends EntityDTOReferenceContainer {
+export interface EntityDTOContainerOfCheckoutDeliveryDTO extends EntityDTOReferenceContainer{
   data?: CheckoutDeliveryDTO;
 }

generated/swagger/print-api/src/models/entity-dtocontainer-of-checkout-dto.ts

@@ -1,6 +1,6 @@
 /* tslint:disable */
 import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
 import { CheckoutDTO } from './checkout-dto';
-export interface EntityDTOContainerOfCheckoutDTO extends EntityDTOReferenceContainer {
+export interface EntityDTOContainerOfCheckoutDTO extends EntityDTOReferenceContainer{
   data?: CheckoutDTO;
 }

generated/swagger/print-api/src/models/entity-dtocontainer-of-checkout-item-dto.ts

@@ -1,6 +1,6 @@
 /* tslint:disable */
 import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
 import { CheckoutItemDTO } from './checkout-item-dto';
-export interface EntityDTOContainerOfCheckoutItemDTO extends EntityDTOReferenceContainer {
+export interface EntityDTOContainerOfCheckoutItemDTO extends EntityDTOReferenceContainer{
   data?: CheckoutItemDTO;
 }

generated/swagger/print-api/src/models/entity-dtocontainer-of-company-dto.ts

@@ -1,6 +1,6 @@
 /* tslint:disable */
 import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
 import { CompanyDTO } from './company-dto';
-export interface EntityDTOContainerOfCompanyDTO extends EntityDTOReferenceContainer {
+export interface EntityDTOContainerOfCompanyDTO extends EntityDTOReferenceContainer{
   data?: CompanyDTO;
 }

generated/swagger/print-api/src/models/entity-dtocontainer-of-components-dto.ts

@@ -1,6 +1,6 @@
 /* tslint:disable */
 import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
 import { ComponentsDTO } from './components-dto';
-export interface EntityDTOContainerOfComponentsDTO extends EntityDTOReferenceContainer {
+export interface EntityDTOContainerOfComponentsDTO extends EntityDTOReferenceContainer{
   data?: ComponentsDTO;
 }

generated/swagger/print-api/src/models/entity-dtocontainer-of-contributor-dto.ts

@@ -1,6 +1,6 @@
 /* tslint:disable */
 import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
 import { ContributorDTO } from './contributor-dto';
-export interface EntityDTOContainerOfContributorDTO extends EntityDTOReferenceContainer {
+export interface EntityDTOContainerOfContributorDTO extends EntityDTOReferenceContainer{
   data?: ContributorDTO;
 }

generated/swagger/print-api/src/models/entity-dtocontainer-of-country-dto.ts

@@ -1,6 +1,6 @@
 /* tslint:disable */
 import { EntityDTOReferenceContainer } from './entity-dtoreference-container';
 import { CountryDTO } from './country-dto';
-export interface EntityDTOContainerOfCountryDTO extends EntityDTOReferenceContainer {
+export interface EntityDTOContainerOfCountryDTO extends EntityDTOReferenceContainer{
   data?: CountryDTO;
 }