Update the orderDetails sidebar

views/dashboardPage/Merchant.js

@@ -58,7 +58,7 @@ class Transaction{
 }
 
 class Order{
-    constructor(name, date, ingredients, parent){        
+    constructor(name, date, ingredients, parent){
         this.name = name;
         this.date = new Date(date);
         this.ingredients = [];

views/dashboardPage/components/components.js

@@ -365,8 +365,8 @@ let orderDetailsComp = {
 
         document.querySelector("#removeOrderBtn").onclick = ()=>{this.remove(order._id)};
 
-        document.querySelector("#orderDetails h1").innerText = order.orderId || order._id;
-        document.querySelector("#orderDetails h3").innerText = new Date(order.date).toLocaleDateString("en-US");
+        document.querySelector("#orderDetails h1").innerText = order.name;
+        document.querySelector("#orderDetails h3").innerText = order.date.toLocaleDateString("en-US");
 
         let ingredientList = document.querySelector("#orderIngredients");
         while(ingredientList.children.length > 0){
@@ -380,13 +380,7 @@ let orderDetailsComp = {
             let price = (order.ingredients[i].quantity * order.ingredients[i].price) / 100;
             grandTotal += price;
 
-            for(let j = 0; j < merchant.inventory.length; j++){
-                if(order.ingredients[i].ingredient === merchant.inventory[j].ingredient._id){
-                    ingredient.children[0].innerText = `${merchant.inventory[j].ingredient.name}: ${order.ingredients[i].quantity}`;
-                    break;
-                }
-            }
-
+            ingredient.children[0].innerText = order.ingredients[i].ingredient.name;
             ingredient.children[1].innerText = `$${(order.ingredients[i].price / 100).toFixed(2)}`;
             ingredient.children[2].innerText = price.toFixed(2);
 

views/dashboardPage/controller.js

@@ -23,43 +23,6 @@ let changeStrand = (name)=>{
     window[`${name}Obj`].display();
 }
 
-/*
-Updates an order in the front end
-Can create, edit or remove
-order = {
-    _id: id of recipe,
-    name: name of recipe,
-    price: price of recipe,
-    ingredients: [
-        ingredient: id of ingredient,
-        quantity: quantity of ingredient
-    ]
-}
-*/
-let updateOrders = (order, remove = false)=>{
-    let isNew = true;
-
-    for(let i = 0; i < orders.length; i++){
-        if(orders[i]._id === order._id){
-            if(remove){
-                orders.splice(i, 1);
-            }else{
-                orders[i] = order;
-            }
-
-            isNew = false;
-        }
-    }
-
-    if(isNew){
-        orders.push(order);
-    }
-
-    ordersStrandObj.isPopulated = false;
-    ordersStrandObj.display();
-    closeSidebar();
-}
-
 //Close any open sidebar
 let closeSidebar = ()=>{
     let sidebar = document.querySelector("#sidebarDiv");

views/dashboardPage/orders.js

@@ -17,10 +17,11 @@ window.ordersStrandObj = {
                         banner.createError(response);
                     }else{
                         let newOrders = [];
+                        console.log(response);
                         for(let i = 0; i < response.length; i++){
                             newOrders.push(new Order(
-                                response[i].name,
-                                new Date(response.date),
+                                response[i].orderId,
+                                response[i].date,
                                 response[i].ingredients,
                                 merchant
                             ));