Преглед изворни кода

Update "most used ingredients" to display correct quantities.

Lee Morgan пре 5 година
родитељ
комит
3794970a4a

+ 2 - 2
views/dashboardPage/js/classes/Ingredient.js

@@ -129,7 +129,7 @@ class Ingredient{
         return [];
     }
 
-    getUnitCost(){
+    getUnitCost(isDisplay = false){
         let totalCost = 0;
         let quantity = 0;
 
@@ -138,7 +138,7 @@ class Ingredient{
                 let ingredient = this._parent.orders[i].ingredients[j];
 
                 if(ingredient.ingredient === this){
-                    totalCost += ingredient.quantity * ingredient.pricePerUnit;
+                    totalCost += ingredient.quantity * (isDisplay === true) ?  ingredient.pricePerUnit : ingredient.pricePerBaseUnit;
                     quantity += ingredient.quantity;
                     break;
                 }

+ 4 - 0
views/dashboardPage/js/classes/Order.js

@@ -58,6 +58,10 @@ class OrderIngredient{
         }
     }
 
+    get pricePerBaseUnit(){
+        return this._pricePerUnit;
+    }
+
     cost(){
         return (this._quantity * this._pricePerUnit) / 100;
     }

+ 4 - 4
views/dashboardPage/js/strands/home.js

@@ -52,13 +52,13 @@ let home = {
         from.setDate(from.getDate() - 30);
 
         for(let i = 0; i < merchant.inventory.length; i++){
-            let unitCost = merchant.inventory[i].ingredient.getUnitCost();
+            let unitCost = merchant.inventory[i].ingredient.getUnitCost(false);
             let totalCost = unitCost * merchant.inventory[i].getSoldQuantity(from, new Date());
             
             ingredients.push({
                 inventoryItem: merchant.inventory[i],
-                unitCost: unitCost,
-                totalCost: totalCost
+                unitCost: merchant.inventory[i].ingredient.getUnitCost(true),
+                totalCost: totalCost / 100
             });
         }
 
@@ -86,7 +86,7 @@ let home = {
             item.appendChild(leftText);
 
             let centerText = document.createElement("td");
-            centerText.innerText = `$${ingredients[i].unitCost.toFixed(2)}`;
+            centerText.innerText = `$${ingredients[i].unitCost.toFixed(2)}/${ingredients[i].inventoryItem.ingredient.unit.toUpperCase()}`;
             item.appendChild(centerText);
 
             let rightText = document.createElement("td");