Fac-verify ook immediate en scheduled putorders e-mail ondersteunen

svn path=/Website/trunk/; revision=50553
This commit is contained in:
Jos Groot Lipman
2021-03-30 08:03:55 +00:00
parent d0dddc4cfc
commit 98c5be398b
2 changed files with 20 additions and 4 deletions

View File

@@ -1918,8 +1918,7 @@ checker("E-mail sending with immediate putorders",
params = { FromAddress: mailfrom,
ReplyAddress: mailreply
};
var keepOracle = Oracle; // We hebben een ietwat 'rare' Oracle in fac_verify
Oracle = { RealConnection: Oracle };
putorders._puo_Oracle = orgOracle.RealConnection; // putorders vind het niet leuk dat wel Oracle vervangen hebben
var res = putorders.sendMail(mailto, txt, strBody, params); // res is altijd leeg
}
catch(e)
@@ -1950,7 +1949,7 @@ checker("E-mail sending with scheduled putorders",
var sql = "BEGIN fac.putnotificationsrtprio("
+ user_key
+ ", NULL " // pto
+ ", " + safe.quoted_sql("PRSMAI") // je moet toch iets
+ ", " + safe.quoted_sql("FACTST")
+ ", " + user_key // pref
+ ", " + safe.quoted_sql(txt)
+ ", 2" // pstatus e-mail (only?)
@@ -1999,7 +1998,7 @@ checker("Immediate E-mail test",
+ "<select name='puo_mode' style='width:250px'>"
+ "<option value='0' " + (puo_mode==0?" selected='selected'":"") + ">Direct SMTP</option>"
+ "<option value='1' " + (puo_mode==1?" selected='selected'":"") + ">Immediate Putorders</option>"
+ "<option value='2' " + (puo_mode==2?" selected='selected'":"") + ">Scheduled Putorders</option>"
+ "<option value='2' " + (puo_mode==2?" selected='selected'":"") + ">Scheduled Putorders (FACTST notification)</option>"
+ "</select>"
+ " <input type='submit' value='Send' onclick='this.value=\"Please wait...\";'></td></tr>"
+ " <tr><td colspan='2'><fieldset><legend>Direct SMTP only</legend><table>"

View File

@@ -2990,6 +2990,9 @@ END:VCALENDAR
<xsl:when test="$srtnotificatiecode='PRSREG'">
<xsl:apply-templates select="." mode="registreertelefoon"/>
</xsl:when>
<xsl:when test="$srtnotificatiecode='FACTST'">
<xsl:apply-templates select="." mode="facilitortest"/>
</xsl:when>
<xsl:otherwise>
<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
@@ -3119,6 +3122,20 @@ END:VCALENDAR
</table>
</xsl:template>
<xsl:template match="perslid" mode="facilitortest">
<table border="0" cellpadding="1">
<tr>
<td colspan="4" >
Dit is een Facilitor test notificatie<br/>
Gericht aan: <xsl:value-of select="//perslid/naam_full"/> (<xsl:value-of select="//perslid/oslogin"/>)<br/>
Verstuurd: <xsl:value-of select="//header/dateTime"/><br/>
Mode: <xsl:value-of select="$mode"/><br/>
srtnotificatiecode: <xsl:value-of select="$srtnotificatiecode"/><br/>
</td>
</tr>
</table>
</xsl:template>
<xsl:template match="contract" mode="include">
<table border="0" cellpadding="1">
<xsl:if test="extra_key">