From 3278cd79252c43d24a1ecf5e511e0665fc30bf1a Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@magento.com>
Date: Mon, 15 Aug 2016 13:15:55 +0300
Subject: [PATCH 1/3] MAGETWO-53135: [GITHUB] Prices of related products on PDP
 changes according to product custom options. #4588

---
 .../Catalog/view/frontend/templates/product/view/form.phtml   | 4 +++-
 .../view/frontend/templates/product/view/options.phtml        | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
index f6dd2a0033fd4..f23544a7734fb 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
@@ -42,7 +42,9 @@
         'jquery',
         'Magento_Catalog/js/price-box'
     ], function($){
-        var priceBoxes = $('[data-role=priceBox]');
+        var dataPriceBoxSelector = '[data-role=priceBox]',
+            dataProductIdSelector = '[data-product-id=<?php echo $block->escapeHtml($_product->getId());?>]',
+            priceBoxes = $(dataPriceBoxSelector + dataProductIdSelector);
 
         priceBoxes = priceBoxes.filter(function(index, elem){
             return !$(elem).find('.price-from').length;
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
index 97f844067f068..ec8f3c86483c9 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
@@ -10,6 +10,7 @@
 ?>
 
 <?php $_options = $block->decorateArray($block->getOptions()) ?>
+<?php $_productId = $block->getProduct()->getId() ?>
 <?php if (count($_options)):?>
 <script type="text/x-magento-init">
     {
@@ -17,7 +18,7 @@
             "priceOptions": {
                 "optionConfig": <?php /* @escapeNotVerified */ echo $block->getJsonConfig()?>,
                 "controlContainer": ".field",
-                "priceHolderSelector": "[data-role=priceBox]"
+                "priceHolderSelector": "[data-product-id='<?php echo $_productId?>'][data-role=priceBox]"
             }
         }
     }

From 0a812ebec7e0d0dbc8475f18a0d1c4900c2ab7dd Mon Sep 17 00:00:00 2001
From: Olha Nakonechna <onakonechna@magento.com>
Date: Tue, 16 Aug 2016 15:07:50 +0300
Subject: [PATCH 2/3] MAGETWO-53135: [GITHUB] Prices of related products on PDP
 changes according to product custom options. #4588

---
 .../Catalog/view/frontend/templates/product/view/form.phtml     | 2 +-
 .../Catalog/view/frontend/templates/product/view/options.phtml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
index f23544a7734fb..f27f9ecea4515 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
@@ -43,7 +43,7 @@
         'Magento_Catalog/js/price-box'
     ], function($){
         var dataPriceBoxSelector = '[data-role=priceBox]',
-            dataProductIdSelector = '[data-product-id=<?php echo $block->escapeHtml($_product->getId());?>]',
+            dataProductIdSelector = '[data-product-id=<?php echo $block->escapeHtml($_product->getId())?>]',
             priceBoxes = $(dataPriceBoxSelector + dataProductIdSelector);
 
         priceBoxes = priceBoxes.filter(function(index, elem){
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
index ec8f3c86483c9..e7918f7da37f6 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
@@ -18,7 +18,7 @@
             "priceOptions": {
                 "optionConfig": <?php /* @escapeNotVerified */ echo $block->getJsonConfig()?>,
                 "controlContainer": ".field",
-                "priceHolderSelector": "[data-product-id='<?php echo $_productId?>'][data-role=priceBox]"
+                "priceHolderSelector": "[data-product-id='<?php echo /* @noEscape */ $_productId?>'][data-role=priceBox]"
             }
         }
     }

From 1bfe96185af968bca2de6d9d112c7343c4710a85 Mon Sep 17 00:00:00 2001
From: Olha Nakonechna <onakonechna@magento.com>
Date: Tue, 16 Aug 2016 16:41:35 +0300
Subject: [PATCH 3/3] MAGETWO-53135: [GITHUB] Prices of related products on PDP
 changes according to product custom options. #4588

---
 .../Catalog/view/frontend/templates/product/view/options.phtml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
index e7918f7da37f6..9da72303f068d 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
@@ -18,7 +18,7 @@
             "priceOptions": {
                 "optionConfig": <?php /* @escapeNotVerified */ echo $block->getJsonConfig()?>,
                 "controlContainer": ".field",
-                "priceHolderSelector": "[data-product-id='<?php echo /* @noEscape */ $_productId?>'][data-role=priceBox]"
+                "priceHolderSelector": "[data-product-id='<?php echo $block->escapeHtml($_productId)?>'][data-role=priceBox]"
             }
         }
     }