MAGETWO-48248: [GitHub] Prefix field has wrong type on Checkout #3083

fixed processor and templates

Author: Serhiy Shkolyarenko

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

@@ -7,6 +7,18 @@
 
 class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcessorInterface
 {
+    /**
+     * Attributes with custom convertion to selects
+     * key is an attribute code
+     * value is a method to fetch values
+     *
+     * @var array
+     */
+    private $attributesToConvert = [
+        'prefix' => 'getNamePrefixOptions',
+        'suffix' => 'getNameSuffixOptions',
+    ];
+
     /**
      * @var \Magento\Customer\Model\AttributeMetadataDataProvider
      */
@@ -22,28 +34,30 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
      */
     protected $merger;
 
+    /**
+     * @var \Magento\Customer\Model\Options
+     */
+    private $options;
+
     /**
      * @param \Magento\Customer\Model\AttributeMetadataDataProvider $attributeMetadataDataProvider
      * @param \Magento\Ui\Component\Form\AttributeMapper $attributeMapper
+     * @param \Magento\Customer\Model\Options $options
      * @param AttributeMerger $merger
      */
     public function __construct(
         \Magento\Customer\Model\AttributeMetadataDataProvider $attributeMetadataDataProvider,
         \Magento\Ui\Component\Form\AttributeMapper $attributeMapper,
+        \Magento\Customer\Model\Options $options,
         AttributeMerger $merger
     ) {
         $this->attributeMetadataDataProvider = $attributeMetadataDataProvider;
         $this->attributeMapper = $attributeMapper;
+        $this->options = $options;
         $this->merger = $merger;
     }
 
-    /**
-     * Process js Layout of block
-     *
-     * @param array $jsLayout
-     * @return array
-     */
-    public function process($jsLayout)
+    private function getElements()
     {
         /** @var \Magento\Eav\Api\Data\AttributeInterface[] $attributes */
         $attributes = $this->attributeMetadataDataProvider->loadAttributesCollection(
@@ -53,16 +67,61 @@ public function process($jsLayout)
 
         $elements = [];
         foreach ($attributes as $attribute) {
+            $code = $attribute->getAttributeCode();
             if ($attribute->getIsUserDefined()) {
                 continue;
             }
-            $elements[$attribute->getAttributeCode()] = $this->attributeMapper->map($attribute);
-            if (isset($elements[$attribute->getAttributeCode()]['label'])) {
-                $label = $elements[$attribute->getAttributeCode()]['label'];
-                $elements[$attribute->getAttributeCode()]['label'] = __($label);
+            $elements[$code] = $this->attributeMapper->map($attribute);
+            if (isset($elements[$code]['label'])) {
+                $label = $elements[$code]['label'];
+                $elements[$code]['label'] = __($label);
             }
         }
+        return $elements;
+    }
 
+    /**
+     * @param array $elements
+     * @return array
+     */
+    public function convertPrefixSuffix($elements)
+    {
+        $codes = array_keys($this->attributesToConvert);
+        foreach ($elements as $code => $element) {
+            if (!in_array($code, $codes)) {
+                continue;
+            }
+            $options = call_user_func_array(
+                [$this->options, $this->attributesToConvert[$code]],
+                []
+            );
+            if (!is_array($options)) {
+                continue;
+            }
+            $elements[$code]['dataType'] = 'select';
+            $elements[$code]['formElement'] = 'select';
+
+            foreach ($options as $key => $value) {
+                $elements[$code]['options'][] = [
+                    'value' => $key,
+                    'label' => $value,
+                ];
+            }
+        }
+
+        return $elements;
+    }
+
+    /**
+     * Process js Layout of block
+     *
+     * @param array $jsLayout
+     * @return array
+     */
+    public function process($jsLayout)
+    {
+        $elements = $this->getElements();
+        $elements = $this->convertPrefixSuffix($elements);
         // The following code is a workaround for custom address attributes
         if (isset($jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
             ['payment']['children']

app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html

@@ -5,7 +5,8 @@
  */
 -->
 <div class="billing-address-details" data-bind="if: isAddressDetailsVisible() && currentBillingAddress()">
-    <!-- ko text: currentBillingAddress().firstname --><!-- /ko --> <!-- ko text: currentBillingAddress().lastname --><!-- /ko --><br/>
+    <!-- ko text: currentBillingAddress().prefix --><!-- /ko --><!-- ko text: currentBillingAddress().firstname --><!-- /ko -->
+    <!-- ko text: currentBillingAddress().lastname --><!-- /ko --><!-- ko text: currentBillingAddress().suffix --><!-- /ko --><br/>;
     <!-- ko text: currentBillingAddress().street --><!-- /ko --><br/>
     <!-- ko text: currentBillingAddress().city --><!-- /ko -->, <!-- ko text: currentBillingAddress().region --><!-- /ko --> <!-- ko text: currentBillingAddress().postcode --><!-- /ko --><br/>
     <!-- ko text: getCountryName(currentBillingAddress().countryId) --><!-- /ko --><br/>

app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html

@@ -5,7 +5,8 @@
  */
 -->
 <div class="shipping-address-item" data-bind="css: isSelected() ? 'selected-item' : 'not-selected-item'">
-    <!-- ko text: address().firstname --><!-- /ko --> <!-- ko text: address().lastname --><!-- /ko --><br/>
+    <!-- ko text: address().prefix --><!-- /ko --><!-- ko text: address().firstname --><!-- /ko -->
+    <!-- ko text: address().lastname --><!-- /ko --><!-- ko text: address().suffix --><!-- /ko --><br/>
     <!-- ko text: address().street --><!-- /ko --><br/>
     <!-- ko text: address().city --><!-- /ko -->, <!-- ko text: address().region --><!-- /ko --> <!-- ko text: address().postcode --><!-- /ko --><br/>
     <!-- ko text: getCountryName(address().countryId) --><!-- /ko --><br/>

app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html

@@ -5,7 +5,8 @@
  */
 -->
 <!-- ko if: (visible()) -->
-    <!-- ko text: address().firstname --><!-- /ko --> <!-- ko text: address().lastname --><!-- /ko --><br/>
+    <!-- ko text: address().prefix --><!-- /ko --><!-- ko text: address().firstname --><!-- /ko -->
+    <!-- ko text: address().lastname --><!-- /ko --><!-- ko text: address().suffix --><!-- /ko --><br/>
     <!-- ko text: address().street --><!-- /ko --><br/>
     <!-- ko text: address().city --><!-- /ko -->, <!-- ko text: address().region --><!-- /ko --> <!-- ko text: address().postcode --><!-- /ko --><br/>
     <!-- ko text: getCountryName(address().countryId) --><!-- /ko --><br/>