OrchardCMS · DemeSzabolcs · Aug 4, 2023 · Aug 4, 2023 · Aug 4, 2023 · Aug 4, 2023
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -6,7 +6,7 @@
   -->
 
   <ItemGroup>
-    <PackageReference Include="Lombiq.Analyzers" Version="3.1.0">
+    <PackageReference Include="Lombiq.Analyzers" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/src/Libraries/OrchardCore.Commerce.MoneyDataType/Currency.cs b/src/Libraries/OrchardCore.Commerce.MoneyDataType/Currency.cs
@@ -103,7 +103,7 @@ public string ToString(decimal amount)
 
     public static bool operator !=(Currency left, Currency right) => !(left == right);
 
-    private static void ThrowIfMissing(string argument, [CallerArgumentExpression("argument")] string name = null)
+    private static void ThrowIfMissing(string argument, [CallerArgumentExpression(nameof(argument))] string name = null)
     {
         if (string.IsNullOrWhiteSpace(argument))
         {

diff --git a/src/Libraries/OrchardCore.Commerce.MoneyDataType/KnownCurrencyTable.cs b/src/Libraries/OrchardCore.Commerce.MoneyDataType/KnownCurrencyTable.cs
@@ -51,7 +51,7 @@ static int RankCultureByExpectedRelevance(CultureInfo cultureInfo)
             var cultures = CultureInfo.GetCultures(CultureTypes.AllCultures).Where(IsValid).ToList();
 
             CurrencyTable = cultures
-                .GroupBy(culture => culture.Name.Split('-').Last())
+                .GroupBy(culture => culture.Name.Split('-')[^1])
                 .Select(group => group
                     .OrderBy(RankCultureByExpectedRelevance)
                     .ThenBy(culture => culture.EnglishName)

diff --git a/src/Libraries/OrchardCore.Commerce.MoneyDataType/OrchardCore.Commerce.MoneyDataType.csproj b/src/Libraries/OrchardCore.Commerce.MoneyDataType/OrchardCore.Commerce.MoneyDataType.csproj
@@ -25,7 +25,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.Text.Json" Version="7.0.2" />
+    <PackageReference Include="System.Text.Json" Version="7.0.3" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Libraries/OrchardCore.Commerce.MoneyDataType/Serialization/AmountConverter.cs b/src/Libraries/OrchardCore.Commerce.MoneyDataType/Serialization/AmountConverter.cs
@@ -6,7 +6,7 @@
 
 namespace OrchardCore.Commerce.MoneyDataType.Serialization;
 
-internal class AmountConverter : JsonConverter<Amount>
+internal sealed class AmountConverter : JsonConverter<Amount>
 {
     public const string ValueName = "value";
     public const string CurrencyName = "currency";

diff --git a/src/Libraries/OrchardCore.Commerce.MoneyDataType/Serialization/CurrencyConverter.cs b/src/Libraries/OrchardCore.Commerce.MoneyDataType/Serialization/CurrencyConverter.cs
@@ -4,7 +4,7 @@
 
 namespace OrchardCore.Commerce.MoneyDataType.Serialization;
 
-internal class CurrencyConverter : System.Text.Json.Serialization.JsonConverter<ICurrency>
+internal sealed class CurrencyConverter : System.Text.Json.Serialization.JsonConverter<ICurrency>
 {
     public override ICurrency Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
         Currency.FromIsoCode(reader.GetString());

diff --git a/src/Libraries/OrchardCore.Commerce.MoneyDataType/Serialization/LegacyAmountConverter.cs b/src/Libraries/OrchardCore.Commerce.MoneyDataType/Serialization/LegacyAmountConverter.cs
@@ -6,7 +6,7 @@
 
 namespace OrchardCore.Commerce.MoneyDataType.Serialization;
 
-internal class LegacyAmountConverter : JsonConverter<Amount>
+internal sealed class LegacyAmountConverter : JsonConverter<Amount>
 {
     public override Amount ReadJson(
         JsonReader reader,

diff --git a/src/Libraries/OrchardCore.Commerce.MoneyDataType/Serialization/LegacyCurrencyConverter.cs b/src/Libraries/OrchardCore.Commerce.MoneyDataType/Serialization/LegacyCurrencyConverter.cs
@@ -4,7 +4,7 @@
 
 namespace OrchardCore.Commerce.MoneyDataType.Serialization;
 
-internal class LegacyCurrencyConverter : JsonConverter<ICurrency>
+internal sealed class LegacyCurrencyConverter : JsonConverter<ICurrency>
 {
     public override ICurrency ReadJson(
         JsonReader reader,

diff --git a/src/Modules/OrchardCore.Commerce.ContentFields/OrchardCore.Commerce.ContentFields.csproj b/src/Modules/OrchardCore.Commerce.ContentFields/OrchardCore.Commerce.ContentFields.csproj
@@ -44,7 +44,7 @@
     <ProjectReference Include="$(LombiqHelpfulLibrariesPath)" />
   </ItemGroup>
   <ItemGroup Condition="!Exists($(LombiqHelpfulLibrariesPath))">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="6.0.1-alpha.0.gov-15" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="7.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Modules/OrchardCore.Commerce.Inventory/Drivers/InventoryPartDisplayDriver.cs b/src/Modules/OrchardCore.Commerce.Inventory/Drivers/InventoryPartDisplayDriver.cs
@@ -33,9 +33,9 @@ public override async Task<IDisplayResult> UpdateAsync(
         var viewModel = new InventoryPartViewModel();
         if (await updater.TryUpdateModelAsync(viewModel, Prefix))
         {
-            var currentSku = _hca.HttpContext.Request.Form["ProductPart.Sku"].ToString().ToUpperInvariant();
+            var currentSku = _hca.HttpContext?.Request.Form["ProductPart.Sku"].ToString().ToUpperInvariant();
             var skuBefore = viewModel.Inventory.FirstOrDefault().Key != null
-                ? viewModel.Inventory.FirstOrDefault().Key.Split("-").First()
+                ? viewModel.Inventory.FirstOrDefault().Key.Split('-')[0]
                 : "DEFAULT";
 
             part.Inventory.Clear();
@@ -51,7 +51,7 @@ public override async Task<IDisplayResult> UpdateAsync(
                 foreach (var inventoryEntry in oldInventory)
                 {
                     var updatedKey = oldInventory.Count > 1
-                        ? currentSku + "-" + inventoryEntry.Key.Split('-').Last()
+                        ? currentSku + "-" + inventoryEntry.Key.Split('-')[^1]
                         : currentSku;
 
                     part.Inventory.Remove(inventoryEntry.Key);

diff --git a/src/Modules/OrchardCore.Commerce.Inventory/OrchardCore.Commerce.Inventory.csproj b/src/Modules/OrchardCore.Commerce.Inventory/OrchardCore.Commerce.Inventory.csproj
@@ -41,7 +41,7 @@
     <ProjectReference Include="$(LombiqHelpfulLibrariesPath)" />
   </ItemGroup>
   <ItemGroup Condition="!Exists($(LombiqHelpfulLibrariesPath))">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="6.0.1-alpha.0.gov-15" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="7.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Modules/OrchardCore.Commerce/Abstractions/IPredefinedValuesProductAttributeService.cs b/src/Modules/OrchardCore.Commerce/Abstractions/IPredefinedValuesProductAttributeService.cs
@@ -33,7 +33,7 @@ public static IEnumerable<string> GetProductAttributesCombinations(
         this IPredefinedValuesProductAttributeService service,
         ContentItem product) =>
         CartesianProduct(service.GetProductAttributesPredefinedValues(product))
-            .Select(predefinedValues => string.Join("-", predefinedValues));
+            .Select(predefinedValues => string.Join('-', predefinedValues));
 
     private static IEnumerable<IEnumerable<T>> CartesianProduct<T>(IEnumerable<IEnumerable<T>> sequences)
     {

diff --git a/src/Modules/OrchardCore.Commerce/Activities/OrderCreatedEvent.cs b/src/Modules/OrchardCore.Commerce/Activities/OrderCreatedEvent.cs
@@ -22,7 +22,7 @@ public OrderCreatedEvent(IStringLocalizer<OrderCreatedEvent> localizer) =>
     public override IEnumerable<Outcome> GetPossibleOutcomes(
         WorkflowExecutionContext workflowContext,
         ActivityContext activityContext) =>
-        Outcomes(new[] { T["Done"] });
+        new[] { new Outcome(T["Done"]) };
 
     public override ActivityExecutionResult Resume(
         WorkflowExecutionContext workflowContext,

diff --git a/src/Modules/OrchardCore.Commerce/Activities/ProductAddedToCartEvent.cs b/src/Modules/OrchardCore.Commerce/Activities/ProductAddedToCartEvent.cs
@@ -21,7 +21,7 @@ public class ProductAddedToCartEvent : EventActivity
     public override IEnumerable<Outcome> GetPossibleOutcomes(
         WorkflowExecutionContext workflowContext,
         ActivityContext activityContext) =>
-        Outcomes(new[] { T["Done"] });
+        new[] { new Outcome(T["Done"]) };
 
     public override ActivityExecutionResult Resume(
         WorkflowExecutionContext workflowContext,

diff --git a/src/Modules/OrchardCore.Commerce/Drivers/OrderContentTypeDefinitionDisplayDriver.cs b/src/Modules/OrchardCore.Commerce/Drivers/OrderContentTypeDefinitionDisplayDriver.cs
@@ -52,8 +52,7 @@ public override IDisplayResult Edit(ContentTypeDefinition model) =>
                             {
                                 var displayText = link.Url
                                     .Query
-                                    .Split("name=")
-                                    .Last()
+                                    .Split("name=")[^1]
                                     .Replace("Order_Checkout__", string.Empty)
                                     .Replace("__", " - ");
 

diff --git a/src/Modules/OrchardCore.Commerce/Drivers/ProductPartDisplayDriver.cs b/src/Modules/OrchardCore.Commerce/Drivers/ProductPartDisplayDriver.cs
@@ -82,7 +82,7 @@ private static void UpdateAvailabilityKeys(ProductPart part, int inventoryCount)
         foreach (var entry in part.CanBeBought)
         {
             var updatedKey = inventoryCount > 1
-                ? part.Sku + "-" + entry.Key.Split('-').Last()
+                ? $"{part.Sku}-{entry.Key.Split('-')[^1]}"
                 : part.Sku;
 
             newAvailabilities.Add(updatedKey, entry.Value);

diff --git a/src/Modules/OrchardCore.Commerce/Drivers/RegionSettingsDisplayDriver.cs b/src/Modules/OrchardCore.Commerce/Drivers/RegionSettingsDisplayDriver.cs
@@ -77,8 +77,7 @@ public override async Task<IDisplayResult> UpdateAsync(RegionSettings section, B
                     .Select(region => region.TwoLetterISORegionName);
 
                 section.AllowedRegions = allowedRegions?.Any() == true
-                    ? allRegionTwoLetterIsoRegionNames
-                        .Where(regionTwoLetterIsoRegionName => allowedRegions.Contains(regionTwoLetterIsoRegionName))
+                    ? allRegionTwoLetterIsoRegionNames.Where(allowedRegions.Contains)
                     : allRegionTwoLetterIsoRegionNames;
 
                 // Release the tenant to apply settings.

diff --git a/src/Modules/OrchardCore.Commerce/Drivers/ShoppingCartWidgetPartDisplayDriver.cs b/src/Modules/OrchardCore.Commerce/Drivers/ShoppingCartWidgetPartDisplayDriver.cs
@@ -16,7 +16,7 @@ public ShoppingCartWidgetPartDisplayDriver(IShoppingCartPersistence shoppingCart
         _shoppingCartPersistence = shoppingCartPersistence;
 
     public override IDisplayResult Display(ShoppingCartWidgetPart part, BuildPartDisplayContext context) =>
-        Initialize<ShoppingCartWidgetPartViewModel>(GetDisplayShapeType(context), viewModel => PopulateViewModelAsync(viewModel))
+        Initialize<ShoppingCartWidgetPartViewModel>(GetDisplayShapeType(context), PopulateViewModelAsync)
             .Location("Detail", "Content:25")
             .Location("Summary", "Meta:10");
 

diff --git a/src/Modules/OrchardCore.Commerce/Fields/ProductAttributeField.cs b/src/Modules/OrchardCore.Commerce/Fields/ProductAttributeField.cs
@@ -1,9 +1,14 @@
 using OrchardCore.Commerce.Settings;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
+using System.Diagnostics.CodeAnalysis;
 
 namespace OrchardCore.Commerce.Fields;
 
+[SuppressMessage(
+    "Minor Code Smell",
+    "S2094:Classes should not be empty",
+    Justification = "Intermediate ancestor class to group together attribute fields.")]
 public abstract class ProductAttributeField : ContentField
 {
 }

diff --git a/src/Modules/OrchardCore.Commerce/Models/PrioritizedPrice.cs b/src/Modules/OrchardCore.Commerce/Models/PrioritizedPrice.cs
@@ -1,7 +1,7 @@
 using OrchardCore.Commerce.MoneyDataType;
 using OrchardCore.Commerce.Serialization;
-using System;
 using System.Diagnostics;
+using System.Globalization;
 using System.Text.Json.Serialization;
 
 namespace OrchardCore.Commerce.Models;
@@ -23,7 +23,7 @@ public class PrioritizedPrice
     /// </summary>
     public Amount Price { get; }
 
-    private string DebuggerDisplay => FormattableString.Invariant($"{Price} ^{Priority}");
+    private string DebuggerDisplay => string.Create(CultureInfo.InvariantCulture, $"{Price} ^{Priority}");
 
     public PrioritizedPrice(int priority, Amount price)
     {

diff --git a/src/Modules/OrchardCore.Commerce/Models/ShoppingCartItem.cs b/src/Modules/OrchardCore.Commerce/Models/ShoppingCartItem.cs
@@ -64,10 +64,10 @@ public string GetVariantKeyFromAttributes(ISet<string> predefinedAttributeValues
             .OrderBy(value => value.AttributeName);
 
         return string.Join(
-            "-",
-            predefinedAttributes
-                .Select(attr => attr.UntypedPredefinedValue)
-                .Where(value => value != null))
+                '-',
+                predefinedAttributes
+                    .Select(attr => attr.UntypedPredefinedValue)
+                    .Where(value => value != null))
             .HtmlClassify()
             .ToUpperInvariant();
     }

diff --git a/src/Modules/OrchardCore.Commerce/Models/ShoppingCartWidgetPart.cs b/src/Modules/OrchardCore.Commerce/Models/ShoppingCartWidgetPart.cs
@@ -1,7 +1,12 @@
 using OrchardCore.ContentManagement;
+using System.Diagnostics.CodeAnalysis;
 
 namespace OrchardCore.Commerce.Models;
 
+[SuppressMessage(
+    "Minor Code Smell",
+    "S2094:Classes should not be empty",
+    Justification = "This part doesn't store data.")]
 public class ShoppingCartWidgetPart : ContentPart
 {
 }
diff --git a/src/Modules/OrchardCore.Commerce/OrchardCore.Commerce.csproj b/src/Modules/OrchardCore.Commerce/OrchardCore.Commerce.csproj
@@ -37,7 +37,7 @@
     <PackageReference Include="OrchardCore.Title" Version="1.6.0" />
     <PackageReference Include="OrchardCore.Templates" Version="1.6.0" />
     <PackageReference Include="OrchardCore.Workflows.Abstractions" Version="1.6.0" />
-    <PackageReference Include="Stripe.net" Version="41.18.0" />
+    <PackageReference Include="Stripe.net" Version="41.27.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Modules/OrchardCore.Commerce/ProductAttributeValues/RawProductAttributeValue.cs b/src/Modules/OrchardCore.Commerce/ProductAttributeValues/RawProductAttributeValue.cs
@@ -7,7 +7,7 @@ namespace OrchardCore.Commerce.ProductAttributeValues;
 /// Used only to deserialize attributes, before they're post-processed into concrete attribute values.
 /// </summary>
 [JsonConverter(typeof(RawProductAttributeValueConverter))]
-internal class RawProductAttributeValue : BaseProductAttributeValue<object>
+internal sealed class RawProductAttributeValue : BaseProductAttributeValue<object>
 {
     public RawProductAttributeValue(object value)
         : base(attributeName: null, value)

diff --git a/src/Modules/OrchardCore.Commerce/Serialization/PrioritizedPriceConverter.cs b/src/Modules/OrchardCore.Commerce/Serialization/PrioritizedPriceConverter.cs
@@ -6,7 +6,7 @@
 
 namespace OrchardCore.Commerce.Serialization;
 
-internal class PrioritizedPriceConverter : JsonConverter<PrioritizedPrice>
+internal sealed class PrioritizedPriceConverter : JsonConverter<PrioritizedPrice>
 {
     private const string PriorityName = "priority";
     private const string AmountName = "amount";

diff --git a/src/Modules/OrchardCore.Commerce/Serialization/ProductAttributeValueConverter.cs b/src/Modules/OrchardCore.Commerce/Serialization/ProductAttributeValueConverter.cs
@@ -7,7 +7,7 @@
 
 namespace OrchardCore.Commerce.Serialization;
 
-internal class ProductAttributeValueConverter : JsonConverter<IProductAttributeValue>
+internal sealed class ProductAttributeValueConverter : JsonConverter<IProductAttributeValue>
 {
     private const string Type = "type";
     private const string Value = "value";

diff --git a/src/Modules/OrchardCore.Commerce/Serialization/RawProductAttributeValueConverter.cs b/src/Modules/OrchardCore.Commerce/Serialization/RawProductAttributeValueConverter.cs
@@ -5,7 +5,7 @@
 
 namespace OrchardCore.Commerce.Serialization;
 
-internal class RawProductAttributeValueConverter : JsonConverter<RawProductAttributeValue>
+internal sealed class RawProductAttributeValueConverter : JsonConverter<RawProductAttributeValue>
 {
     public override RawProductAttributeValue Read(
         ref Utf8JsonReader reader,

diff --git a/src/Modules/OrchardCore.Commerce/Serialization/ShoppingCartItemConverter.cs b/src/Modules/OrchardCore.Commerce/Serialization/ShoppingCartItemConverter.cs
@@ -9,7 +9,7 @@
 
 namespace OrchardCore.Commerce.Serialization;
 
-internal class ShoppingCartItemConverter : JsonConverter<ShoppingCartItem>
+internal sealed class ShoppingCartItemConverter : JsonConverter<ShoppingCartItem>
 {
     private const string QuantityName = "quantity";
     private const string SkuName = "sku";

diff --git a/src/Modules/OrchardCore.Commerce/Services/FieldsOnlyDisplayManager.cs b/src/Modules/OrchardCore.Commerce/Services/FieldsOnlyDisplayManager.cs
@@ -69,8 +69,8 @@ await GetFieldShapeTypes(contentItem, displayType)
         if (_hca.HttpContext is not { } context) throw new InvalidOperationException("Missing HTTP context!");
         var returnUrl = context.Request.PathBase + context.Request.Path + context.Request.QueryString;
 
-        var editAction = context.Action<TemplateController>(controller => controller.Edit(null, false, returnUrl));
-        var createAction = context.Action<TemplateController>(controller => controller.Create(null, false, returnUrl));
+        var editAction = context.ActionTask<TemplateController>(controller => controller.Edit(null, false, returnUrl));
+        var createAction = context.ActionTask<TemplateController>(controller => controller.Create(null, false, returnUrl));
 
         return GetFieldShapeTypes(contentItem, displayType)
             .Select(name =>

diff --git a/src/Modules/OrchardCore.Commerce/Services/OrderLineItemService.cs b/src/Modules/OrchardCore.Commerce/Services/OrderLineItemService.cs
@@ -111,7 +111,7 @@ await _taxProviders.GetFirstApplicableProviderAsync(promotionAndTaxContext) is {
 
         var total = viewModelLineItems.CalculateTotals().Any()
             ? viewModelLineItems.CalculateTotals().Single()
-            : new Amount(0, lineItems.First().LinePrice.Currency);
+            : new Amount(0, lineItems[0].LinePrice.Currency);
 
         return (viewModelLineItems, total);
     }

diff --git a/src/Modules/OrchardCore.Commerce/Services/PriceService.cs b/src/Modules/OrchardCore.Commerce/Services/PriceService.cs
@@ -46,7 +46,7 @@ public async Task<IList<ShoppingCartItem>> AddPricesAsync(IList<ShoppingCartItem
             var applicable = await unhandled.WhereAsync(pair => provider.IsApplicableAsync(new[] { pair.Item }));
             if (!applicable.Any()) continue;
 
-            unhandled.RemoveAll(pair => applicable.Contains(pair));
+            unhandled.RemoveAll(applicable.Contains);
 
             var providerResult = await provider.UpdateAsync(applicable.Select(pair => pair.Item).ToList());
             handled.AddRange(providerResult.Select((item, index) => (item, applicable[index].Index)));

diff --git a/src/Modules/OrchardCore.Commerce/Services/ProductService.cs b/src/Modules/OrchardCore.Commerce/Services/ProductService.cs
@@ -34,7 +34,7 @@ public ProductService(
 
     public async Task<IEnumerable<ProductPart>> GetProductsAsync(IEnumerable<string> skus)
     {
-        var trimmedSkus = skus.Select(sku => sku.Split('-').First());
+        var trimmedSkus = skus.Select(sku => sku.Split('-')[0]);
 
         var contentItemIds = (await _session
                 .QueryIndex<ProductPartIndex>(index => index.Sku.IsIn(trimmedSkus))
@@ -67,8 +67,7 @@ public string GetOrderFullSku(ShoppingCartItem item, ProductPart productPart)
     public async Task<IEnumerable<ProductPart>> GetProductsByContentItemVersionsAsync(IEnumerable<string> contentItemVersions)
     {
         // There is no GetVersionAsync that accepts a collection.
-        var contentItems = await contentItemVersions.AwaitEachAsync(async contentItemVersion =>
-            await _contentManager.GetVersionAsync(contentItemVersion));
+        var contentItems = await contentItemVersions.AwaitEachAsync(_contentManager.GetVersionAsync);
 
         // We have to replicate some things that BuildDisplayAsync does to fill part.Elements with the fields. We can't
         // use BuildDisplayAsync directly because it requires a BuildDisplayContext.

diff --git a/src/Modules/OrchardCore.Commerce/Services/ShoppingCartHelpers.cs b/src/Modules/OrchardCore.Commerce/Services/ShoppingCartHelpers.cs
@@ -102,8 +102,7 @@ private async Task<ShoppingCartViewModel> CreateShoppingCartViewModelAsync(
             line.UnitPrice = line.UnitPrice.GetRounded();
         }
 
-        model.Totals.AddRange(
-            totals.Any() ? totals.Round() : new List<Amount> { new Amount(0, lines.First().LinePrice.Currency) });
+        model.Totals.AddRange(totals.Any() ? totals.Round() : new List<Amount> { new(0, lines[0].LinePrice.Currency) });
 
         model.Headers.AddRange(headers);
         model.Lines.AddRange(lines);

diff --git a/src/Modules/OrchardCore.Commerce/Services/StripePaymentService.cs b/src/Modules/OrchardCore.Commerce/Services/StripePaymentService.cs
@@ -312,7 +312,7 @@ public async Task<IEnumerable<OrderLineItem>> CreateOrderLineItemsAsync(Shopping
         // void."
         foreach (var item in shoppingCart.Items)
         {
-            var trimmedSku = item.ProductSku.Split('-').First();
+            var trimmedSku = item.ProductSku.Split('-')[0];
 
             var contentItemId = (await _session
                     .QueryIndex<ProductPartIndex>(productPartIndex => productPartIndex.Sku == trimmedSku)

diff --git a/src/Modules/OrchardCore.Commerce/Views/Checkout.cshtml b/src/Modules/OrchardCore.Commerce/Views/Checkout.cshtml
@@ -1,6 +1,4 @@
 @using OrchardCore.Commerce.Controllers;
-@using OrchardCore.Commerce.Tax.Extensions
-@using OrchardCore.Mvc.Core.Utilities;
 
 @model CheckoutViewModel
 
@@ -99,7 +97,7 @@
                        prop-NetTotal="@Model.NetTotal"
                        prop-GrossTotal="@Model.GrossTotal"
                        prop-PublishableKey="@Model.StripePublishableKey"
-                       prop-ClientSecret="@Model.PaymentIntentClientSecret"/>                
+                       prop-ClientSecret="@Model.PaymentIntentClientSecret"/>
             }
             else
             {

diff --git a/src/Modules/OrchardCore.Commerce/Views/ShoppingCartCell_Product.cshtml b/src/Modules/OrchardCore.Commerce/Views/ShoppingCartCell_Product.cshtml
@@ -1,13 +1,15 @@
 @using OrchardCore
 @using OrchardCore.Commerce.Abstractions
-@using OrchardCore.DisplayManagement.TagHelpers
 
 @{
     var line = (ShoppingCartLineViewModel)Model.Line;
     var attributes = (IList<(IProductAttributeValue Value, string Type, int Index)>)Model.ProductAttributes;
 }
 
-<a href="@Orchard.GetItemDisplayUrl(line.Product.ContentItem)" class="link-primary">@line.ProductName</a>
+<div class="cart-product-name">
+    <a href="@Orchard.GetItemDisplayUrl(line.Product.ContentItem)" class="link-primary">@line.ProductName</a>
+</div>
+
 @if (line.Attributes?.Any() == true)
 {
     <ul class="cart-product-attributes list-inline">