Browse Source

Update getOrders function to work with new session id.

Lee Morgan 5 năm trước cách đây
mục cha
commit
e631e761bd
2 tập tin đã thay đổi với 2 bổ sung6 xóa
  1. 1 5
      controllers/orderData.js
  2. 1 1
      routes.js

+ 1 - 5
controllers/orderData.js

@@ -19,10 +19,6 @@ module.exports = {
     }
     */
     getOrders: function(req, res){
-        if(!req.session.user){
-            req.session.error = "MUST BE LOGGED IN TO DO THAT";
-            return res.redirect("/");
-        }
         let from = new Date(req.body.from);
         let to = new Date(req.body.to);
 
@@ -46,7 +42,7 @@ module.exports = {
 
         Order.aggregate([
             {$match:{
-                merchant: new ObjectId(req.session.user),
+                merchant: new ObjectId(res.locals.merchant._id),
                 date: {
                     $gte: from,
                     $lt: to

+ 1 - 1
routes.js

@@ -43,7 +43,7 @@ module.exports = function(app){
     app.get("/recipes/download/spreadsheet", recipeData.spreadsheetTemplate);
 
     //Orders
-    app.post("/orders/get", orderData.getOrders);
+    app.post("/orders/get", session, orderData.getOrders);
     app.post("/order/create", orderData.createOrder);
     app.post("/orders/create/spreadsheet", upload.single("orders"), orderData.createFromSpreadsheet);
     app.get("/orders/download/spreadsheet", orderData.spreadsheetTemplate);