diff --git a/UTILS/PutOrders/puo_allorders.js b/UTILS/PutOrders/puo_allorders.js index 927579fc83..f8901dc6e1 100644 --- a/UTILS/PutOrders/puo_allorders.js +++ b/UTILS/PutOrders/puo_allorders.js @@ -209,7 +209,8 @@ function send1Order(Bedrijf_key, XMLnode, OpdrKey, ordernr, Sender, cust) , AttachPath , AttachFile , Sender - , MailSubject); + , MailSubject + , ""); Log2File(1, "SendOrderResult: " + SendOrderResult.sendorder); var tekst = []; diff --git a/UTILS/PutOrders/puo_notifications.js b/UTILS/PutOrders/puo_notifications.js index 9c2408ff5b..8cc729cead 100644 --- a/UTILS/PutOrders/puo_notifications.js +++ b/UTILS/PutOrders/puo_notifications.js @@ -83,8 +83,8 @@ function sendNotification(ref_key, pcode) + " WHERE ( BITAND (fac_notificatie_status, " + (puo_const.STATUS_EMAIL | puo_const.STATUS_SMS) + ") > 0" + " OR fac_notificatie_systeemadres IS NOT NULL)" + strFilter - + " ORDER BY fac_notificatie_datum DESC" - + " , fac_notificatie_key DESC"; + + " ORDER BY fac_notificatie_datum" + + " , fac_notificatie_key"; Log2File(2, sql); var oRs = Oracle.Execute(sql); @@ -338,6 +338,7 @@ function notificationSYS(rec, params) var refkey = rec("fac_notificatie_refkey").value; var extrakey = rec("fac_notificatie_extrakey").value; var taal = rec("fac_notificatie_lang").value; + var code = rec("fac_srtnotificatie_code").value || ""; var sender_email = rec("fac_notificatie_sender_email").value || ""; if (systeemadres) @@ -374,6 +375,7 @@ function notificationSYS(rec, params) Log2File(4, "order_mode=" + ordermode); Log2File(4, "certificate=" + certificateName); Log2File(4, "AttachPath=" + AttachPath); + Log2File(4, "Code=" + code); var SendOrderResult = SendOrder ( connect , xml_content @@ -384,8 +386,10 @@ function notificationSYS(rec, params) , ordermode , certificateName , AttachPath + , "" // AttachFile , sender_email , S("puo_subjectprefix") + ordernr + , code ); } diff --git a/UTILS/PutOrders/puo_sendfile.js b/UTILS/PutOrders/puo_sendfile.js index 4db7221f91..0080b562ce 100644 --- a/UTILS/PutOrders/puo_sendfile.js +++ b/UTILS/PutOrders/puo_sendfile.js @@ -319,6 +319,7 @@ function SendOrder( p_connect , p_attachfile , p_sender , p_mailsubject + , p_code ) { // Input: @@ -362,10 +363,16 @@ function SendOrder( p_connect streamResult.Charset = 'utf-8'; streamResult.Open(); if (extension == "xml") - { + { + result = XML2HTML( p_xmlData + , p_xslPath + , p_code + , "" + ) + var XMLResult = new ActiveXObject("Msxml2.DOMDocument.6.0"); XMLResult.async = false; - xmlDoc.transformNodeToObject(xslDoc, XMLResult); + XMLResult.loadXML(result); // Eventuele attachements inplakken //Log2File(2, "Order: " + XMLResult.xml);