Merge branch 'release/3.28.0'

VirtoCommerce · Nov 12, 2021 · 8933b9e · 8933b9e
2 parents 3563c07 + 0cddbe9
commit 8933b9e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.27.0</VersionPrefix>
+    <VersionPrefix>3.28.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/src/VirtoCommerce.CoreModule.Web/Scripts/common/blades/address-detail.js b/src/VirtoCommerce.CoreModule.Web/Scripts/common/blades/address-detail.js
@@ -59,8 +59,18 @@ angular.module('virtoCommerce.coreModule.common')
             return results;
         };
 
-        function addRegion(regions, name) {
-            regions.unshift({ name: name, displayName: name });
+        function addRegion(regionArray, name) {
+            var canInclude = true;
+            _.each(regionArray, function (region) {
+                if (name.includes(region.name)) {
+                    region.name = name;
+                    region.displayName = name;
+                    canInclude = false;
+                }
+            });
+            if (canInclude) {
+                regionArray.unshift({ name: name, displayName: name });
+            }
         }
 
         $scope.$watch('blade.currentEntity.regionName', function (regionName, old) {

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.27.0</version>
+  <version>3.28.0</version>
   <version-tag />
   <platformVersion>3.66.0</platformVersion>
   <title>Commerce core module</title>