[HIMA-1087] fixed issue with address validation that would show not correctly invalid address

This commit is contained in:
Eraldo Hasanaj
2020-02-19 14:10:58 +01:00
parent 8342aafd8e
commit 254803e240
53 changed files with 155 additions and 145 deletions

View File

@@ -251,7 +251,13 @@
!create || deliveryAndGuestOrOnline || pickUpOrTakeNowAndOnline || downloadAndOnline || onlineChecked || guestChecked
"
[error]="submitted && f.country.errors"
[errorMessage]="f.city.errors && f.city.errors.backendValidation ? f.city.errors.backendValidationMsg : 'Land wird benötigt'"
[errorMessage]="
countryGeneralError
? 'Ungültige Eingabe des Landes'
: f.city.errors && f.city.errors.backendValidation
? f.city.errors.backendValidationMsg
: 'Land wird benötigt'
"
[value]="f.country.value"
[maxheight]="'360px'"
[scroll]="true"

View File

@@ -83,6 +83,7 @@ export class CreateCustomerCardComponent implements OnInit, OnDestroy {
addressGeneralError = false;
addressNoGeneralError = false;
zipGeneralError = false;
countryGeneralError = false;
shouldValidateAddressForSimpleCustomer = false;
lastEmailValueChecked: string;
lastEmailCheckResult: any = null;
@@ -180,7 +181,6 @@ export class CreateCustomerCardComponent implements OnInit, OnDestroy {
});
(this.cartHasItemsForDelivery && !this.cartHasItemsForDownload && !this.onlineChecked).ifTrue(this.guestCheckboxInitialization);
console.log('types set', this.guestChecked, this.onlineChecked);
};
guestCheckboxInitialization = () => {
@@ -223,7 +223,6 @@ export class CreateCustomerCardComponent implements OnInit, OnDestroy {
// store user form data on changes
this.userForm.valueChanges.pipe(takeUntil(this.destroy$)).subscribe(v => {
console.log('v', v);
const formStateString = JSON.stringify(v);
const errors = {};
Object.keys(v).forEach(field => {
@@ -537,11 +536,16 @@ export class CreateCustomerCardComponent implements OnInit, OnDestroy {
this.userForm.get('zipCode').setErrors({ backendValidation: true, backendValidationMsg: invalid.ZipCode });
this.submitted = true;
}
if (invalid.Country) {
this.userForm.get('country').setErrors({ backendValidation: true, backendValidationMsg: invalid.Country });
this.submitted = true;
}
if (invalid.General) {
this.cityGeneralError = true;
this.addressGeneralError = true;
this.addressNoGeneralError = true;
this.zipGeneralError = true;
this.countryGeneralError = true;
this.submitted = true;
}
scrollToFirstInvalidElement();

View File

@@ -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;
/**
* Shop
* Stock Status Code / Beschreibung
*/
shop?: any;
sscText?: string;
/**
* Verfügbare Menge

View File

@@ -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<ImageDTO>;
/**
* Weitere Artikel-IDs
* Verfügbarkeit laut Katalog
*/
ids?: {[key: string]: number};
catalogAvailability?: any;
/**
* Verfügbarkeit zur Bestellung in die Filiale

View File

@@ -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;
/**
* Bezeichner
* Katalogbereich
*/
friendlyName?: string;
catalogType?: any;
/**
* Filter

View File

@@ -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;
supplierProductNumber?: string;
ssc?: string;
sscText?: string;
qty?: number;
isPrebooked?: boolean;

View File

@@ -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;
supplierProductNumber?: string;
price?: PriceDTO;
ssc?: string;
estimatedShipping?: string;
shopId?: number;

View File

@@ -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;
careOf?: string;
street?: string;
streetNumber?: string;
zipCode?: string;
state?: string;

View File

@@ -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;
careOf?: string;
region?: string;
street?: string;
streetNumber?: string;
zipCode?: string;

View File

@@ -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;
inStock?: number;
supplierSSCText?: string;
price?: PriceDTO;
estimatedShippingDate?: string;
shopItem?: EntityDTOContainerOfShopItemDTO;

View File

@@ -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;
parent?: number;
isOnline?: boolean;
isOrderingEnabled?: boolean;
isShippingEnabled?: boolean;
address?: Address;

View File

@@ -1,18 +1,18 @@
/* tslint:disable */
import { EntityReferenceDTO } from './entity-reference-dto';
import { Gender } from './gender';
import { BuyerType } from './buyer-type';
import { Gender } from './gender';
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;
buyerType: BuyerType;
firstName?: string;
lastName?: string;
dateOfBirth?: string;
communicationDetails?: CommunicationDetailsDTO;

View File

@@ -1,24 +1,24 @@
/* tslint:disable */
import { EntityDTOOfCheckoutDTOAndICheckout } from './entity-dtoof-checkout-dtoand-icheckout';
import { EntityDTOContainerOfCheckoutItemDTO } from './entity-dtocontainer-of-checkout-item-dto';
import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-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 { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto';
import { EntityDTOContainerOfCheckoutItemDTO } from './entity-dtocontainer-of-checkout-item-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<EntityDTOContainerOfCheckoutItemDTO>;
label?: string;
orderBranch?: EntityDTOContainerOfBranchDTO;
userAccount?: UserAccountDTO;
buyer?: BuyerDTO;
payer?: PayerDTO;
destinations?: Array<EntityDTOContainerOfDestinationDTO>;
deliveries?: Array<EntityDTOContainerOfCheckoutDeliveryDTO>;
orderBranch?: EntityDTOContainerOfBranchDTO;
items?: Array<EntityDTOContainerOfCheckoutItemDTO>;
notificationChannels: NotificationChannel;
availableShippingTargets?: Array<SelectionDTOOfShippingTarget>;
payment?: PaymentDTO;

View File

@@ -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;
locale?: string;
department?: string;
costUnit?: string;
vatId?: string;
address?: AddressDTO;

View File

@@ -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;
description?: string;
quantityMax?: number;
quantityUnitType: QuantityUnitType;
unit?: string;
displayType: ComponentItemDisplayType;

View File

@@ -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;
type?: string;
size?: number;
subtitle?: string;
copyright?: string;
locale?: string;

View File

@@ -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<EntityDTOContainerOfCategoryDTO>;
manufacturingCosts?: number;
size?: SizeOfString;
name?: string;
weight?: WeightOfAvoirdupois;
netWeight?: WeightOfAvoirdupois;
weightOfPackaging?: WeightOfAvoirdupois;
itemType: ItemType;

View File

@@ -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;
payerType: PayerType;
firstName?: string;
lastName?: string;
dateOfBirth?: string;
communicationDetails?: CommunicationDetailsDTO;

View File

@@ -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;
additionalName?: string;
productGroup?: string;
edition?: string;
volume?: string;
serial?: string;

View File

@@ -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;
description?: string;
orderingEnabledStart?: string;
orderingEnabledStop?: string;
shippingEnabledStart?: string;
shippingEnabledStop?: string;

View File

@@ -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;
ssc?: string;
specialComment?: string;
lastAvailabilityRequest?: string;
shoppingCartItemStatus: ShoppingCartItemStatus;
total?: PriceDTO;

View File

@@ -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;
userName?: string;
title?: string;
firstName?: string;
lastName?: string;
dateOfBirth?: string;

View File

@@ -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;
careOf?: string;
street?: string;
streetNumber?: string;
zipCode?: string;
state?: string;

View File

@@ -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;
/**
* Format (Karte, App, ...)
* Geburtsdatum
*/
format?: string;
dateOfBirth?: string;
/**
* E-Mail Adresse

View File

@@ -1,5 +1,6 @@
/* 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';
@@ -9,7 +10,6 @@ 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<EntityDTOContainerOfShippingAddressDTO>;
clientChannel?: EnvironmentChannel;
agentComment?: string;
statusChangeComment?: string;
deactivationComment?: string;
statusComment?: string;

View File

@@ -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;
userName?: string;
dateOfBirth?: string;
communicationDetails?: CommunicationDetailsDTO;
address?: AddressDTO;
agentComment?: string;

View File

@@ -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;
user?: string;
allowRequested?: string;
allowRequestToken?: string;
allow?: string;
denyRequested?: string;

View File

@@ -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;
payerGroup?: string;
address?: AddressDTO;
communicationDetails?: CommunicationDetailsDTO;
agentComment?: string;
statusChangeComment?: string;

View File

@@ -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;
title?: string;
address?: AddressDTO;
agentComment?: string;
type: ShippingAddressType;
isDefault?: string;

View File

@@ -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;
careOf?: string;
street?: string;
streetNumber?: string;
zipCode?: string;
state?: string;

View File

@@ -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;
careOf?: string;
street?: string;
streetNumber?: string;
zipCode?: string;
state?: string;

View File

@@ -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;
careOf?: string;
region?: string;
street?: string;
streetNumber?: string;
zipCode?: string;

View File

@@ -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;
supplierProductNumber?: string;
ssc?: string;
sscText?: string;
qty?: number;
isPrebooked?: boolean;

View File

@@ -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;
parent?: number;
isOnline?: boolean;
isOrderingEnabled?: boolean;
isShippingEnabled?: boolean;
address?: Address;

View File

@@ -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;
buyerType: BuyerType;
title?: string;
firstName?: string;
lastName?: string;
communicationDetails?: CommunicationDetailsDTO;

View File

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

View File

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

View File

@@ -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;
orderItemSubsetNumber?: string;
supplierLabel?: string;
processingStatus: OrderItemProcessingStatusValue;
processingStatusDate?: string;
trackingNumber?: string;

View File

@@ -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;
paymentType: PaymentType;
shipping?: number;
tax?: number;
currency?: string;
dateOfPayment?: string;

View File

@@ -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 { EnvironmentChannel } from './environment-channel';
import { EntityDTOContainerOfPayerDTO } from './entity-dtocontainer-of-payer-dto';
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;
clientChannel?: EnvironmentChannel;
payer?: EntityDTOContainerOfPayerDTO;
paymentType?: PaymentType;
paymentComment?: string;
payment?: EntityDTOContainerOfPaymentDTO;

View File

@@ -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<EntityDTOContainerOfOrderItemSubsetDTO>;
buyerComment?: string;
invoiceText?: string;
product?: ProductDTO;
quantity?: number;
quantityUnitType?: QuantityUnitType;
quantityUnit?: string;
grossPrice?: PriceDTO;

View File

@@ -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;
orderItemId?: number;
currency?: string;
buyerNumber?: string;
organisation?: string;
gender?: Gender;

View File

@@ -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<number>;
branchId?: number;
fuzzy?: number;
filter?: {[key: string]: string};
orderBy?: Array<OrderByDTO2>;
skip?: number;

View File

@@ -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;
orderItemSubsetNumber?: string;
specialComment?: string;
isPrebooked?: boolean;
processingStatus?: OrderItemProcessingStatusValue;
processingStatusDate?: string;

View File

@@ -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;
orderId?: number;
processingStatus?: OrderProcessingStatus;
orderDate?: string;
organisation?: string;
gender?: Gender;

View File

@@ -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<number>;
branchNumber?: string;
fuzzy?: number;
filter?: {[key: string]: string};
orderBy?: Array<OrderByDTO>;
skip?: number;

View File

@@ -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;
payerType: PayerType;
title?: string;
firstName?: string;
lastName?: string;
organisation?: OrganisationDTO;

View File

@@ -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;
paymentNumber?: string;
currency?: string;
dateOfPayment?: string;
cancelled?: string;
dunning1?: string;

View File

@@ -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;
additionalName?: string;
productGroup?: string;
edition?: string;
volume?: string;
serial?: string;

View File

@@ -1,11 +1,11 @@
/* tslint:disable */
import { EntityReferenceDTO } from './entity-reference-dto';
import { PaymentType } from './payment-type';
import { ReceiptType } from './receipt-type';
import { PaymentType } from './payment-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;
orderNumber?: string;
paymentType?: PaymentType;
paymentStatus?: PaymentStatus2;
statusDate?: string;
payerNumber?: string;

View File

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

View File

@@ -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<SpecDTO>;
texts?: Array<TextDTO>;
images?: Array<ImageDTO>;
ids?: {[key: string]: number};
catalogAvailability?: AvailabilityDTO;
storeAvailabilities?: Array<AvailabilityDTO>;
shippingAvailabilities?: Array<AvailabilityDTO>;
stockInfos?: Array<StockInfoDTO>;

View File

@@ -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;
additionalName?: string;
productGroup?: string;
edition?: string;
volume?: string;
serial?: string;