|
@@ -1786,7 +1786,7 @@ let newOrder = {
|
|
|
data.ingredients.push({
|
|
data.ingredients.push({
|
|
|
ingredient: ingredients[i].ingredient.id,
|
|
ingredient: ingredients[i].ingredient.id,
|
|
|
quantity: controller.convertToMain(ingredients[i].ingredient.unit, quantity),
|
|
quantity: controller.convertToMain(ingredients[i].ingredient.unit, quantity),
|
|
|
- price: price
|
|
|
|
|
|
|
+ price: price * 100
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -2184,12 +2184,14 @@ let orders = {
|
|
|
let totalCost = 0;
|
|
let totalCost = 0;
|
|
|
|
|
|
|
|
for(let j = 0; j < merchant.orders[i].ingredients.length; j++){
|
|
for(let j = 0; j < merchant.orders[i].ingredients.length; j++){
|
|
|
- totalCost += merchant.orders[i].ingredients[j].quantity * merchant.orders[i].ingredients[j].price;
|
|
|
|
|
|
|
+ console.log(merchant.orders[i].ingredients[j].price);
|
|
|
|
|
+ totalCost += merchant.orders[i].ingredients[j].price;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
row.children[0].innerText = merchant.orders[i].name;
|
|
row.children[0].innerText = merchant.orders[i].name;
|
|
|
- row.children[1].innerText = `${merchant.orders[i].ingredients.length} items`;
|
|
|
|
|
|
|
+ row.children[1].innerText = `${merchant.orders[i].ingredients.length} ingredients`;
|
|
|
row.children[2].innerText = new Date(merchant.orders[i].date).toLocaleDateString("en-US");
|
|
row.children[2].innerText = new Date(merchant.orders[i].date).toLocaleDateString("en-US");
|
|
|
|
|
+ console.log(totalCost);
|
|
|
row.children[3].innerText = `$${(totalCost / 100).toFixed(2)}`;
|
|
row.children[3].innerText = `$${(totalCost / 100).toFixed(2)}`;
|
|
|
row.order = merchant.orders[i];
|
|
row.order = merchant.orders[i];
|
|
|
row.onclick = ()=>{controller.openSidebar("orderDetails", merchant.orders[i])};
|
|
row.onclick = ()=>{controller.openSidebar("orderDetails", merchant.orders[i])};
|