DJIN#37002: Verkeerde notificatiecode

svn path=/Website/branches/v2015.2/; revision=29872

CUST/ARFR/tasks/gen_notify.bat

@@ -0,0 +1,4 @@
+@echo off
+REM Moet gescheduled worden (normaliter 1 keer per uur) om door de applicatiebeheerder
+REM ingeregelde notificaties te genereren.
+cscript ..\..\..\utils\gen_notify\gen_notify.js ../oracle.udl ARFR

CUST/ARFR/tasks/gen_scheduler.bat

@@ -0,0 +1,4 @@
+@echo off
+REM Moet gescheduled worden (normaliter 1 keer per dag) om door de applicatiebeheerder
+REM ingeregelde jobs (aanmaak van periodieke opdrachten) uit te voeren.
+cscript ..\..\..\utils\gen_scheduler\gen_scheduler.js ../oracle.udl

CUST/ARFR/tasks/putOrders.bat

@@ -0,0 +1 @@
+call ..\..\..\utils\putOrders\putOrders.bat

CUST/DENB/cust.css

@@ -6,17 +6,3 @@
 {
   background: url(fac_logo.png) no-repeat;
 }
-
-#headerlogout {
-  visibility: hidden;
-}
-
-
-
-
-
-
-
-
-
-

CUST/DJIN/xsl/cust.xsl

@@ -171,7 +171,7 @@
 
 	<xsl:template match="melding" mode="include">
 
-		<xsl:variable name="srtnotificatiecode">MLDREJ</xsl:variable>
+		<xsl:variable name="Xsrtnotificatiecode">MLDREJ</xsl:variable>
 		
 		<table border="0" width="100%" cellpadding="2">
 			<!-- begin header -->

CUST/DJIN/xsl/environment.xsl

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <!--Dit bestand moet de URL naar de root van Facilitor bevatten en is afhankelijk van de OTAP-omgeving.-->
-  <xsl:variable name="FacilitorRoot">sgf12/facilitor5iwork</xsl:variable>
-  <xsl:variable name="FacilitorWebRoot">http://sgf12/facilitor5iwork</xsl:variable>
+  <xsl:variable name="FacilitorRoot">https://djin.facilitorlabs.nl</xsl:variable>
 </xsl:stylesheet>

CUST/MDUX/xsl/cust.xsl

@@ -674,6 +674,22 @@
 
 
 <xsl:template match="bestelopdracht" mode="include">
+<xsl:choose>
+<xsl:when test="$srtnotificatiecode = 'CUST01'">
+    <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
+        <tr>
+        <td>
+        <br/>
+        Beste collega,<br/><br/> 
+        Volgens onze gegevens heeft u in Facilitor nog een aantal orders staan, waarvan de uiterlijke leverdatum reeds verstreken is, maar waarvan de bestelling nog niet binnen geboekt is.<br/><br/> 
+        Om de factuur uiteindelijk betaalbaar te kunnen stellen, willen we u graag verzoeken de geleverde bestellingen in Facilitor (middels uw ‘Ontvang’ account) als ‘geleverd’ binnen te boeken in Facilitor.<br/><br/> 
+        Bedankt voor de medewerking,<br/><br/> 
+        Medux B.V.!!
+        </td>
+        </tr>
+    </TABLE>
+</xsl:when>
+<xsl:otherwise>
     <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
       <TR>
         <TD WIDTH="40" ROWSPAN="30" ID="LINKERMARGE"></TD>
@@ -927,7 +943,9 @@
         <TD WIDTH="30" ROWSPAN="30" ID="RECHTERMARGE"/>
       </TR>
     </TABLE>
-  </xsl:template>
+</xsl:otherwise>
+</xsl:choose>    
+</xsl:template>
   
   
   <xsl:template match="melding" mode="include">

CUST/SGGR/xsl/cust.xsl

@@ -676,7 +676,7 @@
 					</tr>
 				</table>
 			</xsl:when>
-			<xsl:when test="discipline/srtdiscipline/prefix='HR' and stdmelding/key !=281">
+			<xsl:when test="discipline/srtdiscipline/prefix='HR'">
 			 <xsl:choose>
 			    <xsl:when test="discipline/key=561"> <!-- vakgroep verlof -->
 				<table border="0" width="100%" cellpadding="2">
@@ -843,7 +843,7 @@
 					</tr>
 				</table>
 				</xsl:when>
-			    <xsl:when test="stdmelding/key=261"> <!-- stdmelding declaratie -->
+			    <xsl:when test="discipline/key=601"> <!-- vakgroep declaratie -->
 			    <style>
 			    td.bedrag {
 			        text-align: right;
@@ -896,7 +896,7 @@
 				<table border="0" width="100%" cellpadding="2">
 					<tr>
 						<td colspan="5" class="caption" style="padding-top:20px;padding-bottom:20px">
-							<b>Declaratieaanvraag&#xA0;<xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/></b>
+							<b><xsl:value-of select="stdmelding/omschrijving"/>&#xA0;<xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/></b>
 						</td>
 					</tr>
 					<tr>
@@ -925,6 +925,7 @@
 							<xsl:value-of select="gemeld/datum"/>
 						</td>
 					</tr>
+					<xsl:if test="stdmelding/key='261'">
 					<tr>
 					<td align="left">
                         <b>Betaald per bank d.d.:</b>
@@ -933,6 +934,7 @@
 							<xsl:value-of select="kenmerk[@volgnummer='920']"/>
 						</td>
 					</tr>
+					</xsl:if>
                     <tr height="20px">
 						<td/>
 					</tr>
@@ -944,14 +946,16 @@
 										<b>Datum</b>
 									</th>
 									<th align="left">
-										<b>Van-naar/Omschrijving</b>
+										<b><xsl:value-of select="kenmerk[@volgnummer='10']/@naam"/></b>
 									</th>
+									<xsl:if test="stdmelding/key='261'">
 									<th align="right">
 										<b>Km's</b>
 									</th>
 									<th align="right">
 										<b>à</b>
 									</th>
+									</xsl:if>
 									<th align="right">
 										<b>Totaal incl. BTW</b>
 									</th>
@@ -962,8 +966,10 @@
 								<tr>
 									<td align="left" width="12%"><xsl:value-of select="kenmerk[@volgnummer='5']"/></td>
 									<td align="left" width="32%"><xsl:value-of select="kenmerk[@volgnummer='10']"/></td>
+							        <xsl:if test="stdmelding/key='261'">
 							        <td align="left" width="8%" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='15'], '0,0', 'euro')"/></td>
 							        <td align="left" width="8%" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='20'], '0,00', 'euro')"/></td>
+							        </xsl:if>
 							        <td align="left" class="bedrag">&#8364; <xsl:value-of select="format-number(kenmerk[@volgnummer='25'], '0,00', 'euro')"/></td>
 							        <td align="left" width="25%"></td>
 								</tr>
@@ -971,8 +977,10 @@
 								<tr>
 									<td align="left"><xsl:value-of select="kenmerk[@volgnummer='30']"/></td>
 									<td align="left"><xsl:value-of select="kenmerk[@volgnummer='35']"/></td>
+									<xsl:if test="stdmelding/key='261'">
 							        <td align="left" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='40'], '0,0', 'euro')"/></td>
 							        <td align="left" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='45'], '0,00', 'euro')"/></td>
+							        </xsl:if>
 							        <td align="left" class="bedrag">&#8364; <xsl:value-of select="format-number(kenmerk[@volgnummer='50'], '0,00', 'euro')"/></td>
 							        <td align="left"></td>
 								</tr>
@@ -981,8 +989,10 @@
 								<tr>
 									<td align="left"><xsl:value-of select="kenmerk[@volgnummer='55']"/></td>
 									<td align="left"><xsl:value-of select="kenmerk[@volgnummer='60']"/></td>
+									<xsl:if test="stdmelding/key='261'">
 							        <td align="left" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='65'], '0,0', 'euro')"/></td>
 							        <td align="left" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='70'], '0,00', 'euro')"/></td>
+							        </xsl:if>
 							        <td align="left" class="bedrag">&#8364; <xsl:value-of select="format-number(kenmerk[@volgnummer='75'], '0,00', 'euro')"/></td>
 							        <td align="left"></td>
 								</tr>
@@ -991,8 +1001,10 @@
 								<tr>
 									<td align="left"><xsl:value-of select="kenmerk[@volgnummer='80']"/></td>
 									<td align="left"><xsl:value-of select="kenmerk[@volgnummer='85']"/></td>
+									<xsl:if test="stdmelding/key='261'">
 							        <td align="left" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='90'], '0,0', 'euro')"/></td>
 							        <td align="left" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='95'], '0,00', 'euro')"/></td>
+							        </xsl:if>
 							        <td align="left" class="bedrag">&#8364; <xsl:value-of select="format-number(kenmerk[@volgnummer='100'], '0,00', 'euro')"/></td>
 							        <td align="left"></td>
 								</tr>
@@ -1001,15 +1013,23 @@
 								<tr>
 									<td align="left"><xsl:value-of select="kenmerk[@volgnummer='105']"/></td>
 									<td align="left"><xsl:value-of select="kenmerk[@volgnummer='110']"/></td>
+									<xsl:if test="stdmelding/key='261'">
 							        <td align="left" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='115'], '0,0', 'euro')"/></td>
-
 							        <td align="left" class="bedrag"><xsl:value-of select="format-number(kenmerk[@volgnummer='120'], '0,00', 'euro')"/></td>
+							        </xsl:if>
 							        <td align="left" class="bedrag">&#8364; <xsl:value-of select="format-number(kenmerk[@volgnummer='125'], '0,00', 'euro')"/></td>
 							        <td align="left"></td>
 								</tr>
 								</xsl:if>
 								<tr>
+									<xsl:choose>
+									<xsl:when test="stdmelding/key='261'">
 									  <td colspan= "4" align="left"><b>Totaal:</b></td>
+									</xsl:when>
+									<xsl:otherwise>
+									  <td colspan= "2" align="left"><b>Totaal:</b></td>
+									</xsl:otherwise>
+									</xsl:choose>
 							        <td align="left" class="bedrag"><b>&#8364; <xsl:value-of select="format-number($tot_kosten, '0,00', 'euro')"/></b></td>
 							        <td align="left"></td>
 								</tr>																

CUST/WEHK/xsl/cXML.xsl

@@ -47,8 +47,8 @@
 						</Total>
 						<ShipTo>
 							<xsl:element name="Address">
-								<!--xsl:attribute name="addressID"><xsl:value-of select="bedrijf/overeenkomst_nr"/>ship-to number???</xsl:attribute-->
-								<xsl:attribute name="addressID"><xsl:choose><xsl:when test="bedrijf/key='30341'">1654717</xsl:when></xsl:choose></xsl:attribute>
+								<!--xsl:attribute name="addressID">WEHK#34722 flexkenmerk debiteurennummer (key 222 en 223)</xsl:attribute-->
+								<xsl:attribute name="addressID"><xsl:choose><xsl:when test="bedrijf/key='30341'"><xsl:value-of select="substring-before(bestelling/kenmerk[@naam='debiteurennummer'],' ')"/></xsl:when></xsl:choose></xsl:attribute>
 								<Name xml:lang="NL"><xsl:value-of select="afleveradres/naam"/></Name>
 								<PostalAddress>
 									<DeliverTo><xsl:value-of select="bestelling/aanvrager/naam_full"/></DeliverTo>
@@ -124,3 +124,8 @@
 		</xsl:choose>
 	</xsl:template>
 </xsl:stylesheet>
+<!-- Stylus Studio meta-information - (c) 2004-2007. Progress Software Corporation. All rights reserved.
+<metaInformation>
+<scenarios ><scenario default="yes" name="Scenario1" userelativepaths="yes" externalpreview="no" url="..\..\..\TEMP\WEHK_files\bestelopdr1368_20151210135837.xml" htmlbaseurl="" outputurl="" processortype="internal" useresolver="yes" profilemode="0" profiledepth="" profilelength="" urlprofilexml="" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext="" validateoutput="no" validator="internal" customvalidator=""/></scenarios><MapperMetaTag><MapperInfo srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/><MapperBlockPosition></MapperBlockPosition><TemplateContext></TemplateContext><MapperFilter side="source"></MapperFilter></MapperMetaTag>
+</metaInformation>
+-->

UTILS/PutOrders/puo_sendhttp.js

@@ -47,7 +47,7 @@ function submitHTTP( p_connect
     //    Call XMLhttp.setOption(SXH_OPTION_IGNORE_SERVER_SSL_CERT_ERROR_FLAGS, secu)
     XMLhttp.setRequestHeader("Content-Type", "text/xml; charset=utf-8");
 
-    if (p_bedrijfadres.username != "")
+    if (p_bedrijfadres.username)
     {
       var base64 = new Base64Cls();
       XMLhttp.setRequestHeader("Authorization", "Basic " + base64.encode(p_bedrijfadres.username + ":" + p_bedrijfadres.password));