server/AyaNova/generator/CoreJobNotify.cs

@@ -172,7 +172,18 @@ namespace AyaNova.Biz
                     //subscription name translation
                     var SubscriptionTypeName = LT[EventTypeTranslationKey];
 
-                    var subject = $"AY:{AyaTypeTranslated}:{name}:{SubscriptionTypeName}";
+                    string subject = "";
+                    //Special notification handling
+                    switch (ne.EventType)
+                    {
+                        case NotifyEventType.CustomerServiceImminent:
+                            subject = SubscriptionTypeName;
+                            break;
+                        default:
+                            subject = $"AY:{AyaTypeTranslated}:{name}:{SubscriptionTypeName}";
+                            break;
+                    }
+
 
                     //Age relevant notification
                     string AgeDisplay = "";
@@ -208,7 +219,7 @@ namespace AyaNova.Biz
                     {
                         await m.SendEmailAsync(deliveryAddress, subject, body, ServerGlobalOpsSettingsCache.Notify);
                     }
-                }              
+                }
             }
             catch (Exception ex)
             {