Merge branch '2.4-develop' of github.com:Sental/magento2 into 2.4-develop-prs

Author: ishakhsuvarov

app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php

@@ -132,9 +132,9 @@ private function convertElementsToSelect($elements, $attributesToConvert)
             $elements[$code]['dataType'] = 'select';
             $elements[$code]['formElement'] = 'select';
 
-            foreach ($options as $key => $value) {
+            foreach ($options as $value) {
                 $elements[$code]['options'][] = [
-                    'value' => $key,
+                    'value' => $value,
                     'label' => $value,
                 ];
             }

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php

@@ -20,21 +20,21 @@
 class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
 {
     /**
-     * Customer form factory
+     * Customer Metadata form factory
      *
      * @var \Magento\Customer\Model\Metadata\FormFactory
      */
     protected $_customerFormFactory;
 
     /**
-     * Json encoder
+     * Framework Json encoder
      *
      * @var \Magento\Framework\Json\EncoderInterface
      */
     protected $_jsonEncoder;
 
     /**
-     * Directory helper
+     * Directory helper Data
      *
      * @var \Magento\Directory\Helper\Data
      */
@@ -48,28 +48,28 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
     protected $options;
 
     /**
-     * Address service
+     * Address service - AddressRepositoryInterface
      *
      * @var \Magento\Customer\Api\AddressRepositoryInterface
      */
     protected $addressService;
 
     /**
-     * Address helper
+     * Customer Address helper
      *
      * @var \Magento\Customer\Helper\Address
      */
     protected $_addressHelper;
 
     /**
-     * Search criteria builder
+     * Search criteria builder for getList calls
      *
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
      */
     protected $searchCriteriaBuilder;
 
     /**
-     * Filter builder
+     * Filter builder for getList calls
      *
      * @var \Magento\Framework\Api\FilterBuilder
      */
@@ -235,9 +235,13 @@ protected function _prepareForm()
         if ($prefixElement) {
             $prefixOptions = $this->options->getNamePrefixOptions($this->getStore());
             if (!empty($prefixOptions)) {
+                $mappedPrefixOptions = [];
+                foreach ($prefixOptions as $prefix) {
+                    $mappedPrefixOptions[$prefix] = $prefix;
+                }
                 $fieldset->removeField($prefixElement->getId());
                 $prefixField = $fieldset->addField($prefixElement->getId(), 'select', $prefixElement->getData(), '^');
-                $prefixField->setValues($prefixOptions);
+                $prefixField->setValues($mappedPrefixOptions);
                 if ($this->getAddressId()) {
                     $prefixField->addElementValues($this->getAddress()->getPrefix());
                 }