Skip to content
Snippets Groups Projects
Commit 322c70b1 authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

Merge branch 'cm_dt_1074059_report-dispatch' into '2021.0' 

Cm dt 1074059 report dispatch

See merge request xrm/basic!836
parents b808ea2e 76f2f51d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 42 additions and 30 deletions
entity/DSGVOReport_entity/entityfields/dsgvoreportdispatch/children/dispatchdsgvoreport/onActionProcess.js
+ 5
− 2
View file @ 322c70b1
import("KeywordRegistry_basic");
import("system.logging");
import("system.translate");
import("system.vars");
......@@ -19,10 +20,12 @@ var emailFilename = translate.text(reportType == "DSGVO_Disclosure_report" ? "Di
var fullname = ContactUtils.getTitleByContactId(contactId);
emailFilename = emailFilename + " " + fullname;
dsgvoReport.content = reportData;
dsgvoReport.content = reportData.substr(1);
dsgvoReport.mimeType = MimeTypes.PDF();
dsgvoReport.filename = emailFilename + ".pdf";
attachmentArray[0] = dsgvoReport;
EmailWritingUtils.sendReportAsMail(recipient, attachmentArray, "DSGVOReport", null, emailFilename, null, null);
EmailWritingUtils.sendReportAsMail(recipient, attachmentArray, "DSGVOReport", null, emailFilename, null, null,
$KeywordRegistry.documentTemplateTypeCategory$single());
\ No newline at end of file
entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
+ 2
− 2
View file @ 322c70b1
......@@ -16,7 +16,6 @@ var notificationMsg = translate.text("The status of the offer was changed to \"s
var contactId = vars.get("$field.CONTACT_ID");
var arrayReport = OfferUtils.buildOfferReport(vars.get("$field.OFFERID"));
var emailFilename = translate.text("Offerrequest");
var offerId = vars.get("$field.OFFERID")
var additionalPlaceholders = [
new Placeholder("offerCode", Placeholder.types.FIXEDVALUE, vars.get("$field.FullOfferCode"))
];
......@@ -29,4 +28,5 @@ offerReport.filename = translate.text("Offer No.") + vars.get("$field.#CONTENTTI
attachmentArray[0] = offerReport;
EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Offer", notificationMsg, emailFilename, additionalPlaceholders, updateStatements);
EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Offer", notificationMsg, emailFilename, additionalPlaceholders, updateStatements,
$KeywordRegistry.documentTemplateTypeCategory$single());
entity/Order_entity/entityfields/orderreportdispatch/children/dispatchorderreport/onActionProcess.js
+ 3
− 5
View file @ 322c70b1
......@@ -2,6 +2,7 @@ import("system.question");
import("system.translate");
import("system.vars");
import("system.db");
import("KeywordRegistry_basic");
import("MimeType_lib");
import("Email_lib");
import("Sql_lib");
......@@ -13,10 +14,7 @@ var notificationMsg = translate.text("The status of the order was changed to \"s
var contactId = vars.get("$field.CONTACT_ID");
var orgContactId = vars.get("$field.CONTACT_ORG_ID");
var reportData = vars.get("$field.ORDER_REPORT_DATA");
var emailFilename = vars.get("$field.#CONTENTTITLE");
var orderNo = emailFilename.substring(emailFilename.indexOf(" ", 0)+1, emailFilename.length);
emailFilename = emailFilename.substring(0, emailFilename.indexOf(" ", 0));
emailFilename = emailFilename + " " + orderNo;
var emailFilename = vars.get("$field.ORDERTYPE.displayValue") + " " + vars.get("$field.SALESORDERCODE");
if (contactId == null || "")
contactId = orgContactId;
......@@ -27,4 +25,4 @@ orderReport.filename = emailFilename + ".pdf";
attachmentArray[0] = orderReport;
EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Order", notificationMsg, emailFilename, null, updateStatements);
EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Order", notificationMsg, emailFilename, null, updateStatements, $KeywordRegistry.documentTemplateTypeCategory$single());
entity/Order_entity/entityfields/reminderreportdispatch/children/dispatchreminderreport/onActionProcess.js
+ 3
− 1
View file @ 322c70b1
......@@ -2,6 +2,7 @@ import("system.question");
import("system.translate");
import("system.vars");
import("system.db");
import("KeywordRegistry_basic");
import("MimeType_lib");
import("Email_lib");
import("Order_lib");
......@@ -25,4 +26,5 @@ orderReport.filename = emailFilename + ".pdf";
attachmentArray[0] = orderReport;
EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Order", null, emailFilename, null, null);
EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Order", null, emailFilename, null, null,
$KeywordRegistry.documentTemplateTypeCategory$single())
entity/Organisation_entity/entityfields/newemail/onActionProcess.js
+ 2
− 1
View file @ 322c70b1
......@@ -2,4 +2,5 @@ import("system.vars");
import("Email_lib");
import("KeywordRegistry_basic");
EmailWritingUtils.openNewMail(vars.getString("$field.CONTACTID"), null, vars.get("$sys.currentcontextname"), null, null, null, null, null, $KeywordRegistry.documentTemplateTypeCategory$single());
\ No newline at end of file
EmailWritingUtils.openNewMail(vars.getString("$field.CONTACTID"), null, vars.get("$sys.currentcontextname"), null, null, null, null, null,
$KeywordRegistry.documentTemplateTypeCategory$single());
\ No newline at end of file
entity/Organisation_entity/entityfields/orgreportdispatch/children/dispatchorgreport/onActionProcess.js
+ 4
− 2
View file @ 322c70b1
import("system.logging");
import("Organisation_lib");
import("system.translate");
import("system.vars");
import("system.db");
import("KeywordRegistry_basic");
import("Organisation_lib");
import("MimeType_lib");
import("Email_lib");
import("Order_lib");
......@@ -21,4 +22,5 @@ orgReport.filename = emailFilename + ".pdf";
attachmentArray[0] = orgReport;
EmailWritingUtils.sendReportAsMail(orgContactId, attachmentArray, "Organisation", null, emailFilename, null, null);
EmailWritingUtils.sendReportAsMail(orgContactId, attachmentArray, "Organisation", null, emailFilename, null, null,
$KeywordRegistry.documentTemplateTypeCategory$single())
entity/Person_entity/entityfields/newemail/onActionProcess.js
+ 2
− 1
View file @ 322c70b1
......@@ -3,4 +3,5 @@ import("Email_lib");
import("KeywordRegistry_basic");
EmailWritingUtils.openNewMail(vars.getString("$field.CONTACTID"), null, vars.get("$sys.currentcontextname"), null, null, null, null, null, $KeywordRegistry.documentTemplateTypeCategory$single());
\ No newline at end of file
EmailWritingUtils.openNewMail(vars.getString("$field.CONTACTID"), null, vars.get("$sys.currentcontextname"), null, null, null, null, null,
$KeywordRegistry.documentTemplateTypeCategory$single());
\ No newline at end of file
process/Email_lib/process.js
+ 21
− 16
View file @ 322c70b1
import("system.translate");
import("system.question");
import("Sql_lib");
import("MimeType_lib");
import("Document_lib");
import("system.logging");
import("system.translate");
import("system.text");
import("system.db");
import("system.util");
import("Communication_lib");
import("DocumentTemplate_lib");
import("system.neon");
import("system.mail");
import("Bulkmail_lib");
import("system.tools");
import("system.util");
import("system.db");
import("KeywordRegistry_basic");
import("DocumentTemplate_lib");
import("Communication_lib");
import("EmailUtil_lib");
import("Bulkmail_lib");
import("MimeType_lib");
import("Document_lib");
import("Sql_lib");
function EmailWritingUtils () {}
......@@ -89,9 +90,10 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
* @param {String} pEmailFilename optional file name of the email.
* @param {String} [pAdditionalPlaceholders] additional placeholders for the email
* @param {Array[]} [pUpdateStatements] an array with update statements which will be executed after email is downloaded/sent.
* @param {String} pTypeClassification Documenttemplatetypeclassification
* @param {String} pDocumentTemplateType The document template type (single or serial - <b><u><i>use keyword!</i></u></b>).
*/
EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComingFrom, pAttachmentArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pUpdateStatements, pTypeClassification)
EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComingFrom, pAttachmentArray, pNotificationMsg, pEmailFilename,
pAdditionalPlaceholders, pUpdateStatements, pDocumentTemplateType)
{
var params = {
"ContactId_param" : pToContactId,
......@@ -101,7 +103,7 @@ EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComing
"EmailFilename" : pEmailFilename,
"AdditionalPlaceholders_param" : JSON.stringify(pAdditionalPlaceholders),
"UpdateStatements_param" : JSON.stringify(pUpdateStatements),
"DocumentTemplateTypeClassification_param" : pTypeClassification
"DocumentTemplateTypeClassification_param" : pDocumentTemplateType
};
if (pToEmailAddress)
......@@ -120,16 +122,18 @@ EmailWritingUtils.getMailbridgeAddress = function ()
* Opens a view where the email with the report(s) can be downloaded as .eml
* and after that it can be sent with e.g. Thunderbird
*
* Report have to be a object with these attrs: content (base64 encoded report), contentType (mimeType of the report), filename (complete filename with filending)
* @param {String} pRecipient Contact id of the recipient.
* @param {String} pComingFrom source from where you started (e.g. "Person", "Organisation")
* @param {Array} pReportArray array with reports.
* @param {String} pNotificationMsg message which will be shown after the operation is done.
* @param {String} pEmailFilename optional file name of the email.
* @param {String} [pAdditionalPlaceholders] additional placeholders for the email
* @param {String} [pOfferId] optional needed for the offerEmails, to change the status of the offer
* Report have to be a object with these attrs: content (base64 encoded report), contentType (mimeType of the report), filename (complete filename with filending)
* @param {String} [pUpdateStatements] Opt. update-statements which will be executed, after download process is started.
* @param {String} pDocumentTemplateType The document template type (single or serial - <b><u><i>use keyword!</i></u></b>).
*/
EmailWritingUtils.sendReportAsMail = function (pRecipient, pReportArray, pComingFrom, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pOfferId)
EmailWritingUtils.sendReportAsMail = function (pRecipient, pReportArray, pComingFrom, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders,
pUpdateStatements, pDocumentTemplateType)
{
var pRecpientEmail;
......@@ -141,7 +145,8 @@ EmailWritingUtils.sendReportAsMail = function (pRecipient, pReportArray, pComing
pRecpientEmail = null;
}
EmailWritingUtils.openNewMail(pRecipient, pRecpientEmail, pComingFrom, pReportArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pOfferId);
EmailWritingUtils.openNewMail(pRecipient, pRecpientEmail, pComingFrom, pReportArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders,
pUpdateStatements, pDocumentTemplateType);
}
/**
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment