MAGETWO-66321: Check of null result value in swatch-renderer.js #8923

Oleksii Korshenko · Oleksii Korshenko · commit 39cc4c2d4cd9 · 2017-03-27T04:59:20.000-07:00
- Merge Pull Request #8923 from aholovan/magento2:patch-2
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
@@ -868,13 +868,13 @@ define([
                 }
             );
 
-            if (result.oldPrice.amount !== result.finalPrice.amount) {
+            if (typeof result != 'undefined' && result.oldPrice.amount !== result.finalPrice.amount) {
                 $(this.options.slyOldPriceSelector).show();
             } else {
                 $(this.options.slyOldPriceSelector).hide();
             }
 
-            if (result.tierPrices.length) {
+            if (typeof result != 'undefined' && result.tierPrices.length) {
                 if (this.options.tierPriceTemplate) {
                     tierPriceHtml = mageTemplate(
                         this.options.tierPriceTemplate,

Original file line number	Diff line number	Diff line change
`@@ -868,13 +868,13 @@ define([`
`868`	`868`	`}`
`869`	`869`	`);`
`870`	`870`
`871`		`- if (result.oldPrice.amount !== result.finalPrice.amount) {`
	`871`	`+ if (typeof result != 'undefined' && result.oldPrice.amount !== result.finalPrice.amount) {`
`872`	`872`	`$(this.options.slyOldPriceSelector).show();`
`873`	`873`	`} else {`
`874`	`874`	`$(this.options.slyOldPriceSelector).hide();`
`875`	`875`	`}`
`876`	`876`
`877`		`- if (result.tierPrices.length) {`
	`877`	`+ if (typeof result != 'undefined' && result.tierPrices.length) {`
`878`	`878`	`if (this.options.tierPriceTemplate) {`
`879`	`879`	`tierPriceHtml = mageTemplate(`
`880`	`880`	`this.options.tierPriceTemplate,`