From e1d4a79cf81a9481d0e15648e046ea97231a35fb Mon Sep 17 00:00:00 2001 From: Peter Skrlj Date: Wed, 5 Feb 2020 13:44:34 +0100 Subject: [PATCH] swagger generator changes --- .gitignore | 2 + libs/swagger/src/lib/api/api-configuration.ts | 2 +- .../src/lib/api/models/availability-dto.ts | 14 +- libs/swagger/src/lib/api/models/item-dto.ts | 14 +- .../src/lib/api/models/query-token-dto.ts | 14 +- .../src/lib/api/services/search.service.ts | 35 ++ .../src/lib/availability/av-configuration.ts | 2 +- .../availability/models/availability-dto.ts | 4 +- .../models/availability-request-dto.ts | 4 +- .../src/lib/checkout/models/address-dto.ts | 4 +- .../src/lib/checkout/models/address.ts | 4 +- .../lib/checkout/models/availability-dto.ts | 4 +- .../src/lib/checkout/models/branch-dto.ts | 4 +- .../src/lib/checkout/models/buyer-dto.ts | 6 +- .../src/lib/checkout/models/checkout-dto.ts | 8 +- .../src/lib/checkout/models/company-dto.ts | 4 +- .../lib/checkout/models/component-item-dto.ts | 4 +- .../src/lib/checkout/models/file-dto.ts | 4 +- .../src/lib/checkout/models/item-dto.ts | 6 +- .../src/lib/checkout/models/payer-dto.ts | 6 +- .../src/lib/checkout/models/product-dto.ts | 4 +- .../src/lib/checkout/models/shop-dto.ts | 4 +- .../checkout/models/shopping-cart-item-dto.ts | 4 +- .../lib/checkout/models/user-account-dto.ts | 4 +- .../services/store-checkout.service.ts | 368 +++++------------- .../swagger/src/lib/crm/models/address-dto.ts | 4 +- .../src/lib/crm/models/bonus-card-info-dto.ts | 14 +- .../src/lib/crm/models/customer-dto.ts | 6 +- .../src/lib/crm/models/customer-info-dto.ts | 4 +- libs/swagger/src/lib/crm/models/opt-in-dto.ts | 4 +- libs/swagger/src/lib/crm/models/payer-dto.ts | 6 +- .../lib/crm/models/shipping-address-dto.ts | 6 +- .../swagger/src/lib/isa/models/address-dto.ts | 4 +- .../swagger/src/lib/oms/models/address-dto.ts | 4 +- libs/swagger/src/lib/oms/models/address.ts | 4 +- .../src/lib/oms/models/availability-dto.ts | 4 +- libs/swagger/src/lib/oms/models/branch-dto.ts | 4 +- libs/swagger/src/lib/oms/models/buyer-dto.ts | 6 +- .../src/lib/oms/models/display-order-dto.ts | 8 +- .../lib/oms/models/display-order-item-dto.ts | 6 +- .../models/display-order-item-subset-dto.ts | 4 +- .../oms/models/display-order-payment-dto.ts | 4 +- libs/swagger/src/lib/oms/models/order-dto.ts | 8 +- .../src/lib/oms/models/order-item-dto.ts | 6 +- .../oms/models/order-item-list-item-dto.ts | 4 +- .../oms/models/order-item-query-token-dto.ts | 4 +- .../lib/oms/models/order-item-subset-dto.ts | 4 +- .../src/lib/oms/models/order-list-item-dto.ts | 6 +- .../lib/oms/models/order-query-token-dto.ts | 4 +- libs/swagger/src/lib/oms/models/payer-dto.ts | 6 +- .../swagger/src/lib/oms/models/payment-dto.ts | 4 +- .../swagger/src/lib/oms/models/product-dto.ts | 4 +- .../lib/oms/models/receipt-list-item-dto.ts | 6 +- .../lib/oms/models/stock-status-code-dto.ts | 6 +- libs/swagger/src/lib/print/models.ts | 154 +++++++- libs/swagger/src/lib/print/models/item-dto.ts | 6 +- .../src/lib/print/models/product-dto.ts | 4 +- libs/swagger/src/lib/print/print.module.ts | 8 + libs/swagger/src/lib/print/services.ts | 4 + .../src/lib/print/services/print.service.ts | 197 +--------- 60 files changed, 451 insertions(+), 605 deletions(-) diff --git a/.gitignore b/.gitignore index d4e0fa143..717ccb66b 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ testem.log # System Files .DS_Store Thumbs.db + +libs/swagger/src/lib/* \ No newline at end of file diff --git a/libs/swagger/src/lib/api/api-configuration.ts b/libs/swagger/src/lib/api/api-configuration.ts index 971240825..a33ed51e7 100644 --- a/libs/swagger/src/lib/api/api-configuration.ts +++ b/libs/swagger/src/lib/api/api-configuration.ts @@ -5,7 +5,7 @@ import { Injectable } from '@angular/core'; * Global configuration for Api services */ @Injectable({ - providedIn: 'root', + providedIn: 'root' }) export class ApiConfiguration { rootUrl: string = 'https://isa.paragon-data.de/cat/v5'; diff --git a/libs/swagger/src/lib/api/models/availability-dto.ts b/libs/swagger/src/lib/api/models/availability-dto.ts index eca8950bc..58939b54e 100644 --- a/libs/swagger/src/lib/api/models/availability-dto.ts +++ b/libs/swagger/src/lib/api/models/availability-dto.ts @@ -5,16 +5,16 @@ */ export interface AvailabilityDTO { + /** + * Stock Status Code / Beschreibung + */ + sscText?: string; + /** * Produkt / Artikel PK */ itemId?: number; - /** - * Shop - */ - shop?: any; - /** * Preis (VK) */ @@ -31,9 +31,9 @@ export interface AvailabilityDTO { ssc?: string; /** - * Stock Status Code / Beschreibung + * Shop */ - sscText?: string; + shop?: any; /** * Verfügbare Menge diff --git a/libs/swagger/src/lib/api/models/item-dto.ts b/libs/swagger/src/lib/api/models/item-dto.ts index aff099c4a..c41466223 100644 --- a/libs/swagger/src/lib/api/models/item-dto.ts +++ b/libs/swagger/src/lib/api/models/item-dto.ts @@ -10,16 +10,16 @@ import { KeyValueDTOOfStringAndString } from './key-value-dtoof-string-and-strin import { ReviewDTO } from './review-dto'; export interface ItemDTO extends EntityDTO { + /** + * Verfügbarkeit laut Katalog + */ + catalogAvailability?: any; + /** * Rang */ scoring?: number; - /** - * Weitere Artikel-IDs - */ - ids?: {[key: string]: number}; - /** * Artikel / Produkttyp */ @@ -56,9 +56,9 @@ export interface ItemDTO extends EntityDTO { images?: Array; /** - * Verfügbarkeit laut Katalog + * Weitere Artikel-IDs */ - catalogAvailability?: any; + ids?: {[key: string]: number}; /** * Verfügbarkeit zur Bestellung in die Filiale diff --git a/libs/swagger/src/lib/api/models/query-token-dto.ts b/libs/swagger/src/lib/api/models/query-token-dto.ts index 84bac56a5..dc8e5fdf1 100644 --- a/libs/swagger/src/lib/api/models/query-token-dto.ts +++ b/libs/swagger/src/lib/api/models/query-token-dto.ts @@ -6,16 +6,16 @@ import { OrderByDTO } from './order-by-dto'; */ export interface QueryTokenDTO { + /** + * Katalogbereich + */ + catalogType?: any; + /** * Lager PK */ stockId?: number; - /** - * Bezeichner - */ - friendlyName?: string; - /** * Eingabewerte z.B. ("qs", "heller süden") */ @@ -32,9 +32,9 @@ export interface QueryTokenDTO { fuzzy?: number; /** - * Katalogbereich + * Bezeichner */ - catalogType?: any; + friendlyName?: string; /** * Filter diff --git a/libs/swagger/src/lib/api/services/search.service.ts b/libs/swagger/src/lib/api/services/search.service.ts index de10cbc1e..18eb2250f 100644 --- a/libs/swagger/src/lib/api/services/search.service.ts +++ b/libs/swagger/src/lib/api/services/search.service.ts @@ -23,6 +23,7 @@ class SearchService extends __BaseService { static readonly SearchSearchPath = '/s'; static readonly SearchAutocompletePath = '/s/complete'; static readonly SearchByIdPath = '/s/byid'; + static readonly SearchByEANPath = '/s/byean'; static readonly SearchDetailPath = '/s/{id}'; static readonly SearchDetailByEANPath = '/s/ean/{ean}'; static readonly SearchSettingsPath = '/s/settings'; @@ -172,6 +173,40 @@ class SearchService extends __BaseService { ); } + /** + * @param eans undefined + */ + SearchByEANResponse(eans: Array): __Observable<__StrictHttpResponse> { + let __params = this.newParams(); + let __headers = new HttpHeaders(); + let __body: any = null; + __body = eans; + let req = new HttpRequest( + 'POST', + this.rootUrl + `/s/byean`, + __body, + { + headers: __headers, + params: __params, + responseType: 'json' + }); + + return this.http.request(req).pipe( + __filter(_r => _r instanceof HttpResponse), + __map((_r) => { + return _r as __StrictHttpResponse; + }) + ); + } + /** + * @param eans undefined + */ + SearchByEAN(eans: Array): __Observable { + return this.SearchByEANResponse(eans).pipe( + __map(_r => _r.body as ListResponseArgsOfItemDTO) + ); + } + /** * @param id undefined */ diff --git a/libs/swagger/src/lib/availability/av-configuration.ts b/libs/swagger/src/lib/availability/av-configuration.ts index 6bf656d18..d9c959b97 100644 --- a/libs/swagger/src/lib/availability/av-configuration.ts +++ b/libs/swagger/src/lib/availability/av-configuration.ts @@ -8,5 +8,5 @@ import { Injectable } from '@angular/core'; providedIn: 'root', }) export class AvConfiguration { - rootUrl: string = 'https://isa.paragon-data.de/ava/v4'; + rootUrl: string = 'https://isa.paragon-data.de/ava/v2'; } diff --git a/libs/swagger/src/lib/availability/models/availability-dto.ts b/libs/swagger/src/lib/availability/models/availability-dto.ts index 2e374762a..f7ac036bf 100644 --- a/libs/swagger/src/lib/availability/models/availability-dto.ts +++ b/libs/swagger/src/lib/availability/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; diff --git a/libs/swagger/src/lib/availability/models/availability-request-dto.ts b/libs/swagger/src/lib/availability/models/availability-request-dto.ts index 863dbc574..b6f1b2f34 100644 --- a/libs/swagger/src/lib/availability/models/availability-request-dto.ts +++ b/libs/swagger/src/lib/availability/models/availability-request-dto.ts @@ -1,14 +1,14 @@ /* tslint:disable */ import { PriceDTO } from './price-dto'; export interface AvailabilityRequestDTO { + price?: PriceDTO; itemId?: string; - supplierProductNumber?: string; ean?: string; qty: number; orderCode?: string; supplier?: string; preBook?: boolean; - price?: PriceDTO; + supplierProductNumber?: string; ssc?: string; estimatedShipping?: string; shopId?: number; diff --git a/libs/swagger/src/lib/checkout/models/address-dto.ts b/libs/swagger/src/lib/checkout/models/address-dto.ts index 089bd01c6..9f5d698e9 100644 --- a/libs/swagger/src/lib/checkout/models/address-dto.ts +++ b/libs/swagger/src/lib/checkout/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; diff --git a/libs/swagger/src/lib/checkout/models/address.ts b/libs/swagger/src/lib/checkout/models/address.ts index e60c41f52..cbfe6952a 100644 --- a/libs/swagger/src/lib/checkout/models/address.ts +++ b/libs/swagger/src/lib/checkout/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; diff --git a/libs/swagger/src/lib/checkout/models/availability-dto.ts b/libs/swagger/src/lib/checkout/models/availability-dto.ts index 9c913f7c7..cf21d4074 100644 --- a/libs/swagger/src/lib/checkout/models/availability-dto.ts +++ b/libs/swagger/src/lib/checkout/models/availability-dto.ts @@ -4,14 +4,14 @@ import { PriceDTO } from './price-dto'; import { EntityDTOContainerOfShopItemDTO } from './entity-dtocontainer-of-shop-item-dto'; import { EntityDTOContainerOfSupplierDTO } from './entity-dtocontainer-of-supplier-dto'; export interface AvailabilityDTO { + supplierSSCText?: string; availabilityType: AvailabilityType; - inStock?: number; ssc?: string; sscText?: string; supplierInfo?: string; isPrebooked?: boolean; supplierSSC?: string; - supplierSSCText?: string; + inStock?: number; price?: PriceDTO; estimatedShippingDate?: string; shopItem?: EntityDTOContainerOfShopItemDTO; diff --git a/libs/swagger/src/lib/checkout/models/branch-dto.ts b/libs/swagger/src/lib/checkout/models/branch-dto.ts index 27c659387..44d71d47e 100644 --- a/libs/swagger/src/lib/checkout/models/branch-dto.ts +++ b/libs/swagger/src/lib/checkout/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; diff --git a/libs/swagger/src/lib/checkout/models/buyer-dto.ts b/libs/swagger/src/lib/checkout/models/buyer-dto.ts index 913a024f7..904347cf9 100644 --- a/libs/swagger/src/lib/checkout/models/buyer-dto.ts +++ b/libs/swagger/src/lib/checkout/models/buyer-dto.ts @@ -1,18 +1,18 @@ /* tslint:disable */ import { EntityReferenceDTO } from './entity-reference-dto'; -import { BuyerType } from './buyer-type'; 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 { + firstName?: string; buyerNumber?: string; - buyerType: BuyerType; isTemporaryAccount?: boolean; locale?: string; gender: Gender; title?: string; - firstName?: string; + buyerType: BuyerType; lastName?: string; dateOfBirth?: string; communicationDetails?: CommunicationDetailsDTO; diff --git a/libs/swagger/src/lib/checkout/models/checkout-dto.ts b/libs/swagger/src/lib/checkout/models/checkout-dto.ts index 7a3ba3165..60a1475ff 100644 --- a/libs/swagger/src/lib/checkout/models/checkout-dto.ts +++ b/libs/swagger/src/lib/checkout/models/checkout-dto.ts @@ -1,24 +1,24 @@ /* tslint:disable */ import { EntityDTOOfCheckoutDTOAndICheckout } from './entity-dtoof-checkout-dtoand-icheckout'; -import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto'; +import { EntityDTOContainerOfCheckoutItemDTO } from './entity-dtocontainer-of-checkout-item-dto'; import { UserAccountDTO } from './user-account-dto'; import { BuyerDTO } from './buyer-dto'; import { PayerDTO } from './payer-dto'; import { EntityDTOContainerOfDestinationDTO } from './entity-dtocontainer-of-destination-dto'; import { EntityDTOContainerOfCheckoutDeliveryDTO } from './entity-dtocontainer-of-checkout-delivery-dto'; -import { EntityDTOContainerOfCheckoutItemDTO } from './entity-dtocontainer-of-checkout-item-dto'; +import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto'; import { NotificationChannel } from './notification-channel'; import { SelectionDTOOfShippingTarget } from './selection-dtoof-shipping-target'; import { PaymentDTO } from './payment-dto'; export interface CheckoutDTO extends EntityDTOOfCheckoutDTOAndICheckout { + items?: Array; label?: string; - orderBranch?: EntityDTOContainerOfBranchDTO; userAccount?: UserAccountDTO; buyer?: BuyerDTO; payer?: PayerDTO; destinations?: Array; deliveries?: Array; - items?: Array; + orderBranch?: EntityDTOContainerOfBranchDTO; notificationChannels: NotificationChannel; availableShippingTargets?: Array; payment?: PaymentDTO; diff --git a/libs/swagger/src/lib/checkout/models/company-dto.ts b/libs/swagger/src/lib/checkout/models/company-dto.ts index 8b9ebfcd3..79934a25e 100644 --- a/libs/swagger/src/lib/checkout/models/company-dto.ts +++ b/libs/swagger/src/lib/checkout/models/company-dto.ts @@ -3,12 +3,12 @@ import { EntityDTOOfCompanyDTOAndICompany } from './entity-dtoof-company-dtoand- import { EntityDTOContainerOfCompanyDTO } from './entity-dtocontainer-of-company-dto'; import { AddressDTO } from './address-dto'; export interface CompanyDTO extends EntityDTOOfCompanyDTOAndICompany { + department?: string; parent?: EntityDTOContainerOfCompanyDTO; - locale?: string; name?: string; nameSuffix?: string; legalForm?: string; - department?: string; + locale?: string; costUnit?: string; vatId?: string; address?: AddressDTO; diff --git a/libs/swagger/src/lib/checkout/models/component-item-dto.ts b/libs/swagger/src/lib/checkout/models/component-item-dto.ts index f0035a862..47a127fa7 100644 --- a/libs/swagger/src/lib/checkout/models/component-item-dto.ts +++ b/libs/swagger/src/lib/checkout/models/component-item-dto.ts @@ -4,12 +4,12 @@ import { EntityDTOContainerOfCategoryDTO } from './entity-dtocontainer-of-catego import { QuantityUnitType } from './quantity-unit-type'; import { ComponentItemDisplayType } from './component-item-display-type'; export interface ComponentItemDTO { + quantityMax?: number; name?: string; - description?: string; item?: EntityDTOContainerOfItemDTO; category?: EntityDTOContainerOfCategoryDTO; required?: boolean; - quantityMax?: number; + description?: string; quantityUnitType: QuantityUnitType; unit?: string; displayType: ComponentItemDisplayType; diff --git a/libs/swagger/src/lib/checkout/models/file-dto.ts b/libs/swagger/src/lib/checkout/models/file-dto.ts index 7a5f9b8f3..c85d7610a 100644 --- a/libs/swagger/src/lib/checkout/models/file-dto.ts +++ b/libs/swagger/src/lib/checkout/models/file-dto.ts @@ -1,12 +1,12 @@ /* tslint:disable */ import { EntityDTOOfFileDTOAndIFile } from './entity-dtoof-file-dtoand-ifile'; export interface FileDTO extends EntityDTOOfFileDTOAndIFile { + size?: number; name?: string; - type?: string; path?: string; mime?: string; hash?: string; - size?: number; + type?: string; subtitle?: string; copyright?: string; locale?: string; diff --git a/libs/swagger/src/lib/checkout/models/item-dto.ts b/libs/swagger/src/lib/checkout/models/item-dto.ts index f93ae6f96..dac9dba9a 100644 --- a/libs/swagger/src/lib/checkout/models/item-dto.ts +++ b/libs/swagger/src/lib/checkout/models/item-dto.ts @@ -1,11 +1,11 @@ /* tslint:disable */ import { EntityDTOOfItemDTOAndIItem } from './entity-dtoof-item-dtoand-iitem'; +import { WeightOfAvoirdupois } from './weight-of-avoirdupois'; import { EntityDTOContainerOfItemDTO } from './entity-dtocontainer-of-item-dto'; import { ContributorHelperDTO } from './contributor-helper-dto'; import { EntityDTOContainerOfCompanyDTO } from './entity-dtocontainer-of-company-dto'; import { EntityDTOContainerOfCategoryDTO } from './entity-dtocontainer-of-category-dto'; import { SizeOfString } from './size-of-string'; -import { WeightOfAvoirdupois } from './weight-of-avoirdupois'; import { ItemType } from './item-type'; import { EntityDTOContainerOfFileDTO } from './entity-dtocontainer-of-file-dto'; import { EntityDTOContainerOfTextDTO } from './entity-dtocontainer-of-text-dto'; @@ -14,8 +14,8 @@ import { ItemLabelDTO } from './item-label-dto'; import { FoodDTO } from './food-dto'; import { EntityDTOContainerOfTenantDTO } from './entity-dtocontainer-of-tenant-dto'; export interface ItemDTO extends EntityDTOOfItemDTOAndIItem { + weight?: WeightOfAvoirdupois; itemNumber?: string; - name?: string; subtitle?: string; description?: string; ean?: string; @@ -28,7 +28,7 @@ export interface ItemDTO extends EntityDTOOfItemDTOAndIItem { categories?: Array; manufacturingCosts?: number; size?: SizeOfString; - weight?: WeightOfAvoirdupois; + name?: string; netWeight?: WeightOfAvoirdupois; weightOfPackaging?: WeightOfAvoirdupois; itemType: ItemType; diff --git a/libs/swagger/src/lib/checkout/models/payer-dto.ts b/libs/swagger/src/lib/checkout/models/payer-dto.ts index f2174c1bc..02c13fc73 100644 --- a/libs/swagger/src/lib/checkout/models/payer-dto.ts +++ b/libs/swagger/src/lib/checkout/models/payer-dto.ts @@ -1,19 +1,19 @@ /* tslint:disable */ import { EntityReferenceDTO } from './entity-reference-dto'; -import { PayerType } from './payer-type'; import { PayerStatus } from './payer-status'; import { Gender } from './gender'; +import { PayerType } from './payer-type'; import { CommunicationDetailsDTO } from './communication-details-dto'; import { OrganisationDTO } from './organisation-dto'; import { AddressDTO } from './address-dto'; export interface PayerDTO extends EntityReferenceDTO { + firstName?: string; payerNumber?: string; - payerType: PayerType; payerStatus: PayerStatus; locale?: string; gender: Gender; title?: string; - firstName?: string; + payerType: PayerType; lastName?: string; dateOfBirth?: string; communicationDetails?: CommunicationDetailsDTO; diff --git a/libs/swagger/src/lib/checkout/models/product-dto.ts b/libs/swagger/src/lib/checkout/models/product-dto.ts index d9cd2689b..438ded128 100644 --- a/libs/swagger/src/lib/checkout/models/product-dto.ts +++ b/libs/swagger/src/lib/checkout/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; diff --git a/libs/swagger/src/lib/checkout/models/shop-dto.ts b/libs/swagger/src/lib/checkout/models/shop-dto.ts index 60cfce85d..4ac5e3cf0 100644 --- a/libs/swagger/src/lib/checkout/models/shop-dto.ts +++ b/libs/swagger/src/lib/checkout/models/shop-dto.ts @@ -9,15 +9,15 @@ import { ShippingTarget } from './shipping-target'; import { CountryTargetDTO } from './country-target-dto'; import { BranchTargetDTO } from './branch-target-dto'; export interface ShopDTO extends EntityDTOOfShopDTOAndIShop { + orderingEnabledStart?: string; name?: string; - description?: string; branch?: EntityDTOContainerOfBranchDTO; defaultLocale?: string; defaultTargetBranch?: EntityDTOContainerOfBranchDTO; defaultLogistician?: EntityDTOContainerOfLogisticianDTO; defaultCurrency?: EntityDTOContainerOfCurrencyDTO; defaultCountry?: EntityDTOContainerOfCountryDTO; - orderingEnabledStart?: string; + description?: string; orderingEnabledStop?: string; shippingEnabledStart?: string; shippingEnabledStop?: string; diff --git a/libs/swagger/src/lib/checkout/models/shopping-cart-item-dto.ts b/libs/swagger/src/lib/checkout/models/shopping-cart-item-dto.ts index b23597f4b..92f2ab08e 100644 --- a/libs/swagger/src/lib/checkout/models/shopping-cart-item-dto.ts +++ b/libs/swagger/src/lib/checkout/models/shopping-cart-item-dto.ts @@ -12,8 +12,8 @@ import { EntityDTOContainerOfShopDTO } from './entity-dtocontainer-of-shop-dto'; import { EntityDTOContainerOfDestinationDTO } from './entity-dtocontainer-of-destination-dto'; import { PromotionDTO } from './promotion-dto'; export interface ShoppingCartItemDTO extends EntityDTOOfShoppingCartItemDTOAndIShoppingCartItem { + specialComment?: string; quantity?: number; - ssc?: string; sscText?: string; shopItem?: EntityDTOContainerOfShopItemDTO; product?: ProductDTO; @@ -22,7 +22,7 @@ export interface ShoppingCartItemDTO extends EntityDTOOfShoppingCartItemDTOAndIS availability?: AvailabilityDTO; agentComment?: string; buyerComment?: string; - specialComment?: string; + ssc?: string; lastAvailabilityRequest?: string; shoppingCartItemStatus: ShoppingCartItemStatus; total?: PriceDTO; diff --git a/libs/swagger/src/lib/checkout/models/user-account-dto.ts b/libs/swagger/src/lib/checkout/models/user-account-dto.ts index d009ffedb..a48c96c11 100644 --- a/libs/swagger/src/lib/checkout/models/user-account-dto.ts +++ b/libs/swagger/src/lib/checkout/models/user-account-dto.ts @@ -1,12 +1,12 @@ /* tslint:disable */ import { Gender } from './gender'; export interface UserAccountDTO { + title?: string; isTemporaryAccount?: boolean; - userName?: string; alias?: string; password?: string; gender?: Gender; - title?: string; + userName?: string; firstName?: string; lastName?: string; dateOfBirth?: string; diff --git a/libs/swagger/src/lib/checkout/services/store-checkout.service.ts b/libs/swagger/src/lib/checkout/services/store-checkout.service.ts index 91a6b38d4..3352e7a82 100644 --- a/libs/swagger/src/lib/checkout/services/store-checkout.service.ts +++ b/libs/swagger/src/lib/checkout/services/store-checkout.service.ts @@ -99,9 +99,9 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutGetShoppingCartParams` containing the following parameters: * - * - `shoppingCartId`: Warenkorb PK + * - `shoppingCartId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutGetShoppingCartResponse(params: StoreCheckoutService.StoreCheckoutGetShoppingCartParams): __Observable<__StrictHttpResponse> { let __params = this.newParams(); @@ -129,9 +129,9 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutGetShoppingCartParams` containing the following parameters: * - * - `shoppingCartId`: Warenkorb PK + * - `shoppingCartId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutGetShoppingCart(params: StoreCheckoutService.StoreCheckoutGetShoppingCartParams): __Observable { return this.StoreCheckoutGetShoppingCartResponse(params).pipe( @@ -140,7 +140,7 @@ class StoreCheckoutService extends __BaseService { } /** - * @param locale Lokalisierung + * @param locale undefined */ StoreCheckoutCreateShoppingCartResponse(locale?: null | string): __Observable<__StrictHttpResponse> { let __params = this.newParams(); @@ -165,7 +165,7 @@ class StoreCheckoutService extends __BaseService { ); } /** - * @param locale Lokalisierung + * @param locale undefined */ StoreCheckoutCreateShoppingCart(locale?: null | string): __Observable { return this.StoreCheckoutCreateShoppingCartResponse(locale).pipe( @@ -174,14 +174,13 @@ class StoreCheckoutService extends __BaseService { } /** - * Ist ein Artikel bereits vorhanden, wird die übergebene Menge addiert. * @param params The `StoreCheckoutService.StoreCheckoutAddItemToShoppingCartParams` containing the following parameters: * - * - `shoppingCartId`: Warenkorb PK + * - `shoppingCartId`: * - * - `items`: Artikel + * - `items`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutAddItemToShoppingCartResponse(params: StoreCheckoutService.StoreCheckoutAddItemToShoppingCartParams): __Observable<__StrictHttpResponse> { let __params = this.newParams(); @@ -208,14 +207,13 @@ class StoreCheckoutService extends __BaseService { ); } /** - * Ist ein Artikel bereits vorhanden, wird die übergebene Menge addiert. * @param params The `StoreCheckoutService.StoreCheckoutAddItemToShoppingCartParams` containing the following parameters: * - * - `shoppingCartId`: Warenkorb PK + * - `shoppingCartId`: * - * - `items`: Artikel + * - `items`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutAddItemToShoppingCart(params: StoreCheckoutService.StoreCheckoutAddItemToShoppingCartParams): __Observable { return this.StoreCheckoutAddItemToShoppingCartResponse(params).pipe( @@ -226,9 +224,9 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutCreateShoppingCartAndAddItemParams` containing the following parameters: * - * - `items`: Artikel + * - `items`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutCreateShoppingCartAndAddItemResponse(params: StoreCheckoutService.StoreCheckoutCreateShoppingCartAndAddItemParams): __Observable<__StrictHttpResponse> { let __params = this.newParams(); @@ -256,9 +254,9 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutCreateShoppingCartAndAddItemParams` containing the following parameters: * - * - `items`: Artikel + * - `items`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutCreateShoppingCartAndAddItem(params: StoreCheckoutService.StoreCheckoutCreateShoppingCartAndAddItemParams): __Observable { return this.StoreCheckoutCreateShoppingCartAndAddItemResponse(params).pipe( @@ -615,9 +613,9 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutCreateOrRefreshCheckoutParams` containing the following parameters: * - * - `shoppingCartId`: Warenkorb PK + * - `shoppingCartId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutCreateOrRefreshCheckoutResponse(params: StoreCheckoutService.StoreCheckoutCreateOrRefreshCheckoutParams): __Observable<__StrictHttpResponse> { let __params = this.newParams(); @@ -645,9 +643,9 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutCreateOrRefreshCheckoutParams` containing the following parameters: * - * - `shoppingCartId`: Warenkorb PK + * - `shoppingCartId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutCreateOrRefreshCheckout(params: StoreCheckoutService.StoreCheckoutCreateOrRefreshCheckoutParams): __Observable { return this.StoreCheckoutCreateOrRefreshCheckoutResponse(params).pipe( @@ -658,9 +656,9 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutDiscardCheckoutParams` containing the following parameters: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutDiscardCheckoutResponse(params: StoreCheckoutService.StoreCheckoutDiscardCheckoutParams): __Observable<__StrictHttpResponse> { let __params = this.newParams(); @@ -688,9 +686,9 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutDiscardCheckoutParams` containing the following parameters: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutDiscardCheckout(params: StoreCheckoutService.StoreCheckoutDiscardCheckoutParams): __Observable { return this.StoreCheckoutDiscardCheckoutResponse(params).pipe( @@ -701,9 +699,9 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutGetCheckoutParams` containing the following parameters: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutGetCheckoutResponse(params: StoreCheckoutService.StoreCheckoutGetCheckoutParams): __Observable<__StrictHttpResponse> { let __params = this.newParams(); @@ -731,9 +729,9 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutGetCheckoutParams` containing the following parameters: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutGetCheckout(params: StoreCheckoutService.StoreCheckoutGetCheckoutParams): __Observable { return this.StoreCheckoutGetCheckoutResponse(params).pipe( @@ -744,9 +742,9 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutResetCheckoutParams` containing the following parameters: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutResetCheckoutResponse(params: StoreCheckoutService.StoreCheckoutResetCheckoutParams): __Observable<__StrictHttpResponse> { let __params = this.newParams(); @@ -774,9 +772,9 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutResetCheckoutParams` containing the following parameters: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutResetCheckout(params: StoreCheckoutService.StoreCheckoutResetCheckoutParams): __Observable { return this.StoreCheckoutResetCheckoutResponse(params).pipe( @@ -787,9 +785,9 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutCurrentCheckoutStepParams` containing the following parameters: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutCurrentCheckoutStepResponse(params: StoreCheckoutService.StoreCheckoutCurrentCheckoutStepParams): __Observable<__StrictHttpResponse> { let __params = this.newParams(); @@ -817,9 +815,9 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutCurrentCheckoutStepParams` containing the following parameters: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutCurrentCheckoutStep(params: StoreCheckoutService.StoreCheckoutCurrentCheckoutStepParams): __Observable { return this.StoreCheckoutCurrentCheckoutStepResponse(params).pipe( @@ -1196,11 +1194,11 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutCreateDestinationParams` containing the following parameters: * - * - `destinationDTO`: Lieferzieldaten + * - `destinationDTO`: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutCreateDestinationResponse(params: StoreCheckoutService.StoreCheckoutCreateDestinationParams): __Observable<__StrictHttpResponse> { let __params = this.newParams(); @@ -1229,11 +1227,11 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutCreateDestinationParams` containing the following parameters: * - * - `destinationDTO`: Lieferzieldaten + * - `destinationDTO`: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutCreateDestination(params: StoreCheckoutService.StoreCheckoutCreateDestinationParams): __Observable { return this.StoreCheckoutCreateDestinationResponse(params).pipe( @@ -1244,13 +1242,13 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutUpdateDestinationParams` containing the following parameters: * - * - `destinationId`: Lieferziel PK + * - `destinationId`: * - * - `destinationDTO`: Lieferzieldaten + * - `destinationDTO`: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutUpdateDestinationResponse(params: StoreCheckoutService.StoreCheckoutUpdateDestinationParams): __Observable<__StrictHttpResponse> { let __params = this.newParams(); @@ -1280,13 +1278,13 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutUpdateDestinationParams` containing the following parameters: * - * - `destinationId`: Lieferziel PK + * - `destinationId`: * - * - `destinationDTO`: Lieferzieldaten + * - `destinationDTO`: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutUpdateDestination(params: StoreCheckoutService.StoreCheckoutUpdateDestinationParams): __Observable { return this.StoreCheckoutUpdateDestinationResponse(params).pipe( @@ -1295,12 +1293,11 @@ class StoreCheckoutService extends __BaseService { } /** - * Wenn eine bereits eingegebene Adresse wieder entfernt werden soll * @param params The `StoreCheckoutService.StoreCheckoutDeleteDestinationParams` containing the following parameters: * - * - `destinationId`: Lieferziel PK + * - `destinationId`: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * * - `returnCheckout`: * @@ -1332,12 +1329,11 @@ class StoreCheckoutService extends __BaseService { ); } /** - * Wenn eine bereits eingegebene Adresse wieder entfernt werden soll * @param params The `StoreCheckoutService.StoreCheckoutDeleteDestinationParams` containing the following parameters: * - * - `destinationId`: Lieferziel PK + * - `destinationId`: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * * - `returnCheckout`: * @@ -1395,11 +1391,11 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutCreateDeliveryParams` containing the following parameters: * - * - `deliveryContainer`: Daten zur Lieferung + * - `deliveryContainer`: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutCreateDeliveryResponse(params: StoreCheckoutService.StoreCheckoutCreateDeliveryParams): __Observable<__StrictHttpResponse> { let __params = this.newParams(); @@ -1428,11 +1424,11 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutCreateDeliveryParams` containing the following parameters: * - * - `deliveryContainer`: Daten zur Lieferung + * - `deliveryContainer`: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutCreateDelivery(params: StoreCheckoutService.StoreCheckoutCreateDeliveryParams): __Observable { return this.StoreCheckoutCreateDeliveryResponse(params).pipe( @@ -1443,15 +1439,15 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutUpdateDeliveryParams` containing the following parameters: * - * - `deliveryId`: Lieferung PK + * - `deliveryId`: * - * - `deliveryContainer`: Date zur Lieferung + * - `deliveryContainer`: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * * - `returnCheckout`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutUpdateDeliveryResponse(params: StoreCheckoutService.StoreCheckoutUpdateDeliveryParams): __Observable<__StrictHttpResponse> { let __params = this.newParams(); @@ -1482,15 +1478,15 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutUpdateDeliveryParams` containing the following parameters: * - * - `deliveryId`: Lieferung PK + * - `deliveryId`: * - * - `deliveryContainer`: Date zur Lieferung + * - `deliveryContainer`: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * * - `returnCheckout`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutUpdateDelivery(params: StoreCheckoutService.StoreCheckoutUpdateDeliveryParams): __Observable { return this.StoreCheckoutUpdateDeliveryResponse(params).pipe( @@ -1501,9 +1497,9 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutGetBranchesByCheckoutParams` containing the following parameters: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutGetBranchesByCheckoutResponse(params: StoreCheckoutService.StoreCheckoutGetBranchesByCheckoutParams): __Observable<__StrictHttpResponse> { let __params = this.newParams(); @@ -1531,9 +1527,9 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutGetBranchesByCheckoutParams` containing the following parameters: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutGetBranchesByCheckout(params: StoreCheckoutService.StoreCheckoutGetBranchesByCheckoutParams): __Observable { return this.StoreCheckoutGetBranchesByCheckoutResponse(params).pipe( @@ -1640,9 +1636,9 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutGetCountriesByCheckoutParams` containing the following parameters: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutGetCountriesByCheckoutResponse(params: StoreCheckoutService.StoreCheckoutGetCountriesByCheckoutParams): __Observable<__StrictHttpResponse> { let __params = this.newParams(); @@ -1670,9 +1666,9 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutGetCountriesByCheckoutParams` containing the following parameters: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutGetCountriesByCheckout(params: StoreCheckoutService.StoreCheckoutGetCountriesByCheckoutParams): __Observable { return this.StoreCheckoutGetCountriesByCheckoutResponse(params).pipe( @@ -1687,7 +1683,7 @@ class StoreCheckoutService extends __BaseService { * * - `skip`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutGetCountriesResponse(params: StoreCheckoutService.StoreCheckoutGetCountriesParams): __Observable<__StrictHttpResponse> { let __params = this.newParams(); @@ -1720,7 +1716,7 @@ class StoreCheckoutService extends __BaseService { * * - `skip`: * - * - `locale`: Lokalisierung + * - `locale`: */ StoreCheckoutGetCountries(params: StoreCheckoutService.StoreCheckoutGetCountriesParams): __Observable { return this.StoreCheckoutGetCountriesResponse(params).pipe( @@ -1905,7 +1901,7 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutGetCheckoutPaymentParams` containing the following parameters: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * * - `locale`: */ @@ -1935,7 +1931,7 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutGetCheckoutPaymentParams` containing the following parameters: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * * - `locale`: */ @@ -2102,11 +2098,11 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutAddVoucherParams` containing the following parameters: * - * - `voucherCode`: Gutscheincode + * - `voucherCode`: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `returnCheckout`: Wenn true (default) wird das Bestellprozessobjekt zurückgegeben + * - `returnCheckout`: * * - `locale`: */ @@ -2138,11 +2134,11 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutAddVoucherParams` containing the following parameters: * - * - `voucherCode`: Gutscheincode + * - `voucherCode`: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `returnCheckout`: Wenn true (default) wird das Bestellprozessobjekt zurückgegeben + * - `returnCheckout`: * * - `locale`: */ @@ -2155,11 +2151,11 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutDeleteVoucherParams` containing the following parameters: * - * - `voucherId`: Gutschein PId + * - `voucherId`: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `returnCheckout`: Wenn true (default) wird das Bestellprozessobjekt zurückgegeben + * - `returnCheckout`: * * - `locale`: */ @@ -2191,11 +2187,11 @@ class StoreCheckoutService extends __BaseService { /** * @param params The `StoreCheckoutService.StoreCheckoutDeleteVoucherParams` containing the following parameters: * - * - `voucherId`: Gutschein PId + * - `voucherId`: * - * - `checkoutId`: Bestellprozess PK + * - `checkoutId`: * - * - `returnCheckout`: Wenn true (default) wird das Bestellprozessobjekt zurückgegeben + * - `returnCheckout`: * * - `locale`: */ @@ -2409,15 +2405,7 @@ module StoreCheckoutService { * Parameters for StoreCheckoutGetShoppingCart */ export interface StoreCheckoutGetShoppingCartParams { - - /** - * Warenkorb PK - */ shoppingCartId: number; - - /** - * Lokalisierung - */ locale?: null | string; } @@ -2425,20 +2413,8 @@ module StoreCheckoutService { * Parameters for StoreCheckoutAddItemToShoppingCart */ export interface StoreCheckoutAddItemToShoppingCartParams { - - /** - * Warenkorb PK - */ shoppingCartId: number; - - /** - * Artikel - */ items: Array; - - /** - * Lokalisierung - */ locale?: null | string; } @@ -2446,15 +2422,7 @@ module StoreCheckoutService { * Parameters for StoreCheckoutCreateShoppingCartAndAddItem */ export interface StoreCheckoutCreateShoppingCartAndAddItemParams { - - /** - * Artikel - */ items: Array; - - /** - * Lokalisierung - */ locale?: null | string; } @@ -2527,15 +2495,7 @@ module StoreCheckoutService { * Parameters for StoreCheckoutCreateOrRefreshCheckout */ export interface StoreCheckoutCreateOrRefreshCheckoutParams { - - /** - * Warenkorb PK - */ shoppingCartId: number; - - /** - * Lokalisierung - */ locale?: null | string; } @@ -2543,15 +2503,7 @@ module StoreCheckoutService { * Parameters for StoreCheckoutDiscardCheckout */ export interface StoreCheckoutDiscardCheckoutParams { - - /** - * Bestellprozess PK - */ checkoutId: number; - - /** - * Lokalisierung - */ locale?: null | string; } @@ -2559,15 +2511,7 @@ module StoreCheckoutService { * Parameters for StoreCheckoutGetCheckout */ export interface StoreCheckoutGetCheckoutParams { - - /** - * Bestellprozess PK - */ checkoutId: number; - - /** - * Lokalisierung - */ locale?: null | string; } @@ -2575,15 +2519,7 @@ module StoreCheckoutService { * Parameters for StoreCheckoutResetCheckout */ export interface StoreCheckoutResetCheckoutParams { - - /** - * Bestellprozess PK - */ checkoutId: number; - - /** - * Lokalisierung - */ locale?: null | string; } @@ -2591,15 +2527,7 @@ module StoreCheckoutService { * Parameters for StoreCheckoutCurrentCheckoutStep */ export interface StoreCheckoutCurrentCheckoutStepParams { - - /** - * Bestellprozess PK - */ checkoutId: number; - - /** - * Lokalisierung - */ locale?: null | string; } @@ -2676,20 +2604,8 @@ module StoreCheckoutService { * Parameters for StoreCheckoutCreateDestination */ export interface StoreCheckoutCreateDestinationParams { - - /** - * Lieferzieldaten - */ destinationDTO: DestinationDTO; - - /** - * Bestellprozess PK - */ checkoutId: number; - - /** - * Lokalisierung - */ locale?: null | string; } @@ -2697,25 +2613,9 @@ module StoreCheckoutService { * Parameters for StoreCheckoutUpdateDestination */ export interface StoreCheckoutUpdateDestinationParams { - - /** - * Lieferziel PK - */ destinationId: number; - - /** - * Lieferzieldaten - */ destinationDTO: DestinationDTO; - - /** - * Bestellprozess PK - */ checkoutId: number; - - /** - * Lokalisierung - */ locale?: null | string; } @@ -2723,15 +2623,7 @@ module StoreCheckoutService { * Parameters for StoreCheckoutDeleteDestination */ export interface StoreCheckoutDeleteDestinationParams { - - /** - * Lieferziel PK - */ destinationId: number; - - /** - * Bestellprozess PK - */ checkoutId: number; returnCheckout?: boolean; locale?: null | string; @@ -2749,20 +2641,8 @@ module StoreCheckoutService { * Parameters for StoreCheckoutCreateDelivery */ export interface StoreCheckoutCreateDeliveryParams { - - /** - * Daten zur Lieferung - */ deliveryContainer: DeliveryContainer; - - /** - * Bestellprozess PK - */ checkoutId: number; - - /** - * Lokalisierung - */ locale?: null | string; } @@ -2770,26 +2650,10 @@ module StoreCheckoutService { * Parameters for StoreCheckoutUpdateDelivery */ export interface StoreCheckoutUpdateDeliveryParams { - - /** - * Lieferung PK - */ deliveryId: number; - - /** - * Date zur Lieferung - */ deliveryContainer: DeliveryContainer; - - /** - * Bestellprozess PK - */ checkoutId: number; returnCheckout?: boolean; - - /** - * Lokalisierung - */ locale?: null | string; } @@ -2797,15 +2661,7 @@ module StoreCheckoutService { * Parameters for StoreCheckoutGetBranchesByCheckout */ export interface StoreCheckoutGetBranchesByCheckoutParams { - - /** - * Bestellprozess PK - */ checkoutId: number; - - /** - * Lokalisierung - */ locale?: null | string; } @@ -2831,15 +2687,7 @@ module StoreCheckoutService { * Parameters for StoreCheckoutGetCountriesByCheckout */ export interface StoreCheckoutGetCountriesByCheckoutParams { - - /** - * Bestellprozess PK - */ checkoutId: number; - - /** - * Lokalisierung - */ locale?: null | string; } @@ -2849,10 +2697,6 @@ module StoreCheckoutService { export interface StoreCheckoutGetCountriesParams { take?: null | number; skip?: null | number; - - /** - * Lokalisierung - */ locale?: null | string; } @@ -2893,10 +2737,6 @@ module StoreCheckoutService { * Parameters for StoreCheckoutGetCheckoutPayment */ export interface StoreCheckoutGetCheckoutPaymentParams { - - /** - * Bestellprozess PK - */ checkoutId: number; locale?: null | string; } @@ -2934,20 +2774,8 @@ module StoreCheckoutService { * Parameters for StoreCheckoutAddVoucher */ export interface StoreCheckoutAddVoucherParams { - - /** - * Gutscheincode - */ voucherCode: string; - - /** - * Bestellprozess PK - */ checkoutId: number; - - /** - * Wenn true (default) wird das Bestellprozessobjekt zurückgegeben - */ returnCheckout?: boolean; locale?: null | string; } @@ -2956,20 +2784,8 @@ module StoreCheckoutService { * Parameters for StoreCheckoutDeleteVoucher */ export interface StoreCheckoutDeleteVoucherParams { - - /** - * Gutschein PId - */ voucherId: number; - - /** - * Bestellprozess PK - */ checkoutId: number; - - /** - * Wenn true (default) wird das Bestellprozessobjekt zurückgegeben - */ returnCheckout?: boolean; locale?: null | string; } diff --git a/libs/swagger/src/lib/crm/models/address-dto.ts b/libs/swagger/src/lib/crm/models/address-dto.ts index 089bd01c6..9f5d698e9 100644 --- a/libs/swagger/src/lib/crm/models/address-dto.ts +++ b/libs/swagger/src/lib/crm/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; diff --git a/libs/swagger/src/lib/crm/models/bonus-card-info-dto.ts b/libs/swagger/src/lib/crm/models/bonus-card-info-dto.ts index 410835cba..c2f4f981d 100644 --- a/libs/swagger/src/lib/crm/models/bonus-card-info-dto.ts +++ b/libs/swagger/src/lib/crm/models/bonus-card-info-dto.ts @@ -5,16 +5,16 @@ */ export interface BonusCardInfoDTO { + /** + * Geburtsdatum + */ + dateOfBirth?: string; + /** * Kartennummer */ code?: string; - /** - * Format (Karte, App, ...) - */ - format?: string; - /** * Anrede */ @@ -41,9 +41,9 @@ export interface BonusCardInfoDTO { address?: any; /** - * Geburtsdatum + * Format (Karte, App, ...) */ - dateOfBirth?: string; + format?: string; /** * E-Mail Adresse diff --git a/libs/swagger/src/lib/crm/models/customer-dto.ts b/libs/swagger/src/lib/crm/models/customer-dto.ts index f6c69bb1f..1789b06f4 100644 --- a/libs/swagger/src/lib/crm/models/customer-dto.ts +++ b/libs/swagger/src/lib/crm/models/customer-dto.ts @@ -1,6 +1,5 @@ /* tslint:disable */ import { EntityDTOOfCustomerDTOAndICustomer } from './entity-dtoof-customer-dtoand-icustomer'; -import { EnvironmentChannel } from './environment-channel'; import { EntityDTOContainerOfUserDTO } from './entity-dtocontainer-of-user-dto'; import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto'; import { CustomerType } from './customer-type'; @@ -10,6 +9,7 @@ import { Gender } from './gender'; import { CommunicationDetailsDTO } from './communication-details-dto'; import { AddressDTO } from './address-dto'; import { EntityDTOContainerOfShippingAddressDTO } from './entity-dtocontainer-of-shipping-address-dto'; +import { EnvironmentChannel } from './environment-channel'; import { EntityDTOContainerOfLabelDTO } from './entity-dtocontainer-of-label-dto'; import { EntityDTOContainerOfBonusCardDTO } from './entity-dtocontainer-of-bonus-card-dto'; import { NotificationChannel } from './notification-channel'; @@ -18,8 +18,8 @@ import { AssignedPayerDTO } from './assigned-payer-dto'; import { EntityDTOContainerOfAttributeDTO } from './entity-dtocontainer-of-attribute-dto'; import { KeyValueDTOOfStringAndString } from './key-value-dtoof-string-and-string'; export interface CustomerDTO extends EntityDTOOfCustomerDTOAndICustomer { + agentComment?: string; customerGroup?: string; - clientChannel?: EnvironmentChannel; user?: EntityDTOContainerOfUserDTO; createdInBranch?: EntityDTOContainerOfBranchDTO; customerNumber?: string; @@ -34,7 +34,7 @@ export interface CustomerDTO extends EntityDTOOfCustomerDTOAndICustomer { communicationDetails?: CommunicationDetailsDTO; address?: AddressDTO; shippingAddresses?: Array; - agentComment?: string; + clientChannel?: EnvironmentChannel; statusChangeComment?: string; deactivationComment?: string; statusComment?: string; diff --git a/libs/swagger/src/lib/crm/models/customer-info-dto.ts b/libs/swagger/src/lib/crm/models/customer-info-dto.ts index 7e6938ef8..bd6da2e34 100644 --- a/libs/swagger/src/lib/crm/models/customer-info-dto.ts +++ b/libs/swagger/src/lib/crm/models/customer-info-dto.ts @@ -12,8 +12,8 @@ import { EntityDTOContainerOfBonusCardDTO } from './entity-dtocontainer-of-bonus import { NotificationChannel } from './notification-channel'; import { KeyValueDTOOfStringAndString } from './key-value-dtoof-string-and-string'; export interface CustomerInfoDTO extends EntityDTOOfCustomerInfoDTOAndICustomer { + dateOfBirth?: string; customerGroup?: string; - userName?: string; createdInBranch?: EntityDTOContainerOfBranchDTO; customerNumber?: string; customerType?: CustomerType; @@ -23,7 +23,7 @@ export interface CustomerInfoDTO extends EntityDTOOfCustomerInfoDTOAndICustomer title?: string; firstName?: string; lastName?: string; - dateOfBirth?: string; + userName?: string; communicationDetails?: CommunicationDetailsDTO; address?: AddressDTO; agentComment?: string; diff --git a/libs/swagger/src/lib/crm/models/opt-in-dto.ts b/libs/swagger/src/lib/crm/models/opt-in-dto.ts index abf95033c..3413f865d 100644 --- a/libs/swagger/src/lib/crm/models/opt-in-dto.ts +++ b/libs/swagger/src/lib/crm/models/opt-in-dto.ts @@ -4,14 +4,14 @@ import { EntityDTOContainerOfCustomerDTO } from './entity-dtocontainer-of-custom import { EntityDTOContainerOfTenantDTO } from './entity-dtocontainer-of-tenant-dto'; import { EntityDTOContainerOfLabelDTO } from './entity-dtocontainer-of-label-dto'; export interface OptInDTO extends EntityDTOOfOptInDTOAndIOptIn { + allowRequested?: string; email?: string; - user?: string; customer?: EntityDTOContainerOfCustomerDTO; category?: string; key?: string; sourceSystem?: string; sourceIP?: string; - allowRequested?: string; + user?: string; allowRequestToken?: string; allow?: string; denyRequested?: string; diff --git a/libs/swagger/src/lib/crm/models/payer-dto.ts b/libs/swagger/src/lib/crm/models/payer-dto.ts index 9d87c50dc..5c5d1a669 100644 --- a/libs/swagger/src/lib/crm/models/payer-dto.ts +++ b/libs/swagger/src/lib/crm/models/payer-dto.ts @@ -1,16 +1,16 @@ /* tslint:disable */ import { EntityDTOOfPayerDTOAndIPayer } from './entity-dtoof-payer-dtoand-ipayer'; +import { AddressDTO } from './address-dto'; import { EntityDTOContainerOfLabelDTO } from './entity-dtocontainer-of-label-dto'; import { CustomerType } from './customer-type'; import { PayerStatus } from './payer-status'; import { Gender } from './gender'; import { OrganisationDTO } from './organisation-dto'; -import { AddressDTO } from './address-dto'; import { CommunicationDetailsDTO } from './communication-details-dto'; import { PaymentSettingsDTO } from './payment-settings-dto'; export interface PayerDTO extends EntityDTOOfPayerDTOAndIPayer { + address?: AddressDTO; label?: EntityDTOContainerOfLabelDTO; - payerGroup?: string; payerNumber?: string; payerType?: CustomerType; payerStatus?: PayerStatus; @@ -19,7 +19,7 @@ export interface PayerDTO extends EntityDTOOfPayerDTOAndIPayer { firstName?: string; lastName?: string; organisation?: OrganisationDTO; - address?: AddressDTO; + payerGroup?: string; communicationDetails?: CommunicationDetailsDTO; agentComment?: string; statusChangeComment?: string; diff --git a/libs/swagger/src/lib/crm/models/shipping-address-dto.ts b/libs/swagger/src/lib/crm/models/shipping-address-dto.ts index 15a702683..ba880fc73 100644 --- a/libs/swagger/src/lib/crm/models/shipping-address-dto.ts +++ b/libs/swagger/src/lib/crm/models/shipping-address-dto.ts @@ -1,18 +1,18 @@ /* tslint:disable */ import { EntityDTOOfShippingAddressDTOAndIShippingAddress } from './entity-dtoof-shipping-address-dtoand-ishipping-address'; +import { AddressDTO } from './address-dto'; import { Gender } from './gender'; import { OrganisationDTO } from './organisation-dto'; import { CommunicationDetailsDTO } from './communication-details-dto'; -import { AddressDTO } from './address-dto'; import { ShippingAddressType } from './shipping-address-type'; export interface ShippingAddressDTO extends EntityDTOOfShippingAddressDTOAndIShippingAddress { + address?: AddressDTO; gender?: Gender; - title?: string; firstName?: string; lastName?: string; organisation?: OrganisationDTO; communicationDetails?: CommunicationDetailsDTO; - address?: AddressDTO; + title?: string; agentComment?: string; type: ShippingAddressType; isDefault?: string; diff --git a/libs/swagger/src/lib/isa/models/address-dto.ts b/libs/swagger/src/lib/isa/models/address-dto.ts index 089bd01c6..9f5d698e9 100644 --- a/libs/swagger/src/lib/isa/models/address-dto.ts +++ b/libs/swagger/src/lib/isa/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; diff --git a/libs/swagger/src/lib/oms/models/address-dto.ts b/libs/swagger/src/lib/oms/models/address-dto.ts index 089bd01c6..9f5d698e9 100644 --- a/libs/swagger/src/lib/oms/models/address-dto.ts +++ b/libs/swagger/src/lib/oms/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; diff --git a/libs/swagger/src/lib/oms/models/address.ts b/libs/swagger/src/lib/oms/models/address.ts index e60c41f52..cbfe6952a 100644 --- a/libs/swagger/src/lib/oms/models/address.ts +++ b/libs/swagger/src/lib/oms/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; diff --git a/libs/swagger/src/lib/oms/models/availability-dto.ts b/libs/swagger/src/lib/oms/models/availability-dto.ts index 2e374762a..f7ac036bf 100644 --- a/libs/swagger/src/lib/oms/models/availability-dto.ts +++ b/libs/swagger/src/lib/oms/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; diff --git a/libs/swagger/src/lib/oms/models/branch-dto.ts b/libs/swagger/src/lib/oms/models/branch-dto.ts index 27c659387..44d71d47e 100644 --- a/libs/swagger/src/lib/oms/models/branch-dto.ts +++ b/libs/swagger/src/lib/oms/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; diff --git a/libs/swagger/src/lib/oms/models/buyer-dto.ts b/libs/swagger/src/lib/oms/models/buyer-dto.ts index 50cc1c3d6..5cfa5091c 100644 --- a/libs/swagger/src/lib/oms/models/buyer-dto.ts +++ b/libs/swagger/src/lib/oms/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; diff --git a/libs/swagger/src/lib/oms/models/display-order-dto.ts b/libs/swagger/src/lib/oms/models/display-order-dto.ts index 1ea96b465..f1f1cf336 100644 --- a/libs/swagger/src/lib/oms/models/display-order-dto.ts +++ b/libs/swagger/src/lib/oms/models/display-order-dto.ts @@ -1,16 +1,16 @@ /* 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 { 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; @@ -19,7 +19,7 @@ export interface DisplayOrderDTO extends EntityDTOOfDisplayOrderDTOAndIOrder { buyerNumber?: string; buyer?: DisplayAddresseeDTO; buyerComment?: string; - shippingAddress?: DisplayAddresseeDTO; + clientChannel?: EnvironmentChannel; targetBranch?: DisplayBranchDTO; payerNumber?: string; payer?: DisplayAddresseeDTO; diff --git a/libs/swagger/src/lib/oms/models/display-order-item-dto.ts b/libs/swagger/src/lib/oms/models/display-order-item-dto.ts index 81cb26686..04fd3be88 100644 --- a/libs/swagger/src/lib/oms/models/display-order-item-dto.ts +++ b/libs/swagger/src/lib/oms/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; buyerComment?: string; - quantity?: number; + product?: ProductDTO; quantityUnitType: QuantityUnitType; quantityUnit?: string; price?: PriceDTO; diff --git a/libs/swagger/src/lib/oms/models/display-order-item-subset-dto.ts b/libs/swagger/src/lib/oms/models/display-order-item-subset-dto.ts index b6f68813a..569fd4b6d 100644 --- a/libs/swagger/src/lib/oms/models/display-order-item-subset-dto.ts +++ b/libs/swagger/src/lib/oms/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; diff --git a/libs/swagger/src/lib/oms/models/display-order-payment-dto.ts b/libs/swagger/src/lib/oms/models/display-order-payment-dto.ts index 3ee6a23ec..70b36b23c 100644 --- a/libs/swagger/src/lib/oms/models/display-order-payment-dto.ts +++ b/libs/swagger/src/lib/oms/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; diff --git a/libs/swagger/src/lib/oms/models/order-dto.ts b/libs/swagger/src/lib/oms/models/order-dto.ts index 2633b0e67..9e9bcc728 100644 --- a/libs/swagger/src/lib/oms/models/order-dto.ts +++ b/libs/swagger/src/lib/oms/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; diff --git a/libs/swagger/src/lib/oms/models/order-item-dto.ts b/libs/swagger/src/lib/oms/models/order-item-dto.ts index 6689c760e..e28eb4977 100644 --- a/libs/swagger/src/lib/oms/models/order-item-dto.ts +++ b/libs/swagger/src/lib/oms/models/order-item-dto.ts @@ -1,17 +1,17 @@ /* tslint:disable */ import { EntityDTOOfOrderItemDTOAndIOrderItem } from './entity-dtoof-order-item-dtoand-iorder-item'; 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 { ProductDTO } from './product-dto'; import { QuantityUnitType } from './quantity-unit-type'; import { PriceDTO } from './price-dto'; import { EntityDTOContainerOfShopItemDTO } from './entity-dtocontainer-of-shop-item-dto'; import { PromotionDTO } from './promotion-dto'; export interface OrderItemDTO extends EntityDTOOfOrderItemDTOAndIOrderItem { + quantity?: number; order?: EntityDTOContainerOfOrderDTO; - product?: ProductDTO; orderItemNumber?: string; parent?: EntityDTOContainerOfOrderItemDTO; orderItemType?: OrderItemType; @@ -20,7 +20,7 @@ export interface OrderItemDTO extends EntityDTOOfOrderItemDTOAndIOrderItem { subsetItems?: Array; buyerComment?: string; invoiceText?: string; - quantity?: number; + product?: ProductDTO; quantityUnitType?: QuantityUnitType; quantityUnit?: string; grossPrice?: PriceDTO; diff --git a/libs/swagger/src/lib/oms/models/order-item-list-item-dto.ts b/libs/swagger/src/lib/oms/models/order-item-list-item-dto.ts index 2eeb46642..d82fca8d6 100644 --- a/libs/swagger/src/lib/oms/models/order-item-list-item-dto.ts +++ b/libs/swagger/src/lib/oms/models/order-item-list-item-dto.ts @@ -5,8 +5,8 @@ import { ProductDTO } from './product-dto'; import { Gender } from './gender'; import { KeyValueDTOOfOrderItemProcessingStatusValueAndString } from './key-value-dtoof-order-item-processing-status-value-and-string'; export interface OrderItemListItemDTO { + currency?: string; orderId?: number; - orderItemId?: number; orderItemSubsetId?: number; orderPId?: string; orderItemPId?: string; @@ -23,7 +23,7 @@ export interface OrderItemListItemDTO { quantity?: number; overallQuantity?: number; price?: number; - currency?: string; + orderItemId?: number; buyerNumber?: string; organisation?: string; gender?: Gender; diff --git a/libs/swagger/src/lib/oms/models/order-item-query-token-dto.ts b/libs/swagger/src/lib/oms/models/order-item-query-token-dto.ts index 708c7f361..752c707e2 100644 --- a/libs/swagger/src/lib/oms/models/order-item-query-token-dto.ts +++ b/libs/swagger/src/lib/oms/models/order-item-query-token-dto.ts @@ -1,13 +1,13 @@ /* tslint:disable */ import { OrderByDTO2 } from './order-by-dto2'; export interface OrderItemQueryTokenDTO { + fuzzy?: number; labelKey?: string; - branchId?: number; branchNumber?: string; friendlyName?: string; input?: {[key: string]: string}; ids?: Array; - fuzzy?: number; + branchId?: number; filter?: {[key: string]: string}; orderBy?: Array; skip?: number; diff --git a/libs/swagger/src/lib/oms/models/order-item-subset-dto.ts b/libs/swagger/src/lib/oms/models/order-item-subset-dto.ts index c3bbc0573..532a49e5d 100644 --- a/libs/swagger/src/lib/oms/models/order-item-subset-dto.ts +++ b/libs/swagger/src/lib/oms/models/order-item-subset-dto.ts @@ -4,8 +4,8 @@ import { EntityDTOContainerOfOrderItemDTO } from './entity-dtocontainer-of-order import { EntityDTOContainerOfSupplierDTO } from './entity-dtocontainer-of-supplier-dto'; import { OrderItemProcessingStatusValue } from './order-item-processing-status-value'; export interface OrderItemSubsetDTO extends EntityDTOOfOrderItemSubsetDTOAndIOrderItemStatus { + specialComment?: string; orderItem?: EntityDTOContainerOfOrderItemDTO; - orderItemSubsetNumber?: string; supplier?: EntityDTOContainerOfSupplierDTO; supplierProductNumber?: string; orderedAtSupplier?: string; @@ -15,7 +15,7 @@ export interface OrderItemSubsetDTO extends EntityDTOOfOrderItemSubsetDTOAndIOrd dateFetchedDelivered?: string; ssc?: string; sscText?: string; - specialComment?: string; + orderItemSubsetNumber?: string; isPrebooked?: boolean; processingStatus?: OrderItemProcessingStatusValue; processingStatusDate?: string; diff --git a/libs/swagger/src/lib/oms/models/order-list-item-dto.ts b/libs/swagger/src/lib/oms/models/order-list-item-dto.ts index 374ea1281..9831eada6 100644 --- a/libs/swagger/src/lib/oms/models/order-list-item-dto.ts +++ b/libs/swagger/src/lib/oms/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; diff --git a/libs/swagger/src/lib/oms/models/order-query-token-dto.ts b/libs/swagger/src/lib/oms/models/order-query-token-dto.ts index c8a878966..6c28b1c72 100644 --- a/libs/swagger/src/lib/oms/models/order-query-token-dto.ts +++ b/libs/swagger/src/lib/oms/models/order-query-token-dto.ts @@ -1,12 +1,12 @@ /* tslint:disable */ import { OrderByDTO } from './order-by-dto'; export interface OrderQueryTokenDTO { + fuzzy?: number; labelKey?: string; - branchNumber?: string; friendlyName?: string; input?: {[key: string]: string}; ids?: Array; - fuzzy?: number; + branchNumber?: string; filter?: {[key: string]: string}; orderBy?: Array; skip?: number; diff --git a/libs/swagger/src/lib/oms/models/payer-dto.ts b/libs/swagger/src/lib/oms/models/payer-dto.ts index 7a8717c66..0c6c87a00 100644 --- a/libs/swagger/src/lib/oms/models/payer-dto.ts +++ b/libs/swagger/src/lib/oms/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; diff --git a/libs/swagger/src/lib/oms/models/payment-dto.ts b/libs/swagger/src/lib/oms/models/payment-dto.ts index f91fbfc91..a3133f4ae 100644 --- a/libs/swagger/src/lib/oms/models/payment-dto.ts +++ b/libs/swagger/src/lib/oms/models/payment-dto.ts @@ -2,14 +2,14 @@ import { EntityDTOOfPaymentDTOAndIReadOnlyPayment } from './entity-dtoof-payment-dtoand-iread-only-payment'; import { PaymentType } from './payment-type'; export interface PaymentDTO extends EntityDTOOfPaymentDTOAndIReadOnlyPayment { + currency?: string; paymentType: PaymentType; - paymentNumber?: string; paymentComment?: string; total: number; subtotal?: number; shipping?: number; tax?: number; - currency?: string; + paymentNumber?: string; dateOfPayment?: string; cancelled?: string; dunning1?: string; diff --git a/libs/swagger/src/lib/oms/models/product-dto.ts b/libs/swagger/src/lib/oms/models/product-dto.ts index d9cd2689b..438ded128 100644 --- a/libs/swagger/src/lib/oms/models/product-dto.ts +++ b/libs/swagger/src/lib/oms/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; diff --git a/libs/swagger/src/lib/oms/models/receipt-list-item-dto.ts b/libs/swagger/src/lib/oms/models/receipt-list-item-dto.ts index 785f6db84..29effba83 100644 --- a/libs/swagger/src/lib/oms/models/receipt-list-item-dto.ts +++ b/libs/swagger/src/lib/oms/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; diff --git a/libs/swagger/src/lib/oms/models/stock-status-code-dto.ts b/libs/swagger/src/lib/oms/models/stock-status-code-dto.ts index 30327f6af..500c2c29c 100644 --- a/libs/swagger/src/lib/oms/models/stock-status-code-dto.ts +++ b/libs/swagger/src/lib/oms/models/stock-status-code-dto.ts @@ -1,15 +1,15 @@ /* 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'; export interface StockStatusCodeDTO extends EntityDTOOfStockStatusCodeDTOAndIStockStatusCode { + supplierDescription?: string; code?: string; - supplier?: EntityDTOContainerOfSupplierDTO; availabilityInMinutes?: number; isPrebookable?: boolean; prio?: number; availabilityType?: AvailabilityType; - supplierDescription?: string; + supplier?: EntityDTOContainerOfSupplierDTO; friendlyDescription?: string; friendlyDescriptionPrebooked?: string; friendlyShortDescription?: string; diff --git a/libs/swagger/src/lib/print/models.ts b/libs/swagger/src/lib/print/models.ts index c14b643a8..c15e8fdad 100644 --- a/libs/swagger/src/lib/print/models.ts +++ b/libs/swagger/src/lib/print/models.ts @@ -1,11 +1,5 @@ -export { ListResponseArgsOfKeyValueDTOOfStringAndString } from './models/list-response-args-of-key-value-dtoof-string-and-string'; -export { ResponseArgsOfIEnumerableOfKeyValueDTOOfStringAndString } from './models/response-args-of-ienumerable-of-key-value-dtoof-string-and-string'; -export { KeyValueDTOOfStringAndString } from './models/key-value-dtoof-string-and-string'; export { ResponseArgs } from './models/response-args'; export { IPublicUserInfo } from './models/ipublic-user-info'; -export { PrintRequest } from './models/print-request'; -export { PrintRequestOfIEnumerableOfLong } from './models/print-request-of-ienumerable-of-long'; -export { PrintRequestOfLong } from './models/print-request-of-long'; export { PrintRequestOfIEnumerableOfItemDTO } from './models/print-request-of-ienumerable-of-item-dto'; export { ItemDTO } from './models/item-dto'; export { ItemType } from './models/item-type'; @@ -28,3 +22,151 @@ 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 { PrintRequest } from './models/print-request'; +export { PrintRequestOfLong } from './models/print-request-of-long'; +export { PrintRequestOfIEnumerableOfShoppingCartItemDTO } from './models/print-request-of-ienumerable-of-shopping-cart-item-dto'; +export { ShoppingCartItemDTO } from './models/shopping-cart-item-dto'; +export { EntityDTOContainerOfShopItemDTO } from './models/entity-dtocontainer-of-shop-item-dto'; +export { ShopItemDTO } from './models/shop-item-dto'; +export { EntityDTOContainerOfItemDTO } from './models/entity-dtocontainer-of-item-dto'; +export { ItemDTO2 } from './models/item-dto2'; +export { ContributorHelperDTO } from './models/contributor-helper-dto'; +export { EntityDTOContainerOfContributorDTO } from './models/entity-dtocontainer-of-contributor-dto'; +export { ContributorDTO } from './models/contributor-dto'; +export { PersonNamesDTO } from './models/person-names-dto'; +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 { EntityDTOOfTenantDTOAndIReadOnlyTenant } from './models/entity-dtoof-tenant-dtoand-iread-only-tenant'; +export { EntityDTOReferenceContainer } from './models/entity-dtoreference-container'; +export { ExternalReferenceDTO } from './models/external-reference-dto'; +export { EntityDTOOfContributorDTOAndIContributor } from './models/entity-dtoof-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 { EntityDTOContainerOfCategoryDTO } from './models/entity-dtocontainer-of-category-dto'; +export { CategoryDTO } from './models/category-dto'; +export { EntityDTOOfCategoryDTOAndICategory } from './models/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 { EntityDTOContainerOfTextDTO } from './models/entity-dtocontainer-of-text-dto'; +export { TextDTO2 } from './models/text-dto2'; +export { EntityDTOOfTextDTOAndIText } from './models/entity-dtoof-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 { ItemLabelDTO } from './models/item-label-dto'; +export { FoodDTO } from './models/food-dto'; +export { FoodLabel } from './models/food-label'; +export { AllergeneType } from './models/allergene-type'; +export { DeclarableFoodAdditives } from './models/declarable-food-additives'; +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 { ImageDTO2 } from './models/image-dto2'; +export { UrlDTO } from './models/url-dto'; +export { AvailabilityDTO2 } from './models/availability-dto2'; +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 { EntityDTOOfShopItemDTOAndIShopItem } from './models/entity-dtoof-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'; +export { EntityDTOContainerOfShopDTO } from './models/entity-dtocontainer-of-shop-dto'; +export { ShopDTO2 } from './models/shop-dto2'; +export { EntityDTOContainerOfBranchDTO } from './models/entity-dtocontainer-of-branch-dto'; +export { BranchDTO } from './models/branch-dto'; +export { EntityDTOContainerOfLabelDTO } from './models/entity-dtocontainer-of-label-dto'; +export { LabelDTO } from './models/label-dto'; +export { EntityDTOOfLabelDTOAndIReadOnlyLabel } from './models/entity-dtoof-label-dtoand-iread-only-label'; +export { Address } from './models/address'; +export { BranchType } from './models/branch-type'; +export { EntityDTOOfBranchDTOAndIReadOnlyBranch } from './models/entity-dtoof-branch-dtoand-iread-only-branch'; +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 { EntityDTOContainerOfCurrencyDTO } from './models/entity-dtocontainer-of-currency-dto'; +export { CurrencyDTO } from './models/currency-dto'; +export { EntityDTOOfCurrencyDTOAndICurrency } from './models/entity-dtoof-currency-dtoand-icurrency'; +export { EntityDTOContainerOfCountryDTO } from './models/entity-dtocontainer-of-country-dto'; +export { CountryDTO } from './models/country-dto'; +export { EntityDTOOfCountryDTOAndIReadOnlyCountry } from './models/entity-dtoof-country-dtoand-iread-only-country'; +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 { EntityDTOContainerOfDestinationDTO } from './models/entity-dtocontainer-of-destination-dto'; +export { DestinationDTO } from './models/destination-dto'; +export { EntityDTOContainerOfCheckoutDTO } from './models/entity-dtocontainer-of-checkout-dto'; +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 { CommunicationDetailsDTO } from './models/communication-details-dto'; +export { OrganisationDTO } from './models/organisation-dto'; +export { EntityReferenceDTO } from './models/entity-reference-dto'; +export { PayerDTO } from './models/payer-dto'; +export { PayerType } from './models/payer-type'; +export { PayerStatus } from './models/payer-status'; +export { EntityDTOContainerOfCheckoutDeliveryDTO } from './models/entity-dtocontainer-of-checkout-delivery-dto'; +export { CheckoutDeliveryDTO } from './models/checkout-delivery-dto'; +export { TermsOfDeliveryDTO } from './models/terms-of-delivery-dto'; +export { TypeOfDelivery } from './models/type-of-delivery'; +export { ShippingType } from './models/shipping-type'; +export { EntityDTOContainerOfCheckoutItemDTO } from './models/entity-dtocontainer-of-checkout-item-dto'; +export { CheckoutItemDTO } from './models/checkout-item-dto'; +export { EntityDTOOfCheckoutItemDTOAndICheckoutItem } from './models/entity-dtoof-checkout-item-dtoand-icheckout-item'; +export { DisplayItemDTO } from './models/display-item-dto'; +export { EntityDTOOfCheckoutDeliveryDTOAndICheckoutDelivery } from './models/entity-dtoof-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 { EntityDTOOfVoucherDTOAndIReadOnlyVoucher } from './models/entity-dtoof-voucher-dtoand-iread-only-voucher'; +export { EntityDTOContainerOfCouponDTO } from './models/entity-dtocontainer-of-coupon-dto'; +export { CouponDTO } from './models/coupon-dto'; +export { CouponType } from './models/coupon-type'; +export { EntityDTOOfCouponDTOAndIReadOnlyCoupon } from './models/entity-dtoof-coupon-dtoand-iread-only-coupon'; +export { EntityDTOOfCheckoutDTOAndICheckout } from './models/entity-dtoof-checkout-dtoand-icheckout'; +export { ShippingAddressDTO } from './models/shipping-address-dto'; +export { EntityDTOOfDestinationDTOAndIDestination } from './models/entity-dtoof-destination-dtoand-idestination'; +export { PromotionDTO } from './models/promotion-dto'; +export { EntityDTOOfShoppingCartItemDTOAndIShoppingCartItem } from './models/entity-dtoof-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'; +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 { EntityDTOOfDisplayBranchDTOAndIReadOnlyBranch } from './models/entity-dtoof-display-branch-dtoand-iread-only-branch'; +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 { EntityDTOOfDisplayOrderItemSubsetDTOAndIOrderItemStatus } from './models/entity-dtoof-display-order-item-subset-dtoand-iorder-item-status'; +export { EntityDTOOfDisplayOrderItemDTOAndIOrderItem } from './models/entity-dtoof-display-order-item-dtoand-iorder-item'; +export { DisplayAddresseeDTO } from './models/display-addressee-dto'; +export { DisplayLogisticianDTO } from './models/display-logistician-dto'; +export { EntityDTOOfDisplayLogisticianDTOAndILogistician } from './models/entity-dtoof-display-logistician-dtoand-ilogistician'; +export { DisplayOrderPaymentDTO } from './models/display-order-payment-dto'; +export { EntityDTOOfDisplayOrderPaymentDTOAndIReadOnlyPayment } from './models/entity-dtoof-display-order-payment-dtoand-iread-only-payment'; +export { TermsOfDeliveryDTO2 } from './models/terms-of-delivery-dto2'; +export { EntityDTOOfDisplayOrderDTOAndIOrder } from './models/entity-dtoof-display-order-dtoand-iorder'; +export { ListResponseArgsOfKeyValueDTOOfStringAndString } from './models/list-response-args-of-key-value-dtoof-string-and-string'; +export { ResponseArgsOfIEnumerableOfKeyValueDTOOfStringAndString } from './models/response-args-of-ienumerable-of-key-value-dtoof-string-and-string'; +export { KeyValueDTOOfStringAndString } from './models/key-value-dtoof-string-and-string'; diff --git a/libs/swagger/src/lib/print/models/item-dto.ts b/libs/swagger/src/lib/print/models/item-dto.ts index 4586878f5..14012f386 100644 --- a/libs/swagger/src/lib/print/models/item-dto.ts +++ b/libs/swagger/src/lib/print/models/item-dto.ts @@ -1,24 +1,24 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; +import { AvailabilityDTO } from './availability-dto'; import { ItemType } from './item-type'; import { ProductDTO } from './product-dto'; import { SpecDTO } from './spec-dto'; import { TextDTO } from './text-dto'; import { ImageDTO } from './image-dto'; -import { AvailabilityDTO } from './availability-dto'; import { StockInfoDTO } from './stock-info-dto'; import { ShelfInfoDTO } from './shelf-info-dto'; import { ReviewDTO } from './review-dto'; export interface ItemDTO extends EntityDTO { + catalogAvailability?: AvailabilityDTO; scoring?: number; - ids?: {[key: string]: number}; type?: ItemType; labels?: {[key: string]: string}; product?: ProductDTO; specs?: Array; texts?: Array; images?: Array; - catalogAvailability?: AvailabilityDTO; + ids?: {[key: string]: number}; storeAvailabilities?: Array; shippingAvailabilities?: Array; stockInfos?: Array; diff --git a/libs/swagger/src/lib/print/models/product-dto.ts b/libs/swagger/src/lib/print/models/product-dto.ts index d9cd2689b..438ded128 100644 --- a/libs/swagger/src/lib/print/models/product-dto.ts +++ b/libs/swagger/src/lib/print/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; diff --git a/libs/swagger/src/lib/print/print.module.ts b/libs/swagger/src/lib/print/print.module.ts index 2deb8f552..3d14f2d03 100644 --- a/libs/swagger/src/lib/print/print.module.ts +++ b/libs/swagger/src/lib/print/print.module.ts @@ -3,6 +3,10 @@ import { NgModule } from '@angular/core'; import { HttpClientModule } from '@angular/common/http'; import { PrintConfiguration } from './print-configuration'; +import { CatalogPrintService } from './services/catalog-print.service'; +import { CheckoutPrintService } from './services/checkout-print.service'; +import { InventoryPrintService } from './services/inventory-print.service'; +import { OMSPrintService } from './services/omsprint.service'; import { PrintService } from './services/print.service'; /** @@ -18,6 +22,10 @@ import { PrintService } from './services/print.service'; declarations: [], providers: [ PrintConfiguration, + CatalogPrintService, + CheckoutPrintService, + InventoryPrintService, + OMSPrintService, PrintService ], }) diff --git a/libs/swagger/src/lib/print/services.ts b/libs/swagger/src/lib/print/services.ts index 7386c1ddf..a45eef83b 100644 --- a/libs/swagger/src/lib/print/services.ts +++ b/libs/swagger/src/lib/print/services.ts @@ -1 +1,5 @@ +export { CatalogPrintService } from './services/catalog-print.service'; +export { CheckoutPrintService } from './services/checkout-print.service'; +export { InventoryPrintService } from './services/inventory-print.service'; +export { OMSPrintService } from './services/omsprint.service'; export { PrintService } from './services/print.service'; diff --git a/libs/swagger/src/lib/print/services/print.service.ts b/libs/swagger/src/lib/print/services/print.service.ts index f76903853..69f181f82 100644 --- a/libs/swagger/src/lib/print/services/print.service.ts +++ b/libs/swagger/src/lib/print/services/print.service.ts @@ -10,9 +10,6 @@ import { map as __map, filter as __filter } from 'rxjs/operators'; import { ListResponseArgsOfKeyValueDTOOfStringAndString } from '../models/list-response-args-of-key-value-dtoof-string-and-string'; import { ResponseArgs } from '../models/response-args'; import { PrintRequest } from '../models/print-request'; -import { PrintRequestOfIEnumerableOfLong } from '../models/print-request-of-ienumerable-of-long'; -import { PrintRequestOfLong } from '../models/print-request-of-long'; -import { PrintRequestOfIEnumerableOfItemDTO } from '../models/print-request-of-ienumerable-of-item-dto'; @Injectable({ providedIn: 'root', }) @@ -22,12 +19,8 @@ class PrintService extends __BaseService { static readonly PrintOfficePrintersPath = '/printers/office'; static readonly PrintTestPath = '/print/test'; static readonly PrintPrinterDetailsPath = '/printers/details'; - static readonly PrintAbholscheinPath = '/print/abholschein'; - static readonly PrintAbholfachetikettPath = '/print/abholfachetikett'; - static readonly PrintWarenkorbPath = '/print/cart'; - static readonly PrintArtikelDetailPath = '/print/article/detail'; - static readonly PrintArtikelListePath = '/print/article/list'; - static readonly PrintWarenbegleitscheinePath = '/print/warenbegleitscheine'; + static readonly PrintMonitorPath = '/print/monitor'; + static readonly PrintStatusPath = '/print/status'; constructor( config: __Configuration, @@ -178,208 +171,54 @@ class PrintService extends __BaseService { __map(_r => _r.body as ResponseArgs) ); } - - /** - * @param data undefined - */ - PrintAbholscheinResponse(data: PrintRequestOfIEnumerableOfLong): __Observable<__StrictHttpResponse> { + PrintMonitorResponse(): __Observable<__StrictHttpResponse> { let __params = this.newParams(); let __headers = new HttpHeaders(); let __body: any = null; - __body = data; let req = new HttpRequest( - 'POST', - this.rootUrl + `/print/abholschein`, + 'GET', + this.rootUrl + `/print/monitor`, __body, { headers: __headers, params: __params, - responseType: 'json' + responseType: 'blob' }); return this.http.request(req).pipe( __filter(_r => _r instanceof HttpResponse), __map((_r) => { - return _r as __StrictHttpResponse; + return _r as __StrictHttpResponse; }) ); - } - /** - * @param data undefined - */ - PrintAbholschein(data: PrintRequestOfIEnumerableOfLong): __Observable { - return this.PrintAbholscheinResponse(data).pipe( - __map(_r => _r.body as ResponseArgs) + } PrintMonitor(): __Observable { + return this.PrintMonitorResponse().pipe( + __map(_r => _r.body as Blob) ); } - - /** - * @param data undefined - */ - PrintAbholfachetikettResponse(data: PrintRequestOfIEnumerableOfLong): __Observable<__StrictHttpResponse> { + PrintStatusResponse(): __Observable<__StrictHttpResponse> { let __params = this.newParams(); let __headers = new HttpHeaders(); let __body: any = null; - __body = data; let req = new HttpRequest( - 'POST', - this.rootUrl + `/print/abholfachetikett`, + 'GET', + this.rootUrl + `/print/status`, __body, { headers: __headers, params: __params, - responseType: 'json' + responseType: 'blob' }); return this.http.request(req).pipe( __filter(_r => _r instanceof HttpResponse), __map((_r) => { - return _r as __StrictHttpResponse; + return _r as __StrictHttpResponse; }) ); - } - /** - * @param data undefined - */ - PrintAbholfachetikett(data: PrintRequestOfIEnumerableOfLong): __Observable { - return this.PrintAbholfachetikettResponse(data).pipe( - __map(_r => _r.body as ResponseArgs) - ); - } - - /** - * @param data undefined - */ - PrintWarenkorbResponse(data: PrintRequestOfLong): __Observable<__StrictHttpResponse> { - let __params = this.newParams(); - let __headers = new HttpHeaders(); - let __body: any = null; - __body = data; - let req = new HttpRequest( - 'POST', - this.rootUrl + `/print/cart`, - __body, - { - headers: __headers, - params: __params, - responseType: 'json' - }); - - return this.http.request(req).pipe( - __filter(_r => _r instanceof HttpResponse), - __map((_r) => { - return _r as __StrictHttpResponse; - }) - ); - } - /** - * @param data undefined - */ - PrintWarenkorb(data: PrintRequestOfLong): __Observable { - return this.PrintWarenkorbResponse(data).pipe( - __map(_r => _r.body as ResponseArgs) - ); - } - - /** - * @param data undefined - */ - PrintArtikelDetailResponse(data: PrintRequestOfIEnumerableOfItemDTO): __Observable<__StrictHttpResponse> { - let __params = this.newParams(); - let __headers = new HttpHeaders(); - let __body: any = null; - __body = data; - let req = new HttpRequest( - 'POST', - this.rootUrl + `/print/article/detail`, - __body, - { - headers: __headers, - params: __params, - responseType: 'json' - }); - - return this.http.request(req).pipe( - __filter(_r => _r instanceof HttpResponse), - __map((_r) => { - return _r as __StrictHttpResponse; - }) - ); - } - /** - * @param data undefined - */ - PrintArtikelDetail(data: PrintRequestOfIEnumerableOfItemDTO): __Observable { - return this.PrintArtikelDetailResponse(data).pipe( - __map(_r => _r.body as ResponseArgs) - ); - } - - /** - * @param data undefined - */ - PrintArtikelListeResponse(data: PrintRequestOfIEnumerableOfItemDTO): __Observable<__StrictHttpResponse> { - let __params = this.newParams(); - let __headers = new HttpHeaders(); - let __body: any = null; - __body = data; - let req = new HttpRequest( - 'POST', - this.rootUrl + `/print/article/list`, - __body, - { - headers: __headers, - params: __params, - responseType: 'json' - }); - - return this.http.request(req).pipe( - __filter(_r => _r instanceof HttpResponse), - __map((_r) => { - return _r as __StrictHttpResponse; - }) - ); - } - /** - * @param data undefined - */ - PrintArtikelListe(data: PrintRequestOfIEnumerableOfItemDTO): __Observable { - return this.PrintArtikelListeResponse(data).pipe( - __map(_r => _r.body as ResponseArgs) - ); - } - - /** - * @param data undefined - */ - PrintWarenbegleitscheineResponse(data: PrintRequestOfLong): __Observable<__StrictHttpResponse> { - let __params = this.newParams(); - let __headers = new HttpHeaders(); - let __body: any = null; - __body = data; - let req = new HttpRequest( - 'POST', - this.rootUrl + `/print/warenbegleitscheine`, - __body, - { - headers: __headers, - params: __params, - responseType: 'json' - }); - - return this.http.request(req).pipe( - __filter(_r => _r instanceof HttpResponse), - __map((_r) => { - return _r as __StrictHttpResponse; - }) - ); - } - /** - * @param data undefined - */ - PrintWarenbegleitscheine(data: PrintRequestOfLong): __Observable { - return this.PrintWarenbegleitscheineResponse(data).pipe( - __map(_r => _r.body as ResponseArgs) + } PrintStatus(): __Observable { + return this.PrintStatusResponse().pipe( + __map(_r => _r.body as Blob) ); } }