diff --git a/devdocs/specs/core-notification.txt b/devdocs/specs/core-notification.txt index 9f71cf5e..f14676da 100644 --- a/devdocs/specs/core-notification.txt +++ b/devdocs/specs/core-notification.txt @@ -223,7 +223,7 @@ CSRRejected [CUSTOMER] NewWorkorder [CUSTOMER] WorkorderStatusChange [CUSTOMER] [CONDITION: WOSTATUS integer] WorkorderClosed [CUSTOMER] -WorkorderFollowUp [CUSTOMER] +### HOLD for v.next lots of cases around customer satisfaction survey etc not initial release though WorkorderFollowUp [CUSTOMER]###### QuoteStatusChanged [CUSTOMER] [CONDITION: QUOTESTATUS integer] ServiceBank[Currency/Hours/Incidents]Depleted [GENERAL] NewCSR [GENERAL] diff --git a/server/AyaNova/Controllers/EnumListController.cs b/server/AyaNova/Controllers/EnumListController.cs index d6de742b..8a291632 100644 --- a/server/AyaNova/Controllers/EnumListController.cs +++ b/server/AyaNova/Controllers/EnumListController.cs @@ -239,7 +239,7 @@ namespace AyaNova.Api.Controllers TranslationKeysToFetch.Add("NotifyEventCSRRejected"); TranslationKeysToFetch.Add("NotifyEventWorkorderClosed"); TranslationKeysToFetch.Add("NotifyEventQuoteStatusChange"); - TranslationKeysToFetch.Add("NotifyEventWorkorderFollowUp"); + //TranslationKeysToFetch.Add("NotifyEventWorkorderFollowUp"); TranslationKeysToFetch.Add("NotifyEventServiceBankDepleted"); TranslationKeysToFetch.Add("NotifyEventReminderImminent"); TranslationKeysToFetch.Add("NotifyEventScheduledOnWorkorder"); @@ -256,7 +256,7 @@ namespace AyaNova.Api.Controllers TranslationKeysToFetch.Add("NotifyEventWorkorderStatusAge"); TranslationKeysToFetch.Add("NotifyEventUnitWarrantyExpiry"); TranslationKeysToFetch.Add("NotifyEventUnitMeterReadingMultipleExceeded"); - TranslationKeysToFetch.Add("NotifyEventDefaultNotification"); + // TranslationKeysToFetch.Add("NotifyEventDefaultNotification"); var LT = TranslationBiz.GetSubsetStaticAsync(TranslationKeysToFetch, TranslationId).Result; @@ -269,7 +269,7 @@ namespace AyaNova.Api.Controllers ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventCSRRejected"], Id = (long)NotifyEventType.CSRRejected }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventWorkorderClosed"], Id = (long)NotifyEventType.WorkorderClosed }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventQuoteStatusChange"], Id = (long)NotifyEventType.QuoteStatusChange }); - ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventWorkorderFollowUp"], Id = (long)NotifyEventType.WorkorderFollowUp }); + // ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventWorkorderFollowUp"], Id = (long)NotifyEventType.WorkorderFollowUp }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventServiceBankDepleted"], Id = (long)NotifyEventType.ServiceBankDepleted }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventReminderImminent"], Id = (long)NotifyEventType.ReminderImminent }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventScheduledOnWorkorder"], Id = (long)NotifyEventType.ScheduledOnWorkorder }); @@ -286,7 +286,7 @@ namespace AyaNova.Api.Controllers ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventWorkorderStatusAge"], Id = (long)NotifyEventType.WorkorderStatusAge }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventUnitWarrantyExpiry"], Id = (long)NotifyEventType.UnitWarrantyExpiry }); ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventUnitMeterReadingMultipleExceeded"], Id = (long)NotifyEventType.UnitMeterReadingMultipleExceeded }); - ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventDefaultNotification"], Id = (long)NotifyEventType.DefaultNotification }); + //ReturnList.Add(new NameIdItem() { Name = LT["NotifyEventDefaultNotification"], Id = (long)NotifyEventType.DefaultNotification }); } else if (keyNameInLowerCase == StringUtil.TrimTypeName(typeof(NotifyDeliveryMethod).ToString()).ToLowerInvariant()) diff --git a/server/AyaNova/biz/NotifyEventType.cs b/server/AyaNova/biz/NotifyEventType.cs index 0a300078..5688b1b6 100644 --- a/server/AyaNova/biz/NotifyEventType.cs +++ b/server/AyaNova/biz/NotifyEventType.cs @@ -19,7 +19,7 @@ namespace AyaNova.Biz CSRRejected=7, WorkorderClosed=8, QuoteStatusChange=9, - WorkorderFollowUp=10, + // WorkorderFollowUp=10, ServiceBankDepleted=11, ReminderImminent=12, ScheduledOnWorkorder=13, diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 1556478a..76720ac1 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -1866,8 +1866,7 @@ "NotifyEventCSRAccepted": "Kundendienstanfrage angenommen", "NotifyEventCSRRejected": "Kundendienstanfrage abgelehnt", "NotifyEventWorkorderClosed": "Arbeitsauftrag geschlossen", - "NotifyEventQuoteStatusChange": "Angebotsstatus geändert", - "NotifyEventWorkorderFollowUp": "Überprüfung des Arbeitsauftrags", + "NotifyEventQuoteStatusChange": "Angebotsstatus geändert", "NotifyEventServiceBankDepleted": "Service Bank erschöpft", "NotifyEventReminderImminent": "Erinnerung unmittelbar bevorsteht", "NotifyEventScheduledOnWorkorder": "Geplant auf Arbeitsauftrag", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index fbd8f214..0230006e 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -1866,8 +1866,7 @@ "NotifyEventCSRAccepted": "Customer service request accepted", "NotifyEventCSRRejected": "Customer service request rejected", "NotifyEventWorkorderClosed": "Work order closed", - "NotifyEventQuoteStatusChange": "Quote status changed", - "NotifyEventWorkorderFollowUp": "Work order review", + "NotifyEventQuoteStatusChange": "Quote status changed", "NotifyEventServiceBankDepleted": "Service bank empty", "NotifyEventReminderImminent": "Reminder imminent", "NotifyEventScheduledOnWorkorder": "Scheduled on work order", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index c04e0b46..8b0e1de6 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -1867,7 +1867,6 @@ "NotifyEventCSRRejected": "Solicitud de servicio al cliente rechazada", "NotifyEventWorkorderClosed": "Orden de trabajo cerrada", "NotifyEventQuoteStatusChange": "Cambio de estado de cotización", - "NotifyEventWorkorderFollowUp": "Revisión de orden de trabajo", "NotifyEventServiceBankDepleted": "Banco de servicios agotado", "NotifyEventReminderImminent": "Recordatorio inminente", "NotifyEventScheduledOnWorkorder": "Programado en orden de trabajo", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 6b999d54..c0ca0dc1 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -1867,7 +1867,6 @@ "NotifyEventCSRRejected": "Demande de service client rejetée", "NotifyEventWorkorderClosed": "Bon de travail clôturé", "NotifyEventQuoteStatusChange": "Statut du devis modifié", - "NotifyEventWorkorderFollowUp": "Examen des bons de travail", "NotifyEventServiceBankDepleted": "Banque de services épuisée", "NotifyEventReminderImminent": "Rappel imminent", "NotifyEventScheduledOnWorkorder": "Planifié sur ordre de travail",