Merge pull request #5872 from magento-tsg/2.4.0-develop-pr65

[TSG] Fixes for 2.4 (pr65) (2.4.0-develop)

Author: zakdma

app/code/Magento/Customer/Setup/Patch/Data/UpdateDefaultCustomerGroupInConfig.php

@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Setup\Patch\Data;
+
+use Magento\Customer\Model\GroupManagement;
+use Magento\Customer\Model\Vat;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+
+/**
+ * Update default customer group id in customer configuration if it's value is NULL
+ */
+class UpdateDefaultCustomerGroupInConfig implements DataPatchInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var GroupManagement
+     */
+    private $groupManagement;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param GroupManagement $groupManagement
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        GroupManagement $groupManagement
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->groupManagement = $groupManagement;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function apply()
+    {
+        $customerGroups = $this->groupManagement->getLoggedInGroups();
+        $commonGroup = array_shift($customerGroups);
+
+        $this->moduleDataSetup->getConnection()->update(
+            $this->moduleDataSetup->getTable('core_config_data'),
+            ['value' => $commonGroup->getId()],
+            [
+                'value is ?' => new \Zend_Db_Expr('NULL'),
+                'path = ?' => GroupManagement::XML_PATH_DEFAULT_ID,
+            ]
+        );
+
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function getDependencies()
+    {
+        return [
+            DefaultCustomerGroupsAndAttributes::class,
+        ];
+    }
+}

app/code/Magento/Customer/etc/adminhtml/system.xml

@@ -40,6 +40,7 @@
                 <field id="default_group" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Default Group</label>
                     <source_model>Magento\Customer\Model\Config\Source\Group</source_model>
+                    <validate>required-entry</validate>
                 </field>
                 <field id="viv_domestic_group" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Group for Valid VAT ID - Domestic</label>

lib/internal/Magento/Framework/View/Element/Html/Calendar.php

@@ -107,9 +107,7 @@ protected function _toHtml()
             ]
         );
 
-        // get "today" and "week" words
-        $this->assign('today', $this->encoder->encode($localeData['fields']['day']['relative']['0']));
-        $this->assign('week', $this->encoder->encode($localeData['fields']['week']['dn']));
+        $this->assignFieldsValues($localeData);
 
         // get "am" & "pm" words
         $this->assign('am', $this->encoder->encode($localeData['calendar']['gregorian']['AmPmMarkers']['0']));
@@ -189,4 +187,25 @@ public function getYearRange()
         return (new \DateTime())->modify('- 100 years')->format('Y')
             . ':' . (new \DateTime())->modify('+ 100 years')->format('Y');
     }
+
+    /**
+     * Assign "fields" values from the ICU data
+     *
+     * @param \ResourceBundle $localeData
+     */
+    private function assignFieldsValues(\ResourceBundle $localeData): void
+    {
+        /**
+         * Fields value in the current position has been added to ICU Data tables
+         * starting with ICU library version 51.1.
+         * Due to fact that we do not use these variables in templates, we do not initialize them for older versions
+         *
+         * @see https://github.com/unicode-org/icu/blob/release-50-2/icu4c/source/data/locales/en.txt
+         * @see https://github.com/unicode-org/icu/blob/release-51-2/icu4c/source/data/locales/en.txt
+         */
+        if ($localeData->get('fields')) {
+            $this->assign('today', $this->encoder->encode($localeData['fields']['day']['relative']['0']));
+            $this->assign('week', $this->encoder->encode($localeData['fields']['week']['dn']));
+        }
+    }
 }