Finish updating everything on the ingredients strand

controllers/merchantData.js

@@ -4,6 +4,7 @@ const bcrypt = require("bcryptjs");
 const Merchant = require("../models/merchant");
 const Recipe = require("../models/recipe");
 const InventoryAdjustment = require("../models/inventoryAdjustment");
+const { update } = require("../models/merchant");
 
 module.exports = {
     /*
@@ -257,10 +258,10 @@ module.exports = {
                         date: Date.now(),
                         merchant: req.session.user,
                         ingredient: req.body[i].id,
-                        quantity: req.body[i].quantity
+                        quantity: req.body[i].quantity - updateIngredient.quantity
                     }));
 
-                    updateIngredient.quantity += req.body[i].quantity;
+                    updateIngredient.quantity = req.body[i].quantity;
                 }
 
                 merchant.save()

views/dashboardPage/Merchant.js

@@ -101,12 +101,11 @@ class Merchant{
     If ingredient doesn't exist, add it
     ingredients = {
         ingredient: Ingredient object,
-        quantity: change in quantity
+        quantity: new quantity
     }
     remove = set true if removing
     */
     editIngredients(ingredients, remove = false){
-        console.log(ingredients);
         for(let i = 0; i < ingredients.length; i++){
             let isNew = true;
             for(let j = 0; j < merchant.ingredients.length; j++){
@@ -114,7 +113,7 @@ class Merchant{
                     if(remove){
                         merchant.ingredients.splice(j, 1);
                     }else{
-                        merchant.ingredients[j].quantity += ingredients[i].quantity;
+                        merchant.ingredients[j].quantity = ingredients[i].quantity;
                     }
     
                     isNew = false;

views/dashboardPage/components/components.js

@@ -558,7 +558,6 @@ let ingredientDetailsComp = {
 
     display: function(ingredient, category){
         this.ingredient = ingredient;
-        console.log(ingredient);
 
         sidebar = document.querySelector("#ingredientDetails");
 
@@ -640,9 +639,10 @@ let ingredientDetailsComp = {
     },
 
     editSubmit: function(){
+        this.ingredient.quantity = Number(document.getElementById("ingredientInput").value);
         let data = [{
-            id: this.ingredient.id,
-            quantity: Number(document.querySelector("#ingredientInput").value)
+            id: this.ingredient.ingredient.id,
+            quantity: this.ingredient.quantity
         }];
 
         if(validator.ingredientQuantity(data[0].quantity)){
@@ -658,7 +658,7 @@ let ingredientDetailsComp = {
                     if(typeof(response) === "string"){
                         banner.createError(response);
                     }else{
-                        updateInventory(data);
+                        merchant.editIngredients([this.ingredient]);
                         banner.createNotification("Ingredient updated");
                     }
                 })