done #1966 @2.5

diff --git a/js/libs/fluidbook/special/wescosales.js b/js/libs/fluidbook/special/wescosales.js
index 8b79810c0e4d562ee4bf78df7077fdf40c9be751..4e6e7fca0e22375e2244d51ef68a39c80a0fdd6c 100644 (file)
--- a/js/libs/fluidbook/special/wescosales.js
+++ b/js/libs/fluidbook/special/wescosales.js
@@ -1,4 +1,5 @@
 var wsref = {};
+var normalizeRefCache = {};
 
 $(function () {
     $(fluidbook).on('fluidbookready', initWesco);
@@ -179,8 +180,21 @@ function wescoLinksReady() {
     });
 }
 
+function normalizeRef(oref) {
+    if (normalizeRefCache[oref] == null) {
+        ref = oref.toString().replace(/\s*/g, '');
+        if (ref.length < 5) {
+            var pad = "00000"
+            ref = pad.substring(0, pad.length - ref.length) + ref;
+        }
+        ref = ref.toString().substr(ref.toString().length - 5);
+        normalizeRefCache[oref] = ref;
+    }
+    return normalizeRefCache[oref];
+}
+
 function getWescoRef(ref) {
-    ref = ref.toString().substr(ref.toString().length - 5);
+    ref = normalizeRef(ref);
     if (wsref[ref] === undefined) {
         var res = {countries: {}, del: ''};
         for (var country in DATAS.basketReferences) {
@@ -189,11 +203,11 @@ function getWescoRef(ref) {
             var l = line0.length;
             for (var linenum in sheet) {
                 var line = sheet[linenum];
-                var r = line[0].toString();
-                r = r.substr(4);
+                var r = normalizeRef(line[0].toString());
                 if (r != ref) {
                     continue;
                 }
+
                 var d = [];
 
                 for (var i = 2; i < l; i++) {
@@ -204,6 +218,9 @@ function getWescoRef(ref) {
                     var ca = null;
                     var hasCA = false;
                     var colTitle = line0[i];
+                    if (colTitle == null) {
+                        continue;
+                    }
                     var qte = line[i];
                     if (colTitle.indexOf('Qté') == 0) {
                         colTitle = line0[i].substr(4);