Browse Source

Bug fix: sub-ingredients were double adding in the backend.
Bug fix: frontend was not updating when sub-ingredients were changed.

Lee Morgan 5 năm trước cách đây
mục cha
commit
be5bc7aeac

+ 1 - 8
controllers/ingredientData.js

@@ -106,14 +106,7 @@ module.exports = {
                             let ingredient = res.locals.merchant.inventory[j].ingredient;
                             stack = [ingredient];
                             if(ingredient._id.toString() === req.body.id) throw "circular";
-                            if(isCircular(ingredient, response[0]) === false){
-                                response[0].ingredients.push({
-                                    ingredient: req.body.ingredients[i].ingredient,
-                                    quantity: req.body.ingredients[i].quantity
-                                });
-                            }else{
-                                throw "circular";
-                            }
+                            if(isCircular(ingredient, response[0]) === true) throw "circular";
                             break;
                         }
                     }

+ 0 - 1
controllers/recipeData.js

@@ -212,7 +212,6 @@ module.exports = {
                 return res.json(recipes);
             })
             .catch((err)=>{
-                console.log(err);
                 if(typeof(err) === "string"){
                     return res.json(err);
                 }

+ 2 - 1
views/dashboardPage/js/classes/Merchant.js

@@ -205,9 +205,10 @@ class Merchant{
                 defaultUnit,
                 this,
                 ingredient.unitSize,
-                ingredient.ingredients
             );
 
+            createdIngredient.replaceIngredients(ingredient.ingredients);
+
             const merchantIngredient = new MerchantIngredient(createdIngredient, quantity);
             this._ingredients.push(merchantIngredient);
         }

+ 1 - 1
views/dashboardPage/js/sidebars/editIngredient.js

@@ -92,7 +92,7 @@ let editIngredient = {
             let subIngredient = ingredient.ingredient.subIngredients[i];
             data.ingredients.push({
                 ingredient: subIngredient.ingredient.id,
-                quantity: subIngredient.quantity 
+                quantity: subIngredient.quantity
             });
         }