diff --git a/apps/core/application/src/lib/defs/application-process.ts b/apps/core/application/src/lib/defs/application-process.ts index 425924933..4eb56df8d 100644 --- a/apps/core/application/src/lib/defs/application-process.ts +++ b/apps/core/application/src/lib/defs/application-process.ts @@ -1,7 +1,5 @@ -import { StringDictionary } from '@cmf/core'; - export interface ApplicationProcess { id: number; name: string; - data: StringDictionary; + data: { [key: string]: any }; } diff --git a/apps/domain/checkout/src/lib/checkout.service.ts b/apps/domain/checkout/src/lib/checkout.service.ts index c339b34a0..24133acaa 100644 --- a/apps/domain/checkout/src/lib/checkout.service.ts +++ b/apps/domain/checkout/src/lib/checkout.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { StringDictionary } from '@cmf/core'; import { Store } from '@ngrx/store'; import { AddToShoppingCartDTO, @@ -606,8 +605,8 @@ export class DomainCheckoutService { customerFeatures, }: { processId: number; - customerFeatures?: StringDictionary; - }): Observable<{ ok?: boolean; filter?: StringDictionary; message?: string; create?: InputDTO }> { + customerFeatures?: { [key: string]: string }; + }): Observable<{ ok?: boolean; filter?: { [key: string]: string }; message?: string; create?: InputDTO }> { return this.getShoppingCart({ processId }).pipe( first(), mergeMap((shoppingCart) => @@ -644,10 +643,10 @@ export class DomainCheckoutService { return this.store.select(DomainCheckoutSelectors.selectBuyerCommunicationDetails, { processId }); } - getSetableCustomerTypes(processId: number): Observable> { + getSetableCustomerTypes(processId: number): Observable<{ [key: string]: boolean }> { return this.canSetCustomer({ processId, customerFeatures: undefined }).pipe( map((res) => { - let setableTypes: StringDictionary = { + let setableTypes: { [key: string]: boolean } = { store: true, guest: true, webshop: true, @@ -699,11 +698,11 @@ export class DomainCheckoutService { ); } - setCustomerFeatures({ processId, customerFeatures }: { processId: number; customerFeatures: StringDictionary }) { + setCustomerFeatures({ processId, customerFeatures }: { processId: number; customerFeatures: { [key: string]: string } }) { this.store.dispatch(DomainCheckoutActions.setCustomerFeatures({ processId, customerFeatures })); } - getCustomerFeatures({ processId }: { processId: number }): Observable> { + getCustomerFeatures({ processId }: { processId: number }): Observable<{ [key: string]: string }> { return this.store.select(DomainCheckoutSelectors.selectCustomerFeaturesByProcessId, { processId }); } diff --git a/apps/domain/checkout/src/lib/store/defs/checkout.entity.ts b/apps/domain/checkout/src/lib/store/defs/checkout.entity.ts index 916194026..cf50993ef 100644 --- a/apps/domain/checkout/src/lib/store/defs/checkout.entity.ts +++ b/apps/domain/checkout/src/lib/store/defs/checkout.entity.ts @@ -1,4 +1,3 @@ -import { StringDictionary } from '@cmf/core'; import { BuyerDTO, CheckoutDTO, NotificationChannel, PayerDTO, ShippingAddressDTO, ShoppingCartDTO } from '@swagger/checkout'; import { DisplayOrderDTO } from '@swagger/oms'; @@ -6,7 +5,7 @@ export interface CheckoutEntity { processId: number; checkout: CheckoutDTO; shoppingCart: ShoppingCartDTO; - customerFeatures: StringDictionary; + customerFeatures: { [key: string]: string }; payer: PayerDTO; buyer: BuyerDTO; shippingAddress: ShippingAddressDTO; diff --git a/apps/domain/checkout/src/lib/store/domain-checkout.actions.ts b/apps/domain/checkout/src/lib/store/domain-checkout.actions.ts index a880601b3..6f313259b 100644 --- a/apps/domain/checkout/src/lib/store/domain-checkout.actions.ts +++ b/apps/domain/checkout/src/lib/store/domain-checkout.actions.ts @@ -1,4 +1,3 @@ -import { StringDictionary } from '@cmf/core'; import { createAction, props } from '@ngrx/store'; import { ShoppingCartDTO, @@ -41,7 +40,7 @@ export const setCheckoutDestination = createAction( export const setCustomerFeatures = createAction( `${prefix} Set Customer Features`, - props<{ processId: number; customerFeatures: StringDictionary }>() + props<{ processId: number; customerFeatures: { [key: string]: string } }>() ); export const setShippingAddress = createAction( diff --git a/apps/domain/checkout/src/lib/store/domain-checkout.reducer.ts b/apps/domain/checkout/src/lib/store/domain-checkout.reducer.ts index 8120e3734..dbdf4962e 100644 --- a/apps/domain/checkout/src/lib/store/domain-checkout.reducer.ts +++ b/apps/domain/checkout/src/lib/store/domain-checkout.reducer.ts @@ -5,7 +5,6 @@ import * as DomainCheckoutActions from './domain-checkout.actions'; import { Dictionary } from '@ngrx/entity'; import { CheckoutEntity } from './defs/checkout.entity'; import { isNullOrUndefined } from '@utils/common'; -import { NotificationChannel } from '@cmf/core'; const _domainCheckoutReducer = createReducer( initialCheckoutState, @@ -94,7 +93,7 @@ function getOrCreateCheckoutEntity({ entities, processId }: { entities: Dictiona payer: undefined, buyer: undefined, specialComment: '', - notificationChannels: NotificationChannel.NotSet, + notificationChannels: 0, }; } diff --git a/apps/domain/crm/src/lib/crm-customer.service.ts b/apps/domain/crm/src/lib/crm-customer.service.ts index 9d399064e..39d0e8ff2 100644 --- a/apps/domain/crm/src/lib/crm-customer.service.ts +++ b/apps/domain/crm/src/lib/crm-customer.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { StringDictionary } from '@cmf/core'; import { AddressDTO, AssignedPayerDTO, @@ -26,7 +25,7 @@ import { catchError, map, mergeMap, retry } from 'rxjs/operators'; export class CrmCustomerService { constructor(private customerService: CustomerService, private payerService: PayerService) {} - complete(queryString: string, filter?: StringDictionary): Observable> { + complete(queryString: string, filter?: { [key: string]: string }): Observable> { return this.customerService.CustomerCustomerAutocomplete({ input: queryString, filter: filter || {}, @@ -44,7 +43,7 @@ export class CrmCustomerService { getCustomers( queryString: string, - options: { take?: number; skip?: number; filter?: StringDictionary } = { take: 20, skip: 0 } + options: { take?: number; skip?: number; filter?: { [key: string]: string } } = { take: 20, skip: 0 } ): Observable> { return this.customerService.CustomerListCustomers({ input: !!queryString ? { qs: queryString } : undefined, diff --git a/apps/isa/remission/src/lib/mappings/item-dto-to-product.mapping.ts b/apps/isa/remission/src/lib/mappings/item-dto-to-product.mapping.ts index d88cfde6d..59573f353 100644 --- a/apps/isa/remission/src/lib/mappings/item-dto-to-product.mapping.ts +++ b/apps/isa/remission/src/lib/mappings/item-dto-to-product.mapping.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { Mapper } from './mapper'; -import { ItemDTO } from '@isa/catsearch-api'; import { Product } from '../models/product'; +import { ItemDTO } from '@swagger/cat'; @Injectable() export class ItemDtoToProductMapping implements Mapper { @@ -36,6 +36,6 @@ export class ItemDtoToProductMapping implements Mapper { sourcePrice: (source.storeAvailabilities && source.storeAvailabilities[0] && source.storeAvailabilities[0].price) || (source.catalogAvailability && source.catalogAvailability.price), - } as Product; + } as any; } } diff --git a/apps/isa/remission/src/lib/mappings/product-to-price-dto.ts b/apps/isa/remission/src/lib/mappings/product-to-price-dto.ts index a660a3c3c..65c856863 100644 --- a/apps/isa/remission/src/lib/mappings/product-to-price-dto.ts +++ b/apps/isa/remission/src/lib/mappings/product-to-price-dto.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { PriceDTO } from '@cmf/inventory-api'; import { Mapper } from './mapper'; import { Product } from '../models/product'; +import { PriceDTO } from '@swagger/remi'; @Injectable() export class ProductToPriceDTOMapping implements Mapper { diff --git a/apps/isa/remission/src/lib/mappings/product-to-product-dto.ts b/apps/isa/remission/src/lib/mappings/product-to-product-dto.ts index 1cd396633..4f803f508 100644 --- a/apps/isa/remission/src/lib/mappings/product-to-product-dto.ts +++ b/apps/isa/remission/src/lib/mappings/product-to-product-dto.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { ProductDTO } from '@cmf/inventory-api'; import { Mapper } from './mapper'; import { Product } from '../models/product'; +import { ProductDTO } from '@swagger/remi'; @Injectable() export class ProductToProductDTOMapping implements Mapper { diff --git a/apps/isa/remission/src/lib/mappings/receipt-dto-to-shipping-document.mapping.ts b/apps/isa/remission/src/lib/mappings/receipt-dto-to-shipping-document.mapping.ts index ce1be69f7..8c0e764f3 100644 --- a/apps/isa/remission/src/lib/mappings/receipt-dto-to-shipping-document.mapping.ts +++ b/apps/isa/remission/src/lib/mappings/receipt-dto-to-shipping-document.mapping.ts @@ -1,13 +1,12 @@ import { Injectable } from '@angular/core'; import { Mapper } from './mapper'; -import { ReceiptDTO } from '@cmf/inventory-api'; import { ReceiptItemDtoToRemissionProductMapping } from './receipt-item-dto-to-remission-product.mapping'; import { MappingService } from './mapping.service'; import { ShippingDocument } from '../models/shipping-document'; +import { ReceiptDTO } from '@swagger/remi'; @Injectable() -export class ReceiptDTOToShippingDocumentMapping - implements Mapper { +export class ReceiptDTOToShippingDocumentMapping implements Mapper { constructor(private mappingService: MappingService) {} get sourceName() { @@ -19,20 +18,12 @@ export class ReceiptDTOToShippingDocumentMapping } map(source: ReceiptDTO): ShippingDocument { - const productMapper = this.mappingService.get< - ReceiptItemDtoToRemissionProductMapping - >('ReceiptItemDTO', 'RemissionProduct'); + const productMapper = this.mappingService.get('ReceiptItemDTO', 'RemissionProduct'); return { id: source.id, shippingDocumentNumber: source.receiptNumber, - packageNumber: - source.packages && - source.packages[0] && - source.packages[0].data && - source.packages[0].data.packageNumber, - products: source.items.map((item) => - productMapper.map(item.data || item) - ), + packageNumber: source.packages && source.packages[0] && source.packages[0].data && source.packages[0].data.packageNumber, + products: source.items.map((item) => productMapper.map(item.data || item)), isCompleted: !!source.completed || source.status === 4 ? true : false, isDeleted: source.status === 4, }; diff --git a/apps/isa/remission/src/lib/mappings/receipt-item-dto-to-remission-product.mapping.ts b/apps/isa/remission/src/lib/mappings/receipt-item-dto-to-remission-product.mapping.ts index a21340a2b..1374b99ce 100644 --- a/apps/isa/remission/src/lib/mappings/receipt-item-dto-to-remission-product.mapping.ts +++ b/apps/isa/remission/src/lib/mappings/receipt-item-dto-to-remission-product.mapping.ts @@ -1,7 +1,7 @@ import { Mapper } from './mapper'; -import { ReceiptItemDTO } from '@cmf/inventory-api'; import { Injectable } from '@angular/core'; import { RemissionProduct } from '../models/remission-product'; +import { ReceiptItemDTO } from '@swagger/remi'; @Injectable() export class ReceiptItemDtoToRemissionProductMapping implements Mapper { diff --git a/apps/isa/remission/src/lib/mappings/return-item-dto-to-remission-product.mapping.ts b/apps/isa/remission/src/lib/mappings/return-item-dto-to-remission-product.mapping.ts index 9c5ec01cb..c8a979731 100644 --- a/apps/isa/remission/src/lib/mappings/return-item-dto-to-remission-product.mapping.ts +++ b/apps/isa/remission/src/lib/mappings/return-item-dto-to-remission-product.mapping.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { ReturnItemDTO } from '@cmf/inventory-api'; import { Mapper } from './mapper'; import { RemissionProduct } from '../models/remission-product'; +import { ReturnItemDTO } from '@swagger/remi'; @Injectable() export class ReturnItemDtoToRemissionProductMapping implements Mapper { diff --git a/apps/isa/remission/src/lib/mappings/return-suggestion-dto-to-remission-product.mapping.ts b/apps/isa/remission/src/lib/mappings/return-suggestion-dto-to-remission-product.mapping.ts index 733476cc1..dbc78c002 100644 --- a/apps/isa/remission/src/lib/mappings/return-suggestion-dto-to-remission-product.mapping.ts +++ b/apps/isa/remission/src/lib/mappings/return-suggestion-dto-to-remission-product.mapping.ts @@ -1,7 +1,7 @@ -import { ReturnSuggestionDTO } from '@cmf/inventory-api'; import { Injectable } from '@angular/core'; import { Mapper } from './mapper'; import { RemissionProduct } from '../models/remission-product'; +import { ReturnSuggestionDTO } from '@swagger/remi'; @Injectable() export class ReturnSuggestionDtoToRemissionProductMapping implements Mapper { diff --git a/apps/isa/remission/src/lib/mappings/supplier-dto-to-remssion-supplier.mapping.ts b/apps/isa/remission/src/lib/mappings/supplier-dto-to-remssion-supplier.mapping.ts index ee7bbce7f..1a4e46bfc 100644 --- a/apps/isa/remission/src/lib/mappings/supplier-dto-to-remssion-supplier.mapping.ts +++ b/apps/isa/remission/src/lib/mappings/supplier-dto-to-remssion-supplier.mapping.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { SupplierDTO } from '@cmf/inventory-api'; +import { SupplierDTO } from '@swagger/remi'; import { RemissionSupplier } from '../models'; import { Mapper } from './mapper'; diff --git a/apps/isa/remission/src/lib/mock/data/product.ts b/apps/isa/remission/src/lib/mock/data/product.ts index ddbe14564..a3bb834ab 100644 --- a/apps/isa/remission/src/lib/mock/data/product.ts +++ b/apps/isa/remission/src/lib/mock/data/product.ts @@ -1,5 +1,4 @@ import { createRandomId } from '../util'; -import { VATType } from '@cmf/trade-api'; import { Product } from '../../models/product'; export const product: Product = { @@ -30,7 +29,7 @@ export const product: Product = { }, vat: { inPercent: 7, - vatType: VATType.MediumRate, + vatType: 4, // MediumRate = 4, }, }, sourceProduct: { diff --git a/apps/isa/remission/src/lib/models/action-result.ts b/apps/isa/remission/src/lib/models/action-result.ts index 2a93789be..7ae55299b 100644 --- a/apps/isa/remission/src/lib/models/action-result.ts +++ b/apps/isa/remission/src/lib/models/action-result.ts @@ -1,8 +1,6 @@ -import { StringDictionary } from '@cmf/core'; - export interface ActionResult { error?: boolean; - errorReasons?: StringDictionary; + errorReasons?: { [key: string]: string }; http?: { code: number; }; diff --git a/apps/isa/remission/src/lib/models/product.ts b/apps/isa/remission/src/lib/models/product.ts index cb648ce14..ec9e4a5b4 100644 --- a/apps/isa/remission/src/lib/models/product.ts +++ b/apps/isa/remission/src/lib/models/product.ts @@ -1,4 +1,4 @@ -import { PriceDTO, ProductDTO } from '@cmf/inventory-api'; +import { PriceDTO, ProductDTO } from '@swagger/remi'; export interface Product { /** diff --git a/apps/isa/remission/src/lib/remission.module.ts b/apps/isa/remission/src/lib/remission.module.ts index 7580b3e6c..3c998324e 100644 --- a/apps/isa/remission/src/lib/remission.module.ts +++ b/apps/isa/remission/src/lib/remission.module.ts @@ -1,7 +1,4 @@ import { RemissionModuleOptions } from './remission-module.options'; -import { CatsearchApiRequestOptions } from '@isa/catsearch-api'; -import { RemiApiRequestOptions } from '@isa/remi-api'; -import { PrintApiRequestOptions } from '@isa/print-api'; import { NgModule, ModuleWithProviders } from '@angular/core'; import { RestRemissionService } from './services/rest-remission.service'; import { MockRemissionService } from './mock/mock-remission.service'; @@ -14,30 +11,9 @@ import { ReturnItemDtoToRemissionProductMapping } from './mappings/return-item-d import { ReceiptItemDtoToRemissionProductMapping } from './mappings/receipt-item-dto-to-remission-product.mapping'; import { ReceiptDTOToShippingDocumentMapping } from './mappings/receipt-dto-to-shipping-document.mapping'; import { RemissionService } from './services/remission.service'; -import { BaseUrlInterceptor, CatchResponseArgsErrorInterceptor, LogErrorInterceptor } from '@cmf/core'; -import { HTTP_INTERCEPTORS } from '@angular/common/http'; import { FeaturesToAssortmentMapping } from './mappings/features-to-assortment.mapping'; import { SupplierDtoToRemissionSupplier } from './mappings/supplier-dto-to-remssion-supplier.mapping'; -export function catsearchApiRequestOptionsFactory(options: RemissionModuleOptions): CatsearchApiRequestOptions { - return { - baseUrl: (options.endpoints && options.endpoints.catsearch) || '', - catchResponseArgsError: true, - }; -} -export function remiApiRequestOptionsFactory(options: RemissionModuleOptions): RemiApiRequestOptions { - return { - baseUrl: (options.endpoints && options.endpoints.remi) || '', - catchResponseArgsError: true, - }; -} -export function printApiRequestOptionsFactory(options: RemissionModuleOptions): PrintApiRequestOptions { - return { - baseUrl: (options.endpoints && options.endpoints.print) || '', - catchResponseArgsError: true, - }; -} - export function remissionServiceFactory(options: RemissionModuleOptions, rest: RestRemissionService, mock: MockRemissionService) { return options.useMock ? mock : rest; } @@ -56,21 +32,6 @@ export class RemissionModule { provide: RemissionModuleOptions, useValue: options, }, - { - provide: CatsearchApiRequestOptions, - useFactory: catsearchApiRequestOptionsFactory, - deps: [RemissionModuleOptions], - }, - { - provide: RemiApiRequestOptions, - useFactory: remiApiRequestOptionsFactory, - deps: [RemissionModuleOptions], - }, - { - provide: PrintApiRequestOptions, - useFactory: printApiRequestOptionsFactory, - deps: [RemissionModuleOptions], - }, { provide: Mapper, useClass: ReturnSuggestionDtoToRemissionProductMapping, @@ -121,21 +82,6 @@ export class RemissionModule { useFactory: remissionServiceFactory, deps: [RemissionModuleOptions, RestRemissionService, MockRemissionService], }, - { - provide: HTTP_INTERCEPTORS, - useClass: BaseUrlInterceptor, - multi: true, - }, - { - provide: HTTP_INTERCEPTORS, - useClass: CatchResponseArgsErrorInterceptor, - multi: true, - }, - { - provide: HTTP_INTERCEPTORS, - useClass: LogErrorInterceptor, - multi: true, - }, ], }; } diff --git a/apps/isa/remission/src/lib/rest/rest-filter.service.ts b/apps/isa/remission/src/lib/rest/rest-filter.service.ts index 9aaf340ce..ae6119c50 100644 --- a/apps/isa/remission/src/lib/rest/rest-filter.service.ts +++ b/apps/isa/remission/src/lib/rest/rest-filter.service.ts @@ -1,11 +1,10 @@ import { Injectable } from '@angular/core'; import { Observable, of } from 'rxjs'; -import { StringDictionary, InputDTO, OptionDTO } from '@cmf/core'; -import { RemiService, FilterParams } from '@isa/remi-api'; -import { map, shareReplay } from 'rxjs/operators'; +import { delay, map, shareReplay } from 'rxjs/operators'; import { FilterOption, Filter } from '../models/filter'; import { RemissionSourceType } from '../types/remission-source.type'; import { RemissionFilter, RemissionSelectedFilters } from '../models'; +import { InputDTO, OptionDTO, RemiService } from '@swagger/remi'; @Injectable({ providedIn: 'root' }) export class RestFilterService { @@ -59,8 +58,8 @@ export class RestFilterService { remissionTargetName: string; stockId: number; filter: RemissionFilter; - }): Observable> { - const queryTokenFilter: StringDictionary = {}; + }): Observable<{ [key: string]: string }> { + const queryTokenFilter: { [key: string]: string } = {}; const filter = params.filter.filter[params.remissionSourceType] && params.filter.filter[params.remissionSourceType][params.remissionTargetName]; @@ -88,15 +87,15 @@ export class RestFilterService { stockId: number; }): Observable { let filter$: Observable; - const filterQuery: FilterParams = { + const filterQuery: RemiService.RemiGetPflichtremissionFilter2Params = { stockId: params.stockId, supplierId: params.supplierId, }; if (params.remissionSourceType === 'zentral') { - filter$ = this.remiService.getPflichtremissionFilter(filterQuery).pipe(map((response) => response.result)); + filter$ = this.remiService.RemiGetPflichtremissionFilter2(filterQuery).pipe(map((response) => response.result)); } else { - filter$ = this.remiService.getUeberlaufFilter(filterQuery).pipe(map((response) => response.result)); + filter$ = this.remiService.RemiGetUeberlaufFilter(filterQuery).pipe(map((response) => response.result)); } return filter$; diff --git a/apps/isa/remission/src/lib/rest/rest-remission-products.service.ts b/apps/isa/remission/src/lib/rest/rest-remission-products.service.ts index edc6e7dfa..b309e1e9a 100644 --- a/apps/isa/remission/src/lib/rest/rest-remission-products.service.ts +++ b/apps/isa/remission/src/lib/rest/rest-remission-products.service.ts @@ -1,22 +1,20 @@ import { Injectable } from '@angular/core'; import { Observable, combineLatest, BehaviorSubject, forkJoin, of } from 'rxjs'; -import { RemiService, ReturnApiService } from '@isa/remi-api'; import { RestFilterService } from './rest-filter.service'; import { switchMap, map, flatMap, mergeMap, startWith, take, shareReplay } from 'rxjs/operators'; import { filter as rxjsFilter } from 'rxjs/operators'; import { MappingService } from '../mappings/mapping.service'; import { Mapper } from '../mappings/mapper'; -import { ReturnSuggestionDTO, ReturnItemDTO } from '@cmf/inventory-api'; import { RemissionFilter } from '../models/remission-filter'; import { RemissionProduct } from '../models/remission-product'; -import { KeyValueDTO } from '@cmf/core'; import { isNumber } from 'util'; +import { RemiService, ReturnItemDTO, ReturnSuggestionDTO, KeyValueDTOOfStringAndString, ReturnService } from '@swagger/remi'; @Injectable({ providedIn: 'root' }) export class RestRemissionProductsService { constructor( private remiService: RemiService, - private returnApi: ReturnApiService, + private returnService: ReturnService, private restFilterService: RestFilterService, private mapping: MappingService ) {} @@ -27,7 +25,7 @@ export class RestRemissionProductsService { [2, new BehaviorSubject([])], ]); - productGroupNames$: Observable[]>; + productGroupNames$: Observable; // Products that should be shown on top right after adding to remission list updatePriorityProducts(productId: number, supplierId: number) { @@ -64,10 +62,10 @@ export class RestRemissionProductsService { applicablePriorityProducts2$.next(applicablePriorityProducts$.value.filter((id) => productId !== id)); } - getProductGroupNames(stockId: number): Observable[]> { + getProductGroupNames(stockId: number): Observable { if (!this.productGroupNames$) { this.productGroupNames$ = this.remiService - .productgroups({ stockId }) + .RemiProductgroups({ stockId }) .pipe(map((response) => response.result)) .pipe(shareReplay()); } @@ -96,7 +94,7 @@ export class RestRemissionProductsService { const regularProducts$ = filter$.pipe( switchMap((qtFilter) => - this.remiService.ueberlauf({ + this.remiService.RemiUeberlauf({ queryToken: { stockId, supplierId: filter.target.id, @@ -147,7 +145,7 @@ export class RestRemissionProductsService { const priorityItems$ = applicablePriorityProducts$.pipe( switchMap((ids) => (!!showPriorityProducts(ids) ? of(ids) : of([]))), - mergeMap((ids) => forkJoin(ids.map((id) => this.returnApi.getReturnItemById({ itemId: id })))), + mergeMap((ids) => forkJoin(ids.map((id) => this.returnService.ReturnGetReturnItemById({ itemId: id })))), map((products) => products.map((product) => product.result)), startWith([]), map((products) => products.slice(filter.skip)) @@ -155,7 +153,7 @@ export class RestRemissionProductsService { const regularProducts$ = filter$.pipe( switchMap((qtFilter) => - this.remiService.pflichtremissionsartikel({ + this.remiService.RemiPflichtremissionsartikel({ queryToken: { stockId, supplierId: filter.target.id, @@ -198,7 +196,7 @@ export class RestRemissionProductsService { !result.items.length ? of({ items: [], completed: true }) : this.remiService - .inStock({ + .RemiInStock({ stockId, articleIds: result.items && diff --git a/apps/isa/remission/src/lib/services/rest-remission.service.ts b/apps/isa/remission/src/lib/services/rest-remission.service.ts index 6be671199..9eb865ed1 100644 --- a/apps/isa/remission/src/lib/services/rest-remission.service.ts +++ b/apps/isa/remission/src/lib/services/rest-remission.service.ts @@ -1,13 +1,6 @@ import { Injectable } from '@angular/core'; import { RemissionService } from './remission.service'; -import { - Observable, - of, - combineLatest, - BehaviorSubject, - forkJoin, - throwError, -} from 'rxjs'; +import { Observable, of, combineLatest, BehaviorSubject, forkJoin, throwError, merge, concat, NEVER } from 'rxjs'; import { map, shareReplay, @@ -22,28 +15,11 @@ import { filter, mergeMap, catchError, + first, + retry, + delay, } from 'rxjs/operators'; import { ProcessStoreService } from './process-store.service'; -import { - RemiService, - SupplierApiService, - ReturnApiService, -} from '@isa/remi-api'; -import { SearchApiService, ItemDTO } from '@isa/catsearch-api'; -import { PrintApiService, PrintRequest } from '@isa/print-api'; -import { - ProductDTO, - PriceDTO, - ReturnItemDTO, - ReceiptDTO, - StockReceiptType, - ReceiptItemDTO, - ReturnSuggestionDTO, - SupplierDTO, - ReturnQueryTokenDTO, - AddReturnSuggestionParams, - ReturnDTO, -} from '@cmf/inventory-api'; import { UidGeneratorService } from '../generators/uid-generator.service'; import { RestFilterService } from '../rest/rest-filter.service'; import { MappingService } from '../mappings/mapping.service'; @@ -59,12 +35,30 @@ import { Filter } from '../models/filter'; import { RemissionPlacementType } from '../types/remission-placement-types'; import { RemissionSupplier } from '../models/remission-supplier'; import { ShippingDocument } from '../models/shipping-document'; -import { ResponseArgs } from '@cmf/core'; import { ActionResult, CapacityType } from '../models'; import { compare } from '../utils/compare'; import { addDays } from '../utils/add-days'; -import { isNullOrUndefined, isNumber } from 'util'; -import { shippingDocument } from '../mock/data/shipping-document'; +import { isNullOrUndefined } from 'util'; +import { + RemiService, + SupplierService, + ReturnService, + ReceiptDTO, + SupplierDTO, + ProductDTO, + PriceDTO, + ReturnItemDTO, + ReceiptItemDTO, + ReturnSuggestionValues, + ReturnQueryTokenDTO, + ReturnDTO, + ResponseArgsOfValueTupleOfReceiptItemDTOAndReturnItemDTO, + ResponseArgsOfValueTupleOfReceiptItemDTOAndReturnSuggestionDTO, +} from '@swagger/remi'; +import { ItemDTO, SearchService } from '@swagger/cat'; +import { PrintService, InventoryPrintService, PrintRequestOfString } from '@swagger/print'; +import { memorize } from '@utils/common'; +import { HttpErrorResponse } from '@angular/common/http'; @Injectable({ providedIn: 'root' }) export class RestRemissionService extends RemissionService { @@ -83,7 +77,7 @@ export class RestRemissionService extends RemissionService { }> >(); - stock$ = this.remiService.currentStock({}).pipe( + stock$ = this.remiService.RemiCurrentStock().pipe( map((response) => response.result), shareReplay() ); @@ -94,13 +88,14 @@ export class RestRemissionService extends RemissionService { private uidGenerator: UidGeneratorService, private processStore: ProcessStoreService, private remiService: RemiService, - private supplierAPI: SupplierApiService, - private returnApi: ReturnApiService, + private supplierAPI: SupplierService, + private returnApi: ReturnService, private restFilterService: RestFilterService, private mappingService: MappingService, private restRemissionProcessService: RestRemissionProductsService, - private searchApi: SearchApiService, - private printApi: PrintApiService + private searchApi: SearchService, + private printApi: PrintService, + private inventoryPrintService: InventoryPrintService ) { super(); } @@ -144,9 +139,7 @@ export class RestRemissionService extends RemissionService { } continueProcess(source: RemissionProcess): Observable { - const receiptMapper = this.mappingService.get< - Mapper - >('ReceiptDTO', 'ShippingDocument'); + const receiptMapper = this.mappingService.get>('ReceiptDTO', 'ShippingDocument'); let process$ = this.processStore.get(source.id); @@ -158,103 +151,97 @@ export class RestRemissionService extends RemissionService { return process$.asObservable(); } - const remissionFromBackend$ = this.returnApi - .getReturn({ returnId: source.externalId }) - .pipe( - map((response) => response.result), - mergeMap((returnDto) => { - const remission = { - ...source, - externalId: returnDto.id, - completed: !!returnDto['completed'], + const remissionFromBackend$ = this.returnApi.ReturnGetReturn({ returnId: source.externalId }).pipe( + map((response) => response.result), + mergeMap((returnDto) => { + const remission = { + ...source, + externalId: returnDto.id, + completed: !!returnDto['completed'], + filter: { + ...(source.filter || {}), filter: { - ...(source.filter || {}), - filter: { - ...((source.filter && source.filter.filter) || { - ueberlauf: { - Blank: {}, - ZL: {}, - }, - zentral: { - Blank: {}, - ZL: {}, - }, - }), - }, - }, - }; - - // Do not fetch shipping documents if not set on remission - if (!returnDto.receipts) { - remission.shippingDocuments = []; - return of(remission as RemissionProcess); - } - - // for remissions with old filter settings - if ( - !this.restFilterService.checkFilterValidity(remission.filter.filter) - ) { - remission.filter.filter = this.restFilterService.resetRemissionSelectedFilters(); - } - - return this.returnApi - .getReturnReceipts({ - eagerLoading: 3, - returnId: returnDto.id, - }) - .pipe( - map((response) => response.result), - take(1), - map((receipts) => - receipts.map((receipt) => receiptMapper.map(receipt)) - ), - map((shippingDocuments) => ({ - ...remission, - shippingDocuments, - filter: { - ...remission.filter, - ...source.filter, - filter: { - ...remission.filter.filter, - ...source.filter.filter, - }, + ...((source.filter && source.filter.filter) || { + ueberlauf: { + Blank: {}, + ZL: {}, + }, + zentral: { + Blank: {}, + ZL: {}, }, - })), - withLatestFrom(this.stock$), - mergeMap(([remi, stock]) => { - const shippingDocumentsWithProductGroupNames$ = forkJoin( - // tslint:disable-next-line: no-shadowed-variable - remi.shippingDocuments.map((shippingDocument) => { - const productsWithGroupNames$ = this.restRemissionProcessService.addGroupnameToProducts( - shippingDocument.products, - stock.id - ); - - return productsWithGroupNames$.pipe( - map((products) => ({ - ...shippingDocument, - products, - })) - ); - }) - ); - - return shippingDocumentsWithProductGroupNames$.pipe( - map((shippingDocuments) => ({ - ...remi, - shippingDocuments, - })) - ); }), - tap((continuedRemission) => - this.updateRemissionFilter({ - remissionProcessId: continuedRemission.id, - changes: continuedRemission.filter, + }, + }, + }; + + // Do not fetch shipping documents if not set on remission + if (!returnDto.receipts) { + remission.shippingDocuments = []; + return of(remission as RemissionProcess); + } + + // for remissions with old filter settings + if (!this.restFilterService.checkFilterValidity(remission.filter.filter)) { + remission.filter.filter = this.restFilterService.resetRemissionSelectedFilters(); + } + + return this.returnApi + .ReturnGetReturnReceipts({ + eagerLoading: 3, + returnId: returnDto.id, + }) + .pipe( + map((response) => response.result), + take(1), + map((receipts) => receipts.map((receipt) => receiptMapper.map(receipt))), + map((shippingDocuments) => ({ + ...remission, + shippingDocuments, + filter: { + ...remission.filter, + ...source.filter, + filter: { + ...remission.filter.filter, + ...source.filter.filter, + }, + }, + })), + withLatestFrom(this.stock$), + mergeMap(([remi, stock]) => { + const shippingDocumentsWithProductGroupNames$ = forkJoin( + // tslint:disable-next-line: no-shadowed-variable + remi.shippingDocuments.map((shippingDocument) => { + const productsWithGroupNames$ = this.restRemissionProcessService.addGroupnameToProducts( + shippingDocument.products, + stock.id + ); + + return productsWithGroupNames$.pipe( + map((products) => ({ + ...shippingDocument, + products, + })) + ); }) - ) - ); - }) - ); + ); + + return shippingDocumentsWithProductGroupNames$.pipe( + map((shippingDocuments) => ({ + ...remi, + shippingDocuments, + })) + ); + }), + tap((continuedRemission) => + this.updateRemissionFilter({ + remissionProcessId: continuedRemission.id, + changes: continuedRemission.filter, + }) + ) + ); + }) + ); return combineLatest([process$, remissionFromBackend$]).pipe( map(([process, remissionFromBackend]) => ({ @@ -277,10 +264,7 @@ export class RestRemissionService extends RemissionService { ); } - startRemission(params: { - remissionProcessId: number; - createShippingDocument?: boolean; - }): Observable { + startRemission(params: { remissionProcessId: number; createShippingDocument?: boolean }): Observable { const process$ = this.processStore.get(params.remissionProcessId); if (process$ === undefined) { @@ -289,8 +273,8 @@ export class RestRemissionService extends RemissionService { // prozess starten let nextProcess$ = this.returnApi - .createReturn({ - returnDTO: { + .ReturnCreateReturn({ + data: { supplier: { id: process$.value.filter.target.id, }, @@ -317,9 +301,7 @@ export class RestRemissionService extends RemissionService { (document) => (({ ...process, - shippingDocuments: process.shippingDocuments - ? [...process.shippingDocuments, document] - : [document], + shippingDocuments: process.shippingDocuments ? [...process.shippingDocuments, document] : [document], } as unknown) as RemissionProcess) ) ) @@ -332,9 +314,7 @@ export class RestRemissionService extends RemissionService { } // Schließt eine Remission ab (externalId) - protected completeRemission(params: { - remissionProcessId: number; - }): Observable { + protected completeRemission(params: { remissionProcessId: number }): Observable { const process = this.processStore.get(params.remissionProcessId); console.warn('Remission Completed'); @@ -343,16 +323,14 @@ export class RestRemissionService extends RemissionService { } return this.returnApi - .finalizeReturn({ + .ReturnFinalizeReturn({ returnId: process.value.externalId, }) .pipe(map((response) => !response.error)); } // Schließt alle Remissionen unter einer id (returnGroup) ab - completeRemissions(params: { - remissionProcessId: number; - }): Observable { + completeRemissions(params: { remissionProcessId: number }): Observable { const process = this.processStore.get(params.remissionProcessId); console.warn('Remission Completed'); @@ -361,15 +339,13 @@ export class RestRemissionService extends RemissionService { } return this.returnApi - .finalizeReturnGroup({ + .ReturnFinalizeReturnGroup({ returnGroup: String(process.value.returnGroup), }) .pipe(map((response) => !response.error)); } - getRemission(params: { - remissionProcessId: number; - }): Observable { + getRemission(params: { remissionProcessId: number }): Observable { return this.processStore.get(params.remissionProcessId).asObservable(); } @@ -382,9 +358,7 @@ export class RestRemissionService extends RemissionService { items: RemissionProduct[]; completed: boolean; }> { - const process$ = this.processStore - .get(params.remissionProcessId) - .pipe(distinctUntilChanged((x, y) => compare(x.filter, y.filter))); + const process$ = this.processStore.get(params.remissionProcessId).pipe(distinctUntilChanged((x, y) => compare(x.filter, y.filter))); if (process$ === undefined) { throw new Error('Prozess nicht verfügbar.'); @@ -392,16 +366,10 @@ export class RestRemissionService extends RemissionService { this.reloadProducts(params); - if ( - isNullOrUndefined(this.remissionProducts$.get(params.remissionProcessId)) - ) { + if (isNullOrUndefined(this.remissionProducts$.get(params.remissionProcessId))) { this.remissionProducts$.set( params.remissionProcessId, - combineLatest([ - process$.pipe(distinctUntilChanged(compare)), - this.stock$, - this.reloadProductsSub, - ]).pipe( + combineLatest([process$.pipe(distinctUntilChanged(compare)), this.stock$, this.reloadProductsSub]).pipe( debounceTime(50), switchMap(([process, stock]) => this.restRemissionProcessService.getRemissionproducts({ @@ -417,10 +385,7 @@ export class RestRemissionService extends RemissionService { return this.remissionProducts$.get(params.remissionProcessId); } - updateRemissionFilter(changes: { - remissionProcessId: number; - changes: Partial; - }): Observable { + updateRemissionFilter(changes: { remissionProcessId: number; changes: Partial }): Observable { const processSubject = this.processStore.get(changes.remissionProcessId); if (processSubject === undefined) { @@ -444,21 +409,14 @@ export class RestRemissionService extends RemissionService { // Avoid multiple emissions on multiple updateRemissionFilter calls this.currentRemissionSource$.next(nextProcess.filter.source); - if ( - changes.changes.source === 'ueberlauf' || - (process.filter.source === 'ueberlauf' && !!changes.changes.filter) - ) { - const supplierId = - nextProcess.filter.target && nextProcess.filter.target.id; + if (changes.changes.source === 'ueberlauf' || (process.filter.source === 'ueberlauf' && !!changes.changes.filter)) { + const supplierId = nextProcess.filter.target && nextProcess.filter.target.id; return this.updateCapacities({ selectedFilters, supplierId, }).pipe( map((capacities) => ({ ...nextProcess, capacities })), - takeWhile( - (newProcess) => - newProcess.filter.source === this.currentRemissionSource$.value - ), + takeWhile((newProcess) => newProcess.filter.source === this.currentRemissionSource$.value), take(1), flatMap((newProcess) => this.processStore.set(newProcess)), tap((_) => !!changes.changes.filter && this.reloadProductsSub.next()), @@ -469,19 +427,14 @@ export class RestRemissionService extends RemissionService { this.processStore.set(nextProcess); return processSubject.pipe( - takeWhile( - (newProcess) => - newProcess.filter.source === this.currentRemissionSource$.value - ), + takeWhile((newProcess) => newProcess.filter.source === this.currentRemissionSource$.value), take(1), tap((_) => !!changes.changes.filter && this.reloadProductsSub.next()), map((m) => m.filter) ); } - isPrintingRequired(params: { - remissionProcessId: number; - }): Observable { + isPrintingRequired(params: { remissionProcessId: number }): Observable { const process$ = this.processStore.get(params.remissionProcessId); if (process$ === undefined) { @@ -493,60 +446,41 @@ export class RestRemissionService extends RemissionService { } getPrinters(): Observable { - return this.printApi - .officePrinters() - .pipe( - map((response) => - response.result.map((printer) => (printer as unknown) as Printer) - ) - ); + return this.printApi.PrintOfficePrinters().pipe(map((response) => response.result.map((printer) => (printer as unknown) as Printer))); } - printRemissionList(params: { - remissionProcessId: number; - printerKey: string; - }): Observable { + printRemissionList(params: { remissionProcessId: number; printerKey: string }): Observable { console.warn('Method not available'); return of(false); } - printShippingDocument(params: { - remissionProcessId: number; - shippingDocumentId: number; - printerKey: string; - }): Observable { + printShippingDocument(params: { remissionProcessId: number; shippingDocumentId: number; printerKey: string }): Observable { const process$ = this.processStore.get(params.remissionProcessId); if (process$ === undefined) { throw new Error('Prozess nicht verfügbar.'); } - const printRequest: PrintRequest = { + const printRequest: PrintRequestOfString = { printer: params.printerKey, data: String(process$.value.returnGroup), }; - return this.printApi - .returngroup(printRequest) - .pipe(map((response) => !response.error)); + return this.inventoryPrintService.InventoryPrintPrintReturnGroup(printRequest).pipe(map((response) => !response.error)); } searchProduct(params: { ean: string }): Observable { - const mapper = this.mappingService.get>( - 'ItemDTO', - 'Product' - ); + const mapper = this.mappingService.get>('ItemDTO', 'Product'); const products$ = this.stock$.pipe( flatMap((stock) => this.searchApi - .search({ - queryTokenDTO: { + .SearchSearch({ + queryToken: { + input: { qs: params.ean }, stockId: stock.id, - input: { - qs: params.ean, - }, }, + stockId: null, }) .pipe( catchError((_) => @@ -576,18 +510,14 @@ export class RestRemissionService extends RemissionService { return of(product); } - return this.restRemissionProcessService - .getProductGroupNames(stock.id) - .pipe( - map((groupNames) => { - return { - ...product, - productGroupName: groupNames.find( - (groupName) => groupName.key === product.productGroup - ).value, - }; - }) - ); + return this.restRemissionProcessService.getProductGroupNames(stock.id).pipe( + map((groupNames) => { + return { + ...product, + productGroupName: groupNames.find((groupName) => groupName.key === product.productGroup).value, + }; + }) + ); }) ); @@ -602,58 +532,52 @@ export class RestRemissionService extends RemissionService { } return combineLatest([this.stock$, process$]).pipe( - distinctUntilChanged( - (x, y) => - compare(x[1].filter.source, y[1].filter.source) && - compare(x[1].filter.target, y[1].filter.target) - ), + distinctUntilChanged((x, y) => compare(x[1].filter.source, y[1].filter.source) && compare(x[1].filter.target, y[1].filter.target)), switchMap(([stock, process]) => - this.restFilterService.getFilter({ - remissionSourceType: process.filter.source || null, - supplierId: process.filter.target.id || null, - stockId: stock.id, - }) + concat( + of([]), + this.restFilterService.getFilter({ + remissionSourceType: process.filter.source || null, + supplierId: process.filter.target.id || null, + stockId: stock.id, + }) + ) ) ); } getPlacementTypes(): Observable { - const remissionPlacementTypes: RemissionPlacementType[] = [ - 'Stapel', - 'Leistung', - ]; + const remissionPlacementTypes: RemissionPlacementType[] = ['Stapel', 'Leistung']; return of(remissionPlacementTypes); } getRemissionReasons(): Observable { return this.stock$.pipe( - flatMap((stock) => - this.returnApi.getReturnReasons({ stockId: stock.id }) - ), + flatMap((stock) => this.returnApi.ReturnGetReturnReasons({ stockId: stock.id })), map((response) => response.result.map((reason) => reason.value)) ); } + + @memorize() getRemissionTargets(): Observable { - const supplierMapper = this.mappingService.get< - Mapper - >('SupplierDTO', 'RemissionSupplier'); + const supplierMapper = this.mappingService.get>('SupplierDTO', 'RemissionSupplier'); return this.stock$.pipe( - flatMap((stock) => this.supplierAPI.getSuppliers({ stockId: stock.id })), - map((suppliers) => - suppliers.result.map((supplier) => supplierMapper.map(supplier)) - ), + mergeMap((stock) => this.supplierAPI.SupplierGetSuppliers({ stockId: stock.id })), + map((suppliers) => suppliers.result.map((supplier) => supplierMapper.map(supplier))), + mergeMap((suppliers) => { + return !!suppliers?.length ? of(suppliers) : throwError(new Error('Keine Supplier')); + }), + retry(2), shareReplay() ); } + getRemissionSources(): Observable { const remissionSources: RemissionSourceType[] = ['zentral', 'ueberlauf']; return of(remissionSources); } - getShippingDocuments(params: { - remissionProcessId: number; - shippingDocumentId: number; - }): Observable { + getShippingDocuments(params: { remissionProcessId: number; shippingDocumentId: number }): Observable { const process$ = this.processStore.get(params.remissionProcessId); if (process$ === undefined) { @@ -662,16 +586,11 @@ export class RestRemissionService extends RemissionService { return process$.pipe( filter((p) => !!p.shippingDocuments), - map((p) => - p.shippingDocuments.find((f) => f.id === params.shippingDocumentId) - ) + map((p) => p.shippingDocuments.find((f) => f.id === params.shippingDocumentId)) ); } - deleteProductFromRemissionList(input: { - remissionProcessId: number; - remissionProductId: number; - }): Observable> { + deleteProductFromRemissionList(input: { remissionProcessId: number; remissionProductId: number }): Observable> { const process = this.processStore.get(input.remissionProcessId); if (!process) { @@ -682,22 +601,20 @@ export class RestRemissionService extends RemissionService { }); } - const supplierId = - process.value.filter.target && process.value.filter.target.id; + const supplierId = process.value.filter.target && process.value.filter.target.id; + + // TODO: Fehlerhandling überprüfen return this.returnApi - .deleteReturnItem({ + .ReturnDeleteReturnItem({ itemId: input.remissionProductId, }) .pipe( map((response) => { - const hasError = response.error || !!response.httpError; + const hasError = response.error; if (!hasError) { - this.restRemissionProcessService.removePriorityProducts( - input.remissionProductId, - supplierId - ); + this.restRemissionProcessService.removePriorityProducts(input.remissionProductId, supplierId); this.reloadProducts({ remissionProcessId: input.remissionProcessId, }); @@ -706,7 +623,7 @@ export class RestRemissionService extends RemissionService { return { error: hasError, errorReasons: response.invalidProperties, - httpError: response.httpError, + // httpError: response.httpError, message: response.message, result: !hasError, } as ActionResult; @@ -714,36 +631,25 @@ export class RestRemissionService extends RemissionService { ); } - addProductToRemit(input: { - product: Product; - remissionReason: string; - remissionQuantity: number; - }): Observable { - const productMapper = this.mappingService.get>( - 'Product', - 'ProductDTO' - ); - const priceMapper = this.mappingService.get>( - 'Product', - 'PriceDTO' + addProductToRemit(input: { product: Product; remissionReason: string; remissionQuantity: number }): Observable { + const productMapper = this.mappingService.get>('Product', 'ProductDTO'); + const priceMapper = this.mappingService.get>('Product', 'PriceDTO'); + + const assortmentMapper = this.mappingService.get>( + 'Features', + 'Assortment' ); - const assortmentMapper = this.mappingService.get< - Mapper<{ key: string; name: string; value?: string }[], string> - >('Features', 'Assortment'); + const remissionProductMapper = this.mappingService.get>('ReturnItemDTO', 'RemissionProduct'); - const remissionProductMapper = this.mappingService.get< - Mapper - >('ReturnItemDTO', 'RemissionProduct'); - - const supplierMapper = this.mappingService.get< - Mapper - >('SupplierDTO', 'RemissionSupplier'); + const supplierMapper = this.mappingService.get>('SupplierDTO', 'RemissionSupplier'); return this.stock$.pipe( - flatMap((stock) => - this.returnApi.createReturnItem({ - returnItemDTO: { + first(), + tap(console.log.bind(window)), + mergeMap((stock) => + this.returnApi.ReturnCreateReturnItem({ + data: { product: productMapper.map(input.product), assortment: assortmentMapper.map(input.product.features), stock: { id: stock.id }, @@ -775,36 +681,24 @@ export class RestRemissionService extends RemissionService { }; }), tap(({ newProduct, supplier }) => { - this.restRemissionProcessService.updatePriorityProducts( - newProduct.id, - supplier.id || 1 - ); + this.restRemissionProcessService.updatePriorityProducts(newProduct.id, supplier.id || 1); this.reloadProductsSub.next(); }), map(({ newProduct }) => newProduct) ); } - getCapacities(params: { - selectedFilters?: { [filterId: string]: string[] }; - supplierId: number; - }): Observable { + getCapacities(params: { selectedFilters?: { [filterId: string]: string[] }; supplierId: number }): Observable { return this.fetchCapacities$(params); } - private fetchCapacities$(params: { - selectedFilters?: { [filterId: string]: string[] }; - supplierId: number; - }): Observable { + private fetchCapacities$(params: { selectedFilters?: { [filterId: string]: string[] }; supplierId: number }): Observable { return this.stock$.pipe( switchMap((stock) => - this.remiService.getRequiredCapacities({ + this.remiService.RemiGetRequiredCapacities({ stockId: stock.id, - capacityRequest: { - departments: - params.selectedFilters.abteilungen || - params.selectedFilters.department || - [], + payload: { + departments: params.selectedFilters.abteilungen || params.selectedFilters.department || [], supplierId: params.supplierId, }, }) @@ -825,15 +719,10 @@ export class RestRemissionService extends RemissionService { return capacities.map((capacity, index) => ({ name: capacity.item5, - utilized: - capacity.item3 > capacity.item2 ? capacity.item2 : capacity.item3, + utilized: capacity.item3 > capacity.item2 ? capacity.item2 : capacity.item3, available: (capacity.item4 || 0) < capacity.item2 - ? capacity.item4 || - (capacity.item3 > capacity.item2 - ? capacity.item2 - : capacity.item3) || - 0 + ? capacity.item4 || (capacity.item3 > capacity.item2 ? capacity.item2 : capacity.item3) || 0 : capacity.item2, label: index === 0 ? 'Exemplaren' : 'Titel', })); @@ -842,29 +731,22 @@ export class RestRemissionService extends RemissionService { ); } - private updateCapacities(params: { - selectedFilters?: { [filterId: string]: string[] }; - supplierId: number; - }): Observable { + private updateCapacities(params: { selectedFilters?: { [filterId: string]: string[] }; supplierId: number }): Observable { return this.fetchCapacities$(params); } private updateShippingDocumentProducts(params: { remissionProcessId: number; placementType: string; - response: ResponseArgs<{ - item1: ReceiptItemDTO; - item2: ReceiptItemDTO | ReturnSuggestionDTO; - }>; + // TODO: Typen prüfen + response: ResponseArgsOfValueTupleOfReceiptItemDTOAndReturnSuggestionDTO | ResponseArgsOfValueTupleOfReceiptItemDTOAndReturnItemDTO; }) { if (!params.response.result || !params.response.result.item1) { return; } const process = this.processStore.get(params.remissionProcessId); - const mapper = this.mappingService.get< - Mapper - >('ReceiptItemDTO', 'RemissionProduct'); + const mapper = this.mappingService.get>('ReceiptItemDTO', 'RemissionProduct'); this.stock$ .pipe( @@ -875,18 +757,14 @@ export class RestRemissionService extends RemissionService { return { ...product, placementType: params.placementType, - productGroupName: groupNames.find( - (groupName) => groupName.key === product.productGroup - ).value, + productGroupName: groupNames.find((groupName) => groupName.key === product.productGroup).value, } as RemissionProduct; }) ) ), map((product) => { const shippingDocuments = process.value.shippingDocuments; - const shippingDocumentToUpdate = shippingDocuments.find( - (doc) => doc.id === params.response.result.item1.receipt.id - ); + const shippingDocumentToUpdate = shippingDocuments.find((doc) => doc.id === params.response.result.item1.receipt.id); const updatedShippingDoc: ShippingDocument = { ...shippingDocumentToUpdate, products: [...shippingDocumentToUpdate.products, product], @@ -897,12 +775,7 @@ export class RestRemissionService extends RemissionService { .subscribe((updatedShippingDoc) => process.next({ ...process.value, - shippingDocuments: [ - ...process.value.shippingDocuments.filter( - (doc) => doc.id !== updatedShippingDoc.id - ), - updatedShippingDoc, - ], + shippingDocuments: [...process.value.shippingDocuments.filter((doc) => doc.id !== updatedShippingDoc.id), updatedShippingDoc], }) ); } @@ -931,8 +804,7 @@ export class RestRemissionService extends RemissionService { if (source === undefined) { return of>({ error: true, - message: - 'Unbekannter Artikel-Ursprung (zentrales Sortiment oder Überlauf)', + message: 'Unbekannter Artikel-Ursprung (zentrales Sortiment oder Überlauf)', result: false, }); } @@ -941,7 +813,7 @@ export class RestRemissionService extends RemissionService { switch (source) { case 'ueberlauf': return this.returnApi - .returnSuggestionImpediment({ + .ReturnReturnSuggestionImpediment({ itemId: params.remissionProductId, data: { comment: 'Produkt nicht gefunden', @@ -953,12 +825,13 @@ export class RestRemissionService extends RemissionService { remissionProcessId: params.remissionProcessId, }) ), + catchError(this.handleHttpError), map((response) => { - const hasError = response.error || !!response.httpError; + const hasError = response.error; // || !!response.httpError; return { error: hasError, errorReasons: response.invalidProperties, - httpError: response.httpError, + // httpError: response.httpError, message: response.message, result: false, } as ActionResult; @@ -967,7 +840,7 @@ export class RestRemissionService extends RemissionService { case 'zentral': return this.returnApi - .returnItemImpediment({ + .ReturnReturnItemImpediment({ itemId: params.remissionProductId, data: { comment: 'Produkt nicht gefunden', @@ -979,12 +852,13 @@ export class RestRemissionService extends RemissionService { remissionProcessId: params.remissionProcessId, }) ), + catchError(this.handleHttpError), map((response) => { - const hasError = response.error || !!response.httpError; + const hasError = response.error; // || !!response.httpError; return { error: hasError, errorReasons: response.invalidProperties, - httpError: response.httpError, + // httpError: response.httpError, message: response.message, result: false, } as ActionResult; @@ -994,29 +868,24 @@ export class RestRemissionService extends RemissionService { } if (source === 'ueberlauf') { - const returnSuggestionValues: AddReturnSuggestionParams['returnSuggestionValues'] = { + const returnSuggestionValues: ReturnSuggestionValues = { quantity: params.quantity, - remainingQuantity: - params.inStock - params.quantity <= 0 - ? null - : params.inStock - params.quantity, + remainingQuantity: params.inStock - params.quantity <= 0 ? null : params.inStock - params.quantity, placementType: params.placementType, returnSuggestionId: params.remissionProductId, }; - const isPartialRemit = - params.predefinedRemissionQuantity && - params.predefinedRemissionQuantity > params.quantity; + const isPartialRemit = params.predefinedRemissionQuantity && params.predefinedRemissionQuantity > params.quantity; if (isPartialRemit) { returnSuggestionValues.impedimentComment = 'Restmenge'; } return this.returnApi - .addReturnSuggestion({ + .ReturnAddReturnSuggestion({ returnId: process.value.externalId, receiptId: params.shippingDocumentId, - returnSuggestionValues, + data: returnSuggestionValues, }) .pipe( tap( @@ -1028,25 +897,21 @@ export class RestRemissionService extends RemissionService { placementType: params.placementType, }) ), + catchError(this.handleHttpError), map((r) => { - const hasError = r.error || !!r.httpError; + const hasError = r.error; // || !!r.httpError; return { error: hasError, errorReasons: r.invalidProperties, - httpError: r.httpError, + // httpError: r.httpError, message: r.message, result: !hasError, } as ActionResult; }), switchMap((result) => { - const selectedFilters = this.restFilterService.getSelectedFilters( - process.value.filter - ); + const selectedFilters = this.restFilterService.getSelectedFilters(process.value.filter); - const supplierId = - process.value.filter && - process.value.filter.target && - process.value.filter.target.id; + const supplierId = process.value.filter && process.value.filter.target && process.value.filter.target.id; return this.updateCapacities({ selectedFilters, @@ -1068,10 +933,10 @@ export class RestRemissionService extends RemissionService { } return this.returnApi - .addReturnItem({ + .ReturnAddReturnItem({ returnId: process.value.externalId, receiptId: params.shippingDocumentId, - returnItemValues: { + data: { returnItemId: params.remissionProductId, placementType: params.placementType, quantity: params.quantity, @@ -1088,22 +953,18 @@ export class RestRemissionService extends RemissionService { placementType: params.placementType, }) ), + catchError(this.handleHttpError), map((r) => { - const hasError = r.error || !!r.httpError; + const hasError = r.error; // || !!r.httpError; return { error: hasError, errorReasons: r.invalidProperties, - httpError: r.httpError, + // httpError: r.httpError, message: r.message, result: !hasError, } as ActionResult; }), - tap((_) => - this.restRemissionProcessService.removePriorityProducts( - params.remissionProductId, - process.value.filter.target.id || 1 - ) - ), + tap((_) => this.restRemissionProcessService.removePriorityProducts(params.remissionProductId, process.value.filter.target.id || 1)), tap((_) => this.reloadProducts({ remissionProcessId: params.remissionProcessId, @@ -1120,7 +981,7 @@ export class RestRemissionService extends RemissionService { const process = this.processStore.get(params.remissionProcessId); return this.returnApi - .removeReturnItem({ + .ReturnRemoveReturnItem({ returnId: process.value.externalId, receiptId: params.shippingDocumentId, receiptItemId: params.remissionProductId, @@ -1129,21 +990,15 @@ export class RestRemissionService extends RemissionService { switchMap((response) => { let newProcess: RemissionProcess; if (!response.error) { - let shippingDocToUpdate = process.value.shippingDocuments.find( - (document) => document.id === params.shippingDocumentId - ); + let shippingDocToUpdate = process.value.shippingDocuments.find((document) => document.id === params.shippingDocumentId); shippingDocToUpdate = { ...shippingDocToUpdate, - products: shippingDocToUpdate.products.filter( - (product) => product.id !== params.remissionProductId - ), + products: shippingDocToUpdate.products.filter((product) => product.id !== params.remissionProductId), }; newProcess = { ...process.value, shippingDocuments: [ - ...process.value.shippingDocuments.filter( - (document) => document.id !== params.shippingDocumentId - ), + ...process.value.shippingDocuments.filter((document) => document.id !== params.shippingDocumentId), shippingDocToUpdate, ], }; @@ -1155,14 +1010,9 @@ export class RestRemissionService extends RemissionService { }); if (process.value.filter.source === 'ueberlauf') { - const selectedFilters = this.restFilterService.getSelectedFilters( - newProcess.filter - ); + const selectedFilters = this.restFilterService.getSelectedFilters(newProcess.filter); - const supplierId = - process.value.filter && - process.value.filter.target && - process.value.filter.target.id; + const supplierId = process.value.filter && process.value.filter.target && process.value.filter.target.id; return this.updateCapacities({ selectedFilters, @@ -1194,10 +1044,10 @@ export class RestRemissionService extends RemissionService { } return this.returnApi - .finalizeReceipt({ + .ReturnFinalizeReceipt({ returnId: process.value.externalId, receiptId: params.shippingDocumentId, - receiptFinalizeValues: { + data: { packageCode: params.containerId, }, }) @@ -1205,9 +1055,7 @@ export class RestRemissionService extends RemissionService { tap((response) => { if (!response.error) { const shippingDocuments = process.value.shippingDocuments; - let shippingDocumentToComplete = shippingDocuments.find( - (document) => document.id === params.shippingDocumentId - ); + let shippingDocumentToComplete = shippingDocuments.find((document) => document.id === params.shippingDocumentId); shippingDocumentToComplete = { ...shippingDocumentToComplete, isCompleted: true, @@ -1216,27 +1064,17 @@ export class RestRemissionService extends RemissionService { process.next({ ...process.value, shippingDocuments: [ - ...shippingDocuments.filter( - (document) => document.id !== params.shippingDocumentId - ), + ...shippingDocuments.filter((document) => document.id !== params.shippingDocumentId), shippingDocumentToComplete, ], }); } }), switchMap((shippingDocumentCompleteResponse) => { - if ( - !shippingDocumentCompleteResponse.error && - !!Object.keys(shippingDocumentCompleteResponse.invalidProperties) - .length - ) { + if (!shippingDocumentCompleteResponse.error && !!Object.keys(shippingDocumentCompleteResponse.invalidProperties).length) { return of({ result: false, - error: - shippingDocumentCompleteResponse.error || - !!Object.keys( - shippingDocumentCompleteResponse.invalidProperties - ).length, + error: shippingDocumentCompleteResponse.error || !!Object.keys(shippingDocumentCompleteResponse.invalidProperties).length, message: shippingDocumentCompleteResponse.message, errorReasons: shippingDocumentCompleteResponse.invalidProperties, }); @@ -1245,11 +1083,7 @@ export class RestRemissionService extends RemissionService { if (!!shippingDocumentCompleteResponse.error) { return of({ result: true, - error: - shippingDocumentCompleteResponse.error || - !!Object.keys( - shippingDocumentCompleteResponse.invalidProperties - ).length, + error: shippingDocumentCompleteResponse.error || !!Object.keys(shippingDocumentCompleteResponse.invalidProperties).length, message: shippingDocumentCompleteResponse.message, errorReasons: shippingDocumentCompleteResponse.invalidProperties, }); @@ -1262,15 +1096,10 @@ export class RestRemissionService extends RemissionService { ); } - createShippingDocument(params: { - remissionProcessId: number; - receiptNumber?: string; - }): Observable { + createShippingDocument(params: { remissionProcessId: number; receiptNumber?: string }): Observable { const process = this.processStore.get(params.remissionProcessId); - const receiptMapper = this.mappingService.get< - Mapper - >('ReceiptDTO', 'ShippingDocument'); + const receiptMapper = this.mappingService.get>('ReceiptDTO', 'ShippingDocument'); if (process === undefined) { throw new Error('Prozess nicht verfügbar.'); @@ -1278,20 +1107,21 @@ export class RestRemissionService extends RemissionService { return this.stock$.pipe( flatMap((stock) => - this.returnApi.createReceipt({ + this.returnApi.ReturnCreateReceipt({ returnId: process.value.externalId, - receiptDTO: { + data: { receiptNumber: params.receiptNumber || null, stock: { id: stock.id, }, supplier: { id: process.value.filter.target.id } as any, - receiptType: StockReceiptType.ShippingNote, + receiptType: 1, // ShippingNote = 1 }, }) ), - flatMap((response) => { - if (response.error || !!response.httpError) { + catchError(this.handleHttpError), + mergeMap((response) => { + if (response.error /*|| !!response.httpError*/) { return throwError(response); } return of(response); @@ -1300,9 +1130,7 @@ export class RestRemissionService extends RemissionService { tap((document) => { const newProcess = { ...process.value, - shippingDocuments: process.value.shippingDocuments - ? [...process.value.shippingDocuments, document] - : [document], + shippingDocuments: process.value.shippingDocuments ? [...process.value.shippingDocuments, document] : [document], }; process.next(newProcess); }) @@ -1378,25 +1206,18 @@ export class RestRemissionService extends RemissionService { return this.stock$.pipe( flatMap((stock) => { const openReturns$: Observable = this.returnApi - .queryReturns({ + .ReturnQueryReturns({ stockId: stock.id, queryToken: queryTokenOpen, }) .pipe( map((response) => response.result), map((returns) => - returns.filter( - (r) => - !r.receipts.every( - (receipt) => - (receipt.data && receipt.data.status === 4) || - receipt.data.completed - ) - ) + returns.filter((r) => !r.receipts.every((receipt) => (receipt.data && receipt.data.status === 4) || receipt.data.completed)) ) ); const completedReturns$: Observable = this.returnApi - .queryReturns({ + .ReturnQueryReturns({ stockId: stock.id, queryToken: queryTokenCompleted, }) @@ -1413,12 +1234,7 @@ export class RestRemissionService extends RemissionService { return forkJoin([openReturns$, completedReturns$]).pipe( map(([openReturns, completedReturns]: [ReturnDTO[], ReturnDTO[]]) => { const openReturnIds = openReturns.map((r) => r.id); - return [ - ...openReturns, - ...completedReturns.filter( - (completedReturn) => !openReturnIds.includes(completedReturn.id) - ), - ]; + return [...openReturns, ...completedReturns.filter((completedReturn) => !openReturnIds.includes(completedReturn.id))]; }) ); }), @@ -1430,13 +1246,9 @@ export class RestRemissionService extends RemissionService { return forkJoin( result.map((returnDto) => { - const receiptMapper = this.mappingService.get< - Mapper - >('ReceiptDTO', 'ShippingDocument'); + const receiptMapper = this.mappingService.get>('ReceiptDTO', 'ShippingDocument'); - const supplierMapper = this.mappingService.get< - Mapper - >('SupplierDTO', 'RemissionSupplier'); + const supplierMapper = this.mappingService.get>('SupplierDTO', 'RemissionSupplier'); const remission: RemissionProcess = { id: returnDto.id, @@ -1450,16 +1262,10 @@ export class RestRemissionService extends RemissionService { source: 'zentral', // default skip: 0, take: 25, - target: supplierMapper.map( - targets.find((target) => target.id === returnDto.supplier.id) - ), + target: supplierMapper.map(targets.find((target) => target.id === returnDto.supplier.id)), }, - shippingDocuments: !!returnDto.receipts.length - ? returnDto.receipts.map((receipt) => - receiptMapper.map(receipt.data) - ) - : [], - completed: returnDto['completed'], + shippingDocuments: !!returnDto.receipts.length ? returnDto.receipts.map((receipt) => receiptMapper.map(receipt.data)) : [], + completed: !!returnDto['completed'], }; return of(remission as RemissionProcess).pipe( @@ -1495,22 +1301,16 @@ export class RestRemissionService extends RemissionService { map((remissions: RemissionProcess[]) => remissions.filter( (remission) => - !!remission.id && - !!remission.shippingDocuments && - !remission.shippingDocuments.every((document) => document.isDeleted) + !!remission.id && !!remission.shippingDocuments && !remission.shippingDocuments.every((document) => document.isDeleted) ) ), - tap((remissions: RemissionProcess[]) => - remissions.forEach((remission) => this.processStore.set(remission)) - ) + tap((remissions: RemissionProcess[]) => remissions.forEach((remission) => this.processStore.set(remission))) ); } getUncompletedRemissions(): Observable { this.reloadRemissionSub.next(); - const receiptMapper = this.mappingService.get< - Mapper - >('ReceiptDTO', 'ShippingDocument'); + const receiptMapper = this.mappingService.get>('ReceiptDTO', 'ShippingDocument'); const baseProcess$: Observable> = of({ filter: { @@ -1530,7 +1330,7 @@ export class RestRemissionService extends RemissionService { this.targets$, ]).pipe( switchMap(([_, stock, baseProcess, targets]) => - this.returnApi.getUncompletedReturns({ stockId: stock.id }).pipe( + this.returnApi.ReturnGetUncompletedReturns({ stockId: stock.id }).pipe( map((response) => response.result), map((returns) => { const processes = returns.map((r) => ({ @@ -1539,9 +1339,7 @@ export class RestRemissionService extends RemissionService { externalId: r.id, filter: { ...baseProcess.filter, - target: targets.find( - (supplier) => supplier.id === r.supplier.id - ), + target: targets.find((supplier) => supplier.id === r.supplier.id), }, stockId: stock.id, shippingDocuments: r.receipts.map((receipt) => ({ @@ -1561,21 +1359,19 @@ export class RestRemissionService extends RemissionService { return of(remissionsWithoutShippingDocument); } - const shippingDocuments = remissionsWithoutShippingDocument.map( - (remission) => { - return forkJoin( - remission.shippingDocuments.map((shippingDoc) => - this.returnApi - .getReturnReceipt({ - returnId: remission.externalId, - receiptId: shippingDoc.id, - eagerLoading: 3, - }) - .pipe(map((response) => response.result)) - ) - ); - } - ); + const shippingDocuments = remissionsWithoutShippingDocument.map((remission) => { + return forkJoin( + remission.shippingDocuments.map((shippingDoc) => + this.returnApi + .ReturnGetReturnReceipt({ + returnId: remission.externalId, + receiptId: shippingDoc.id, + eagerLoading: 3, + }) + .pipe(map((response) => response.result)) + ) + ); + }); return forkJoin(shippingDocuments).pipe( map((response) => response.map((r) => receiptMapper.map(r[0]))), @@ -1585,25 +1381,18 @@ export class RestRemissionService extends RemissionService { remissionsWithoutShippingDocument.forEach((remission) => { // tslint:disable-next-line: no-shadowed-variable return remission.shippingDocuments.map((shippingDocument) => { - const matchedShippingDocument = shippingDocs.find( - (doc) => doc.id === shippingDocument.id - ); + const matchedShippingDocument = shippingDocs.find((doc) => doc.id === shippingDocument.id); const updatedProcessWithShippingDocument: RemissionProcess = { ...remission, shippingDocuments: [matchedShippingDocument], }; - resultRemissions = [ - ...resultRemissions, - updatedProcessWithShippingDocument, - ]; + resultRemissions = [...resultRemissions, updatedProcessWithShippingDocument]; }); }); // Save Remissions in store - resultRemissions.forEach((remission) => - this.processStore.set(remission) - ); + resultRemissions.forEach((remission) => this.processStore.set(remission)); return resultRemissions; }) @@ -1614,39 +1403,30 @@ export class RestRemissionService extends RemissionService { return remissionWithShippingDocument$; } - deleteRemission(params: { - remissionProcessId: number; - externalId?: number; - }): Observable { + deleteRemission(params: { remissionProcessId: number; externalId?: number }): Observable { const process = this.processStore.get(params.remissionProcessId); - return this.returnApi - .cancelReturn({ returnId: params.externalId || process.value.externalId }) - .pipe( - map((response) => (response.error ? false : true)), - tap((_) => this.reloadRemissionSub.next()) - ); + return this.returnApi.ReturnCancelReturn({ returnId: params.externalId || process.value.externalId }).pipe( + map((response) => (response.error ? false : true)), + tap((_) => this.reloadRemissionSub.next()) + ); } deleteShippingDocument(params: { remissionProcessId: number; shippingDocumentId: number; externalId?: number; - }): Observable< - ActionResult<{ deleted: boolean; completedRemissionsExist: boolean }> - > { + }): Observable> { const process = this.processStore.get(params.remissionProcessId); return this.returnApi - .cancelReturnReceipt({ + .ReturnCancelReturnReceipt({ returnId: params.externalId || process.value.externalId, receiptId: params.shippingDocumentId, }) .pipe( map((response) => { - const remainingShippingDocument = process.value.shippingDocuments.filter( - (document) => document.id !== params.shippingDocumentId - ); + const remainingShippingDocument = process.value.shippingDocuments.filter((document) => document.id !== params.shippingDocumentId); this.processStore.set({ ...process.value, @@ -1697,4 +1477,16 @@ export class RestRemissionService extends RemissionService { }) ); } + + handleHttpError = (error: HttpErrorResponse) => { + if (error.status === 0) { + return NEVER; + } + + return of({ + message: error?.message, + ...(error?.error || {}), + error: true, + }); + }; } diff --git a/apps/page/catalog/src/lib/article-search/article-search-new.store.ts b/apps/page/catalog/src/lib/article-search/article-search-new.store.ts index 4792b0cfc..f53029631 100644 --- a/apps/page/catalog/src/lib/article-search/article-search-new.store.ts +++ b/apps/page/catalog/src/lib/article-search/article-search-new.store.ts @@ -1,12 +1,9 @@ import { Injectable } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { StringDictionary } from '@cmf/core'; -import { ApplicationService } from '@core/application'; +import { Router } from '@angular/router'; import { BreadcrumbService } from '@core/breadcrumb'; import { ComponentStore, tapResponse } from '@ngrx/component-store'; -import { isEqual } from 'lodash'; -import { combineLatest, Observable, Subject, Subscription } from 'rxjs'; -import { first, map, tap, switchMap, withLatestFrom, debounceTime, finalize } from 'rxjs/operators'; +import { combineLatest, Observable, Subject } from 'rxjs'; +import { first, map, tap, switchMap, withLatestFrom, debounceTime } from 'rxjs/operators'; import { DomainCatalogService } from '@domain/catalog'; import { fromInputDto, @@ -74,7 +71,7 @@ export class ArticleSearchStore extends ComponentStore { readonly searchState$ = this.select(this.searchStateSelector); private queryParamsSelector = (s: ArticleSearchState) => - Object.keys(s.params).reduce((dic, key) => ({ ...dic, [key]: s.params[key] }), {} as StringDictionary); + Object.keys(s.params).reduce((dic, key) => ({ ...dic, [key]: s.params[key] }), {} as { [key: string]: string }); readonly queryParams$ = this.select(this.queryParamsSelector); get queryParams() { return this.get(this.queryParamsSelector); @@ -123,7 +120,7 @@ export class ArticleSearchStore extends ComponentStore { readonly queryTokenInput$ = combineLatest([this.queryParamsQuery$, this.inputSelectorFilter$]).pipe( map(([query, inputSelector]) => { - const dic: StringDictionary = {}; + const dic: { [key: string]: string } = {}; inputSelector.forEach((filter) => filter.options.forEach((option) => { @@ -262,7 +259,7 @@ export class ArticleSearchStore extends ComponentStore { } } - setQueryParams({ params }: { params: StringDictionary }) { + setQueryParams({ params }: { params: { [key: string]: string } }) { this.patchState({ params }); } diff --git a/apps/page/catalog/src/lib/article-search/article-search.mappings.ts b/apps/page/catalog/src/lib/article-search/article-search.mappings.ts index 847a9cd61..93410606c 100644 --- a/apps/page/catalog/src/lib/article-search/article-search.mappings.ts +++ b/apps/page/catalog/src/lib/article-search/article-search.mappings.ts @@ -1,4 +1,3 @@ -import { StringDictionary } from '@cmf/core'; import { InputDTO, OptionDTO, InputType } from '@swagger/cat'; import { SelectFilter, SelectFilterOption, FilterType, Filter, FilterOption, RangeFilter } from '@ui/filter'; import { RangeFilterOption } from 'apps/ui/filter/src/lib/models/range-filter-option'; @@ -70,8 +69,8 @@ export function inputTypeToType(type: InputType): FilterType { } } -export function mapFilterArrayToStringDictionary(source: Filter[]): StringDictionary { - const dict: StringDictionary = {}; +export function mapFilterArrayToStringDictionary(source: Filter[]): { [key: string]: string } { + const dict: { [key: string]: string } = {}; for (const filter of source) { const options: FilterOption[] = filter.options; const selected = options.filter((o) => o.selected); @@ -112,7 +111,7 @@ export function mapFilterArrayToStringDictionary(source: Filter[]): StringDictio } export function mapSelectedFilterToParams(source: Filter[]): string { - const dict: StringDictionary = {}; + const dict: { [key: string]: string } = {}; for (const filter of source) { const options: FilterOption[] = filter.options; diff --git a/apps/page/catalog/src/lib/article-search/search-results/search-results.component.ts b/apps/page/catalog/src/lib/article-search/search-results/search-results.component.ts index 9fba21b7f..2760fdd5a 100644 --- a/apps/page/catalog/src/lib/article-search/search-results/search-results.component.ts +++ b/apps/page/catalog/src/lib/article-search/search-results/search-results.component.ts @@ -1,14 +1,13 @@ import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; import { Component, ChangeDetectionStrategy, OnInit, OnDestroy, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { StringDictionary } from '@cmf/core'; import { ApplicationService } from '@core/application'; import { BreadcrumbService } from '@core/breadcrumb'; import { ItemDTO } from '@swagger/cat'; import { CacheService } from 'apps/core/cache/src/public-api'; import { isEqual } from 'lodash'; import { BehaviorSubject, combineLatest, Subscription } from 'rxjs'; -import { debounceTime, distinctUntilChanged, finalize, first, map, withLatestFrom } from 'rxjs/operators'; +import { debounceTime, first, map } from 'rxjs/operators'; import { ArticleSearchStore } from '../article-search-new.store'; @Component({ diff --git a/apps/page/checkout/src/lib/checkout-review/checkout-review.component.ts b/apps/page/checkout/src/lib/checkout-review/checkout-review.component.ts index f44557ef1..d6d75ed8f 100644 --- a/apps/page/checkout/src/lib/checkout-review/checkout-review.component.ts +++ b/apps/page/checkout/src/lib/checkout-review/checkout-review.component.ts @@ -11,7 +11,6 @@ import { SsoService } from 'sso'; import { PurchasingOptionsModalComponent, PurchasingOptionsModalData } from '../modals/purchasing-options-modal'; import { PurchasingOptions } from '../modals/purchasing-options-modal/purchasing-options-modal.store'; import { Subject, NEVER } from 'rxjs'; -import { StringDictionary } from '@cmf/core'; import { DomainCatalogService } from '@domain/catalog'; import { BreadcrumbService } from '@core/breadcrumb'; import { DomainPrinterService } from '@domain/printer'; @@ -213,7 +212,7 @@ export class CheckoutReviewComponent { .toPromise(); let availableOptions: PurchasingOptions[] = []; - const availabilities: StringDictionary = {}; + const availabilities: { [key: string]: AvailabilityDTO } = {}; if (takeAwayAvailability && this.availabilityService.isAvailable({ availability: takeAwayAvailability })) { availableOptions.push('take-away'); diff --git a/apps/page/checkout/src/lib/modals/purchasing-options-modal/purchasing-options-modal.component.ts b/apps/page/checkout/src/lib/modals/purchasing-options-modal/purchasing-options-modal.component.ts index 7065c54b8..591b2f496 100644 --- a/apps/page/checkout/src/lib/modals/purchasing-options-modal/purchasing-options-modal.component.ts +++ b/apps/page/checkout/src/lib/modals/purchasing-options-modal/purchasing-options-modal.component.ts @@ -1,6 +1,5 @@ import { Component, ChangeDetectionStrategy } from '@angular/core'; import { Router } from '@angular/router'; -import { StringDictionary } from '@cmf/core'; import { ApplicationService } from '@core/application'; import { DomainCheckoutService } from '@domain/checkout'; import { AddToShoppingCartDTO, AvailabilityDTO } from '@swagger/checkout'; @@ -246,7 +245,7 @@ export class PurchasingOptionsModalComponent { this.router.navigate(['/product', 'search']); } else if (navigate === 'continue') { // Set filter for navigation to customer search if customer is not set - let filter: StringDictionary; + let filter: { [key: string]: string }; if (!customer) { filter = await this.customerFeatures$ .pipe( diff --git a/apps/page/customer/src/lib/customer-create/customer-create.component.ts b/apps/page/customer/src/lib/customer-create/customer-create.component.ts index 15eaaabfb..557577af6 100644 --- a/apps/page/customer/src/lib/customer-create/customer-create.component.ts +++ b/apps/page/customer/src/lib/customer-create/customer-create.component.ts @@ -5,7 +5,6 @@ import { CountryDTO, CustomerDTO, InputOptionsDTO } from '@swagger/crm'; import { Observable } from 'rxjs'; import { first, map } from 'rxjs/operators'; import { UiModalService } from '@ui/modal'; -import { StringDictionary } from '@cmf/core'; import { BreadcrumbService } from '@core/breadcrumb'; import { ApplicationService } from '@core/application'; import { AddressSelectionModalService } from '../modals/address-selection-modal/address-selection-modal.service'; @@ -99,8 +98,8 @@ export abstract class CustomerCreateComponentBase { // } } - createCustomerDataQuery(customer: CustomerDTO): StringDictionary { - const query: StringDictionary = { + createCustomerDataQuery(customer: CustomerDTO): { [key: string]: string } { + const query: { [key: string]: string } = { gender: String(customer.gender), title: customer.title, firstName: customer.firstName, @@ -155,7 +154,7 @@ export abstract class CustomerCreateComponentBase { }; } - setValidationError(invalidProperties: StringDictionary, formGroup: AbstractControl) { + setValidationError(invalidProperties: { [key: string]: string }, formGroup: AbstractControl) { this.control.enable(); this.control.reset(this.control.value); diff --git a/apps/page/customer/src/lib/customer-search/customer-search.service.ts b/apps/page/customer/src/lib/customer-search/customer-search.service.ts index d94a44950..03dd37f15 100644 --- a/apps/page/customer/src/lib/customer-search/customer-search.service.ts +++ b/apps/page/customer/src/lib/customer-search/customer-search.service.ts @@ -10,7 +10,6 @@ import { catchError, debounceTime, distinctUntilChanged, filter, map, shareRepla import { CustomerSearchType, QueryFilter, ResultState } from './defs'; import { cloneFilter, Filter, FilterOption, UiFilterMappingService } from '@ui/filter'; import { NativeContainerService } from 'native-container'; -import { StringDictionary } from '@cmf/core'; import { ApplicationService } from '@core/application'; import { BreadcrumbService } from '@core/breadcrumb'; @@ -18,7 +17,7 @@ import { BreadcrumbService } from '@core/breadcrumb'; export abstract class CustomerSearch implements OnInit, OnDestroy { protected abstract customerSearch: CrmCustomerService; - private queryParams: StringDictionary; + private queryParams: { [key: string]: string }; private destroy$ = new Subject(); @@ -117,12 +116,12 @@ export abstract class CustomerSearch implements OnInit, OnDestroy { this.destroy$.complete(); } - setQueryParams({ params }: { params: StringDictionary }): void { + setQueryParams({ params }: { params: { [key: string]: string } }): void { this.queryParams = params; this.parseQueryParams(); } - getQueryParams(): StringDictionary { + getQueryParams(): { [key: string]: string } { return this.queryParams || {}; } @@ -199,7 +198,7 @@ export abstract class CustomerSearch implements OnInit, OnDestroy { .subscribe(() => this.searchState$.next('init')); } - createQueryParams(): StringDictionary { + createQueryParams(): { [key: string]: string } { return { query: this.queryFilter.query, ...this.getSelecteFiltersAsDictionary(), @@ -238,8 +237,8 @@ export abstract class CustomerSearch implements OnInit, OnDestroy { return this.search(); } - getSelecteFiltersAsDictionary(): StringDictionary { - const dict: StringDictionary = {}; + getSelecteFiltersAsDictionary(): { [key: string]: string } { + const dict: { [key: string]: string } = {}; for (const filter of this.queryFilter.filters) { const options: FilterOption[] = filter.options; diff --git a/apps/page/customer/src/lib/modals/cant-select-guest/cant-select-guest-modal.component.ts b/apps/page/customer/src/lib/modals/cant-select-guest/cant-select-guest-modal.component.ts index 2886dbe92..dccb59940 100644 --- a/apps/page/customer/src/lib/modals/cant-select-guest/cant-select-guest-modal.component.ts +++ b/apps/page/customer/src/lib/modals/cant-select-guest/cant-select-guest-modal.component.ts @@ -1,5 +1,4 @@ import { Component, ChangeDetectionStrategy } from '@angular/core'; -import { StringDictionary } from '@cmf/core'; import { CustomerDTO } from '@swagger/crm'; import { UiModalRef } from '@ui/modal'; @@ -12,8 +11,8 @@ import { UiModalRef } from '@ui/modal'; export class CantSelectGuestModalComponent { constructor(public ref: UiModalRef) {} - createCustomerDataQuery(customer: CustomerDTO): StringDictionary { - const query: StringDictionary = { + createCustomerDataQuery(customer: CustomerDTO): { [key: string]: string } { + const query: { [key: string]: string } = { gender: String(customer.gender), title: customer?.title, firstName: customer?.firstName, diff --git a/apps/page/task-calendar/src/lib/task-calendar.store.ts b/apps/page/task-calendar/src/lib/task-calendar.store.ts index fea66e015..d3f57ba5d 100644 --- a/apps/page/task-calendar/src/lib/task-calendar.store.ts +++ b/apps/page/task-calendar/src/lib/task-calendar.store.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { StringDictionary } from '@cmf/core'; import { DomainTaskCalendarService } from '@domain/task-calendar'; import { ComponentStore, tapResponse } from '@ngrx/component-store'; import { DisplayInfoDTO, InputDTO, ResponseArgsOfIEnumerableOfInputDTO } from '@swagger/eis'; @@ -204,8 +203,8 @@ export class TaskCalendarStore extends ComponentStore { return mappedArr; } - mapFilterArrayToStringDictionary(source: Filter[]): StringDictionary { - const dict: StringDictionary = {}; + mapFilterArrayToStringDictionary(source: Filter[]): { [key: string]: string } { + const dict: { [key: string]: string } = {}; for (const filter of source) { const options: FilterOption[] = filter.options; const selected = options.filter((o) => o.selected); diff --git a/apps/sales/src/app/app-configuration.ts b/apps/sales/src/app/app-configuration.ts index 0d443fde9..39a99bbd4 100644 --- a/apps/sales/src/app/app-configuration.ts +++ b/apps/sales/src/app/app-configuration.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { StringDictionary } from '@cmf/core'; import { AuthConfig } from 'angular-oauth2-oidc'; @Injectable() @@ -7,7 +6,7 @@ export class AppConfiguration { includeGoogleAnalytics = false; title?: string; - cdn: StringDictionary; + cdn: { [key: string]: string }; sso: AuthConfig; diff --git a/apps/sales/src/app/app.module.ts b/apps/sales/src/app/app.module.ts index 7a292ff87..75f2ae83c 100644 --- a/apps/sales/src/app/app.module.ts +++ b/apps/sales/src/app/app.module.ts @@ -153,11 +153,6 @@ export function cdnProdutctPictures(config: AppConfiguration): string { useFactory: remissionModuleOptionsFactory, deps: [AppConfiguration], }, - { - provide: HTTP_INTERCEPTORS, - useClass: HttpErrorHandlerInterceptor, - multi: true, - }, DatePipe, { provide: ErrorHandler, diff --git a/apps/sales/src/app/components/menu/menu.component.ts b/apps/sales/src/app/components/menu/menu.component.ts index d4e6f8f01..f5f4ba44d 100644 --- a/apps/sales/src/app/components/menu/menu.component.ts +++ b/apps/sales/src/app/components/menu/menu.component.ts @@ -10,7 +10,7 @@ import { SetOnlineCustomerCreationStatus, } from '../../core/store/actions/process.actions'; import { Breadcrumb } from '../../core/models/breadcrumb.model'; -import { ResetBreadcrumbsTo, AddBreadcrumb } from '../../core/store/actions/breadcrumb.actions'; +import { ResetBreadcrumbsTo } from '../../core/store/actions/breadcrumb.actions'; import { takeUntil, distinctUntilChanged } from 'rxjs/operators'; import { ProcessSelectors } from '../../core/store/selectors/process.selectors'; import { ResetFilters } from '../../core/store/actions/filter.actions'; @@ -22,7 +22,6 @@ import { RemissionSelectors } from '../../core/store/selectors/remission.selecto import { RemissionFinishingProcessStatus } from '../../modules/remission/models/remission-finishing-process-status.enum'; import { DeleteFormState } from '../../core/store/actions/forms.actions'; import { USER_FORM_STATE_KEY, USER_EXTRAS_FORM_STATE_KEY, USER_ERRORS_FORM_STATE_KEY } from '../../core/utils/app.constants'; -import { StringDictionary } from '@cmf/core'; @Component({ selector: 'app-menu', @@ -39,7 +38,7 @@ export class MenuComponent implements OnInit, OnDestroy { constructor(public router: Router, private store: Store, private moduleSwitcherService: ModuleSwitcherService) {} activeMenu = ''; - routeToMenu(menuPath: string, menuTag: string, queryParams?: StringDictionary): void { + routeToMenu(menuPath: string, menuTag: string, queryParams?: { [key: string]: string }): void { if (this.processes && this.processes.length < 1 && this.module === ModuleSwitcher.Customer) { this.createProcess(menuPath); } diff --git a/apps/sales/src/app/core/interceptors/http-error-handler.interceptor.ts b/apps/sales/src/app/core/interceptors/http-error-handler.interceptor.ts index 64f903c82..04efef522 100644 --- a/apps/sales/src/app/core/interceptors/http-error-handler.interceptor.ts +++ b/apps/sales/src/app/core/interceptors/http-error-handler.interceptor.ts @@ -6,10 +6,11 @@ import { Injectable } from '@angular/core'; import { OAuthErrorEvent } from 'angular-oauth2-oidc'; import { LoggingService, LogType } from '../services/logging.service'; import { isWhiteList } from '../utils/http-interceptor-whitelist.utils'; +import { UiMessageModalComponent, UiModalService } from '@ui/modal'; @Injectable() export class HttpErrorHandlerInterceptor implements HttpInterceptor { - constructor(private errorService: ErrorService, private logger: LoggingService) {} + constructor(private errorService: ErrorService, private logger: LoggingService, private modal: UiModalService) {} intercept(req: HttpRequest, next: HttpHandler): Observable> { return next.handle(req).pipe(catchError((error: HttpErrorResponse, caught: any) => this.handleError(error))); @@ -34,6 +35,15 @@ export class HttpErrorHandlerInterceptor implements HttpInterceptor { } private handleError(error: HttpErrorResponse) { + console.log(error.status); + if (error.status === 0) { + this.modal.open({ + content: UiMessageModalComponent, + data: { title: 'Sie sind offline', message: 'Bitte überprüfen Sie Ihre Netzwerkverbindung.' }, + }); + return throwError(error); + } + if (!isWhiteList(error.url)) { if (isWhiteList(error.url, error.status)) { return throwError(error); diff --git a/apps/sales/src/app/core/utils/http-interceptor-whitelist.utils.ts b/apps/sales/src/app/core/utils/http-interceptor-whitelist.utils.ts index 053dc6531..88b1b1dbb 100644 --- a/apps/sales/src/app/core/utils/http-interceptor-whitelist.utils.ts +++ b/apps/sales/src/app/core/utils/http-interceptor-whitelist.utils.ts @@ -32,6 +32,7 @@ const errorWhiteList: { url: string; codes: number[] }[] = [ { url: '/shippingaddress', codes: [400] }, { url: '/inventory', codes: [400] }, { url: '/destination/canadd', codes: [400] }, + { url: '/remi', codes: [0, -1] }, ]; const errorBlackList: { url: string; codes: number[] }[] = [{ url: '/order/checkout', codes: [400] }]; diff --git a/apps/sales/src/app/modules/remission/overlays/remission-list-filter/remission-list-filter.component.html b/apps/sales/src/app/modules/remission/overlays/remission-list-filter/remission-list-filter.component.html index 902b7a993..f6bfb2e8c 100644 --- a/apps/sales/src/app/modules/remission/overlays/remission-list-filter/remission-list-filter.component.html +++ b/apps/sales/src/app/modules/remission/overlays/remission-list-filter/remission-list-filter.component.html @@ -15,6 +15,7 @@
+ + diff --git a/apps/sales/src/app/modules/remission/overlays/remission-list-filter/remission-list-filter.component.scss b/apps/sales/src/app/modules/remission/overlays/remission-list-filter/remission-list-filter.component.scss index 5fbb02336..6d32ea5b5 100644 --- a/apps/sales/src/app/modules/remission/overlays/remission-list-filter/remission-list-filter.component.scss +++ b/apps/sales/src/app/modules/remission/overlays/remission-list-filter/remission-list-filter.component.scss @@ -4,6 +4,14 @@ :host { @include overlay-host; + @apply relative; +} + +ui-spinner { + @apply absolute block; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); } .selection-container { diff --git a/apps/sales/src/app/modules/remission/overlays/remission-list-filter/remission-list-filter.module.ts b/apps/sales/src/app/modules/remission/overlays/remission-list-filter/remission-list-filter.module.ts index f0f8489f0..8b9f776e8 100644 --- a/apps/sales/src/app/modules/remission/overlays/remission-list-filter/remission-list-filter.module.ts +++ b/apps/sales/src/app/modules/remission/overlays/remission-list-filter/remission-list-filter.module.ts @@ -10,6 +10,7 @@ import { RemissionUeberlaufCapacitiesModule } from '../../pages/remission-list-c import { SharedModule } from 'apps/sales/src/app/shared/shared.module'; import { RemissionRequiredCapacitiesWidgetModule } from '../../components/remission-required-capacities-widget'; import { HasSelectedFiltersPipe } from '../../pipes'; +import { UiSpinnerModule } from 'apps/ui/spinner/src/lib/ui-spinner.module'; @NgModule({ imports: [ @@ -21,6 +22,7 @@ import { HasSelectedFiltersPipe } from '../../pipes'; BrowserAnimationsModule, RemissionUeberlaufCapacitiesModule, RemissionRequiredCapacitiesWidgetModule, + UiSpinnerModule, ], exports: [RemissionListFilterComponent, HasSelectedFiltersPipe], declarations: [RemissionListFilterComponent, HasSelectedFiltersPipe], diff --git a/apps/sales/src/app/modules/remission/pages/remission-add-product-to-remission-list/remission-add-product-to-remission-list.component.ts b/apps/sales/src/app/modules/remission/pages/remission-add-product-to-remission-list/remission-add-product-to-remission-list.component.ts index 3fa220f4b..77a7c7d04 100644 --- a/apps/sales/src/app/modules/remission/pages/remission-add-product-to-remission-list/remission-add-product-to-remission-list.component.ts +++ b/apps/sales/src/app/modules/remission/pages/remission-add-product-to-remission-list/remission-add-product-to-remission-list.component.ts @@ -34,6 +34,7 @@ export class RemissionAddProductToRemissionListComponent implements OnInit, Afte } searchProduct(input: string) { + console.log(input); this.validInput(input).ifTrue(() => { this.remissionService .searchProduct({ ean: input }) diff --git a/apps/sales/src/app/modules/remission/pages/remission-list-create/remission-list-create.component.html b/apps/sales/src/app/modules/remission/pages/remission-list-create/remission-list-create.component.html index 3e87d8e6a..e55318c7c 100644 --- a/apps/sales/src/app/modules/remission/pages/remission-list-create/remission-list-create.component.html +++ b/apps/sales/src/app/modules/remission/pages/remission-list-create/remission-list-create.component.html @@ -13,7 +13,7 @@
- +
diff --git a/apps/sales/src/app/modules/remission/pages/remission-list-create/remission-list-create.component.ts b/apps/sales/src/app/modules/remission/pages/remission-list-create/remission-list-create.component.ts index 5fc30f27e..0c43d7655 100644 --- a/apps/sales/src/app/modules/remission/pages/remission-list-create/remission-list-create.component.ts +++ b/apps/sales/src/app/modules/remission/pages/remission-list-create/remission-list-create.component.ts @@ -34,7 +34,6 @@ import { RemissionToTopToBottomActionsComponent } from '../../components/remissi // tslint:disable-next-line: max-line-length import { RemissionScanProductInvalidBarcodeComponent } from '../../components/remission-scan-product-invalid-barcode/remission-scan-product-invalid-barcode.component'; import { NativeContainerService } from 'shared/lib/remission-container-scanner/native-container.service'; -import { SupplierDTO } from '@cmf/inventory-api'; import { fadeInWithDelay } from '../../animations/fadeIn.animation'; import { RemissionProcess, @@ -44,6 +43,7 @@ import { RemissionSourceType, RemissionSupplier, } from '@isa/remission'; +import { SupplierDTO } from '@swagger/remi'; @Component({ selector: 'app-remission-list-create', @@ -69,7 +69,6 @@ export class RemissionListCreateComponent implements OnInit, OnDestroy { isLoading$: Observable; remissionProcess$: Observable; - remissionSuppliers$ = this.remissionService.getRemissionTargets(); remissionTargets$ = this.remissionService.getRemissionTargets(); remissionListHits$: Observable; listLoaded$: Observable; diff --git a/apps/sales/src/app/modules/shelf/components/history-log/history-log.component.ts b/apps/sales/src/app/modules/shelf/components/history-log/history-log.component.ts index 7ac80c9df..8e2b9d8d7 100644 --- a/apps/sales/src/app/modules/shelf/components/history-log/history-log.component.ts +++ b/apps/sales/src/app/modules/shelf/components/history-log/history-log.component.ts @@ -1,5 +1,5 @@ import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; -import { HistoryDTO } from '@cmf/trade-api'; +import { HistoryDTO } from '@swagger/oms'; @Component({ selector: 'app-shelf-history-log', diff --git a/apps/sales/src/app/modules/shelf/pages/shelf-history/history-logs/shelf-history-logs.component.ts b/apps/sales/src/app/modules/shelf/pages/shelf-history/history-logs/shelf-history-logs.component.ts index d0ac73c9d..c8b770556 100644 --- a/apps/sales/src/app/modules/shelf/pages/shelf-history/history-logs/shelf-history-logs.component.ts +++ b/apps/sales/src/app/modules/shelf/pages/shelf-history/history-logs/shelf-history-logs.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ChangeDetectionStrategy, Input } from '@angular/core'; import { Observable } from 'rxjs'; -import { HistoryDTO } from '@cmf/trade-api'; import { HistoryStateFacade } from '@shelf-store/history'; +import { HistoryDTO } from '@swagger/oms'; @Component({ selector: 'app-shelf-history-logs', diff --git a/apps/sales/src/app/modules/shelf/pages/shelf-history/mappings/history-dto-to-info-text.mapping.ts b/apps/sales/src/app/modules/shelf/pages/shelf-history/mappings/history-dto-to-info-text.mapping.ts index a825b2022..91edd563a 100644 --- a/apps/sales/src/app/modules/shelf/pages/shelf-history/mappings/history-dto-to-info-text.mapping.ts +++ b/apps/sales/src/app/modules/shelf/pages/shelf-history/mappings/history-dto-to-info-text.mapping.ts @@ -1,4 +1,4 @@ -import { HistoryDTO } from '@cmf/trade-api'; +import { HistoryDTO } from '@swagger/oms'; export function historyDtoToInfoText(history: HistoryDTO): string { const baseDate = new Date(history.changed); diff --git a/apps/sales/src/app/modules/shelf/pages/shelf-history/mappings/history-dto-to-status-text.mapping.ts b/apps/sales/src/app/modules/shelf/pages/shelf-history/mappings/history-dto-to-status-text.mapping.ts index 3c2a1446c..136d8ad74 100644 --- a/apps/sales/src/app/modules/shelf/pages/shelf-history/mappings/history-dto-to-status-text.mapping.ts +++ b/apps/sales/src/app/modules/shelf/pages/shelf-history/mappings/history-dto-to-status-text.mapping.ts @@ -1,4 +1,4 @@ -import { HistoryDTO } from '@cmf/trade-api'; +import { HistoryDTO } from '@swagger/oms'; export function historyDtoToStatusText(history: HistoryDTO): string { return history.description || 'Status der Bestellung wurde geändert'; diff --git a/apps/sales/src/app/modules/shelf/pages/shelf-history/pipes/filter-histories-with-status-change.pipe.ts b/apps/sales/src/app/modules/shelf/pages/shelf-history/pipes/filter-histories-with-status-change.pipe.ts index fdd5e6390..d7b537cbb 100644 --- a/apps/sales/src/app/modules/shelf/pages/shelf-history/pipes/filter-histories-with-status-change.pipe.ts +++ b/apps/sales/src/app/modules/shelf/pages/shelf-history/pipes/filter-histories-with-status-change.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { HistoryDTO } from '@cmf/trade-api'; +import { HistoryDTO } from '@swagger/oms'; @Pipe({ name: 'filterHistoriesWithStatusChange', diff --git a/apps/sales/src/app/modules/shelf/pages/shelf-history/pipes/historyDtoToStatusText.pipe.ts b/apps/sales/src/app/modules/shelf/pages/shelf-history/pipes/historyDtoToStatusText.pipe.ts index 631dd61da..abb558fa7 100644 --- a/apps/sales/src/app/modules/shelf/pages/shelf-history/pipes/historyDtoToStatusText.pipe.ts +++ b/apps/sales/src/app/modules/shelf/pages/shelf-history/pipes/historyDtoToStatusText.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { HistoryDTO } from '@cmf/trade-api'; +import { HistoryDTO } from '@swagger/oms'; import { historyDtoToStatusText } from '../mappings'; @Pipe({ diff --git a/apps/sales/src/app/modules/shelf/pages/shelf-history/pipes/historyDtoToinfoText.pipe.ts b/apps/sales/src/app/modules/shelf/pages/shelf-history/pipes/historyDtoToinfoText.pipe.ts index 71400cb50..2d39d348e 100644 --- a/apps/sales/src/app/modules/shelf/pages/shelf-history/pipes/historyDtoToinfoText.pipe.ts +++ b/apps/sales/src/app/modules/shelf/pages/shelf-history/pipes/historyDtoToinfoText.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { HistoryDTO } from '@cmf/trade-api'; +import { HistoryDTO } from '@swagger/oms'; import { historyDtoToInfoText } from '../mappings'; @Pipe({ diff --git a/apps/sales/src/app/modules/shelf/services/shelf-shipping-note.service.ts b/apps/sales/src/app/modules/shelf/services/shelf-shipping-note.service.ts index 1ed9498b5..26d490b76 100644 --- a/apps/sales/src/app/modules/shelf/services/shelf-shipping-note.service.ts +++ b/apps/sales/src/app/modules/shelf/services/shelf-shipping-note.service.ts @@ -1,6 +1,5 @@ import { Injectable } from '@angular/core'; -import { OrderItemListItemDTO, ReceiptDTO, ReceiptService } from '@swagger/oms'; -import { ResponseArgs } from '@cmf/core'; +import { OrderItemListItemDTO, ReceiptDTO, ReceiptService, ResponseArgs } from '@swagger/oms'; import { BehaviorSubject, Observable, of } from 'rxjs'; import { take } from 'rxjs/internal/operators/take'; @@ -162,7 +161,7 @@ export class ShelfShippingNoteService { } } - private handleRequest(response$: Observable>, statusObs$?: BehaviorSubject): Promise { + private handleRequest(response$: Observable, statusObs$?: BehaviorSubject): Promise { return response$ .pipe( map((response) => { diff --git a/apps/sales/src/app/store/customer/customers/customers.selectors.ts b/apps/sales/src/app/store/customer/customers/customers.selectors.ts index 876af1a5b..5e49d9412 100644 --- a/apps/sales/src/app/store/customer/customers/customers.selectors.ts +++ b/apps/sales/src/app/store/customer/customers/customers.selectors.ts @@ -1,5 +1,4 @@ import { createSelector } from '@ngrx/store'; -import { Dictionary } from '@cmf/core'; import { customersStateAdapter } from './customers.state'; import { selectCustomerState } from '../customer.selector'; import { Customer } from './defs'; @@ -8,28 +7,28 @@ export const selectCustomersState = createSelector(selectCustomerState, (s) => s export const { selectAll, selectEntities } = customersStateAdapter.getSelectors(selectCustomersState); -export const selectCustomers = createSelector(selectEntities, (entities: Dictionary) => entities); +export const selectCustomers = createSelector(selectEntities, (entities: { [key: number]: Customer }) => entities); -export const selectCustomer = createSelector(selectEntities, (entities: Dictionary, id: number) => entities[id]); +export const selectCustomer = createSelector(selectEntities, (entities: { [key: number]: Customer }, id: number) => entities[id]); export const selectAddresses = createSelector( selectEntities, - (entities: Dictionary, id: number) => entities[id] && entities[id].addresses + (entities: { [key: number]: Customer }, id: number) => entities[id] && entities[id].addresses ); export const selectGeneralAddress = createSelector( selectEntities, - (entities: Dictionary, id: number) => entities[id] && entities[id].addresses && entities[id].addresses.generalAddress + (entities: { [key: number]: Customer }, id: number) => entities[id] && entities[id].addresses && entities[id].addresses.generalAddress ); export const selectShippingAddresses = createSelector( selectEntities, - (entities: Dictionary, id: number) => entities[id] && entities[id].addresses.shippingAddresses + (entities: { [key: number]: Customer }, id: number) => entities[id] && entities[id].addresses.shippingAddresses ); export const selectDefaultShippingAddress = createSelector( selectEntities, - (entities: Dictionary, id: number) => + (entities: { [key: number]: Customer }, id: number) => entities[id] && entities[id].addresses.shippingAddresses && entities[id].addresses.shippingAddresses.find((address) => address.isDefault) @@ -37,11 +36,11 @@ export const selectDefaultShippingAddress = createSelector( export const selectPayerAddresses = createSelector( selectEntities, - (entities: Dictionary, id: number) => entities[id] && entities[id].addresses && entities[id].addresses.payerAddresses + (entities: { [key: number]: Customer }, id: number) => entities[id] && entities[id].addresses && entities[id].addresses.payerAddresses ); export const selectDefaultPayerAddresses = createSelector( selectEntities, - (entities: Dictionary, id: number) => + (entities: { [key: number]: Customer }, id: number) => entities[id] && entities[id].addresses && entities[id].addresses.payerAddresses.find((address) => address.isDefault) ); diff --git a/apps/sales/src/app/store/customer/shelf/defs/order-history.ts b/apps/sales/src/app/store/customer/shelf/defs/order-history.ts index 44f7ed320..55404206f 100644 --- a/apps/sales/src/app/store/customer/shelf/defs/order-history.ts +++ b/apps/sales/src/app/store/customer/shelf/defs/order-history.ts @@ -1,4 +1,4 @@ -import { HistoryDTO } from '@cmf/trade-api'; +import { HistoryDTO } from '@swagger/oms'; import { OrderHistoryStatus } from './order-history-status'; export interface OrderHistory { diff --git a/apps/sales/src/app/store/customer/shelf/history/history.actions.ts b/apps/sales/src/app/store/customer/shelf/history/history.actions.ts index 09493abb8..77ed973dd 100644 --- a/apps/sales/src/app/store/customer/shelf/history/history.actions.ts +++ b/apps/sales/src/app/store/customer/shelf/history/history.actions.ts @@ -1,7 +1,6 @@ import { OrderHistory, OrderHistoryStatus } from '../defs'; import { props, createAction } from '@ngrx/store'; -import { StrictHttpResponse, ResponseArgsOfHistoryDTO } from '@swagger/oms'; -import { HistoryDTO } from '@cmf/trade-api'; +import { StrictHttpResponse, ResponseArgsOfHistoryDTO, HistoryDTO } from '@swagger/oms'; const prefix = '[CUSTOMER] [SHELF] [HISTORY]'; diff --git a/apps/sales/src/app/store/customer/shelf/history/history.facade.ts b/apps/sales/src/app/store/customer/shelf/history/history.facade.ts index a308a90cb..39605b132 100644 --- a/apps/sales/src/app/store/customer/shelf/history/history.facade.ts +++ b/apps/sales/src/app/store/customer/shelf/history/history.facade.ts @@ -5,8 +5,8 @@ import { Dictionary } from '@ngrx/entity'; import { Observable } from 'rxjs'; import * as selectors from './history.selectors'; import * as actions from './history.actions'; -import { HistoryDTO } from '@cmf/trade-api'; import { map } from 'rxjs/operators'; +import { HistoryDTO } from '@swagger/oms'; @Injectable({ providedIn: 'root' }) export class HistoryStateFacade { diff --git a/apps/sales/src/app/store/customer/shelf/search/mappers/primary-filters-to-filters-dictionary.mapper.ts b/apps/sales/src/app/store/customer/shelf/search/mappers/primary-filters-to-filters-dictionary.mapper.ts index ca84f5499..55ca438b0 100644 --- a/apps/sales/src/app/store/customer/shelf/search/mappers/primary-filters-to-filters-dictionary.mapper.ts +++ b/apps/sales/src/app/store/customer/shelf/search/mappers/primary-filters-to-filters-dictionary.mapper.ts @@ -1,4 +1,3 @@ -import { Dictionary } from '@cmf/core'; import { PrimaryFilterOption } from 'apps/sales/src/app/modules/shelf/defs'; export function primaryFiltersToFiltersDictionary(primaryFilters: PrimaryFilterOption[]): { [key: string]: string[] } { diff --git a/apps/swagger/print/src/lib/models/address-dto.ts b/apps/swagger/print/src/lib/models/address-dto.ts index 089bd01c6..502254ee0 100644 --- a/apps/swagger/print/src/lib/models/address-dto.ts +++ b/apps/swagger/print/src/lib/models/address-dto.ts @@ -4,14 +4,14 @@ export interface AddressDTO { apartment?: string; careOf?: string; city?: string; + country?: string; district?: string; + geoLocation?: GeoLocation; info?: string; po?: string; + region?: string; + state?: string; street?: string; streetNumber?: string; zipCode?: string; - state?: string; - country?: string; - geoLocation?: GeoLocation; - region?: string; } diff --git a/apps/swagger/print/src/lib/models/address.ts b/apps/swagger/print/src/lib/models/address.ts index e60c41f52..677a5f5e7 100644 --- a/apps/swagger/print/src/lib/models/address.ts +++ b/apps/swagger/print/src/lib/models/address.ts @@ -4,14 +4,14 @@ export interface Address { apartment?: string; careOf?: string; city?: string; + country?: string; district?: string; + geoLocation?: GeoLocation; info?: string; po?: string; region?: string; + state?: string; street?: string; streetNumber?: string; zipCode?: string; - state?: string; - country?: string; - geoLocation?: GeoLocation; } diff --git a/apps/swagger/print/src/lib/models/availability-dto.ts b/apps/swagger/print/src/lib/models/availability-dto.ts index a4a28366a..e0baf311b 100644 --- a/apps/swagger/print/src/lib/models/availability-dto.ts +++ b/apps/swagger/print/src/lib/models/availability-dto.ts @@ -1,16 +1,16 @@ /* tslint:disable */ -import { ShopDTO } from './shop-dto'; import { PriceDTO } from './price-dto'; +import { ShopDTO } from './shop-dto'; import { AvailabilityType } from './availability-type'; export interface AvailabilityDTO { - itemId?: number; - shop?: ShopDTO; - price?: PriceDTO; - supplier?: string; - ssc?: string; - qty?: number; at?: string; - status: AvailabilityType; + itemId?: number; + price?: PriceDTO; + qty?: number; rank?: number; requested?: string; + shop?: ShopDTO; + ssc?: string; + status: AvailabilityType; + supplier?: string; } diff --git a/apps/swagger/print/src/lib/models/availability-dto2.ts b/apps/swagger/print/src/lib/models/availability-dto2.ts index 84567dfa6..03091b829 100644 --- a/apps/swagger/print/src/lib/models/availability-dto2.ts +++ b/apps/swagger/print/src/lib/models/availability-dto2.ts @@ -1,23 +1,23 @@ /* tslint:disable */ import { AvailabilityType } from './availability-type'; +import { EntityDTOContainerOfLogisticianDTO } from './entity-dtocontainer-of-logistician-dto'; import { PriceDTO } from './price-dto'; import { EntityDTOContainerOfShopItemDTO } from './entity-dtocontainer-of-shop-item-dto'; import { EntityDTOContainerOfSupplierDTO } from './entity-dtocontainer-of-supplier-dto'; -import { EntityDTOContainerOfLogisticianDTO } from './entity-dtocontainer-of-logistician-dto'; export interface AvailabilityDTO2 { availabilityType: AvailabilityType; + estimatedShippingDate?: string; inStock?: number; + isPrebooked?: boolean; + logistician?: EntityDTOContainerOfLogisticianDTO; + price?: PriceDTO; + requestReference?: string; + shopItem?: EntityDTOContainerOfShopItemDTO; ssc?: string; sscText?: string; + supplier?: EntityDTOContainerOfSupplierDTO; supplierInfo?: string; - isPrebooked?: boolean; + supplierProductNumber?: string; supplierSSC?: string; supplierSSCText?: string; - price?: PriceDTO; - estimatedShippingDate?: string; - shopItem?: EntityDTOContainerOfShopItemDTO; - supplier?: EntityDTOContainerOfSupplierDTO; - logistician?: EntityDTOContainerOfLogisticianDTO; - supplierProductNumber?: string; - requestReference?: string; } diff --git a/apps/swagger/print/src/lib/models/branch-dto.ts b/apps/swagger/print/src/lib/models/branch-dto.ts index 148182bb3..b359b86fc 100644 --- a/apps/swagger/print/src/lib/models/branch-dto.ts +++ b/apps/swagger/print/src/lib/models/branch-dto.ts @@ -1,19 +1,19 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfBranchDTOAndIReadOnlyBranch } from './read-only-entity-dtoof-branch-dtoand-iread-only-branch'; -import { EntityDTOContainerOfLabelDTO } from './entity-dtocontainer-of-label-dto'; import { Address } from './address'; import { BranchType } from './branch-type'; -export interface BranchDTO extends ReadOnlyEntityDTOOfBranchDTOAndIReadOnlyBranch { - label?: EntityDTOContainerOfLabelDTO; - parent?: number; +import { EntityDTOContainerOfLabelDTO } from './entity-dtocontainer-of-label-dto'; +export interface BranchDTO extends ReadOnlyEntityDTOOfBranchDTOAndIReadOnlyBranch{ + address?: Address; branchNumber?: string; - name?: string; - shortName?: string; - key?: string; + branchType: BranchType; + isDefault?: string; isOnline?: boolean; isOrderingEnabled?: boolean; isShippingEnabled?: boolean; - address?: Address; - branchType: BranchType; - isDefault?: string; + key?: string; + label?: EntityDTOContainerOfLabelDTO; + name?: string; + parent?: number; + shortName?: string; } diff --git a/apps/swagger/print/src/lib/models/branch-target-dto.ts b/apps/swagger/print/src/lib/models/branch-target-dto.ts index 3596ce011..2f74f9dc7 100644 --- a/apps/swagger/print/src/lib/models/branch-target-dto.ts +++ b/apps/swagger/print/src/lib/models/branch-target-dto.ts @@ -1,8 +1,8 @@ /* tslint:disable */ import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto'; export interface BranchTargetDTO { - target?: EntityDTOContainerOfBranchDTO; + isDefault?: string; start?: string; stop?: string; - isDefault?: string; + target?: EntityDTOContainerOfBranchDTO; } diff --git a/apps/swagger/print/src/lib/models/buyer-dto.ts b/apps/swagger/print/src/lib/models/buyer-dto.ts index 913a024f7..ceb282198 100644 --- a/apps/swagger/print/src/lib/models/buyer-dto.ts +++ b/apps/swagger/print/src/lib/models/buyer-dto.ts @@ -1,21 +1,21 @@ /* tslint:disable */ import { EntityReferenceDTO } from './entity-reference-dto'; -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 { +import { BuyerType } from './buyer-type'; +import { CommunicationDetailsDTO } from './communication-details-dto'; +import { Gender } from './gender'; +import { OrganisationDTO } from './organisation-dto'; +export interface BuyerDTO extends EntityReferenceDTO{ + address?: AddressDTO; buyerNumber?: string; buyerType: BuyerType; - isTemporaryAccount?: boolean; - locale?: string; - gender: Gender; - title?: string; - firstName?: string; - lastName?: string; - dateOfBirth?: string; communicationDetails?: CommunicationDetailsDTO; + dateOfBirth?: string; + firstName?: string; + gender: Gender; + isTemporaryAccount?: boolean; + lastName?: string; + locale?: string; organisation?: OrganisationDTO; - address?: AddressDTO; + title?: string; } diff --git a/apps/swagger/print/src/lib/models/category-dto.ts b/apps/swagger/print/src/lib/models/category-dto.ts index 1fd410850..cdc5f00cb 100644 --- a/apps/swagger/print/src/lib/models/category-dto.ts +++ b/apps/swagger/print/src/lib/models/category-dto.ts @@ -2,13 +2,13 @@ import { EntityDTOOfCategoryDTOAndICategory } from './entity-dtoof-category-dtoand-icategory'; import { EntityDTOContainerOfCategoryDTO } from './entity-dtocontainer-of-category-dto'; import { EntityDTOContainerOfTenantDTO } from './entity-dtocontainer-of-tenant-dto'; -export interface CategoryDTO extends EntityDTOOfCategoryDTOAndICategory { +export interface CategoryDTO extends EntityDTOOfCategoryDTOAndICategory{ + key?: string; name?: string; parent?: EntityDTOContainerOfCategoryDTO; - type?: string; - key?: string; sort?: number; start?: string; stop?: string; tenant?: EntityDTOContainerOfTenantDTO; + type?: string; } diff --git a/apps/swagger/print/src/lib/models/checkout-delivery-dto.ts b/apps/swagger/print/src/lib/models/checkout-delivery-dto.ts index 589c8b8cd..a35b8a949 100644 --- a/apps/swagger/print/src/lib/models/checkout-delivery-dto.ts +++ b/apps/swagger/print/src/lib/models/checkout-delivery-dto.ts @@ -2,18 +2,18 @@ import { ReadOnlyEntityDTOOfCheckoutDeliveryDTOAndICheckoutDelivery } from './read-only-entity-dtoof-checkout-delivery-dtoand-icheckout-delivery'; import { EntityDTOContainerOfCheckoutDTO } from './entity-dtocontainer-of-checkout-dto'; import { EntityDTOContainerOfDestinationDTO } from './entity-dtocontainer-of-destination-dto'; -import { TermsOfDeliveryDTO } from './terms-of-delivery-dto'; -import { EntityDTOContainerOfCheckoutItemDTO } from './entity-dtocontainer-of-checkout-item-dto'; -import { DisplayItemDTO } from './display-item-dto'; import { PriceValueDTO } from './price-value-dto'; -export interface CheckoutDeliveryDTO extends ReadOnlyEntityDTOOfCheckoutDeliveryDTOAndICheckoutDelivery { +import { DisplayItemDTO } from './display-item-dto'; +import { EntityDTOContainerOfCheckoutItemDTO } from './entity-dtocontainer-of-checkout-item-dto'; +import { TermsOfDeliveryDTO } from './terms-of-delivery-dto'; +export interface CheckoutDeliveryDTO extends ReadOnlyEntityDTOOfCheckoutDeliveryDTOAndICheckoutDelivery{ checkout?: EntityDTOContainerOfCheckoutDTO; destination?: EntityDTOContainerOfDestinationDTO; + discount?: PriceValueDTO; + displayItems?: Array; + items?: Array; preferredShippingDate?: string; termsOfDelivery?: TermsOfDeliveryDTO; - items?: Array; - displayItems?: Array; total?: PriceValueDTO; totalWithoutDiscount?: PriceValueDTO; - discount?: PriceValueDTO; } diff --git a/apps/swagger/print/src/lib/models/checkout-dto.ts b/apps/swagger/print/src/lib/models/checkout-dto.ts index 32df29979..d2972c1a2 100644 --- a/apps/swagger/print/src/lib/models/checkout-dto.ts +++ b/apps/swagger/print/src/lib/models/checkout-dto.ts @@ -1,30 +1,30 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfCheckoutDTOAndICheckout } from './read-only-entity-dtoof-checkout-dtoand-icheckout'; -import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto'; -import { UserAccountDTO } from './user-account-dto'; +import { KeyValueDTOOfStringAndString } from './key-value-dtoof-string-and-string'; +import { SelectionDTOOfShippingTarget } from './selection-dtoof-shipping-target'; 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 { EntityDTOContainerOfDestinationDTO } from './entity-dtocontainer-of-destination-dto'; import { EntityDTOContainerOfCheckoutItemDTO } from './entity-dtocontainer-of-checkout-item-dto'; import { NotificationChannel } from './notification-channel'; -import { SelectionDTOOfShippingTarget } from './selection-dtoof-shipping-target'; +import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto'; +import { PayerDTO } from './payer-dto'; import { PaymentDTO } from './payment-dto'; -import { KeyValueDTOOfStringAndString } from './key-value-dtoof-string-and-string'; -export interface CheckoutDTO extends ReadOnlyEntityDTOOfCheckoutDTOAndICheckout { - label?: string; - orderBranch?: EntityDTOContainerOfBranchDTO; - userAccount?: UserAccountDTO; - buyer?: BuyerDTO; - payer?: PayerDTO; - destinations?: Array; - deliveries?: Array; - items?: Array; - notificationChannels: NotificationChannel; - availableShippingTargets?: Array; - payment?: PaymentDTO; - shoppingCartUrl?: string; - checkoutUrl?: string; - shippingCostsUrl?: string; +import { UserAccountDTO } from './user-account-dto'; +export interface CheckoutDTO extends ReadOnlyEntityDTOOfCheckoutDTOAndICheckout{ agreements?: Array; + availableShippingTargets?: Array; + buyer?: BuyerDTO; + checkoutUrl?: string; + deliveries?: Array; + destinations?: Array; + items?: Array; + label?: string; + notificationChannels: NotificationChannel; + orderBranch?: EntityDTOContainerOfBranchDTO; + payer?: PayerDTO; + payment?: PaymentDTO; + shippingCostsUrl?: string; + shoppingCartUrl?: string; + userAccount?: UserAccountDTO; } diff --git a/apps/swagger/print/src/lib/models/checkout-item-dto.ts b/apps/swagger/print/src/lib/models/checkout-item-dto.ts index 977a02b1c..c2172c522 100644 --- a/apps/swagger/print/src/lib/models/checkout-item-dto.ts +++ b/apps/swagger/print/src/lib/models/checkout-item-dto.ts @@ -1,16 +1,16 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfCheckoutItemDTOAndICheckoutItem } from './read-only-entity-dtoof-checkout-item-dtoand-icheckout-item'; -import { EntityDTOContainerOfCheckoutDTO } from './entity-dtocontainer-of-checkout-dto'; import { EntityDTOContainerOfShoppingCartItemDTO } from './entity-dtocontainer-of-shopping-cart-item-dto'; +import { EntityDTOContainerOfCheckoutDTO } from './entity-dtocontainer-of-checkout-dto'; import { EntityDTOContainerOfCheckoutDeliveryDTO } from './entity-dtocontainer-of-checkout-delivery-dto'; import { PriceValueDTO } from './price-value-dto'; -export interface CheckoutItemDTO extends ReadOnlyEntityDTOOfCheckoutItemDTOAndICheckoutItem { - checkout?: EntityDTOContainerOfCheckoutDTO; - shoppingCartItem?: EntityDTOContainerOfShoppingCartItemDTO; - delivery?: EntityDTOContainerOfCheckoutDeliveryDTO; - quantity?: number; - preferredShippingDate?: string; +export interface CheckoutItemDTO extends ReadOnlyEntityDTOOfCheckoutItemDTOAndICheckoutItem{ accessories?: Array; - total?: PriceValueDTO; + checkout?: EntityDTOContainerOfCheckoutDTO; + delivery?: EntityDTOContainerOfCheckoutDeliveryDTO; orderedAtSupplier?: string; + preferredShippingDate?: string; + quantity?: number; + shoppingCartItem?: EntityDTOContainerOfShoppingCartItemDTO; + total?: PriceValueDTO; } diff --git a/apps/swagger/print/src/lib/models/communication-details-dto.ts b/apps/swagger/print/src/lib/models/communication-details-dto.ts index c4d37ee69..eb5791e6a 100644 --- a/apps/swagger/print/src/lib/models/communication-details-dto.ts +++ b/apps/swagger/print/src/lib/models/communication-details-dto.ts @@ -1,7 +1,7 @@ /* tslint:disable */ export interface CommunicationDetailsDTO { - phone?: string; - mobile?: string; - fax?: string; email?: string; + fax?: string; + mobile?: string; + phone?: string; } diff --git a/apps/swagger/print/src/lib/models/company-dto.ts b/apps/swagger/print/src/lib/models/company-dto.ts index 8b9ebfcd3..97946083a 100644 --- a/apps/swagger/print/src/lib/models/company-dto.ts +++ b/apps/swagger/print/src/lib/models/company-dto.ts @@ -1,17 +1,17 @@ /* tslint:disable */ import { EntityDTOOfCompanyDTOAndICompany } from './entity-dtoof-company-dtoand-icompany'; -import { EntityDTOContainerOfCompanyDTO } from './entity-dtocontainer-of-company-dto'; import { AddressDTO } from './address-dto'; -export interface CompanyDTO extends EntityDTOOfCompanyDTOAndICompany { - parent?: EntityDTOContainerOfCompanyDTO; +import { EntityDTOContainerOfCompanyDTO } from './entity-dtocontainer-of-company-dto'; +export interface CompanyDTO extends EntityDTOOfCompanyDTOAndICompany{ + address?: AddressDTO; + costUnit?: string; + department?: string; + gln?: string; + legalForm?: string; locale?: string; name?: string; nameSuffix?: string; - legalForm?: string; - department?: string; - costUnit?: string; - vatId?: string; - address?: AddressDTO; - gln?: string; + parent?: EntityDTOContainerOfCompanyDTO; sector?: string; + vatId?: string; } diff --git a/apps/swagger/print/src/lib/models/component-item-dto.ts b/apps/swagger/print/src/lib/models/component-item-dto.ts index f0035a862..93a92d737 100644 --- a/apps/swagger/print/src/lib/models/component-item-dto.ts +++ b/apps/swagger/print/src/lib/models/component-item-dto.ts @@ -1,18 +1,18 @@ /* tslint:disable */ -import { EntityDTOContainerOfItemDTO } from './entity-dtocontainer-of-item-dto'; import { EntityDTOContainerOfCategoryDTO } from './entity-dtocontainer-of-category-dto'; -import { QuantityUnitType } from './quantity-unit-type'; import { ComponentItemDisplayType } from './component-item-display-type'; +import { EntityDTOContainerOfItemDTO } from './entity-dtocontainer-of-item-dto'; +import { QuantityUnitType } from './quantity-unit-type'; export interface ComponentItemDTO { - name?: string; - description?: string; - item?: EntityDTOContainerOfItemDTO; category?: EntityDTOContainerOfCategoryDTO; - required?: boolean; + description?: string; + displayType: ComponentItemDisplayType; + item?: EntityDTOContainerOfItemDTO; + name?: string; quantityMax?: number; quantityUnitType: QuantityUnitType; - unit?: string; - displayType: ComponentItemDisplayType; + required?: boolean; start?: string; stop?: string; + unit?: string; } diff --git a/apps/swagger/print/src/lib/models/components-dto.ts b/apps/swagger/print/src/lib/models/components-dto.ts index ae2403e5e..d41a14935 100644 --- a/apps/swagger/print/src/lib/models/components-dto.ts +++ b/apps/swagger/print/src/lib/models/components-dto.ts @@ -1,14 +1,14 @@ /* tslint:disable */ import { EntityDTOOfComponentsDTOAndIComponents } from './entity-dtoof-components-dtoand-icomponents'; import { ComponentItemDTO } from './component-item-dto'; -import { SetType } from './set-type'; import { QuantityUnitType } from './quantity-unit-type'; -export interface ComponentsDTO extends EntityDTOOfComponentsDTOAndIComponents { +import { SetType } from './set-type'; +export interface ComponentsDTO extends EntityDTOOfComponentsDTOAndIComponents{ items?: Array; - type: SetType; - overallQuantityMin?: number; overallQuantityMax?: number; + overallQuantityMin?: number; quantityUnitType: QuantityUnitType; - unit?: string; referenceQuantity?: number; + type: SetType; + unit?: string; } diff --git a/apps/swagger/print/src/lib/models/contributor-dto.ts b/apps/swagger/print/src/lib/models/contributor-dto.ts index 3492cef38..6b78092d7 100644 --- a/apps/swagger/print/src/lib/models/contributor-dto.ts +++ b/apps/swagger/print/src/lib/models/contributor-dto.ts @@ -1,11 +1,11 @@ /* tslint:disable */ import { EntityDTOOfContributorDTOAndIContributor } from './entity-dtoof-contributor-dtoand-icontributor'; -import { PersonNamesDTO } from './person-names-dto'; import { OrganisationNamesDTO } from './organisation-names-dto'; +import { PersonNamesDTO } from './person-names-dto'; import { EntityDTOContainerOfTenantDTO } from './entity-dtocontainer-of-tenant-dto'; -export interface ContributorDTO extends EntityDTOOfContributorDTOAndIContributor { - person?: PersonNamesDTO; - organisation?: OrganisationNamesDTO; +export interface ContributorDTO extends EntityDTOOfContributorDTOAndIContributor{ friendlyName?: string; + organisation?: OrganisationNamesDTO; + person?: PersonNamesDTO; tenant?: EntityDTOContainerOfTenantDTO; } diff --git a/apps/swagger/print/src/lib/models/contributor-helper-dto.ts b/apps/swagger/print/src/lib/models/contributor-helper-dto.ts index 8ccde9731..0bcdfea61 100644 --- a/apps/swagger/print/src/lib/models/contributor-helper-dto.ts +++ b/apps/swagger/print/src/lib/models/contributor-helper-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOContainerOfContributorDTO } from './entity-dtocontainer-of-contributor-dto'; export interface ContributorHelperDTO { - type?: string; contributor?: EntityDTOContainerOfContributorDTO; + type?: string; } diff --git a/apps/swagger/print/src/lib/models/country-dto.ts b/apps/swagger/print/src/lib/models/country-dto.ts index 66b66eb5a..567953fe6 100644 --- a/apps/swagger/print/src/lib/models/country-dto.ts +++ b/apps/swagger/print/src/lib/models/country-dto.ts @@ -1,8 +1,8 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfCountryDTOAndIReadOnlyCountry } from './read-only-entity-dtoof-country-dtoand-iread-only-country'; -export interface CountryDTO extends ReadOnlyEntityDTOOfCountryDTOAndIReadOnlyCountry { - name?: string; - isO3166_A_3?: string; +export interface CountryDTO extends ReadOnlyEntityDTOOfCountryDTOAndIReadOnlyCountry{ isDefault?: string; + isO3166_A_3?: string; + name?: string; sort?: number; } diff --git a/apps/swagger/print/src/lib/models/country-target-dto.ts b/apps/swagger/print/src/lib/models/country-target-dto.ts index 2d0fd59f6..5173177ec 100644 --- a/apps/swagger/print/src/lib/models/country-target-dto.ts +++ b/apps/swagger/print/src/lib/models/country-target-dto.ts @@ -1,8 +1,8 @@ /* tslint:disable */ import { EntityDTOContainerOfCountryDTO } from './entity-dtocontainer-of-country-dto'; export interface CountryTargetDTO { - target?: EntityDTOContainerOfCountryDTO; + isDefault?: string; start?: string; stop?: string; - isDefault?: string; + target?: EntityDTOContainerOfCountryDTO; } diff --git a/apps/swagger/print/src/lib/models/coupon-dto.ts b/apps/swagger/print/src/lib/models/coupon-dto.ts index 17afa5ce0..91bc78327 100644 --- a/apps/swagger/print/src/lib/models/coupon-dto.ts +++ b/apps/swagger/print/src/lib/models/coupon-dto.ts @@ -2,12 +2,12 @@ import { ReadOnlyEntityDTOOfCouponDTOAndICoupon } from './read-only-entity-dtoof-coupon-dtoand-icoupon'; import { CouponType } from './coupon-type'; import { PriceValueDTO } from './price-value-dto'; -export interface CouponDTO extends ReadOnlyEntityDTOOfCouponDTOAndICoupon { - couponType: CouponType; - label?: string; +export interface CouponDTO extends ReadOnlyEntityDTOOfCouponDTOAndICoupon{ code?: string; - exclusive?: boolean; + couponType: CouponType; discount?: number; + exclusive?: boolean; + label?: string; maxDiscounted?: PriceValueDTO; value?: PriceValueDTO; } diff --git a/apps/swagger/print/src/lib/models/currency-dto.ts b/apps/swagger/print/src/lib/models/currency-dto.ts index 9661ef3ec..4d12c22f8 100644 --- a/apps/swagger/print/src/lib/models/currency-dto.ts +++ b/apps/swagger/print/src/lib/models/currency-dto.ts @@ -1,8 +1,8 @@ /* tslint:disable */ import { EntityDTOOfCurrencyDTOAndICurrency } from './entity-dtoof-currency-dtoand-icurrency'; -export interface CurrencyDTO extends EntityDTOOfCurrencyDTOAndICurrency { +export interface CurrencyDTO extends EntityDTOOfCurrencyDTOAndICurrency{ isO4217?: string; - number?: number; name?: string; + number?: number; symbol?: string; } diff --git a/apps/swagger/print/src/lib/models/destination-dto.ts b/apps/swagger/print/src/lib/models/destination-dto.ts index 3c82c3795..3bb57af57 100644 --- a/apps/swagger/print/src/lib/models/destination-dto.ts +++ b/apps/swagger/print/src/lib/models/destination-dto.ts @@ -1,14 +1,14 @@ /* tslint:disable */ import { EntityDTOOfDestinationDTOAndIDestination } from './entity-dtoof-destination-dtoand-idestination'; import { EntityDTOContainerOfCheckoutDTO } from './entity-dtocontainer-of-checkout-dto'; -import { ShippingTarget } from './shipping-target'; -import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto'; import { EntityDTOContainerOfLogisticianDTO } from './entity-dtocontainer-of-logistician-dto'; import { ShippingAddressDTO } from './shipping-address-dto'; -export interface DestinationDTO extends EntityDTOOfDestinationDTOAndIDestination { +import { ShippingTarget } from './shipping-target'; +import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto'; +export interface DestinationDTO extends EntityDTOOfDestinationDTOAndIDestination{ checkout?: EntityDTOContainerOfCheckoutDTO; - target?: ShippingTarget; - targetBranch?: EntityDTOContainerOfBranchDTO; logistician?: EntityDTOContainerOfLogisticianDTO; shippingAddress?: ShippingAddressDTO; + target?: ShippingTarget; + targetBranch?: EntityDTOContainerOfBranchDTO; } diff --git a/apps/swagger/print/src/lib/models/display-addressee-dto.ts b/apps/swagger/print/src/lib/models/display-addressee-dto.ts index f98f0a0ea..aa6cd188a 100644 --- a/apps/swagger/print/src/lib/models/display-addressee-dto.ts +++ b/apps/swagger/print/src/lib/models/display-addressee-dto.ts @@ -1,18 +1,18 @@ /* tslint:disable */ -import { Gender } from './gender'; -import { OrganisationDTO } from './organisation-dto'; import { AddressDTO } from './address-dto'; import { CommunicationDetailsDTO } from './communication-details-dto'; import { ExternalReferenceDTO } from './external-reference-dto'; +import { Gender } from './gender'; +import { OrganisationDTO } from './organisation-dto'; export interface DisplayAddresseeDTO { - number?: string; - locale?: string; - gender: Gender; - title?: string; - firstName?: string; - lastName?: string; - organisation?: OrganisationDTO; address?: AddressDTO; communicationDetails?: CommunicationDetailsDTO; externalReference?: ExternalReferenceDTO; + firstName?: string; + gender: Gender; + lastName?: string; + locale?: string; + number?: string; + organisation?: OrganisationDTO; + title?: string; } diff --git a/apps/swagger/print/src/lib/models/display-branch-dto.ts b/apps/swagger/print/src/lib/models/display-branch-dto.ts index b549d9dbf..c7d8946a4 100644 --- a/apps/swagger/print/src/lib/models/display-branch-dto.ts +++ b/apps/swagger/print/src/lib/models/display-branch-dto.ts @@ -2,11 +2,11 @@ import { ReadOnlyEntityDTOOfDisplayBranchDTOAndIReadOnlyBranch } from './read-only-entity-dtoof-display-branch-dtoand-iread-only-branch'; import { AddressDTO } from './address-dto'; import { CommunicationDetailsDTO } from './communication-details-dto'; -export interface DisplayBranchDTO extends ReadOnlyEntityDTOOfDisplayBranchDTOAndIReadOnlyBranch { - name?: string; - key?: string; - branchNumber?: string; +export interface DisplayBranchDTO extends ReadOnlyEntityDTOOfDisplayBranchDTOAndIReadOnlyBranch{ address?: AddressDTO; + branchNumber?: string; communicationDetails?: CommunicationDetailsDTO; + key?: string; + name?: string; web?: string; } diff --git a/apps/swagger/print/src/lib/models/display-item-dto.ts b/apps/swagger/print/src/lib/models/display-item-dto.ts index c091f0ea4..c65d777c2 100644 --- a/apps/swagger/print/src/lib/models/display-item-dto.ts +++ b/apps/swagger/print/src/lib/models/display-item-dto.ts @@ -1,15 +1,15 @@ /* tslint:disable */ -import { ShopItemDTO } from './shop-item-dto'; import { PriceDTO } from './price-dto'; import { PromotionDTO } from './promotion-dto'; +import { ShopItemDTO } from './shop-item-dto'; export interface DisplayItemDTO { + accessories?: Array; + components?: Array; + customProductName?: string; + price?: PriceDTO; + promotion?: PromotionDTO; + quantity?: number; shopItem?: ShopItemDTO; specialComment?: string; - customProductName?: string; - quantity?: number; - price?: PriceDTO; - components?: Array; - accessories?: Array; total?: PriceDTO; - promotion?: PromotionDTO; } diff --git a/apps/swagger/print/src/lib/models/display-logistician-dto.ts b/apps/swagger/print/src/lib/models/display-logistician-dto.ts index 445c221a3..91be7b75b 100644 --- a/apps/swagger/print/src/lib/models/display-logistician-dto.ts +++ b/apps/swagger/print/src/lib/models/display-logistician-dto.ts @@ -1,7 +1,7 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfDisplayLogisticianDTOAndILogistician } from './read-only-entity-dtoof-display-logistician-dtoand-ilogistician'; -export interface DisplayLogisticianDTO extends ReadOnlyEntityDTOOfDisplayLogisticianDTOAndILogistician { - name?: string; - logisticianNumber?: string; +export interface DisplayLogisticianDTO extends ReadOnlyEntityDTOOfDisplayLogisticianDTOAndILogistician{ gln?: string; + logisticianNumber?: string; + name?: string; } diff --git a/apps/swagger/print/src/lib/models/display-order-dto.ts b/apps/swagger/print/src/lib/models/display-order-dto.ts index d9002c60e..515c86a3c 100644 --- a/apps/swagger/print/src/lib/models/display-order-dto.ts +++ b/apps/swagger/print/src/lib/models/display-order-dto.ts @@ -1,39 +1,39 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfDisplayOrderDTOAndIOrder } from './read-only-entity-dtoof-display-order-dtoand-iorder'; -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 { BuyerType } from './buyer-type'; +import { EnvironmentChannel } from './environment-channel'; +import { DisplayOrderItemDTO } from './display-order-item-dto'; import { DisplayLogisticianDTO } from './display-logistician-dto'; +import { NotificationChannel } from './notification-channel'; +import { DisplayBranchDTO } from './display-branch-dto'; +import { OrderType } from './order-type'; import { DisplayOrderPaymentDTO } from './display-order-payment-dto'; import { TermsOfDeliveryDTO2 } from './terms-of-delivery-dto2'; -import { NotificationChannel } from './notification-channel'; -export interface DisplayOrderDTO extends ReadOnlyEntityDTOOfDisplayOrderDTOAndIOrder { - orderType: OrderType; - clientChannel?: EnvironmentChannel; - orderNumber?: string; - orderDate?: string; - orderBranch?: DisplayBranchDTO; - completedDate?: string; - items?: Array; - buyerNumber?: string; - buyerIsGuestAccount?: boolean; +export interface DisplayOrderDTO extends ReadOnlyEntityDTOOfDisplayOrderDTOAndIOrder{ buyer?: DisplayAddresseeDTO; buyerComment?: string; + buyerIsGuestAccount?: boolean; + buyerNumber?: string; buyerType?: BuyerType; - shippingAddress?: DisplayAddresseeDTO; - targetBranch?: DisplayBranchDTO; + clientChannel?: EnvironmentChannel; + completedDate?: string; + features?: {[key: string]: string}; + items?: Array; + itemsCount?: number; logistician?: DisplayLogisticianDTO; - payerNumber?: string; - payerIsGuestAccount?: boolean; - payer?: DisplayAddresseeDTO; - payment?: DisplayOrderPaymentDTO; - termsOfDelivery?: TermsOfDeliveryDTO2; notificationChannels?: NotificationChannel; + orderBranch?: DisplayBranchDTO; + orderDate?: string; + orderNumber?: string; + orderType: OrderType; orderValue?: number; orderValueCurrency?: string; - itemsCount?: number; - features?: {[key: string]: string}; + payer?: DisplayAddresseeDTO; + payerIsGuestAccount?: boolean; + payerNumber?: string; + payment?: DisplayOrderPaymentDTO; + shippingAddress?: DisplayAddresseeDTO; + targetBranch?: DisplayBranchDTO; + termsOfDelivery?: TermsOfDeliveryDTO2; } diff --git a/apps/swagger/print/src/lib/models/display-order-item-dto.ts b/apps/swagger/print/src/lib/models/display-order-item-dto.ts index 6bba6ae38..a53102134 100644 --- a/apps/swagger/print/src/lib/models/display-order-item-dto.ts +++ b/apps/swagger/print/src/lib/models/display-order-item-dto.ts @@ -1,23 +1,23 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfDisplayOrderItemDTOAndIOrderItem } from './read-only-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 { QuantityUnitType } from './quantity-unit-type'; import { PriceDTO } from './price-dto'; +import { ProductDTO } from './product-dto'; import { PromotionDTO } from './promotion-dto'; -export interface DisplayOrderItemDTO extends ReadOnlyEntityDTOOfDisplayOrderItemDTOAndIOrderItem { - order?: DisplayOrderDTO; - product?: ProductDTO; - orderItemNumber?: string; - orderDate?: string; - subsetItems?: Array; +import { QuantityUnitType } from './quantity-unit-type'; +import { DisplayOrderItemSubsetDTO } from './display-order-item-subset-dto'; +export interface DisplayOrderItemDTO extends ReadOnlyEntityDTOOfDisplayOrderItemDTOAndIOrderItem{ buyerComment?: string; - quantity?: number; - quantityUnitType: QuantityUnitType; - quantityUnit?: string; - price?: PriceDTO; description?: string; - promotion?: PromotionDTO; features?: {[key: string]: string}; + order?: DisplayOrderDTO; + orderDate?: string; + orderItemNumber?: string; + price?: PriceDTO; + product?: ProductDTO; + promotion?: PromotionDTO; + quantity?: number; + quantityUnit?: string; + quantityUnitType: QuantityUnitType; + subsetItems?: Array; } diff --git a/apps/swagger/print/src/lib/models/display-order-item-subset-dto.ts b/apps/swagger/print/src/lib/models/display-order-item-subset-dto.ts index a4810c5c2..937084dc0 100644 --- a/apps/swagger/print/src/lib/models/display-order-item-subset-dto.ts +++ b/apps/swagger/print/src/lib/models/display-order-item-subset-dto.ts @@ -2,22 +2,22 @@ import { ReadOnlyEntityDTOOfDisplayOrderItemSubsetDTOAndIOrderItemStatus } from './read-only-entity-dtoof-display-order-item-subset-dtoand-iorder-item-status'; import { DisplayOrderItemDTO } from './display-order-item-dto'; import { OrderItemProcessingStatusValue } from './order-item-processing-status-value'; -export interface DisplayOrderItemSubsetDTO extends ReadOnlyEntityDTOOfDisplayOrderItemSubsetDTOAndIOrderItemStatus { - orderItem?: DisplayOrderItemDTO; - orderItemSubsetNumber?: string; - description?: string; - quantity?: number; - estimatedShippingDate?: string; - ssc?: string; - sscText?: string; - supplierName?: string; - supplierLabel?: string; - processingStatus: OrderItemProcessingStatusValue; - processingStatusDate?: string; - trackingNumber?: string; - specialComment?: string; +export interface DisplayOrderItemSubsetDTO extends ReadOnlyEntityDTOOfDisplayOrderItemSubsetDTOAndIOrderItemStatus{ compartmentCode?: string; compartmentInfo?: string; compartmentStart?: string; compartmentStop?: string; + description?: string; + estimatedShippingDate?: string; + orderItem?: DisplayOrderItemDTO; + orderItemSubsetNumber?: string; + processingStatus: OrderItemProcessingStatusValue; + processingStatusDate?: string; + quantity?: number; + specialComment?: string; + ssc?: string; + sscText?: string; + supplierLabel?: string; + supplierName?: string; + trackingNumber?: string; } diff --git a/apps/swagger/print/src/lib/models/display-order-payment-dto.ts b/apps/swagger/print/src/lib/models/display-order-payment-dto.ts index a53d72aa1..05e830c31 100644 --- a/apps/swagger/print/src/lib/models/display-order-payment-dto.ts +++ b/apps/swagger/print/src/lib/models/display-order-payment-dto.ts @@ -1,17 +1,17 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfDisplayOrderPaymentDTOAndIReadOnlyPayment } from './read-only-entity-dtoof-display-order-payment-dtoand-iread-only-payment'; import { PaymentType } from './payment-type'; -export interface DisplayOrderPaymentDTO extends ReadOnlyEntityDTOOfDisplayOrderPaymentDTOAndIReadOnlyPayment { - paymentActionRequired: boolean; - paymentType: PaymentType; - paymentNumber?: string; - paymentComment?: string; - total: number; - subtotal?: number; - shipping?: number; - tax?: number; - currency?: string; - dateOfPayment?: string; +export interface DisplayOrderPaymentDTO extends ReadOnlyEntityDTOOfDisplayOrderPaymentDTOAndIReadOnlyPayment{ cancelled?: string; completed?: string; + currency?: string; + dateOfPayment?: string; + paymentActionRequired: boolean; + paymentComment?: string; + paymentNumber?: string; + paymentType: PaymentType; + shipping?: number; + subtotal?: number; + tax?: number; + total: number; } diff --git a/apps/swagger/print/src/lib/models/entity-dto.ts b/apps/swagger/print/src/lib/models/entity-dto.ts index 2c9909c56..b5049f54e 100644 --- a/apps/swagger/print/src/lib/models/entity-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dto.ts @@ -1,10 +1,10 @@ /* tslint:disable */ import { EntityStatus } from './entity-status'; export interface EntityDTO { - id?: number; - created?: string; changed?: string; - version?: number; - status?: EntityStatus; + created?: string; + id?: number; pId?: string; + status?: EntityStatus; + version?: number; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-branch-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-branch-dto.ts index 99b26c663..1d4c4a96a 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-branch-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-branch-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { BranchDTO } from './branch-dto'; -export interface EntityDTOContainerOfBranchDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfBranchDTO extends EntityDTOReferenceContainer{ data?: BranchDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-category-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-category-dto.ts index 7f9b53489..5c13714e6 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-category-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-category-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { CategoryDTO } from './category-dto'; -export interface EntityDTOContainerOfCategoryDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfCategoryDTO extends EntityDTOReferenceContainer{ data?: CategoryDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-checkout-delivery-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-checkout-delivery-dto.ts index 9c9811fcc..bd30ecb1f 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-checkout-delivery-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-checkout-delivery-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { CheckoutDeliveryDTO } from './checkout-delivery-dto'; -export interface EntityDTOContainerOfCheckoutDeliveryDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfCheckoutDeliveryDTO extends EntityDTOReferenceContainer{ data?: CheckoutDeliveryDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-checkout-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-checkout-dto.ts index ce76c1442..ddba176bb 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-checkout-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-checkout-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { CheckoutDTO } from './checkout-dto'; -export interface EntityDTOContainerOfCheckoutDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfCheckoutDTO extends EntityDTOReferenceContainer{ data?: CheckoutDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-checkout-item-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-checkout-item-dto.ts index 8696760e0..8ac3a6a3d 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-checkout-item-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-checkout-item-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { CheckoutItemDTO } from './checkout-item-dto'; -export interface EntityDTOContainerOfCheckoutItemDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfCheckoutItemDTO extends EntityDTOReferenceContainer{ data?: CheckoutItemDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-company-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-company-dto.ts index 7859ca372..d58656379 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-company-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-company-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { CompanyDTO } from './company-dto'; -export interface EntityDTOContainerOfCompanyDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfCompanyDTO extends EntityDTOReferenceContainer{ data?: CompanyDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-components-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-components-dto.ts index fd016e55d..69241e71d 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-components-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-components-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { ComponentsDTO } from './components-dto'; -export interface EntityDTOContainerOfComponentsDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfComponentsDTO extends EntityDTOReferenceContainer{ data?: ComponentsDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-contributor-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-contributor-dto.ts index 821efae4c..992958878 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-contributor-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-contributor-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { ContributorDTO } from './contributor-dto'; -export interface EntityDTOContainerOfContributorDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfContributorDTO extends EntityDTOReferenceContainer{ data?: ContributorDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-country-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-country-dto.ts index 429a44037..c8defc62c 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-country-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-country-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { CountryDTO } from './country-dto'; -export interface EntityDTOContainerOfCountryDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfCountryDTO extends EntityDTOReferenceContainer{ data?: CountryDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-coupon-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-coupon-dto.ts index f43dd50a6..5899a9df8 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-coupon-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-coupon-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { CouponDTO } from './coupon-dto'; -export interface EntityDTOContainerOfCouponDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfCouponDTO extends EntityDTOReferenceContainer{ data?: CouponDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-currency-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-currency-dto.ts index 594474df3..8c2f90657 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-currency-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-currency-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { CurrencyDTO } from './currency-dto'; -export interface EntityDTOContainerOfCurrencyDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfCurrencyDTO extends EntityDTOReferenceContainer{ data?: CurrencyDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-destination-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-destination-dto.ts index cdc1a1cdd..19d43533a 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-destination-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-destination-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { DestinationDTO } from './destination-dto'; -export interface EntityDTOContainerOfDestinationDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfDestinationDTO extends EntityDTOReferenceContainer{ data?: DestinationDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-file-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-file-dto.ts index 41358f4a1..6826f0c3b 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-file-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-file-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { FileDTO } from './file-dto'; -export interface EntityDTOContainerOfFileDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfFileDTO extends EntityDTOReferenceContainer{ data?: FileDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-item-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-item-dto.ts index db4721370..411493d19 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-item-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-item-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { ItemDTO2 } from './item-dto2'; -export interface EntityDTOContainerOfItemDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfItemDTO extends EntityDTOReferenceContainer{ data?: ItemDTO2; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-label-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-label-dto.ts index ab1491f60..c23d14fd2 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-label-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-label-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { LabelDTO } from './label-dto'; -export interface EntityDTOContainerOfLabelDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfLabelDTO extends EntityDTOReferenceContainer{ data?: LabelDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-logistician-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-logistician-dto.ts index fabe23876..5e9e8c8f9 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-logistician-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-logistician-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { LogisticianDTO } from './logistician-dto'; -export interface EntityDTOContainerOfLogisticianDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfLogisticianDTO extends EntityDTOReferenceContainer{ data?: LogisticianDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-shop-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-shop-dto.ts index 3c72e63e4..61f596e28 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-shop-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-shop-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { ShopDTO2 } from './shop-dto2'; -export interface EntityDTOContainerOfShopDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfShopDTO extends EntityDTOReferenceContainer{ data?: ShopDTO2; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-shop-item-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-shop-item-dto.ts index 7bd3fca15..e61dd6a68 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-shop-item-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-shop-item-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { ShopItemDTO } from './shop-item-dto'; -export interface EntityDTOContainerOfShopItemDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfShopItemDTO extends EntityDTOReferenceContainer{ data?: ShopItemDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-shopping-cart-item-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-shopping-cart-item-dto.ts index 7528e5b0c..c4797056a 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-shopping-cart-item-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-shopping-cart-item-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { ShoppingCartItemDTO } from './shopping-cart-item-dto'; -export interface EntityDTOContainerOfShoppingCartItemDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfShoppingCartItemDTO extends EntityDTOReferenceContainer{ data?: ShoppingCartItemDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-supplier-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-supplier-dto.ts index 7b13ce858..171228c3f 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-supplier-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-supplier-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { SupplierDTO } from './supplier-dto'; -export interface EntityDTOContainerOfSupplierDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfSupplierDTO extends EntityDTOReferenceContainer{ data?: SupplierDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-tenant-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-tenant-dto.ts index fb92ec5f4..834a8e1c7 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-tenant-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-tenant-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { TenantDTO } from './tenant-dto'; -export interface EntityDTOContainerOfTenantDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfTenantDTO extends EntityDTOReferenceContainer{ data?: TenantDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-text-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-text-dto.ts index a0d986392..4f50497ba 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-text-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-text-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { TextDTO2 } from './text-dto2'; -export interface EntityDTOContainerOfTextDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfTextDTO extends EntityDTOReferenceContainer{ data?: TextDTO2; } diff --git a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-voucher-dto.ts b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-voucher-dto.ts index 614ed673d..1112f77d9 100644 --- a/apps/swagger/print/src/lib/models/entity-dtocontainer-of-voucher-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-dtocontainer-of-voucher-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; import { VoucherDTO } from './voucher-dto'; -export interface EntityDTOContainerOfVoucherDTO extends EntityDTOReferenceContainer { +export interface EntityDTOContainerOfVoucherDTO extends EntityDTOReferenceContainer{ data?: VoucherDTO; } diff --git a/apps/swagger/print/src/lib/models/entity-dtoof-category-dtoand-icategory.ts b/apps/swagger/print/src/lib/models/entity-dtoof-category-dtoand-icategory.ts index de55d5292..696aa6aa2 100644 --- a/apps/swagger/print/src/lib/models/entity-dtoof-category-dtoand-icategory.ts +++ b/apps/swagger/print/src/lib/models/entity-dtoof-category-dtoand-icategory.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfCategoryDTOAndICategory } from './read-only-entity-dtoof-category-dtoand-icategory'; -export interface EntityDTOOfCategoryDTOAndICategory extends ReadOnlyEntityDTOOfCategoryDTOAndICategory { +export interface EntityDTOOfCategoryDTOAndICategory extends ReadOnlyEntityDTOOfCategoryDTOAndICategory{ } diff --git a/apps/swagger/print/src/lib/models/entity-dtoof-company-dtoand-icompany.ts b/apps/swagger/print/src/lib/models/entity-dtoof-company-dtoand-icompany.ts index 37f2237af..5a9cf6878 100644 --- a/apps/swagger/print/src/lib/models/entity-dtoof-company-dtoand-icompany.ts +++ b/apps/swagger/print/src/lib/models/entity-dtoof-company-dtoand-icompany.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfCompanyDTOAndICompany } from './read-only-entity-dtoof-company-dtoand-icompany'; -export interface EntityDTOOfCompanyDTOAndICompany extends ReadOnlyEntityDTOOfCompanyDTOAndICompany { +export interface EntityDTOOfCompanyDTOAndICompany extends ReadOnlyEntityDTOOfCompanyDTOAndICompany{ } diff --git a/apps/swagger/print/src/lib/models/entity-dtoof-components-dtoand-icomponents.ts b/apps/swagger/print/src/lib/models/entity-dtoof-components-dtoand-icomponents.ts index 625c95d91..54e10a8f8 100644 --- a/apps/swagger/print/src/lib/models/entity-dtoof-components-dtoand-icomponents.ts +++ b/apps/swagger/print/src/lib/models/entity-dtoof-components-dtoand-icomponents.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfComponentsDTOAndIComponents } from './read-only-entity-dtoof-components-dtoand-icomponents'; -export interface EntityDTOOfComponentsDTOAndIComponents extends ReadOnlyEntityDTOOfComponentsDTOAndIComponents { +export interface EntityDTOOfComponentsDTOAndIComponents extends ReadOnlyEntityDTOOfComponentsDTOAndIComponents{ } diff --git a/apps/swagger/print/src/lib/models/entity-dtoof-contributor-dtoand-icontributor.ts b/apps/swagger/print/src/lib/models/entity-dtoof-contributor-dtoand-icontributor.ts index 3c083450d..bb1cab0f3 100644 --- a/apps/swagger/print/src/lib/models/entity-dtoof-contributor-dtoand-icontributor.ts +++ b/apps/swagger/print/src/lib/models/entity-dtoof-contributor-dtoand-icontributor.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfContributorDTOAndIContributor } from './read-only-entity-dtoof-contributor-dtoand-icontributor'; -export interface EntityDTOOfContributorDTOAndIContributor extends ReadOnlyEntityDTOOfContributorDTOAndIContributor { +export interface EntityDTOOfContributorDTOAndIContributor extends ReadOnlyEntityDTOOfContributorDTOAndIContributor{ } diff --git a/apps/swagger/print/src/lib/models/entity-dtoof-currency-dtoand-icurrency.ts b/apps/swagger/print/src/lib/models/entity-dtoof-currency-dtoand-icurrency.ts index 5f64480b3..28f270f5b 100644 --- a/apps/swagger/print/src/lib/models/entity-dtoof-currency-dtoand-icurrency.ts +++ b/apps/swagger/print/src/lib/models/entity-dtoof-currency-dtoand-icurrency.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfCurrencyDTOAndICurrency } from './read-only-entity-dtoof-currency-dtoand-icurrency'; -export interface EntityDTOOfCurrencyDTOAndICurrency extends ReadOnlyEntityDTOOfCurrencyDTOAndICurrency { +export interface EntityDTOOfCurrencyDTOAndICurrency extends ReadOnlyEntityDTOOfCurrencyDTOAndICurrency{ } diff --git a/apps/swagger/print/src/lib/models/entity-dtoof-destination-dtoand-idestination.ts b/apps/swagger/print/src/lib/models/entity-dtoof-destination-dtoand-idestination.ts index bbd7a3707..157d01fe0 100644 --- a/apps/swagger/print/src/lib/models/entity-dtoof-destination-dtoand-idestination.ts +++ b/apps/swagger/print/src/lib/models/entity-dtoof-destination-dtoand-idestination.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfDestinationDTOAndIDestination } from './read-only-entity-dtoof-destination-dtoand-idestination'; -export interface EntityDTOOfDestinationDTOAndIDestination extends ReadOnlyEntityDTOOfDestinationDTOAndIDestination { +export interface EntityDTOOfDestinationDTOAndIDestination extends ReadOnlyEntityDTOOfDestinationDTOAndIDestination{ } diff --git a/apps/swagger/print/src/lib/models/entity-dtoof-file-dtoand-ifile.ts b/apps/swagger/print/src/lib/models/entity-dtoof-file-dtoand-ifile.ts index 87cfe5061..5463df3fe 100644 --- a/apps/swagger/print/src/lib/models/entity-dtoof-file-dtoand-ifile.ts +++ b/apps/swagger/print/src/lib/models/entity-dtoof-file-dtoand-ifile.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfFileDTOAndIFile } from './read-only-entity-dtoof-file-dtoand-ifile'; -export interface EntityDTOOfFileDTOAndIFile extends ReadOnlyEntityDTOOfFileDTOAndIFile { +export interface EntityDTOOfFileDTOAndIFile extends ReadOnlyEntityDTOOfFileDTOAndIFile{ } diff --git a/apps/swagger/print/src/lib/models/entity-dtoof-item-dtoand-iitem.ts b/apps/swagger/print/src/lib/models/entity-dtoof-item-dtoand-iitem.ts index 5a65f277d..ddcad4b1d 100644 --- a/apps/swagger/print/src/lib/models/entity-dtoof-item-dtoand-iitem.ts +++ b/apps/swagger/print/src/lib/models/entity-dtoof-item-dtoand-iitem.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfItemDTOAndIItem } from './read-only-entity-dtoof-item-dtoand-iitem'; -export interface EntityDTOOfItemDTOAndIItem extends ReadOnlyEntityDTOOfItemDTOAndIItem { +export interface EntityDTOOfItemDTOAndIItem extends ReadOnlyEntityDTOOfItemDTOAndIItem{ } diff --git a/apps/swagger/print/src/lib/models/entity-dtoof-logistician-dtoand-ilogistician.ts b/apps/swagger/print/src/lib/models/entity-dtoof-logistician-dtoand-ilogistician.ts index 0018b5ff2..837dae72a 100644 --- a/apps/swagger/print/src/lib/models/entity-dtoof-logistician-dtoand-ilogistician.ts +++ b/apps/swagger/print/src/lib/models/entity-dtoof-logistician-dtoand-ilogistician.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfLogisticianDTOAndILogistician } from './read-only-entity-dtoof-logistician-dtoand-ilogistician'; -export interface EntityDTOOfLogisticianDTOAndILogistician extends ReadOnlyEntityDTOOfLogisticianDTOAndILogistician { +export interface EntityDTOOfLogisticianDTOAndILogistician extends ReadOnlyEntityDTOOfLogisticianDTOAndILogistician{ } diff --git a/apps/swagger/print/src/lib/models/entity-dtoof-shop-dtoand-ishop.ts b/apps/swagger/print/src/lib/models/entity-dtoof-shop-dtoand-ishop.ts index 6b8cffe1a..ed681e55a 100644 --- a/apps/swagger/print/src/lib/models/entity-dtoof-shop-dtoand-ishop.ts +++ b/apps/swagger/print/src/lib/models/entity-dtoof-shop-dtoand-ishop.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfShopDTOAndIShop } from './read-only-entity-dtoof-shop-dtoand-ishop'; -export interface EntityDTOOfShopDTOAndIShop extends ReadOnlyEntityDTOOfShopDTOAndIShop { +export interface EntityDTOOfShopDTOAndIShop extends ReadOnlyEntityDTOOfShopDTOAndIShop{ } diff --git a/apps/swagger/print/src/lib/models/entity-dtoof-supplier-dtoand-isupplier.ts b/apps/swagger/print/src/lib/models/entity-dtoof-supplier-dtoand-isupplier.ts index 1a9428caa..2b3824e47 100644 --- a/apps/swagger/print/src/lib/models/entity-dtoof-supplier-dtoand-isupplier.ts +++ b/apps/swagger/print/src/lib/models/entity-dtoof-supplier-dtoand-isupplier.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfSupplierDTOAndISupplier } from './read-only-entity-dtoof-supplier-dtoand-isupplier'; -export interface EntityDTOOfSupplierDTOAndISupplier extends ReadOnlyEntityDTOOfSupplierDTOAndISupplier { +export interface EntityDTOOfSupplierDTOAndISupplier extends ReadOnlyEntityDTOOfSupplierDTOAndISupplier{ } diff --git a/apps/swagger/print/src/lib/models/entity-dtoof-text-dtoand-itext.ts b/apps/swagger/print/src/lib/models/entity-dtoof-text-dtoand-itext.ts index 95ae70818..f0baacd5f 100644 --- a/apps/swagger/print/src/lib/models/entity-dtoof-text-dtoand-itext.ts +++ b/apps/swagger/print/src/lib/models/entity-dtoof-text-dtoand-itext.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfTextDTOAndIText } from './read-only-entity-dtoof-text-dtoand-itext'; -export interface EntityDTOOfTextDTOAndIText extends ReadOnlyEntityDTOOfTextDTOAndIText { +export interface EntityDTOOfTextDTOAndIText extends ReadOnlyEntityDTOOfTextDTOAndIText{ } diff --git a/apps/swagger/print/src/lib/models/entity-dtoreference-container.ts b/apps/swagger/print/src/lib/models/entity-dtoreference-container.ts index 09cb76cdf..096b961c3 100644 --- a/apps/swagger/print/src/lib/models/entity-dtoreference-container.ts +++ b/apps/swagger/print/src/lib/models/entity-dtoreference-container.ts @@ -1,10 +1,10 @@ /* tslint:disable */ import { ExternalReferenceDTO } from './external-reference-dto'; export interface EntityDTOReferenceContainer { - id?: number; - pId?: string; - externalReference?: ExternalReferenceDTO; displayLabel?: string; enabled?: boolean; + externalReference?: ExternalReferenceDTO; + id?: number; + pId?: string; selected?: boolean; } diff --git a/apps/swagger/print/src/lib/models/entity-reference-dto.ts b/apps/swagger/print/src/lib/models/entity-reference-dto.ts index 2d91ccdfd..5a9c0ee3e 100644 --- a/apps/swagger/print/src/lib/models/entity-reference-dto.ts +++ b/apps/swagger/print/src/lib/models/entity-reference-dto.ts @@ -1,5 +1,7 @@ /* tslint:disable */ +import { EntityDTOReferenceContainer } from './entity-dtoreference-container'; export interface EntityReferenceDTO { - source?: number; pId?: string; + reference?: EntityDTOReferenceContainer; + source?: number; } diff --git a/apps/swagger/print/src/lib/models/external-reference-dto.ts b/apps/swagger/print/src/lib/models/external-reference-dto.ts index 1f1675a9e..074d10f02 100644 --- a/apps/swagger/print/src/lib/models/external-reference-dto.ts +++ b/apps/swagger/print/src/lib/models/external-reference-dto.ts @@ -1,12 +1,12 @@ /* tslint:disable */ import { EntityStatus } from './entity-status'; export interface ExternalReferenceDTO { - externalPK?: string; - externalNumber?: string; - externalCreated?: string; externalChanged?: string; + externalCreated?: string; + externalNumber?: string; + externalPK?: string; + externalRepository?: string; externalStatus: EntityStatus; externalVersion?: number; - externalRepository?: string; publishToken?: string; } diff --git a/apps/swagger/print/src/lib/models/file-dto.ts b/apps/swagger/print/src/lib/models/file-dto.ts index 7a5f9b8f3..752178037 100644 --- a/apps/swagger/print/src/lib/models/file-dto.ts +++ b/apps/swagger/print/src/lib/models/file-dto.ts @@ -1,15 +1,15 @@ /* tslint:disable */ import { EntityDTOOfFileDTOAndIFile } from './entity-dtoof-file-dtoand-ifile'; -export interface FileDTO extends EntityDTOOfFileDTOAndIFile { - name?: string; - type?: string; - path?: string; - mime?: string; - hash?: string; - size?: number; - subtitle?: string; +export interface FileDTO extends EntityDTOOfFileDTOAndIFile{ copyright?: string; - locale?: string; + hash?: string; license?: string; + locale?: string; + mime?: string; + name?: string; + path?: string; + size?: number; sort?: number; + subtitle?: string; + type?: string; } diff --git a/apps/swagger/print/src/lib/models/food-dto.ts b/apps/swagger/print/src/lib/models/food-dto.ts index e6f1bef15..d272cbf8e 100644 --- a/apps/swagger/print/src/lib/models/food-dto.ts +++ b/apps/swagger/print/src/lib/models/food-dto.ts @@ -1,15 +1,15 @@ /* tslint:disable */ -import { FoodLabel } from './food-label'; import { AllergeneType } from './allergene-type'; import { DeclarableFoodAdditives } from './declarable-food-additives'; +import { FoodLabel } from './food-label'; import { NutritionFactsDTO } from './nutrition-facts-dto'; export interface FoodDTO { alcohol?: number; - foodLabel: FoodLabel; allergenes: AllergeneType; allergenesDescription?: string; + declarableFoodAdditives: DeclarableFoodAdditives; + foodLabel: FoodLabel; mayContainTracesOf: AllergeneType; mayContainTracesOfDescription?: string; - declarableFoodAdditives: DeclarableFoodAdditives; nutritionFacts?: NutritionFactsDTO; } diff --git a/apps/swagger/print/src/lib/models/geo-location.ts b/apps/swagger/print/src/lib/models/geo-location.ts index 8578edf68..f5179e53f 100644 --- a/apps/swagger/print/src/lib/models/geo-location.ts +++ b/apps/swagger/print/src/lib/models/geo-location.ts @@ -1,6 +1,6 @@ /* tslint:disable */ export interface GeoLocation { - longitude?: number; - latitude?: number; altitude?: number; + latitude?: number; + longitude?: number; } diff --git a/apps/swagger/print/src/lib/models/image-dto.ts b/apps/swagger/print/src/lib/models/image-dto.ts index 5d210acc5..ee9848f77 100644 --- a/apps/swagger/print/src/lib/models/image-dto.ts +++ b/apps/swagger/print/src/lib/models/image-dto.ts @@ -1,10 +1,10 @@ /* tslint:disable */ export interface ImageDTO { + copyright?: string; id?: number; + source?: string; + subtitle?: string; + thumbUrl?: string; type?: string; url?: string; - thumbUrl?: string; - subtitle?: string; - source?: string; - copyright?: string; } diff --git a/apps/swagger/print/src/lib/models/image-dto2.ts b/apps/swagger/print/src/lib/models/image-dto2.ts index e55c256fd..73e86ed11 100644 --- a/apps/swagger/print/src/lib/models/image-dto2.ts +++ b/apps/swagger/print/src/lib/models/image-dto2.ts @@ -1,6 +1,6 @@ /* tslint:disable */ export interface ImageDTO2 { - path?: string; alt?: string; + path?: string; subtitle?: string; } diff --git a/apps/swagger/print/src/lib/models/ipublic-user-info.ts b/apps/swagger/print/src/lib/models/ipublic-user-info.ts index 72c286b98..db73d102c 100644 --- a/apps/swagger/print/src/lib/models/ipublic-user-info.ts +++ b/apps/swagger/print/src/lib/models/ipublic-user-info.ts @@ -2,6 +2,6 @@ export interface IPublicUserInfo { alias?: string; displayName?: string; - username?: string; isAuthenticated: boolean; + username?: string; } diff --git a/apps/swagger/print/src/lib/models/item-dto.ts b/apps/swagger/print/src/lib/models/item-dto.ts index 4586878f5..90f1c7505 100644 --- a/apps/swagger/print/src/lib/models/item-dto.ts +++ b/apps/swagger/print/src/lib/models/item-dto.ts @@ -1,30 +1,30 @@ /* tslint:disable */ import { EntityDTO } from './entity-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 { ImageDTO } from './image-dto'; +import { ProductDTO } from './product-dto'; import { ReviewDTO } from './review-dto'; -export interface ItemDTO extends EntityDTO { - scoring?: number; +import { ShelfInfoDTO } from './shelf-info-dto'; +import { SpecDTO } from './spec-dto'; +import { StockInfoDTO } from './stock-info-dto'; +import { TextDTO } from './text-dto'; +import { ItemType } from './item-type'; +export interface ItemDTO extends EntityDTO{ + catalogAvailability?: AvailabilityDTO; + family?: Array; ids?: {[key: string]: number}; - type?: ItemType; + images?: Array; labels?: {[key: string]: string}; product?: ProductDTO; - specs?: Array; - texts?: Array; - images?: Array; - catalogAvailability?: AvailabilityDTO; - storeAvailabilities?: Array; - shippingAvailabilities?: Array; - stockInfos?: Array; - shelfInfos?: Array; - successor?: ItemDTO; - family?: Array; promoPoints?: number; reviews?: Array; + scoring?: number; + shelfInfos?: Array; + shippingAvailabilities?: Array; + specs?: Array; + stockInfos?: Array; + storeAvailabilities?: Array; + successor?: ItemDTO; + texts?: Array; + type?: ItemType; } diff --git a/apps/swagger/print/src/lib/models/item-dto2.ts b/apps/swagger/print/src/lib/models/item-dto2.ts index e31f23f98..b2c2194fa 100644 --- a/apps/swagger/print/src/lib/models/item-dto2.ts +++ b/apps/swagger/print/src/lib/models/item-dto2.ts @@ -1,45 +1,45 @@ /* tslint:disable */ import { EntityDTOOfItemDTOAndIItem } from './entity-dtoof-item-dtoand-iitem'; -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'; import { EntityDTOContainerOfComponentsDTO } from './entity-dtocontainer-of-components-dto'; -import { ItemLabelDTO } from './item-label-dto'; +import { EntityDTOContainerOfCategoryDTO } from './entity-dtocontainer-of-category-dto'; +import { ContributorHelperDTO } from './contributor-helper-dto'; +import { EntityDTOContainerOfFileDTO } from './entity-dtocontainer-of-file-dto'; import { FoodDTO } from './food-dto'; +import { ItemType } from './item-type'; +import { ItemLabelDTO } from './item-label-dto'; +import { EntityDTOContainerOfCompanyDTO } from './entity-dtocontainer-of-company-dto'; +import { WeightOfAvoirdupois } from './weight-of-avoirdupois'; +import { EntityDTOContainerOfItemDTO } from './entity-dtocontainer-of-item-dto'; +import { SizeOfString } from './size-of-string'; import { EntityDTOContainerOfTenantDTO } from './entity-dtocontainer-of-tenant-dto'; -export interface ItemDTO2 extends EntityDTOOfItemDTOAndIItem { - itemNumber?: string; - name?: string; - subtitle?: string; +import { EntityDTOContainerOfTextDTO } from './entity-dtocontainer-of-text-dto'; +export interface ItemDTO2 extends EntityDTOOfItemDTOAndIItem{ + accessories?: EntityDTOContainerOfComponentsDTO; + categories?: Array; + contributors?: Array; description?: string; ean?: string; - secondaryEAN?: string; + edition?: string; + files?: Array; + food?: FoodDTO; + format?: string; + itemNumber?: string; + itemType: ItemType; + labels?: Array; + manufacturer?: EntityDTOContainerOfCompanyDTO; + manufacturingCosts?: number; + name?: string; + netWeight?: WeightOfAvoirdupois; precedingItem?: EntityDTOContainerOfItemDTO; precedingItemEAN?: string; - contributors?: Array; - manufacturer?: EntityDTOContainerOfCompanyDTO; publicationDate?: string; - categories?: Array; - manufacturingCosts?: number; - size?: SizeOfString; - weight?: WeightOfAvoirdupois; - netWeight?: WeightOfAvoirdupois; - weightOfPackaging?: WeightOfAvoirdupois; - itemType: ItemType; - edition?: string; + secondaryEAN?: string; serial?: string; - format?: string; - files?: Array; - texts?: Array; set?: EntityDTOContainerOfComponentsDTO; - accessories?: EntityDTOContainerOfComponentsDTO; - labels?: Array; - food?: FoodDTO; + size?: SizeOfString; + subtitle?: string; tenant?: EntityDTOContainerOfTenantDTO; + texts?: Array; + weight?: WeightOfAvoirdupois; + weightOfPackaging?: WeightOfAvoirdupois; } diff --git a/apps/swagger/print/src/lib/models/item-label-dto.ts b/apps/swagger/print/src/lib/models/item-label-dto.ts index 1c88fbc3c..9aee738ed 100644 --- a/apps/swagger/print/src/lib/models/item-label-dto.ts +++ b/apps/swagger/print/src/lib/models/item-label-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ export interface ItemLabelDTO { - labelType?: string; cultureInfo?: string; + labelType?: string; value?: string; } diff --git a/apps/swagger/print/src/lib/models/key-value-dtoof-string-and-string.ts b/apps/swagger/print/src/lib/models/key-value-dtoof-string-and-string.ts index eb925f426..91f9f4d89 100644 --- a/apps/swagger/print/src/lib/models/key-value-dtoof-string-and-string.ts +++ b/apps/swagger/print/src/lib/models/key-value-dtoof-string-and-string.ts @@ -1,11 +1,11 @@ /* tslint:disable */ export interface KeyValueDTOOfStringAndString { - enabled?: boolean; - label?: string; - key?: string; - value?: string; - selected?: boolean; - description?: string; - sort?: number; command?: string; + description?: string; + enabled?: boolean; + key?: string; + label?: string; + selected?: boolean; + sort?: number; + value?: string; } diff --git a/apps/swagger/print/src/lib/models/label-dto.ts b/apps/swagger/print/src/lib/models/label-dto.ts index b5a3d6b41..90ff50e3f 100644 --- a/apps/swagger/print/src/lib/models/label-dto.ts +++ b/apps/swagger/print/src/lib/models/label-dto.ts @@ -1,9 +1,9 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfLabelDTOAndIReadOnlyLabel } from './read-only-entity-dtoof-label-dtoand-iread-only-label'; import { EntityDTOContainerOfTenantDTO } from './entity-dtocontainer-of-tenant-dto'; -export interface LabelDTO extends ReadOnlyEntityDTOOfLabelDTOAndIReadOnlyLabel { - name?: string; - key?: string; +export interface LabelDTO extends ReadOnlyEntityDTOOfLabelDTOAndIReadOnlyLabel{ bitMask?: number; + key?: string; + name?: string; tenant?: EntityDTOContainerOfTenantDTO; } diff --git a/apps/swagger/print/src/lib/models/list-response-args-of-key-value-dtoof-string-and-string.ts b/apps/swagger/print/src/lib/models/list-response-args-of-key-value-dtoof-string-and-string.ts index 5f1fa6a04..9528feadb 100644 --- a/apps/swagger/print/src/lib/models/list-response-args-of-key-value-dtoof-string-and-string.ts +++ b/apps/swagger/print/src/lib/models/list-response-args-of-key-value-dtoof-string-and-string.ts @@ -1,8 +1,8 @@ /* tslint:disable */ import { ResponseArgsOfIEnumerableOfKeyValueDTOOfStringAndString } from './response-args-of-ienumerable-of-key-value-dtoof-string-and-string'; -export interface ListResponseArgsOfKeyValueDTOOfStringAndString extends ResponseArgsOfIEnumerableOfKeyValueDTOOfStringAndString { - skip?: number; - take?: number; +export interface ListResponseArgsOfKeyValueDTOOfStringAndString extends ResponseArgsOfIEnumerableOfKeyValueDTOOfStringAndString{ completed?: boolean; hits?: number; + skip?: number; + take?: number; } diff --git a/apps/swagger/print/src/lib/models/logistician-dto.ts b/apps/swagger/print/src/lib/models/logistician-dto.ts index e6352c63c..8c5cc357c 100644 --- a/apps/swagger/print/src/lib/models/logistician-dto.ts +++ b/apps/swagger/print/src/lib/models/logistician-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { EntityDTOOfLogisticianDTOAndILogistician } from './entity-dtoof-logistician-dtoand-ilogistician'; -export interface LogisticianDTO extends EntityDTOOfLogisticianDTOAndILogistician { - name?: string; +export interface LogisticianDTO extends EntityDTOOfLogisticianDTOAndILogistician{ logisticianNumber?: string; + name?: string; } diff --git a/apps/swagger/print/src/lib/models/nutrition-fact-dto.ts b/apps/swagger/print/src/lib/models/nutrition-fact-dto.ts index 534954bfe..648e7e338 100644 --- a/apps/swagger/print/src/lib/models/nutrition-fact-dto.ts +++ b/apps/swagger/print/src/lib/models/nutrition-fact-dto.ts @@ -1,10 +1,10 @@ /* tslint:disable */ import { NutritionFactType } from './nutrition-fact-type'; export interface NutritionFactDTO { + kiloJoule?: number; label?: string; nutritionFactType: NutritionFactType; - rdaQuantity?: number; percentageOfRDA?: number; - kiloJoule?: number; quantity?: number; + rdaQuantity?: number; } diff --git a/apps/swagger/print/src/lib/models/nutrition-facts-dto.ts b/apps/swagger/print/src/lib/models/nutrition-facts-dto.ts index 80c982355..c343ba98a 100644 --- a/apps/swagger/print/src/lib/models/nutrition-facts-dto.ts +++ b/apps/swagger/print/src/lib/models/nutrition-facts-dto.ts @@ -1,10 +1,10 @@ /* tslint:disable */ -import { Rezeptmasz } from './rezeptmasz'; import { NutritionFactDTO } from './nutrition-fact-dto'; +import { Rezeptmasz } from './rezeptmasz'; export interface NutritionFactsDTO { + items?: Array; + kiloCalories?: number; + kiloJoule?: number; referenceQuantity?: number; referenceQuantityUnitType: Rezeptmasz; - kiloJoule?: number; - kiloCalories?: number; - items?: Array; } diff --git a/apps/swagger/print/src/lib/models/organisation-dto.ts b/apps/swagger/print/src/lib/models/organisation-dto.ts index 31fb4f6b3..24bc58335 100644 --- a/apps/swagger/print/src/lib/models/organisation-dto.ts +++ b/apps/swagger/print/src/lib/models/organisation-dto.ts @@ -1,11 +1,11 @@ /* tslint:disable */ export interface OrganisationDTO { + costUnit?: string; + department?: string; + gln?: string; + legalForm?: string; name?: string; nameSuffix?: string; - legalForm?: string; - department?: string; - costUnit?: string; - vatId?: string; - gln?: string; sector?: string; + vatId?: string; } diff --git a/apps/swagger/print/src/lib/models/organisation-names-dto.ts b/apps/swagger/print/src/lib/models/organisation-names-dto.ts index 8fc627043..ffe315e05 100644 --- a/apps/swagger/print/src/lib/models/organisation-names-dto.ts +++ b/apps/swagger/print/src/lib/models/organisation-names-dto.ts @@ -1,7 +1,7 @@ /* tslint:disable */ export interface OrganisationNamesDTO { + department?: string; + legalForm?: string; name?: string; nameSuffix?: string; - legalForm?: string; - department?: string; } diff --git a/apps/swagger/print/src/lib/models/payer-dto.ts b/apps/swagger/print/src/lib/models/payer-dto.ts index f2174c1bc..922979f98 100644 --- a/apps/swagger/print/src/lib/models/payer-dto.ts +++ b/apps/swagger/print/src/lib/models/payer-dto.ts @@ -1,22 +1,22 @@ /* tslint:disable */ import { EntityReferenceDTO } from './entity-reference-dto'; -import { PayerType } from './payer-type'; -import { PayerStatus } from './payer-status'; -import { Gender } from './gender'; -import { CommunicationDetailsDTO } from './communication-details-dto'; -import { OrganisationDTO } from './organisation-dto'; import { AddressDTO } from './address-dto'; -export interface PayerDTO extends EntityReferenceDTO { - payerNumber?: string; - payerType: PayerType; - payerStatus: PayerStatus; - locale?: string; - gender: Gender; - title?: string; - firstName?: string; - lastName?: string; - dateOfBirth?: string; - communicationDetails?: CommunicationDetailsDTO; - organisation?: OrganisationDTO; +import { CommunicationDetailsDTO } from './communication-details-dto'; +import { Gender } from './gender'; +import { OrganisationDTO } from './organisation-dto'; +import { PayerStatus } from './payer-status'; +import { PayerType } from './payer-type'; +export interface PayerDTO extends EntityReferenceDTO{ address?: AddressDTO; + communicationDetails?: CommunicationDetailsDTO; + dateOfBirth?: string; + firstName?: string; + gender: Gender; + lastName?: string; + locale?: string; + organisation?: OrganisationDTO; + payerNumber?: string; + payerStatus: PayerStatus; + payerType: PayerType; + title?: string; } diff --git a/apps/swagger/print/src/lib/models/payment-dto.ts b/apps/swagger/print/src/lib/models/payment-dto.ts index 63da3ae80..bb9647652 100644 --- a/apps/swagger/print/src/lib/models/payment-dto.ts +++ b/apps/swagger/print/src/lib/models/payment-dto.ts @@ -1,19 +1,19 @@ /* tslint:disable */ import { SelectionDTOOfPaymentType } from './selection-dtoof-payment-type'; -import { PaymentType } from './payment-type'; -import { EntityDTOContainerOfVoucherDTO } from './entity-dtocontainer-of-voucher-dto'; import { EntityDTOContainerOfCouponDTO } from './entity-dtocontainer-of-coupon-dto'; -import { VATValueDTO } from './vatvalue-dto'; import { PriceValueDTO } from './price-value-dto'; +import { PaymentType } from './payment-type'; +import { VATValueDTO } from './vatvalue-dto'; +import { EntityDTOContainerOfVoucherDTO } from './entity-dtocontainer-of-voucher-dto'; export interface PaymentDTO { availablePaymentTypes?: Array; - paymentType: PaymentType; - handlingFee: number; - vouchers?: Array; coupons?: Array; - vaTs?: Array; + discounted?: PriceValueDTO; + handlingFee: number; + paymentType: PaymentType; total?: PriceValueDTO; totalLess?: PriceValueDTO; totalWithoutDiscount?: PriceValueDTO; - discounted?: PriceValueDTO; + vaTs?: Array; + vouchers?: Array; } diff --git a/apps/swagger/print/src/lib/models/payment-type.ts b/apps/swagger/print/src/lib/models/payment-type.ts index da96b6f86..f639f5e33 100644 --- a/apps/swagger/print/src/lib/models/payment-type.ts +++ b/apps/swagger/print/src/lib/models/payment-type.ts @@ -1,2 +1,2 @@ /* tslint:disable */ -export type PaymentType = 0 | 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128 | 256 | 512 | 1024 | 2048 | 4096 | 8192 | 16384; \ No newline at end of file +export type PaymentType = 0 | 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128 | 256 | 512 | 1024 | 2048 | 4096 | 8192 | 16384 | 32768; \ No newline at end of file diff --git a/apps/swagger/print/src/lib/models/person-names-dto.ts b/apps/swagger/print/src/lib/models/person-names-dto.ts index baa67cc1e..0bc8bb921 100644 --- a/apps/swagger/print/src/lib/models/person-names-dto.ts +++ b/apps/swagger/print/src/lib/models/person-names-dto.ts @@ -1,8 +1,8 @@ /* tslint:disable */ import { Gender } from './gender'; export interface PersonNamesDTO { - gender: Gender; - title?: string; firstName?: string; + gender: Gender; lastName?: string; + title?: string; } diff --git a/apps/swagger/print/src/lib/models/price-value-dto.ts b/apps/swagger/print/src/lib/models/price-value-dto.ts index 8500aff63..9c74436ba 100644 --- a/apps/swagger/print/src/lib/models/price-value-dto.ts +++ b/apps/swagger/print/src/lib/models/price-value-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ export interface PriceValueDTO { - value?: number; currency?: string; currencySymbol?: string; + value?: number; } diff --git a/apps/swagger/print/src/lib/models/print-request-of-ienumerable-of-display-order-dto.ts b/apps/swagger/print/src/lib/models/print-request-of-ienumerable-of-display-order-dto.ts index 4811fb033..ff9dc9f4e 100644 --- a/apps/swagger/print/src/lib/models/print-request-of-ienumerable-of-display-order-dto.ts +++ b/apps/swagger/print/src/lib/models/print-request-of-ienumerable-of-display-order-dto.ts @@ -2,9 +2,10 @@ import { PrintRequest } from './print-request'; import { DisplayOrderDTO } from './display-order-dto'; import { PaperKind } from './paper-kind'; -export interface PrintRequestOfIEnumerableOfDisplayOrderDTO extends PrintRequest { - data?: Array; +export interface PrintRequestOfIEnumerableOfDisplayOrderDTO extends PrintRequest{ copies?: number; + data?: Array; + isLandscape?: boolean; paperKind?: PaperKind; paperSource?: string; } diff --git a/apps/swagger/print/src/lib/models/print-request-of-ienumerable-of-item-dto.ts b/apps/swagger/print/src/lib/models/print-request-of-ienumerable-of-item-dto.ts index 7ce01e819..ff29c663b 100644 --- a/apps/swagger/print/src/lib/models/print-request-of-ienumerable-of-item-dto.ts +++ b/apps/swagger/print/src/lib/models/print-request-of-ienumerable-of-item-dto.ts @@ -2,9 +2,10 @@ import { PrintRequest } from './print-request'; import { ItemDTO } from './item-dto'; import { PaperKind } from './paper-kind'; -export interface PrintRequestOfIEnumerableOfItemDTO extends PrintRequest { - data?: Array; +export interface PrintRequestOfIEnumerableOfItemDTO extends PrintRequest{ copies?: number; + data?: Array; + isLandscape?: boolean; paperKind?: PaperKind; paperSource?: string; } diff --git a/apps/swagger/print/src/lib/models/print-request-of-ienumerable-of-long.ts b/apps/swagger/print/src/lib/models/print-request-of-ienumerable-of-long.ts index cf5b1a101..ef9042392 100644 --- a/apps/swagger/print/src/lib/models/print-request-of-ienumerable-of-long.ts +++ b/apps/swagger/print/src/lib/models/print-request-of-ienumerable-of-long.ts @@ -1,9 +1,10 @@ /* tslint:disable */ import { PrintRequest } from './print-request'; import { PaperKind } from './paper-kind'; -export interface PrintRequestOfIEnumerableOfLong extends PrintRequest { - data?: Array; +export interface PrintRequestOfIEnumerableOfLong extends PrintRequest{ copies?: number; + data?: Array; + isLandscape?: boolean; paperKind?: PaperKind; paperSource?: string; } diff --git a/apps/swagger/print/src/lib/models/print-request-of-ienumerable-of-shopping-cart-item-dto.ts b/apps/swagger/print/src/lib/models/print-request-of-ienumerable-of-shopping-cart-item-dto.ts index 3f9bd2abc..eac4aba02 100644 --- a/apps/swagger/print/src/lib/models/print-request-of-ienumerable-of-shopping-cart-item-dto.ts +++ b/apps/swagger/print/src/lib/models/print-request-of-ienumerable-of-shopping-cart-item-dto.ts @@ -2,9 +2,10 @@ import { PrintRequest } from './print-request'; import { ShoppingCartItemDTO } from './shopping-cart-item-dto'; import { PaperKind } from './paper-kind'; -export interface PrintRequestOfIEnumerableOfShoppingCartItemDTO extends PrintRequest { - data?: Array; +export interface PrintRequestOfIEnumerableOfShoppingCartItemDTO extends PrintRequest{ copies?: number; + data?: Array; + isLandscape?: boolean; paperKind?: PaperKind; paperSource?: string; } diff --git a/apps/swagger/print/src/lib/models/print-request-of-long.ts b/apps/swagger/print/src/lib/models/print-request-of-long.ts index 153ce9ef3..0469c4880 100644 --- a/apps/swagger/print/src/lib/models/print-request-of-long.ts +++ b/apps/swagger/print/src/lib/models/print-request-of-long.ts @@ -1,9 +1,10 @@ /* tslint:disable */ import { PrintRequest } from './print-request'; import { PaperKind } from './paper-kind'; -export interface PrintRequestOfLong extends PrintRequest { - data: number; +export interface PrintRequestOfLong extends PrintRequest{ copies?: number; + data: number; + isLandscape?: boolean; paperKind?: PaperKind; paperSource?: string; } diff --git a/apps/swagger/print/src/lib/models/print-request-of-string.ts b/apps/swagger/print/src/lib/models/print-request-of-string.ts index 676b9cc1d..5008b3c72 100644 --- a/apps/swagger/print/src/lib/models/print-request-of-string.ts +++ b/apps/swagger/print/src/lib/models/print-request-of-string.ts @@ -1,9 +1,10 @@ /* tslint:disable */ import { PrintRequest } from './print-request'; import { PaperKind } from './paper-kind'; -export interface PrintRequestOfString extends PrintRequest { - data?: string; +export interface PrintRequestOfString extends PrintRequest{ copies?: number; + data?: string; + isLandscape?: boolean; paperKind?: PaperKind; paperSource?: string; } diff --git a/apps/swagger/print/src/lib/models/problem-details.ts b/apps/swagger/print/src/lib/models/problem-details.ts index a6be9fb84..370f918ed 100644 --- a/apps/swagger/print/src/lib/models/problem-details.ts +++ b/apps/swagger/print/src/lib/models/problem-details.ts @@ -1,11 +1,10 @@ /* tslint:disable */ export interface ProblemDetails { - type?: string; - title?: string; - status?: number; detail?: string; - instance?: string; extensions?: {[key: string]: any}; - + instance?: string; + status?: number; + title?: string; + type?: string; [prop: string]: any; } diff --git a/apps/swagger/print/src/lib/models/product-dto.ts b/apps/swagger/print/src/lib/models/product-dto.ts index d9cd2689b..8d5c51c3b 100644 --- a/apps/swagger/print/src/lib/models/product-dto.ts +++ b/apps/swagger/print/src/lib/models/product-dto.ts @@ -2,21 +2,21 @@ import { SizeOfString } from './size-of-string'; import { WeightOfAvoirdupois } from './weight-of-avoirdupois'; export interface ProductDTO { - name?: string; additionalName?: string; - ean?: string; - supplierProductNumber?: string; catalogProductNumber?: string; contributors?: string; - manufacturer?: string; - publicationDate?: string; - productGroup?: string; + ean?: string; edition?: string; - volume?: string; - serial?: string; format?: string; formatDetail?: string; locale?: string; + manufacturer?: string; + name?: string; + productGroup?: string; + publicationDate?: string; + serial?: string; size?: SizeOfString; + supplierProductNumber?: string; + volume?: string; weight?: WeightOfAvoirdupois; } diff --git a/apps/swagger/print/src/lib/models/promotion-dto.ts b/apps/swagger/print/src/lib/models/promotion-dto.ts index b5a4f8bbd..6aaf0e8b7 100644 --- a/apps/swagger/print/src/lib/models/promotion-dto.ts +++ b/apps/swagger/print/src/lib/models/promotion-dto.ts @@ -1,7 +1,7 @@ /* tslint:disable */ export interface PromotionDTO { - points?: number; - type?: string; code?: string; label?: string; + points?: number; + type?: string; } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-branch-dtoand-iread-only-branch.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-branch-dtoand-iread-only-branch.ts index 241ea002a..d160e584e 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-branch-dtoand-iread-only-branch.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-branch-dtoand-iread-only-branch.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfBranchDTOAndIReadOnlyBranch extends EntityDTO { +export interface ReadOnlyEntityDTOOfBranchDTOAndIReadOnlyBranch extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-category-dtoand-icategory.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-category-dtoand-icategory.ts index d8b688864..c1239c888 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-category-dtoand-icategory.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-category-dtoand-icategory.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfCategoryDTOAndICategory extends EntityDTO { +export interface ReadOnlyEntityDTOOfCategoryDTOAndICategory extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-checkout-delivery-dtoand-icheckout-delivery.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-checkout-delivery-dtoand-icheckout-delivery.ts index da2c13a39..d9fba44b9 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-checkout-delivery-dtoand-icheckout-delivery.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-checkout-delivery-dtoand-icheckout-delivery.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfCheckoutDeliveryDTOAndICheckoutDelivery extends EntityDTO { +export interface ReadOnlyEntityDTOOfCheckoutDeliveryDTOAndICheckoutDelivery extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-checkout-dtoand-icheckout.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-checkout-dtoand-icheckout.ts index 9d6717b5d..ce51a727b 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-checkout-dtoand-icheckout.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-checkout-dtoand-icheckout.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfCheckoutDTOAndICheckout extends EntityDTO { +export interface ReadOnlyEntityDTOOfCheckoutDTOAndICheckout extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-checkout-item-dtoand-icheckout-item.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-checkout-item-dtoand-icheckout-item.ts index 6f235aeb4..2fd9a6385 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-checkout-item-dtoand-icheckout-item.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-checkout-item-dtoand-icheckout-item.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfCheckoutItemDTOAndICheckoutItem extends EntityDTO { +export interface ReadOnlyEntityDTOOfCheckoutItemDTOAndICheckoutItem extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-company-dtoand-icompany.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-company-dtoand-icompany.ts index d6a89c932..40dc9974b 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-company-dtoand-icompany.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-company-dtoand-icompany.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfCompanyDTOAndICompany extends EntityDTO { +export interface ReadOnlyEntityDTOOfCompanyDTOAndICompany extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-components-dtoand-icomponents.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-components-dtoand-icomponents.ts index 5324cb225..170eadced 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-components-dtoand-icomponents.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-components-dtoand-icomponents.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfComponentsDTOAndIComponents extends EntityDTO { +export interface ReadOnlyEntityDTOOfComponentsDTOAndIComponents extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-contributor-dtoand-icontributor.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-contributor-dtoand-icontributor.ts index 7b925ce51..ccf9a50c3 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-contributor-dtoand-icontributor.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-contributor-dtoand-icontributor.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfContributorDTOAndIContributor extends EntityDTO { +export interface ReadOnlyEntityDTOOfContributorDTOAndIContributor extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-country-dtoand-iread-only-country.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-country-dtoand-iread-only-country.ts index 2b754f0f8..a2e3d9aaa 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-country-dtoand-iread-only-country.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-country-dtoand-iread-only-country.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfCountryDTOAndIReadOnlyCountry extends EntityDTO { +export interface ReadOnlyEntityDTOOfCountryDTOAndIReadOnlyCountry extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-coupon-dtoand-icoupon.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-coupon-dtoand-icoupon.ts index b2b40d90a..145cc49a2 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-coupon-dtoand-icoupon.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-coupon-dtoand-icoupon.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfCouponDTOAndICoupon extends EntityDTO { +export interface ReadOnlyEntityDTOOfCouponDTOAndICoupon extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-currency-dtoand-icurrency.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-currency-dtoand-icurrency.ts index 5e5b802ec..2f70540e2 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-currency-dtoand-icurrency.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-currency-dtoand-icurrency.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfCurrencyDTOAndICurrency extends EntityDTO { +export interface ReadOnlyEntityDTOOfCurrencyDTOAndICurrency extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-destination-dtoand-idestination.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-destination-dtoand-idestination.ts index e6628518d..4f53d645d 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-destination-dtoand-idestination.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-destination-dtoand-idestination.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfDestinationDTOAndIDestination extends EntityDTO { +export interface ReadOnlyEntityDTOOfDestinationDTOAndIDestination extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-branch-dtoand-iread-only-branch.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-branch-dtoand-iread-only-branch.ts index 135eb315b..6499d4a8c 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-branch-dtoand-iread-only-branch.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-branch-dtoand-iread-only-branch.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfDisplayBranchDTOAndIReadOnlyBranch extends EntityDTO { +export interface ReadOnlyEntityDTOOfDisplayBranchDTOAndIReadOnlyBranch extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-logistician-dtoand-ilogistician.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-logistician-dtoand-ilogistician.ts index 9b9360938..a0ff1dc50 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-logistician-dtoand-ilogistician.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-logistician-dtoand-ilogistician.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfDisplayLogisticianDTOAndILogistician extends EntityDTO { +export interface ReadOnlyEntityDTOOfDisplayLogisticianDTOAndILogistician extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-order-dtoand-iorder.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-order-dtoand-iorder.ts index 8f1c48ddb..7e69e3dcb 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-order-dtoand-iorder.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-order-dtoand-iorder.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfDisplayOrderDTOAndIOrder extends EntityDTO { +export interface ReadOnlyEntityDTOOfDisplayOrderDTOAndIOrder extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-order-item-dtoand-iorder-item.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-order-item-dtoand-iorder-item.ts index 9392f9d5a..3d86ae190 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-order-item-dtoand-iorder-item.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-order-item-dtoand-iorder-item.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfDisplayOrderItemDTOAndIOrderItem extends EntityDTO { +export interface ReadOnlyEntityDTOOfDisplayOrderItemDTOAndIOrderItem extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-order-item-subset-dtoand-iorder-item-status.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-order-item-subset-dtoand-iorder-item-status.ts index fe6041164..4585f438c 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-order-item-subset-dtoand-iorder-item-status.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-order-item-subset-dtoand-iorder-item-status.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfDisplayOrderItemSubsetDTOAndIOrderItemStatus extends EntityDTO { +export interface ReadOnlyEntityDTOOfDisplayOrderItemSubsetDTOAndIOrderItemStatus extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-order-payment-dtoand-iread-only-payment.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-order-payment-dtoand-iread-only-payment.ts index 1f4094f97..6dc03e47f 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-order-payment-dtoand-iread-only-payment.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-display-order-payment-dtoand-iread-only-payment.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfDisplayOrderPaymentDTOAndIReadOnlyPayment extends EntityDTO { +export interface ReadOnlyEntityDTOOfDisplayOrderPaymentDTOAndIReadOnlyPayment extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-file-dtoand-ifile.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-file-dtoand-ifile.ts index e93cdd727..40db4d376 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-file-dtoand-ifile.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-file-dtoand-ifile.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfFileDTOAndIFile extends EntityDTO { +export interface ReadOnlyEntityDTOOfFileDTOAndIFile extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-item-dtoand-iitem.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-item-dtoand-iitem.ts index e8dace2f2..ae7ce04d2 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-item-dtoand-iitem.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-item-dtoand-iitem.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfItemDTOAndIItem extends EntityDTO { +export interface ReadOnlyEntityDTOOfItemDTOAndIItem extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-label-dtoand-iread-only-label.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-label-dtoand-iread-only-label.ts index 4c8c2fe77..595c1b776 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-label-dtoand-iread-only-label.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-label-dtoand-iread-only-label.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfLabelDTOAndIReadOnlyLabel extends EntityDTO { +export interface ReadOnlyEntityDTOOfLabelDTOAndIReadOnlyLabel extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-logistician-dtoand-ilogistician.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-logistician-dtoand-ilogistician.ts index 60a0a4f84..860ec6135 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-logistician-dtoand-ilogistician.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-logistician-dtoand-ilogistician.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfLogisticianDTOAndILogistician extends EntityDTO { +export interface ReadOnlyEntityDTOOfLogisticianDTOAndILogistician extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-shop-dtoand-ishop.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-shop-dtoand-ishop.ts index b9778ac25..3fd2a1265 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-shop-dtoand-ishop.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-shop-dtoand-ishop.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfShopDTOAndIShop extends EntityDTO { +export interface ReadOnlyEntityDTOOfShopDTOAndIShop extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-shop-item-dtoand-ishop-item.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-shop-item-dtoand-ishop-item.ts index f8568c682..a6c3699f5 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-shop-item-dtoand-ishop-item.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-shop-item-dtoand-ishop-item.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfShopItemDTOAndIShopItem extends EntityDTO { +export interface ReadOnlyEntityDTOOfShopItemDTOAndIShopItem extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-shopping-cart-item-dtoand-ishopping-cart-item.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-shopping-cart-item-dtoand-ishopping-cart-item.ts index b28de58f7..d193829de 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-shopping-cart-item-dtoand-ishopping-cart-item.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-shopping-cart-item-dtoand-ishopping-cart-item.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfShoppingCartItemDTOAndIShoppingCartItem extends EntityDTO { +export interface ReadOnlyEntityDTOOfShoppingCartItemDTOAndIShoppingCartItem extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-supplier-dtoand-isupplier.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-supplier-dtoand-isupplier.ts index d9d7206b0..f65fab410 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-supplier-dtoand-isupplier.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-supplier-dtoand-isupplier.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfSupplierDTOAndISupplier extends EntityDTO { +export interface ReadOnlyEntityDTOOfSupplierDTOAndISupplier extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-tenant-dtoand-iread-only-tenant.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-tenant-dtoand-iread-only-tenant.ts index 3c8d91dee..0e1710288 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-tenant-dtoand-iread-only-tenant.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-tenant-dtoand-iread-only-tenant.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfTenantDTOAndIReadOnlyTenant extends EntityDTO { +export interface ReadOnlyEntityDTOOfTenantDTOAndIReadOnlyTenant extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-text-dtoand-itext.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-text-dtoand-itext.ts index 17e9c5b01..d6f6624d5 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-text-dtoand-itext.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-text-dtoand-itext.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfTextDTOAndIText extends EntityDTO { +export interface ReadOnlyEntityDTOOfTextDTOAndIText extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-voucher-dtoand-iread-only-voucher.ts b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-voucher-dtoand-iread-only-voucher.ts index 149207ad2..e36b4da5a 100644 --- a/apps/swagger/print/src/lib/models/read-only-entity-dtoof-voucher-dtoand-iread-only-voucher.ts +++ b/apps/swagger/print/src/lib/models/read-only-entity-dtoof-voucher-dtoand-iread-only-voucher.ts @@ -1,4 +1,4 @@ /* tslint:disable */ import { EntityDTO } from './entity-dto'; -export interface ReadOnlyEntityDTOOfVoucherDTOAndIReadOnlyVoucher extends EntityDTO { +export interface ReadOnlyEntityDTOOfVoucherDTOAndIReadOnlyVoucher extends EntityDTO{ } diff --git a/apps/swagger/print/src/lib/models/response-args-of-ienumerable-of-key-value-dtoof-string-and-string.ts b/apps/swagger/print/src/lib/models/response-args-of-ienumerable-of-key-value-dtoof-string-and-string.ts index 15fbb9db8..889ff4ace 100644 --- a/apps/swagger/print/src/lib/models/response-args-of-ienumerable-of-key-value-dtoof-string-and-string.ts +++ b/apps/swagger/print/src/lib/models/response-args-of-ienumerable-of-key-value-dtoof-string-and-string.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { ResponseArgs } from './response-args'; import { KeyValueDTOOfStringAndString } from './key-value-dtoof-string-and-string'; -export interface ResponseArgsOfIEnumerableOfKeyValueDTOOfStringAndString extends ResponseArgs { +export interface ResponseArgsOfIEnumerableOfKeyValueDTOOfStringAndString extends ResponseArgs{ result?: Array; } diff --git a/apps/swagger/print/src/lib/models/response-args.ts b/apps/swagger/print/src/lib/models/response-args.ts index de82ca711..321cf370a 100644 --- a/apps/swagger/print/src/lib/models/response-args.ts +++ b/apps/swagger/print/src/lib/models/response-args.ts @@ -2,8 +2,8 @@ import { IPublicUserInfo } from './ipublic-user-info'; export interface ResponseArgs { error: boolean; + invalidProperties?: {[key: string]: string}; message?: string; requestId?: number; userInfo?: IPublicUserInfo; - invalidProperties?: {[key: string]: string}; } diff --git a/apps/swagger/print/src/lib/models/review-dto.ts b/apps/swagger/print/src/lib/models/review-dto.ts index 9637d9616..c1af08c41 100644 --- a/apps/swagger/print/src/lib/models/review-dto.ts +++ b/apps/swagger/print/src/lib/models/review-dto.ts @@ -1,10 +1,10 @@ /* tslint:disable */ export interface ReviewDTO { - id?: string; author?: string; - created: string; - rating: number; - title?: string; - text?: string; branch?: string; + created: string; + id?: string; + rating: number; + text?: string; + title?: string; } diff --git a/apps/swagger/print/src/lib/models/selection-dtoof-payment-type.ts b/apps/swagger/print/src/lib/models/selection-dtoof-payment-type.ts index bec56595b..e5bdedc36 100644 --- a/apps/swagger/print/src/lib/models/selection-dtoof-payment-type.ts +++ b/apps/swagger/print/src/lib/models/selection-dtoof-payment-type.ts @@ -1,8 +1,8 @@ /* tslint:disable */ import { PaymentType } from './payment-type'; export interface SelectionDTOOfPaymentType { + description?: string; key: PaymentType; label?: string; - description?: string; path?: string; } diff --git a/apps/swagger/print/src/lib/models/selection-dtoof-shipping-target.ts b/apps/swagger/print/src/lib/models/selection-dtoof-shipping-target.ts index 2f5cdb352..c51c1dcb8 100644 --- a/apps/swagger/print/src/lib/models/selection-dtoof-shipping-target.ts +++ b/apps/swagger/print/src/lib/models/selection-dtoof-shipping-target.ts @@ -1,8 +1,8 @@ /* tslint:disable */ import { ShippingTarget } from './shipping-target'; export interface SelectionDTOOfShippingTarget { + description?: string; key: ShippingTarget; label?: string; - description?: string; path?: string; } diff --git a/apps/swagger/print/src/lib/models/shelf-info-dto.ts b/apps/swagger/print/src/lib/models/shelf-info-dto.ts index df61e2234..5c44ca3b2 100644 --- a/apps/swagger/print/src/lib/models/shelf-info-dto.ts +++ b/apps/swagger/print/src/lib/models/shelf-info-dto.ts @@ -1,5 +1,5 @@ /* tslint:disable */ export interface ShelfInfoDTO { - label?: string; assortment?: string; + label?: string; } diff --git a/apps/swagger/print/src/lib/models/shipping-address-dto.ts b/apps/swagger/print/src/lib/models/shipping-address-dto.ts index c1e8d68db..c5466b330 100644 --- a/apps/swagger/print/src/lib/models/shipping-address-dto.ts +++ b/apps/swagger/print/src/lib/models/shipping-address-dto.ts @@ -1,16 +1,16 @@ /* tslint:disable */ import { EntityReferenceDTO } from './entity-reference-dto'; -import { Gender } from './gender'; -import { OrganisationDTO } from './organisation-dto'; import { AddressDTO } from './address-dto'; import { CommunicationDetailsDTO } from './communication-details-dto'; -export interface ShippingAddressDTO extends EntityReferenceDTO { - locale?: string; - gender: Gender; - title?: string; - firstName?: string; - lastName?: string; - organisation?: OrganisationDTO; +import { Gender } from './gender'; +import { OrganisationDTO } from './organisation-dto'; +export interface ShippingAddressDTO extends EntityReferenceDTO{ address?: AddressDTO; communicationDetails?: CommunicationDetailsDTO; + firstName?: string; + gender: Gender; + lastName?: string; + locale?: string; + organisation?: OrganisationDTO; + title?: string; } diff --git a/apps/swagger/print/src/lib/models/shipping-dto.ts b/apps/swagger/print/src/lib/models/shipping-dto.ts index 73a9e006d..50f920c6d 100644 --- a/apps/swagger/print/src/lib/models/shipping-dto.ts +++ b/apps/swagger/print/src/lib/models/shipping-dto.ts @@ -4,8 +4,8 @@ import { TypeOfDelivery } from './type-of-delivery'; export interface ShippingDTO { postage?: number; shippingType?: ShippingType; - typeOfDelivery?: TypeOfDelivery; shipsSeparatly?: boolean; start?: string; stop?: string; + typeOfDelivery?: TypeOfDelivery; } diff --git a/apps/swagger/print/src/lib/models/shop-dto2.ts b/apps/swagger/print/src/lib/models/shop-dto2.ts index 68b4e0e05..9767a16ec 100644 --- a/apps/swagger/print/src/lib/models/shop-dto2.ts +++ b/apps/swagger/print/src/lib/models/shop-dto2.ts @@ -1,29 +1,29 @@ /* tslint:disable */ import { EntityDTOOfShopDTOAndIShop } from './entity-dtoof-shop-dtoand-ishop'; import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto'; -import { EntityDTOContainerOfLogisticianDTO } from './entity-dtocontainer-of-logistician-dto'; -import { EntityDTOContainerOfCurrencyDTO } from './entity-dtocontainer-of-currency-dto'; import { EntityDTOContainerOfCountryDTO } from './entity-dtocontainer-of-country-dto'; +import { EntityDTOContainerOfCurrencyDTO } from './entity-dtocontainer-of-currency-dto'; +import { EntityDTOContainerOfLogisticianDTO } from './entity-dtocontainer-of-logistician-dto'; import { PaymentType } from './payment-type'; import { ShippingTarget } from './shipping-target'; import { CountryTargetDTO } from './country-target-dto'; import { BranchTargetDTO } from './branch-target-dto'; -export interface ShopDTO2 extends EntityDTOOfShopDTOAndIShop { - name?: string; - description?: string; +export interface ShopDTO2 extends EntityDTOOfShopDTOAndIShop{ branch?: EntityDTOContainerOfBranchDTO; - defaultLocale?: string; - defaultTargetBranch?: EntityDTOContainerOfBranchDTO; - defaultLogistician?: EntityDTOContainerOfLogisticianDTO; - defaultCurrency?: EntityDTOContainerOfCurrencyDTO; defaultCountry?: EntityDTOContainerOfCountryDTO; - orderingEnabledStart?: string; - orderingEnabledStop?: string; - shippingEnabledStart?: string; - shippingEnabledStop?: string; + defaultCurrency?: EntityDTOContainerOfCurrencyDTO; + defaultLocale?: string; + defaultLogistician?: EntityDTOContainerOfLogisticianDTO; + defaultTargetBranch?: EntityDTOContainerOfBranchDTO; + description?: string; enabledPaymentTypes: PaymentType; enabledShippingTargets: ShippingTarget; + name?: string; + orderingEnabledStart?: string; + orderingEnabledStop?: string; pigeonholeFetchTimeSpan?: number; shippingCountries?: Array; + shippingEnabledStart?: string; + shippingEnabledStop?: string; targetBranches?: Array; } diff --git a/apps/swagger/print/src/lib/models/shop-item-dto.ts b/apps/swagger/print/src/lib/models/shop-item-dto.ts index f6467671c..a46dd07f9 100644 --- a/apps/swagger/print/src/lib/models/shop-item-dto.ts +++ b/apps/swagger/print/src/lib/models/shop-item-dto.ts @@ -1,23 +1,23 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfShopItemDTOAndIShopItem } from './read-only-entity-dtoof-shop-item-dtoand-ishop-item'; -import { EntityDTOContainerOfItemDTO } from './entity-dtocontainer-of-item-dto'; -import { ImageDTO2 } from './image-dto2'; -import { ItemType } from './item-type'; -import { UrlDTO } from './url-dto'; import { AvailabilityDTO2 } from './availability-dto2'; +import { UrlDTO } from './url-dto'; +import { ImageDTO2 } from './image-dto2'; +import { EntityDTOContainerOfItemDTO } from './entity-dtocontainer-of-item-dto'; +import { ItemType } from './item-type'; import { ShippingDTO } from './shipping-dto'; -export interface ShopItemDTO extends ReadOnlyEntityDTOOfShopItemDTOAndIShopItem { - item?: EntityDTOContainerOfItemDTO; - ean?: string; - itemNumber?: string; - name?: string; - format?: string; - description?: string; - image?: ImageDTO2; - itemType: ItemType; - deepUrl?: UrlDTO; +export interface ShopItemDTO extends ReadOnlyEntityDTOOfShopItemDTOAndIShopItem{ availability?: AvailabilityDTO2; - shipping?: ShippingDTO; - minimumAge?: number; + deepUrl?: UrlDTO; + description?: string; + ean?: string; firstDayOfSale?: string; + format?: string; + image?: ImageDTO2; + item?: EntityDTOContainerOfItemDTO; + itemNumber?: string; + itemType: ItemType; + minimumAge?: number; + name?: string; + shipping?: ShippingDTO; } diff --git a/apps/swagger/print/src/lib/models/shopping-cart-item-dto.ts b/apps/swagger/print/src/lib/models/shopping-cart-item-dto.ts index efb91ee51..eceef7abc 100644 --- a/apps/swagger/print/src/lib/models/shopping-cart-item-dto.ts +++ b/apps/swagger/print/src/lib/models/shopping-cart-item-dto.ts @@ -1,39 +1,39 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfShoppingCartItemDTOAndIShoppingCartItem } from './read-only-entity-dtoof-shopping-cart-item-dtoand-ishopping-cart-item'; -import { EntityDTOContainerOfShopItemDTO } from './entity-dtocontainer-of-shop-item-dto'; -import { ProductDTO } from './product-dto'; import { EntityDTOContainerOfShoppingCartItemDTO } from './entity-dtocontainer-of-shopping-cart-item-dto'; import { AvailabilityDTO2 } from './availability-dto2'; +import { UrlDTO } from './url-dto'; +import { EntityDTOContainerOfDestinationDTO } from './entity-dtocontainer-of-destination-dto'; +import { OrderItemType } from './order-item-type'; +import { ProductDTO } from './product-dto'; +import { PromotionDTO } from './promotion-dto'; +import { EntityDTOContainerOfShopDTO } from './entity-dtocontainer-of-shop-dto'; +import { EntityDTOContainerOfShopItemDTO } from './entity-dtocontainer-of-shop-item-dto'; import { ShoppingCartItemStatus } from './shopping-cart-item-status'; import { PriceDTO } from './price-dto'; -import { UrlDTO } from './url-dto'; -import { OrderItemType } from './order-item-type'; -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 ReadOnlyEntityDTOOfShoppingCartItemDTOAndIShoppingCartItem { - quantity?: number; - ssc?: string; - sscText?: string; - shopItem?: EntityDTOContainerOfShopItemDTO; - product?: ProductDTO; - customProductName?: string; - components?: Array; +export interface ShoppingCartItemDTO extends ReadOnlyEntityDTOOfShoppingCartItemDTOAndIShoppingCartItem{ accessories?: Array; - availability?: AvailabilityDTO2; agentComment?: string; + availability?: AvailabilityDTO2; buyerComment?: string; - specialComment?: string; - lastAvailabilityRequest?: string; - shoppingCartItemStatus: ShoppingCartItemStatus; - unitPrice?: PriceDTO; - total?: PriceDTO; + components?: Array; + customProductName?: string; deepUrl?: UrlDTO; - orderItemType: OrderItemType; - shop?: EntityDTOContainerOfShopDTO; destination?: EntityDTOContainerOfDestinationDTO; estimatedShippingDate?: string; - parent?: EntityDTOContainerOfShoppingCartItemDTO; - promotion?: PromotionDTO; features?: {[key: string]: string}; + lastAvailabilityRequest?: string; + orderItemType: OrderItemType; + parent?: EntityDTOContainerOfShoppingCartItemDTO; + product?: ProductDTO; + promotion?: PromotionDTO; + quantity?: number; + shop?: EntityDTOContainerOfShopDTO; + shopItem?: EntityDTOContainerOfShopItemDTO; + shoppingCartItemStatus: ShoppingCartItemStatus; + specialComment?: string; + ssc?: string; + sscText?: string; + total?: PriceDTO; + unitPrice?: PriceDTO; } diff --git a/apps/swagger/print/src/lib/models/size-of-string.ts b/apps/swagger/print/src/lib/models/size-of-string.ts index e3aea9d5e..af7595a9d 100644 --- a/apps/swagger/print/src/lib/models/size-of-string.ts +++ b/apps/swagger/print/src/lib/models/size-of-string.ts @@ -1,7 +1,7 @@ /* tslint:disable */ export interface SizeOfString { height: number; - width: number; length: number; unit?: string; + width: number; } diff --git a/apps/swagger/print/src/lib/models/stock-info-dto.ts b/apps/swagger/print/src/lib/models/stock-info-dto.ts index 548574c3c..0fc279d75 100644 --- a/apps/swagger/print/src/lib/models/stock-info-dto.ts +++ b/apps/swagger/print/src/lib/models/stock-info-dto.ts @@ -1,6 +1,6 @@ /* tslint:disable */ export interface StockInfoDTO { + compartment?: string; id?: number; inStock?: number; - compartment?: string; } diff --git a/apps/swagger/print/src/lib/models/supplier-dto.ts b/apps/swagger/print/src/lib/models/supplier-dto.ts index f099051ce..a9d5e9234 100644 --- a/apps/swagger/print/src/lib/models/supplier-dto.ts +++ b/apps/swagger/print/src/lib/models/supplier-dto.ts @@ -1,9 +1,9 @@ /* tslint:disable */ import { EntityDTOOfSupplierDTOAndISupplier } from './entity-dtoof-supplier-dtoand-isupplier'; import { SupplierType } from './supplier-type'; -export interface SupplierDTO extends EntityDTOOfSupplierDTOAndISupplier { - name?: string; +export interface SupplierDTO extends EntityDTOOfSupplierDTOAndISupplier{ key?: string; + name?: string; supplierNumber?: string; supplierType?: SupplierType; } diff --git a/apps/swagger/print/src/lib/models/tenant-dto.ts b/apps/swagger/print/src/lib/models/tenant-dto.ts index d8f83f957..32f8a1f09 100644 --- a/apps/swagger/print/src/lib/models/tenant-dto.ts +++ b/apps/swagger/print/src/lib/models/tenant-dto.ts @@ -1,7 +1,7 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfTenantDTOAndIReadOnlyTenant } from './read-only-entity-dtoof-tenant-dtoand-iread-only-tenant'; -export interface TenantDTO extends ReadOnlyEntityDTOOfTenantDTOAndIReadOnlyTenant { - name?: string; - key?: string; +export interface TenantDTO extends ReadOnlyEntityDTOOfTenantDTOAndIReadOnlyTenant{ bitMask?: number; + key?: string; + name?: string; } diff --git a/apps/swagger/print/src/lib/models/terms-of-delivery-dto.ts b/apps/swagger/print/src/lib/models/terms-of-delivery-dto.ts index 00e0d41f7..a32784495 100644 --- a/apps/swagger/print/src/lib/models/terms-of-delivery-dto.ts +++ b/apps/swagger/print/src/lib/models/terms-of-delivery-dto.ts @@ -1,13 +1,13 @@ /* tslint:disable */ import { PriceValueDTO } from './price-value-dto'; -import { TypeOfDelivery } from './type-of-delivery'; import { ShippingType } from './shipping-type'; +import { TypeOfDelivery } from './type-of-delivery'; export interface TermsOfDeliveryDTO { isPartialShipping?: boolean; partialShippingCharge?: number; postage?: PriceValueDTO; - typeOfDelivery: TypeOfDelivery; - shippingType: ShippingType; - shippingDeadlineStart?: string; shippingDeadlineEnd?: string; + shippingDeadlineStart?: string; + shippingType: ShippingType; + typeOfDelivery: TypeOfDelivery; } diff --git a/apps/swagger/print/src/lib/models/terms-of-delivery-dto2.ts b/apps/swagger/print/src/lib/models/terms-of-delivery-dto2.ts index 19ada433c..78c378f30 100644 --- a/apps/swagger/print/src/lib/models/terms-of-delivery-dto2.ts +++ b/apps/swagger/print/src/lib/models/terms-of-delivery-dto2.ts @@ -1,12 +1,12 @@ /* tslint:disable */ -import { TypeOfDelivery } from './type-of-delivery'; import { ShippingType } from './shipping-type'; +import { TypeOfDelivery } from './type-of-delivery'; export interface TermsOfDeliveryDTO2 { isPartialShipping?: boolean; partialShippingCharge?: number; postage?: number; - typeOfDelivery?: TypeOfDelivery; - shippingType?: ShippingType; - shippingDeadlineStart?: string; shippingDeadlineEnd?: string; + shippingDeadlineStart?: string; + shippingType?: ShippingType; + typeOfDelivery?: TypeOfDelivery; } diff --git a/apps/swagger/print/src/lib/models/text-dto2.ts b/apps/swagger/print/src/lib/models/text-dto2.ts index d926c6c71..dbc54592d 100644 --- a/apps/swagger/print/src/lib/models/text-dto2.ts +++ b/apps/swagger/print/src/lib/models/text-dto2.ts @@ -1,15 +1,15 @@ /* tslint:disable */ import { EntityDTOOfTextDTOAndIText } from './entity-dtoof-text-dtoand-itext'; import { EntityDTOContainerOfTenantDTO } from './entity-dtocontainer-of-tenant-dto'; -export interface TextDTO2 extends EntityDTOOfTextDTOAndIText { +export interface TextDTO2 extends EntityDTOOfTextDTOAndIText{ + content?: string; + copyright?: string; cultureInfo?: string; + encoding?: string; + hash?: string; + mime?: string; name?: string; subtitle?: string; - copyright?: string; - type?: string; - content?: string; - encoding?: string; - mime?: string; - hash?: string; tenant?: EntityDTOContainerOfTenantDTO; + type?: string; } diff --git a/apps/swagger/print/src/lib/models/url-dto.ts b/apps/swagger/print/src/lib/models/url-dto.ts index 42318815d..24d7303cc 100644 --- a/apps/swagger/print/src/lib/models/url-dto.ts +++ b/apps/swagger/print/src/lib/models/url-dto.ts @@ -1,7 +1,7 @@ /* tslint:disable */ export interface UrlDTO { - url?: string; - title?: string; - target?: string; nofollow?: boolean; + target?: string; + title?: string; + url?: string; } diff --git a/apps/swagger/print/src/lib/models/user-account-dto.ts b/apps/swagger/print/src/lib/models/user-account-dto.ts index d009ffedb..8b19dca37 100644 --- a/apps/swagger/print/src/lib/models/user-account-dto.ts +++ b/apps/swagger/print/src/lib/models/user-account-dto.ts @@ -1,15 +1,15 @@ /* tslint:disable */ import { Gender } from './gender'; export interface UserAccountDTO { - isTemporaryAccount?: boolean; - userName?: string; alias?: string; - password?: string; - gender?: Gender; - title?: string; - firstName?: string; - lastName?: string; dateOfBirth?: string; email?: string; + firstName?: string; + gender?: Gender; + isTemporaryAccount?: boolean; + lastName?: string; newsletter?: boolean; + password?: string; + title?: string; + userName?: string; } diff --git a/apps/swagger/print/src/lib/models/vatvalue-dto.ts b/apps/swagger/print/src/lib/models/vatvalue-dto.ts index a4e56566e..295376a6b 100644 --- a/apps/swagger/print/src/lib/models/vatvalue-dto.ts +++ b/apps/swagger/print/src/lib/models/vatvalue-dto.ts @@ -1,8 +1,8 @@ /* tslint:disable */ import { VATType } from './vattype'; export interface VATValueDTO { - label?: string; inPercent?: number; - vatType?: VATType; + label?: string; value?: number; + vatType?: VATType; } diff --git a/apps/swagger/print/src/lib/models/voucher-dto.ts b/apps/swagger/print/src/lib/models/voucher-dto.ts index 3c558dfc5..9a34e4740 100644 --- a/apps/swagger/print/src/lib/models/voucher-dto.ts +++ b/apps/swagger/print/src/lib/models/voucher-dto.ts @@ -1,8 +1,8 @@ /* tslint:disable */ import { ReadOnlyEntityDTOOfVoucherDTOAndIReadOnlyVoucher } from './read-only-entity-dtoof-voucher-dtoand-iread-only-voucher'; import { PriceValueDTO } from './price-value-dto'; -export interface VoucherDTO extends ReadOnlyEntityDTOOfVoucherDTOAndIReadOnlyVoucher { - name?: string; +export interface VoucherDTO extends ReadOnlyEntityDTOOfVoucherDTOAndIReadOnlyVoucher{ description?: string; + name?: string; value?: PriceValueDTO; } diff --git a/apps/swagger/print/src/lib/models/weight-of-avoirdupois.ts b/apps/swagger/print/src/lib/models/weight-of-avoirdupois.ts index 519059cdd..f61c374d4 100644 --- a/apps/swagger/print/src/lib/models/weight-of-avoirdupois.ts +++ b/apps/swagger/print/src/lib/models/weight-of-avoirdupois.ts @@ -1,6 +1,6 @@ /* tslint:disable */ import { Avoirdupois } from './avoirdupois'; export interface WeightOfAvoirdupois { - value: number; unit: Avoirdupois; + value: number; } diff --git a/apps/swagger/print/src/lib/print-configuration.ts b/apps/swagger/print/src/lib/print-configuration.ts index 3af51d5dc..a76d73c44 100644 --- a/apps/swagger/print/src/lib/print-configuration.ts +++ b/apps/swagger/print/src/lib/print-configuration.ts @@ -10,3 +10,7 @@ import { Injectable } from '@angular/core'; export class PrintConfiguration { rootUrl: string = 'http://isa-test.paragon-data.net'; } + +export interface PrintConfigurationInterface { + rootUrl?: string; +} diff --git a/apps/swagger/print/src/lib/print.module.ts b/apps/swagger/print/src/lib/print.module.ts index 3d14f2d03..fbb1705f7 100644 --- a/apps/swagger/print/src/lib/print.module.ts +++ b/apps/swagger/print/src/lib/print.module.ts @@ -1,7 +1,7 @@ /* tslint:disable */ -import { NgModule } from '@angular/core'; +import { NgModule, ModuleWithProviders } from '@angular/core'; import { HttpClientModule } from '@angular/common/http'; -import { PrintConfiguration } from './print-configuration'; +import { PrintConfiguration, PrintConfigurationInterface } from './print-configuration'; import { CatalogPrintService } from './services/catalog-print.service'; import { CheckoutPrintService } from './services/checkout-print.service'; @@ -29,4 +29,16 @@ import { PrintService } from './services/print.service'; PrintService ], }) -export class PrintModule { } +export class PrintModule { + static forRoot(customParams: PrintConfigurationInterface): ModuleWithProviders { + return { + ngModule: PrintModule, + providers: [ + { + provide: PrintConfiguration, + useValue: {rootUrl: customParams.rootUrl} + } + ] + } + } +} diff --git a/apps/ui/validators/src/lib/set-invalid-property-errors.ts b/apps/ui/validators/src/lib/set-invalid-property-errors.ts index 19bef3bc7..087388f8b 100644 --- a/apps/ui/validators/src/lib/set-invalid-property-errors.ts +++ b/apps/ui/validators/src/lib/set-invalid-property-errors.ts @@ -1,12 +1,11 @@ import { AbstractControl } from '@angular/forms'; -import { StringDictionary } from '@cmf/core'; import * as _ from 'lodash'; export function setInvalidPropertyErrors({ invalidProperties, formGroup, }: { - invalidProperties: StringDictionary; + invalidProperties: { [key: string]: string }; formGroup: AbstractControl; }) { for (const key in invalidProperties) { diff --git a/apps/utils/object/src/is-response-args.ts b/apps/utils/object/src/is-response-args.ts index 4e8b2221c..17c0dc3fa 100644 --- a/apps/utils/object/src/is-response-args.ts +++ b/apps/utils/object/src/is-response-args.ts @@ -1,4 +1,4 @@ -import { ResponseArgs } from '@cmf/core'; +import { ResponseArgs } from '@swagger/cat'; import { isBoolean } from '@utils/common'; import { isObject } from 'lodash'; diff --git a/package-lock.json b/package-lock.json index aee7ee206..bf697d080 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5009,66 +5009,6 @@ } } }, - "@cmf/catalog-api": { - "version": "0.1.34", - "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel@Local/npm/registry/@cmf/catalog-api/-/catalog-api-0.1.34.tgz", - "integrity": "sha1-85/BIxoBfdCG8Qf5MfUW5TB1S2g=", - "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" - } - } - }, - "@cmf/core": { - "version": "0.1.34", - "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel@Local/npm/registry/@cmf/core/-/core-0.1.34.tgz", - "integrity": "sha1-qQiR/iL3hlOhNg16j/L2WQs0Bn8=", - "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" - } - } - }, - "@cmf/inventory-api": { - "version": "0.1.34", - "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel@Local/npm/registry/@cmf/inventory-api/-/inventory-api-0.1.34.tgz", - "integrity": "sha1-49/7PeMGFrG/Gs8YEmizUn0ETqI=", - "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" - } - } - }, - "@cmf/trade-api": { - "version": "0.1.34", - "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel@Local/npm/registry/@cmf/trade-api/-/trade-api-0.1.34.tgz", - "integrity": "sha1-EepT58f+dHa2tmVtzDAXJTwgGwg=", - "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" - } - } - }, "@fullhuman/postcss-purgecss": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/@fullhuman/postcss-purgecss/-/postcss-purgecss-3.1.3.tgz", @@ -5078,51 +5018,6 @@ "purgecss": "^3.1.3" } }, - "@isa/catsearch-api": { - "version": "0.0.56", - "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel@Local/npm/registry/@isa/catsearch-api/-/catsearch-api-0.0.56.tgz", - "integrity": "sha1-VQWugpfYeSER3UnIsYOQVtnd5FA=", - "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" - } - } - }, - "@isa/print-api": { - "version": "0.0.56", - "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel@Local/npm/registry/@isa/print-api/-/print-api-0.0.56.tgz", - "integrity": "sha1-8cSMtEczwDnSe/C8piozLDmVYMA=", - "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" - } - } - }, - "@isa/remi-api": { - "version": "0.0.56", - "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel@Local/npm/registry/@isa/remi-api/-/remi-api-0.0.56.tgz", - "integrity": "sha1-bQBbsKL7D+j+nrB26qIOaobBjmc=", - "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" - } - } - }, "@istanbuljs/schema": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz", diff --git a/package.json b/package.json index 745fab373..29fefea74 100644 --- a/package.json +++ b/package.json @@ -41,13 +41,6 @@ "@angular/platform-browser-dynamic": "~10.1.2", "@angular/router": "~10.1.2", "@angular/service-worker": "~10.1.2", - "@cmf/catalog-api": "^0.1.34", - "@cmf/core": "^0.1.34", - "@cmf/inventory-api": "^0.1.34", - "@cmf/trade-api": "^0.1.34", - "@isa/catsearch-api": "^0.0.56", - "@isa/print-api": "0.0.56", - "@isa/remi-api": "0.0.56", "@ng-idle/core": "^8.0.0-beta.4", "@ng-idle/keepalive": "^8.0.0-beta.4", "@ngrx/component-store": "^11.0.0",