Forráskód Böngészése

Change order filtering to use new backend function for getting the orders.

Lee Morgan 5 éve
szülő
commit
053ad66f80

+ 1 - 1
controllers/orderData.js

@@ -31,7 +31,7 @@ module.exports = {
         if(req.body.ingredients.length === 0){
             match = {$exists: true};
         }else{  
-            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]));
             }
 

+ 7 - 15
views/dashboardPage/bundle.js

@@ -510,7 +510,7 @@ class Merchant{
     }
 
     setOrders(orders){
-        this._orders = orders
+        this._orders = orders;
     }
 
     removeOrder(order){
@@ -1325,7 +1325,7 @@ controller = {
             case "orders":
                 activeButton = document.getElementById("ordersBtn");
                 document.getElementById("ordersStrand").style.display = "flex";
-                orders.orders = data;
+                merchant.setOrders(data);
                 orders.display(Order);
                 break;
             case "transactions":
@@ -2689,15 +2689,13 @@ let orderFilter = {
 
     submit: function(Order){
         let data = {
-            startDate: document.getElementById("orderFilterDateFrom").valueAsDate,
-            endDate: document.getElementById("orderFilterDateTo").valueAsDate,
+            from: document.getElementById("orderFilterDateFrom").valueAsDate,
+            to: document.getElementById("orderFilterDateTo").valueAsDate,
             ingredients: []
         }
 
-        if(data.startDate >= data.endDate){
-            controller.createBanner("START DATE CANNOT BE AFTER END DATE", "error");
-            return;
-        }
+        data.from.setHours(0, 0, 0, 0);
+        data.to.setHours(0, 0, 0, 0);
 
         let ingredients = document.getElementById("orderFilterIngredients").children;
         for(let i = 0; i < ingredients.length; i++){
@@ -2706,16 +2704,10 @@ let orderFilter = {
             }
         }
 
-        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", {
+        fetch("/orders/get", {
             method: "post",
             headers: {
                 "Content-Type": "application/json;charset=utf-8"

+ 1 - 1
views/dashboardPage/js/classes/Merchant.js

@@ -394,7 +394,7 @@ class Merchant{
     }
 
     setOrders(orders){
-        this._orders = orders
+        this._orders = orders;
     }
 
     removeOrder(order){

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

@@ -78,7 +78,7 @@ controller = {
             case "orders":
                 activeButton = document.getElementById("ordersBtn");
                 document.getElementById("ordersStrand").style.display = "flex";
-                orders.orders = data;
+                merchant.setOrders(data);
                 orders.display(Order);
                 break;
             case "transactions":

+ 5 - 13
views/dashboardPage/js/sidebars/orderFilter.js

@@ -36,15 +36,13 @@ let orderFilter = {
 
     submit: function(Order){
         let data = {
-            startDate: document.getElementById("orderFilterDateFrom").valueAsDate,
-            endDate: document.getElementById("orderFilterDateTo").valueAsDate,
+            from: document.getElementById("orderFilterDateFrom").valueAsDate,
+            to: document.getElementById("orderFilterDateTo").valueAsDate,
             ingredients: []
         }
 
-        if(data.startDate >= data.endDate){
-            controller.createBanner("START DATE CANNOT BE AFTER END DATE", "error");
-            return;
-        }
+        data.from.setHours(0, 0, 0, 0);
+        data.to.setHours(0, 0, 0, 0);
 
         let ingredients = document.getElementById("orderFilterIngredients").children;
         for(let i = 0; i < ingredients.length; i++){
@@ -53,16 +51,10 @@ let orderFilter = {
             }
         }
 
-        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", {
+        fetch("/orders/get", {
             method: "post",
             headers: {
                 "Content-Type": "application/json;charset=utf-8"