Merge pull request #106 from magento-epam/MAGETWO-91760-rebase

MAGETWO-91760: Custom address attributes displays with wrong value on…

Author: vital-pantsialeyeu

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

@@ -23,9 +23,9 @@
                         <text args="element[attribute].value"/>
                     </if>
                 </ifnot>
-                <if args="typeof element[attribute] === 'string'">
-                    <text args="element[attribute]"/>
-                </if>
+            </if>
+            <if args="typeof element[attribute] === 'string'">
+                <text args="element[attribute]"/>
             </if><br/>
         </each>
     </each>

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

@@ -23,9 +23,9 @@
                         <text args="element[attribute].value"/>
                     </if>
                 </ifnot>
-                <if args="typeof element[attribute] === 'string'">
-                    <text args="element[attribute]"/>
-                </if>
+            </if>
+            <if args="typeof element[attribute] === 'string'">
+                <text args="element[attribute]"/>
             </if><br/>
         </each>
     </each>

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

@@ -23,9 +23,9 @@
                         <text args="element[attribute].value"/>
                     </if>
                 </ifnot>
-                <if args="typeof element[attribute] === 'string'">
-                    <text args="element[attribute]"/>
-                </if>
+            </if>
+            <if args="typeof element[attribute] === 'string'">
+                <text args="element[attribute]"/>
             </if><br/>
         </each>
     </each>