Update to use Umbraco Commerce 16.3.1 and implement new Enabled flags on Shipping/Payment Methods

mattbrailsford · mattbrailsford · commit 0cbaaed43ea1 · 2025-09-25T13:38:20.000+01:00
diff --git a/Directory.Packages.props b/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.1.0, 16.999.999)" />
-    <PackageVersion Include="Umbraco.Commerce.Persistence.Sqlite" Version="[16.1.0, 16.999.999)" />
+    <PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[16.3.1, 16.999.999)" />
+    <PackageVersion Include="Umbraco.Commerce.Persistence.Sqlite" Version="[16.3.1, 16.999.999)" />
     <PackageVersion Include="Umbraco.Deploy.Infrastructure" Version="[16.0.0, 16.999.999)" />
   </ItemGroup>
 </Project>
diff --git a/src/Umbraco.Commerce.Deploy/Artifacts/PaymentMethodArtifact.cs b/src/Umbraco.Commerce.Deploy/Artifacts/PaymentMethodArtifact.cs
@@ -23,6 +23,7 @@ public class PaymentMethodArtifact(
         public bool CanRefundPayments { get; set; }
 
         public IEnumerable<AllowedCountryRegionArtifact>? AllowedCountryRegions { get; set; }
+        public bool IsEnabled { 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
@@ -25,6 +25,7 @@ public class ShippingMethodArtifact(
         public SortedDictionary<string, string> ShippingProviderSettings { get; set; }
 
         public IEnumerable<AllowedCountryRegionArtifact>? AllowedCountryRegions { get; set; }
+        public bool IsEnabled { get; set; }
         public int SortOrder { get; set; }
     }
 }
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommercePaymentMethodServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommercePaymentMethodServiceConnector.cs
@@ -75,6 +75,7 @@ public override IAsyncEnumerable<PaymentMethodReadOnly> GetEntitiesAsync(Guid st
                 CanCapturePayments = entity.CanCapturePayments,
                 CanCancelPayments = entity.CanCancelPayments,
                 CanRefundPayments = entity.CanRefundPayments,
+                IsEnabled = entity.IsEnabled,
                 SortOrder = entity.SortOrder
             };
 
@@ -214,6 +215,7 @@ await entity.SetNameAsync(artifact.Name, artifact.Alias)
                         .SetImageAsync(artifact.ImageId)
                         .SetSettingsAsync(settings, SetBehavior.Merge)
                         .ToggleFeaturesAsync(artifact.CanFetchPaymentStatuses, artifact.CanCapturePayments, artifact.CanCancelPayments, artifact.CanRefundPayments)
+                        .SetEnabledAsync(artifact.IsEnabled)
                         .SetSortOrderAsync(artifact.SortOrder);
 
                     await _umbracoCommerceApi.SavePaymentMethodAsync(entity, ct);
diff --git a/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceShippingMethodServiceConnector.cs b/src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceShippingMethodServiceConnector.cs
@@ -77,6 +77,7 @@ public override IAsyncEnumerable<ShippingMethodReadOnly> GetEntitiesAsync(Guid s
                 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
                     .ToDictionary(x => x.Key, x => x.Value)), // Could contain UDIs?
+                IsEnabled = entity.IsEnabled,
                 SortOrder = entity.SortOrder
             };
 
@@ -231,6 +232,7 @@ await entity.SetNameAsync(artifact.Name, artifact.Alias)
                         .SetSkuAsync(artifact.Sku)
                         .SetImageAsync(artifact.ImageId)
                         .SetSettingsAsync(settings, SetBehavior.Merge)
+                        .SetEnabledAsync(artifact.IsEnabled)
                         .SetSortOrderAsync(artifact.SortOrder);
 
                     await _umbracoCommerceApi.SaveShippingMethodAsync(entity, ct);
diff --git a/src/Umbraco.Commerce.Deploy/wwwroot/umbraco-package.json b/src/Umbraco.Commerce.Deploy/wwwroot/umbraco-package.json
@@ -1,7 +1,7 @@
 {
   "id": "Umbraco.Commerce.Deploy",
   "name": "Umbraco Commerce Deploy",
-  "version": "16.0.0--rc1.preview.6.gdc53613",
+  "version": "16.2.0",
   "allowTelemetry": true,
   "extensions": [
     {
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "16.1.1",
+  "version": "16.2.0",
   "assemblyVersion": {
     "precision": "build"
   },

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public class PaymentMethodArtifact(`
`23`	`23`	`public bool CanRefundPayments { get; set; }`
`24`	`24`
`25`	`25`	`public IEnumerable<AllowedCountryRegionArtifact>? AllowedCountryRegions { get; set; }`
	`26`	`+ public bool IsEnabled { get; set; }`
`26`	`27`	`public int SortOrder { get; set; }`
`27`	`28`	`}`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ public class ShippingMethodArtifact(`
`25`	`25`	`public SortedDictionary<string, string> ShippingProviderSettings { get; set; }`
`26`	`26`
`27`	`27`	`public IEnumerable<AllowedCountryRegionArtifact>? AllowedCountryRegions { get; set; }`
	`28`	`+ public bool IsEnabled { get; set; }`
`28`	`29`	`public int SortOrder { get; set; }`
`29`	`30`	`}`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "Umbraco.Commerce.Deploy",`
`3`	`3`	`"name": "Umbraco Commerce Deploy",`
`4`		`- "version": "16.0.0--rc1.preview.6.gdc53613",`
	`4`	`+ "version": "16.2.0",`
`5`	`5`	`"allowTelemetry": true,`
`6`	`6`	`"extensions": [`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",`
`3`		`- "version": "16.1.1",`
	`3`	`+ "version": "16.2.0",`
`4`	`4`	`"assemblyVersion": {`
`5`	`5`	`"precision": "build"`
`6`	`6`	`},`