Merge branch 'development' of https://bitbucket.org/umwerk/instore-ma-app into development

src/app/app-routing.module.ts

@@ -27,11 +27,13 @@ const routes: Routes = [
   { path: 'article-scan', component: BarcodeSearchComponent },
   { path: 'debug', loadChildren: './modules/debug/debug.module#DebugModule' },
   { path: 'cart', component: CartReviewComponent },
-  { path: 'cart-confirmation', component: CartConfirmationComponent },
+  { path: 'cart-confirmation', component: CartConfirmationComponent }
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes)],
+  imports: [
+    RouterModule.forRoot(routes, { scrollPositionRestoration: 'enabled' })
+  ],
   exports: [RouterModule]
 })
 export class AppRoutingModule {}

src/app/core/store/state/filter.state.ts

@@ -91,7 +91,7 @@ export class FilterState {
         'Lesealter',
         'Sprache',
         'Bestand',
-        'Kategorien'
+        'Archiv'
       ];
       const missingfilters = mock.map((f, i) => ({
         expanded: false,

src/app/modules/article-search/components/text-search/text-search.component.ts

@@ -62,7 +62,7 @@ export class TextSearchComponent implements OnInit, AfterViewInit {
   autocompleteResults: Observable<string>;
   processes: Process[];
   error = '';
-
+  autoCompleteEnabled = false;
   @Input()
   searchParams = '';
 
@@ -210,7 +210,7 @@ export class TextSearchComponent implements OnInit, AfterViewInit {
   }
 
   autocomplete(search: string) {
-    if (search.length > 0) {
+    if (search.length > 0 && this.autoCompleteEnabled) {
       if (this.timer) {
         clearTimeout(this.timer);
       }

src/app/modules/customer-search/components/search-customer-result/search-customer-result.component.html

@@ -1,5 +1,5 @@
 <div class="customer-search-result-container">
-  <app-loading *ngIf="users.length == 0" loading="true"></app-loading>
+  <app-loading *ngIf="users?.length == 0" loading="true"></app-loading>
   <div class="user" *ngFor="let user of users">
     <div class="user-info-container">
       <div class="user-info">

src/app/modules/customer-search/components/search-customer-result/search-customer-result.component.scss

@@ -7,6 +7,8 @@
   flex-direction: column;
   justify-content: flex-start;
   align-items: center;
+  height: calc(100% - 55px);
+  overflow: scroll;
 
   .user {
     background-color: #ffffff;