Fix NoExtraLayerCharge persistence, appointment reminders, coat notes display, scroll restoration, and invoice Send dead-button
- Appointment reminders: add AppointmentReminderBackgroundService (60s poll), ReminderSentAt dedup stamp, NotifyAppointmentReminderAsync sends both customer email and creator staff email; AppointmentReminderStaff notification type + default template added; DateTime.Now used instead of UtcNow to match locally-stored ScheduledStartTime; ToLocalTime() double-conversion removed - NoExtraLayerCharge not persisted: flag existed on CreateQuoteItemCoatDto and was used by pricing engine but never written to JobItemCoat/QuoteItemCoat entities — every edit reset it to false and re-applied the extra layer charge; added column to both entities (migration AddNoExtraLayerChargeToCoats), both read DTOs, all 3 JobItemAssemblyService overloads, JobItemCoatSeed inner class, and existingItemsData JSON in all 5 wizard views; fixed JS template path that hard-coded noExtraLayerCharge: false - Coat notes not visible: notes were rendered in desktop job details but missing from the wizard item card summary and the mobile card view; both fixed - Scroll position lost on item save: sessionStorage save/restore added to item-wizard.js owner form submit handler; path-keyed so cross-page navigation does not restore stale position; requestAnimationFrame used for reliable mobile scroll restoration - Invoice Send dead button: #sendChannelModal was gated inside @if (isDraft) but the button targeting it fires for Sent/Overdue invoices too when customer has both email and SMS; modal moved outside the Draft guard - InitialCreate migration added for fresh database installs; Baseline migration guarded with IF OBJECT_ID check so it no-ops on fresh DBs; Razor scoping bug fixed in Customers/Index.cshtml Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1152,6 +1152,156 @@ public class NotificationService : INotificationService
|
||||
};
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sends appointment reminder emails when an appointment's reminder window opens.
|
||||
/// Two emails are dispatched independently:
|
||||
/// <list type="bullet">
|
||||
/// <item>Customer email — sent when a customer is linked, has an email address, and has
|
||||
/// email notifications enabled (<see cref="Customer.NotifyByEmail"/>).</item>
|
||||
/// <item>Staff email — sent to <see cref="BaseEntity.CreatedBy"/> (the user who created
|
||||
/// the appointment). This fires regardless of whether a customer is linked.</item>
|
||||
/// </list>
|
||||
/// Called exclusively by
|
||||
/// <see cref="PowderCoating.Web.BackgroundServices.AppointmentReminderBackgroundService"/>
|
||||
/// after it stamps <c>ReminderSentAt</c> — the caller owns deduplication.
|
||||
/// </summary>
|
||||
public async Task NotifyAppointmentReminderAsync(Appointment appointment)
|
||||
{
|
||||
try
|
||||
{
|
||||
var (companyName, company) = await GetCompanyAsync(appointment.CompanyId);
|
||||
var (replyToEmail, replyToName) = await GetEmailFromAsync(appointment.CompanyId);
|
||||
var baseUrl = await GetBaseUrlAsync();
|
||||
|
||||
var locationLine = !string.IsNullOrWhiteSpace(appointment.Location)
|
||||
? $"<br/><strong>Location:</strong> {WebUtility.HtmlEncode(appointment.Location)}"
|
||||
: string.Empty;
|
||||
|
||||
var appointmentDate = appointment.ScheduledStartTime.ToString("dddd, MMMM d, yyyy");
|
||||
var appointmentTime = appointment.IsAllDay
|
||||
? "All Day"
|
||||
: appointment.ScheduledStartTime.ToString("h:mm tt");
|
||||
var defaultSubject = $"Appointment Reminder — {appointment.Title} on {appointment.ScheduledStartTime:MMMM d, yyyy}";
|
||||
|
||||
// ── Customer email ────────────────────────────────────────────────
|
||||
if (appointment.CustomerId != null)
|
||||
{
|
||||
var customer = appointment.Customer
|
||||
?? await _context.Customers.FindAsync(appointment.CustomerId.Value);
|
||||
|
||||
if (customer != null)
|
||||
{
|
||||
var customerName = GetCustomerDisplayName(customer);
|
||||
var reminderEmails = ParseEmailList(customer.Email);
|
||||
|
||||
if (!customer.NotifyByEmail || reminderEmails.Count == 0)
|
||||
{
|
||||
if (reminderEmails.Count > 0)
|
||||
{
|
||||
await WriteLog(SkippedLog(NotificationChannel.Email, NotificationType.AppointmentReminder,
|
||||
customerName, string.Join(", ", reminderEmails), appointment.CompanyId,
|
||||
customerId: customer.Id));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var customerValues = new Dictionary<string, string>
|
||||
{
|
||||
["companyName"] = companyName,
|
||||
["customerName"] = customerName,
|
||||
["appointmentTitle"] = appointment.Title,
|
||||
["appointmentDate"] = appointmentDate,
|
||||
["appointmentTime"] = appointmentTime,
|
||||
["locationLine"] = locationLine
|
||||
};
|
||||
|
||||
var (custSubject, custHtml) = await GetRenderedEmailAsync(
|
||||
appointment.CompanyId, NotificationType.AppointmentReminder, customerValues, defaultSubject);
|
||||
|
||||
var custFullHtml = AppendUnsubscribeFooterHtml(custHtml, customer.UnsubscribeToken, company, baseUrl);
|
||||
var custPlainText = StripHtml(custFullHtml);
|
||||
|
||||
var (custOk, custErr, custLog) = await SendToEmailListAsync(
|
||||
customer.Email, customerName, custSubject, custPlainText, custFullHtml,
|
||||
replyToEmail: replyToEmail, replyToName: replyToName);
|
||||
|
||||
await WriteLog(new NotificationLog
|
||||
{
|
||||
Channel = NotificationChannel.Email,
|
||||
NotificationType = NotificationType.AppointmentReminder,
|
||||
Status = custOk ? NotificationStatus.Sent : NotificationStatus.Failed,
|
||||
RecipientName = customerName,
|
||||
Recipient = custLog,
|
||||
Subject = custSubject,
|
||||
Message = custPlainText,
|
||||
ErrorMessage = custErr,
|
||||
SentAt = DateTime.UtcNow,
|
||||
CustomerId = customer.Id,
|
||||
CompanyId = appointment.CompanyId
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ── Staff email ───────────────────────────────────────────────────
|
||||
// Send to whoever created the appointment so they get an out-of-app reminder.
|
||||
if (!string.IsNullOrWhiteSpace(appointment.CreatedBy))
|
||||
{
|
||||
// Look up the user's display name from Identity if available.
|
||||
var staffUser = await _context.Users
|
||||
.FirstOrDefaultAsync(u => u.Email == appointment.CreatedBy);
|
||||
var staffName = !string.IsNullOrWhiteSpace(staffUser?.FullName)
|
||||
? staffUser.FullName
|
||||
: appointment.CreatedBy;
|
||||
|
||||
// Include a customer line only when a customer is linked.
|
||||
var customerLine = appointment.Customer != null
|
||||
? $"<br/><strong>Customer:</strong> {WebUtility.HtmlEncode(GetCustomerDisplayName(appointment.Customer))}"
|
||||
: string.Empty;
|
||||
|
||||
var staffValues = new Dictionary<string, string>
|
||||
{
|
||||
["companyName"] = companyName,
|
||||
["staffName"] = staffName,
|
||||
["appointmentTitle"] = appointment.Title,
|
||||
["appointmentDate"] = appointmentDate,
|
||||
["appointmentTime"] = appointmentTime,
|
||||
["customerLine"] = customerLine,
|
||||
["locationLine"] = locationLine
|
||||
};
|
||||
|
||||
var staffDefaultSubject = $"[Reminder] {appointment.Title} — {appointment.ScheduledStartTime:MMMM d, yyyy 'at' h:mm tt}";
|
||||
|
||||
var (staffSubject, staffHtml) = await GetRenderedEmailAsync(
|
||||
appointment.CompanyId, NotificationType.AppointmentReminderStaff, staffValues, staffDefaultSubject);
|
||||
|
||||
var staffPlainText = StripHtml(staffHtml);
|
||||
|
||||
var (staffOk, staffErr, staffLog) = await SendToEmailListAsync(
|
||||
appointment.CreatedBy, staffName, staffSubject, staffPlainText, staffHtml,
|
||||
replyToEmail: replyToEmail, replyToName: replyToName);
|
||||
|
||||
await WriteLog(new NotificationLog
|
||||
{
|
||||
Channel = NotificationChannel.Email,
|
||||
NotificationType = NotificationType.AppointmentReminderStaff,
|
||||
Status = staffOk ? NotificationStatus.Sent : NotificationStatus.Failed,
|
||||
RecipientName = staffName,
|
||||
Recipient = staffLog,
|
||||
Subject = staffSubject,
|
||||
Message = staffPlainText,
|
||||
ErrorMessage = staffErr,
|
||||
SentAt = DateTime.UtcNow,
|
||||
CompanyId = appointment.CompanyId
|
||||
});
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "NotifyAppointmentReminderAsync failed for appointment {AppointmentId}", appointment.Id);
|
||||
}
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// Fallback default templates (used when company has no DB template)
|
||||
// -----------------------------------------------------------------------
|
||||
@@ -1217,6 +1367,14 @@ public class NotificationService : INotificationService
|
||||
"Payment Reminder — Invoice {{invoiceNumber}} ({{daysOverdue}} days overdue)",
|
||||
"<p>Dear {{customerName}},</p><p>This is a friendly reminder that invoice <strong>{{invoiceNumber}}</strong> for <strong>{{invoiceTotal}}</strong> was due on <strong>{{dueDate}}</strong> and is now <strong>{{daysOverdue}} days overdue</strong>.</p><p>Outstanding balance: <strong>{{balanceDue}}</strong></p><p>Please arrange payment at your earliest convenience. If you have already sent payment, please disregard this notice.</p><p>Thank you for your business with {{companyName}}.</p>"
|
||||
),
|
||||
[(NotificationType.AppointmentReminder, NotificationChannel.Email)] = (
|
||||
"Appointment Reminder — {{appointmentTitle}} on {{appointmentDate}}",
|
||||
"<p>Dear {{customerName}},</p><p>This is a reminder that you have an upcoming appointment with <strong>{{companyName}}</strong>.</p><p><strong>Appointment:</strong> {{appointmentTitle}}<br/><strong>Date & Time:</strong> {{appointmentDate}} at {{appointmentTime}}{{locationLine}}</p><p>If you have any questions or need to reschedule, please contact us at your earliest convenience.</p><p>Thank you for choosing {{companyName}}.</p>"
|
||||
),
|
||||
[(NotificationType.AppointmentReminderStaff, NotificationChannel.Email)] = (
|
||||
"[Reminder] {{appointmentTitle}} — {{appointmentDate}}",
|
||||
"<p>Hi {{staffName}},</p><p>This is a reminder that you have an upcoming appointment.</p><p><strong>Appointment:</strong> {{appointmentTitle}}<br/><strong>Date & Time:</strong> {{appointmentDate}} at {{appointmentTime}}{{customerLine}}{{locationLine}}</p><p>— {{companyName}}</p>"
|
||||
),
|
||||
};
|
||||
|
||||
public static (string? Subject, string Body)? Get(NotificationType type, NotificationChannel channel)
|
||||
|
||||
Reference in New Issue
Block a user