Quellcode durchsuchen

Did some things.

Lee Morgan vor 5 Jahren
Ursprung
Commit
e1285203fb

+ 2 - 2
controllers/ingredientData.js

@@ -24,7 +24,7 @@ module.exports = {
     createIngredient: function(req, res){
         let newIngredient = {...req.body};
         if(req.body.defaultUnit === "bottle"){
-            newIngredient.ingredient.unitSize = helper.convertQuantityToBaseUnit(newIngredient.ingredient.unitSize, newIngredient.ingredient.unitType);
+            newIngredient.ingredient.unitSize = newIngredient.ingredient.unitSize;
         }
 
         newIngredient = new Ingredient(newIngredient.ingredient);
@@ -37,7 +37,7 @@ module.exports = {
                     defaultUnit: req.body.defaultUnit
                 }
 
-                newIngredient.quantity = helper.convertQuantityToBaseUnit(req.body.quantity, req.body.defaultUnit);
+                newIngredient.quantity = req.body.quantity, req.body.defaultUnit;
 
                 res.locals.merchant.inventory.push(newIngredient);
 

+ 4 - 3
views/dashboardPage/js/sidebars/newIngredient.js

@@ -36,15 +36,16 @@ let newIngredient = {
                 category: document.getElementById("newIngCategory").value,
                 unitType: options[unitSelector.selectedIndex].getAttribute("type")
             },
-            quantity: quantityValue,
+            quantity: controller.baseUnit(quantityValue, unit),
             defaultUnit: unit
         }
 
         //Change the ingredient if it is a special unit type (ie "bottle")
         if(unit === "bottle"){
             newIngredient.ingredient.unitType = document.getElementById("bottleUnits").value;
-            newIngredient.ingredient.unitSize = parseFloat(document.getElementById("bottleSize").value);
+            newIngredient.ingredient.unitSize = controller.baseUnit(parseFloat(document.getElementById("bottleSize").value), unit);
         }
+        console.log(newIngredient);
     
         let loader = document.getElementById("loaderContainer");
         loader.style.display = "flex";
@@ -52,7 +53,7 @@ let newIngredient = {
         fetch("/ingredients/create", {
             method: "POST",
             headers: {
-                "Content-Type": "application/json;charset=utf-8"
+                "Content-Type": "application/json"
             },
             body: JSON.stringify(newIngredient)
         })