Merge pull request #4864 from magento-chaika/MC-19894-19152

Chaika-PR-2019-10-04

Author: dhorytskyi

app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js

@@ -18,6 +18,7 @@ define([
     return {
         /**
          * Convert address form data to Address object
+         *
          * @param {Object} formData
          * @returns {Object}
          */

app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js

@@ -159,7 +159,6 @@ function (
                     }
                     addressData['save_in_address_book'] = this.saveInAddressBook() ? 1 : 0;
                     newBillingAddress = createBillingAddress(addressData);
-
                     // New address must be selected as a billing address
                     selectBillingAddress(newBillingAddress);
                     checkoutData.setSelectedBillingAddress(newBillingAddress.getKey());
@@ -237,6 +236,30 @@ function (
          */
         getCode: function (parent) {
             return _.isFunction(parent.getCode) ? parent.getCode() : 'shared';
+        },
+
+        /**
+         * Get customer attribute label
+         *
+         * @param {*} attribute
+         * @returns {*}
+         */
+        getCustomAttributeLabel: function (attribute) {
+            var resultAttribute;
+
+            if (typeof attribute === 'string') {
+                return attribute;
+            }
+
+            if (attribute.label) {
+                return attribute.label;
+            }
+
+            resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {
+                value: attribute.value
+            });
+
+            return resultAttribute && resultAttribute.label || attribute.value;
         }
     });
 });

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

@@ -7,12 +7,13 @@ define([
     'jquery',
     'ko',
     'uiComponent',
+    'underscore',
     'Magento_Checkout/js/action/select-shipping-address',
     'Magento_Checkout/js/model/quote',
     'Magento_Checkout/js/model/shipping-address/form-popup-state',
     'Magento_Checkout/js/checkout-data',
     'Magento_Customer/js/customer-data'
-], function ($, ko, Component, selectShippingAddressAction, quote, formPopUpState, checkoutData, customerData) {
+], function ($, ko, Component, _, selectShippingAddressAction, quote, formPopUpState, checkoutData, customerData) {
     'use strict';
 
     var countryData = customerData.get('directory-data');
@@ -47,6 +48,30 @@ define([
             return countryData()[countryId] != undefined ? countryData()[countryId].name : ''; //eslint-disable-line
         },
 
+        /**
+         * Get customer attribute label
+         *
+         * @param {*} attribute
+         * @returns {*}
+         */
+        getCustomAttributeLabel: function (attribute) {
+            var resultAttribute;
+
+            if (typeof attribute === 'string') {
+                return attribute;
+            }
+
+            if (attribute.label) {
+                return attribute.label;
+            }
+
+            resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {
+                value: attribute.value
+            });
+
+            return resultAttribute && resultAttribute.label || attribute.value;
+        },
+
         /** Set selected customer shipping address  */
         selectAddress: function () {
             selectShippingAddressAction(this.address());

app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/list.js

@@ -16,7 +16,8 @@ define([
     var defaultRendererTemplate = {
         parent: '${ $.$data.parentName }',
         name: '${ $.$data.name }',
-        component: 'Magento_Checkout/js/view/shipping-address/address-renderer/default'
+        component: 'Magento_Checkout/js/view/shipping-address/address-renderer/default',
+        provider: 'checkoutProvider'
     };
 
     return Component.extend({

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

@@ -5,8 +5,9 @@
 
 define([
     'uiComponent',
+    'underscore',
     'Magento_Customer/js/customer-data'
-], function (Component, customerData) {
+], function (Component, _, customerData) {
     'use strict';
 
     var countryData = customerData.get('directory-data');
@@ -22,6 +23,30 @@ define([
          */
         getCountryName: function (countryId) {
             return countryData()[countryId] != undefined ? countryData()[countryId].name : ''; //eslint-disable-line
+        },
+
+        /**
+         * Get customer attribute label
+         *
+         * @param {*} attribute
+         * @returns {*}
+         */
+        getCustomAttributeLabel: function (attribute) {
+            var resultAttribute;
+
+            if (typeof attribute === 'string') {
+                return attribute;
+            }
+
+            if (attribute.label) {
+                return attribute.label;
+            }
+
+            resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {
+                value: attribute.value
+            });
+
+            return resultAttribute && resultAttribute.label || attribute.value;
         }
     });
 });

app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/list.js

@@ -16,7 +16,8 @@ define([
     var defaultRendererTemplate = {
         parent: '${ $.$data.parentName }',
         name: '${ $.$data.name }',
-        component: 'Magento_Checkout/js/view/shipping-information/address-renderer/default'
+        component: 'Magento_Checkout/js/view/shipping-information/address-renderer/default',
+        provider: 'checkoutProvider'
     };
 
     return Component.extend({

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

@@ -13,19 +13,8 @@
     <a if="currentBillingAddress().telephone" attr="'href': 'tel:' + currentBillingAddress().telephone" text="currentBillingAddress().telephone"></a><br/>
 
     <each args="data: currentBillingAddress().customAttributes, as: 'element'">
-        <if args="typeof element === 'object'">
-            <if args="element.label">
-                <text args="element.label"/>
-            </if>
-            <ifnot args="element.label">
-                <if args="element.value">
-                    <text args="element.value"/>
-                </if>
-            </ifnot>
-        </if>
-        <if args="typeof element === 'string'">
-            <text args="element"/>
-        </if><br/>
+        <text args="$parent.getCustomAttributeLabel(element)"/>
+        <br/>
     </each>
 
     <button visible="!isAddressSameAsShipping()"

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

@@ -13,21 +13,8 @@
     <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/>
 
     <each args="data: address().customAttributes, as: 'element'">
-        <each args="data: Object.keys(element), as: 'attribute'">
-            <if args="typeof element[attribute] === 'object'">
-                <if args="element[attribute].label">
-                    <text args="element[attribute].label"/>
-                </if>
-                <ifnot args="element[attribute].label">
-                    <if args="element[attribute].value">
-                        <text args="element[attribute].value"/>
-                    </if>
-                </ifnot>
-            </if>
-            <if args="typeof element[attribute] === 'string'">
-                <text args="element[attribute]"/>
-            </if><br/>
-        </each>
+        <text args="$parent.getCustomAttributeLabel(element)"/>
+        <br/>
     </each>
 
     <button visible="address().isEditable()" type="button"

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

@@ -13,18 +13,7 @@
     <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/>
 
     <each args="data: address().customAttributes, as: 'element'">
-        <if args="typeof element === 'object'">
-            <if args="element.label">
-                <text args="element.label"/>
-            </if>
-            <ifnot args="element.label">
-                <if args="element.value">
-                    <text args="element.value"/>
-                </if>
-            </ifnot>
-        </if>
-        <if args="typeof element === 'string'">
-            <text args="element"/>
-        </if><br/>
+        <text args="$parent.getCustomAttributeLabel(element)"/>
+        <br/>
     </each>
 </if>