Merge branch 'release/16.1.0'

Author: mattbrailsford

Directory.Packages.props

@@ -10,8 +10,8 @@
     <GlobalPackageReference Include="Umbraco.JsonSchema.Extensions" Version="0.3.0" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[16.0.0, 16.999.999)" />
-    <PackageVersion Include="Umbraco.Commerce.Persistence.Sqlite" Version="[16.0.0, 16.999.999)" />
+    <PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[16.1.0, 16.999.999)" />
+    <PackageVersion Include="Umbraco.Commerce.Persistence.Sqlite" Version="[16.1.0, 16.999.999)" />
     <PackageVersion Include="Umbraco.Deploy.Infrastructure" Version="[16.0.0, 16.999.999)" />
   </ItemGroup>
 </Project>

src/Umbraco.Commerce.Deploy/Artifacts/StoreArtifact.cs

@@ -21,6 +21,10 @@ public class StoreArtifact(GuidUdi? udi, IEnumerable<ArtifactDependency>? depend
 
         public GuidUdi? ErrorOrderStatusUdi { get; set; }
 
+        public string? LogoImageUrl { get; set; }
+
+        public string? ThemeColor { get; set; }
+
         public int MeasurementSystem { get; set; }
 
         public bool PricesIncludeTax { get; set; }
@@ -57,6 +61,12 @@ public class StoreArtifact(GuidUdi? udi, IEnumerable<ArtifactDependency>? depend
 
         public GuidUdi? ErrorEmailTemplateUdi { get; set; }
 
+        public GuidUdi? AbandonedCartEmailTemplateUdi { get; set; }
+
+        public int? AbandonedCartInactivityPeriod { get; set; }
+
+        public string? AbandonedCartLandingPageUrl { get; set; }
+
         public IEnumerable<string>? AllowedUsers { get; set; }
 
         public IEnumerable<string>?AllowedUserRoles { get; set; }

src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceStoreServiceConnector.cs

@@ -63,6 +63,8 @@ public override IAsyncEnumerable<StoreReadOnly> GetEntitiesAsync(CancellationTok
             {
                 Name = entity.Name,
                 Alias = entity.Alias,
+                LogoImageUrl = entity.LogoImageUrl,
+                ThemeColor = entity.ThemeColor,
                 MeasurementSystem = (int)entity.MeasurementSystem,
                 PricesIncludeTax = entity.PricesIncludeTax,
                 CookieTimeout = entity.CookieTimeout,
@@ -76,6 +78,8 @@ public override IAsyncEnumerable<StoreReadOnly> GetEntitiesAsync(CancellationTok
                 GiftCardCodeTemplate = entity.GiftCardCodeTemplate,
                 GiftCardPropertyAliases = entity.GiftCardPropertyAliases,
                 GiftCardActivationMethod = (int)entity.GiftCardActivationMethod,
+                AbandonedCartInactivityPeriod = entity.AbandonedCartInactivityPeriod,
+                AbandonedCartLandingPageUrl = entity.AbandonedCartLandingPageUrl,
                 AllowedUsers = entity.AllowedUsers.Select(x => x.UserId).ToList(),
                 AllowedUserRoles = entity.AllowedUserRoles.Select(x => x.Role).ToList(),
             };
@@ -170,6 +174,15 @@ public override IAsyncEnumerable<StoreReadOnly> GetEntitiesAsync(CancellationTok
                 artifact.ErrorEmailTemplateUdi = depUdi;
             }
 
+            // Abandoned Cart Notification email template
+            if (entity.AbandonedCartEmailTemplateId.HasValue)
+            {
+                var depUdi = new GuidUdi(UmbracoCommerceConstants.UdiEntityType.EmailTemplate, entity.AbandonedCartEmailTemplateId.Value);
+                var dep = new UmbracoCommerceArtifactDependency(depUdi);
+                dependencies.Add(dep);
+                artifact.AbandonedCartEmailTemplateUdi = depUdi;
+            }
+
             // Stock sharing store
             if (entity.ShareStockFromStoreId.HasValue)
             {
@@ -215,6 +228,10 @@ private async Task Pass1Async(ArtifactDeployState<StoreArtifact, StoreReadOnly>
                         false);
 
                     await entity.SetNameAsync(artifact.Name, artifact.Alias)
+                        .SetThemeSettingsAsync(new StoreThemeSettings{
+                            LogoImageUrl = artifact.LogoImageUrl,
+                            ThemeColor = artifact.ThemeColor
+                        })
                         .SetMeasurementSystemAsync((MeasurementSystem)artifact.MeasurementSystem)
                         .SetPriceTaxInclusivityAsync(artifact.PricesIncludeTax)
                         .SetCartNumberTemplateAsync(artifact.CartNumberTemplate)
@@ -366,6 +383,21 @@ await _umbracoCommerceApi.Uow.ExecuteAsync(
 
                         await entity.SetErrorEmailTemplateAsync(errorEmailTemplateId);
 
+                        // Abandoned
+                        Guid? abandonedCartEmailTemplateId = null;
+
+                        if (artifact.AbandonedCartEmailTemplateUdi != null)
+                        {
+                            artifact.AbandonedCartEmailTemplateUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.EmailTemplate);
+
+                            abandonedCartEmailTemplateId = (await _umbracoCommerceApi.GetEmailTemplateAsync(artifact.AbandonedCartEmailTemplateUdi.Guid))?.Id;
+                        }
+
+                        await entity.SetAbandonedCartSettingsAsync(
+                            abandonedCartEmailTemplateId,
+                            artifact.AbandonedCartInactivityPeriod ?? 0,
+                            artifact.AbandonedCartLandingPageUrl);
+
                         // StockSharingStore
                         Guid? stockSharingStore = null;
 

src/Umbraco.Commerce.Deploy/wwwroot/umbraco-commerce-deploy.js

@@ -10,10 +10,8 @@ export const onInit = async (host, extensionRegistry) => {
         localizations: {
           // Entity types
           deploy_entityTypes: {
-            "uc:product-attribute": "Umbraco Commerce Product Attribute",
-            "uc:product-attributes": "Umbraco Commerce Product Attributes",
-            "uc:product-attribute-preset": "Umbraco Commerce Product Attribute Preset",
-            "uc:product-attribute-presets": "Umbraco Commerce Product Attribute Presets"
+            "umbraco-commerce-product-attribute": "Umbraco Commerce Product Attribute",
+            "umbraco-commerce-product-attribute-preset": "Umbraco Commerce Product Attribute Preset"
           }
         }
       },

umbraco-marketplace-readme.md

@@ -8,4 +8,4 @@ With Umbraco Commerce Deploy you can easily transfer your Umbraco Commerce setti
 
 * Deploy store settings between environments
 * Adapters for Umbraco Commerce property editors
-* Works OnPrem or with Umrbaco Cloud
+* Works OnPrem or with Umbraco Cloud

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "16.0.0",
+  "version": "16.1.0",
   "assemblyVersion": {
     "precision": "build"
   },