wip #4740 @1

diff --git a/js/libs/fluidbook/special/wescosales.js b/js/libs/fluidbook/special/wescosales.js
index 72b86ba8f99a69f54a52202f414f4207a90c71a6..8c850c20606edfd76806e7924fd813d10f68615f 100644 (file)
--- a/js/libs/fluidbook/special/wescosales.js
+++ b/js/libs/fluidbook/special/wescosales.js
@@ -17,12 +17,13 @@ function initWescoNav() {
     console.log('initWescoNav');
     var select = $('<select id="wescosalesselect"></select>');
     $.each(fluidbook.settings.basketReferences, function (k, v) {
+        if (k === 'Groupes' || k === 'Kits') {
+            return;
+        }
         select.append('<option value="' + k + '">' + k + '</option>');
     });
     $("header nav").after('<div id="wescosalesselector"><span>VENTES</span> : </div>');
 
-    console.log(select);
-
     $("#wescosalesselector").css({
         position: "absolute"
     }).append(select);
@@ -185,19 +186,25 @@ function getAllRefs() {
         var res = [];
         for (var country in fluidbook.settings.basketReferences) {
             var sheet = fluidbook.settings.basketReferences[country];
-            for (var linenum in sheet) {
-                var line = sheet[linenum];
-                if (line[0] === null) {
-                    continue;
-                }
+            if (country === 'Kits') {
 
-                try {
-                    var r = normalizeRef(line[0].toString());
-                    if (res.indexOf(r) === -1) {
-                        res.push(r);
+            } else if (country === 'Groupes') {
+
+            } else {
+                for (var linenum in sheet) {
+                    var line = sheet[linenum];
+                    if (line[0] === null) {
+                        continue;
+                    }
+
+                    try {
+                        var r = normalizeRef(line[0].toString());
+                        if (res.indexOf(r) === -1) {
+                            res.push(r);
+                        }
+                    } catch (e) {
+                        continue;
                     }
-                } catch (e) {
-                    continue;
                 }
             }
             break;
@@ -333,57 +340,63 @@ function getWescoRef(ref) {
         var res = {countries: {}, del: ''};
         for (var country in fluidbook.settings.basketReferences) {
             var sheet = fluidbook.settings.basketReferences[country];
-            var line0 = sheet[0];
-            var l = line0.length;
-            for (var linenum in sheet) {
-                var line = sheet[linenum];
-                if (line[0] === null) {
-                    continue;
-                }
-                var r = normalizeRef(line[0].toString());
-                if (r != ref) {
-                    continue;
-                }
+            if (country === 'Kits') {
 
-                var d = [];
+            } else if (country === 'Groupes') {
 
-                for (var i = 2; i < l; i++) {
-                    if (line[i] == line[1]) {
+            } else {
+                var line0 = sheet[0];
+                var l = line0.length;
+                for (var linenum in sheet) {
+                    var line = sheet[linenum];
+                    if (line[0] === null) {
                         continue;
                     }
-
-                    var ca = null;
-                    var hasCA = false;
-                    var colTitle = line0[i];
-                    if (colTitle == null) {
+                    var r = normalizeRef(line[0].toString());
+                    if (r != ref) {
                         continue;
                     }
-                    var qte = line[i];
-                    if (colTitle.indexOf('Qté') == 0) {
-                        colTitle = line0[i].substr(4);
-                    }
-
-                    if (line0[i + 1] != undefined && line0[i].indexOf('Qté') == 0 && line0[i + 1].toString().indexOf('CA ' + colTitle) != -1) {
-                        qte = line[i];
-                        ca = line[i + 1];
-                        hasCA = true;
-                    }
-                    d.push([colTitle, qte, ca]);
 
-                    if (String(line0[i]).toLocaleLowerCase().indexOf('supp') >= 0 && line[i] !== null && String(line[i]) != '') {
-                        res.del = line[i];
-                    }
-                    if (String(line0[i]).toLocaleLowerCase().indexOf('export') >= 0 && line[i] !== null && String(line[i]) != '') {
-                        res.export = line[i];
-                    }
-                    if (hasCA) {
-                        i++;
+                    var d = [];
+
+                    for (var i = 2; i < l; i++) {
+                        if (line[i] == line[1]) {
+                            continue;
+                        }
+
+                        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);
+                        }
+
+                        if (line0[i + 1] != undefined && line0[i].indexOf('Qté') == 0 && line0[i + 1].toString().indexOf('CA ' + colTitle) != -1) {
+                            qte = line[i];
+                            ca = line[i + 1];
+                            hasCA = true;
+                        }
+                        d.push([colTitle, qte, ca]);
+
+                        if (String(line0[i]).toLocaleLowerCase().indexOf('supp') >= 0 && line[i] !== null && String(line[i]) != '') {
+                            res.del = line[i];
+                        }
+                        if (String(line0[i]).toLocaleLowerCase().indexOf('export') >= 0 && line[i] !== null && String(line[i]) != '') {
+                            res.export = line[i];
+                        }
+                        if (hasCA) {
+                            i++;
+                        }
                     }
+                    res.ref = ref;
+                    res.countries[country] = d;
+                    res.title = line[1];
+                    break;
                 }
-                res.ref = ref;
-                res.countries[country] = d;
-                res.title = line[1];
-                break;
             }
         }
         wsref[ref] = res;