瀏覽代碼

Update spreadsheetTemplate (transactions) to work with new session id.

Lee Morgan 5 年之前
父節點
當前提交
18d25c3b39
共有 2 個文件被更改,包括 3 次插入7 次删除
  1. 2 6
      controllers/transactionData.js
  2. 1 1
      routes.js

+ 2 - 6
controllers/transactionData.js

@@ -233,13 +233,9 @@ module.exports = {
     },
 
     spreadsheetTemplate: function(req, res){
-        if(!req.session.user){
-            req.session.error = "MUST BE LOGGED IN TO DO THAT";
-            return res.redirect("/");
-        }
-
-        Merchant.findOne({_id: req.session.user})
+        res.locals.merchant
             .populate("recipes")
+            .execPopulate()
             .then((merchant)=>{
                 let workbook = xlsx.utils.book_new();
                 workbook.SheetNames.push("Transaction");

+ 1 - 1
routes.js

@@ -51,7 +51,7 @@ module.exports = function(app){
     app.post("/transaction", session, transactionData.getTransactions);
     app.post("/transaction/create", session, transactionData.createTransaction);
     app.post("/transactions/create/spreadsheet", session, upload.single("transactions"), transactionData.createFromSpreadsheet);
-    app.get("/transactions/download/spreadsheet", transactionData.spreadsheetTemplate);
+    app.get("/transactions/download/spreadsheet", session, transactionData.spreadsheetTemplate);
     app.delete("/transaction/:id", transactionData.remove);
     app.get("/populatesometransactions", transactionData.populate);