Merge branch 'release/13.1.0'

Author: mattbrailsford

Directory.Packages.props

@@ -10,7 +10,7 @@
     <GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[13.0.0, 14)" />
+    <PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[13.1.0--rc1, 14)" />
     <PackageVersion Include="Umbraco.Cms.Web.Website" Version="[13.0.0, 14)" />
   </ItemGroup>
 </Project>

src/Umbraco.Commerce.Checkout/Client/src/js/uccheckout.js

@@ -1,4 +1,4 @@
-(function () {
+(function () {
 
     // Initialization
     function init() {
@@ -34,6 +34,13 @@
             h();
         });
 
+        // Update shippingOptionId based on selected shipping method
+        document.querySelectorAll("input[name=shippingMethod]").forEach(el => {
+          var h = () => { document.querySelector("input[name=shippingOptionId]").value = document.querySelector("input[name=shippingMethod]:checked").dataset.optionId; }
+          el.addEventListener("change", h);
+          if (el.checked) h();
+        });
+
         // Enable / disable continue button when accepting terms
         var acceptTermsEl = document.getElementById("accept-terms");
         if (acceptTermsEl) {

src/Umbraco.Commerce.Checkout/Extensions/CompositionExtensions.cs

@@ -4,7 +4,6 @@
 using Umbraco.Commerce.Checkout.Web.Events.Notification.Handlers;
 using Umbraco.Commerce.Core.Events.Notification;
 using Umbraco.Commerce.Extensions;
-using Umbraco.Commerce.Cms.Web.Events.Notification;
 
 using IBuilder = Umbraco.Cms.Core.DependencyInjection.IUmbracoBuilder;
 

src/Umbraco.Commerce.Checkout/Pipeline/Tasks/CreateUmbracoCommerceCheckoutNodesTask.cs

@@ -1,10 +1,8 @@
-using Umbraco.Commerce.Common.Pipelines;
-using Umbraco.Commerce.Common.Pipelines.Tasks;
-using System.Reflection;
-using System.Linq;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Infrastructure.Scoping;
+using Umbraco.Commerce.Common.Pipelines;
+using Umbraco.Commerce.Common.Pipelines.Tasks;
 
 namespace Umbraco.Commerce.Checkout.Pipeline.Tasks
 {
@@ -33,7 +31,7 @@ public override PipelineResult<InstallPipelineContext> Execute(PipelineArgs<Inst
                 // Check to see if the checkout node already exists
                 var filter = scope.SqlContext.Query<IContent>().Where(x => x.ContentTypeId == uccCheckoutPageContenType.Id);
                 var childNodes = _contentService.GetPagedChildren(args.Model.SiteRootNodeId, 1, 1, out long totalRecords, filter);
-                
+
                 if (totalRecords == 0)
                 {
                     // Create the checkout page

src/Umbraco.Commerce.Checkout/Views/UmbracoCommerceCheckout/Partials/UmbracoCommerceCheckoutOrderInfo.cshtml

@@ -23,12 +23,12 @@
         : null;
 }
 <div class="border border-gray-300 p-6 rounded mb-8">
-    <h3 class="text-xl font-medium mb-4">@Umbraco.GetDictionaryValue("UmbracoCommerceCheckout.OrderInfo.ContactInformation", "Contact Information")</h3>
+    <h3 class="text-xl font-medium mb-4">@Umbraco.GetDictionaryValueOrDefault("UmbracoCommerceCheckout.OrderInfo.ContactInformation", "Contact Information")</h3>
     <p class="mb-4">@order.CustomerInfo.Email</p>
 
     <div class="flex w-full -mx-2">
         <div class="flex-1 mx-2">
-            <h3 class="text-xl font-medium mb-4">@Umbraco.GetDictionaryValue("UmbracoCommerceCheckout.OrderInfo.BillingInformation", "Billing Information")</h3>
+            <h3 class="text-xl font-medium mb-4">@Umbraco.GetDictionaryValueOrDefault("UmbracoCommerceCheckout.OrderInfo.BillingInformation", "Billing Information")</h3>
             <p class="">
                 <strong>@order.CustomerInfo.FirstName @order.CustomerInfo.LastName</strong>
                 <br />
@@ -45,7 +45,7 @@
         @if (checkoutPage.Value<bool>("uccCollectShippingInfo"))
         {
             <div class="flex-1 mx-2">
-                <h3 class="text-xl font-medium mb-4">@Umbraco.GetDictionaryValue("UmbracoCommerceCheckout.OrderInfo.ShippingInformation", "Shipping Information")</h3>
+                <h3 class="text-xl font-medium mb-4">@Umbraco.GetDictionaryValueOrDefault("UmbracoCommerceCheckout.OrderInfo.ShippingInformation", "Shipping Information")</h3>
                 <p class="">
                     <strong>@order.Properties["shippingFirstName"] @order.Properties["shippingLastName"]</strong>
                     <br />

src/Umbraco.Commerce.Checkout/Views/UmbracoCommerceCheckout/Partials/UmbracoCommerceCheckoutPrevNext.cshtml

@@ -9,11 +9,11 @@
 <div class="flex flex-col-reverse items-center justify-between mt-8 md:flex-row">
     @if (prevStep != null)
     {
-        <div><a href="@(prevStep.Url())" class="inline-flex text-@(themeColor) hover:text-gray-900 hover:underline"><svg viewBox="0 0 20 20" class="inline-block w-5 h-5 fill-current"><use href="#ico-chevron-left" /></svg> @string.Format(Umbraco.GetDictionaryValue("UmbracoCommerceCheckout.Navigation.ReturnTo", "Return to {0}"), prevStep.Name)</a></div>
+        <div><a href="@(prevStep.Url())" class="inline-flex text-@(themeColor) hover:text-gray-900 hover:underline"><svg viewBox="0 0 20 20" class="inline-block w-5 h-5 fill-current"><use href="#ico-chevron-left" /></svg> @string.Format(Umbraco.GetDictionaryValueOrDefault("UmbracoCommerceCheckout.Navigation.ReturnTo", "Return to {0}"), prevStep.Name)</a></div>
     }
     else if (backPage != null)
     {
-        <div><a href="@(backPage.Url())" class="inline-flex text-@(themeColor) hover:text-gray-900 hover:underline"><svg viewBox="0 0 20 20" class="inline-block w-5 h-5 fill-current"><use href="#ico-chevron-left" /></svg> @string.Format(Umbraco.GetDictionaryValue("UmbracoCommerceCheckout.Navigation.ReturnTo", "Return to {0}"), backPage.Name)</a></div>
+        <div><a href="@(backPage.Url())" class="inline-flex text-@(themeColor) hover:text-gray-900 hover:underline"><svg viewBox="0 0 20 20" class="inline-block w-5 h-5 fill-current"><use href="#ico-chevron-left" /></svg> @string.Format(Umbraco.GetDictionaryValueOrDefault("UmbracoCommerceCheckout.Navigation.ReturnTo", "Return to {0}"), backPage.Name)</a></div>
     }
     else
     {
@@ -22,7 +22,7 @@
     @if (nextStep != null)
     {
         <div class="mb-4 w-full md:mb-0 md:w-auto">
-            <button id="continue" class="bg-@(themeColor) text-white px-4 py-4 w-full rounded hover:bg-gray-900 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:text-gray-300 disabled:hover:bg-gray-100 disabled:hover:text-gray-300" type="submit">@string.Format(Umbraco.GetDictionaryValue("UmbracoCommerceCheckout.Navigation.ContinueTo", "Continue to {0}"), nextStep.Name)</button>
+            <button id="continue" class="bg-@(themeColor) text-white px-4 py-4 w-full rounded hover:bg-gray-900 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:text-gray-300 disabled:hover:bg-gray-100 disabled:hover:text-gray-300" type="submit">@string.Format(Umbraco.GetDictionaryValueOrDefault("UmbracoCommerceCheckout.Navigation.ContinueTo", "Continue to {0}"), nextStep.Name)</button>
         </div>
     }
 </div>

src/Umbraco.Commerce.Checkout/Views/UmbracoCommerceCheckout/UmbracoCommerceCheckoutConfirmationPage.cshtml

@@ -14,9 +14,9 @@
 
 <div class="border border-gray-300 p-6 rounded mb-8 text-center">
     <span class="inline-flex items-center justify-center text-6xl border-4 border-green-500 rounded-full mb-4 w-24 h-24"><svg viewBox="0 0 20 20" class="inline-block w-16 h-16 fill-current text-green-500"><use href="#ico-check" /></svg></span>
-    <h3 class="text-xl font-medium mb-4">@string.Format(Umbraco.GetDictionaryValue("UmbracoCommerceCheckout.Confirmation.ThankYou", "Thank you for your order #{0}"), currentOrder.OrderNumber ?? currentOrder.CartNumber)</h3>
-    <p class="mb-4">@Html.Raw(string.Format(Umbraco.GetDictionaryValue("UmbracoCommerceCheckout.Confirmation.ConfirmationEmailSent", "A confirmation email has been sent to {0}"), "<strong>" + currentOrder.CustomerInfo.Email + "</strong>"))</p>
-    <p><a href="/" class="inline-block bg-@(themeColor) text-white px-4 py-4 rounded hover:bg-gray-900">@Umbraco.GetDictionaryValue("UmbracoCommerceCheckout.Confirmation.ReturnToStore", "Return to store")</a></p>
+    <h3 class="text-xl font-medium mb-4">@string.Format(Umbraco.GetDictionaryValueOrDefault("UmbracoCommerceCheckout.Confirmation.ThankYou", "Thank you for your order #{0}"), currentOrder.OrderNumber ?? currentOrder.CartNumber)</h3>
+    <p class="mb-4">@Html.Raw(string.Format(Umbraco.GetDictionaryValueOrDefault("UmbracoCommerceCheckout.Confirmation.ConfirmationEmailSent", "A confirmation email has been sent to {0}"), "<strong>" + currentOrder.CustomerInfo.Email + "</strong>"))</p>
+    <p><a href="/" class="inline-block bg-@(themeColor) text-white px-4 py-4 rounded hover:bg-gray-900">@Umbraco.GetDictionaryValueOrDefault("UmbracoCommerceCheckout.Confirmation.ReturnToStore", "Return to store")</a></p>
 </div>
 
 @Html.Partial("~/Views/UmbracoCommerceCheckout/Partials/UmbracoCommerceCheckoutOrderInfo.cshtml", currentOrder)