From ad8fc5f95b0b318ba8475fbe22b9412efd9b60ea Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Thu, 13 Jan 2022 14:22:09 +0530
Subject: [PATCH] Currency Updated

---
 packages/Webkul/Core/src/Core.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php
index f1a1935a9..34cdc285c 100755
--- a/packages/Webkul/Core/src/Core.php
+++ b/packages/Webkul/Core/src/Core.php
@@ -420,11 +420,13 @@ class Core
     /**
      * Get currency.
      *
+     * Will return null if not found.
+     *
      * @return \Webkul\Core\Models\Currency
      */
     public function getCurrency()
     {
-        return self::$currency ?: $this->getChannelBaseCurrency();
+        return self::$currency;
     }
 
     /**
@@ -518,6 +520,8 @@ class Core
     /**
      * Returns current channel's currency model.
      *
+     * Will fallback to base currency if not set.
+     *
      * @return \Webkul\Core\Contracts\Currency
      */
     public function getCurrentCurrency()
@@ -528,7 +532,7 @@ class Core
             return $currency;
         }
 
-        return $currency = $this->getCurrency();
+        return $currency = $this->getCurrency() ?: $this->getChannelBaseCurrency();
     }
 
     /**