refactor et renommage de variable

reception/static/js/reception_produits.js

@@ -95,24 +95,28 @@ function select_product_from_bc(barcode) {
                 });
             }
            
-            if(scannedProduct.rule == 'weight')
-                foundProduct.data.product_qty = scannedProduct.qty;
-
-            else if(scannedProduct.rule == 'price_to_weight'){
-                openModal($('#templates #modal_confirm_price_to_weight').html(), price_to_weight_is_wrong, 'Non', false, true, price_to_weight_confirmed_callback(foundProduct, scannedProduct));
-                setupPopUpBtnStyle(scannedProduct);
-            }
+            if(foundProduct.data !== null){
+                if(scannedProduct.rule === 'weight'){
+                    foundProduct.data.product_qty = scannedProduct.qty;
+                }
 
+                else if(scannedProduct.rule === 'price_to_weight'){
+                    openModal($('#templates #modal_confirm_price_to_weight').html(), price_to_weight_is_wrong, 'Non', false, true, price_to_weight_confirmed_callback(foundProduct, scannedProduct));
+                    setupPopUpBtnStyle(scannedProduct);
+                }
 
-            if(foundProduct.data !== null && !(scannedProduct.rule == 'price_to_weight')){
-                if(scannedProduct.rule == 'weight')
-                    editProductInfo(foundProduct.data, foundProduct.data.product_qty);
-                else
-                    setLineEdition(foundProduct.data);
+                if(scannedProduct.rule !== 'price_to_weight'){
+                    if(scannedProduct.rule === 'weight'){
+                        editProductInfo(foundProduct.data, foundProduct.data.product_qty);
+                    }
+                    else{
+                        setLineEdition(foundProduct.data);
+                    }
 
-                if (foundProduct.place === 'to_process') {
-                    let row = table_to_process.row($('#'+foundProduct.data.product_id[0]));
-                    remove_from_toProcess(row, foundProduct.data);
+                    if (foundProduct.place === 'to_process') {
+                        let row = table_to_process.row($('#'+foundProduct.data.product_id[0]));
+                        remove_from_toProcess(row, foundProduct.data);
+                    }
                 }
             }
         }
@@ -170,21 +174,21 @@ function update_distant_orders() {
         });
 }
 
-//TODO not the cleanest way to manage the callback, needs improvement
-//TODO too much repeating code, needs refactor 
-function price_to_weight_confirmed_callback (found, p){
-
+function price_to_weight_confirmed_callback (foundProduct, scannedProduct){
     return function price_to_weight_confirmed(){
-        if(priceToWeightIsCorrect)
-            found.data.product_qty = p.qty;
-        else
-            found.data.product_qty = Number((p.value/document.getElementById("new_price_to_weight").value).toFixed(3)); 
-
-        if (found.data !== null) {
-            editProductInfo(found.data, found.data.product_qty);
-            if (found.place === 'to_process') {
-                let row = table_to_process.row($('#'+found.data.product_id[0]));
-                remove_from_toProcess(row, found.data);
+        if(priceToWeightIsCorrect){
+            foundProduct.data.product_qty = scannedProduct.qty;
+        }
+        else{
+            //TODO il n'y a aucun controle sur l'input à corriger
+            foundProduct.data.product_qty = Number((scannedProduct.value/document.getElementById("new_price_to_weight").value).toFixed(3)); 
+        }
+
+        if (foundProduct.data !== null) {
+            editProductInfo(foundProduct.data, foundProduct.data.product_qty);
+            if (foundProduct.place === 'to_process') {
+                let row = table_to_process.row($('#'+foundProduct.data.product_id[0]));
+                remove_from_toProcess(row, foundProduct.data);
             }
             resetPopUpButtons();
         }