From 18eb7d8496148c1f628122488ad4cdd47c0cb9db Mon Sep 17 00:00:00 2001
From: Karan Shah <karan.shah@krishtechnolabs.com>
Date: Sat, 27 Oct 2018 16:47:53 +0530
Subject: [PATCH 1/2] #12183 Fixed special price issue for configurable product

---
 .../view/base/templates/product/price/final_price.phtml       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
index 97238d0813b09..ebd88d0ccbbd0 100644
--- a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
@@ -34,8 +34,8 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
     ?>
 </span>
 
-<?php if (!$block->isProductList() && $block->hasSpecialPrice()): ?>
-    <span class="old-price sly-old-price no-display">
+<?php if ($block->hasSpecialPrice()): ?>
+    <span class="old-price sly-old-price">
         <?php /* @escapeNotVerified */ echo $block->renderAmount($priceModel->getAmount(), [
             'display_label'     => __('Regular Price'),
             'price_id'          => $block->getPriceId('old-price-' . $idSuffix),

From 2b9022e7396675a5e9644d5eb5736e08bdff0cb4 Mon Sep 17 00:00:00 2001
From: Karan Shah <karan.shah@krishtechnolabs.com>
Date: Mon, 29 Oct 2018 15:10:34 +0530
Subject: [PATCH 2/2] Magento catalog product page gallery hide magnifier when
 mouse leave. #18919

---
 lib/web/magnifier/magnifier.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/web/magnifier/magnifier.js b/lib/web/magnifier/magnifier.js
index 0807a4c394995..43bf7ab0b17c8 100644
--- a/lib/web/magnifier/magnifier.js
+++ b/lib/web/magnifier/magnifier.js
@@ -593,7 +593,11 @@
 
         $box.on('mousemove', onMousemove);
         $box.on('mouseleave', onMouseLeave);
-
+        function onMouseLeave(e) {
+           onThumbLeave();
+           isOverThumb = false;
+           $('.magnifier-preview').addClass('magnify-hidden');
+        }
         _init($box, customUserOptions);
     }
 }(jQuery));