Merge pull request #1157 from magento-engcom/2.1-develop-prs

ishakhsuvarov · web-flow · commit 118a197c21f4 · 2017-06-01T14:47:58.000+03:00
[EngCom] Public Pull Requests - 2.1 - MAGETWO-69541: #7959 - Fix for JS error on Swatch Renderer for undefined oldPrice #9776
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
@@ -711,7 +711,7 @@ 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();

Original file line number	Diff line number	Diff line change
`@@ -711,7 +711,7 @@ define([`
`711`	`711`	`}`
`712`	`712`	`);`
`713`	`713`
`714`		`- if (result.oldPrice.amount !== result.finalPrice.amount) {`
	`714`	`+ if (typeof result != 'undefined' && result.oldPrice.amount !== result.finalPrice.amount) {`
`715`	`715`	`$(this.options.slyOldPriceSelector).show();`
`716`	`716`	`} else {`
`717`	`717`	`$(this.options.slyOldPriceSelector).hide();`