slapos_crm: Include name and proper language on Notification

    On  Regularisation Requests context.

master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm/Person_checkToCreateRegularisationRequest.py

@@ -63,22 +63,36 @@ if int(outstanding_amount) > 0:
 
   ticket.reindexObject(activate_kw={'tag': tag})
 
+  # Notify using user's language
+  language = context.getLanguage("en")
+
   notification_message = context.getPortalObject().portal_notifications.getDocumentValue(
-    reference="slapos-crm.create.regularisation.request")
+    reference="slapos-crm.create.regularisation.request",
+    language=language)
   if notification_message is None:
     subject = 'Invoice payment requested'
-    body = """Dear user,
+    body = """Dear %s,
 
 A new invoice has been generated. 
 You can access it in your invoice section at %s.
 
 Regards,
 The slapos team
-""" % portal.portal_preferences.getPreferredSlaposWebSiteUrl()
+""" % (context.getTitle(), portal.portal_preferences.getPreferredSlaposWebSiteUrl())
 
   else:
+    notification_mapping_dict = {
+     'user_name': context.getTitle()}
+
     subject = notification_message.getTitle()
-    body = notification_message.convert(format='text')[1]
+
+    # Preserve HTML else convert to text
+    if notification_message.getContentType() == "text/html":
+      body = notification_message.asEntireHTML(
+        substitution_method_parameter_dict={'mapping_dict':notification_mapping_dict})
+    else:
+      body = notification_message.asText(
+        substitution_method_parameter_dict={'mapping_dict':notification_mapping_dict})
 
   mail_message = ticket.RegularisationRequest_checkToSendUniqEvent(
     portal.portal_preferences.getPreferredRegularisationRequestResource(),

master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm/RegularisationRequest_triggerAcknowledgmentEscalation.py

@@ -2,7 +2,15 @@ from zExceptions import Unauthorized
 if REQUEST is not None:
   raise Unauthorized
 
-notification_message = context.getPortalObject().portal_notifications.getDocumentValue(reference="slapos-crm.acknowledgment.escalation")
+portal = context.getPortalObject()
+language = "en"
+recipient = context.getDestinationSectionValue()
+if recipient is not None:
+  language = recipient.getLanguage("en")
+
+notification_message = portal.portal_notifications.getDocumentValue(
+  language=language, reference="slapos-crm.acknowledgment.escalation")
+
 if notification_message is None:
   subject = 'Reminder: invoice payment requested'
   body = """Dear user,
@@ -15,8 +23,18 @@ The slapos team
 """ % context.getPortalObject().portal_preferences.getPreferredSlaposWebSiteUrl()
 
 else:
+  notification_mapping_dict = {
+     'user_name': context.getDestinationSectionTitle()}
+
   subject = notification_message.getTitle()
-  body = notification_message.convert(format='text')[1]
+
+  # Preserve HTML else convert to text
+  if notification_message.getContentType() == "text/html":
+    body = notification_message.asEntireHTML(
+        substitution_method_parameter_dict={'mapping_dict':notification_mapping_dict})
+  else:
+    body = notification_message.asText(
+        substitution_method_parameter_dict={'mapping_dict':notification_mapping_dict})
 
 return context.RegularisationRequest_checkToTriggerNextEscalationStep(
   delay_period_in_days=15,

master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm/RegularisationRequest_triggerDeleteReminderEscalation.py

@@ -2,7 +2,15 @@ from zExceptions import Unauthorized
 if REQUEST is not None:
   raise Unauthorized
 
-notification_message = context.getPortalObject().portal_notifications.getDocumentValue(reference="slapos-crm.delete.reminder.escalation")
+portal = context.getPortalObject()
+language = "en"
+recipient = context.getDestinationSectionValue()
+if recipient is not None:
+  language = recipient.getLanguage("en")
+
+notification_message = portal.portal_notifications.getDocumentValue(
+  language=language, reference="slapos-crm.delete.reminder.escalation")
+
 if notification_message is None:
   subject = 'Acknowledgment: instances deleted'
   body = """Dear user,
@@ -14,8 +22,18 @@ Regards,
 The slapos team
 """ % context.getPortalObject().portal_preferences.getPreferredSlaposWebSiteUrl()
 else:
+  notification_mapping_dict = {
+     'user_name': context.getDestinationSectionTitle()}
+
   subject = notification_message.getTitle()
-  body = notification_message.convert(format='text')[1]
+
+  # Preserve HTML else convert to text
+  if notification_message.getContentType() == "text/html":
+    body = notification_message.asEntireHTML(
+        substitution_method_parameter_dict={'mapping_dict':notification_mapping_dict})
+  else:
+    body = notification_message.asText(
+        substitution_method_parameter_dict={'mapping_dict':notification_mapping_dict})
 
 return context.RegularisationRequest_checkToTriggerNextEscalationStep(
   delay_period_in_days=10,

master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm/RegularisationRequest_triggerStopAcknowledgmentEscalation.py

@@ -2,7 +2,15 @@ from zExceptions import Unauthorized
 if REQUEST is not None:
   raise Unauthorized
 
-notification_message = context.getPortalObject().portal_notifications.getDocumentValue(reference="slapos-crm.stop.acknowledgment.escalation")
+portal = context.getPortalObject()
+language = "en"
+recipient = context.getDestinationSectionValue()
+if recipient is not None:
+  language = recipient.getLanguage("en")
+
+notification_message = portal.portal_notifications.getDocumentValue(
+  language=language, reference="slapos-crm.stop.acknowledgment.escalation")
+
 if notification_message is None:
   subject = 'Last reminder: invoice payment requested'
   body = """Dear user,
@@ -14,8 +22,18 @@ Regards,
 The slapos team
 """ % context.getPortalObject().portal_preferences.getPreferredSlaposWebSiteUrl()
 else:
+  notification_mapping_dict = {
+     'user_name': context.getDestinationSectionTitle()}
+
   subject = notification_message.getTitle()
-  body = notification_message.convert(format='text')[1]
+
+  # Preserve HTML else convert to text
+  if notification_message.getContentType() == "text/html":
+    body = notification_message.asEntireHTML(
+        substitution_method_parameter_dict={'mapping_dict':notification_mapping_dict})
+  else:
+    body = notification_message.asText(
+        substitution_method_parameter_dict={'mapping_dict':notification_mapping_dict})
 
 return context.RegularisationRequest_checkToTriggerNextEscalationStep(
   delay_period_in_days=7,

master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm/RegularisationRequest_triggerStopReminderEscalation.py

@@ -2,7 +2,15 @@ from zExceptions import Unauthorized
 if REQUEST is not None:
   raise Unauthorized
 
-notification_message = context.getPortalObject().portal_notifications.getDocumentValue(reference="slapos-crm.stop.reminder.escalation")
+portal = context.getPortalObject()
+language = "en"
+recipient = context.getDestinationSectionValue()
+if recipient is not None:
+  language = recipient.getLanguage("en")
+
+notification_message = portal.portal_notifications.getDocumentValue(
+  language=language, reference="slapos-crm.stop.reminder.escalation")
+
 if notification_message is None:
   subject = 'Acknowledgment: instances stopped'
   body = """Dear user,
@@ -14,8 +22,18 @@ Regards,
 The slapos team
 """ % context.getPortalObject().portal_preferences.getPreferredSlaposWebSiteUrl()
 else:
+  notification_mapping_dict = {
+     'user_name': context.getDestinationSectionTitle()}
+
   subject = notification_message.getTitle()
-  body = notification_message.convert(format='text')[1]
+
+  # Preserve HTML else convert to text
+  if notification_message.getContentType() == "text/html":
+    body = notification_message.asEntireHTML(
+        substitution_method_parameter_dict={'mapping_dict':notification_mapping_dict})
+  else:
+    body = notification_message.asText(
+        substitution_method_parameter_dict={'mapping_dict':notification_mapping_dict})
 
 return context.RegularisationRequest_checkToTriggerNextEscalationStep(
   delay_period_in_days=7,