@releng - sync dev to main before release #337

adobe · Sep 5, 2024 · 15a2cc6 · 15a2cc6
2 parents 7a2d996 + b072a3b
commit 15a2cc6
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -87,7 +87,7 @@
         <vault.user>admin</vault.user>
         <vault.password>admin</vault.password>
         <core.wcm.components.version>2.18.6</core.wcm.components.version>
-        <core.cif.components.version>2.14.0</core.cif.components.version>
+        <core.cif.components.version>2.14.2</core.cif.components.version>
         <graphql.client.version>1.7.10</graphql.client.version>
         <magento.graphql.version>9.1.0-magento242ee</magento.graphql.version>
         <bnd.version>5.1.2</bnd.version>

diff --git a/ui.frontend/i18n/en.json b/ui.frontend/i18n/en.json
@@ -124,7 +124,11 @@
   "checkoutPage.orderNumber": [
     {
       "type": 0,
-      "value": "Order Number"
+      "value": "Order Number: "
+    },
+    {
+      "type": 1,
+      "value": "orderNumber"
     }
   ],
   "checkoutPage.orderSummary": [

diff --git a/ui.frontend/package-lock.json b/ui.frontend/package-lock.json
diff --git a/ui.frontend/package.json b/ui.frontend/package.json
@@ -87,8 +87,8 @@
     "webpack-merge": "^4.2.1"
   },
   "dependencies": {
-    "@adobe/aem-core-cif-product-recs-extension": "2.14.0",
-    "@adobe/aem-core-cif-react-components": "2.14.0",
+    "@adobe/aem-core-cif-product-recs-extension": "2.14.2",
+    "@adobe/aem-core-cif-react-components": "2.14.2",
     "@apollo/client": "^3.5.5",
     "@babel/runtime": "^7.4.5",
     "@magento/peregrine": "11.0.0",

diff --git a/...koutPage/OrderConfirmationPage/__tests__/__snapshots__/orderConfirmationPage.spec.js.snap b/...koutPage/OrderConfirmationPage/__tests__/__snapshots__/orderConfirmationPage.spec.js.snap
@@ -7,7 +7,7 @@ exports[`OrderConfirmationPage renders OrderConfirmationPage component 1`] = `
       Thank you for your order!
     </h2>
     <div>
-      Order Number
+      Order Number: 123
     </div>
     <div>
       Shipping Information

diff --git a/ui.frontend/src/main/components/CheckoutPage/OrderConfirmationPage/orderConfirmationPage.js b/ui.frontend/src/main/components/CheckoutPage/OrderConfirmationPage/orderConfirmationPage.js
@@ -65,7 +65,7 @@ const OrderConfirmationPage = props => {
                 <div className={classes.orderNumber}>
                     <FormattedMessage
                         id={'checkoutPage.orderNumber'}
-                        defaultMessage={'Order Number'}
+                        defaultMessage={'Order Number: {orderNumber}'}
                         values={{ orderNumber }}
                     />
                 </div>