wait #6685 @2

diff --git a/Michelin/script.js b/Michelin/script.js
index 29e4205ef752cac011c488cca12c42fb17afa969..d30291ecb53d3c578d44a5a04e2f2f1c028e1fc4 100644 (file)
--- a/Michelin/script.js
+++ b/Michelin/script.js
@@ -169,12 +169,15 @@ function noResult() {
 function getValuesOfProductList(list, key, sort) {
     var array = [];
     var map = {};
+
+    let types = {}
+
     $.each(list, function (k, v) {
         var value = v[key];
         if (sort) {
             value = parseFloat(value);
             if (isNaN(value)) {
-                return;
+                value = v[key];
             }
         }
         map[value] = v[key];
@@ -185,7 +188,18 @@ function getValuesOfProductList(list, key, sort) {
 
     if (sort) {
         array = array.sort(function (a, b) {
-            return a - b;
+            let aIsNumber = !Number.isNaN(parseFloat(a));
+            let bIsNumber = !Number.isNaN(parseFloat(b));
+            if (aIsNumber && bIsNumber) {
+                return a - b;
+            }
+            if (aIsNumber && !bIsNumber) {
+                return -1;
+            }
+            if (!aIsNumber && bIsNumber) {
+                return 1;
+            }
+            return a.localeCompare(b);
         });
     }
 
@@ -263,7 +277,7 @@ function updateSteps() {
 
 function createSelect(name, options, placeholder) {
     if (placeholder === undefined) {
-        placeholder = getTranslation('Select')+'...';
+        placeholder = getTranslation('Select') + '...';
     }
     let value = FORMDATA[name];
     var s = $('<select name="' + name + '"><option value="">' + placeholder + '</option></select>');