Update email templates

Claude · Claude · commit 756ad815df4c · 2025-07-09T13:58:39.000+01:00
diff --git a/src/Umbraco.Commerce.Checkout/Views/UmbracoCommerceCheckout/Templates/Email/UmbracoCommerceCheckoutGiftCardEmail.cshtml b/src/Umbraco.Commerce.Checkout/Views/UmbracoCommerceCheckout/Templates/Email/UmbracoCommerceCheckoutGiftCardEmail.cshtml
@@ -14,11 +14,19 @@
     }
 
     var uccStoreLogoUrl = checkoutPage.Value<IPublishedContent>("uccStoreLogo")?.Url();
+
     if (string.IsNullOrWhiteSpace(uccStoreLogoUrl))
     {
+        // Fallback to the store logo if the checkout page logo is not set
         uccStoreLogoUrl = store.LogoImageUrl;
     }
 
+    if (!string.IsNullOrWhiteSpace(uccStoreLogoUrl) && !uccStoreLogoUrl.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+    {
+        // Ensure the logo URL is absolute
+        uccStoreLogoUrl = BaseUrl + uccStoreLogoUrl;
+    }
+
     var uccStoreTsAndCsUrl = checkoutPage.Value<IPublishedContent>("uccTermsAndConditionsPage")?.Url();
     var uccStorePrivacyPolicyUrl = checkoutPage.Value<IPublishedContent>("uccPrivacyPolicyPage")?.Url();
 
@@ -33,7 +41,13 @@
         }
     }
 
-    var uccThemeColor = checkoutPage.Value<string>("uccThemeColor", defaultValue: store.ThemeColor ?? "#000000");
+    var uccThemeColor = checkoutPage.Value<string>("uccThemeColor");
+
+    if (string.IsNullOrWhiteSpace(uccThemeColor))
+    {
+        // Fallback to the store theme color if the checkout page theme color is not set
+        uccThemeColor = store.ThemeColor ?? "#000000";
+    }
 }
 <style>
     #ucc, #ucc td, #ucc p {
@@ -58,11 +72,11 @@
 
                                 @if (!string.IsNullOrWhiteSpace(uccStoreLogoUrl))
                                 {
-                                    <a href="@(BaseUrl)" target="_blank"><img src="@Html.Raw(BaseUrl + uccStoreLogoUrl.GetCropUrl(200, 100, imageCropMode: ImageCropMode.Max))" alt="@(store.Name)" border="0" /></a>
+                                    <a href="@(BaseUrl)" target="_blank"><img src="@Html.Raw(uccStoreLogoUrl.GetCropUrl(200, 100, imageCropMode: ImageCropMode.Max))" alt="@(store.Name)" border="0" /></a>
                                 }
                                 else
                                 {
-                                    <h1 class="margin: 0 0 20px; font-size: 30px; line-height: 38px; color: ##000;"><a href="@(BaseUrl)" style="color: #000;" target="_blank">@(store.Name)</a></h1>
+                                    <h1 class="margin: 0 0 20px; font-size: 30px; line-height: 38px; color: #000;"><a href="@(BaseUrl)" style="color: #000;" target="_blank">@(store.Name)</a></h1>
                                 }
 
                                 <hr style="border: 0; height: 1px; background: #ebebe9; margin: 20px 0;" />
diff --git a/src/Umbraco.Commerce.Checkout/Views/UmbracoCommerceCheckout/Templates/Email/UmbracoCommerceCheckoutOrderConfirmationEmail.cshtml b/src/Umbraco.Commerce.Checkout/Views/UmbracoCommerceCheckout/Templates/Email/UmbracoCommerceCheckoutOrderConfirmationEmail.cshtml
@@ -32,11 +32,19 @@
     }
 
     var uccStoreLogoUrl = checkoutPage.Value<IPublishedContent>("uccStoreLogo")?.Url();
+
     if (string.IsNullOrWhiteSpace(uccStoreLogoUrl))
     {
+        // Fallback to the store logo if the checkout page logo is not set
         uccStoreLogoUrl = store.LogoImageUrl;
     }
 
+    if (!string.IsNullOrWhiteSpace(uccStoreLogoUrl) && !uccStoreLogoUrl.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+    {
+        // Ensure the logo URL is absolute
+        uccStoreLogoUrl = BaseUrl + uccStoreLogoUrl;
+    }
+
     var uccStoreTsAndCsUrl = checkoutPage.Value<IPublishedContent>("uccTermsAndConditionsPage")?.Url();
     var uccStorePrivacyPolicyUrl = checkoutPage.Value<IPublishedContent>("uccPrivacyPolicyPage")?.Url();
 
@@ -51,7 +59,13 @@
         }
     }
 
-    var uccThemeColor = checkoutPage.Value<string>("uccThemeColor", defaultValue: store.ThemeColor ?? "#000000");
+    var uccThemeColor = checkoutPage.Value<string>("uccThemeColor");
+
+    if (string.IsNullOrWhiteSpace(uccThemeColor))
+    {
+        // Fallback to the store theme color if the checkout page theme color is not set
+        uccThemeColor = store.ThemeColor ?? "#000000";
+    }
 }
 <style type="text/css">
     #ucc, #ucc td, #ucc p {
@@ -77,11 +91,11 @@
 
                                 @if (!string.IsNullOrWhiteSpace(uccStoreLogoUrl))
                                 {
-                                    <a href="@(BaseUrl)" target="_blank"><img src="@Html.Raw(BaseUrl + uccStoreLogoUrl.GetCropUrl(200, 100, imageCropMode: ImageCropMode.Max))" alt="@(store.Name)" border="0" /></a>
+                                    <a href="@(BaseUrl)" target="_blank"><img src="@Html.Raw(uccStoreLogoUrl.GetCropUrl(200, 100, imageCropMode: ImageCropMode.Max))" alt="@(store.Name)" border="0" /></a>
                                 }
                                 else
                                 {
-                                    <h1 class="margin: 0 0 20px; font-size: 30px; line-height: 38px; color: ##000;"><a href="@(BaseUrl)" style="color: #000;" target="_blank">@(store.Name)</a></h1>
+                                    <h1 class="margin: 0 0 20px; font-size: 30px; line-height: 38px; color: #000;"><a href="@(BaseUrl)" style="color: #000;" target="_blank">@(store.Name)</a></h1>
                                 }
 
                                 <hr style="border: 0; height: 1px; background: #ebebe9; margin: 20px 0;" />
diff --git a/src/Umbraco.Commerce.Checkout/Views/UmbracoCommerceCheckout/Templates/Email/UmbracoCommerceCheckoutOrderErrorEmail.cshtml b/src/Umbraco.Commerce.Checkout/Views/UmbracoCommerceCheckout/Templates/Email/UmbracoCommerceCheckoutOrderErrorEmail.cshtml
@@ -14,11 +14,19 @@
     }
 
     var uccStoreLogoUrl = checkoutPage.Value<IPublishedContent>("uccStoreLogo")?.Url();
+
     if (string.IsNullOrWhiteSpace(uccStoreLogoUrl))
     {
+        // Fallback to the store logo if the checkout page logo is not set
         uccStoreLogoUrl = store.LogoImageUrl;
     }
 
+    if (!string.IsNullOrWhiteSpace(uccStoreLogoUrl) && !uccStoreLogoUrl.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+    {
+        // Ensure the logo URL is absolute
+        uccStoreLogoUrl = BaseUrl + uccStoreLogoUrl;
+    }
+
     var uccStoreTsAndCsUrl = checkoutPage.Value<IPublishedContent>("uccTermsAndConditionsPage")?.Url();
     var uccStorePrivacyPolicyUrl = checkoutPage.Value<IPublishedContent>("uccPrivacyPolicyPage")?.Url();
 
@@ -33,7 +41,13 @@
         }
     }
 
-    var uccThemeColor = checkoutPage.Value<string>("uccThemeColor", defaultValue: store.ThemeColor ?? "#000000");
+    var uccThemeColor = checkoutPage.Value<string>("uccThemeColor");
+
+    if (string.IsNullOrWhiteSpace(uccThemeColor))
+    {
+        // Fallback to the store theme color if the checkout page theme color is not set
+        uccThemeColor = store.ThemeColor ?? "#000000";
+    }
 }
 <style type="text/css">
     #ucc, #ucc td, #ucc p {
@@ -58,11 +72,11 @@
 
                                 @if (!string.IsNullOrWhiteSpace(uccStoreLogoUrl))
                                 {
-                                    <a href="@(BaseUrl)" target="_blank"><img src="@Html.Raw(BaseUrl + uccStoreLogoUrl.GetCropUrl(200, 100, imageCropMode: ImageCropMode.Max))" alt="@(store.Name)" border="0" /></a>
+                                    <a href="@(BaseUrl)" target="_blank"><img src="@Html.Raw(uccStoreLogoUrl.GetCropUrl(200, 100, imageCropMode: ImageCropMode.Max))" alt="@(store.Name)" border="0" /></a>
                                 }
                                 else
                                 {
-                                    <h1 class="margin: 0 0 20px; font-size: 30px; line-height: 38px; color: ##000;"><a href="@(BaseUrl)" style="color: #000;" target="_blank">@(store.Name)</a></h1>
+                                    <h1 class="margin: 0 0 20px; font-size: 30px; line-height: 38px; color: #000;"><a href="@(BaseUrl)" style="color: #000;" target="_blank">@(store.Name)</a></h1>
                                 }
 
                                 <hr style="border: 0; height: 1px; background: #ebebe9; margin: 20px 0;" />

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,19 @@`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`var uccStoreLogoUrl = checkoutPage.Value<IPublishedContent>("uccStoreLogo")?.Url();`
	`17`	`+`
`17`	`18`	`if (string.IsNullOrWhiteSpace(uccStoreLogoUrl))`
`18`	`19`	`{`
	`20`	`+ // Fallback to the store logo if the checkout page logo is not set`
`19`	`21`	`uccStoreLogoUrl = store.LogoImageUrl;`
`20`	`22`	`}`
`21`	`23`
	`24`	`+ if (!string.IsNullOrWhiteSpace(uccStoreLogoUrl) && !uccStoreLogoUrl.StartsWith("http", StringComparison.OrdinalIgnoreCase))`
	`25`	`+ {`
	`26`	`+ // Ensure the logo URL is absolute`
	`27`	`+ uccStoreLogoUrl = BaseUrl + uccStoreLogoUrl;`
	`28`	`+ }`
	`29`	`+`
`22`	`30`	`var uccStoreTsAndCsUrl = checkoutPage.Value<IPublishedContent>("uccTermsAndConditionsPage")?.Url();`
`23`	`31`	`var uccStorePrivacyPolicyUrl = checkoutPage.Value<IPublishedContent>("uccPrivacyPolicyPage")?.Url();`
`24`	`32`
`@@ -33,7 +41,13 @@`
`33`	`41`	`}`
`34`	`42`	`}`
`35`	`43`
`36`		`- var uccThemeColor = checkoutPage.Value<string>("uccThemeColor", defaultValue: store.ThemeColor ?? "#000000");`
	`44`	`+ var uccThemeColor = checkoutPage.Value<string>("uccThemeColor");`
	`45`	`+`
	`46`	`+ if (string.IsNullOrWhiteSpace(uccThemeColor))`
	`47`	`+ {`
	`48`	`+ // Fallback to the store theme color if the checkout page theme color is not set`
	`49`	`+ uccThemeColor = store.ThemeColor ?? "#000000";`
	`50`	`+ }`
`37`	`51`	`}`
`38`	`52`	`<style>`
`39`	`53`	`#ucc, #ucc td, #ucc p {`
`@@ -58,11 +72,11 @@`
`58`	`72`
`59`	`73`	`@if (!string.IsNullOrWhiteSpace(uccStoreLogoUrl))`
`60`	`74`	`{`
`61`		`- <a href="@(BaseUrl)" target="_blank"><img src="@Html.Raw(BaseUrl + uccStoreLogoUrl.GetCropUrl(200, 100, imageCropMode: ImageCropMode.Max))" alt="@(store.Name)" border="0" /></a>`
	`75`	`+ <a href="@(BaseUrl)" target="_blank"><img src="@Html.Raw(uccStoreLogoUrl.GetCropUrl(200, 100, imageCropMode: ImageCropMode.Max))" alt="@(store.Name)" border="0" /></a>`
`62`	`76`	`}`
`63`	`77`	`else`
`64`	`78`	`{`
`65`		`- <h1 class="margin: 0 0 20px; font-size: 30px; line-height: 38px; color: ##000;"><a href="@(BaseUrl)" style="color: #000;" target="_blank">@(store.Name)</a></h1>`
	`79`	`+ <h1 class="margin: 0 0 20px; font-size: 30px; line-height: 38px; color: #000;"><a href="@(BaseUrl)" style="color: #000;" target="_blank">@(store.Name)</a></h1>`
`66`	`80`	`}`
`67`	`81`
`68`	`82`	`<hr style="border: 0; height: 1px; background: #ebebe9; margin: 20px 0;" />`
Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,19 @@`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`var uccStoreLogoUrl = checkoutPage.Value<IPublishedContent>("uccStoreLogo")?.Url();`
	`35`	`+`
`35`	`36`	`if (string.IsNullOrWhiteSpace(uccStoreLogoUrl))`
`36`	`37`	`{`
	`38`	`+ // Fallback to the store logo if the checkout page logo is not set`
`37`	`39`	`uccStoreLogoUrl = store.LogoImageUrl;`
`38`	`40`	`}`
`39`	`41`
	`42`	`+ if (!string.IsNullOrWhiteSpace(uccStoreLogoUrl) && !uccStoreLogoUrl.StartsWith("http", StringComparison.OrdinalIgnoreCase))`
	`43`	`+ {`
	`44`	`+ // Ensure the logo URL is absolute`
	`45`	`+ uccStoreLogoUrl = BaseUrl + uccStoreLogoUrl;`
	`46`	`+ }`
	`47`	`+`
`40`	`48`	`var uccStoreTsAndCsUrl = checkoutPage.Value<IPublishedContent>("uccTermsAndConditionsPage")?.Url();`
`41`	`49`	`var uccStorePrivacyPolicyUrl = checkoutPage.Value<IPublishedContent>("uccPrivacyPolicyPage")?.Url();`
`42`	`50`
`@@ -51,7 +59,13 @@`
`51`	`59`	`}`
`52`	`60`	`}`
`53`	`61`
`54`		`- var uccThemeColor = checkoutPage.Value<string>("uccThemeColor", defaultValue: store.ThemeColor ?? "#000000");`
	`62`	`+ var uccThemeColor = checkoutPage.Value<string>("uccThemeColor");`
	`63`	`+`
	`64`	`+ if (string.IsNullOrWhiteSpace(uccThemeColor))`
	`65`	`+ {`
	`66`	`+ // Fallback to the store theme color if the checkout page theme color is not set`
	`67`	`+ uccThemeColor = store.ThemeColor ?? "#000000";`
	`68`	`+ }`
`55`	`69`	`}`
`56`	`70`	`<style type="text/css">`
`57`	`71`	`#ucc, #ucc td, #ucc p {`
`@@ -77,11 +91,11 @@`
`77`	`91`
`78`	`92`	`@if (!string.IsNullOrWhiteSpace(uccStoreLogoUrl))`
`79`	`93`	`{`
`80`		`- <a href="@(BaseUrl)" target="_blank"><img src="@Html.Raw(BaseUrl + uccStoreLogoUrl.GetCropUrl(200, 100, imageCropMode: ImageCropMode.Max))" alt="@(store.Name)" border="0" /></a>`
	`94`	`+ <a href="@(BaseUrl)" target="_blank"><img src="@Html.Raw(uccStoreLogoUrl.GetCropUrl(200, 100, imageCropMode: ImageCropMode.Max))" alt="@(store.Name)" border="0" /></a>`
`81`	`95`	`}`
`82`	`96`	`else`
`83`	`97`	`{`
`84`		`- <h1 class="margin: 0 0 20px; font-size: 30px; line-height: 38px; color: ##000;"><a href="@(BaseUrl)" style="color: #000;" target="_blank">@(store.Name)</a></h1>`
	`98`	`+ <h1 class="margin: 0 0 20px; font-size: 30px; line-height: 38px; color: #000;"><a href="@(BaseUrl)" style="color: #000;" target="_blank">@(store.Name)</a></h1>`
`85`	`99`	`}`
`86`	`100`
`87`	`101`	`<hr style="border: 0; height: 1px; background: #ebebe9; margin: 20px 0;" />`