瀏覽代碼

Update ingredients.js to reflect changes in bottle data structure.

Lee Morgan 5 年之前
父節點
當前提交
68626290f4
共有 2 個文件被更改,包括 2 次插入10 次删除
  1. 1 5
      views/dashboardPage/bundle.js
  2. 1 5
      views/dashboardPage/js/strands/ingredients.js

+ 1 - 5
views/dashboardPage/bundle.js

@@ -3588,11 +3588,7 @@ let ingredients = {
                 ingredientDiv._name = ingredient.ingredient.name.toLowerCase();
                 ingredientDiv._unit = ingredient.ingredient.unit.toLowerCase();
                 
-                if(ingredient.ingredient.specialUnit === "bottle"){
-                    ingredientDiv.children[2].innerText = `${ingredient.quantity.toFixed(2)} BOTTLES`
-                }else{
-                    ingredientDiv.children[2].innerText = `${ingredient.quantity.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
-                }
+                ingredientDiv.children[2].innerText = `${ingredient.quantity.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
 
                 categoryDiv.children[1].appendChild(ingredientDiv);
                 this.ingredients.push(ingredientDiv);

+ 1 - 5
views/dashboardPage/js/strands/ingredients.js

@@ -47,11 +47,7 @@ let ingredients = {
                 ingredientDiv._name = ingredient.ingredient.name.toLowerCase();
                 ingredientDiv._unit = ingredient.ingredient.unit.toLowerCase();
                 
-                if(ingredient.ingredient.specialUnit === "bottle"){
-                    ingredientDiv.children[2].innerText = `${ingredient.quantity.toFixed(2)} BOTTLES`
-                }else{
-                    ingredientDiv.children[2].innerText = `${ingredient.quantity.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
-                }
+                ingredientDiv.children[2].innerText = `${ingredient.quantity.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
 
                 categoryDiv.children[1].appendChild(ingredientDiv);
                 this.ingredients.push(ingredientDiv);