fix for github issue: magento#32177

Sental · Feb 7, 2022 · db8f86d · db8f86d
1 parent 72239c5
commit db8f86d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
@@ -134,7 +134,7 @@ private function convertElementsToSelect($elements, $attributesToConvert)
 
             foreach ($options as $key => $value) {
                 $elements[$code]['options'][] = [
-                    'value' => $key,
+                    'value' => $value,
                     'label' => $value,
                 ];
             }

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
@@ -235,9 +235,13 @@ protected function _prepareForm()
         if ($prefixElement) {
             $prefixOptions = $this->options->getNamePrefixOptions($this->getStore());
             if (!empty($prefixOptions)) {
+                $mappedPrefixOptions = array ();
+				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());
                 }