Browse Source

Update orders for new handling of price

Lee Morgan 5 years ago
parent
commit
df59ea0e74

+ 5 - 3
views/dashboardPage/bundle.js

@@ -1786,7 +1786,7 @@ let newOrder = {
             data.ingredients.push({
                 ingredient: ingredients[i].ingredient.id,
                 quantity: controller.convertToMain(ingredients[i].ingredient.unit, quantity),
-                price: price
+                price: price * 100
             });
         }
 
@@ -2184,12 +2184,14 @@ let orders = {
             let totalCost = 0;
             
             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[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");
+            console.log(totalCost);
             row.children[3].innerText = `$${(totalCost / 100).toFixed(2)}`;
             row.order = merchant.orders[i];
             row.onclick = ()=>{controller.openSidebar("orderDetails", merchant.orders[i])};

+ 1 - 1
views/dashboardPage/js/newOrder.js

@@ -75,7 +75,7 @@ let newOrder = {
             data.ingredients.push({
                 ingredient: ingredients[i].ingredient.id,
                 quantity: controller.convertToMain(ingredients[i].ingredient.unit, quantity),
-                price: price
+                price: price * 100
             });
         }
 

+ 4 - 2
views/dashboardPage/js/orders.js

@@ -79,12 +79,14 @@ let orders = {
             let totalCost = 0;
             
             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[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");
+            console.log(totalCost);
             row.children[3].innerText = `$${(totalCost / 100).toFixed(2)}`;
             row.order = merchant.orders[i];
             row.onclick = ()=>{controller.openSidebar("orderDetails", merchant.orders[i])};