Bug fix: new ingredients for bottles did not convert unitSize to base.

controllers/helper.js

@@ -184,6 +184,8 @@ module.exports = {
     },
 
     convertQuantityToBaseUnit: function(quantity, unit){
+        console.log(quantity);
+        console.log(unit);
         switch(unit){
             case "kg": return quantity * 1000;
             case "oz": return quantity * 28.3495;

controllers/ingredientData.js

@@ -28,8 +28,12 @@ module.exports = {
             return res.redirect("/");
         }
 
-        let newIngredient = {};
-        newIngredient = new Ingredient(req.body.ingredient);
+        let newIngredient = {...req.body};
+        if(req.body.defaultUnit === "bottle"){
+            newIngredient.ingredient.unitSize = helper.convertQuantityToBaseUnit(newIngredient.ingredient.unitSize, newIngredient.ingredient.unitType);
+        }
+
+        newIngredient = new Ingredient(newIngredient.ingredient);
 
         let ingredientPromise = newIngredient.save();
         let merchantPromise = Merchant.findOne({_id: req.session.user});

views/dashboardPage/bundle.js

@@ -1975,7 +1975,7 @@ let newIngredient = {
         //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 = document.getElementById("bottleSize").value;
+            newIngredient.ingredient.unitSize = parseFloat(document.getElementById("bottleSize").value);
         }
     
         let loader = document.getElementById("loaderContainer");

views/dashboardPage/js/sidebars/newIngredient.js

@@ -43,7 +43,7 @@ let newIngredient = {
         //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 = document.getElementById("bottleSize").value;
+            newIngredient.ingredient.unitSize = parseFloat(document.getElementById("bottleSize").value);
         }
     
         let loader = document.getElementById("loaderContainer");