Merge branch 'release/6.30.0'

VirtoCommerce · Oct 12, 2023 · ae41e14 · ae41e14
2 parents 5b60c47 + 657f424
commit ae41e14
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -66,8 +66,8 @@ jobs:
 
     - name: Update environment
       run: |
-        vc-build SetHelmParameter -ArgoServer https://argo.virtocommerce.cloud -ArgoAppName ${{ steps.app-name.outputs.APP }} -ArgoToken ${{ secrets.VCST_TOKEN }} -HelmParameters storefront.image.tag=${{ github.event.inputs.artifactUrl }}
-  
+        vc-build SetEnvParameter -EnvironmentName ${{ steps.app-name.outputs.APP }} -CloudToken ${{ secrets.VCST_TOKEN }} -HelmParameters storefront.image.tag=${{ github.event.inputs.artifactUrl }}
+
     - name: DEPLOY_STATE::successful
       if: success()
       run: echo "DEPLOY_STATE=successful" >> $GITHUB_ENV

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,7 +7,7 @@
     <Authors>VirtoCommerce</Authors>
   </PropertyGroup>
    <PropertyGroup>
-    <VersionPrefix>6.29.0</VersionPrefix>
+    <VersionPrefix>6.30.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/VirtoCommerce.Storefront.Model/Stores/Store.cs b/VirtoCommerce.Storefront.Model/Stores/Store.cs
@@ -136,6 +136,8 @@ public string Host
 
         public bool EmailVerificationEnabled { get; set; }
 
+        public bool CreateAnonymousOrderEnabled { get; set; }
+
         public decimal FixedTaxRate { get; set; }
 
         public string CartValidationRuleSet { get; set; }

diff --git a/VirtoCommerce.Storefront/Domain/Stores/StoreConverter.cs b/VirtoCommerce.Storefront/Domain/Stores/StoreConverter.cs
@@ -88,6 +88,7 @@ public static Store ToStore(this storeDto.Store storeDto)
             result.AnonymousUsersAllowed = result.Settings.GetSettingValue("Stores.AllowAnonymousUsers", true);
             result.IsSpa = result.Settings.GetSettingValue("Stores.IsSpa", false);
             result.EmailVerificationEnabled = result.Settings.GetSettingValue("Stores.EmailVerificationEnabled", false);
+            result.CreateAnonymousOrderEnabled = result.Settings.GetSettingValue("XOrder.CreateAnonymousOrderEnabled", true);
 
             result.CartValidationRuleSet = result.Settings.GetSettingValue<string>("Stores.CartValidationRuleSet", null);
             if (string.IsNullOrEmpty(result.CartValidationRuleSet))