FCLT#54957 cust.xsl was al over naar custId + '.xsl', de backup code is nu ook weg en cust.xsl is hiermee volledig uitgefaseerd

svn path=/Website/trunk/; revision=40525

APPL/BES/DynArtikelInfo.asp

@@ -156,13 +156,7 @@ var JSON_Result = true;
         Response.End;
     }
 
-    var prs_ba_xsl = (oRs("prs_bedrijfadres_xsl").Value || "").toLowerCase();
-
-    if (prs_ba_xsl == "xsl/cust.xsl")
-        prs_ba_xsl = getCustXsl();
-    else if (prs_ba_xsl)// compatible houden
-        prs_ba_xsl = custpath + "/" + prs_ba_xsl;
-
+    var prs_ba_xsl = custpath + "/" + (oRs("prs_bedrijfadres_xsl").Value || "").toLowerCase();
     var res = getSupplierStock(oRs("bes_srtgroep_omschrijving").Value,
                                oRs("bes_srtdeel_nr").Value,
                                oRs("prs_bedrijfadres_url").Value,

APPL/Shared/Shared.inc

@@ -1711,21 +1711,13 @@ function determineCustomerId()
 function getCustXsl(prefix)
 {
     prefix = prefix || "";
-    var fso = Server.CreateObject("Scripting.FileSystemObject");
-    var xslFile = custpath + "/xsl/" + prefix + customerId + ".xsl";
-    if (!fso.FileExists(Server.MapPath(xslFile)))
-        xslFile = custpath + "/xsl/" + prefix + "cust.xsl";
-    return xslFile;
+    return custpath + "/xsl/" + prefix + customerId + ".xsl";
 }
 
 function getCustCss(prefix)
 {
     prefix = prefix || "";
-    var fso = Server.CreateObject("Scripting.FileSystemObject");
-    var cssFile = custpath + "/" + prefix + customerId + ".css";
-    if (!fso.FileExists(Server.MapPath(cssFile)))
-        cssFile = custpath + "/" + prefix + "cust.css";
-    return cssFile;
+    return custpath + "/" + prefix + customerId + ".css";
 }
 
 // Merk op dat we een beetje browser capabilities en device capabilities

UTILS/PutOrders/puo_allorders.js

@@ -170,7 +170,7 @@ function send1Order(Bedrijf_key, prs_loc_key, XMLnode, OpdrKey, ordernr, Sender,
     var sqlB = "SELECT prs_bedrijfadres_url, "
              + "       prs_bedrijfadres_encoding, "
              + "       NVL(prs_bedrijfadres_ordermode, 0) prs_bedrijfadres_ordermode, "
-             + "       NVL(replace(prs_bedrijfadres_xsl, '\\', '/'), 'xsl/cust.xsl') prs_bedrijfadres_xsl, "
+             + "       NVL(replace(prs_bedrijfadres_xsl, '\\', '/'), 'xsl/" + customerId + ".xsl') prs_bedrijfadres_xsl, "
              + "       prs_bedrijfadres_certificate, "
              + "       prs_bedrijfadres_attachfile,"
              + "       prs_bedrijfadres_flexfiles,"
@@ -378,16 +378,8 @@ function getXslNode(pXslFile, pNode)
   var fso = new ActiveXObject("Scripting.FileSystemObject");
   var custIDxsl = "xsl/" + customerId.toLowerCase() + ".xsl";
 
-  if (pXslFile && pXslFile == "xsl/cust.xsl")
-  {
-      var xslFile = custabspath + "/" + custIDxsl;
-      if (fso.FileExists(xslFile))
-          pXslFile = custIDxsl;
-  }
-
   var vFile = pXslFile;
-
-  if (vFile == "xsl/cust.xsl" || vFile == custIDxsl)
+  if (vFile == custIDxsl)
   {
     vFile = "xsl/" + pNode + ".xsl";
     if (!fso.FileExists(custabspath + "/" + vFile))
@@ -398,4 +390,3 @@ function getXslNode(pXslFile, pNode)
 
   return vFile;
 }
-

UTILS/PutOrders/puo_notifications.js

@@ -628,18 +628,10 @@ function notificationSYS(rec, params)
     return noti_sysed;
 }
 
-
-
 function getXslName(pNode)
 {
     var fso = new ActiveXObject("Scripting.FileSystemObject");
     var resxslsheet = S("puo_notificationxsl").toLowerCase() || "";
-    if (resxslsheet == "xsl/cust.xsl")
-    {
-        var custIDxsl = "xsl/" + customerId.toLowerCase() + ".xsl";
-        if (fso.FileExists(custabspath + "/" + custIDxsl))
-            resxslsheet = custIDxsl;
-    }
 
     if (pNode)
     {
@@ -652,4 +644,3 @@ function getXslName(pNode)
 
     return resxslsheet;
 }
-