Răsfoiți Sursa

Bug fix: conversions were not automatically showing for ingredients on the frontend.

Lee Morgan 4 ani în urmă
părinte
comite
537370e430

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
views/dashboardPage/bundle.js.map


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

@@ -256,6 +256,7 @@ class Merchant{
             inventoryItem.ingredient.id = ingredients[i].ingredient._id;
             inventoryItem.ingredient.name = ingredients[i].ingredient.name;
             inventoryItem.ingredient.unit = ingredients[i].ingredient.unit;
+            inventoryItem.ingredient.convert = ingredients[i].ingredient.convert;
             inventoryItem.ingredient.addIngredients(ingredients[i].ingredient.ingredients);
         }
     }

+ 0 - 3
views/dashboardPage/js/sidebars/editIngredient.js

@@ -105,16 +105,13 @@ let editIngredient = {
         //update current stock quantity
         let label = {};
         let newValue = 0;
-        let inputId = "";
         if(ingredient.ingredient.unit === "bottle"){
             label = document.getElementById("editSpecialLabel");
             label.innerText = `BOTTLE SIZE (${button.innerText})`;
-            inputId = "editIngQuantity";
             newValue = controller.unitMultiplier(controller.getBaseUnit(ingredient.ingredient.altUnit), button.innerText.toLowerCase()) / ingredient.ingredient.convert.toBottle;
         }else{
             label = document.getElementById("editIngQuantityLabel");
             label.innerText = `CURRENT STOCK (${button.innerText})`;
-            inputId = "editSpecialInput";
             newValue = ingredient.quantity * controller.unitMultiplier(ingredient.ingredient.unit, button.innerText.toLowerCase());
         }
         

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

@@ -138,7 +138,7 @@ module.exports = {
         for(let i = 0; i < divs.length; i++){
             data.ingredients.push({
                 ingredient: divs[i].ingredient.id,
-                quantity: divs[i].children[1].children[0].value,
+                quantity: controller.toBase(divs[i].children[1].children[0].value, divs[i].children[1].children[1].value),
                 unit: divs[i].children[1].children[1].value
             });
         }

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

@@ -5,7 +5,7 @@ let newTransaction = {
 
         let recipeList = document.getElementById("newTransAvailable");
         recipeList.children[0].onkeyup = ()=>{this.searchRecipes()};
-        while(recipeList.children.length > 1){
+        while(recipeList.children.length > 0){
             recipeList.removeChild(recipeList.firstChild);
         }
 

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff