hotfix/cms-guard-and-missing-translations

view/adminhtml/web/js/checkout/dist/main.css

@@ -9070,7 +9070,7 @@ a {
 .braintree-payment__title .divider-line {
   border-bottom: var(--divider__border);
   margin-left: var(--indent__base);
-  width: 100%;
+  flex-grow: 1;
   display: var(--divider-line-display, block);
 }
 .braintree-payment__icon {

view/adminhtml/web/js/checkout/src/components/Steps/PaymentPage/Braintree/DropIn/styles.scss

@@ -19,7 +19,7 @@
     .divider-line {
       border-bottom: var(--divider__border);
       margin-left: var(--indent__base);
-      width: 100%;
+      flex-grow: 1;
       display: var(--divider-line-display, block);
     }
   }

view/frontend/web/js/checkout/src/components/Steps/PaymentPage/Braintree/DropIn/styles.scss

@@ -19,7 +19,7 @@
     .divider-line {
       border-bottom: var(--divider__border);
       margin-left: var(--indent__base);
-      width: 100%;
+      flex-grow: 1;
       display: var(--divider-line-display, block);
     }
   }

view/frontend/web/js/checkout/src/locales/en-US.js

@@ -130,6 +130,16 @@ export default {
       addressForm: {
         saveAddressButton: 'Use this address',
         linkText: 'Enter address manually',
+        useMyLocation: 'Use My Location',
+        collectLocations: 'Where would you like to collect it?',
+        closestLocations: 'Nearest Collection Locations',
+        noLocations: 'No locations found for current search.',
+        collectionName: 'Who is collecting the order?',
+        collectionBillingTitle: 'Billing Details',
+        submitCollectionDetails: 'Submit collection details',
+        collectionDistance: '{distance} miles',
+        viewMapAndHours: 'View map and opening hours',
+        selectLocation: 'SELECT LOCATION',
         addressField: {
           placeholder: 'Address (line {line})',
           label: 'Address (line {line})',
@@ -195,6 +205,7 @@ export default {
     unexpectedPaymentError: 'An unexpected error occurred',
     applePayNoShippingMethods:
       'No shipping methods found for the selected address.',
+    postcodeLookup: 'Unable to get your location.',
   },
   welcomeMessages: {
     accountBody: 'Sign in or continue as a guest.',
@@ -206,7 +217,7 @@ export default {
   },
   signInButton: 'Sign In',
   noAccountGuestButton: 'Continue as a Guest',
-  accountGuestButton: 'Or Continue as a Guest',
+  accountGuestButton: 'Continue as a Guest',
   continueButton: 'Continue',
   forgotPass: 'Forgot your password?',
   passwordRequirementsText:
@@ -240,6 +251,8 @@ export default {
     titleGuest: 'Select a payment method',
     titleStored: 'Your saved payment methods',
     titleNew: 'Select new payment method',
+    freePaymentLabel: 'No Payment Information Required',
+    checkMOLabel: 'Check / Money Order',
     payNow: 'Pay Now',
     storedPayments: 'Your Saved Payments',
     creditDebitCard: 'Credit or debit card',
@@ -329,4 +342,13 @@ export default {
     from: 'From',
     message: 'Message',
   },
+  days: {
+    monday: 'Monday',
+    tuesday: 'Tuesday',
+    wednesday: 'Wednesday',
+    thursday: 'Thursday',
+    friday: 'Friday',
+    saturday: 'Saturday',
+    sunday: 'Sunday',
+  },
 };

view/frontend/web/js/checkout/src/stores/ConfigStores/ConfigStore.js

@@ -18,6 +18,19 @@ import mapCustomConfigs from '@/helpers/storeConfigs/mapCustomConfigs';
 import handleInitialConfig from '@/helpers/storeConfigs/handleInitialConfig';
 import getMagentoSolutionType from '@/helpers/getMagentoSolutionType';
 
+async function getOptionalBlock(blockId) {
+  try {
+    return await getBlock(blockId);
+  } catch (error) {
+    if (error?.response?.status === 404) {
+      console.warn(`CMS block "${blockId}" could not be loaded.`, error.message);
+      return {};
+    }
+
+    throw error;
+  }
+}
+
 export default defineStore('configStore', {
   state: () => ({
     staticUrl: getFallBackStaticPath(),
@@ -309,7 +322,7 @@ export default defineStore('configStore', {
 
       if (privacyPolicyId) {
         const data = await this.getCachedResponse(
-          getBlock,
+          getOptionalBlock,
           'getPrivacyPolicyBlock',
           privacyPolicyId,
         );
@@ -323,7 +336,7 @@ export default defineStore('configStore', {
 
       if (generalTermsServicesId) {
         const data = await this.getCachedResponse(
-          getBlock,
+          getOptionalBlock,
           'getGeneralTermsServicesBlock',
           generalTermsServicesId,
         );
@@ -337,7 +350,7 @@ export default defineStore('configStore', {
 
       if (withdrawTermsServicesId) {
         const data = await this.getCachedResponse(
-          getBlock,
+          getOptionalBlock,
           'getWithdrawTermsServicesBlock',
           withdrawTermsServicesId,
         );