ソースを参照

Removed old code from filterTransactions.js that was sending all recipes of none were chosen.
Bug fix: getTransactions function on the backend was returning no functions if none were chosen.

Lee Morgan 5 年 前
コミット
859d462b4d

+ 5 - 2
controllers/transactionData.js

@@ -21,14 +21,15 @@ module.exports = {
             req.session.error = "MUST BE LOGGED IN TO DO THAT";
             return res.redirect("/");
         }
+        console.log(req.body);
 
         let from = new Date(req.body.from);
         let to = new Date(req.body.to);
 
         let objectifiedRecipes = [];
         let query = {};
-        if(req.body.length === 0){
-            query = {$exists: false};
+        if(req.body.recipes.length === 0){
+            query = {$ne: false};
         }else{
             for(let i = 0; i < req.body.recipes.length; i++){
                 objectifiedRecipes.push(new ObjectId(req.body.recipes[i]));
@@ -43,6 +44,8 @@ module.exports = {
             }
         }
 
+        console.log(query);
+
         Transaction.aggregate([
             {$match: {
                 merchant: ObjectId(req.session.user),

+ 0 - 1
routes.js

@@ -55,7 +55,6 @@ module.exports = function(app){
     app.post("/transactions/create/spreadsheet", upload.single("transactions"), transactionData.createFromSpreadsheet);
     app.get("/transactions/download/spreadsheet", transactionData.spreadsheetTemplate);
     app.delete("/transaction/:id", transactionData.remove);
-    // app.get("/transactions/:from/:to", transactionData.getTransactionsByDate);
     app.get("/populatesometransactions", transactionData.populate);
 
     //Other

+ 19 - 7
views/dashboardPage/bundle.js

@@ -2944,12 +2944,6 @@ let transactionFilter = {
             }
         }
 
-        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";
 
@@ -3062,15 +3056,30 @@ let analytics = {
     },
 
     getData: function(from, to, Transaction){
+        console.log(from);
+        console.log(to);
+        let data = {
+            from: from,
+            to: to,
+            recipes: []
+        }
+        
         let loader = document.getElementById("loaderContainer");
         loader.style.display = "flex";
 
-        return fetch(`/transactions/${from.toISOString()}/${to.toISOString()}`)
+        return fetch("/transaction", {
+            method: "post",
+            headers: {
+                "Content-Type": "application/json;charset=utf-8"
+            },
+            body: JSON.stringify(data)
+        })
             .then(response => response.json())
             .then((response)=>{
                 if(typeof(response) === "string"){
                     controller.createBanner(response, "error");
                 }else{
+                    console.log(response);
                     this.transactionsByDate = [];
 
                     let startOfDay = new Date(from.getTime());
@@ -3103,9 +3112,12 @@ let analytics = {
                         startOfDay.setDate(startOfDay.getDate() + 1);
                         endOfDay.setDate(endOfDay.getDate() + 1);
                     }
+
+                    console.log(this.transactionsByDate);
                 }
             })
             .catch((err)=>{
+                console.log(err);
                 controller.createBanner("UNABLE TO UPDATE THE PAGE", "error");
             })
             .finally(()=>{

+ 0 - 6
views/dashboardPage/js/sidebars/transactionFilter.js

@@ -58,12 +58,6 @@ let transactionFilter = {
             }
         }
 
-        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";
 

+ 19 - 1
views/dashboardPage/js/strands/analytics.js

@@ -69,15 +69,30 @@ let analytics = {
     },
 
     getData: function(from, to, Transaction){
+        console.log(from);
+        console.log(to);
+        let data = {
+            from: from,
+            to: to,
+            recipes: []
+        }
+        
         let loader = document.getElementById("loaderContainer");
         loader.style.display = "flex";
 
-        return fetch(`/transactions/${from.toISOString()}/${to.toISOString()}`)
+        return fetch("/transaction", {
+            method: "post",
+            headers: {
+                "Content-Type": "application/json;charset=utf-8"
+            },
+            body: JSON.stringify(data)
+        })
             .then(response => response.json())
             .then((response)=>{
                 if(typeof(response) === "string"){
                     controller.createBanner(response, "error");
                 }else{
+                    console.log(response);
                     this.transactionsByDate = [];
 
                     let startOfDay = new Date(from.getTime());
@@ -110,9 +125,12 @@ let analytics = {
                         startOfDay.setDate(startOfDay.getDate() + 1);
                         endOfDay.setDate(endOfDay.getDate() + 1);
                     }
+
+                    console.log(this.transactionsByDate);
                 }
             })
             .catch((err)=>{
+                console.log(err);
                 controller.createBanner("UNABLE TO UPDATE THE PAGE", "error");
             })
             .finally(()=>{