slapos_crm: no need to manually handle the notification message

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

@@ -23,6 +23,7 @@ ticket = portal.portal_catalog.getResultValue(
 if ticket is not None:
   return ticket, None
 
+mail_message = None
 outstanding_amount = person.Entity_statSlapOSOutstandingAmount()
 
 # It can't be smaller, we are considernig all open invoices are from unpaid_payment_amount
@@ -55,43 +56,26 @@ if int(outstanding_amount) > 0:
 
   ticket.reindexObject(activate_kw={'tag': tag})
 
-  # Notify using user's language
-  language = context.getLanguage("en")
+  subject = 'Invoice payment requested'
+  body = """Dear %s,
 
-  notification_message = context.getPortalObject().portal_notifications.getDocumentValue(
-    reference="slapos-crm.create.regularisation.request",
-    language=language)
-  if notification_message is None:
-    subject = 'Invoice payment requested'
-    body = """Dear %s,
-
-A new invoice has been generated. 
+A new invoice has been generated.
 You can access it in your invoice section at %s.
 
 Regards,
 The slapos team
 """ % (context.getTitle(), portal.portal_preferences.getPreferredSlaposWebSiteUrl())
-
-  else:
-    notification_mapping_dict = {
-     'user_name': context.getTitle()}
-
-    subject = notification_message.getTitle()
-
-    # 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})
+  notification_message_reference = "slapos-crm.create.regularisation.request"
 
   mail_message = ticket.RegularisationRequest_checkToSendUniqEvent(
     portal.portal_preferences.getPreferredRegularisationRequestResource(),
     subject,
     body,
-    'Requested manual payment.')
-
-  return ticket, mail_message
+    'Requested manual payment.',
+    notification_message=notification_message_reference,
+    substitution_method_parameter_dict={
+      'user_name': context.getTitle()
+    },
+  )
 
-return ticket, None
+return ticket, mail_message