admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#31078 -- Aanpassingen nav system-system test

Browse Source 
svn path=/Website/branches/v5.4.3/; revision=23460
This commit is contained in:
Arthur Egberink
2014-11-26 12:01:16 +00:00
parent 1b4c99e8bb
commit e514f94db2
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
UTILS/PutOrders/puo_allorders.js
View File

@@ -209,7 +209,8 @@ function send1Order(Bedrijf_key, XMLnode, OpdrKey, ordernr, Sender, cust)
, AttachPath , AttachPath
, AttachFile , AttachFile
, Sender , Sender
, MailSubject); , MailSubject
, "");
Log2File(1, "SendOrderResult: " + SendOrderResult.sendorder); Log2File(1, "SendOrderResult: " + SendOrderResult.sendorder);
var tekst = []; var tekst = [];

8
UTILS/PutOrders/puo_notifications.js
View File

@@ -83,8 +83,8 @@ function sendNotification(ref_key, pcode)
+ " WHERE ( BITAND (fac_notificatie_status, " + (puo_const.STATUS_EMAIL | puo_const.STATUS_SMS) + ") > 0" + " WHERE ( BITAND (fac_notificatie_status, " + (puo_const.STATUS_EMAIL | puo_const.STATUS_SMS) + ") > 0"
+ " OR fac_notificatie_systeemadres IS NOT NULL)" + " OR fac_notificatie_systeemadres IS NOT NULL)"
+ strFilter + strFilter
+ " ORDER BY fac_notificatie_datum DESC" + " ORDER BY fac_notificatie_datum"
+ " , fac_notificatie_key DESC"; + " , fac_notificatie_key";
Log2File(2, sql); Log2File(2, sql);
var oRs = Oracle.Execute(sql); var oRs = Oracle.Execute(sql);
@@ -338,6 +338,7 @@ function notificationSYS(rec, params)
var refkey = rec("fac_notificatie_refkey").value; var refkey = rec("fac_notificatie_refkey").value;
var extrakey = rec("fac_notificatie_extrakey").value; var extrakey = rec("fac_notificatie_extrakey").value;
var taal = rec("fac_notificatie_lang").value; var taal = rec("fac_notificatie_lang").value;
var code = rec("fac_srtnotificatie_code").value || "";
var sender_email = rec("fac_notificatie_sender_email").value || ""; var sender_email = rec("fac_notificatie_sender_email").value || "";
if (systeemadres) if (systeemadres)
@@ -374,6 +375,7 @@ function notificationSYS(rec, params)
Log2File(4, "order_mode=" + ordermode); Log2File(4, "order_mode=" + ordermode);
Log2File(4, "certificate=" + certificateName); Log2File(4, "certificate=" + certificateName);
Log2File(4, "AttachPath=" + AttachPath); Log2File(4, "AttachPath=" + AttachPath);
Log2File(4, "Code=" + code);
var SendOrderResult = SendOrder ( connect var SendOrderResult = SendOrder ( connect
, xml_content , xml_content
@@ -384,8 +386,10 @@ function notificationSYS(rec, params)
, ordermode , ordermode
, certificateName , certificateName
, AttachPath , AttachPath
, "" // AttachFile
, sender_email , sender_email
, S("puo_subjectprefix") + ordernr , S("puo_subjectprefix") + ordernr
, code
); );
} }

11
UTILS/PutOrders/puo_sendfile.js
View File

@@ -319,6 +319,7 @@ function SendOrder( p_connect
, p_attachfile , p_attachfile
, p_sender , p_sender
, p_mailsubject , p_mailsubject
, p_code
) )
{ {
// Input: // Input:
@@ -362,10 +363,16 @@ function SendOrder( p_connect
streamResult.Charset = 'utf-8'; streamResult.Charset = 'utf-8';
streamResult.Open(); streamResult.Open();
if (extension == "xml") if (extension == "xml")
{ {
result = XML2HTML( p_xmlData
, p_xslPath
, p_code
, ""
)
var XMLResult = new ActiveXObject("Msxml2.DOMDocument.6.0"); var XMLResult = new ActiveXObject("Msxml2.DOMDocument.6.0");
XMLResult.async = false; XMLResult.async = false;
xmlDoc.transformNodeToObject(xslDoc, XMLResult); XMLResult.loadXML(result);
// Eventuele attachements inplakken // Eventuele attachements inplakken
//Log2File(2, "Order: " + XMLResult.xml); //Log2File(2, "Order: " + XMLResult.xml);