From 4357ce56970e9f4d09205d6c5c900512155f727e Mon Sep 17 00:00:00 2001
From: Sergey Semenov <ssemenov@magento.com>
Date: Mon, 31 Oct 2016 18:20:01 +0200
Subject: [PATCH] MAGETWO-60047: [Porting] Error on adding address during
checkout if add custom customer address attribute of file type - 2.2
---
app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php | 3 +++
1 file changed, 3 insertions(+)
diff --git a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
index 1882d88e04a..437e7541030 100644
--- a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
+++ b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
@@ -23,6 +23,8 @@ class AttributeMerger
'textarea' => 'Magento_Ui/js/form/element/textarea',
'multiline' => 'Magento_Ui/js/form/components/group',
'multiselect' => 'Magento_Ui/js/form/element/multiselect',
+ 'image' => 'Magento_Ui/js/form/element/media',
+ 'file' => 'Magento_Ui/js/form/element/media',
];
/**
@@ -32,6 +34,7 @@ class AttributeMerger
*/
protected $templateMap = [
'image' => 'media',
+ 'file' => 'media',
];
/**
--
GitLab