[FIX] CXSPA-9334 Terms and condition URL not changed accordingly when…

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

@@ -16,8 +16,8 @@
       />
       <span class="form-check-label">
         {{ 'checkoutReview.confirmThatRead' | cxTranslate }}
-        <a
-          [routerLink]="{ cxRoute: 'termsAndConditions' } | cxUrl"
+         <a
+          [attr.href]="termsAndConditionUrl$ | async"
           class="cx-tc-link"
           target="_blank"
           rel="noopener noreferrer"

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

@@ -9,26 +9,36 @@ import {
   Component,
   ComponentRef,
   OnDestroy,
+  OnInit,
   ViewContainerRef,
 } from '@angular/core';
 import {
   UntypedFormBuilder,
   UntypedFormGroup,
   Validators,
 } from '@angular/forms';
-import { RoutingService } from '@spartacus/core';
+import { Router } from '@angular/router';
+import {
+  CurrencyService,
+  LanguageService,
+  RoutingService,
+} from '@spartacus/core';
 import { OrderFacade } from '@spartacus/order/root';
 import { LaunchDialogService, LAUNCH_CALLER } from '@spartacus/storefront';
-import { Observable } from 'rxjs';
+import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 
 @Component({
   selector: 'cx-place-order',
   templateUrl: './checkout-place-order.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: false,
 })
-export class CheckoutPlaceOrderComponent implements OnDestroy {
+export class CheckoutPlaceOrderComponent implements OnDestroy, OnInit {
   placedOrder: void | Observable<ComponentRef<any> | undefined>;
+  currency: string;
+  termsAndConditionUrl$ = new BehaviorSubject<string>('');
+  private currency$ = this.currencyService.getActive();
+  private language$ = this.languageService.getActive();
 
   checkoutSubmitForm: UntypedFormGroup = this.fb.group({
     termsAndConditions: [false, Validators.requiredTrue],
@@ -43,9 +53,16 @@ export class CheckoutPlaceOrderComponent implements OnDestroy {
     protected routingService: RoutingService,
     protected fb: UntypedFormBuilder,
     protected launchDialogService: LaunchDialogService,
-    protected vcr: ViewContainerRef
+    protected vcr: ViewContainerRef,
+    protected route: Router,
+    protected currencyService: CurrencyService,
+    protected languageService: LanguageService
   ) {}
 
+  ngOnInit() {
+    this.setTermsOfConditionUrl();
+  }
+
   submitForm(): void {
     if (this.checkoutSubmitForm.valid) {
       this.placedOrder = this.launchDialogService.launch(
@@ -78,6 +95,16 @@ export class CheckoutPlaceOrderComponent implements OnDestroy {
     this.routingService.go({ cxRoute: 'orderConfirmation' });
   }
 
+  setTermsOfConditionUrl(): void {
+    combineLatest([this.currency$, this.language$]).subscribe(
+      ([currency, language]) => {
+        const segments = this.route.url.split('/').filter((s) => !!s);
+        const url = `/${segments[0]}/${language}/${currency}/terms-and-conditions`;
+        this.termsAndConditionUrl$.next(url);
+      }
+    );
+  }
+
   ngOnDestroy(): void {
     this.launchDialogService.clear(LAUNCH_CALLER.PLACE_ORDER_SPINNER);
   }

feature-libs/checkout/base/components/checkout-progress/checkout-progress.component.html

@@ -10,7 +10,8 @@
           [class.active]="isActive(i)"
           [class.disabled]="isDisabled(i)"
         >
-          <a
+
+          <!--<a
             [routerLink]="{ cxRoute: step.routeName } | cxUrl"
             class="cx-link"
             [attr.aria-current]="isActive(i) ? 'step' : null"
@@ -31,6 +32,28 @@
                     }
             "
           >
+          </a>-->
+          <a
+            [attr.href]="setNavUrl(step.routeName)"
+            class="cx-link"
+            [attr.aria-current]="isActive(i) ? 'step' : null"
+            [attr.aria-disabled]="isDisabled(i) ? 'true' : null"
+            [class.active]="isActive(i)"
+            [class.disabled]="isDisabled(i)"
+            [tabindex]="getTabIndex(i)"
+            [innerHTML]="
+              step.nameMultiLine !== false
+                ? (step.name | cxTranslate | cxMultiLine)
+                : (step.name | cxTranslate)
+            "
+            [attr.aria-label]="
+              'checkoutProgress.state.' + getStepState(i)
+                | cxTranslate
+                  : {
+                      step: step.name | cxTranslate,
+                    }
+            "
+          >
           </a>
         </li>
       </ng-container>

feature-libs/checkout/base/components/checkout-progress/checkout-progress.component.ts

@@ -4,23 +4,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { CheckoutStep, CheckoutStepState } from '@spartacus/checkout/base/root';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import { CheckoutStepService } from '../services/checkout-step.service';
+import { Router } from '@angular/router';
+import { CurrencyService, LanguageService } from '@spartacus/core';
 
 @Component({
   selector: 'cx-checkout-progress',
   templateUrl: './checkout-progress.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: false,
 })
-export class CheckoutProgressComponent {
+export class CheckoutProgressComponent implements OnInit {
   private _steps$: BehaviorSubject<CheckoutStep[]> =
     this.checkoutStepService.steps$;
+  currency: string | undefined;
+  language: string | undefined;
 
-  constructor(protected checkoutStepService: CheckoutStepService) {}
+  constructor(
+    protected checkoutStepService: CheckoutStepService,
+    protected route: Router,
+    protected currencyService: CurrencyService,
+    protected languageService: LanguageService
+  ) {}
 
   activeStepIndex: number;
   activeStepIndex$: Observable<number> =
@@ -32,6 +41,10 @@ export class CheckoutProgressComponent {
     return this._steps$.asObservable();
   }
 
+  ngOnInit(): void {
+    this.setLanguageAndCurrency();
+  }
+
   getTabIndex(stepIndex: number): number {
     return !this.isActive(stepIndex) && !this.isDisabled(stepIndex) ? 0 : -1;
   }
@@ -53,4 +66,37 @@ export class CheckoutProgressComponent {
     }
     return CheckoutStepState.COMPLETED;
   }
+
+  setNavUrl(routeName: string): string {
+    const segments = this.route.url.split('/').filter((s) => !!s);
+
+    if (!this.currency || !this.language) {
+      return '';
+    }
+
+    const baseUrl = `/${segments[0]}/${this.language}/${this.currency}/checkout`;
+
+    switch (routeName) {
+      case 'checkoutDeliveryAddress':
+        return `${baseUrl}/delivery-address`;
+      case 'checkoutPaymentDetails':
+        return `${baseUrl}/payment-details`;
+      case 'checkoutReviewOrder':
+        return `${baseUrl}/review-order`;
+      case 'checkoutDeliveryMode':
+        return `${baseUrl}/delivery-mode`;
+      default:
+        return baseUrl;
+    }
+  }
+
+  setLanguageAndCurrency(): void {
+    combineLatest([
+      this.currencyService.getActive(),
+      this.languageService.getActive(),
+    ]).subscribe(([currency, language]) => {
+      this.currency = currency;
+      this.language = language;
+    });
+  }
 }

feature-libs/checkout/scheduled-replenishment/components/checkout-place-order/checkout-place-order.component.ts

@@ -13,7 +13,8 @@ import {
 } from '@angular/core';
 import { UntypedFormBuilder } from '@angular/forms';
 import { CheckoutPlaceOrderComponent } from '@spartacus/checkout/base/components';
-import { RoutingService } from '@spartacus/core';
+import { CurrencyService, LanguageService, RoutingService } from '@spartacus/core';
+import { Router } from '@angular/router';
 import {
   OrderFacade,
   ORDER_TYPE,
@@ -49,9 +50,21 @@ export class CheckoutScheduledReplenishmentPlaceOrderComponent
     protected launchDialogService: LaunchDialogService,
     protected vcr: ViewContainerRef,
     protected checkoutReplenishmentFormService: CheckoutReplenishmentFormService,
-    protected scheduledReplenishmentOrderFacade: ScheduledReplenishmentOrderFacade
+    protected scheduledReplenishmentOrderFacade: ScheduledReplenishmentOrderFacade,
+    protected route: Router,
+    protected currencyService: CurrencyService,
+    protected languageService: LanguageService
   ) {
-    super(orderFacade, routingService, fb, launchDialogService, vcr);
+    super(
+      orderFacade,
+      routingService,
+      fb,
+      launchDialogService,
+      vcr,
+      route,
+      currencyService,
+      languageService
+    );
   }
 
   submitForm(): void {