فهرست منبع

Update ingredients strand and ingredient details sidebar to display bottles as the unit

Lee Morgan 5 سال پیش
والد
کامیت
e99234ffae
3فایلهای تغییر یافته به همراه8 افزوده شده و 6 حذف شده
  1. 4 3
      views/dashboardPage/bundle.js
  2. 2 1
      views/dashboardPage/js/ingredientDetails.js
  3. 2 2
      views/dashboardPage/js/ingredients.js

+ 4 - 3
views/dashboardPage/bundle.js

@@ -1475,10 +1475,11 @@ let ingredientDetails = {
         let stockInput = document.getElementById("ingredientInput");
         let stockDisplay = document.getElementById("ingredientStock");
         stockInput.value = "";
-        if(ingredient.ingredient.unitSize){
+        if(ingredient.ingredient.specialUnit = "bottle"){
             let quantity = ingredient.ingredient.convert(ingredient.quantity);
 
             stockDisplay.innerText = `${quantity.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
+            stockDisplay.innerText = `${(ingredient.quantity / ingredient.ingredient.unitSize).toFixed(2)} BOTTLES`;
             stockInput.placeholder = quantity.toFixed(2);
         }else{
             stockDisplay.innerText = `${ingredient.ingredient.convert(ingredient.quantity).toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
@@ -1769,9 +1770,9 @@ let ingredients = {
                 ingredientDiv._name = ingredient.ingredient.name.toLowerCase();
                 ingredientDiv._unit = ingredient.ingredient.unit.toLowerCase();
 
+                
                 if(ingredient.ingredient.specialUnit === "bottle"){
-                    const showQuantity = ingredient.ingredient.convert(ingredient.quantity);
-                    ingredientDiv.children[2].innerText = `${showQuantity.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
+                    ingredientDiv.children[2].innerText = `${(ingredient.quantity / ingredient.ingredient.unitSize).toFixed(2)} BOTTLES`
                 }else{
                     ingredientDiv.children[2].innerText = `${ingredient.ingredient.convert(ingredient.quantity).toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
                 }

+ 2 - 1
views/dashboardPage/js/ingredientDetails.js

@@ -21,10 +21,11 @@ let ingredientDetails = {
         let stockInput = document.getElementById("ingredientInput");
         let stockDisplay = document.getElementById("ingredientStock");
         stockInput.value = "";
-        if(ingredient.ingredient.unitSize){
+        if(ingredient.ingredient.specialUnit = "bottle"){
             let quantity = ingredient.ingredient.convert(ingredient.quantity);
 
             stockDisplay.innerText = `${quantity.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
+            stockDisplay.innerText = `${(ingredient.quantity / ingredient.ingredient.unitSize).toFixed(2)} BOTTLES`;
             stockInput.placeholder = quantity.toFixed(2);
         }else{
             stockDisplay.innerText = `${ingredient.ingredient.convert(ingredient.quantity).toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;

+ 2 - 2
views/dashboardPage/js/ingredients.js

@@ -50,9 +50,9 @@ let ingredients = {
                 ingredientDiv._name = ingredient.ingredient.name.toLowerCase();
                 ingredientDiv._unit = ingredient.ingredient.unit.toLowerCase();
 
+                
                 if(ingredient.ingredient.specialUnit === "bottle"){
-                    const showQuantity = ingredient.ingredient.convert(ingredient.quantity);
-                    ingredientDiv.children[2].innerText = `${showQuantity.toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
+                    ingredientDiv.children[2].innerText = `${(ingredient.quantity / ingredient.ingredient.unitSize).toFixed(2)} BOTTLES`
                 }else{
                     ingredientDiv.children[2].innerText = `${ingredient.ingredient.convert(ingredient.quantity).toFixed(2)} ${ingredient.ingredient.unit.toUpperCase()}`;
                 }