Merge tag '1.1' into develop

apps/sales/src/app/components/menu/menu.component.html

@@ -57,7 +57,8 @@
         <span class="menu-item">Kundensuche</span>
       </ng-template>
     </div>
-    <div class="menu-item-grid align-center active" (click)="routeToMenu('/shelf/search', 'shelfsearch')">
+    <div class="menu-item-grid align-center">
+      <!-- <div class="menu-item-grid align-center active" (click)="routeToMenu('/shelf/search', 'shelfsearch')"> -->
       <!-- <div class="menu-item-grid align-center"> -->
       <div>
         <lib-icon
@@ -65,7 +66,7 @@
           name="{{
             router.url === '/shelf/search' || router.url.startsWith('/shelf/results') || router.url.startsWith('/shelf/details')
               ? 'Icon_Abholfach'
-              : 'Icon_Abholfach_inactive'
+              : 'Icon_Abholfach_B_disabled'
           }}"
           width="34px"
           height="24px"
@@ -76,11 +77,11 @@
           router.url === '/shelf/search' || router.url.startsWith('/shelf/results') || router.url.startsWith('/shelf/details');
           else shelfSearchLabelElse
         "
-        class="menu-item selected"
+        class="menu-item disbaled"
         >Warenausgabe</span
       >
       <ng-template #shelfSearchLabelElse>
-        <span class="menu-item">Warenausgabe</span>
+        <span class="menu-item disbaled">Warenausgabe</span>
       </ng-template>
     </div>
   </div>

apps/sales/src/app/components/menu/menu.component.scss

@@ -71,6 +71,10 @@
 .active {
   cursor: pointer;
 }
+
+.disbaled {
+  color: #edeff0;
+}
 /* 
   ##Device = Big Desktops
 */

apps/sales/src/app/modules/shelf/components/order-item-details/order-item-details.component.html

@@ -105,9 +105,7 @@
         </div>
         <div class="detail">
           <div class="name">MwSt</div>
-          <div class="value">
-            {{ orderItemListItem['vatType'] | vatType }}
-          </div>
+          <div class="value">{{ orderItemListItem?.retailPrice?.vat?.inPercent }} %</div>
         </div>
         <div class="detail">
           <div class="name">Zahlungsweg</div>

apps/swagger/oms/src/lib/models.ts

@@ -8,6 +8,9 @@ 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 { PriceDTO } from './models/price-dto';
+export { PriceValueDTO } from './models/price-value-dto';
+export { VATValueDTO } from './models/vatvalue-dto';
 export { VATType } from './models/vattype';
 export { Gender } from './models/gender';
 export { PaymentType } from './models/payment-type';
@@ -41,9 +44,6 @@ export { DisplayOrderItemSubsetDTO } from './models/display-order-item-subset-dt
 export { EntityDTOOfDisplayOrderItemSubsetDTOAndIOrderItemStatus } from './models/entity-dtoof-display-order-item-subset-dtoand-iorder-item-status';
 export { ReadOnlyEntityDTOOfDisplayOrderItemSubsetDTOAndIOrderItemStatus } from './models/read-only-entity-dtoof-display-order-item-subset-dtoand-iorder-item-status';
 export { QuantityUnitType } from './models/quantity-unit-type';
-export { PriceDTO } from './models/price-dto';
-export { PriceValueDTO } from './models/price-value-dto';
-export { VATValueDTO } from './models/vatvalue-dto';
 export { PromotionDTO } from './models/promotion-dto';
 export { EntityDTOOfDisplayOrderItemDTOAndIOrderItem } from './models/entity-dtoof-display-order-item-dtoand-iorder-item';
 export { ReadOnlyEntityDTOOfDisplayOrderItemDTOAndIOrderItem } from './models/read-only-entity-dtoof-display-order-item-dtoand-iorder-item';

apps/swagger/oms/src/lib/models/address-dto.ts

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

apps/swagger/oms/src/lib/models/address.ts

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

apps/swagger/oms/src/lib/models/availability-dto.ts

@@ -2,8 +2,8 @@
 import { PriceDTO } from './price-dto';
 import { AvailabilityType } from './availability-type';
 export interface AvailabilityDTO {
+  ssc?: string;
   itemId?: number;
-  supplierProductNumber?: string;
   requestReference?: string;
   ean?: string;
   shop?: number;
@@ -12,7 +12,7 @@ export interface AvailabilityDTO {
   supplierId?: number;
   logistician?: string;
   logisticianId?: number;
-  ssc?: string;
+  supplierProductNumber?: string;
   sscText?: string;
   qty?: number;
   isPrebooked?: boolean;

apps/swagger/oms/src/lib/models/branch-dto.ts

@@ -4,13 +4,13 @@ import { EntityDTOContainerOfLabelDTO } from './entity-dtocontainer-of-label-dto
 import { Address } from './address';
 import { BranchType } from './branch-type';
 export interface BranchDTO extends EntityDTOOfBranchDTOAndIReadOnlyBranch {
+  isOnline?: boolean;
   label?: EntityDTOContainerOfLabelDTO;
-  parent?: number;
   branchNumber?: string;
   name?: string;
   shortName?: string;
   key?: string;
-  isOnline?: boolean;
+  parent?: number;
   isOrderingEnabled?: boolean;
   isShippingEnabled?: boolean;
   address?: Address;

apps/swagger/oms/src/lib/models/buyer-dto.ts

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

apps/swagger/oms/src/lib/models/display-order-dto.ts

@@ -1,17 +1,17 @@
 /* tslint:disable */
 import { EntityDTOOfDisplayOrderDTOAndIOrder } from './entity-dtoof-display-order-dtoand-iorder';
+import { DisplayAddresseeDTO } from './display-addressee-dto';
 import { OrderType } from './order-type';
-import { EnvironmentChannel } from './environment-channel';
 import { DisplayBranchDTO } from './display-branch-dto';
 import { DisplayOrderItemDTO } from './display-order-item-dto';
-import { DisplayAddresseeDTO } from './display-addressee-dto';
+import { EnvironmentChannel } from './environment-channel';
 import { DisplayLogisticianDTO } from './display-logistician-dto';
 import { DisplayOrderPaymentDTO } from './display-order-payment-dto';
 import { TermsOfDeliveryDTO } from './terms-of-delivery-dto';
 import { NotificationChannel } from './notification-channel';
 export interface DisplayOrderDTO extends EntityDTOOfDisplayOrderDTOAndIOrder {
+  shippingAddress?: DisplayAddresseeDTO;
   orderType: OrderType;
-  clientChannel?: EnvironmentChannel;
   orderNumber?: string;
   orderDate?: string;
   orderBranch?: DisplayBranchDTO;
@@ -20,7 +20,7 @@ export interface DisplayOrderDTO extends EntityDTOOfDisplayOrderDTOAndIOrder {
   buyerNumber?: string;
   buyer?: DisplayAddresseeDTO;
   buyerComment?: string;
-  shippingAddress?: DisplayAddresseeDTO;
+  clientChannel?: EnvironmentChannel;
   targetBranch?: DisplayBranchDTO;
   logistician?: DisplayLogisticianDTO;
   payerNumber?: string;

apps/swagger/oms/src/lib/models/display-order-item-dto.ts

@@ -1,19 +1,19 @@
 /* tslint:disable */
 import { EntityDTOOfDisplayOrderItemDTOAndIOrderItem } from './entity-dtoof-display-order-item-dtoand-iorder-item';
 import { DisplayOrderDTO } from './display-order-dto';
-import { ProductDTO } from './product-dto';
 import { DisplayOrderItemSubsetDTO } from './display-order-item-subset-dto';
+import { ProductDTO } from './product-dto';
 import { QuantityUnitType } from './quantity-unit-type';
 import { PriceDTO } from './price-dto';
 import { PromotionDTO } from './promotion-dto';
 export interface DisplayOrderItemDTO extends EntityDTOOfDisplayOrderItemDTOAndIOrderItem {
+  quantity?: number;
   order?: DisplayOrderDTO;
-  product?: ProductDTO;
   orderItemNumber?: string;
   orderDate?: string;
   subsetItems?: Array<DisplayOrderItemSubsetDTO>;
   buyerComment?: string;
-  quantity?: number;
+  product?: ProductDTO;
   quantityUnitType: QuantityUnitType;
   quantityUnit?: string;
   price?: PriceDTO;

apps/swagger/oms/src/lib/models/display-order-item-subset-dto.ts

@@ -3,15 +3,15 @@ import { EntityDTOOfDisplayOrderItemSubsetDTOAndIOrderItemStatus } from './entit
 import { DisplayOrderItemDTO } from './display-order-item-dto';
 import { OrderItemProcessingStatusValue } from './order-item-processing-status-value';
 export interface DisplayOrderItemSubsetDTO extends EntityDTOOfDisplayOrderItemSubsetDTOAndIOrderItemStatus {
+  supplierLabel?: string;
   orderItem?: DisplayOrderItemDTO;
-  orderItemSubsetNumber?: string;
   description?: string;
   quantity?: number;
   estimatedShippingDate?: string;
   ssc?: string;
   sscText?: string;
   supplierName?: string;
-  supplierLabel?: string;
+  orderItemSubsetNumber?: string;
   processingStatus: OrderItemProcessingStatusValue;
   processingStatusDate?: string;
   trackingNumber?: string;

apps/swagger/oms/src/lib/models/display-order-payment-dto.ts

@@ -2,13 +2,13 @@
 import { EntityDTOOfDisplayOrderPaymentDTOAndIReadOnlyPayment } from './entity-dtoof-display-order-payment-dtoand-iread-only-payment';
 import { PaymentType } from './payment-type';
 export interface DisplayOrderPaymentDTO extends EntityDTOOfDisplayOrderPaymentDTOAndIReadOnlyPayment {
+  shipping?: number;
   paymentActionRequired: boolean;
-  paymentType: PaymentType;
   paymentNumber?: string;
   paymentComment?: string;
   total: number;
   subtotal?: number;
-  shipping?: number;
+  paymentType: PaymentType;
   tax?: number;
   currency?: string;
   dateOfPayment?: string;

apps/swagger/oms/src/lib/models/history-dto.ts

@@ -1,12 +1,12 @@
 /* tslint:disable */
 import { DiffDTO } from './diff-dto';
 export interface HistoryDTO {
+  changed?: string;
   name?: string;
-  description?: string;
   location?: string;
   id?: number;
   version?: number;
-  changed?: string;
+  description?: string;
   changedBy?: string;
   changeset?: number;
   historyset?: number;

apps/swagger/oms/src/lib/models/order-dto.ts

@@ -1,7 +1,7 @@
 /* tslint:disable */
 import { EntityDTOOfOrderDTOAndIOrder } from './entity-dtoof-order-dtoand-iorder';
+import { EntityDTOContainerOfPayerDTO } from './entity-dtocontainer-of-payer-dto';
 import { OrderType } from './order-type';
-import { EnvironmentChannel } from './environment-channel';
 import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto';
 import { OrderProcessingStatus } from './order-processing-status';
 import { EntityDTOContainerOfOrderItemDTO } from './entity-dtocontainer-of-order-item-dto';
@@ -9,7 +9,7 @@ import { BuyerDTO } from './buyer-dto';
 import { NotificationChannel } from './notification-channel';
 import { EntityDTOContainerOfShippingAddressDTO } from './entity-dtocontainer-of-shipping-address-dto';
 import { EntityDTOContainerOfLogisticianDTO } from './entity-dtocontainer-of-logistician-dto';
-import { EntityDTOContainerOfPayerDTO } from './entity-dtocontainer-of-payer-dto';
+import { EnvironmentChannel } from './environment-channel';
 import { PaymentType } from './payment-type';
 import { EntityDTOContainerOfPaymentDTO } from './entity-dtocontainer-of-payment-dto';
 import { PaymentStatus } from './payment-status';
@@ -17,8 +17,8 @@ import { ValidationStatus } from './validation-status';
 import { TermsOfDeliveryDTO } from './terms-of-delivery-dto';
 import { PackagingInstructions } from './packaging-instructions';
 export interface OrderDTO extends EntityDTOOfOrderDTOAndIOrder {
+  payer?: EntityDTOContainerOfPayerDTO;
   orderType?: OrderType;
-  clientChannel?: EnvironmentChannel;
   orderNumber?: string;
   orderDate?: string;
   acceptanceDate?: string;
@@ -32,7 +32,7 @@ export interface OrderDTO extends EntityDTOOfOrderDTOAndIOrder {
   shippingAddress?: EntityDTOContainerOfShippingAddressDTO;
   targetBranch?: EntityDTOContainerOfBranchDTO;
   logistician?: EntityDTOContainerOfLogisticianDTO;
-  payer?: EntityDTOContainerOfPayerDTO;
+  clientChannel?: EnvironmentChannel;
   paymentType?: PaymentType;
   paymentComment?: string;
   payment?: EntityDTOContainerOfPaymentDTO;

apps/swagger/oms/src/lib/models/order-item-dto.ts

@@ -1,17 +1,17 @@
 /* tslint:disable */
 import { EntityDTOOfOrderItemDTOAndIOrderItem } from './entity-dtoof-order-item-dtoand-iorder-item';
+import { QuantityUnitType } from './quantity-unit-type';
 import { EntityDTOContainerOfOrderDTO } from './entity-dtocontainer-of-order-dto';
-import { ProductDTO } from './product-dto';
 import { EntityDTOContainerOfOrderItemDTO } from './entity-dtocontainer-of-order-item-dto';
 import { OrderItemType } from './order-item-type';
 import { EntityDTOContainerOfOrderItemSubsetDTO } from './entity-dtocontainer-of-order-item-subset-dto';
-import { QuantityUnitType } from './quantity-unit-type';
+import { ProductDTO } from './product-dto';
 import { PriceDTO } from './price-dto';
 import { EntityDTOContainerOfShopItemDTO } from './entity-dtocontainer-of-shop-item-dto';
 import { PromotionDTO } from './promotion-dto';
 export interface OrderItemDTO extends EntityDTOOfOrderItemDTOAndIOrderItem {
+  quantityUnitType?: QuantityUnitType;
   order?: EntityDTOContainerOfOrderDTO;
-  product?: ProductDTO;
   orderItemNumber?: string;
   parent?: EntityDTOContainerOfOrderItemDTO;
   orderItemType?: OrderItemType;
@@ -21,7 +21,7 @@ export interface OrderItemDTO extends EntityDTOOfOrderItemDTOAndIOrderItem {
   buyerComment?: string;
   invoiceText?: string;
   quantity?: number;
-  quantityUnitType?: QuantityUnitType;
+  product?: ProductDTO;
   quantityUnit?: string;
   grossPrice?: PriceDTO;
   unitPrice?: PriceDTO;

apps/swagger/oms/src/lib/models/order-item-list-item-dto.ts

@@ -1,16 +1,17 @@
 /* tslint:disable */
+import { VATType } from './vattype';
 import { EnvironmentChannel } from './environment-channel';
 import { OrderType } from './order-type';
 import { OrderItemProcessingStatusValue } from './order-item-processing-status-value';
 import { ProductDTO } from './product-dto';
-import { VATType } from './vattype';
+import { PriceDTO } from './price-dto';
 import { Gender } from './gender';
 import { PaymentType } from './payment-type';
 import { PaymentStatus } from './payment-status';
 import { KeyValueDTOOfStringAndString } from './key-value-dtoof-string-and-string';
 export interface OrderItemListItemDTO {
+  vatType?: VATType;
   orderId?: number;
-  orderItemId?: number;
   orderItemSubsetId?: number;
   orderPId?: string;
   orderItemPId?: string;
@@ -31,8 +32,9 @@ export interface OrderItemListItemDTO {
   product?: ProductDTO;
   quantity?: number;
   overallQuantity?: number;
+  retailPrice?: PriceDTO;
   price?: number;
-  vatType?: VATType;
+  orderItemId?: number;
   currency?: string;
   buyerNumber?: string;
   organisation?: string;

apps/swagger/oms/src/lib/models/order-item-subset-dto.ts

@@ -5,8 +5,8 @@ import { EntityDTOContainerOfSupplierDTO } from './entity-dtocontainer-of-suppli
 import { OrderItemProcessingStatusValue } from './order-item-processing-status-value';
 import { EntityDTOContainerOfPackageDTO } from './entity-dtocontainer-of-package-dto';
 export interface OrderItemSubsetDTO extends EntityDTOOfOrderItemSubsetDTOAndIOrderItemStatus {
+  specialComment?: string;
   orderItem?: EntityDTOContainerOfOrderItemDTO;
-  orderItemSubsetNumber?: string;
   supplier?: EntityDTOContainerOfSupplierDTO;
   supplierProductNumber?: string;
   orderedAtSupplier?: string;
@@ -17,7 +17,7 @@ export interface OrderItemSubsetDTO extends EntityDTOOfOrderItemSubsetDTOAndIOrd
   onShippingNote?: string;
   ssc?: string;
   sscText?: string;
-  specialComment?: string;
+  orderItemSubsetNumber?: string;
   isPrebooked?: boolean;
   processingStatus?: OrderItemProcessingStatusValue;
   processingStatusDate?: string;

apps/swagger/oms/src/lib/models/order-list-item-dto.ts

@@ -1,11 +1,11 @@
 /* tslint:disable */
+import { OrderProcessingStatus } from './order-processing-status';
 import { EnvironmentChannel } from './environment-channel';
 import { OrderType } from './order-type';
-import { OrderProcessingStatus } from './order-processing-status';
 import { Gender } from './gender';
 export interface OrderListItemDTO {
+  processingStatus?: OrderProcessingStatus;
   clientChannel?: EnvironmentChannel;
-  orderId?: number;
   orderPId?: string;
   orderBranchName?: string;
   orderBranchId?: number;
@@ -14,7 +14,7 @@ export interface OrderListItemDTO {
   shopName?: string;
   orderNumber?: string;
   orderType?: OrderType;
-  processingStatus?: OrderProcessingStatus;
+  orderId?: number;
   orderDate?: string;
   organisation?: string;
   gender?: Gender;

apps/swagger/oms/src/lib/models/order-query-token-dto.ts

@@ -1,12 +1,12 @@
 /* tslint:disable */
 import { OrderByDTO2 } from './order-by-dto2';
 export interface OrderQueryTokenDTO {
+  fuzzy?: number;
   labelKey?: string;
-  branchNumber?: string;
   friendlyName?: string;
   input?: {[key: string]: string};
   ids?: Array<number>;
-  fuzzy?: number;
+  branchNumber?: string;
   filter?: {[key: string]: string};
   orderBy?: Array<OrderByDTO2>;
   skip?: number;

apps/swagger/oms/src/lib/models/package-dto.ts

@@ -5,13 +5,13 @@ import { EntityDTOContainerOfLabelDTO } from './entity-dtocontainer-of-label-dto
 import { WeightOfAvoirdupois } from './weight-of-avoirdupois';
 import { AddresseeDTO } from './addressee-dto';
 export interface PackageDTO extends EntityDTOOfPackageDTOAndIPackage {
+  numberOfPackages?: number;
   packageNumber?: string;
-  trackingCode?: string;
   packageType?: string;
   shippingProvider?: string;
   packedAt?: string;
   packedBy?: EntityDTOContainerOfUserDTO;
-  numberOfPackages?: number;
+  trackingCode?: string;
   label?: EntityDTOContainerOfLabelDTO;
   weight?: WeightOfAvoirdupois;
   sender?: AddresseeDTO;

apps/swagger/oms/src/lib/models/payer-dto.ts

@@ -1,18 +1,18 @@
 /* tslint:disable */
 import { EntityDTOOfPayerDTOAndIPayer } from './entity-dtoof-payer-dtoand-ipayer';
-import { PayerType } from './payer-type';
 import { PayerStatus } from './payer-status';
 import { Gender } from './gender';
+import { PayerType } from './payer-type';
 import { OrganisationDTO } from './organisation-dto';
 import { AddressDTO } from './address-dto';
 import { CommunicationDetailsDTO } from './communication-details-dto';
 export interface PayerDTO extends EntityDTOOfPayerDTOAndIPayer {
+  title?: string;
   payerNumber?: string;
-  payerType?: PayerType;
   payerStatus?: PayerStatus;
   locale?: string;
   gender?: Gender;
-  title?: string;
+  payerType?: PayerType;
   firstName?: string;
   lastName?: string;
   organisation?: OrganisationDTO;

apps/swagger/oms/src/lib/models/payer-dto2.ts

@@ -1,19 +1,19 @@
 /* tslint:disable */
 import { EntityReferenceDTO } from './entity-reference-dto';
-import { PayerType } from './payer-type';
+import { OrganisationDTO } from './organisation-dto';
 import { PayerStatus } from './payer-status';
 import { CommunicationDetailsDTO } from './communication-details-dto';
-import { OrganisationDTO } from './organisation-dto';
+import { PayerType } from './payer-type';
 import { AddressDTO } from './address-dto';
 import { Gender } from './gender';
 export interface PayerDTO2 extends EntityReferenceDTO {
+  organisation?: OrganisationDTO;
   payerNumber?: string;
-  payerType: PayerType;
   payerStatus: PayerStatus;
   paymentTerm?: string;
   communicationDetails?: CommunicationDetailsDTO;
   isTemporaryAccount: boolean;
-  organisation?: OrganisationDTO;
+  payerType: PayerType;
   address?: AddressDTO;
   locale?: string;
   gender: Gender;

apps/swagger/oms/src/lib/models/payment-dto.ts

@@ -2,15 +2,15 @@
 import { ReadOnlyEntityDTOOfPaymentDTOAndIReadOnlyPayment } from './read-only-entity-dtoof-payment-dtoand-iread-only-payment';
 import { PaymentType } from './payment-type';
 export interface PaymentDTO extends ReadOnlyEntityDTOOfPaymentDTOAndIReadOnlyPayment {
+  dateOfPayment?: string;
   paymentType?: PaymentType;
-  paymentNumber?: string;
   paymentComment?: string;
   total: number;
   subtotal?: number;
   shipping?: number;
   tax?: number;
   currency?: string;
-  dateOfPayment?: string;
+  paymentNumber?: string;
   cancelled?: string;
   dunning1?: string;
   dunning2?: string;

apps/swagger/oms/src/lib/models/product-dto.ts

@@ -2,15 +2,15 @@
 import { SizeOfString } from './size-of-string';
 import { WeightOfAvoirdupois } from './weight-of-avoirdupois';
 export interface ProductDTO {
+  productGroup?: string;
   name?: string;
-  additionalName?: string;
   ean?: string;
   supplierProductNumber?: string;
   catalogProductNumber?: string;
   contributors?: string;
   manufacturer?: string;
   publicationDate?: string;
-  productGroup?: string;
+  additionalName?: string;
   edition?: string;
   volume?: string;
   serial?: string;

apps/swagger/oms/src/lib/models/receipt-dto.ts

@@ -1,20 +1,20 @@
 /* tslint:disable */
 import { EntityDTOOfReceiptDTOAndIReceipt } from './entity-dtoof-receipt-dtoand-ireceipt';
-import { ReceiptType } from './receipt-type';
+import { ShippingAddressDTO2 } from './shipping-address-dto2';
 import { EntityDTOContainerOfOrderDTO } from './entity-dtocontainer-of-order-dto';
 import { BuyerDTO } from './buyer-dto';
 import { PayerDTO2 } from './payer-dto2';
 import { EntityDTOContainerOfPaymentDTO } from './entity-dtocontainer-of-payment-dto';
 import { EntityDTOContainerOfReceiptItemDTO } from './entity-dtocontainer-of-receipt-item-dto';
 import { ValidationStatus } from './validation-status';
-import { ShippingAddressDTO2 } from './shipping-address-dto2';
+import { ReceiptType } from './receipt-type';
 import { TypeOfDelivery } from './type-of-delivery';
 import { ShippingType } from './shipping-type';
 import { EntityDTOContainerOfLabelDTO } from './entity-dtocontainer-of-label-dto';
 import { KeyValueDTOOfStringAndString } from './key-value-dtoof-string-and-string';
 export interface ReceiptDTO extends EntityDTOOfReceiptDTOAndIReceipt {
+  shippingAddress?: ShippingAddressDTO2;
   receiptNumber?: string;
-  receiptType?: ReceiptType;
   receiptText?: string;
   printedDate?: string;
   order?: EntityDTOContainerOfOrderDTO;
@@ -23,7 +23,7 @@ export interface ReceiptDTO extends EntityDTOOfReceiptDTOAndIReceipt {
   payment?: EntityDTOContainerOfPaymentDTO;
   items?: Array<EntityDTOContainerOfReceiptItemDTO>;
   validationStatus: ValidationStatus;
-  shippingAddress?: ShippingAddressDTO2;
+  receiptType?: ReceiptType;
   postage?: number;
   chargePostage?: boolean;
   postageComment?: string;

apps/swagger/oms/src/lib/models/receipt-item-dto.ts

@@ -14,8 +14,8 @@ import { OrderItemProcessingStatusValue } from './order-item-processing-status-v
 import { EntityDTOContainerOfPackageDTO } from './entity-dtocontainer-of-package-dto';
 import { PaymentStatus } from './payment-status';
 export interface ReceiptItemDTO extends EntityDTOOfReceiptItemDTOAndIReceiptItem {
+  accountingIndicator?: string;
   receipt?: EntityDTOContainerOfReceiptDTO;
-  receiptItemNumber?: string;
   parent?: EntityDTOContainerOfReceiptItemDTO;
   orderItemType: OrderItemType;
   lineNumber?: number;
@@ -28,7 +28,7 @@ export interface ReceiptItemDTO extends EntityDTOOfReceiptItemDTOAndIReceiptItem
   targetBranch?: EntityDTOContainerOfBranchDTO;
   bonusCardNumber?: string;
   product?: ProductDTO;
-  accountingIndicator?: string;
+  receiptItemNumber?: string;
   orderType: OrderType;
   agentComment?: string;
   supplier?: EntityDTOContainerOfSupplierDTO;

apps/swagger/oms/src/lib/models/receipt-list-item-dto.ts

@@ -1,11 +1,11 @@
 /* tslint:disable */
 import { EntityReferenceDTO } from './entity-reference-dto';
-import { ReceiptType } from './receipt-type';
 import { PaymentType } from './payment-type';
+import { ReceiptType } from './receipt-type';
 import { PaymentStatus2 } from './payment-status-2';
 export interface ReceiptListItemDTO extends EntityReferenceDTO {
+  paymentType?: PaymentType;
   label?: string;
-  orderNumber?: string;
   receiptType?: ReceiptType;
   receiptNumber?: string;
   printedDate?: string;
@@ -14,7 +14,7 @@ export interface ReceiptListItemDTO extends EntityReferenceDTO {
   paidTotal?: number;
   paidAt?: string;
   placeOfPayment?: string;
-  paymentType?: PaymentType;
+  orderNumber?: string;
   paymentStatus?: PaymentStatus2;
   statusDate?: string;
   payerNumber?: string;

apps/swagger/oms/src/lib/models/stock-status-code-dto.ts

@@ -1,17 +1,17 @@
 /* tslint:disable */
 import { EntityDTOOfStockStatusCodeDTOAndIStockStatusCode } from './entity-dtoof-stock-status-code-dtoand-istock-status-code';
-import { EntityDTOContainerOfSupplierDTO } from './entity-dtocontainer-of-supplier-dto';
 import { AvailabilityType } from './availability-type';
+import { EntityDTOContainerOfSupplierDTO } from './entity-dtocontainer-of-supplier-dto';
 import { StockStatusCodeTextDTO } from './stock-status-code-text-dto';
 export interface StockStatusCodeDTO extends EntityDTOOfStockStatusCodeDTOAndIStockStatusCode {
+  friendlyDescription?: string;
   code?: string;
-  supplier?: EntityDTOContainerOfSupplierDTO;
   availabilityInMinutes?: number;
   isPrebookable?: boolean;
   prio?: number;
   availabilityType?: AvailabilityType;
   supplierDescription?: string;
-  friendlyDescription?: string;
+  supplier?: EntityDTOContainerOfSupplierDTO;
   friendlyDescriptionPrebooked?: string;
   friendlyShortDescription?: string;
   friendlyShortDescriptionPrebooked?: string;