Lee Morgan 6 роки тому
батько
коміт
59c7cf14b3

+ 1 - 1
controllers/orderData.js

@@ -57,7 +57,7 @@ module.exports = {
         }
 
         let objectifiedIngredients = [];
-        for(let i = 0; i < req.body.ingredients; i++){
+        for(let i = 0; i < req.body.ingredients.length; i++){
             objectifiedIngredients.push(new ObjectId(req.body.ingredients[i]));
         }
         let startDate = new Date(req.body.startDate);

+ 0 - 1
controllers/renderer.js

@@ -185,7 +185,6 @@ module.exports = {
                     .catch((err)=>{});
             })
             .catch((err)=>{
-                console.log(err);
                 req.session.error = "ERROR: UNABLE TO RETRIEVE USER DATA";
                 return res.redirect("/");
             });

+ 1 - 3
controllers/transactionData.js

@@ -42,9 +42,7 @@ module.exports = {
                     }
                 }
             }},
-            {$sort: {
-                date: 1
-            }}
+            {$sort: {date: 1}}
         ])
             .then((transactions)=>{
                 return res.json(transactions);

+ 11 - 7
views/dashboardPage/orders.js

@@ -1,5 +1,3 @@
-const { quantity } = require("../../controllers/validator");
-
 window.ordersStrandObj = {
     isFetched: false,
 
@@ -114,7 +112,13 @@ window.ordersStrandObj = {
             }
         }
 
-        let loader = document.getElementById("loarderContainer");
+        if(data.ingredients.length === 0){
+            for(let i = 0; i < merchant.ingredients.length; i++){
+                data.ingredients.push(merchant.ingredients[i].ingredient.id);
+            }
+        }
+
+        let loader = document.getElementById("loaderContainer");
         loader.style.display = "flex";
 
         fetch("/order", {
@@ -140,13 +144,13 @@ window.ordersStrandObj = {
                         let order = template.cloneNode(true);
                         let cost = 0;
                         for(let j = 0; j < response[i].ingredients.length; j++){
-                            cost += (response[i].ingredients[j].price / 100) * quantity;
+                            cost += (response[i].ingredients[j].price / 100) * response[i].ingredients[j].quantity;
                         }
 
                         order.children[0].innerText = response[i].name,
-                        order.children[1].innerText = response[i].ingredients.length;
-                        order.children[2].innerText = response[i].date.toLocaleDateString();
-                        order.children[3].innerText = cost;
+                        order.children[1].innerText = `${response[i].ingredients.length} items`;
+                        order.children[2].innerText = new Date(response[i].date).toLocaleDateString();
+                        order.children[3].innerText = `$${cost.toFixed(2)}`;
                         orderList.appendChild(order);
                     }
                 }

+ 6 - 0
views/dashboardPage/transactions.js

@@ -90,6 +90,12 @@ window.transactionsStrandObj = {
             }
         }
 
+        if(data.recipes.length === 0){
+            for(let i = 0; i < merchant.recipes.length; i++){
+                data.recipes.push(merchant.recipes[i].id);
+            }
+        }
+
         let loader = document.getElementById("loaderContainer");
         loader.style.display = "flex";