From d51dd84b29ca5e312c86f194d7b17ee4a2dfa850 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 7 Mar 2022 20:52:58 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/QuoteBiz.cs            |  3 ++-
 server/AyaNova/generator/CoreJobNotify.cs | 31 +++--------------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/server/AyaNova/biz/QuoteBiz.cs b/server/AyaNova/biz/QuoteBiz.cs
index 9676e797..f1e74e09 100644
--- a/server/AyaNova/biz/QuoteBiz.cs
+++ b/server/AyaNova/biz/QuoteBiz.cs
@@ -1302,7 +1302,8 @@ namespace AyaNova.Biz
                                     ObjectId = oProposed.QuoteId,
                                     CustomerNotifySubscriptionId = sub.Id,
                                     Name = $"{QuoteInfo.Serial.ToString()} - {qos.Name}",
-                                    Message=//TODO: template processing here 
+                                    Subject="TEST SUBJECT",
+                                    Message="TEST MESSAGE"//TODO: template processing here 
                                 };
                                 await ct.CustomerNotifyEvent.AddAsync(n);
                                 log.LogDebug($"Adding CustomerNotifyEvent:  [{n.ToString()}]");
diff --git a/server/AyaNova/generator/CoreJobNotify.cs b/server/AyaNova/generator/CoreJobNotify.cs
index 0382a983..29350a36 100644
--- a/server/AyaNova/generator/CoreJobNotify.cs
+++ b/server/AyaNova/generator/CoreJobNotify.cs
@@ -406,37 +406,14 @@ namespace AyaNova.Biz
                 {
                    
 
-                    string subject = "";
+                    string subject = ne.Subject;
 
 
                     IMailer m = AyaNova.Util.ServiceProviderProvider.Mailer;
-                    var body = "";
+                    var body = ne.Message;
 
-                    //Special notification handling
-                    switch (ne.EventType)
-                    {
-                        case NotifyEventType.CustomerServiceImminent:
-                            subject = subscription.;
-                            body = LT["NotifyEventCustomerServiceImminentMessage"].Replace("{0}", AyaNova.Util.DateUtil.FormatTimeSpan(advanceNotice, LT["TimeSpanDays"], LT["TimeSpanHours"], LT["TimeSpanMinutes"], LT["TimeSpanSeconds"]));
-                            body += $"\n{OpenObjectUrlBuilder(ne.AyaType, ne.ObjectId, ne.EventType)}\n";
-                            break;
-                        default:
-                            subject = $"AY:{AyaTypeTranslated}:{name}:{SubscriptionTypeName}";
-                            if (ne.ObjectId != 0 || ne.EventType == NotifyEventType.BackupStatus)
-                            {
-                                body = $"{AgeDisplay}{DecDisplay}{AyaTypeTranslated}\n{OpenObjectUrlBuilder(ne.AyaType, ne.ObjectId, ne.EventType)}\n";
-                            }
-                            body += ne.Message;
-                            break;
-                    }
-
-
-                    //Add link to subscription, all messages have this regardless of content
-                    //http://localhost:8080/open/51/1 //add subscription link, notifysub is object type 51
-                    if (!body.EndsWith('\n'))
-                        body += "\n";
-
-                    body += $"-----\n{NotifySubscriptionLinkText}\n{OpenSubscriptionUrlBuilder(ne.CustomerNotifySubscriptionId)}\n";
+              
+               
 
                     if (!ServerGlobalOpsSettingsCache.Notify.SmtpDeliveryActive)
                     {