switch to using ints instead of enums to be consistent

Author: mattbrailsford

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

@@ -17,7 +17,7 @@ public LocationArtifact(GuidUdi udi, GuidUdi storeUdi, IEnumerable<ArtifactDepen
         public string Region { get; set; }
         public string CountryIsoCode { get; set; }
         public string ZipCode { get; set; }
-        public LocationType Type { get; set; }
+        public int Type { get; set; }
         public int SortOrder { get; set; }
     }
 }

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

@@ -3,7 +3,6 @@
 using Newtonsoft.Json.Linq;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Deploy;
-using Umbraco.Commerce.Core.Models;
 
 namespace Umbraco.Commerce.Deploy.Artifacts
 {
@@ -20,7 +19,7 @@ public ShippingMethodArtifact(GuidUdi udi, GuidUdi storeUdi, IEnumerable<Artifac
         public IEnumerable<ServicePriceArtifact> Prices { get; set; }
         public string ImageId { get; set; }
 
-        public ShippingCalculationMode CalculationMode { get; set; }
+        public int CalculationMode { get; set; }
         public JObject CalculationConfig { get; set; }
         public string ShippingProviderAlias { get; set; }
         public SortedDictionary<string, string> ShippingProviderSettings { get; set; }

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

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Deploy;
-using Umbraco.Commerce.Core.Models;
 using Umbraco.Deploy.Infrastructure.Artifacts;
 
 namespace Umbraco.Commerce.Deploy.Artifacts
@@ -25,7 +24,7 @@ public StoreArtifact(GuidUdi udi, IEnumerable<ArtifactDependency> dependencies =
 
         public GuidUdi ErrorOrderStatusUdi { get; set; }
 
-        public MeasurementSystem MeasurementSystem { get; set; }
+        public int MeasurementSystem { get; set; }
 
         public bool PricesIncludeTax { get; set; }
 

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

@@ -63,7 +63,7 @@ public override LocationArtifact GetArtifact(GuidUdi udi, LocationReadOnly entit
                 Region = entity.Region,
                 CountryIsoCode = entity.CountryIsoCode,
                 ZipCode = entity.ZipCode,
-                Type = entity.Type,
+                Type = (int)entity.Type,
                 SortOrder = entity.SortOrder
             };
         }
@@ -94,7 +94,7 @@ private void Pass2(ArtifactDeployState<LocationArtifact, LocationReadOnly> state
                 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(artifact.Type)
+                    .SetType((LocationType)artifact.Type)
                     .SetAddress(new Address(artifact.AddressLine1, artifact.AddressLine2, artifact.City, artifact.Region, artifact.CountryIsoCode, artifact.ZipCode))
                     .SetSortOrder(artifact.SortOrder);
 

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

@@ -63,7 +63,7 @@ public override ShippingMethodArtifact GetArtifact(GuidUdi udi, ShippingMethodRe
                 Alias = entity.Alias,
                 Sku = entity.Sku,
                 ImageId = entity.ImageId, // Could be a UDI?
-                CalculationMode = entity.CalculationMode,
+                CalculationMode = (int)entity.CalculationMode,
                 ShippingProviderAlias = entity.ShippingProviderAlias,
                 ShippingProviderSettings = new SortedDictionary<string, string>(entity.ShippingProviderSettings
                     .Where(x => !StringExtensions.InvariantContains(_settingsAccessor.Settings.ShippingMethods.IgnoreSettings, x.Key)) // Ignore any settings that shouldn't be transfered
@@ -202,7 +202,7 @@ private void Pass2(ArtifactDeployState<ShippingMethodArtifact, ShippingMethodRea
                 artifact.Udi.EnsureType(UmbracoCommerceConstants.UdiEntityType.ShippingMethod);
                 artifact.StoreUdi.EnsureType(UmbracoCommerceConstants.UdiEntityType.Store);
 
-                var entity = state.Entity?.AsWritable(uow) ?? ShippingMethod.Create(uow, artifact.Udi.Guid, artifact.StoreUdi.Guid, artifact.Alias, artifact.Name, artifact.ShippingProviderAlias, artifact.CalculationMode);
+                var entity = state.Entity?.AsWritable(uow) ?? ShippingMethod.Create(uow, artifact.Udi.Guid, artifact.StoreUdi.Guid, artifact.Alias, artifact.Name, artifact.ShippingProviderAlias, (ShippingCalculationMode)artifact.CalculationMode);
 
                 var settings = artifact.ShippingProviderSettings
                     .Where(x => !StringExtensions.InvariantContains(_settingsAccessor.Settings.ShippingMethods.IgnoreSettings, x.Key)) // Ignore any settings that shouldn't be transfered
@@ -244,7 +244,7 @@ private void Pass4(ArtifactDeployState<ShippingMethodArtifact, ShippingMethodRea
                 // Calculation config
                 if (artifact.CalculationConfig != null)
                 {
-                    if (artifact.CalculationMode == ShippingCalculationMode.Fixed)
+                    if (artifact.CalculationMode == (int)ShippingCalculationMode.Fixed)
                     {
                         var cfgArtifact = artifact.CalculationConfig.ToObject<FixedRateShippingCalculationConfigArtifact>();
                         var prices = new List<ServicePrice>();
@@ -264,11 +264,11 @@ private void Pass4(ArtifactDeployState<ShippingMethodArtifact, ShippingMethodRea
 
                         entity.SetCalculationConfig(new FixedRateShippingCalculationConfig(prices));
                     }
-                    else if (artifact.CalculationMode == ShippingCalculationMode.Dynamic)
+                    else if (artifact.CalculationMode == (int)ShippingCalculationMode.Dynamic)
                     {
                         entity.SetCalculationConfig(artifact.CalculationConfig.ToObject<DynamicRateShippingCalculationConfig>());
                     }
-                    else if (artifact.CalculationMode == ShippingCalculationMode.Realtime)
+                    else if (artifact.CalculationMode == (int)ShippingCalculationMode.Realtime)
                     {
                         entity.SetCalculationConfig(artifact.CalculationConfig.ToObject<RealtimeRateShippingCalculationConfig>());
                     }

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

@@ -61,7 +61,7 @@ public override StoreArtifact GetArtifact(GuidUdi udi, StoreReadOnly entity)
             {
                 Name = entity.Name,
                 Alias = entity.Alias,
-                MeasurementSystem = entity.MeasurementSystem,
+                MeasurementSystem = (int)entity.MeasurementSystem,
                 PricesIncludeTax = entity.PricesIncludeTax,
                 CookieTimeout = entity.CookieTimeout,
                 CartNumberTemplate = entity.CartNumberTemplate,
@@ -255,7 +255,7 @@ private void Pass1(ArtifactDeployState<StoreArtifact, StoreReadOnly> state, IDep
 
 #pragma warning disable CS0618 // SetOrderEditorConfig is obsolete
                 entity.SetName(artifact.Name, artifact.Alias)
-                    .SetMeasurementSystem(artifact.MeasurementSystem)
+                    .SetMeasurementSystem((MeasurementSystem)artifact.MeasurementSystem)
                     .SetPriceTaxInclusivity(artifact.PricesIncludeTax)
                     .SetCartNumberTemplate(artifact.CartNumberTemplate)
                     .SetOrderNumberTemplate(artifact.OrderNumberTemplate)