From f0ef00c37af0ddda9c2c5ad345f8bb474b5bd84f Mon Sep 17 00:00:00 2001
From: Silke <s.grueber@intershop.de>
Date: Thu, 28 May 2020 15:38:42 +0200
Subject: [PATCH] bug fixing after order templates review

---
 ...order-templates-management.b2b.e2e-spec.ts |  2 +-
 .../order-templates-shopping.b2b.e2e-spec.ts  |  7 +-
 .../order-templates/exports/.gitignore        |  1 +
 ...asket-create-order-template.component.html |  8 ---
 ...-basket-create-order-template.component.ts | 60 -----------------
 ...oduct-add-to-order-template.component.html |  8 ---
 ...product-add-to-order-template.component.ts | 64 -------------------
 .../order-template/order-template.mapper.ts   |  7 +-
 .../order-templates/order-templates.module.ts |  1 -
 ...r-template-detail-line-item.component.html |  7 +-
 ...der-template-detail-line-item.component.ts |  2 +-
 ...-order-template-detail-page.component.html | 21 +++---
 ...nt-order-template-detail-page.component.ts | 24 +++++--
 ...account-order-template-list.component.html |  3 +-
 .../account-order-template-list.component.ts  |  4 +-
 .../order-template.service.spec.ts            | 13 ++++
 .../order-template/order-template.service.ts  | 10 ++-
 ...select-order-template-modal.component.html |  1 +
 .../select-order-template-modal.component.ts  |  2 +-
 .../store/order-templates-store.ts            |  2 -
 .../line-item-list.component.html             |  3 +-
 .../product-add-to-basket.component.html      |  5 +-
 .../product-add-to-basket.component.spec.ts   | 14 ++--
 .../product-add-to-basket.component.ts        |  6 +-
 src/app/shell/shell.module.ts                 |  1 -
 src/assets/i18n/de_DE.json                    | 12 ++--
 src/assets/i18n/en_US.json                    | 10 +--
 src/assets/i18n/fr_FR.json                    |  8 +--
 28 files changed, 94 insertions(+), 212 deletions(-)
 create mode 100644 src/app/extensions/order-templates/exports/.gitignore
 delete mode 100644 src/app/extensions/order-templates/exports/basket/lazy-basket-create-order-template/lazy-basket-create-order-template.component.html
 delete mode 100644 src/app/extensions/order-templates/exports/basket/lazy-basket-create-order-template/lazy-basket-create-order-template.component.ts
 delete mode 100644 src/app/extensions/order-templates/exports/product/lazy-product-add-to-order-template/lazy-product-add-to-order-template.component.html
 delete mode 100644 src/app/extensions/order-templates/exports/product/lazy-product-add-to-order-template/lazy-product-add-to-order-template.component.ts

diff --git a/e2e/cypress/integration/specs/extras/order-templates-management.b2b.e2e-spec.ts b/e2e/cypress/integration/specs/extras/order-templates-management.b2b.e2e-spec.ts
index b0b1542625..ed9d1bc7b6 100644
--- a/e2e/cypress/integration/specs/extras/order-templates-management.b2b.e2e-spec.ts
+++ b/e2e/cypress/integration/specs/extras/order-templates-management.b2b.e2e-spec.ts
@@ -107,7 +107,7 @@ describe('Order Template MyAccount Functionality', () => {
     at(OrderTemplatesDetailsPage, page => {
       page.moveProductToOrderTemplate(_.product1, anotherOrderTemplate);
       cy.wait(500);
-      page.OrderTemplateTitle.should('equal', anotherOrderTemplate);
+      page.OrderTemplateTitle.should('contain', anotherOrderTemplate);
       page.getOrderTemplateItemById(_.product1).should('exist');
       OrderTemplatesDetailsPage.navigateToOverviewPage();
     });
diff --git a/e2e/cypress/integration/specs/extras/order-templates-shopping.b2b.e2e-spec.ts b/e2e/cypress/integration/specs/extras/order-templates-shopping.b2b.e2e-spec.ts
index fa10374352..037ba0b254 100644
--- a/e2e/cypress/integration/specs/extras/order-templates-shopping.b2b.e2e-spec.ts
+++ b/e2e/cypress/integration/specs/extras/order-templates-shopping.b2b.e2e-spec.ts
@@ -69,11 +69,12 @@ describe('Order Template Shopping Experience Functionality', () => {
   it('user adds an order template from order template detail page to cart', () => {
     at(OrderTemplatesDetailsPage, page => {
       page.addOrderTemplateToBasket(_.product1, 4);
-      cy.wait(1500);
+      cy.wait(2000);
       page.header.miniCart.goToCart();
     });
     at(CartPage, page => {
       page.lineItems.contains(_.product1).should('exist');
+      page.lineItems.contains(_.product2).should('exist');
       page.lineItems
         .contains(_.product1)
         .closest('[data-testing-id="product-list-item"]')
@@ -113,7 +114,7 @@ describe('Order Template Shopping Experience Functionality', () => {
     });
     at(OrderTemplatesOverviewPage, page => {
       page.addOrderTemplateToCart(accountOrderTemplate);
-      cy.wait(1500);
+      cy.wait(2000);
       page.header.miniCart.text.should('contain', '11 items');
       page.header.miniCart.goToCart();
     });
@@ -129,7 +130,7 @@ describe('Order Template Shopping Experience Functionality', () => {
   it('user adds only the selected product in order template details', () => {
     at(CartPage, page => {
       page.lineItem(0).remove();
-      cy.wait(1500);
+      cy.wait(2000);
       page.addProductToOrderTemplate();
       page.addToOrderTemplate.addProductToOrderTemplateFromPage(accountOrderTemplate, true);
     });
diff --git a/src/app/extensions/order-templates/exports/.gitignore b/src/app/extensions/order-templates/exports/.gitignore
new file mode 100644
index 0000000000..25baf80175
--- /dev/null
+++ b/src/app/extensions/order-templates/exports/.gitignore
@@ -0,0 +1 @@
+*/**/*.*
diff --git a/src/app/extensions/order-templates/exports/basket/lazy-basket-create-order-template/lazy-basket-create-order-template.component.html b/src/app/extensions/order-templates/exports/basket/lazy-basket-create-order-template/lazy-basket-create-order-template.component.html
deleted file mode 100644
index ff9898d7c6..0000000000
--- a/src/app/extensions/order-templates/exports/basket/lazy-basket-create-order-template/lazy-basket-create-order-template.component.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-  WARNING!
-
-  this file was automatically generated and should be updated using:
-
-  ng g lazy-component extensions/order-templates/shared/basket/basket-create-order-template/basket-create-order-template.component.ts
--->
-<ng-template #anchor></ng-template>
diff --git a/src/app/extensions/order-templates/exports/basket/lazy-basket-create-order-template/lazy-basket-create-order-template.component.ts b/src/app/extensions/order-templates/exports/basket/lazy-basket-create-order-template/lazy-basket-create-order-template.component.ts
deleted file mode 100644
index e87a5515ab..0000000000
--- a/src/app/extensions/order-templates/exports/basket/lazy-basket-create-order-template/lazy-basket-create-order-template.component.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  ComponentFactoryResolver,
-  ComponentRef,
-  Input,
-  OnChanges,
-  OnInit,
-  ViewChild,
-  ViewContainerRef,
-} from '@angular/core';
-
-import { FeatureToggleService } from 'ish-core/feature-toggle.module';
-import { LineItemView } from 'ish-core/models/line-item/line-item.model';
-
-import { BasketCreateOrderTemplateComponent } from '../../../shared/basket/basket-create-order-template/basket-create-order-template.component';
-
-@Component({
-  selector: 'ish-lazy-basket-create-order-template',
-  templateUrl: './lazy-basket-create-order-template.component.html',
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-// tslint:disable-next-line:component-creation-test
-export class LazyBasketCreateOrderTemplateComponent implements OnInit, OnChanges {
-  /*
-   * WARNING!
-   *
-   * This file was automatically generated!
-   * It should be updated using:
-   *
-   * ng g lazy-component extensions/order-templates/shared/basket/basket-create-order-template/basket-create-order-template.component.ts
-   *
-   */
-
-  @ViewChild('anchor', { read: ViewContainerRef, static: true }) anchor: ViewContainerRef;
-  @Input() products: LineItemView[];
-  @Input() class?: string;
-
-  private component: ComponentRef<BasketCreateOrderTemplateComponent>;
-
-  constructor(
-    private componentFactoryResolver: ComponentFactoryResolver,
-    private featureToggleService: FeatureToggleService
-  ) {}
-
-  ngOnInit() {
-    if (this.featureToggleService.enabled('orderTemplates')) {
-      const factory = this.componentFactoryResolver.resolveComponentFactory(BasketCreateOrderTemplateComponent);
-      this.component = this.anchor.createComponent(factory);
-      this.ngOnChanges();
-    }
-  }
-
-  ngOnChanges() {
-    if (this.component) {
-      this.component.instance.products = this.products;
-      this.component.instance.class = this.class;
-    }
-  }
-}
diff --git a/src/app/extensions/order-templates/exports/product/lazy-product-add-to-order-template/lazy-product-add-to-order-template.component.html b/src/app/extensions/order-templates/exports/product/lazy-product-add-to-order-template/lazy-product-add-to-order-template.component.html
deleted file mode 100644
index a0f3da3671..0000000000
--- a/src/app/extensions/order-templates/exports/product/lazy-product-add-to-order-template/lazy-product-add-to-order-template.component.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--
-  WARNING!
-
-  this file was automatically generated and should be updated using:
-
-  ng g lazy-component extensions/order-templates/shared/product/product-add-to-order-template/product-add-to-order-template.component.ts
--->
-<ng-template #anchor></ng-template>
diff --git a/src/app/extensions/order-templates/exports/product/lazy-product-add-to-order-template/lazy-product-add-to-order-template.component.ts b/src/app/extensions/order-templates/exports/product/lazy-product-add-to-order-template/lazy-product-add-to-order-template.component.ts
deleted file mode 100644
index 0b67b4b691..0000000000
--- a/src/app/extensions/order-templates/exports/product/lazy-product-add-to-order-template/lazy-product-add-to-order-template.component.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  ComponentFactoryResolver,
-  ComponentRef,
-  Input,
-  OnChanges,
-  OnInit,
-  ViewChild,
-  ViewContainerRef,
-} from '@angular/core';
-
-import { FeatureToggleService } from 'ish-core/feature-toggle.module';
-import { Product } from 'ish-core/models/product/product.model';
-
-import { ProductAddToOrderTemplateComponent } from '../../../shared/product/product-add-to-order-template/product-add-to-order-template.component';
-
-@Component({
-  selector: 'ish-lazy-product-add-to-order-template',
-  templateUrl: './lazy-product-add-to-order-template.component.html',
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-// tslint:disable-next-line:component-creation-test
-export class LazyProductAddToOrderTemplateComponent implements OnInit, OnChanges {
-  /*
-   * WARNING!
-   *
-   * This file was automatically generated!
-   * It should be updated using:
-   *
-   * ng g lazy-component extensions/order-templates/shared/product/product-add-to-order-template/product-add-to-order-template.component.ts
-   *
-   */
-
-  @ViewChild('anchor', { read: ViewContainerRef, static: true }) anchor: ViewContainerRef;
-  @Input() product: Product;
-  @Input() quantity: number;
-  @Input() displayType?: 'icon' | 'link' | 'animated' = 'link';
-  @Input() class?: string;
-
-  private component: ComponentRef<ProductAddToOrderTemplateComponent>;
-
-  constructor(
-    private componentFactoryResolver: ComponentFactoryResolver,
-    private featureToggleService: FeatureToggleService
-  ) {}
-
-  ngOnInit() {
-    if (this.featureToggleService.enabled('orderTemplates')) {
-      const factory = this.componentFactoryResolver.resolveComponentFactory(ProductAddToOrderTemplateComponent);
-      this.component = this.anchor.createComponent(factory);
-      this.ngOnChanges();
-    }
-  }
-
-  ngOnChanges() {
-    if (this.component) {
-      this.component.instance.product = this.product;
-      this.component.instance.quantity = this.quantity;
-      this.component.instance.displayType = this.displayType;
-      this.component.instance.class = this.class;
-    }
-  }
-}
diff --git a/src/app/extensions/order-templates/models/order-template/order-template.mapper.ts b/src/app/extensions/order-templates/models/order-template/order-template.mapper.ts
index e9071ab957..b910341b21 100644
--- a/src/app/extensions/order-templates/models/order-template/order-template.mapper.ts
+++ b/src/app/extensions/order-templates/models/order-template/order-template.mapper.ts
@@ -5,7 +5,7 @@ import { OrderTemplate, OrderTemplateItem } from './order-template.model';
 
 @Injectable({ providedIn: 'root' })
 export class OrderTemplateMapper {
-  private static parseIDfromURI(uri: string): string {
+  private static parseIdFromURI(uri: string): string {
     const match = /wishlists[^\/]*\/([^\?]*)/.exec(uri);
     if (match) {
       return match[1];
@@ -32,13 +32,14 @@ export class OrderTemplateMapper {
             creationDate: Number(item.creationDate),
             desiredQuantity: {
               value: item.desiredQuantity.value,
-              // TBD: is the unit necessarry?
+              // TBD: is the unit necessary?
               // unit: item.desiredQuantity.unit,
             },
           }));
       } else {
         items = [];
       }
+
       return {
         id: orderTemplateId,
         title: orderTemplateData.title,
@@ -65,7 +66,7 @@ export class OrderTemplateMapper {
   fromDataToIds(orderTemplateData: OrderTemplateData): OrderTemplate {
     if (orderTemplateData) {
       return {
-        id: OrderTemplateMapper.parseIDfromURI(orderTemplateData.uri),
+        id: OrderTemplateMapper.parseIdFromURI(orderTemplateData.uri),
         title: orderTemplateData.title,
       };
     }
diff --git a/src/app/extensions/order-templates/order-templates.module.ts b/src/app/extensions/order-templates/order-templates.module.ts
index 602be4745a..2055129748 100644
--- a/src/app/extensions/order-templates/order-templates.module.ts
+++ b/src/app/extensions/order-templates/order-templates.module.ts
@@ -16,6 +16,5 @@ import { ProductAddToOrderTemplateComponent } from './shared/product/product-add
     SelectOrderTemplateModalComponent,
   ],
   exports: [OrderTemplatePreferencesDialogComponent, SelectOrderTemplateModalComponent],
-  entryComponents: [BasketCreateOrderTemplateComponent, ProductAddToOrderTemplateComponent],
 })
 export class OrderTemplatesModule {}
diff --git a/src/app/extensions/order-templates/pages/account-order-template-detail/account-order-template-detail-line-item/account-order-template-detail-line-item.component.html b/src/app/extensions/order-templates/pages/account-order-template-detail/account-order-template-detail-line-item/account-order-template-detail-line-item.component.html
index 6fd90fc229..317d75e3ef 100644
--- a/src/app/extensions/order-templates/pages/account-order-template-detail/account-order-template-detail-line-item/account-order-template-detail-line-item.component.html
+++ b/src/app/extensions/order-templates/pages/account-order-template-detail/account-order-template-detail-line-item/account-order-template-detail-line-item.component.html
@@ -1,9 +1,8 @@
 <ng-container *ngIf="product$ | async as product">
   <div class="d-flex">
-    <div class="col-2 list-item d-none d-md-block">
+    <div class="col-1 col-md-2 list-item d-flex">
       <ish-checkbox [form]="selectItemForm" controlName="productCheckbox"> </ish-checkbox>
-
-      <a [routerLink]="product | ishProductRoute">
+      <a class="d-none d-md-inline" [routerLink]="product | ishProductRoute">
         <ish-product-image [product]="product" imageType="S" class="product-image"></ish-product-image>
       </a>
     </div>
@@ -53,7 +52,7 @@
     <div class="col-2 list-item d-none d-md-block text-right">
       {{ orderTemplateItemData?.creationDate | ishDate: 'shortDate' }}
     </div>
-    <div class="col-4 col-md-2 list-item text-right pr-0">
+    <div class="col-4 col-md-2 list-item column-price">
       <ish-product-price [product]="product"></ish-product-price>
     </div>
   </div>
diff --git a/src/app/extensions/order-templates/pages/account-order-template-detail/account-order-template-detail-line-item/account-order-template-detail-line-item.component.ts b/src/app/extensions/order-templates/pages/account-order-template-detail/account-order-template-detail-line-item/account-order-template-detail-line-item.component.ts
index a0a8a1d8e7..c5a5e2389e 100644
--- a/src/app/extensions/order-templates/pages/account-order-template-detail/account-order-template-detail-line-item/account-order-template-detail-line-item.component.ts
+++ b/src/app/extensions/order-templates/pages/account-order-template-detail/account-order-template-detail-line-item/account-order-template-detail-line-item.component.ts
@@ -45,7 +45,7 @@ export class AccountOrderTemplateDetailLineItemComponent implements OnChanges, O
 
   updateQuantities() {
     this.addToCartForm.valueChanges
-      .pipe(debounceTime(800), takeUntil(this.destroy$))
+      .pipe(debounceTime(500), takeUntil(this.destroy$))
       .subscribe(val => this.updateProductQuantity(this.orderTemplateItemData.sku, val.quantity));
   }
 
diff --git a/src/app/extensions/order-templates/pages/account-order-template-detail/account-order-template-detail-page.component.html b/src/app/extensions/order-templates/pages/account-order-template-detail/account-order-template-detail-page.component.html
index 7f60c28a47..b37546ffff 100644
--- a/src/app/extensions/order-templates/pages/account-order-template-detail/account-order-template-detail-page.component.html
+++ b/src/app/extensions/order-templates/pages/account-order-template-detail/account-order-template-detail-page.component.html
@@ -2,14 +2,16 @@
 <ish-error-message [error]="orderTemplateError$ | async"></ish-error-message>
 
 <ng-container *ngIf="orderTemplate$ | async as orderTemplate">
-  <a
-    (click)="editOrderTemplateDialog.show()"
-    class="btn btn-default btn-tool float-right"
-    [title]="'account.order_template.edit.heading' | translate"
-    data-testing-id="order-template-details-edit"
-    >{{ 'account.order_template.order_template.edit.rename' | translate }}</a
-  >
-  <h1>{{ orderTemplate?.title }}</h1>
+  <h1>
+    {{ orderTemplate?.title }}
+    <a
+      (click)="editOrderTemplateDialog.show()"
+      class="btn btn-default btn-tool float-right"
+      [title]="'account.order_template.edit.heading' | translate"
+      data-testing-id="order-template-details-edit"
+      >{{ 'account.order_template.order_template.edit.rename' | translate }}</a
+    >
+  </h1>
 
   <div class="section">
     <ng-container *ngIf="orderTemplate.itemsCount && orderTemplate.itemsCount > 0; else noItems" class="section">
@@ -40,7 +42,8 @@ <h1>{{ orderTemplate?.title }}</h1>
   </div>
   <ish-product-add-to-basket
     displayType="button"
-    [products]="orderTemplate.items"
+    [product]="dummyProduct"
+    [disabled]="!selectedItems?.length"
     [class]="'btn btn-primary float-right'"
     (productToBasket)="addSelectedItemsToCart(orderTemplate)"
   ></ish-product-add-to-basket>
diff --git a/src/app/extensions/order-templates/pages/account-order-template-detail/account-order-template-detail-page.component.ts b/src/app/extensions/order-templates/pages/account-order-template-detail/account-order-template-detail-page.component.ts
index 8bee6348fa..15d013f86a 100644
--- a/src/app/extensions/order-templates/pages/account-order-template-detail/account-order-template-detail-page.component.ts
+++ b/src/app/extensions/order-templates/pages/account-order-template-detail/account-order-template-detail-page.component.ts
@@ -1,13 +1,13 @@
 import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
 import { FormArray } from '@angular/forms';
 import { Observable, Subject } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
+import { takeUntil, withLatestFrom } from 'rxjs/operators';
 
 import { ShoppingFacade } from 'ish-core/facades/shopping.facade';
 import { HttpError } from 'ish-core/models/http-error/http-error.model';
 
 import { OrderTemplatesFacade } from '../../facades/order-templates.facade';
-import { OrderTemplate } from '../../models/order-template/order-template.model';
+import { OrderTemplate, OrderTemplateItem } from '../../models/order-template/order-template.model';
 
 @Component({
   selector: 'ish-account-order-template-detail-page',
@@ -20,6 +20,8 @@ export class AccountOrderTemplateDetailPageComponent implements OnInit, OnDestro
   orderTemplateLoading$: Observable<boolean>;
 
   selectedItemsForm: FormArray;
+  selectedItems: OrderTemplateItem[];
+  dummyProduct = { sku: 'dummy', inStock: true, availability: true };
 
   private destroy$ = new Subject();
 
@@ -30,6 +32,12 @@ export class AccountOrderTemplateDetailPageComponent implements OnInit, OnDestro
     this.orderTemplateLoading$ = this.orderTemplatesFacade.orderTemplateLoading$;
     this.orderTemplateError$ = this.orderTemplatesFacade.orderTemplateError$;
     this.initForm();
+
+    this.selectedItemsForm.valueChanges
+      .pipe(withLatestFrom(this.orderTemplate$), takeUntil(this.destroy$))
+      .subscribe(([, orderTemplate]) => {
+        this.selectedItems = this.filterItems(orderTemplate);
+      });
   }
 
   private initForm() {
@@ -58,11 +66,15 @@ export class AccountOrderTemplateDetailPageComponent implements OnInit, OnDestro
     });
   }
 
+  filterItems(orderTemplate): OrderTemplateItem[] {
+    return orderTemplate.items.filter(item =>
+      this.selectedItemsForm.value.find(p => p.sku === item.sku && p.productCheckbox === true)
+    );
+  }
+
   addSelectedItemsToCart(orderTemplate: OrderTemplate) {
-    orderTemplate.items.forEach(item => {
-      if (this.selectedItemsForm.value.find(p => p.sku === item.sku && p.productCheckbox === true)) {
-        this.shoppingFacade.addProductToBasket(item.sku, item.desiredQuantity.value);
-      }
+    this.filterItems(orderTemplate).forEach(item => {
+      this.shoppingFacade.addProductToBasket(item.sku, item.desiredQuantity.value);
     });
   }
 }
diff --git a/src/app/extensions/order-templates/pages/account-order-template/account-order-template-list/account-order-template-list.component.html b/src/app/extensions/order-templates/pages/account-order-template/account-order-template-list/account-order-template-list.component.html
index 69645608eb..2ed852f15c 100644
--- a/src/app/extensions/order-templates/pages/account-order-template/account-order-template-list/account-order-template-list.component.html
+++ b/src/app/extensions/order-templates/pages/account-order-template/account-order-template-list/account-order-template-list.component.html
@@ -29,7 +29,8 @@
       <a class="btn-tool d-inline-flex align-top">
         <ish-product-add-to-basket
           displayType="icon"
-          [products]="orderTemplate.items"
+          [product]="dummyProduct"
+          [disabled]="!orderTemplate.items?.length"
           class="text-primary p-0"
           (productToBasket)="addTemplateToCart(orderTemplate.id)"
         ></ish-product-add-to-basket>
diff --git a/src/app/extensions/order-templates/pages/account-order-template/account-order-template-list/account-order-template-list.component.ts b/src/app/extensions/order-templates/pages/account-order-template/account-order-template-list/account-order-template-list.component.ts
index 0ceb952177..0886006983 100644
--- a/src/app/extensions/order-templates/pages/account-order-template/account-order-template-list/account-order-template-list.component.ts
+++ b/src/app/extensions/order-templates/pages/account-order-template/account-order-template-list/account-order-template-list.component.ts
@@ -22,6 +22,8 @@ export class AccountOrderTemplateListComponent {
    */
   @Output() deleteOrderTemplate = new EventEmitter<string>();
 
+  dummyProduct = { sku: 'dummy', inStock: true, availability: true };
+
   constructor(private translate: TranslateService, private productFacade: ShoppingFacade) {}
 
   addTemplateToCart(orderTemplateId: string) {
@@ -44,7 +46,7 @@ export class AccountOrderTemplateListComponent {
   /** Determine the heading of the delete modal and opens the modal. */
   openDeleteConfirmationDialog(orderTemplate: OrderTemplate, modal: ModalDialogComponent) {
     this.translate
-      .get('modal.heading.remove.order.template', { 0: orderTemplate.title })
+      .get('account.order_templates.delete_dialog.header', { 0: orderTemplate.title })
       .pipe(take(1))
       .subscribe(res => (modal.options.titleText = res));
 
diff --git a/src/app/extensions/order-templates/services/order-template/order-template.service.spec.ts b/src/app/extensions/order-templates/services/order-template/order-template.service.spec.ts
index b567fb95c0..ce1d5eb1ef 100644
--- a/src/app/extensions/order-templates/services/order-template/order-template.service.spec.ts
+++ b/src/app/extensions/order-templates/services/order-template/order-template.service.spec.ts
@@ -49,12 +49,25 @@ describe('Order Template Service', () => {
     });
   });
 
+  it("should get an order template when 'getOrderTemplate' is called", done => {
+    when(apiServiceMock.get(`customers/-/users/-/wishlists/1234`)).thenReturn(of({ id: '1234' }));
+
+    orderTemplateService.getOrderTemplate('1234').subscribe(() => {
+      verify(apiServiceMock.get(`customers/-/users/-/wishlists/1234`)).once();
+      done();
+    });
+  });
+
   it("should create an order template when 'createOrderTemplate' is called", done => {
     const orderTemplateId = '1234';
     const orderTemplateHeader: OrderTemplateHeader = { title: 'order template title' };
     when(apiServiceMock.post(`customers/-/users/-/wishlists`, anything())).thenReturn(
       of({ title: orderTemplateId } as OrderTemplateData)
     );
+    when(apiServiceMock.post(`customers/-/users/-/wishlists`, anything())).thenReturn(
+      of({ title: orderTemplateId } as OrderTemplateData)
+    );
+    when(apiServiceMock.get(`customers/-/users/-/wishlists/1234`)).thenReturn(of({ id: '1234' }));
 
     orderTemplateService.createOrderTemplate(orderTemplateHeader).subscribe(data => {
       expect(orderTemplateId).toEqual(data.id);
diff --git a/src/app/extensions/order-templates/services/order-template/order-template.service.ts b/src/app/extensions/order-templates/services/order-template/order-template.service.ts
index 73b263dddf..5391b2c135 100644
--- a/src/app/extensions/order-templates/services/order-template/order-template.service.ts
+++ b/src/app/extensions/order-templates/services/order-template/order-template.service.ts
@@ -32,7 +32,7 @@ export class OrderTemplateService {
    * @param orderTemplateId  The order template id.
    * @returns           The order template.
    */
-  private getOrderTemplate(orderTemplateId): Observable<OrderTemplate> {
+  getOrderTemplate(orderTemplateId: string): Observable<OrderTemplate> {
     if (!orderTemplateId) {
       return throwError('getOrderTemplate() called without orderTemplateId');
     }
@@ -46,12 +46,10 @@ export class OrderTemplateService {
    * @param OrderTemplateDetails   The order template data.
    * @returns                 The created order template.
    */
-  createOrderTemplate(orderTemplatetData: OrderTemplateHeader): Observable<OrderTemplate> {
+  createOrderTemplate(orderTemplateData: OrderTemplateHeader): Observable<OrderTemplate> {
     return this.apiService
-      .post('customers/-/users/-/wishlists', orderTemplatetData)
-      .pipe(
-        map((response: OrderTemplateData) => this.orderTemplateMapper.fromData(orderTemplatetData, response.title))
-      );
+      .post('customers/-/users/-/wishlists', orderTemplateData)
+      .pipe(concatMap((response: OrderTemplateData) => this.getOrderTemplate(response.title)));
   }
 
   /**
diff --git a/src/app/extensions/order-templates/shared/order-templates/select-order-template-modal/select-order-template-modal.component.html b/src/app/extensions/order-templates/shared/order-templates/select-order-template-modal/select-order-template-modal.component.html
index fbdd3bf928..37cc8a64d7 100644
--- a/src/app/extensions/order-templates/shared/order-templates/select-order-template-modal/select-order-template-modal.component.html
+++ b/src/app/extensions/order-templates/shared/order-templates/select-order-template-modal/select-order-template-modal.component.html
@@ -51,6 +51,7 @@ <h2 class="modal-title">{{ headerTranslationKey | translate }}</h2>
                     id="orderTemplate"
                   />
                   <ish-input
+                    class="w-75"
                     controlName="newOrderTemplate"
                     [disabled]="newOrderTemplateDisabled ? 'true' : null"
                     [errorMessages]="{ required: 'account.order_template.name.error.required' }"
diff --git a/src/app/extensions/order-templates/shared/order-templates/select-order-template-modal/select-order-template-modal.component.ts b/src/app/extensions/order-templates/shared/order-templates/select-order-template-modal/select-order-template-modal.component.ts
index 7e0e12315c..9ecf4ad27f 100644
--- a/src/app/extensions/order-templates/shared/order-templates/select-order-template-modal/select-order-template-modal.component.ts
+++ b/src/app/extensions/order-templates/shared/order-templates/select-order-template-modal/select-order-template-modal.component.ts
@@ -39,7 +39,7 @@ export class SelectOrderTemplateModalComponent implements OnInit, OnDestroy {
   @Input() addMoveProduct: 'add' | 'move' = 'add';
 
   /**
-   * submit successfull event
+   * submit success event
    */
   @Output() submitEmitter = new EventEmitter<{ id: string; title: string }>();
 
diff --git a/src/app/extensions/order-templates/store/order-templates-store.ts b/src/app/extensions/order-templates/store/order-templates-store.ts
index e8c2c733b6..8493b0da3d 100644
--- a/src/app/extensions/order-templates/store/order-templates-store.ts
+++ b/src/app/extensions/order-templates/store/order-templates-store.ts
@@ -6,6 +6,4 @@ export interface OrderTemplatesState {
   orderTemplates: OrderTemplateState;
 }
 
-// TODO: use createFeatureSelector after ivy dynamic loading
-// tslint:disable-next-line: no-any
 export const getOrderTemplatesState = createFeatureSelector<OrderTemplatesState>('orderTemplates');
diff --git a/src/app/shared/components/basket/line-item-list/line-item-list.component.html b/src/app/shared/components/basket/line-item-list/line-item-list.component.html
index 4c8367b951..75f62cf3c5 100644
--- a/src/app/shared/components/basket/line-item-list/line-item-list.component.html
+++ b/src/app/shared/components/basket/line-item-list/line-item-list.component.html
@@ -49,8 +49,7 @@
             <div class="d-flex align-items-center">
               <ish-lazy-product-add-to-order-template
                 *ngIf="editable"
-                class="btn-tool"
-                [class]="'btn btn-link add-to-order-template mt-0 mr-0'"
+                [class]="'btn btn-link btn-tool add-to-order-template'"
                 [product]="pli.product"
                 displayType="icon"
                 [quantity]="form.get(['items', i]).value.quantity"
diff --git a/src/app/shared/components/product/product-add-to-basket/product-add-to-basket.component.html b/src/app/shared/components/product/product-add-to-basket/product-add-to-basket.component.html
index ba9541e9bd..4f22e66658 100644
--- a/src/app/shared/components/product/product-add-to-basket/product-add-to-basket.component.html
+++ b/src/app/shared/components/product/product-add-to-basket/product-add-to-basket.component.html
@@ -1,7 +1,4 @@
-<div
-  *ngIf="(product && product.inStock && product.availability) || (products && products.length > 0)"
-  class="add-to-cart"
->
+<div *ngIf="product?.inStock && product?.availability" class="add-to-cart">
   <button
     type="submit"
     name="addProduct"
diff --git a/src/app/shared/components/product/product-add-to-basket/product-add-to-basket.component.spec.ts b/src/app/shared/components/product/product-add-to-basket/product-add-to-basket.component.spec.ts
index 6803bf0a95..190e29aa52 100644
--- a/src/app/shared/components/product/product-add-to-basket/product-add-to-basket.component.spec.ts
+++ b/src/app/shared/components/product/product-add-to-basket/product-add-to-basket.component.spec.ts
@@ -17,7 +17,6 @@ describe('Product Add To Basket Component', () => {
   let product: Product;
   let translate: TranslateService;
   let element: HTMLElement;
-  let products: Product[];
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -44,11 +43,8 @@ describe('Product Add To Basket Component', () => {
     product.inStock = true;
     product.minOrderQuantity = 1;
     product.availability = true;
-    products = [];
-    products.push(product);
     element = fixture.nativeElement;
     component.product = product;
-    component.products = products;
   });
 
   it('should be created', () => {
@@ -57,9 +53,15 @@ describe('Product Add To Basket Component', () => {
     expect(() => fixture.detectChanges()).not.toThrow();
   });
 
-  it('should not render when product and products are undefined', () => {
+  it('should throw an error if input parameter product is not set', () => {
     component.product = undefined;
-    component.products = undefined;
+    fixture.detectChanges();
+    expect(element.querySelector('button')).toBeFalsy();
+  });
+
+  it('should not render when inStock = false', () => {
+    product.inStock = false;
+
     fixture.detectChanges();
     expect(element.querySelector('button')).toBeFalsy();
   });
diff --git a/src/app/shared/components/product/product-add-to-basket/product-add-to-basket.component.ts b/src/app/shared/components/product/product-add-to-basket/product-add-to-basket.component.ts
index 0238a207f8..211e5ba02d 100644
--- a/src/app/shared/components/product/product-add-to-basket/product-add-to-basket.component.ts
+++ b/src/app/shared/components/product/product-add-to-basket/product-add-to-basket.component.ts
@@ -30,11 +30,7 @@ export class ProductAddToBasketComponent implements OnInit, OnDestroy {
   /**
    * The product that can be added to basket
    */
-  @Input() product?: Product;
-  /**
-   * The products that can be added to basket
-   */
-  @Input() products?: Product[];
+  @Input() product: Product;
   /**
    * When true, it specifies that the button should be disabled
    */
diff --git a/src/app/shell/shell.module.ts b/src/app/shell/shell.module.ts
index aa6c1d976e..3ed30e3dd8 100644
--- a/src/app/shell/shell.module.ts
+++ b/src/app/shell/shell.module.ts
@@ -58,7 +58,6 @@ const exportedComponents = [
     NgbCollapseModule,
     NgbDropdownModule,
     NgbModalModule,
-    OrderTemplatesExportsModule,
     PipesModule.forRoot(),
     RouterModule,
     TranslateModule,
diff --git a/src/assets/i18n/de_DE.json b/src/assets/i18n/de_DE.json
index 82ebb0d3e5..7ebac251c4 100644
--- a/src/assets/i18n/de_DE.json
+++ b/src/assets/i18n/de_DE.json
@@ -2693,8 +2693,8 @@
   "account.ordertemplates.heading": "Bestellvorlagen",
   "account.order_template.table.options.move_to_cart": "In Warenkorb verschieben",
   "account.order_template.table.options.move_to_template": "In andere Bestellvorlage verschieben",
-  "account.order_template.table.header.date_added ": " Datum",
-  "account.order_template.added.confirmation": "{{0}} hinzugefügt zu <a callback=\"callbackHideDialogModal\" href=\"{{1}}\">{{2}}</a>.",
+  "account.order_template.table.header.date_added": "Hinzugefügt am",
+  "account.order_template.added.confirmation": "{{0}} hinzugefügt zu <a callback=\"callbackHideDialogModal\" href=\"{{2}}\">{{1}}</a>.",
   "account.order_template.widget.my_order_templates.heading": "Meine Bestellvorlagen",
   "account.order_template.widget.link.add_to_cart": "In den Warenkorb",
   "account.order_template.widget.link.edit": "Vorlage bearbeiten",
@@ -2707,7 +2707,7 @@
   "account.order_template.new_from_basket_confirm.view_template.text": "Bestellvorlage ansehen <a href=\"{{0}}\">{{1}}</a>.",
   "account.order_template.new_from_order.heading": "Aus Bestellung Bestellvorlage anlegen",
   "account.order_template.new_from_order.button.create.label": "Anlegen",
-  "account.order_template.new_from_order_confirm.heading": "Bestellvorlage \"{{0}}\" angelegt und und alle Artikel aus aktueller Bestellung übertragen.",
+  "account.order_template.new_from_order_confirm.heading": "Ihre Bestellvorlage \"{{0}}\" wurde angelegt und und alle Artikel aus aktueller Bestellung übertragen.",
   "account.order_template.new_from_order_confirm.view_template.text": "Bestellvorlage ansehen <a href=\"{{0}}\">{{1}}</a>.",
   "account.order_template.order_template.button.add_to_cart.label": "In den Warenkorb",
   "account.order_template.order_template.button.update.label": "Vorlage aktualisieren",
@@ -2724,8 +2724,8 @@
   "account.order_template.list.link.remove": "Löschen",
   "account.order_template.list.no_templates.text": "Derzeit haben Sie keine Bestellvorlagen.",
   "account.order_template.list.link.back": "Zurück zu Bestellvorlagen",
-  "account.order_template.new_order_template.confirmation": "Bestellvorlage \"{{0}}\" wurde erfolgreich angelegt.",
-  "account.order_template.delete_order_template.confirmation": "Bestellvorlage \"{{0}}\" wurde gelöscht.",
+  "account.order_template.new_order_template.confirmation": "Ihre Bestellvorlage \"{{0}}\" wurde angelegt.",
+  "account.order_template.delete_order_template.confirmation": "Ihre Bestellvorlage \"{{0}}\" wurde gelöscht.",
   "account.order_template.latest_items.link.view_all": "Alle Bestellvorlagen anzeigen",
   "account.order_template.latest_items.no_templates.text": "Derzeit haben Sie keine Bestellvorlagen.",
   "account.order_template.add_to_template.heading": "Produkt in die Bestellvorlage aufnehmen",
@@ -2749,12 +2749,12 @@
   "order_template.moved.heading": "Bestellvorlage verschoben",
   "order_template.create.heading": "Bestellvorlage anlegen",
   "account.order_template.table.header.item": "Artikelbeschreibung",
-  "account.order_template.table.header.date_added": "Hinzugefügt am",
   "account.order_template.table.header.price": "Preis",
   "account.order_template.no_entries": "Derzeit befinden sich keine Artikel in der Bestellvorlage.",
   "account.order_template.name.error.required": "Zum Erstellen einer neuen Bestellvorlage geben Sie bitte einen Namen ein.",
   "account.order_templates.edit_form.save_button.text": "Änderungen speichern",
   "account.order_templates.edit.confirmation": "Ihre Bestellvorlage \"{{0}}\" wurde aktualisiert.",
+  "account.order_templates.delete_dialog.header": "{{0}} löschen",
   "account.order_template.items": {
     "=0": "0 Artikel",
     "=1": "1 Artikel",
diff --git a/src/assets/i18n/en_US.json b/src/assets/i18n/en_US.json
index 5ee61c32b9..a13cc841ba 100644
--- a/src/assets/i18n/en_US.json
+++ b/src/assets/i18n/en_US.json
@@ -2696,7 +2696,7 @@
   "account.ordertemplates.heading": "Order Templates",
   "account.order_template.table.options.move_to_cart": "Move to Cart",
   "account.order_template.table.options.move_to_template": "Move to other Template",
-  "account.order_template.table.header.date_added ": " Date",
+  "account.order_template.table.header.date_added": "Added on",
   "account.order_template.added.confirmation": "{{0}} added to <a callback=\"callbackHideDialogModal\" href=\"{{2}}\">{{1}}</a>",
   "account.order_template.widget.my_order_templates.heading": "My Order Templates",
   "account.order_template.widget.link.add_to_cart": "Add to Cart",
@@ -2710,7 +2710,7 @@
   "account.order_template.new_from_basket_confirm.view_template.text": "View order template <a href=\"{{0}}\">{{1}}</a>.",
   "account.order_template.new_from_order.heading": "Create Order Template from Order",
   "account.order_template.new_from_order.button.create.label": "Create",
-  "account.order_template.new_from_order_confirm.heading": "Created order template \"{{0}}\" and transferred all items from this order to it.",
+  "account.order_template.new_from_order_confirm.heading": "Your order template \"{{0}}\" has been created and all items from your current cart have been added to it.",
   "account.order_template.new_from_order_confirm.view_template.text": "View order template <a href=\"{{0}}\">{{1}}</a>.",
   "account.order_template.order_template.button.add_to_cart.label": "Add to Cart",
   "account.order_template.order_template.button.update.label": "Update Template",
@@ -2727,8 +2727,8 @@
   "account.order_template.list.link.remove": "Delete",
   "account.order_template.list.no_templates.text": "Currently you don't have any order templates.",
   "account.order_template.list.link.back": "Back to Order Templates",
-  "account.order_template.new_order_template.confirmation": "Order template \"{{0}}\" was successfully created.",
-  "account.order_template.delete_order_template.confirmation": "Order template \"{{0}}\" was deleted.",
+  "account.order_template.new_order_template.confirmation": "Your order template \"{{0}}\" has been created.",
+  "account.order_template.delete_order_template.confirmation": "Your order template \"{{0}}\" has been deleted.",
   "account.order_template.latest_items.link.view_all": "View All Order Templates",
   "account.order_template.latest_items.no_templates.text": "Currently you don't have any order templates.",
   "account.order_template.add_to_template.heading": "Add Product to Order Template",
@@ -2752,12 +2752,12 @@
   "order_template.moved.heading": "Order Template Moved",
   "order_template.create.heading": "Create Order Template",
   "account.order_template.table.header.item": "Item Description",
-  "account.order_template.table.header.date_added": "Date Added",
   "account.order_template.table.header.price": "Price",
   "account.order_template.no_entries": "There are currently no items in this order template.",
   "account.order_template.name.error.required": "If you want to create a new order template, please enter a name.",
   "account.order_templates.edit_form.save_button.text": "Save Changes",
   "account.order_templates.edit.confirmation": "Your order template \"{{0}}\" has been updated.",
+  "account.order_templates.delete_dialog.header": "Delete {{0}}",
   "account.order_template.items": {
     "=0": "0 Items",
     "=1": "1 Item",
diff --git a/src/assets/i18n/fr_FR.json b/src/assets/i18n/fr_FR.json
index 4ce5c5e343..fc1f53986d 100644
--- a/src/assets/i18n/fr_FR.json
+++ b/src/assets/i18n/fr_FR.json
@@ -2695,8 +2695,8 @@
   "account.ordertemplates.heading": "Modèles de commande",
   "account.order_template.table.options.move_to_cart": "Mettre au Panier",
   "account.order_template.table.options.move_to_template": "Déplacer vers un autre modèle",
-  "account.order_template.table.header.date_added ": " Date",
-  "account.order_template.added.confirmation": "{0}\u00A0ajouté à <a callback=\"callbackHideDialogModal\" href=\"{{2}}\">\"{{1}}\"</a>",
+  "account.order_template.table.header.date_added": "Date ajoutée",
+  "account.order_template.added.confirmation": "{{0}}\u00A0ajouté à <a callback=\"callbackHideDialogModal\" href=\"{{2}}\">\"{{1}}\"</a>",
   "account.order_template.widget.my_order_templates.heading": "Mes modèles de commande",
   "account.order_template.widget.link.add_to_cart": "Ajouter au panier",
   "account.order_template.widget.link.edit": "Modifier le modèle",
@@ -2726,7 +2726,7 @@
   "account.order_template.list.link.remove": "Supprimer",
   "account.order_template.list.no_templates.text": "Actuellement, vous n’avez pas de modèles de commande.",
   "account.order_template.list.link.back": "Retour aux modèles de commande",
-  "account.order_template.new_order_template.confirmation": "Le modèle de commande \"{{0}}\" a été créé avec succès.",
+  "account.order_template.new_order_template.confirmation": "Le modèle de commande \"{{0}}\" a été créé",
   "account.order_template.delete_order_template.confirmation": "Le modèle de commande \"{{0}}\" a été supprimé.",
   "account.order_template.latest_items.link.view_all": "Afficher tous les modèles de commande",
   "account.order_template.latest_items.no_templates.text": "Actuellement, vous n’avez pas de modèles de commande.",
@@ -2751,12 +2751,12 @@
   "order_template.moved.heading": "Modèle de commande déplacé",
   "order_template.create.heading": "Créer un modèle de commande",
   "account.order_template.table.header.item": "Description de l’article",
-  "account.order_template.table.header.date_added": "Date ajoutée",
   "account.order_template.table.header.price": "Prix",
   "account.order_template.no_entries": "Il n’y a actuellement aucun article dans ce modèle de commande.",
   "account.order_template.name.error.required": "Si vous souhaitez créer un nouveau modèle de commande, veuillez entrer un nom.",
   "account.order_templates.edit_form.save_button.text": "Enregistrer les modifications",
   "account.order_templates.edit.confirmation": "Votre modèle de commande \"{{0}}\" a été mise à jour.",
+  "account.order_templates.delete_dialog.header": "Supprimer {{0}}",
   "account.order_template.items": {
     "=0": "0 Articles",
     "=1": "1 Article",