Merge remote-tracking branch 'origin/MC-30739' into 2.4-develop-pr11

serhii-balko · serhii-balko · commit 5c79b5a46978 · 2020-02-04T09:45:25.000+02:00
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
@@ -255,9 +255,11 @@ function (
                 return attribute.label;
             }
 
-            resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {
-                value: attribute.value
-            });
+            if (typeof this.source.get('customAttributes') !== 'undefined') {
+                resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {
+                    value: attribute.value
+                });
+            }
 
             return resultAttribute && resultAttribute.label || attribute.value;
         }
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/address-renderer/default.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/address-renderer/default.js
@@ -65,9 +65,11 @@ define([
                 return attribute.label;
             }
 
-            resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {
-                value: attribute.value
-            });
+            if (typeof this.source.get('customAttributes') !== 'undefined') {
+                resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {
+                    value: attribute.value
+                });
+            }
 
             return resultAttribute && resultAttribute.label || attribute.value;
         },
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/address-renderer/default.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/address-renderer/default.js
@@ -42,9 +42,11 @@ define([
                 return attribute.label;
             }
 
-            resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {
-                value: attribute.value
-            });
+            if (typeof this.source.get('customAttributes') !== 'undefined') {
+                resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {
+                    value: attribute.value
+                });
+            }
 
             return resultAttribute && resultAttribute.label || attribute.value;
         }

Original file line number	Diff line number	Diff line change
`@@ -255,9 +255,11 @@ function (`
`255`	`255`	`return attribute.label;`
`256`	`256`	`}`
`257`	`257`
`258`		`- resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {`
`259`		`- value: attribute.value`
`260`		`- });`
	`258`	`+ if (typeof this.source.get('customAttributes') !== 'undefined') {`
	`259`	`+ resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {`
	`260`	`+ value: attribute.value`
	`261`	`+ });`
	`262`	`+ }`
`261`	`263`
`262`	`264`	`return resultAttribute && resultAttribute.label \|\| attribute.value;`
`263`	`265`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,11 @@ define([`
`42`	`42`	`return attribute.label;`
`43`	`43`	`}`
`44`	`44`
`45`		`- resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {`
`46`		`- value: attribute.value`
`47`		`- });`
	`45`	`+ if (typeof this.source.get('customAttributes') !== 'undefined') {`
	`46`	`+ resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {`
	`47`	`+ value: attribute.value`
	`48`	`+ });`
	`49`	`+ }`
`48`	`50`
`49`	`51`	`return resultAttribute && resultAttribute.label \|\| attribute.value;`
`50`	`52`	`}`