From eae1c6b7f43b7bd0077539524e6a56d7c88cc779 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Wed, 13 Apr 2022 16:46:33 +0530
Subject: [PATCH] Duplicate Query Removed

---
 .../Webkul/Product/src/Type/AbstractType.php     |  8 ++++----
 packages/Webkul/Product/src/Type/Bundle.php      | 16 ++++++++--------
 .../Webkul/Product/src/Type/Configurable.php     | 14 ++++++++------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/packages/Webkul/Product/src/Type/AbstractType.php b/packages/Webkul/Product/src/Type/AbstractType.php
index b6953819a..e8dbdbc89 100644
--- a/packages/Webkul/Product/src/Type/AbstractType.php
+++ b/packages/Webkul/Product/src/Type/AbstractType.php
@@ -674,12 +674,12 @@ abstract class AbstractType
     {
         return [
             'regular_price' => [
-                'price'          => core()->convertPrice($this->evaluatePrice($this->product->price)),
-                'formated_price' => core()->currency($this->evaluatePrice($this->product->price)),
+                'price'          => core()->convertPrice($this->evaluatePrice($regularPrice = $this->product->price)),
+                'formated_price' => core()->currency($this->evaluatePrice($regularPrice)),
             ],
             'final_price'   => [
-                'price'          => core()->convertPrice($this->evaluatePrice($this->getMinimalPrice())),
-                'formated_price' => core()->currency($this->evaluatePrice($this->getMinimalPrice())),
+                'price'          => core()->convertPrice($this->evaluatePrice($minimalPrice = $this->getMinimalPrice())),
+                'formated_price' => core()->currency($this->evaluatePrice($minimalPrice)),
             ],
         ];
     }
diff --git a/packages/Webkul/Product/src/Type/Bundle.php b/packages/Webkul/Product/src/Type/Bundle.php
index e58acb739..3dac6fff9 100644
--- a/packages/Webkul/Product/src/Type/Bundle.php
+++ b/packages/Webkul/Product/src/Type/Bundle.php
@@ -340,23 +340,23 @@ class Bundle extends AbstractType
         return [
             'from' => [
                 'regular_price' => [
-                    'price'          => core()->convertPrice($this->evaluatePrice($this->getRegularMinimalPrice())),
-                    'formated_price' => core()->currency($this->evaluatePrice($this->getRegularMinimalPrice())),
+                    'price'          => core()->convertPrice($this->evaluatePrice($regularMinimalPrice = $this->getRegularMinimalPrice())),
+                    'formated_price' => core()->currency($this->evaluatePrice($regularMinimalPrice)),
                 ],
                 'final_price'   => [
-                    'price'          => core()->convertPrice($this->evaluatePrice($this->getMinimalPrice())),
-                    'formated_price' => core()->currency($this->evaluatePrice($this->getMinimalPrice())),
+                    'price'          => core()->convertPrice($this->evaluatePrice($minimalPrice = $this->getMinimalPrice())),
+                    'formated_price' => core()->currency($this->evaluatePrice($minimalPrice)),
                 ],
             ],
 
             'to' => [
                 'regular_price' => [
-                    'price'          => core()->convertPrice($this->evaluatePrice($this->getRegularMaximamPrice())),
-                    'formated_price' => core()->currency($this->evaluatePrice($this->getRegularMaximamPrice())),
+                    'price'          => core()->convertPrice($this->evaluatePrice($regularMaximumPrice = $this->getRegularMaximamPrice())),
+                    'formated_price' => core()->currency($this->evaluatePrice($regularMaximumPrice)),
                 ],
                 'final_price'   => [
-                    'price'          => core()->convertPrice($this->evaluatePrice($this->getMaximamPrice())),
-                    'formated_price' => core()->currency($this->evaluatePrice($this->getMaximamPrice())),
+                    'price'          => core()->convertPrice($this->evaluatePrice($maximumPrice = $this->getMaximamPrice())),
+                    'formated_price' => core()->currency($this->evaluatePrice($maximumPrice)),
                 ],
             ],
         ];
diff --git a/packages/Webkul/Product/src/Type/Configurable.php b/packages/Webkul/Product/src/Type/Configurable.php
index a61ccb8e5..580981514 100644
--- a/packages/Webkul/Product/src/Type/Configurable.php
+++ b/packages/Webkul/Product/src/Type/Configurable.php
@@ -552,14 +552,16 @@ class Configurable extends AbstractType
      */
     public function getProductPrices()
     {
+        $haveOffer = $this->haveOffer();
+
         return [
             'regular_price' => [
-                'formated_price' => $this->haveOffer()
-                    ? core()->currency($this->evaluatePrice($this->getOfferPrice()))
-                    : core()->currency($this->evaluatePrice($this->getMinimalPrice())),
-                'price'          => $this->haveOffer()
-                    ? $this->evaluatePrice($this->getOfferPrice())
-                    : $this->evaluatePrice($this->getMinimalPrice()),
+                'formated_price' => $haveOffer
+                    ? core()->currency($this->evaluatePrice($offerPrice = $this->getOfferPrice()))
+                    : core()->currency($this->evaluatePrice($minimalPrice = $this->getMinimalPrice())),
+                'price'          => $haveOffer
+                    ? $this->evaluatePrice($offerPrice)
+                    : $this->evaluatePrice($minimalPrice),
             ],
         ];
     }