Merge branch 'develop' into feature/CXSPA-2186

feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.ts

@@ -296,7 +296,6 @@ export class AsmBindCartComponent implements OnInit, OnDestroy {
             this.asmComponentService?.setShowDeeplinkCartInfoAlert(true);
             this.asmComponentService?.handleDeepLinkNavigation();
           }
-          return;
         })
     );
   }

feature-libs/cart/base/components/cart-shared/cart-shared.module.ts

@@ -9,7 +9,7 @@ import { NgModule } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import { CartOutlets } from '@spartacus/cart/base/root';
-import { I18nModule, UrlModule } from '@spartacus/core';
+import { FeaturesConfigModule, I18nModule, UrlModule } from '@spartacus/core';
 import {
   AtMessageModule,
   IconModule,
@@ -19,13 +19,13 @@ import {
   PromotionsModule,
   provideOutlet,
 } from '@spartacus/storefront';
-import { CartItemListRowComponent } from './cart-item-list-row/cart-item-list-row.component';
+import { AddToCartModule } from '../add-to-cart/add-to-cart.module';
 import { CartCouponModule } from '../cart-coupon/cart-coupon.module';
 import { CartItemValidationWarningModule } from '../validation/cart-item-warning/cart-item-validation-warning.module';
+import { CartItemListRowComponent } from './cart-item-list-row/cart-item-list-row.component';
 import { CartItemListComponent } from './cart-item-list/cart-item-list.component';
 import { CartItemComponent } from './cart-item/cart-item.component';
 import { OrderSummaryComponent } from './order-summary/order-summary.component';
-import { AddToCartModule } from '../add-to-cart/add-to-cart.module';
 
 @NgModule({
   imports: [
@@ -43,6 +43,7 @@ import { AddToCartModule } from '../add-to-cart/add-to-cart.module';
     RouterModule,
     UrlModule,
     AddToCartModule,
+    FeaturesConfigModule,
   ],
   providers: [
     provideOutlet({

feature-libs/cart/base/components/cart-shared/order-summary/order-summary.component.html

@@ -1,4 +1,9 @@
-<div class="cx-summary-heading">
+<!-- TODO: (CXSPA-5987) Remove feature flag next major -->
+<h3 *cxFeature="'a11yCartSummaryHeadingOrder'" class="cx-summary-heading">
+  {{ 'orderCost.orderSummary' | cxTranslate }}
+</h3>
+
+<div *cxFeature="'!a11yCartSummaryHeadingOrder'" class="cx-summary-heading">
   {{ 'orderCost.orderSummary' | cxTranslate }}
 </div>
 

feature-libs/cart/base/styles/components/_order-summary.scss

@@ -8,6 +8,7 @@
 
   .cx-summary-heading {
     text-transform: capitalize;
+    // TODO: (CXSPA-5987) Remove the following propery next major release
     @include type('3');
     font-weight: var(--cx-font-weight-semi);
     border-bottom: 1px solid var(--cx-color-medium);

feature-libs/checkout/base/components/checkout-place-order/checkout-place-order.component.html

@@ -4,6 +4,7 @@
       <input
         formControlName="termsAndConditions"
         class="scaled-input form-check-input"
+        required="true"
         type="checkbox"
       />
       <span class="form-check-label">
@@ -16,6 +17,15 @@
         >
           {{ 'checkoutReview.termsAndConditions' | cxTranslate }}
         </a>
+        <abbr
+          *cxFeature="'a11yRequiredAsterisks'"
+          class="text-decoration-none"
+          title="{{ 'common.required' | cxTranslate }}"
+          >*</abbr
+        >
+        <cx-form-errors
+          [control]="checkoutSubmitForm.get('termsAndConditions')"
+        ></cx-form-errors>
       </span>
     </label>
   </div>

feature-libs/checkout/base/components/checkout-place-order/checkout-place-order.module.ts

@@ -10,11 +10,12 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import {
   CmsConfig,
+  FeaturesConfigModule,
   I18nModule,
   provideDefaultConfig,
   UrlModule,
 } from '@spartacus/core';
-import { AtMessageModule } from '@spartacus/storefront';
+import { AtMessageModule, FormErrorsModule } from '@spartacus/storefront';
 import { CartNotEmptyGuard } from '../guards/cart-not-empty.guard';
 import { CheckoutAuthGuard } from '../guards/checkout-auth.guard';
 import { CheckoutPlaceOrderComponent } from './checkout-place-order.component';
@@ -28,6 +29,8 @@ import { defaultPlaceOrderSpinnerLayoutConfig } from './default-place-order-spin
     UrlModule,
     I18nModule,
     ReactiveFormsModule,
+    FormErrorsModule,
+    FeaturesConfigModule,
   ],
   providers: [
     provideDefaultConfig(defaultPlaceOrderSpinnerLayoutConfig),

feature-libs/organization/administration/core/store/effects/b2b-user.effect.ts

@@ -7,12 +7,12 @@
 import { HttpErrorResponse } from '@angular/common/http';
 import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { FeatureConfigService } from '@spartacus/core';
 import {
   AuthActions,
   B2BUser,
   B2BUserRole,
   EntitiesModel,
+  FeatureConfigService,
   LoggerService,
   RouterState,
   RoutingService,

feature-libs/organization/administration/core/store/effects/org-unit.effect.ts

@@ -7,12 +7,12 @@
 import { HttpErrorResponse } from '@angular/common/http';
 import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { FeatureConfigService } from '@spartacus/core';
 import {
   B2BApprovalProcess,
   B2BUnit,
   B2BUser,
   EntitiesModel,
+  FeatureConfigService,
   LoggerService,
   StateUtils,
   normalizeHttpError,

feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.module.ts

@@ -8,8 +8,11 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { I18nModule, provideDefaultConfig } from '@spartacus/core';
-import { IconModule, PopoverModule } from '@spartacus/storefront';
-import { KeyboardFocusModule } from '@spartacus/storefront';
+import {
+  IconModule,
+  KeyboardFocusModule,
+  PopoverModule,
+} from '@spartacus/storefront';
 import { ConfiguratorAttributeMultiSelectionImageComponent } from './configurator-attribute-multi-selection-image.component';
 import { ConfiguratorPriceModule } from '../../../price/configurator-price.module';
 import { ConfiguratorAttributeCompositionConfig } from '../../composition/configurator-attribute-composition.config';

feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.module.ts

@@ -8,8 +8,11 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { I18nModule, provideDefaultConfig } from '@spartacus/core';
-import { IconModule, PopoverModule } from '@spartacus/storefront';
-import { KeyboardFocusModule } from '@spartacus/storefront';
+import {
+  IconModule,
+  KeyboardFocusModule,
+  PopoverModule,
+} from '@spartacus/storefront';
 import { ConfiguratorAttributeSingleSelectionImageComponent } from './configurator-attribute-single-selection-image.component';
 import { ConfiguratorPriceModule } from '../../../price/configurator-price.module';
 import { ConfiguratorAttributeCompositionConfig } from '../../composition/configurator-attribute-composition.config';

projects/schematics/src/shared/schematics-config-mappings.ts

@@ -9,7 +9,7 @@ import {
   ASM_SCHEMATICS_CONFIG,
   ASM_CUSTOMER_360_SCHEMATICS_CONFIG,
 } from './lib-configs/asm-schematics-config';
-import { QUOTE_SCHEMATICS_CONFIG } from './lib-configs';
+import { CDP_SCHEMATICS_CONFIG, QUOTE_SCHEMATICS_CONFIG } from './lib-configs';
 import {
   CART_BASE_SCHEMATICS_CONFIG,
   CART_IMPORT_EXPORT_SCHEMATICS_CONFIG,
@@ -67,7 +67,6 @@ import {
   USER_PROFILE_SCHEMATICS_CONFIG,
 } from './lib-configs/user-schematics-config';
 import { Module, SchematicConfig } from './utils/lib-utils';
-import { CDP_SCHEMATICS_CONFIG } from './lib-configs';
 
 /**
  * A list of all schematics feature configurations.

projects/storefrontapp/src/app/app.module.ts

@@ -108,6 +108,7 @@ if (!environment.production) {
         a11yOrganizationListHeadingOrder: true,
         a11yReplenishmentOrderFieldset: true,
         a11yListOversizedFocus: true,
+        a11yCartSummaryHeadingOrder: true,
       },
     }),
     provideConfig(<StoreFinderConfig>{

projects/storefrontstyles/scss/components/product/list/_product-grid-item.scss

@@ -38,7 +38,6 @@
     text-decoration: none;
     overflow: hidden;
     text-overflow: ellipsis;
-    box-orient: vertical;
     line-clamp: 2;
     max-width: 100%;
     height: 40px;