Added the ability to suppress the sending of confirmation emails for …

…quotes and orders in support of #373.
AccelerateNetworks · Aug 2, 2023 · 803f33f · 803f33f
1 parent ee167d4
commit 803f33f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/NumberSearch.DataAccess/Models/Order.cs b/NumberSearch.DataAccess/Models/Order.cs
@@ -28,6 +28,7 @@ public class Order
         public string BillingInvoiceId { get; set; } = string.Empty;
         public decimal SalesTax { get; set; }
         public bool Quote { get; set; }
+        public bool NoEmail { get; set; }
         public string BillingInvoiceReoccuringId { get; set; } = string.Empty;
         public string SalesEmail { get; set; } = string.Empty;
         public bool BackgroundWorkCompleted { get; set; }

diff --git a/NumberSearch.Mvc/Controllers/CartController.cs b/NumberSearch.Mvc/Controllers/CartController.cs
@@ -391,7 +391,9 @@ public async Task<IActionResult> SubmitAsync(Order order)
                         // Send a confirmation email.
                         if (submittedOrder)
                         {
+                            bool NoEmail = order.NoEmail;
                             order = await Order.GetByIdAsync(order.OrderId, _postgresql).ConfigureAwait(false);
+                            order.NoEmail = NoEmail;
 
                             // Submit the number orders and track the total cost.
                             var onetimeItems = new List<Line_Items>();
@@ -1427,19 +1429,20 @@ Accelerate Networks
                                 confirmationEmail.CalendarInvite = icalString;
                             }
 
-                            // If there are notes on the order don't send out any emails to the customer.
-                            if (string.IsNullOrWhiteSpace(order.CustomerNotes))
+                            // Suppress the confirmation emails.
+                            if (order.NoEmail)
                             {
-                                // Queue up the confirmation email.
                                 confirmationEmail.Completed = false;
+                                confirmationEmail.PrimaryEmailAddress = string.IsNullOrWhiteSpace(order.SalesEmail) ? "[email protected]" : order.SalesEmail;
                                 var checkSave = await confirmationEmail.PostAsync(_postgresql).ConfigureAwait(false);
+                                Log.Information($"Suppressed sending out the confirmation emails for {order.OrderId}.");
                             }
                             else
                             {
+                                // Queue up the confirmation email.
                                 confirmationEmail.Completed = false;
-                                confirmationEmail.PrimaryEmailAddress = string.IsNullOrWhiteSpace(order.SalesEmail) ? "[email protected]" : order.SalesEmail;
                                 var checkSave = await confirmationEmail.PostAsync(_postgresql).ConfigureAwait(false);
-                                Log.Information($"Skipped sending out the confirmation emails for {order.OrderId} due to customer notes.");
+                                Log.Information($"Sent out the confirmation emails for {order.OrderId}.");
                             }
 
                             // Allow the background work to commence.

diff --git a/NumberSearch.Mvc/Controllers/LookupController.cs b/NumberSearch.Mvc/Controllers/LookupController.cs
@@ -14,8 +14,6 @@
 using System.Text;
 using System.Threading.Tasks;
 
-using static Microsoft.ApplicationInsights.MetricDimensionNames.TelemetryContext;
-
 namespace NumberSearch.Mvc.Controllers
 {
     [ApiExplorerSettings(IgnoreApi = true)]

diff --git a/NumberSearch.Mvc/Views/Cart/Order.cshtml b/NumberSearch.Mvc/Views/Cart/Order.cshtml
@@ -799,6 +799,14 @@
                             <label for="customernotes">Notes <span class="text-muted">(Optional)</span></label>
                             <input asp-for="Order!.CustomerNotes" type="text" class="form-control" id="customernotes" placeholder="Add important information for our staff">
                         </div>
+                        <div class="col-md-12">
+                            <div class="form-check">
+                                <input asp-for="Order!.NoEmail" type="checkbox" class="form-check-input" id="defaultCheck1">
+                                <label class="form-check-label" for="defaultCheck1">
+                                    Do not send a confirmation email
+                                </label>
+                            </div>
+                        </div>
                         <div class="col-md-12">
                             <div class="form-check">
                                 <input asp-for="Order!.Quote" type="checkbox" class="form-check-input" id="defaultCheck1">