Merge remote-tracking branch 'origin/develop' into release-2211.32.0-1

feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.html

@@ -122,6 +122,7 @@
                   [routerLink]="{ cxRoute: 'cart' } | cxUrl"
                   (click)="dismissModal('View Cart click')"
                   class="btn btn-primary"
+                  cxBtnLikeLink
                   autofocus
                   >{{ 'addToCart.viewCart' | cxTranslate }}</a
                 >
@@ -130,6 +131,7 @@
                   [routerLink]="{ cxRoute: 'checkout' } | cxUrl"
                   (click)="dismissModal('Proceed To Checkout click')"
                   class="btn btn-secondary"
+                  cxBtnLikeLink
                   >{{ 'addToCart.proceedToCheckout' | cxTranslate }}</a
                 >
               </ng-container>
@@ -273,6 +275,7 @@
                   [routerLink]="{ cxRoute: 'cart' } | cxUrl"
                   (click)="dismissModal('View Cart click')"
                   class="btn btn-primary"
+                  cxBtnLikeLink
                   autofocus
                   >{{ 'addToCart.viewCart' | cxTranslate }}</a
                 >
@@ -281,6 +284,7 @@
                   [routerLink]="{ cxRoute: 'checkout' } | cxUrl"
                   (click)="dismissModal('Proceed To Checkout click')"
                   class="btn btn-secondary"
+                  cxBtnLikeLink
                   >{{ 'addToCart.proceedToCheckout' | cxTranslate }}</a
                 >
               </ng-container>

feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.module.ts

@@ -15,6 +15,7 @@ import {
   UrlModule,
 } from '@spartacus/core';
 import {
+  BtnLikeLinkModule,
   IconModule,
   ItemCounterModule,
   KeyboardFocusModule,
@@ -40,6 +41,7 @@ import { defaultAddedToCartLayoutConfig } from './default-added-to-cart-layout.c
     ItemCounterModule,
     KeyboardFocusModule,
     FeaturesConfigModule,
+    BtnLikeLinkModule,
   ],
   providers: [provideDefaultConfig(defaultAddedToCartLayoutConfig)],
   declarations: [AddedToCartDialogComponent],

feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.html

@@ -87,6 +87,7 @@
     <a
       class="btn btn-link button-add-link cx-action-link"
       [routerLink]="{ cxRoute: 'login' } | cxUrl"
+      cxBtnLikeLink
     >
       <cx-icon aria-hidden="true" [type]="iconTypes.EMPTY_HEART"></cx-icon>
       <span class="button-text">{{

feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.module.ts

@@ -14,7 +14,11 @@ import {
   provideDefaultConfig,
   UrlModule,
 } from '@spartacus/core';
-import { AtMessageModule, IconModule } from '@spartacus/storefront';
+import {
+  AtMessageModule,
+  BtnLikeLinkModule,
+  IconModule,
+} from '@spartacus/storefront';
 import { AddToWishListComponent } from './add-to-wish-list.component';
 
 @NgModule({
@@ -26,6 +30,7 @@ import { AddToWishListComponent } from './add-to-wish-list.component';
     UrlModule,
     AtMessageModule,
     FeaturesConfigModule,
+    BtnLikeLinkModule,
   ],
   providers: [
     provideDefaultConfig(<CmsConfig>{

feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts

@@ -511,7 +511,7 @@ describe('CheckoutPaymentMethodComponent', () => {
       fixture.detectChanges();
       fixture.debugElement
         .queryAll(By.css('cx-card'))[1]
-        .query(By.css('.link'))
+        .query(By.css('.btn'))
         .nativeElement.click();
 
       expect(mockCheckoutPaymentService.setPaymentDetails).toHaveBeenCalledWith(

feature-libs/order/components/amend-order/amend-order-actions/amend-order-actions.component.html

@@ -1,12 +1,12 @@
 <div class="col-xs-12 col-md-4 col-lg-3">
   <a
-    role="button"
     [routerLink]="
       {
         cxRoute: backRoute,
         params: { code: orderCode },
       } | cxUrl
     "
+    cxBtnLikeLink
     class="btn btn-block btn-secondary"
   >
     {{ 'common.back' | cxTranslate }}

feature-libs/order/components/amend-order/amend-order-actions/amend-order-actions.module.ts

@@ -9,9 +9,16 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { I18nModule, UrlModule } from '@spartacus/core';
 import { AmendOrderActionsComponent } from './amend-order-actions.component';
+import { BtnLikeLinkModule } from '@spartacus/storefront';
 
 @NgModule({
-  imports: [CommonModule, RouterModule, UrlModule, I18nModule],
+  imports: [
+    CommonModule,
+    RouterModule,
+    UrlModule,
+    I18nModule,
+    BtnLikeLinkModule,
+  ],
   declarations: [AmendOrderActionsComponent],
   exports: [AmendOrderActionsComponent],
 })

feature-libs/order/components/order-details/order-detail-actions/order-detail-actions.component.html

@@ -11,28 +11,28 @@
 
     <div class="col-xs-12 col-md-4 col-lg-3">
       <a
-        role="button"
         *ngIf="order.cancellable"
         [routerLink]="
           {
             cxRoute: 'orderCancel',
             params: order,
           } | cxUrl
         "
+        cxBtnLikeLink
         class="btn btn-block btn-secondary"
       >
         {{ 'orderDetails.cancellationAndReturn.cancelAction' | cxTranslate }}
       </a>
 
       <a
-        role="button"
         *ngIf="order.returnable"
         [routerLink]="
           {
             cxRoute: 'orderReturn',
             params: order,
           } | cxUrl
         "
+        cxBtnLikeLink
         class="btn btn-block btn-secondary"
       >
         {{ 'orderDetails.cancellationAndReturn.returnAction' | cxTranslate }}

feature-libs/order/components/order-details/order-details.module.ts

@@ -31,6 +31,7 @@ import {
   PromotionsModule,
   ProvideOutletOptions,
   SpinnerModule,
+  BtnLikeLinkModule,
 } from '@spartacus/storefront';
 import {
   MyAccountV2ConsignmentTrackingComponent,
@@ -110,6 +111,7 @@ const moduleComponents = [
     IconModule,
     MyAccountV2DownloadInvoicesModule,
     AbstractOrderContextModule,
+    BtnLikeLinkModule,
   ],
   providers: [
     OrderOverviewComponentService,

feature-libs/order/components/order-history/order-history.component.html

@@ -243,6 +243,7 @@ <h2 *ngIf="!type.replenishmentOrder">
                   [routerLink]="{ cxRoute: 'home' } | cxUrl"
                   routerLinkActive="active"
                   class="btn btn-primary btn-block"
+                  cxBtnLikeLink
                   >{{ 'orderHistory.startShopping' | cxTranslate }}</a
                 >
               </ng-template>

feature-libs/order/components/order-history/order-history.module.ts

@@ -18,6 +18,7 @@ import {
   UrlModule,
 } from '@spartacus/core';
 import {
+  BtnLikeLinkModule,
   ListNavigationModule,
   MediaModule,
   SpinnerModule,
@@ -56,6 +57,7 @@ const moduleComponents = [
     I18nModule,
     SpinnerModule,
     MediaModule,
+    BtnLikeLinkModule,
   ],
   declarations: [OrderHistoryComponent, ...moduleComponents],
   exports: [OrderHistoryComponent, ...moduleComponents],

feature-libs/order/components/replenishment-order-details/replenishment-order-cancellation/replenishment-order-cancellation.component.html

@@ -1,13 +1,13 @@
 <div class="cx-cancel-replenishment-btns row">
   <div class="col-xs-12 col-md-5 col-lg-4">
     <a
-      role="button"
       class="btn btn-block btn-secondary"
       [routerLink]="
         {
           cxRoute: 'replenishmentOrders',
         } | cxUrl
       "
+      cxBtnLikeLink
     >
       {{ 'common.back' | cxTranslate }}
     </a>

feature-libs/order/components/replenishment-order-details/replenishment-order-details.module.ts

@@ -14,6 +14,7 @@ import {
   UrlModule,
 } from '@spartacus/core';
 import {
+  BtnLikeLinkModule,
   CardModule,
   ListNavigationModule,
   PromotionsModule,
@@ -42,6 +43,7 @@ const moduleComponents = [ReplenishmentOrderCancellationComponent];
     SpinnerModule,
     ListNavigationModule,
     RouterModule,
+    BtnLikeLinkModule,
   ],
   providers: [
     provideDefaultConfig(defaultReplenishmentOrderCancellationLayoutConfig),

feature-libs/order/components/replenishment-order-history/replenishment-order-history.component.html

@@ -282,6 +282,7 @@ <h3>
               [routerLink]="{ cxRoute: 'home' } | cxUrl"
               routerLinkActive="active"
               class="btn btn-primary btn-block"
+              cxBtnLikeLink
               >{{ 'orderHistory.startShopping' | cxTranslate }}</a
             >
           </div>

feature-libs/order/components/replenishment-order-history/replenishment-order-history.module.ts

@@ -15,7 +15,7 @@ import {
   provideDefaultConfig,
   UrlModule,
 } from '@spartacus/core';
-import { ListNavigationModule } from '@spartacus/storefront';
+import { BtnLikeLinkModule, ListNavigationModule } from '@spartacus/storefront';
 import { defaultReplenishmentOrderCancellationLayoutConfig } from '../replenishment-order-details/default-replenishment-order-cancellation-layout.config';
 import { ReplenishmentOrderHistoryComponent } from './replenishment-order-history.component';
 
@@ -26,6 +26,7 @@ import { ReplenishmentOrderHistoryComponent } from './replenishment-order-histor
     ListNavigationModule,
     UrlModule,
     I18nModule,
+    BtnLikeLinkModule,
     FeaturesConfigModule,
   ],
   providers: [

feature-libs/organization/order-approval/components/details/order-approval-detail-form/order-approval-detail-form.component.html

@@ -85,9 +85,9 @@
       <div class="form-group row">
         <div class="col-lg-4 col-md-12">
           <a
-            role="button"
             [routerLink]="{ cxRoute: 'orderApprovals' } | cxUrl"
             class="btn btn-block btn-secondary"
+            cxBtnLikeLink
             >{{ 'orderApprovalDetails.back' | cxTranslate }}</a
           >
         </div>

feature-libs/organization/order-approval/components/details/order-approval-details.module.ts

@@ -22,7 +22,11 @@ import {
   OrderDetailsService,
   OrderOverviewComponent,
 } from '@spartacus/order/components';
-import { FormErrorsModule, SpinnerModule } from '@spartacus/storefront';
+import {
+  BtnLikeLinkModule,
+  FormErrorsModule,
+  SpinnerModule,
+} from '@spartacus/storefront';
 import { ApproverGuard } from '../../core/guards/approver.guard';
 import { OrderApprovalDetailFormComponent } from './order-approval-detail-form/order-approval-detail-form.component';
 import { OrderApprovalDetailService } from './order-approval-detail.service';
@@ -37,6 +41,7 @@ import { OrderDetailPermissionResultsComponent } from './order-detail-permission
     FormErrorsModule,
     SpinnerModule,
     RouterModule,
+    BtnLikeLinkModule,
     ConfigModule.withConfig(<CmsConfig>{
       cmsComponents: {
         OrderApprovalDetailTotalsComponent: {

feature-libs/organization/unit-order/components/unit-level-order-history/unit-level-order-history.component.html

@@ -251,6 +251,7 @@
                 [routerLink]="{ cxRoute: 'home' } | cxUrl"
                 routerLinkActive="active"
                 class="btn btn-primary btn-block"
+                cxBtnLikeLink
                 >{{ 'unitLevelOrderHistory.startShopping' | cxTranslate }}</a
               >
             </div>

feature-libs/organization/unit-order/components/unit-level-order-history/unit-level-order-history.module.ts

@@ -17,8 +17,8 @@ import {
   provideDefaultConfig,
   UrlModule,
 } from '@spartacus/core';
+import { BtnLikeLinkModule, ListNavigationModule } from '@spartacus/storefront';
 import { UnitLevelOrdersViewerGuard } from '@spartacus/organization/unit-order/core';
-import { ListNavigationModule } from '@spartacus/storefront';
 import { UnitLevelOrderHistoryFilterModule } from './filter/unit-level-order-history-filter.module';
 import { UnitLevelOrderHistoryComponent } from './unit-level-order-history.component';
 
@@ -32,6 +32,7 @@ import { UnitLevelOrderHistoryComponent } from './unit-level-order-history.compo
     UrlModule,
     I18nModule,
     UnitLevelOrderHistoryFilterModule,
+    BtnLikeLinkModule,
     FeaturesConfigModule,
   ],
   declarations: [UnitLevelOrderHistoryComponent],

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

@@ -55,6 +55,9 @@
   "cartItems": {
     "item": "Item"
   },
+  "cardActions": {
+    "getDirections": "Get Directions, this link opens in a new window"
+  },
   "deliveryPointOfServiceDetails": {
     "itemsToBePickUp": "Items To Be Pick-Up",
     "pickUpInStoreAddress": "Pick Up Store Address",