feat: Use tabs instead of radio group for pickup options

feature-libs/cart/base/components/add-to-cart/add-to-cart.component.html

@@ -23,6 +23,7 @@
     <ng-template
       [cxOutlet]="CartOutlets.ADD_TO_CART_PICKUP_OPTION"
       [(cxComponentRef)]="pickupOptionCompRef"
+      (cxComponentRefChange)="onPickupOptionsCompLoaded()"
     ></ng-template>
   </ng-container>
 
@@ -35,7 +36,7 @@
         : 'btn btn-primary btn-block'
     "
     type="submit"
-    [disabled]="quantity <= 0 || quantity > maxQuantity"
+    [disabled]="disabled || quantity <= 0 || quantity > maxQuantity"
   >
     <span
       *ngIf="

feature-libs/cart/base/components/add-to-cart/add-to-cart.component.ts

@@ -32,6 +32,7 @@ import {
   Product,
   isNotNullable,
 } from '@spartacus/core';
+import { AugmentedPointOfService } from '@spartacus/pickup-in-store/root';
 import {
   CmsComponentData,
   CurrentProductService,
@@ -63,7 +64,7 @@ export class AddToCartComponent implements OnInit, OnDestroy {
   @ViewChild('addToCartDialogTriggerEl') addToCartDialogTriggerEl: ElementRef;
 
   maxQuantity: number;
-
+  disabled: boolean = false;
   hasStock: boolean = false;
   inventoryThreshold: boolean = false;
 
@@ -72,7 +73,7 @@ export class AddToCartComponent implements OnInit, OnDestroy {
 
   quantity = 1;
 
-  subscription: Subscription;
+  subscription = new Subscription();
 
   addToCartForm = new UntypedFormGroup({
     quantity: new UntypedFormControl(1, { updateOn: 'blur' }),
@@ -125,17 +126,18 @@ export class AddToCartComponent implements OnInit, OnDestroy {
       this.hasStock = true;
       this.cd.markForCheck();
     } else {
-      this.subscription = (
-        this.productListItemContext
+      this.subscription.add(
+        (this.productListItemContext
           ? this.productListItemContext.product$
           : this.currentProductService.getProduct()
-      )
-        .pipe(filter(isNotNullable))
-        .subscribe((product) => {
-          this.productCode = product.code ?? '';
-          this.setStockInfo(product);
-          this.cd.markForCheck();
-        });
+        )
+          .pipe(filter(isNotNullable))
+          .subscribe((product) => {
+            this.productCode = product.code ?? '';
+            this.setStockInfo(product);
+            this.cd.markForCheck();
+          })
+      );
     }
   }
 
@@ -239,9 +241,21 @@ export class AddToCartComponent implements OnInit, OnDestroy {
     return newEvent;
   }
 
-  ngOnDestroy() {
-    if (this.subscription) {
-      this.subscription.unsubscribe();
+  onPickupOptionsCompLoaded() {
+    if (this.featureConfigService.isEnabled('a11yPickupOptionsTabs')) {
+      this.subscription.add(
+        this.pickupOptionCompRef.instance.intendedPickupChange.subscribe(
+          (intendedPickupLocation: AugmentedPointOfService | undefined) => {
+            this.disabled =
+              intendedPickupLocation?.pickupOption === 'pickup' &&
+              !intendedPickupLocation.displayName;
+          }
+        )
+      );
     }
   }
+
+  ngOnDestroy() {
+    this.subscription.unsubscribe();
+  }
 }

feature-libs/pickup-in-store/assets/translations/en/pickupInStore.json

@@ -13,7 +13,10 @@
     "changeStore": "Change Store",
     "delivery": "Ship It (Free Return)",
     "pickup": "Free Pickup In Store",
-    "selectStore": "Select Store"
+    "shipIt": "Ship It",
+    "selectStore": "Select Store",
+    "freeReturn": "Free Return",
+    "storeIsNotSelected": "Store for pickup is not selected."
   },
   "setPreferredStore": {
     "makeThisMyStore": "Make This My Store",

feature-libs/pickup-in-store/components/container/cart-pickup-options-container/cart-pickup-options-container.component.ts

@@ -310,7 +310,10 @@ export class CartPickupOptionsContainerComponent implements OnInit, OnDestroy {
           );
         });
 
-      if (!this.displayNameIsSet) {
+      if (
+        !this.featureConfigService.isEnabled('a11yPickupOptionsTabs') &&
+        !this.displayNameIsSet
+      ) {
         this.openDialog(event.triggerElement);
       }
     } else if (typeof event === 'string') {
@@ -344,7 +347,10 @@ export class CartPickupOptionsContainerComponent implements OnInit, OnDestroy {
           );
         });
 
-      if (!this.displayNameIsSet) {
+      if (
+        !this.featureConfigService.isEnabled('a11yPickupOptionsTabs') &&
+        !this.displayNameIsSet
+      ) {
         this.openDialog();
       }
     }

feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.ts

@@ -8,8 +8,10 @@ import {
   Component,
   ElementRef,
   inject,
+  EventEmitter,
   OnDestroy,
   OnInit,
+  Output,
   ViewChild,
   ViewContainerRef,
 } from '@angular/core';
@@ -63,6 +65,9 @@ export class PdpPickupOptionsContainerComponent implements OnInit, OnDestroy {
    * The 'triggerElement' is passed through 'PickupOptionChange' event instead.
    */
   @ViewChild('open') element: ElementRef;
+  @Output() intendedPickupChange = new EventEmitter<
+    AugmentedPointOfService | undefined
+  >();
   subscription = new Subscription();
 
   availableForPickup = false;
@@ -147,6 +152,10 @@ export class PdpPickupOptionsContainerComponent implements OnInit, OnDestroy {
       )
     );
 
+    this.subscription.add(
+      this.intendedPickupLocation$.subscribe(this.intendedPickupChange)
+    );
+
     this.subscription.add(
       combineLatest([
         productCode$,
@@ -202,6 +211,19 @@ export class PdpPickupOptionsContainerComponent implements OnInit, OnDestroy {
   onPickupOptionChange(
     event: { option: PickupOption; triggerElement: ElementRef } | PickupOption
   ): void {
+    const handleChange = (
+      option: PickupOption,
+      triggerElement?: ElementRef
+    ) => {
+      if (!this.featureConfigService.isEnabled('a11yPickupOptionsTabs')) {
+        if (option === 'delivery') {
+          return;
+        }
+        if (!this.displayNameIsSet) {
+          this.openDialog(triggerElement);
+        }
+      }
+    };
     if (
       this.featureConfigService.isEnabled('a11yDialogTriggerRefocus') &&
       typeof event === 'object'
@@ -211,23 +233,13 @@ export class PdpPickupOptionsContainerComponent implements OnInit, OnDestroy {
         this.productCode,
         option
       );
-      if (option === 'delivery') {
-        return;
-      }
-      if (!this.displayNameIsSet) {
-        this.openDialog(triggerElement);
-      }
+      handleChange(option, triggerElement);
     } else if (typeof event === 'string') {
       this.intendedPickupLocationService.setPickupOption(
         this.productCode,
         event
       );
-      if (event === 'delivery') {
-        return;
-      }
-      if (!this.displayNameIsSet) {
-        this.openDialog();
-      }
+      handleChange(event);
     }
   }
 }

feature-libs/pickup-in-store/components/container/pickup-option-dialog/pickup-option-dialog.component.ts

@@ -164,25 +164,27 @@ export class PickupOptionDialogComponent implements OnInit, OnDestroy {
   close(reason: string): void {
     this.launchDialogService.closeDialog(reason);
     if (reason === this.CLOSE_WITHOUT_SELECTION) {
-      this.intendedPickupLocationService
-        .getIntendedLocation(this.productCode)
-        .pipe(
-          filter(
-            (store: AugmentedPointOfService | undefined) =>
-              typeof store !== 'undefined'
-          ),
-          map((store) => store as AugmentedPointOfService),
-          filter((store) => !store.name),
-          take(1),
-          tap(() =>
-            this.intendedPickupLocationService.setPickupOption(
-              this.productCode,
-              'delivery'
+      if (!this.featureConfigService.isEnabled('a11yPickupOptionsTabs')) {
+        this.intendedPickupLocationService
+          .getIntendedLocation(this.productCode)
+          .pipe(
+            filter(
+              (store: AugmentedPointOfService | undefined) =>
+                typeof store !== 'undefined'
+            ),
+            map((store) => store as AugmentedPointOfService),
+            filter((store) => !store.name),
+            take(1),
+            tap(() =>
+              this.intendedPickupLocationService.setPickupOption(
+                this.productCode,
+                'delivery'
+              )
             )
           )
-        )
-        .subscribe();
-      this.pickupOptionFacade.setPickupOption(this.entryNumber, 'delivery');
+          .subscribe();
+        this.pickupOptionFacade.setPickupOption(this.entryNumber, 'delivery');
+      }
       return;
     }
     this.subscription.add(