Merge branch 'hotfix/835-gastkundenanlage-not-possible'

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

@@ -133,7 +133,7 @@ export class CreateCustomerCardComponent implements OnInit, OnDestroy {
   cartHasItemsForDownload = false;
   guestChecked = false;
   onlineChecked = false;
-  guestDisabled = true;
+  guestDisabled = false;
   customerCardChecked = false;
   deliveryAndGuestOrOnline = false;
   pickUpOrTakeNowAndOnline = false;
@@ -261,31 +261,48 @@ export class CreateCustomerCardComponent implements OnInit, OnDestroy {
     this.cartHasItemsForTakeNow = cartHasItemsFor(DeliveryOption.TAKE_NOW);
     this.cartHasItemsForDownload = cartHasItemsFor(DeliveryOption.DOWNLOAD);
 
-    (this.cartHasItemsForDownload || this.cartHasItemsForDelivery).ifTrue(
-      () => {
-        this.onlineChecked = true;
-        this.guestChecked = false;
-        this.flagsSetByConditions = true;
+    this.cartHasItemsForDownload.ifTrue(() => {
+      this.onlineChecked = true;
+      this.guestDisabled = true;
+      this.guestChecked = false;
+      this.flagsSetByConditions = true;
 
-        if (this.cartHasItemsForDownload) {
-          this.headerText =
-            'Um Ihnen das ebook bereitstellen zu können, brauchen Sie ein Onlinekonto bei Hugendubel. Wir richten es Ihnen gerne sofort ein.';
-        }
-      }
-    );
+      this.headerText =
+        'Um Ihnen das ebook bereitstellen zu können, brauchen Sie ein Onlinekonto bei Hugendubel. Wir richten es Ihnen gerne sofort ein.';
 
-    (
-      this.cartHasItemsForDelivery &&
-      !this.cartHasItemsForDownload &&
-      !this.onlineChecked
-    ).ifTrue(this.guestCheckboxInitialization);
+      return;
+    });
+
+    // Ruecklage
+    if (this.cartHasItemsForTakeNow) {
+      this.disableGuestCheckbox();
+    }
+
+    // Abholung
+    if (this.cartHasItemsForPickUp) {
+      this.disableGuestCheckbox();
+    }
+
+    // Versand
+    if (this.cartHasItemsForDelivery) {
+      this.guestCheckboxInitialization();
+    }
+
+    this.detectChanges();
+  };
+
+  disableGuestCheckbox = () => {
+    this.guestDisabled = true;
+    this.flagsSetByConditions = true;
   };
 
   guestCheckboxInitialization = () => {
-    this.guestChecked = true;
-    this.onlineChecked = false;
     this.guestDisabled = false;
     this.flagsSetByConditions = true;
+
+    if (!this.guestChecked && !this.onlineChecked) {
+      this.guestChecked = true;
+    }
   };
 
   initializationSubscriptionHandler = (process: Process) => {

azure-pipelines.yml

@@ -23,7 +23,7 @@ jobs:
       demands:
         - Agent.OS -equals Linux
         - docker
-    condition: and(ne(variables['Build.SourceBranch'], 'refs/heads/develop'), ne(variables['Build.SourceBranch'], 'refs/heads/integration'), ne(variables['Build.SourceBranch'], 'refs/heads/master'))
+    condition: and(ne(variables['Build.SourceBranch'], 'refs/heads/develop'), ne(variables['Build.SourceBranch'], 'refs/heads/integration'), ne(variables['Build.SourceBranch'], 'refs/heads/master'), not(startsWith(variables['Build.SourceBranch'], 'refs/heads/hotfix/')))
     steps:
       - task: npmAuthenticate@0
         displayName: 'npm auth'
@@ -88,7 +88,7 @@ jobs:
       demands:
         - Agent.OS -equals Linux
         - docker
-    condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/integration'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+    condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/integration'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), startsWith(variables['Build.SourceBranch'], 'refs/heads/hotfix/'))
     steps:
       - task: npmAuthenticate@0
         displayName: 'npm auth'