Resolves #492 Product details page: unnecessary leading comma in label "Free Shipping" (below price)

mgesing · mgesing · commit d8a2a4ecca66 · 2022-04-30T11:25:14.000+02:00
diff --git a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs
@@ -1148,10 +1148,9 @@ public ProductDetailsModel PrepareProductDetailModel(
 
             if (!product.IsShipEnabled || (addShippingPrice == 0 && product.IsFreeShipping))
             {
-                model.LegalInfo += "{0} {1}, {2}".FormatInvariant(
-                    product.IsTaxExempt ? "" : taxInfo,
-                    product.IsTaxExempt ? "" : defaultTaxRate,
-                    T("Common.FreeShipping"));
+                model.LegalInfo += product.IsTaxExempt
+                    ? T("Common.FreeShipping")
+                    : "{0} {1}, {2}".FormatInvariant(taxInfo, defaultTaxRate, T("Common.FreeShipping"));
             }
             else
             {
@@ -1174,6 +1173,8 @@ public ProductDetailsModel PrepareProductDetailModel(
                 }
             }
 
+            model.LegalInfo = model.LegalInfo.TrimSafe();
+
             var dimension = _measureService.GetMeasureDimensionById(_measureSettings.BaseDimensionId)?.SystemKeyword ?? string.Empty;
 
             model.WeightValue = product.Weight;

Original file line number	Diff line number	Diff line change
`@@ -1148,10 +1148,9 @@ public ProductDetailsModel PrepareProductDetailModel(`
`1148`	`1148`
`1149`	`1149`	`if (!product.IsShipEnabled \|\| (addShippingPrice == 0 && product.IsFreeShipping))`
`1150`	`1150`	`{`
`1151`		`- model.LegalInfo += "{0} {1}, {2}".FormatInvariant(`
`1152`		`- product.IsTaxExempt ? "" : taxInfo,`
`1153`		`- product.IsTaxExempt ? "" : defaultTaxRate,`
`1154`		`- T("Common.FreeShipping"));`
	`1151`	`+ model.LegalInfo += product.IsTaxExempt`
	`1152`	`+ ? T("Common.FreeShipping")`
	`1153`	`+ : "{0} {1}, {2}".FormatInvariant(taxInfo, defaultTaxRate, T("Common.FreeShipping"));`
`1155`	`1154`	`}`
`1156`	`1155`	`else`
`1157`	`1156`	`{`
`@@ -1174,6 +1173,8 @@ public ProductDetailsModel PrepareProductDetailModel(`
`1174`	`1173`	`}`
`1175`	`1174`	`}`
`1176`	`1175`
	`1176`	`+ model.LegalInfo = model.LegalInfo.TrimSafe();`
	`1177`	`+`
`1177`	`1178`	`var dimension = _measureService.GetMeasureDimensionById(_measureSettings.BaseDimensionId)?.SystemKeyword ?? string.Empty;`
`1178`	`1179`
`1179`	`1180`	`model.WeightValue = product.Weight;`