Merge branch 'dev' into feature/VCST-2012

VirtoCommerce · Nov 18, 2024 · 24d29ba · 24d29ba
2 parents d6af725 + 52de3ad
commit 24d29ba
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.810.0</VersionPrefix>
+    <VersionPrefix>3.811.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/src/VirtoCommerce.CoreModule.Core/Currency/Currency.cs b/src/VirtoCommerce.CoreModule.Core/Currency/Currency.cs
@@ -162,9 +162,12 @@ private void Initialize()
                 }
 
                 string symbol;
-                if (_code != null && _isoCurrencySymbolDict.TryGetValue(_code, out symbol) && symbol != null)
+                if (Symbol == null && _code != null && _isoCurrencySymbolDict.TryGetValue(_code, out symbol) && symbol != null)
                 {
                     Symbol = symbol;
+                }
+                if (Symbol != null)
+                {
                     NumberFormat.CurrencySymbol = Symbol;
                 }
             }

diff --git a/src/VirtoCommerce.CoreModule.Web/module.manifest b/src/VirtoCommerce.CoreModule.Web/module.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <id>VirtoCommerce.Core</id>
-  <version>3.810.0</version>
+  <version>3.811.0</version>
   <version-tag />
   <platformVersion>3.853.0</platformVersion>
   <title>Commerce core module</title>