Merged in bugfix/sprint-16-alex (pull request #1252)

Bugfix/sprint 16 alex

apps/sales/src/app/app-routing.module.ts

@@ -4,7 +4,6 @@ import { LogInComponent } from './components/log-in/log-in.component';
 import { DashboardComponent } from './modules/dashboard/pages/dashboard.component';
 
 const routes: Routes = [
-  // { path: '', redirectTo: '/dashboard', pathMatch: 'full' },
   {
     path: 'login',
     children: [
@@ -12,7 +11,6 @@ const routes: Routes = [
       { path: ':token', component: LogInComponent }
     ]
   },
-  //{ path: '', component: DashboardComponent },
   { path: 'dashboard', component: DashboardComponent },
   { path: 'product', loadChildren: './modules/product/product.module#ProductModule' },
   { path: 'customer', loadChildren: './modules/customer/customer.module#CustomerModule' },

apps/sales/src/app/modules/customer/components/customer-orders-card/customer-orders-card.component.html

@@ -3,7 +3,8 @@
     <span>Bestellungen</span>
   </div>
 
-  <div class="fixed-card-container order-container scrollbar-visible">
+  <div class="fixed-card-container order-container"
+    [perfectScrollbar]="{minScrollbarLength: 20}">
     <div class="fixed-header-description">
       <span>Übersicht aller offenen und früheren Bestellungen</span>
     </div>

apps/sales/src/app/modules/customer/customer.module.ts

@@ -39,6 +39,7 @@ import { ShelfModule } from '../shelf/shelf.module';
 
 import { COMPONENTS, EXPORT_COMPONENTS } from './components';
 import { CustomerSearchEmptyModalComponent } from './components/customer-search-empty-modal/customer-search-empty-modal.component';
+import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
 
 @NgModule({
   imports: [
@@ -59,6 +60,7 @@ import { CustomerSearchEmptyModalComponent } from './components/customer-search-
     CheckboxModule,
     DropdownModule,
     DeleteDropdownFixedModule,
+    PerfectScrollbarModule,
     IconModule,
     CustomerRoutingModule,
     SelectModule,

apps/sales/src/app/modules/customer/pages/customer-search-result/customer-search-result.component.html

@@ -39,7 +39,8 @@
       <app-button (action)="redirectToCustomerCreate()">Neue Kundendaten erfassen</app-button>
     </div>
   </div>
-  <cdk-virtual-scroll-viewport itemSize="144" class="scrollbar-visible" #viewport>
+  <cdk-virtual-scroll-viewport itemSize="144" #viewport
+    [perfectScrollbar]="{minScrollbarLength: 20}">
     <div *cdkVirtualFor="let customer of ds; let i = index; let last = last" class="virtual-item">
       <div class="user">
         <div class="user-info-container" *ngIf="customer != null; else loadingComponent" (click)="details(customer, i)">

apps/sales/src/app/modules/goods-in/goods-in.module.ts

@@ -21,6 +21,7 @@ import { SharedModule } from '../../shared/shared.module';
 import { GoodsInOrderTagComponent } from './components/goods-in-order-tag/goods-in-order-tag.component';
 import { GoodsInArticleDetailsComponent } from './components/goods-in-article-details/goods-in-article-details.component';
 import { FormsModule } from '@angular/forms';
+import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
 
 @NgModule({
   declarations: [
@@ -37,6 +38,7 @@ import { FormsModule } from '@angular/forms';
     GoodsInRoutingModule,
     SearchInputModule,
     ScrollingModule,
+    PerfectScrollbarModule,
     LoadingModule,
     SharedModule,
     IconModule,

apps/sales/src/app/modules/goods-in/pages/goods-in-search-results/goods-in-search-results.component.html

@@ -1,6 +1,7 @@
 <div class="result-container">
   <ng-container>
-    <cdk-virtual-scroll-viewport itemSize="190" class="scrollbar-visible" #scroller>
+    <cdk-virtual-scroll-viewport itemSize="190" #scroller
+      [perfectScrollbar]="{minScrollbarLength: 20}">
       <div *cdkVirtualFor="let order of ds; let first = first; let last = last; let index = index">
         <ng-container *ngIf="order != null; else loadingComponent">
           <app-goods-in-order-card

apps/sales/src/app/modules/product/components/product-card/product-card.component.ts

@@ -26,7 +26,6 @@ import { AddBreadcrumb } from 'apps/sales/src/app/core/store/actions/breadcrumb.
 })
 export class ProductCardComponent implements OnInit, OnDestroy, AfterViewChecked {
   private _product: Product;
-  @Input() processId: number;
   @Input() index: number;
 
   @Input()

apps/sales/src/app/modules/product/pages/product-results/product-data.datasource.ts

@@ -1,14 +1,13 @@
-import { DataSource, CollectionViewer } from '@angular/cdk/collections';
-import { procuctsMock } from 'mock';
-import { Product } from '../../../../core/models/product.model';
 import { BehaviorSubject, Observable, Subject } from 'rxjs';
+import { debounceTime, take, takeUntil } from 'rxjs/operators';
+import { DataSource, CollectionViewer } from '@angular/cdk/collections';
+import { Store } from '@ngxs/store';
+import { ItemDTO } from 'swagger';
+import { Product } from '../../../../core/models/product.model';
 import { ProductMapping } from '../../../../core/mappings/product.mapping';
 import { ProductService } from '../../../../core/services/product.service';
-import { Store } from '@ngxs/store';
-import { debounceTime, take, takeUntil } from 'rxjs/operators';
 import { SetProducts, SetProductCachedResults } from '../../../../core/store/actions/product.actions';
 import { AppState } from 'apps/sales/src/app/core/store/state/app.state';
-import { ItemDTO } from 'swagger';
 import { Search } from 'apps/sales/src/app/core/models/search.model';
 
 export class SearchDataSource extends DataSource<Product | undefined> {
@@ -16,15 +15,18 @@ export class SearchDataSource extends DataSource<Product | undefined> {
   public cachedData = Array.from<Product>({ length: 0 });
   private cachedItemsDTO = Array.from<ItemDTO>({ length: 0 });
   private fetchedPages = new Set<number>();
-  private dataStream = new BehaviorSubject<(Product | undefined)[]>(this.cachedData);
-  public dataStreamDTO = new BehaviorSubject<(ItemDTO | undefined)[]>(this.cachedItemsDTO);
-  destroy$ = new Subject();
-  public loading = true;
-  public results = false;
   private productMapping = new ProductMapping();
+  private dataStream = new BehaviorSubject<(Product | undefined)[]>(this.cachedData);
+  dataStreamDTO = new BehaviorSubject<(ItemDTO | undefined)[]>(this.cachedItemsDTO);
+  loading = true;
+  results = false;
+  destroy$ = new Subject();
+
+  static getPageForIndex(index: number): number {
+    return Math.floor(index / SearchDataSource.pageSize);
+  }
 
   constructor(
-    public id: number,
     private searchService: ProductService,
     private search: Search,
     private store: Store,
@@ -36,8 +38,8 @@ export class SearchDataSource extends DataSource<Product | undefined> {
   }
   connect(collectionViewer: CollectionViewer): Observable<(Product | undefined)[]> {
     collectionViewer.viewChange.pipe(takeUntil(this.destroy$)).subscribe(range => {
-      const startPage = this.getPageForIndex(range.start);
-      const endPage = this.getPageForIndex(range.end - 1);
+      const startPage = SearchDataSource.getPageForIndex(range.start);
+      const endPage = SearchDataSource.getPageForIndex(range.end - 1);
       for (let i = startPage; i <= endPage; i++) {
         this.fetchPage(i);
       }
@@ -52,20 +54,18 @@ export class SearchDataSource extends DataSource<Product | undefined> {
     return this.dataStream;
   }
 
+  disconnect(): void {
+    this.dataStream.complete();
+    this.dataStreamDTO.complete();
+    this.destroy$.next();
+  }
+
   getProductsUpTo(page: number) {
     for (let i = 0; i < page; i++) {
       this.fetchPage(i);
     }
   }
 
-  disconnect(): void {
-    this.destroy$.next();
-  }
-
-  public getPageForIndex(index: number): number {
-    return Math.floor(index / SearchDataSource.pageSize);
-  }
-
   private fetchPage(page: number) {
     if (page === 0) {
       this.results = false;
@@ -107,9 +107,7 @@ export class SearchDataSource extends DataSource<Product | undefined> {
       this.cachedData.splice(
         page * SearchDataSource.pageSize,
         SearchDataSource.pageSize,
-        ...data.result.map((item, i) => {
-          return this.productMapping.fromItemDTO(item);
-        })
+        ...data.result.map((item, i) => this.productMapping.fromItemDTO(item))
       );
       this.dataStream.next(this.cachedData);
       this.dataStreamDTO.next(this.cachedItemsDTO);

apps/sales/src/app/modules/product/pages/product-results/product-results.component.html

@@ -1,5 +1,6 @@
 <div class="result-container" *ngIf="!loading">
   <app-interactive-filters (filtersUpdated)="filtersClicked($event)"></app-interactive-filters>
+
   <div class="filter-mode-switcher">
     <lib-small-double-choice-switch
       leftValue="Filtern nach"
@@ -8,7 +9,9 @@
       [selectedSide]="selectedFilterMode"
     ></lib-small-double-choice-switch>
   </div>
+
   <app-filter (toggle)="filterMoreToggle($event)" (filtersChanged)="updateSearch()" [selectedFilterMode]="selectedFilterMode"></app-filter>
+
   <div *ngIf="!ds || (ds.loading && !ds.results)">
     <div [@stagger]="'yes'">
       <div *ngFor="let dummy of dummies" [style.marginTop.px]="10">
@@ -16,23 +19,24 @@
       </div>
     </div>
   </div>
+
   <div *ngIf="ds && !ds.loading && !loading && ds.cachedData.length === 0" class="no-results-text">Keine Suchergebnisse gefunden</div>
+
   <cdk-virtual-scroll-viewport
-    autosize #scroller
-    class="scrollbar-visible"
-    [ngClass]="{ 'cdk-stop-scrolling': scrollDisabled }">
+    autosize
+    #scroller
+    [ngClass]="{ 'cdk-stop-scrolling': scrollDisabled }"
+    [perfectScrollbar]="{minScrollbarLength: 20}">
     <ng-container *cdkVirtualFor="let product of ds; let i = index; let last = last">
       <div class="product-item">
         <app-product-card
           #productCard
-          [processId]="id"
           [product]="product"
           [index]="i"
           *ngIf="product != null"
           (authorFilter)="authorFilter($event)"
           (saveProductPosition)="saveProductPositionHandler($event)"
-        >
-        </app-product-card>
+        ></app-product-card>
         <div class="loading-card-wrapper" *ngIf="product == null">
           <app-product-card-loading></app-product-card-loading>
         </div>
@@ -40,6 +44,7 @@
       <div class="bottom-spacer" *ngIf="last"></div>
     </ng-container>
   </cdk-virtual-scroll-viewport>
+
   <app-loading
     *ngIf="!ds || ds.loading"
     [style.marginTop.px]="60"
@@ -48,4 +53,5 @@
     text="Inhalte werden geladen"
   ></app-loading>
 </div>
+
 <div class="overlay" *ngIf="scrollDisabled" [ngStyle]="{ height: filterContainerHeight }"></div>

apps/sales/src/app/modules/product/pages/product-results/product-results.component.ts

@@ -13,7 +13,6 @@ import {
 import { Search } from '../../../../core/models/search.model';
 import { Process } from '../../../../core/models/process.model';
 import { Product } from '../../../../core/models/product.model';
-import { Router } from '@angular/router';
 import { Select, Store } from '@ngxs/store';
 import { Observable, Subject } from 'rxjs';
 import { staggerAnimation } from './stagger.animation';
@@ -76,14 +75,9 @@ export class ProductResultsComponent implements OnInit, OnDestroy, AfterViewInit
   get areFiltersNegative() {
     if (this.selectedFilterMode) {
       return this.selectedFilterMode === Side.RIGHT;
-    } else {
-      const currentFilterType = this.store.selectSnapshot(SharedSelectors.getFilterType);
-      if (currentFilterType) {
-        return currentFilterType === FilterType.Negative;
-      } else {
-        return false;
-      }
     }
+    const currentFilterType = this.store.selectSnapshot(SharedSelectors.getFilterType);
+    return (currentFilterType) ? currentFilterType === FilterType.Negative : false;
   }
 
   get filterContainerHeight() {
@@ -98,8 +92,7 @@ export class ProductResultsComponent implements OnInit, OnDestroy, AfterViewInit
     private store: Store,
     private productService: ProductService,
     private cdr: ChangeDetectorRef,
-    private productUtils: ProductUtilService,
-    private router: Router
+    private productUtils: ProductUtilService
   ) {}
 
   ngOnInit() {
@@ -109,17 +102,14 @@ export class ProductResultsComponent implements OnInit, OnDestroy, AfterViewInit
         distinctUntilChanged((prev, curr) => prev && curr && JSON.stringify(prev) === JSON.stringify(curr)),
         takeUntil(this.destroy$),
         filter(data => !isNullOrUndefined(data) && data.id !== this.id),
-        switchMap(data => {
-          return this.store.select(SharedSelectors.getFilterType).pipe(
+        switchMap(data =>
+          this.store.select(SharedSelectors.getFilterType).pipe(
             filter(fType => !isNullOrUndefined(fType)),
             takeUntil(this.destroy$),
             map(fType => {
-              return { filterType: fType, process: data };
-            })
-          );
-        })
-      )
-      .subscribe(({ filterType, process }) => {
+              return {filterType: fType, process: data};
+            }))))
+      .subscribe(({filterType, process}) => {
         this.currentProcess = process;
         this.currentSearch = process.search;
         this.id = process.id;
@@ -133,7 +123,7 @@ export class ProductResultsComponent implements OnInit, OnDestroy, AfterViewInit
           this.loadCountOfPage += 1;
           this.loadDataSource(false);
           if (this.loadCountOfPage === 1) {
-            this.store.dispatch(new AddSearch({ ...this.currentSearch, firstLoad: false }));
+            this.store.dispatch(new AddSearch({...this.currentSearch, firstLoad: false}));
           }
         }
       });
@@ -171,16 +161,23 @@ export class ProductResultsComponent implements OnInit, OnDestroy, AfterViewInit
     }
   }
 
-  loadDataSource(skipCache: boolean) {
+  initiateDataSource(search: Search, filters: any[], areFiltersNegative: boolean, skipCache: boolean) {
     this.ds = new SearchDataSource(
-      this.id,
       this.productService,
-      this.currentSearch,
+      search,
       this.store,
-      this.currentSearch.fitlers ? this.currentSearch.fitlers : [],
-      this.areFiltersNegative,
+      filters,
+      areFiltersNegative,
       skipCache
     );
+  }
+
+  loadDataSource(skipCache: boolean) {
+    this.initiateDataSource(
+      this.currentSearch,
+      this.currentSearch.fitlers ? this.currentSearch.fitlers : [],
+      this.areFiltersNegative,
+      skipCache);
 
     // Load products up to the previous page
     const [pageSize] = this.getSelectedProductScrollInformation();
@@ -241,16 +238,12 @@ export class ProductResultsComponent implements OnInit, OnDestroy, AfterViewInit
         this.radioButtonGroup.radioButtons && this.radioButtonGroup.radioButtons.find(t => t.selected)
           ? this.radioButtonGroup.radioButtons.find(t => t.selected).key
           : undefined;
-      const search = { ...currentSearch, type: type };
-      this.ds = new SearchDataSource(
-        this.id,
-        this.productService,
+      const search = {...currentSearch, type: type};
+      this.initiateDataSource(
         search,
-        this.store,
         !isNullOrUndefined(fil) ? fil : [],
         this.areFiltersNegative,
-        true
-      );
+        true);
       this.loading = false;
     }
     setTimeout(() => {
@@ -278,7 +271,7 @@ export class ProductResultsComponent implements OnInit, OnDestroy, AfterViewInit
     this.store.dispatch(new AddSearch(this.currentSearch));
     if (!this.searchFired) {
       this.searchFired = true;
-      this.ds = new SearchDataSource(this.id, this.productService, this.currentSearch, this.store, [], this.areFiltersNegative, true);
+      this.initiateDataSource(this.currentSearch, [], this.areFiltersNegative, true);
       this.loading = false;
       this.searchFired = false;
       this.cdr.detectChanges();
@@ -307,7 +300,7 @@ export class ProductResultsComponent implements OnInit, OnDestroy, AfterViewInit
       };
       this.store.dispatch(new AddSearch(exists));
 
-      this.ds = new SearchDataSource(this.id, this.productService, exists, this.store, filters, this.areFiltersNegative, true);
+      this.initiateDataSource(exists, filters, this.areFiltersNegative, true);
       this.loading = false;
       this.cdr.detectChanges();
 
@@ -322,24 +315,12 @@ export class ProductResultsComponent implements OnInit, OnDestroy, AfterViewInit
   private activeFilters(): Filter[] {
     let filters: Filter[] = [];
     if (this.currentSearch.fitlers) {
-      filters = this.currentSearch.fitlers.map((filter: Filter) => {
-        if (filter.id === 'cattype') {
-          let fil = {
-            ...filter,
-            items: filter.items.map((filterItm: FilterItem) => {
-              if (filterItm.id === '2') {
-                let itm = { ...filterItm, selected: this.acrhiveFilter };
-
-                return itm;
-              }
-              return { ...filterItm, selected: false };
-            })
-          };
-
-          return fil;
-        }
-        return filter;
-      });
+      filters = this.currentSearch.fitlers.map((f: Filter) => (f.id === 'cattype') ?
+        {
+          ...f,
+          items: f.items.map((fi: FilterItem) => (fi.id === '2') ?
+            {...fi, selected: this.acrhiveFilter} : {...fi, selected: false})
+        } : f);
     }
     return filters;
   }
@@ -347,16 +328,12 @@ export class ProductResultsComponent implements OnInit, OnDestroy, AfterViewInit
   private selectAuthorFilter() {
     if (this.radioButtonGroup) {
       let radioButtons = this.radioButtonGroup.radioButtons;
-      radioButtons = radioButtons.map(radio => {
-        if (radio.key === 'author') {
-          return { ...radio, selected: true };
-        }
-        return { ...radio, selected: false };
-      });
+      radioButtons = radioButtons.map(radio => (radio.key === 'author') ?
+        {...radio, selected: true} : {...radio, selected: false});
 
-      const updatedRadios: RadioButtonGroup = { radioButtons };
+      const updatedRadios: RadioButtonGroup = {radioButtons};
       this.radioButtonGroup = updatedRadios;
-      this.store.dispatch(new SetProcessProductFilters({ radioButtonGroup: updatedRadios, archiveFilters: this.acrhiveFilter }));
+      this.store.dispatch(new SetProcessProductFilters({radioButtonGroup: updatedRadios, archiveFilters: this.acrhiveFilter}));
     }
   }
 
@@ -395,10 +372,10 @@ export class ProductResultsComponent implements OnInit, OnDestroy, AfterViewInit
       this.radioButtonGroup.radioButtons && this.radioButtonGroup.radioButtons.find(t => t.selected)
         ? this.radioButtonGroup.radioButtons.find(t => t.selected).key
         : undefined;
-    const search = { ...currentSearch, type: type };
+    const search = {...currentSearch, type: type};
     if (!this.searchFired) {
       this.searchFired = true;
-      this.ds = new SearchDataSource(this.id, this.productService, search, this.store, [], false, true);
+      this.initiateDataSource(search, [], false, true);
       this.loading = false;
       this.searchFired = false;
     }

apps/sales/src/app/modules/product/product.module.ts

@@ -6,7 +6,7 @@ import { CommonModule } from '@angular/common';
 import { ProductCardComponent } from './components/product-card/product-card.component';
 import { ScrollingModule } from '@angular/cdk/scrolling';
 import { ScrollingModule as ExperimentalScrollingModule } from '@angular/cdk-experimental/scrolling';
-// import { ScrollingModule as ExperimentalScrollingModule } from '@angular/cdk-experimental/scrolling';
+import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
 import { LoadingModule, PhotoGalleryModule, CardModule, SearchInputModule, DeleteDropdownModule } from '@libs/ui';
 import { SharedModule } from './../../shared/shared.module';
 import { ModalModule, ButtonModule, InputModule, DropdownModule, IconModule } from '@libs/ui';
@@ -45,6 +45,7 @@ import { SmallDoubleChoiceSwitchModule } from '@libs/ui/lib/small-double-choice-
     CommonModule,
     ScrollingModule,
     ExperimentalScrollingModule,
+    PerfectScrollbarModule,
     LoadingModule,
     ModalModule,
     ButtonModule,

apps/sales/src/app/modules/remission/pages/remission-list-create/remission-list-create.component.html

@@ -1,7 +1,8 @@
 <div
   #remissionListContainer
   id="remission-list-container"
-  class="remission-list-container scrollbar-visible"
+  class="remission-list-container"
+  [perfectScrollbar]="{minScrollbarLength: 20}"
   (scroll)="onScroll()"
 >
   <div class="headers" *ngIf="resourceTypeSwitch">

apps/sales/src/app/modules/remission/pages/remission-list-create/remission-list-create.component.scss

@@ -1,4 +1,5 @@
 .remission-list-container {
+  position: relative;
   height: calc(100% - 30px);
   overflow-y: auto;
   overflow-x: hidden;

apps/sales/src/app/modules/remission/pages/remission-list-started/remission-list-started.component.html

@@ -25,6 +25,7 @@
   id="remission-list-container"
   #remissionListContainer
   class="remission-list-container"
+  [perfectScrollbar]="{minScrollbarLength: 20}"
   (scroll)="scrollHandler($event)"
   *ngIf="!shippingDocumentCreationPage && loaded"
 >
@@ -127,7 +128,7 @@
       [fetchLastProducts$]="fetchLastProducts$"
       [hits]="remissionListHits"
       started="true"
-      (fullListLoaded)="fullListLoaded(true)"
+      (fullListLoaded)="fullListLoaded()"
       #remissionList
     ></app-remission-list>
   </div>

apps/sales/src/app/modules/remission/pages/remission-list-started/remission-list-started.component.scss

@@ -1,4 +1,5 @@
 .remission-list-container {
+  position: relative;
   height: calc(100% - 20px);
   overflow: scroll;
   padding-bottom: 10px;

apps/sales/src/app/modules/remission/remission-client.module.ts

@@ -67,6 +67,7 @@ import { RemissionsOverviewCardContentComponent } from './components/remissions-
 import { RemissionDetailsComponent } from './pages/remission-details/remission-details.component';
 import { RemissionDetailsProductComponent } from './components/remission-details-product/remission-details-product.component';
 import { RemissionDetailsPrimaryCtaComponent } from './components/remission-details-primary-cta/remission-details-primary-cta.component';
+import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
 
 @NgModule({
   declarations: [
@@ -109,6 +110,7 @@ import { RemissionDetailsPrimaryCtaComponent } from './components/remission-deta
     RemissionClientRoutingModule,
     DoubleChoiceSwitchModule,
     ProgressBarModule,
+    PerfectScrollbarModule,
     SmallDoubleChoiceSwitchModule,
     IconModule,
     ButtonModule,

apps/sales/src/app/modules/shelf/pages/shelf-search-results/shelf-search-results.component.html

@@ -1,6 +1,7 @@
 <div class="result-container">
   <ng-container>
-    <cdk-virtual-scroll-viewport itemSize="180" class="scrollbar-visible" #scroller>
+    <cdk-virtual-scroll-viewport itemSize="300" #scroller
+      [perfectScrollbar]="{minScrollbarLength: 20}">
       <div *cdkVirtualFor="let order of ds; let last = last; let index = index">
         <app-shelf-customer-order
           *ngIf="order != null; else loadingComponent"

apps/sales/src/app/modules/shelf/shelf.module.ts

@@ -27,6 +27,7 @@ import { OrderLoadingComponent } from './components/order-loading/order-loading.
 import { ShelfEditOrderComponent } from './pages/shelf-edit-order/shelf-edit-order.component';
 import { OrderItemEditComponent } from './components/order-item-edit/order-item-edit.component';
 import { OrderOverviewEditComponent } from './components/order-overview-edit/order-overview-edit.component';
+import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
 
 @NgModule({
   declarations: [
@@ -56,6 +57,7 @@ import { OrderOverviewEditComponent } from './components/order-overview-edit/ord
     CollectingShelfScannerModule,
     SharedModule,
     ScrollingModule,
+    PerfectScrollbarModule,
     CardModule,
     DropdownModule,
     SearchInputModule,

apps/sales/src/styles.scss

@@ -1,10 +1,9 @@
-:not(.scrollbar-visible)::-webkit-scrollbar {
+@import '~perfect-scrollbar/css/perfect-scrollbar.css';
+
+::-webkit-scrollbar {
   width: 0; // remove scrollbar space
   background: transparent; // optional: just make scrollbar invisible */
 }
-.scrollbar-visible {
-  -webkit-overflow-scrolling: touch;
-}
 
 body {
   font-family: 'Open Sans';

libs/swagger/src/lib/api/models/availability-dto.ts

@@ -5,16 +5,16 @@
  */
 export interface AvailabilityDTO {
 
+  /**
+   * Stock Status Code / Beschreibung
+   */
+  sscText?: string;
+
   /**
    * Produkt / Artikel PK
    */
   itemId?: number;
 
-  /**
-   * Shop
-   */
-  shop?: any;
-
   /**
    * Preis (VK)
    */
@@ -31,9 +31,9 @@ export interface AvailabilityDTO {
   ssc?: string;
 
   /**
-   * Stock Status Code / Beschreibung
+   * Shop
    */
-  sscText?: string;
+  shop?: any;
 
   /**
    * Verfügbare Menge

libs/swagger/src/lib/api/models/item-dto.ts

@@ -10,16 +10,16 @@ import { KeyValueDTOOfStringAndString } from './key-value-dtoof-string-and-strin
 import { ReviewDTO } from './review-dto';
 export interface ItemDTO extends EntityDTO {
 
+  /**
+   * Verfügbarkeit laut Katalog
+   */
+  catalogAvailability?: any;
+
   /**
    * Rang
    */
   scoring?: number;
 
-  /**
-   * Weitere Artikel-IDs
-   */
-  ids?: {[key: string]: number};
-
   /**
    * Artikel / Produkttyp
    */
@@ -56,9 +56,9 @@ export interface ItemDTO extends EntityDTO {
   images?: Array<ImageDTO>;
 
   /**
-   * Verfügbarkeit laut Katalog
+   * Weitere Artikel-IDs
    */
-  catalogAvailability?: any;
+  ids?: {[key: string]: number};
 
   /**
    * Verfügbarkeit zur Bestellung in die Filiale

libs/swagger/src/lib/api/models/query-token-dto.ts

@@ -6,16 +6,16 @@ import { OrderByDTO } from './order-by-dto';
  */
 export interface QueryTokenDTO {
 
+  /**
+   * Katalogbereich
+   */
+  catalogType?: any;
+
   /**
    * Lager PK
    */
   stockId?: number;
 
-  /**
-   * Bezeichner
-   */
-  friendlyName?: string;
-
   /**
    * Eingabewerte z.B. ("qs", "heller süden")
    */
@@ -32,9 +32,9 @@ export interface QueryTokenDTO {
   fuzzy?: number;
 
   /**
-   * Katalogbereich
+   * Bezeichner
    */
-  catalogType?: any;
+  friendlyName?: string;
 
   /**
    * Filter

libs/swagger/src/lib/availability/models/availability-dto.ts

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

libs/swagger/src/lib/availability/models/availability-request-dto.ts

@@ -1,14 +1,14 @@
 /* tslint:disable */
 import { PriceDTO } from './price-dto';
 export interface AvailabilityRequestDTO {
+  price?: PriceDTO;
   itemId?: string;
-  supplierProductNumber?: string;
   ean?: string;
   qty: number;
   orderCode?: string;
   supplier?: string;
   preBook?: boolean;
-  price?: PriceDTO;
+  supplierProductNumber?: string;
   ssc?: string;
   estimatedShipping?: string;
   shopId?: number;

libs/swagger/src/lib/checkout/checkout-configuration.ts

@@ -8,5 +8,5 @@ import { Injectable } from '@angular/core';
   providedIn: 'root',
 })
 export class CheckoutConfiguration {
-  rootUrl: string = 'https://isa-integration.kubernetes.paragon-systems.de';
+  rootUrl: string = 'https://isa.paragon-data.de/checkout/v3';
 }

libs/swagger/src/lib/checkout/models/address-dto.ts

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

libs/swagger/src/lib/checkout/models/address.ts

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

libs/swagger/src/lib/checkout/models/availability-dto.ts

@@ -4,14 +4,14 @@ import { PriceDTO } from './price-dto';
 import { EntityDTOContainerOfShopItemDTO } from './entity-dtocontainer-of-shop-item-dto';
 import { EntityDTOContainerOfSupplierDTO } from './entity-dtocontainer-of-supplier-dto';
 export interface AvailabilityDTO {
+  supplierSSCText?: string;
   availabilityType: AvailabilityType;
-  inStock?: number;
   ssc?: string;
   sscText?: string;
   supplierInfo?: string;
   isPrebooked?: boolean;
   supplierSSC?: string;
-  supplierSSCText?: string;
+  inStock?: number;
   price?: PriceDTO;
   estimatedShippingDate?: string;
   shopItem?: EntityDTOContainerOfShopItemDTO;

libs/swagger/src/lib/checkout/models/branch-dto.ts

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

libs/swagger/src/lib/checkout/models/buyer-dto.ts

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

libs/swagger/src/lib/checkout/models/checkout-dto.ts

@@ -1,24 +1,24 @@
 /* tslint:disable */
 import { EntityDTOOfCheckoutDTOAndICheckout } from './entity-dtoof-checkout-dtoand-icheckout';
-import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto';
+import { EntityDTOContainerOfCheckoutItemDTO } from './entity-dtocontainer-of-checkout-item-dto';
 import { UserAccountDTO } from './user-account-dto';
 import { BuyerDTO } from './buyer-dto';
 import { PayerDTO } from './payer-dto';
 import { EntityDTOContainerOfDestinationDTO } from './entity-dtocontainer-of-destination-dto';
 import { EntityDTOContainerOfCheckoutDeliveryDTO } from './entity-dtocontainer-of-checkout-delivery-dto';
-import { EntityDTOContainerOfCheckoutItemDTO } from './entity-dtocontainer-of-checkout-item-dto';
+import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto';
 import { NotificationChannel } from './notification-channel';
 import { SelectionDTOOfShippingTarget } from './selection-dtoof-shipping-target';
 import { PaymentDTO } from './payment-dto';
 export interface CheckoutDTO extends EntityDTOOfCheckoutDTOAndICheckout {
+  items?: Array<EntityDTOContainerOfCheckoutItemDTO>;
   label?: string;
-  orderBranch?: EntityDTOContainerOfBranchDTO;
   userAccount?: UserAccountDTO;
   buyer?: BuyerDTO;
   payer?: PayerDTO;
   destinations?: Array<EntityDTOContainerOfDestinationDTO>;
   deliveries?: Array<EntityDTOContainerOfCheckoutDeliveryDTO>;
-  items?: Array<EntityDTOContainerOfCheckoutItemDTO>;
+  orderBranch?: EntityDTOContainerOfBranchDTO;
   notificationChannels: NotificationChannel;
   availableShippingTargets?: Array<SelectionDTOOfShippingTarget>;
   payment?: PaymentDTO;

libs/swagger/src/lib/checkout/models/company-dto.ts

@@ -3,12 +3,12 @@ import { EntityDTOOfCompanyDTOAndICompany } from './entity-dtoof-company-dtoand-
 import { EntityDTOContainerOfCompanyDTO } from './entity-dtocontainer-of-company-dto';
 import { AddressDTO } from './address-dto';
 export interface CompanyDTO extends EntityDTOOfCompanyDTOAndICompany {
+  department?: string;
   parent?: EntityDTOContainerOfCompanyDTO;
-  locale?: string;
   name?: string;
   nameSuffix?: string;
   legalForm?: string;
-  department?: string;
+  locale?: string;
   costUnit?: string;
   vatId?: string;
   address?: AddressDTO;

libs/swagger/src/lib/checkout/models/component-item-dto.ts

@@ -4,12 +4,12 @@ import { EntityDTOContainerOfCategoryDTO } from './entity-dtocontainer-of-catego
 import { QuantityUnitType } from './quantity-unit-type';
 import { ComponentItemDisplayType } from './component-item-display-type';
 export interface ComponentItemDTO {
+  quantityMax?: number;
   name?: string;
-  description?: string;
   item?: EntityDTOContainerOfItemDTO;
   category?: EntityDTOContainerOfCategoryDTO;
   required?: boolean;
-  quantityMax?: number;
+  description?: string;
   quantityUnitType: QuantityUnitType;
   unit?: string;
   displayType: ComponentItemDisplayType;

libs/swagger/src/lib/checkout/models/file-dto.ts

@@ -1,12 +1,12 @@
 /* tslint:disable */
 import { EntityDTOOfFileDTOAndIFile } from './entity-dtoof-file-dtoand-ifile';
 export interface FileDTO extends EntityDTOOfFileDTOAndIFile {
+  size?: number;
   name?: string;
-  type?: string;
   path?: string;
   mime?: string;
   hash?: string;
-  size?: number;
+  type?: string;
   subtitle?: string;
   copyright?: string;
   locale?: string;

libs/swagger/src/lib/checkout/models/item-dto.ts

@@ -1,11 +1,11 @@
 /* tslint:disable */
 import { EntityDTOOfItemDTOAndIItem } from './entity-dtoof-item-dtoand-iitem';
+import { WeightOfAvoirdupois } from './weight-of-avoirdupois';
 import { EntityDTOContainerOfItemDTO } from './entity-dtocontainer-of-item-dto';
 import { ContributorHelperDTO } from './contributor-helper-dto';
 import { EntityDTOContainerOfCompanyDTO } from './entity-dtocontainer-of-company-dto';
 import { EntityDTOContainerOfCategoryDTO } from './entity-dtocontainer-of-category-dto';
 import { SizeOfString } from './size-of-string';
-import { WeightOfAvoirdupois } from './weight-of-avoirdupois';
 import { ItemType } from './item-type';
 import { EntityDTOContainerOfFileDTO } from './entity-dtocontainer-of-file-dto';
 import { EntityDTOContainerOfTextDTO } from './entity-dtocontainer-of-text-dto';
@@ -14,8 +14,8 @@ import { ItemLabelDTO } from './item-label-dto';
 import { FoodDTO } from './food-dto';
 import { EntityDTOContainerOfTenantDTO } from './entity-dtocontainer-of-tenant-dto';
 export interface ItemDTO extends EntityDTOOfItemDTOAndIItem {
+  weight?: WeightOfAvoirdupois;
   itemNumber?: string;
-  name?: string;
   subtitle?: string;
   description?: string;
   ean?: string;
@@ -28,7 +28,7 @@ export interface ItemDTO extends EntityDTOOfItemDTOAndIItem {
   categories?: Array<EntityDTOContainerOfCategoryDTO>;
   manufacturingCosts?: number;
   size?: SizeOfString;
-  weight?: WeightOfAvoirdupois;
+  name?: string;
   netWeight?: WeightOfAvoirdupois;
   weightOfPackaging?: WeightOfAvoirdupois;
   itemType: ItemType;

libs/swagger/src/lib/checkout/models/payer-dto.ts

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

libs/swagger/src/lib/checkout/models/product-dto.ts

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

libs/swagger/src/lib/checkout/models/shop-dto.ts

@@ -9,15 +9,15 @@ import { ShippingTarget } from './shipping-target';
 import { CountryTargetDTO } from './country-target-dto';
 import { BranchTargetDTO } from './branch-target-dto';
 export interface ShopDTO extends EntityDTOOfShopDTOAndIShop {
+  orderingEnabledStart?: string;
   name?: string;
-  description?: string;
   branch?: EntityDTOContainerOfBranchDTO;
   defaultLocale?: string;
   defaultTargetBranch?: EntityDTOContainerOfBranchDTO;
   defaultLogistician?: EntityDTOContainerOfLogisticianDTO;
   defaultCurrency?: EntityDTOContainerOfCurrencyDTO;
   defaultCountry?: EntityDTOContainerOfCountryDTO;
-  orderingEnabledStart?: string;
+  description?: string;
   orderingEnabledStop?: string;
   shippingEnabledStart?: string;
   shippingEnabledStop?: string;

libs/swagger/src/lib/checkout/models/shopping-cart-item-dto.ts

@@ -12,8 +12,8 @@ import { EntityDTOContainerOfShopDTO } from './entity-dtocontainer-of-shop-dto';
 import { EntityDTOContainerOfDestinationDTO } from './entity-dtocontainer-of-destination-dto';
 import { PromotionDTO } from './promotion-dto';
 export interface ShoppingCartItemDTO extends EntityDTOOfShoppingCartItemDTOAndIShoppingCartItem {
+  specialComment?: string;
   quantity?: number;
-  ssc?: string;
   sscText?: string;
   shopItem?: EntityDTOContainerOfShopItemDTO;
   product?: ProductDTO;
@@ -22,7 +22,7 @@ export interface ShoppingCartItemDTO extends EntityDTOOfShoppingCartItemDTOAndIS
   availability?: AvailabilityDTO;
   agentComment?: string;
   buyerComment?: string;
-  specialComment?: string;
+  ssc?: string;
   lastAvailabilityRequest?: string;
   shoppingCartItemStatus: ShoppingCartItemStatus;
   total?: PriceDTO;

libs/swagger/src/lib/checkout/models/user-account-dto.ts

@@ -1,12 +1,12 @@
 /* tslint:disable */
 import { Gender } from './gender';
 export interface UserAccountDTO {
+  title?: string;
   isTemporaryAccount?: boolean;
-  userName?: string;
   alias?: string;
   password?: string;
   gender?: Gender;
-  title?: string;
+  userName?: string;
   firstName?: string;
   lastName?: string;
   dateOfBirth?: string;

libs/swagger/src/lib/crm/models/address-dto.ts

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

libs/swagger/src/lib/crm/models/bonus-card-info-dto.ts

@@ -5,16 +5,16 @@
  */
 export interface BonusCardInfoDTO {
 
+  /**
+   * Geburtsdatum
+   */
+  dateOfBirth?: string;
+
   /**
    * Kartennummer
    */
   code?: string;
 
-  /**
-   * Format (Karte, App, ...)
-   */
-  format?: string;
-
   /**
    * Anrede
    */
@@ -41,9 +41,9 @@ export interface BonusCardInfoDTO {
   address?: any;
 
   /**
-   * Geburtsdatum
+   * Format (Karte, App, ...)
    */
-  dateOfBirth?: string;
+  format?: string;
 
   /**
    * E-Mail Adresse

libs/swagger/src/lib/crm/models/customer-dto.ts

@@ -1,6 +1,5 @@
 /* tslint:disable */
 import { EntityDTOOfCustomerDTOAndICustomer } from './entity-dtoof-customer-dtoand-icustomer';
-import { EnvironmentChannel } from './environment-channel';
 import { EntityDTOContainerOfUserDTO } from './entity-dtocontainer-of-user-dto';
 import { EntityDTOContainerOfBranchDTO } from './entity-dtocontainer-of-branch-dto';
 import { CustomerType } from './customer-type';
@@ -10,6 +9,7 @@ import { Gender } from './gender';
 import { CommunicationDetailsDTO } from './communication-details-dto';
 import { AddressDTO } from './address-dto';
 import { EntityDTOContainerOfShippingAddressDTO } from './entity-dtocontainer-of-shipping-address-dto';
+import { EnvironmentChannel } from './environment-channel';
 import { EntityDTOContainerOfLabelDTO } from './entity-dtocontainer-of-label-dto';
 import { EntityDTOContainerOfBonusCardDTO } from './entity-dtocontainer-of-bonus-card-dto';
 import { NotificationChannel } from './notification-channel';
@@ -18,8 +18,8 @@ import { AssignedPayerDTO } from './assigned-payer-dto';
 import { EntityDTOContainerOfAttributeDTO } from './entity-dtocontainer-of-attribute-dto';
 import { KeyValueDTOOfStringAndString } from './key-value-dtoof-string-and-string';
 export interface CustomerDTO extends EntityDTOOfCustomerDTOAndICustomer {
+  agentComment?: string;
   customerGroup?: string;
-  clientChannel?: EnvironmentChannel;
   user?: EntityDTOContainerOfUserDTO;
   createdInBranch?: EntityDTOContainerOfBranchDTO;
   customerNumber?: string;
@@ -34,7 +34,7 @@ export interface CustomerDTO extends EntityDTOOfCustomerDTOAndICustomer {
   communicationDetails?: CommunicationDetailsDTO;
   address?: AddressDTO;
   shippingAddresses?: Array<EntityDTOContainerOfShippingAddressDTO>;
-  agentComment?: string;
+  clientChannel?: EnvironmentChannel;
   statusChangeComment?: string;
   deactivationComment?: string;
   statusComment?: string;

libs/swagger/src/lib/crm/models/customer-info-dto.ts

@@ -12,8 +12,8 @@ import { EntityDTOContainerOfBonusCardDTO } from './entity-dtocontainer-of-bonus
 import { NotificationChannel } from './notification-channel';
 import { KeyValueDTOOfStringAndString } from './key-value-dtoof-string-and-string';
 export interface CustomerInfoDTO extends EntityDTOOfCustomerInfoDTOAndICustomer {
+  dateOfBirth?: string;
   customerGroup?: string;
-  userName?: string;
   createdInBranch?: EntityDTOContainerOfBranchDTO;
   customerNumber?: string;
   customerType?: CustomerType;
@@ -23,7 +23,7 @@ export interface CustomerInfoDTO extends EntityDTOOfCustomerInfoDTOAndICustomer
   title?: string;
   firstName?: string;
   lastName?: string;
-  dateOfBirth?: string;
+  userName?: string;
   communicationDetails?: CommunicationDetailsDTO;
   address?: AddressDTO;
   agentComment?: string;

libs/swagger/src/lib/crm/models/opt-in-dto.ts

@@ -4,14 +4,14 @@ import { EntityDTOContainerOfCustomerDTO } from './entity-dtocontainer-of-custom
 import { EntityDTOContainerOfTenantDTO } from './entity-dtocontainer-of-tenant-dto';
 import { EntityDTOContainerOfLabelDTO } from './entity-dtocontainer-of-label-dto';
 export interface OptInDTO extends EntityDTOOfOptInDTOAndIOptIn {
+  allowRequested?: string;
   email?: string;
-  user?: string;
   customer?: EntityDTOContainerOfCustomerDTO;
   category?: string;
   key?: string;
   sourceSystem?: string;
   sourceIP?: string;
-  allowRequested?: string;
+  user?: string;
   allowRequestToken?: string;
   allow?: string;
   denyRequested?: string;

libs/swagger/src/lib/crm/models/payer-dto.ts

@@ -1,16 +1,16 @@
 /* tslint:disable */
 import { EntityDTOOfPayerDTOAndIPayer } from './entity-dtoof-payer-dtoand-ipayer';
+import { AddressDTO } from './address-dto';
 import { EntityDTOContainerOfLabelDTO } from './entity-dtocontainer-of-label-dto';
 import { CustomerType } from './customer-type';
 import { PayerStatus } from './payer-status';
 import { Gender } from './gender';
 import { OrganisationDTO } from './organisation-dto';
-import { AddressDTO } from './address-dto';
 import { CommunicationDetailsDTO } from './communication-details-dto';
 import { PaymentSettingsDTO } from './payment-settings-dto';
 export interface PayerDTO extends EntityDTOOfPayerDTOAndIPayer {
+  address?: AddressDTO;
   label?: EntityDTOContainerOfLabelDTO;
-  payerGroup?: string;
   payerNumber?: string;
   payerType?: CustomerType;
   payerStatus?: PayerStatus;
@@ -19,7 +19,7 @@ export interface PayerDTO extends EntityDTOOfPayerDTOAndIPayer {
   firstName?: string;
   lastName?: string;
   organisation?: OrganisationDTO;
-  address?: AddressDTO;
+  payerGroup?: string;
   communicationDetails?: CommunicationDetailsDTO;
   agentComment?: string;
   statusChangeComment?: string;

libs/swagger/src/lib/crm/models/shipping-address-dto.ts

@@ -1,18 +1,18 @@
 /* tslint:disable */
 import { EntityDTOOfShippingAddressDTOAndIShippingAddress } from './entity-dtoof-shipping-address-dtoand-ishipping-address';
+import { AddressDTO } from './address-dto';
 import { Gender } from './gender';
 import { OrganisationDTO } from './organisation-dto';
 import { CommunicationDetailsDTO } from './communication-details-dto';
-import { AddressDTO } from './address-dto';
 import { ShippingAddressType } from './shipping-address-type';
 export interface ShippingAddressDTO extends EntityDTOOfShippingAddressDTOAndIShippingAddress {
+  address?: AddressDTO;
   gender?: Gender;
-  title?: string;
   firstName?: string;
   lastName?: string;
   organisation?: OrganisationDTO;
   communicationDetails?: CommunicationDetailsDTO;
-  address?: AddressDTO;
+  title?: string;
   agentComment?: string;
   type: ShippingAddressType;
   isDefault?: string;

libs/swagger/src/lib/isa/models/address-dto.ts

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -5,8 +5,8 @@ import { ProductDTO } from './product-dto';
 import { Gender } from './gender';
 import { KeyValueDTOOfOrderItemProcessingStatusValueAndString } from './key-value-dtoof-order-item-processing-status-value-and-string';
 export interface OrderItemListItemDTO {
+  currency?: string;
   orderId?: number;
-  orderItemId?: number;
   orderItemSubsetId?: number;
   orderPId?: string;
   orderItemPId?: string;
@@ -23,7 +23,7 @@ export interface OrderItemListItemDTO {
   quantity?: number;
   overallQuantity?: number;
   price?: number;
-  currency?: string;
+  orderItemId?: number;
   buyerNumber?: string;
   organisation?: string;
   gender?: Gender;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

libs/swagger/src/lib/print/models/item-dto.ts

@@ -1,24 +1,24 @@
 /* tslint:disable */
 import { EntityDTO } from './entity-dto';
+import { AvailabilityDTO } from './availability-dto';
 import { ItemType } from './item-type';
 import { ProductDTO } from './product-dto';
 import { SpecDTO } from './spec-dto';
 import { TextDTO } from './text-dto';
 import { ImageDTO } from './image-dto';
-import { AvailabilityDTO } from './availability-dto';
 import { StockInfoDTO } from './stock-info-dto';
 import { ShelfInfoDTO } from './shelf-info-dto';
 import { ReviewDTO } from './review-dto';
 export interface ItemDTO extends EntityDTO {
+  catalogAvailability?: AvailabilityDTO;
   scoring?: number;
-  ids?: {[key: string]: number};
   type?: ItemType;
   labels?: {[key: string]: string};
   product?: ProductDTO;
   specs?: Array<SpecDTO>;
   texts?: Array<TextDTO>;
   images?: Array<ImageDTO>;
-  catalogAvailability?: AvailabilityDTO;
+  ids?: {[key: string]: number};
   storeAvailabilities?: Array<AvailabilityDTO>;
   shippingAvailabilities?: Array<AvailabilityDTO>;
   stockInfos?: Array<StockInfoDTO>;

libs/swagger/src/lib/print/models/product-dto.ts

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

package-lock.json

@@ -4473,8 +4473,7 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4492,13 +4491,11 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4511,18 +4508,15 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4625,8 +4619,7 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4636,7 +4629,6 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4649,20 +4641,17 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -4679,7 +4668,6 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4752,8 +4740,7 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4763,7 +4750,6 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4839,8 +4825,7 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4870,7 +4855,6 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4888,7 +4872,6 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -4927,13 +4910,11 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         }
       }
     },
@@ -7548,6 +7529,15 @@
         "opencollective-postinstall": "^2.0.2"
       }
     },
+    "ngx-perfect-scrollbar": {
+      "version": "7.2.1",
+      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/ngx-perfect-scrollbar/-/ngx-perfect-scrollbar-7.2.1.tgz",
+      "integrity": "sha1-csu7prx1tINvoDAHYNLWntQdJBw=",
+      "requires": {
+        "perfect-scrollbar": "^1.4.0",
+        "resize-observer-polyfill": "^1.5.0"
+      }
+    },
     "ngx-toggle-switch": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/ngx-toggle-switch/-/ngx-toggle-switch-2.0.5.tgz",
@@ -8407,6 +8397,11 @@
         "sha.js": "^2.4.8"
       }
     },
+    "perfect-scrollbar": {
+      "version": "1.5.0",
+      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/perfect-scrollbar/-/perfect-scrollbar-1.5.0.tgz",
+      "integrity": "sha1-gh0iTtj/YZkMI/JttjBIzcdba4M="
+    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -9206,6 +9201,11 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
       "dev": true
     },
+    "resize-observer-polyfill": {
+      "version": "1.5.1",
+      "resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+      "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
+    },
     "resolve": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",

package.json

@@ -52,6 +52,7 @@
     "ng-circle-progress": "^1.4.0",
     "ng-connection-service": "^1.0.4",
     "ngx-infinite-scroll": "^7.2.0",
+    "ngx-perfect-scrollbar": "^7.2.1",
     "ngx-toggle-switch": "^2.0.5",
     "node-sass": "^4.12.0",
     "rxjs": "~6.4.0",