Merge branch 'release/13.1.0'

mattbrailsford · mattbrailsford · commit 6e098d1d880a · 2024-02-06T10:16:58.000Z
diff --git a/.gitignore b/.gitignore
@@ -60,7 +60,6 @@ BenchmarkDotNet.Artifacts/
 # .NET
 project.lock.json
 project.fragment.lock.json
-artifacts/
 
 # Tye
 .tye/
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -32,8 +32,8 @@
 
   <!-- Package validation -->
   <PropertyGroup>
-    <EnablePackageValidation>false</EnablePackageValidation>
-    <PackageValidationBaselineVersion>12.0.0</PackageValidationBaselineVersion>
+    <EnablePackageValidation>true</EnablePackageValidation>
+    <PackageValidationBaselineVersion>13.0.0</PackageValidationBaselineVersion>
     <EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
     <EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
   </PropertyGroup>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -10,7 +10,7 @@
     <GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[13.0.0, 14)" />
+    <PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[13.1.0-rc1, 14)" />
     <PackageVersion Include="Umbraco.Deploy.Infrastructure" Version="[13.0.0, 14)" />
   </ItemGroup>
 </Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -7,6 +7,7 @@ trigger:
       - release/*
       - hotfix/*
       - support/*
+      - feature/*
   tags:
     include:
       - release-*
diff --git a/src/Umbraco.Commerce.Deploy/Artifacts/FixedRateShippingCalculationConfigArtifact.cs b/src/Umbraco.Commerce.Deploy/Artifacts/FixedRateShippingCalculationConfigArtifact.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Commerce.Deploy.Artifacts
+{
+    public class FixedRateShippingCalculationConfigArtifact
+    {
+        public IEnumerable<ServicePriceArtifact> Prices { get; set; }
+    }
+}
diff --git a/src/Umbraco.Commerce.Deploy/Artifacts/LocationArtifact.cs b/src/Umbraco.Commerce.Deploy/Artifacts/LocationArtifact.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Deploy;
+using Umbraco.Commerce.Core.Models;
+
+namespace Umbraco.Commerce.Deploy.Artifacts
+{
+    public class LocationArtifact : StoreEntityArtifactBase
+    {
+        public LocationArtifact(GuidUdi udi, GuidUdi storeUdi, IEnumerable<ArtifactDependency> dependencies = null)
+            : base(udi, storeUdi, dependencies)
+        { }
+
+        public string AddressLine1 { get; set; }
+        public string AddressLine2 { get; set; }
+        public string City { get; set; }
+        public string Region { get; set; }
+        public string CountryIsoCode { get; set; }
+        public string ZipCode { get; set; }
+        public int Type { get; set; }
+        public int SortOrder { get; set; }
+    }
+}
diff --git a/src/Umbraco.Commerce.Deploy/Artifacts/ShippingMethodArtifact.cs b/src/Umbraco.Commerce.Deploy/Artifacts/ShippingMethodArtifact.cs
@@ -1,4 +1,6 @@
-﻿using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Deploy;
 
@@ -12,8 +14,16 @@ public ShippingMethodArtifact(GuidUdi udi, GuidUdi storeUdi, IEnumerable<Artifac
 
         public string Sku { get; set; }
         public GuidUdi TaxClassUdi { get; set; }
+
+        [Obsolete("Now handled via CalculationConfig")]
         public IEnumerable<ServicePriceArtifact> Prices { get; set; }
         public string ImageId { get; set; }
+
+        public int CalculationMode { get; set; }
+        public JObject CalculationConfig { get; set; }
+        public string ShippingProviderAlias { get; set; }
+        public SortedDictionary<string, string> ShippingProviderSettings { get; set; }
+
         public IEnumerable<AllowedCountryRegionArtifact> AllowedCountryRegions { get; set; }
         public int SortOrder { get; set; }
     }
diff --git a/src/Umbraco.Commerce.Deploy/Artifacts/StoreArtifact.cs b/src/Umbraco.Commerce.Deploy/Artifacts/StoreArtifact.cs
@@ -18,10 +18,14 @@ public StoreArtifact(GuidUdi udi, IEnumerable<ArtifactDependency> dependencies =
 
         public GuidUdi DefaultTaxClassUdi { get; set; }
 
+        public GuidUdi DefaultLocationUdi { get; set; }
+
         public GuidUdi DefaultOrderStatusUdi { get; set; }
 
         public GuidUdi ErrorOrderStatusUdi { get; set; }
 
+        public int MeasurementSystem { get; set; }
+
         public bool PricesIncludeTax { get; set; }
 
         public TimeSpan? CookieTimeout { get; set; }
diff --git a/src/Umbraco.Commerce.Deploy/Composing/UmbracoCommerceDeployComponent.cs b/src/Umbraco.Commerce.Deploy/Composing/UmbracoCommerceDeployComponent.cs
@@ -42,6 +42,7 @@ public void Terminate()
         private void RegisterUdiTypes()
         {
             UdiParser.RegisterUdiType(UmbracoCommerceConstants.UdiEntityType.Store, UdiType.GuidUdi);
+            UdiParser.RegisterUdiType(UmbracoCommerceConstants.UdiEntityType.Location, UdiType.GuidUdi);
             UdiParser.RegisterUdiType(UmbracoCommerceConstants.UdiEntityType.OrderStatus, UdiType.GuidUdi);
             UdiParser.RegisterUdiType(UmbracoCommerceConstants.UdiEntityType.ShippingMethod, UdiType.GuidUdi);
             UdiParser.RegisterUdiType(UmbracoCommerceConstants.UdiEntityType.PaymentMethod, UdiType.GuidUdi);
@@ -169,6 +170,7 @@ private void InitializeDiskRefreshers()
         {
             // Add in settings entities as valid Disk entities that can be written out	
             _diskEntityService.RegisterDiskEntityType(UmbracoCommerceConstants.UdiEntityType.Store);
+            _diskEntityService.RegisterDiskEntityType(UmbracoCommerceConstants.UdiEntityType.Location);
             _diskEntityService.RegisterDiskEntityType(UmbracoCommerceConstants.UdiEntityType.OrderStatus);
             _diskEntityService.RegisterDiskEntityType(UmbracoCommerceConstants.UdiEntityType.ShippingMethod);
             _diskEntityService.RegisterDiskEntityType(UmbracoCommerceConstants.UdiEntityType.PaymentMethod);
@@ -186,6 +188,10 @@ private void InitializeDiskRefreshers()
             EventHub.NotificationEvents.OnStoreSaved((e) => _diskEntityService.WriteArtifacts(new[] { GetEntityArtifact(e.Store) }));
             EventHub.NotificationEvents.OnStoreDeleted((e) => _diskEntityService.DeleteArtifacts(new[] { GetEntityArtifact(e.Store) }));
 
+            // Location
+            EventHub.NotificationEvents.OnLocationSaved((e) => _diskEntityService.WriteArtifacts(new[] { GetEntityArtifact(e.Location) }));
+            EventHub.NotificationEvents.OnLocationDeleted((e) => _diskEntityService.DeleteArtifacts(new[] { GetEntityArtifact(e.Location) }));
+
             // OrderStatus
             EventHub.NotificationEvents.OnOrderStatusSaved((e) => _diskEntityService.WriteArtifacts(new[] { GetEntityArtifact(e.OrderStatus) }));
             EventHub.NotificationEvents.OnOrderStatusDeleted((e) => _diskEntityService.DeleteArtifacts(new[] { GetEntityArtifact(e.OrderStatus) }));
diff --git a/src/Umbraco.Commerce.Deploy/Configuration/UmbracoCommerceDeploySettings.cs b/src/Umbraco.Commerce.Deploy/Configuration/UmbracoCommerceDeploySettings.cs
@@ -1,14 +1,16 @@
-﻿using System;
+using System;
 
 namespace Umbraco.Commerce.Deploy.Configuration
 {
     public class UmbracoCommerceDeploySettings
     {
         public UmbracoCommerceDeployPaymentMethodSettings PaymentMethods { get; set; }
+        public UmbracoCommerceDeployShippingMethodSettings ShippingMethods { get; set; }
 
         public UmbracoCommerceDeploySettings()
         {
             PaymentMethods = new UmbracoCommerceDeployPaymentMethodSettings();
+            ShippingMethods = new UmbracoCommerceDeployShippingMethodSettings();
         }
     }
 
@@ -21,4 +23,14 @@ public UmbracoCommerceDeployPaymentMethodSettings()
             IgnoreSettings = Array.Empty<string>();
         }
     }
+
+    public class UmbracoCommerceDeployShippingMethodSettings
+    {
+        public string[] IgnoreSettings { get; set; }
+
+        public UmbracoCommerceDeployShippingMethodSettings()
+        {
+            IgnoreSettings = Array.Empty<string>();
+        }
+    }
 }
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceLocationServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceLocationServiceConnector.cs
@@ -0,0 +1,107 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Commerce.Core.Api;
+using Umbraco.Commerce.Core.Models;
+using Umbraco.Commerce.Deploy.Artifacts;
+using Umbraco.Commerce.Deploy.Configuration;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Deploy;
+
+namespace Umbraco.Commerce.Deploy.Connectors.ServiceConnectors
+{
+    [UdiDefinition(UmbracoCommerceConstants.UdiEntityType.Location, UdiType.GuidUdi)]
+    public class UmbracoCommerceLocationServiceConnector : UmbracoCommerceStoreEntityServiceConnectorBase<LocationArtifact, LocationReadOnly, Location, LocationState>
+    {
+        public override int[] ProcessPasses => new[]
+        {
+            2
+        };
+
+        public override string[] ValidOpenSelectors => new[]
+        {
+            "this",
+            "this-and-descendants",
+            "descendants"
+        };
+
+        public override string AllEntitiesRangeName => "All Umbraco Commerce Locations";
+
+        public override string UdiEntityType => UmbracoCommerceConstants.UdiEntityType.Location;
+
+        public UmbracoCommerceLocationServiceConnector(IUmbracoCommerceApi umbracoCommerceApi, UmbracoCommerceDeploySettingsAccessor settingsAccessor)
+            : base(umbracoCommerceApi, settingsAccessor)
+        { }
+
+        public override string GetEntityName(LocationReadOnly entity)
+            => entity.Name;
+
+        public override LocationReadOnly GetEntity(Guid id)
+            => _umbracoCommerceApi.GetLocation(id);
+
+        public override IEnumerable<LocationReadOnly> GetEntities(Guid storeId)
+            => _umbracoCommerceApi.GetLocations(storeId);
+
+        public override LocationArtifact GetArtifact(GuidUdi udi, LocationReadOnly entity)
+        {
+            if (entity == null)
+                return null;
+
+            var storeUdi = new GuidUdi(UmbracoCommerceConstants.UdiEntityType.Store, entity.StoreId);
+
+            var dependencies = new ArtifactDependencyCollection
+            {
+                new UmbracoCommerceArtifactDependency(storeUdi)
+            };
+
+            return new LocationArtifact(udi, storeUdi, dependencies)
+            {
+                Name = entity.Name,
+                Alias = entity.Alias,
+                AddressLine1 = entity.AddressLine1,
+                AddressLine2 = entity.AddressLine2,
+                City = entity.City,
+                Region = entity.Region,
+                CountryIsoCode = entity.CountryIsoCode,
+                ZipCode = entity.ZipCode,
+                Type = (int)entity.Type,
+                SortOrder = entity.SortOrder
+            };
+        }
+
+        public override void Process(ArtifactDeployState<LocationArtifact, LocationReadOnly> state, IDeployContext context, int pass)
+        {
+            state.NextPass = GetNextPass(ProcessPasses, pass);
+
+            switch (pass)
+            {
+                case 2:
+                    Pass2(state, context);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(pass));
+            }
+        }
+
+        private void Pass2(ArtifactDeployState<LocationArtifact, LocationReadOnly> state, IDeployContext context)
+        {
+            _umbracoCommerceApi.Uow.Execute(uow =>
+            {
+                var artifact = state.Artifact;
+
+                artifact.Udi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Location);
+                artifact.StoreUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Store);
+
+                var entity = state.Entity?.AsWritable(uow) ?? Location.Create(uow, artifact.Udi.Guid, artifact.StoreUdi.Guid, artifact.Alias, artifact.Name);
+
+                entity.SetName(artifact.Name, artifact.Alias)
+                    .SetType((LocationType)artifact.Type)
+                    .SetAddress(new Address(artifact.AddressLine1, artifact.AddressLine2, artifact.City, artifact.Region, artifact.CountryIsoCode, artifact.ZipCode))
+                    .SetSortOrder(artifact.SortOrder);
+
+                _umbracoCommerceApi.SaveLocation(entity);
+
+                uow.Complete();
+            });
+        }
+    }
+}
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceShippingMethodServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceShippingMethodServiceConnector.cs
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceStoreServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceStoreServiceConnector.cs
diff --git a/src/Umbraco.Commerce.Deploy/UmbracoCommerceConstants.cs b/src/Umbraco.Commerce.Deploy/UmbracoCommerceConstants.cs
diff --git a/src/Umbraco.Commerce.Deploy/UmbracoCommerceUdiGetterExtensions.cs b/src/Umbraco.Commerce.Deploy/UmbracoCommerceUdiGetterExtensions.cs
diff --git a/version.json b/version.json

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,16 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`
`3`	`3`	`namespace Umbraco.Commerce.Deploy.Configuration`
`4`	`4`	`{`
`5`	`5`	`public class UmbracoCommerceDeploySettings`
`6`	`6`	`{`
`7`	`7`	`public UmbracoCommerceDeployPaymentMethodSettings PaymentMethods { get; set; }`
	`8`	`+ public UmbracoCommerceDeployShippingMethodSettings ShippingMethods { get; set; }`
`8`	`9`
`9`	`10`	`public UmbracoCommerceDeploySettings()`
`10`	`11`	`{`
`11`	`12`	`PaymentMethods = new UmbracoCommerceDeployPaymentMethodSettings();`
	`13`	`+ ShippingMethods = new UmbracoCommerceDeployShippingMethodSettings();`
`12`	`14`	`}`
`13`	`15`	`}`
`14`	`16`
`@@ -21,4 +23,14 @@ public UmbracoCommerceDeployPaymentMethodSettings()`
`21`	`23`	`IgnoreSettings = Array.Empty<string>();`
`22`	`24`	`}`
`23`	`25`	`}`
	`26`	`+`
	`27`	`+ public class UmbracoCommerceDeployShippingMethodSettings`
	`28`	`+ {`
	`29`	`+ public string[] IgnoreSettings { get; set; }`
	`30`	`+`
	`31`	`+ public UmbracoCommerceDeployShippingMethodSettings()`
	`32`	`+ {`
	`33`	`+ IgnoreSettings = Array.Empty<string>();`
	`34`	`+ }`
	`35`	`+ }`
`24`	`36`	`}`