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

CR fix

Author: Serhiy Shkolyarenko

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

@@ -5,20 +5,10 @@
  */
 namespace Magento\Checkout\Block\Checkout;
 
+use Magento\Framework\App\ObjectManager;
+
 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
      */
@@ -42,22 +32,34 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
     /**
      * @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;
     }
 
-    private function getElements()
+    /**
+     * @deprecated
+     * @return \Magento\Customer\Model\Options
+     */
+    private function getOptions()
+    {
+        if (!is_object($this->options)) {
+            $this->options = ObjectManager::getInstance()->get(\Magento\Customer\Model\Options::class);
+        }
+        return $this->options;
+    }
+
+    /**
+     * @return array
+     */
+    private function getAddressAttributes()
     {
         /** @var \Magento\Eav\Api\Data\AttributeInterface[] $attributes */
         $attributes = $this->attributeMetadataDataProvider->loadAttributesCollection(
@@ -81,18 +83,26 @@ private function getElements()
     }
 
     /**
+     * Convert prefix and suffix from inputs to selects when necessary
+     *
      * @param array $elements
      * @return array
      */
-    public function convertPrefixSuffix($elements)
+    private function convertPrefixSuffix($elements)
     {
-        $codes = array_keys($this->attributesToConvert);
+        $attributesToConvert = [
+            'prefix' => 'getNamePrefixOptions',
+            'suffix' => 'getNameSuffixOptions',
+        ];
+
+        $codes = array_keys($attributesToConvert);
         foreach ($elements as $code => $element) {
             if (!in_array($code, $codes)) {
                 continue;
             }
+            $optionz = $this->getOptions();
             $options = call_user_func_array(
-                [$this->options, $this->attributesToConvert[$code]],
+                [$this->getOptions(), $attributesToConvert[$code]],
                 []
             );
             if (!is_array($options)) {
@@ -120,7 +130,7 @@ public function convertPrefixSuffix($elements)
      */
     public function process($jsLayout)
     {
-        $elements = $this->getElements();
+        $elements = $this->getAddressAttributes();
         $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']

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

@@ -5,8 +5,8 @@
  */
 -->
 <div class="billing-address-details" data-bind="if: isAddressDetailsVisible() && currentBillingAddress()">
-    <!-- ko text: currentBillingAddress().prefix --><!-- /ko --><!-- ko text: currentBillingAddress().firstname --><!-- /ko -->
-    <!-- ko text: currentBillingAddress().lastname --><!-- /ko --><!-- ko text: currentBillingAddress().suffix --><!-- /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,8 +5,8 @@
  */
 -->
 <div class="shipping-address-item" data-bind="css: isSelected() ? 'selected-item' : 'not-selected-item'">
-    <!-- ko text: address().prefix --><!-- /ko --><!-- ko text: address().firstname --><!-- /ko -->
-    <!-- ko text: address().lastname --><!-- /ko --><!-- ko text: address().suffix --><!-- /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,8 +5,8 @@
  */
 -->
 <!-- ko if: (visible()) -->
-    <!-- ko text: address().prefix --><!-- /ko --><!-- ko text: address().firstname --><!-- /ko -->
-    <!-- ko text: address().lastname --><!-- /ko --><!-- ko text: address().suffix --><!-- /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/>