MAGETWO-91673: Not Visible Custom Address Attributes Showing on Checkout

Author: viktym

app/code/Magento/Checkout/Model/DefaultConfigProvider.php

@@ -8,12 +8,14 @@
 use Magento\Catalog\Helper\Product\ConfigurationPool;
 use Magento\Checkout\Helper\Data as CheckoutHelper;
 use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
 use Magento\Customer\Model\Context as CustomerContext;
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Customer\Model\Url as CustomerUrlManager;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Form\FormKey;
 use Magento\Framework\Locale\FormatInterface as LocaleFormat;
 use Magento\Framework\UrlInterface;
@@ -159,6 +161,11 @@ class DefaultConfigProvider implements ConfigProviderInterface
      */
     protected $urlBuilder;
 
+    /**
+     * @var AddressMetadataInterface
+     */
+    private $addressMetadata;
+
     /**
      * @param CheckoutHelper $checkoutHelper
      * @param Session $checkoutSession
@@ -186,6 +193,7 @@ class DefaultConfigProvider implements ConfigProviderInterface
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement
      * @param UrlInterface $urlBuilder
+     * @param AddressMetadataInterface $addressMetadata
      * @codeCoverageIgnore
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -215,7 +223,8 @@ public function __construct(
         \Magento\Shipping\Model\Config $shippingMethodConfig,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement,
-        UrlInterface $urlBuilder
+        UrlInterface $urlBuilder,
+        AddressMetadataInterface $addressMetadata = null
     ) {
         $this->checkoutHelper = $checkoutHelper;
         $this->checkoutSession = $checkoutSession;
@@ -243,6 +252,7 @@ public function __construct(
         $this->storeManager = $storeManager;
         $this->paymentMethodManagement = $paymentMethodManagement;
         $this->urlBuilder = $urlBuilder;
+        $this->addressMetadata = $addressMetadata ?: ObjectManager::getInstance()->get(AddressMetadataInterface::class);
     }
 
     /**
@@ -324,11 +334,34 @@ private function getCustomerData()
             $customerData = $customer->__toArray();
             foreach ($customer->getAddresses() as $key => $address) {
                 $customerData['addresses'][$key]['inline'] = $this->getCustomerAddressInline($address);
+                if ($address->getCustomAttributes()) {
+                    $customerData['addresses'][$key]['custom_attributes'] = $this->filterNotVisibleAttributes(
+                        $customerData['addresses'][$key]['custom_attributes']
+                    );
+                }
             }
         }
         return $customerData;
     }
 
+    /**
+     * Filter not visible on storefront custom attributes.
+     *
+     * @param array $attributes
+     * @return array
+     */
+    private function filterNotVisibleAttributes(array $attributes)
+    {
+        $attributesMetadata = $this->addressMetadata->getAllAttributesMetadata();
+        foreach ($attributesMetadata as $attributeMetadata) {
+            if (!$attributeMetadata->isVisible()) {
+                unset($attributes[$attributeMetadata->getAttributeCode()]);
+            }
+        }
+
+        return $attributes;
+    }
+
     /**
      * Set additional customer address data
      *