Merge branch 'develop' into feature/CXSPA-9334

SAP · Feb 11, 2025 · a6d4bf2 · a6d4bf2
2 parents 732a1d0 + 1d38089
commit a6d4bf2
Show file tree

Hide file tree

Showing 323 changed files with 10,885 additions and 334 deletions.
diff --git a/.env-cmdrc b/.env-cmdrc
@@ -15,8 +15,7 @@
     "CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-p1-public.model-t.myhybris.cloud"
   },
   "cds": {
-    "CX_CDS": "true",
-    "CX_SCI": "false"
+    "CX_CDS": "true"
   },
   "lighthouse": {
     "CX_BASE_URL": "https://api.spartacus.rocks"

diff --git a/docs/migration/2211_35/modernize-apps-migrated-from-2211.32-to-2211.35.md b/docs/migration/2211_35/modernize-apps-migrated-from-2211.32-to-2211.35.md
@@ -2,6 +2,22 @@
 
 New Angular 19 apps are configured a bit differently than the Angular 17 apps migrated to v19. This document is a migration guide for modernizing the migrated apps to look as much as possible like the new Angular 19 apps.
 
+# Automatic migration
+
+The Spartacus team provides special schematics that automatically modernize the app to look as much as possible like the new Angular 19 apps.
+
+Please run the following command from your project root directory:
+
+```bash
+ng g @spartacus/schematics:modernize-app-migrated-from-2211_32-to-2211_35
+```
+
+In case of any issues during the automatic migration, you can always fall back to the manual migration steps below.
+
+# Manual migration
+
+Here are the migration steps in detail:
+
 ### `angular.json`
 
 1. In the section `architect > build > options > assets`, please replace 2 string values in the array: `"src/favicon.ico"` and `"src/assets"` with a single object `{ "glob": "**/*", "input": "public" }`

diff --git a/docs/migration/2211_35/modernize-apps-migrated-from-6.8-to-2211.19.md b/docs/migration/2211_35/modernize-apps-migrated-from-6.8-to-2211.19.md
@@ -11,6 +11,40 @@ The benefits of using the new Angular configuration format are:
 The side-effect consequences of using the new configuration format are:
 - For SSR apps: the server-side rendering and prerendering scripts will be executed differently (it will be explained in the last section of this page "[New commands for SSR projects](#new-commands-for-ssr-projects)")
 
+
+# Automatic migration
+
+The Spartacus team provides special schematics that automatically modernize the app to look as much as possible like the new Angular 17 apps.
+
+Note: the tool was released only in `@spartacus/schematics` v2211.35.0, but you need to run it before fully upgrading your app to this version.
+To do this, you'll need to install `@spartacus/schematics@2211.35.0` in a temporary directory and execute the migration schematic from there.
+
+Please run those commands from your project root directory:
+
+```bash
+# 1. Create a temporary sibling directory for the isolated Schematics v2211.35 installation
+node -e "require('fs').mkdirSync('../temp-schematics-35')"
+
+# 2. Install schematics in the temporary directory
+npm install @spartacus/schematics@2211.35.0 --prefix ../temp-schematics-35
+
+# 3. Execute in your project the schematics from the temporary directory
+ng g ../temp-schematics-35/node_modules/@spartacus/schematics:modernize-app-migrated-from-6_8-to-2211_19
+
+# 4. Clean up the temporary directory
+node -e "require('fs').rmSync('../temp-schematics-35', { recursive: true, force: true })"
+```
+
+In case of any issues during the automatic migration, you can always fall back to the manual migration steps below.
+
+> ⚠️ Warning:
+>
+> Reminder for SSR apps: from now on the server-side rendering and prerendering scripts will be executed differently (see the last section of this page "[New commands for SSR projects](#new-commands-for-ssr-projects)")
+
+In case of any issues during the automatic migration, you can always fall back to the manual migration steps below.
+
+# Manual migration
+
 Here are the migration steps in detail:
 
 ## Migration to the new Angular `application` builder

diff --git a/...eckout/scheduled-replenishment/assets/translations/cs/checkoutScheduledReplenishment.json b/...eckout/scheduled-replenishment/assets/translations/cs/checkoutScheduledReplenishment.json
@@ -9,6 +9,7 @@
     "recurrencePeriodType_MONTHLY": "Měsíc",
     "dayOfMonth": "Dne",
     "startOn": "Začít dne",
-    "repeatOnDays": "Opakovat v následujících dnech"
+    "repeatOnDays": "Opakovat v následujících dnech",
+    "duration": "Doba trvání"
   }
 }
diff --git a/...eckout/scheduled-replenishment/assets/translations/de/checkoutScheduledReplenishment.json b/...eckout/scheduled-replenishment/assets/translations/de/checkoutScheduledReplenishment.json
@@ -9,6 +9,7 @@
     "recurrencePeriodType_MONTHLY": "Monat",
     "dayOfMonth": "Am Tag",
     "startOn": "Start am",
-    "repeatOnDays": "An den folgenden Tagen wiederholen"
+    "repeatOnDays": "An den folgenden Tagen wiederholen",
+    "duration": "Dauer"
   }
 }
diff --git a/...eckout/scheduled-replenishment/assets/translations/es/checkoutScheduledReplenishment.json b/...eckout/scheduled-replenishment/assets/translations/es/checkoutScheduledReplenishment.json
@@ -9,6 +9,7 @@
     "recurrencePeriodType_MONTHLY": "Mes",
     "dayOfMonth": "El día",
     "startOn": "Fecha de inicio",
-    "repeatOnDays": "Repetir en los siguientes días"
+    "repeatOnDays": "Repetir en los siguientes días",
+    "duration": "Duración"
   }
 }
diff --git a/...out/scheduled-replenishment/assets/translations/es_CO/checkoutScheduledReplenishment.json b/...out/scheduled-replenishment/assets/translations/es_CO/checkoutScheduledReplenishment.json
@@ -9,6 +9,7 @@
     "recurrencePeriodType_MONTHLY": "Mes",
     "dayOfMonth": "El día",
     "startOn": "Fecha de inicio",
-    "repeatOnDays": "Repetir en los siguientes días"
+    "repeatOnDays": "Repetir en los siguientes días",
+    "duration": "Duración"
   }
 }
diff --git a/...eckout/scheduled-replenishment/assets/translations/fr/checkoutScheduledReplenishment.json b/...eckout/scheduled-replenishment/assets/translations/fr/checkoutScheduledReplenishment.json
@@ -9,6 +9,7 @@
     "recurrencePeriodType_MONTHLY": "mois",
     "dayOfMonth": "À la date",
     "startOn": "Début le",
-    "repeatOnDays": "Répéter les jours suivants"
+    "repeatOnDays": "Répéter les jours suivants",
+    "duration": "Durée"
   }
 }
diff --git a/...eckout/scheduled-replenishment/assets/translations/hi/checkoutScheduledReplenishment.json b/...eckout/scheduled-replenishment/assets/translations/hi/checkoutScheduledReplenishment.json
@@ -9,6 +9,7 @@
     "recurrencePeriodType_MONTHLY": "माह",
     "dayOfMonth": "दिन पर",
     "startOn": "प्रारंभ दिनांक",
-    "repeatOnDays": "निम्न दिनों पर फिर से करें"
+    "repeatOnDays": "निम्न दिनों पर फिर से करें",
+    "duration": "अवधि"
   }
 }
diff --git a/...eckout/scheduled-replenishment/assets/translations/hu/checkoutScheduledReplenishment.json b/...eckout/scheduled-replenishment/assets/translations/hu/checkoutScheduledReplenishment.json
@@ -9,6 +9,7 @@
     "recurrencePeriodType_MONTHLY": "Hónap",
     "dayOfMonth": "Adott napon",
     "startOn": "Kezdés dátuma",
-    "repeatOnDays": "Ismétlés a következő napokon:"
+    "repeatOnDays": "Ismétlés a következő napokon:",
+    "duration": "Időtartam"
   }
 }
diff --git a/...eckout/scheduled-replenishment/assets/translations/id/checkoutScheduledReplenishment.json b/...eckout/scheduled-replenishment/assets/translations/id/checkoutScheduledReplenishment.json
@@ -9,6 +9,7 @@
     "recurrencePeriodType_MONTHLY": "Bulan",
     "dayOfMonth": "Pada hari",
     "startOn": "Dimulai pada",
-    "repeatOnDays": "Ulangi di hari berikutnya"
+    "repeatOnDays": "Ulangi di hari berikutnya",
+    "duration": "Durasi"
   }
 }
diff --git a/...eckout/scheduled-replenishment/assets/translations/it/checkoutScheduledReplenishment.json b/...eckout/scheduled-replenishment/assets/translations/it/checkoutScheduledReplenishment.json
@@ -9,6 +9,7 @@
     "recurrencePeriodType_MONTHLY": "Mese",
     "dayOfMonth": "Il giorno",
     "startOn": "Inizia il",
-    "repeatOnDays": "Ripeti nei seguenti giorni"
+    "repeatOnDays": "Ripeti nei seguenti giorni",
+    "duration": "Durata"
   }
 }
diff --git a/...eckout/scheduled-replenishment/assets/translations/ja/checkoutScheduledReplenishment.json b/...eckout/scheduled-replenishment/assets/translations/ja/checkoutScheduledReplenishment.json
@@ -9,6 +9,7 @@
     "recurrencePeriodType_MONTHLY": "月",
     "dayOfMonth": "特定の日にち",
     "startOn": "開始日",
-    "repeatOnDays": "以下の曜日に繰り返し"
+    "repeatOnDays": "以下の曜日に繰り返し",
+    "duration": "期間"
   }
 }
diff --git a/...eckout/scheduled-replenishment/assets/translations/ko/checkoutScheduledReplenishment.json b/...eckout/scheduled-replenishment/assets/translations/ko/checkoutScheduledReplenishment.json
@@ -9,6 +9,7 @@
     "recurrencePeriodType_MONTHLY": "개월",
     "dayOfMonth": "당일",
     "startOn": "시작 날짜",
-    "repeatOnDays": "다음 날짜에 반복"
+    "repeatOnDays": "다음 날짜에 반복",
+    "duration": "기간"
   }
 }
diff --git a/...eckout/scheduled-replenishment/assets/translations/pl/checkoutScheduledReplenishment.json b/...eckout/scheduled-replenishment/assets/translations/pl/checkoutScheduledReplenishment.json
@@ -9,6 +9,7 @@
     "recurrencePeriodType_MONTHLY": "Miesiąc",
     "dayOfMonth": "Dnia",
     "startOn": "Data rozpoczęcia",
-    "repeatOnDays": "Powtarzaj w następne dni"
+    "repeatOnDays": "Powtarzaj w następne dni",
+    "duration": "Czas trwania"
   }
 }
diff --git a/...eckout/scheduled-replenishment/assets/translations/pt/checkoutScheduledReplenishment.json b/...eckout/scheduled-replenishment/assets/translations/pt/checkoutScheduledReplenishment.json
@@ -9,6 +9,7 @@
     "recurrencePeriodType_MONTHLY": "Mês",
     "dayOfMonth": "No dia",
     "startOn": "Iniciar em",
-    "repeatOnDays": "Repetir nos dias seguintes"
+    "repeatOnDays": "Repetir nos dias seguintes",
+    "duration": "Duração"
   }
 }
diff --git a/...eckout/scheduled-replenishment/assets/translations/ru/checkoutScheduledReplenishment.json b/...eckout/scheduled-replenishment/assets/translations/ru/checkoutScheduledReplenishment.json
@@ -9,6 +9,7 @@
     "recurrencePeriodType_MONTHLY": "месяц",
     "dayOfMonth": "день месяца",
     "startOn": "Начало",
-    "repeatOnDays": "Повторять по следующим дням"
+    "repeatOnDays": "Повторять по следующим дням",
+    "duration": "Продолжительность"
   }
 }
diff --git a/...eckout/scheduled-replenishment/assets/translations/zh/checkoutScheduledReplenishment.json b/...eckout/scheduled-replenishment/assets/translations/zh/checkoutScheduledReplenishment.json
@@ -9,6 +9,7 @@
     "recurrencePeriodType_MONTHLY": "月",
     "dayOfMonth": "日期",
     "startOn": "开始日期",
-    "repeatOnDays": "以下日期重复"
+    "repeatOnDays": "以下日期重复",
+    "duration": "持续时间"
   }
 }
diff --git a/...out/scheduled-replenishment/assets/translations/zh_TW/checkoutScheduledReplenishment.json b/...out/scheduled-replenishment/assets/translations/zh_TW/checkoutScheduledReplenishment.json
@@ -9,6 +9,7 @@
     "recurrencePeriodType_MONTHLY": "月",
     "dayOfMonth": "於日期",
     "startOn": "開始日期",
-    "repeatOnDays": "於下列日期重複"
+    "repeatOnDays": "於下列日期重複",
+    "duration": "持續期"
   }
 }
diff --git a/feature-libs/organization/user-registration/assets/translations/en/userRegistration.json b/feature-libs/organization/user-registration/assets/translations/en/userRegistration.json
@@ -5,6 +5,10 @@
         "label": "Title (optional)",
         "placeholder": "Title"
       },
+      "titleCodeOnOTPForm": {
+        "label": "Title",
+        "placeholder": "Select Title"
+      },
       "firstName": {
         "label": "First name",
         "placeholder": "First name"
@@ -25,38 +29,71 @@
         "label": "City/Town (optional)",
         "placeholder": "Please select City/Town"
       },
+      "cityOnOTPForm": {
+        "label": "City/Town",
+        "placeholder": "Please select City/Town"
+      },
       "country": {
         "label": "Country (optional)",
         "placeholder": "Select Country"
       },
+      "countryOnOTPForm": {
+        "label": "Country",
+        "placeholder": "Select Country"
+      },
       "state": {
         "label": "State/Province (optional)",
         "placeholder": "Select State/Province"
       },
+      "stateOnOTPForm": {
+        "label": "State/Province",
+        "placeholder": "Select State/Province"
+      },
       "postalCode": {
         "label": "Zip/Postal code (optional)",
         "placeholder": "Zip/Postal code"
       },
+      "postalCodeOnOTPForm": {
+        "label": "Zip/Postal code",
+        "placeholder": "Zip/Postal code"
+      },
       "addressLine": {
         "label": "Address (optional)",
         "placeholder": "Address"
       },
+      "addressLineOnOTPForm": {
+        "label": "Address",
+        "placeholder": "Address"
+      },
       "secondAddressLine": {
         "label": "Address line 2 (optional)",
         "placeholder": "Address line 2"
       },
+      "secondAddressLineOnOTPForm": {
+        "label": "Address line 2",
+        "placeholder": "Address line 2"
+      },
       "phoneNumber": {
         "label": "Phone number (optional)",
         "placeholder": "Phone number"
       },
+      "phoneNumberOnOTPForm": {
+        "label": "Phone number",
+        "placeholder": "Phone number"
+      },
       "message": {
         "label": "Message (optional)",
         "placeholder": "An example data for the message field: \"Department: Ground support; Position: Chief safe guard; Report to: Steve Jackson; Comments: Please create new account for me\"."
+      },
+      "messageOnOTPForm": {
+        "label": "Message",
+        "placeholder": "An example data for the message field: \"Department: Ground support; Position: Chief safe guard; Report to: Steve Jackson; Comments: Please create new account for me\"."
       }
     },
     "messageToApproverTemplate": "Company name: {{companyName}},\n  Phone number: {{phoneNumber}},\n  Address: {{addressLine}} {{secondAddressLine}} {{city}} {{state}} {{postalCode}} {{country}},\n  Message: {{message}}",
     "successFormSubmitMessage": "Thank you for registering! A representative will contact you shortly and confirm your access information.",
     "formSubmitButtonLabel": "Register",
+    "continueWithOTP": "Continue",
     "goToLoginButtonLabel": "Already registered? Go to Sign in",
     "httpHandlers": {
       "conflict": "User with this e-mail address already exists."

diff --git a/feature-libs/organization/user-registration/components/public_api.ts b/feature-libs/organization/user-registration/components/public_api.ts
@@ -6,3 +6,5 @@
 
 export * from './user-registration-components.module';
 export * from './form/index';
+export * from './registration-otp-form/index';
+export * from './verification-token-form/index';
diff --git a/feature-libs/organization/user-registration/components/registration-otp-form/index.ts b/feature-libs/organization/user-registration/components/registration-otp-form/index.ts
@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2025 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './user-registration-otp-form.component';
+export * from './user-registration-otp-form.module';