Browse Source

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

Lee Morgan 5 years ago
parent
commit
2ac2e6ee8b
2 changed files with 3 additions and 7 deletions
  1. 2 6
      controllers/recipeData.js
  2. 1 1
      routes.js

+ 2 - 6
controllers/recipeData.js

@@ -227,13 +227,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("inventory.ingredient")
+            .execPopulate()
             .then((merchant)=>{
                 let workbook = xlsx.utils.book_new();
                 workbook.SheetNames.push("Recipes");

+ 1 - 1
routes.js

@@ -38,7 +38,7 @@ module.exports = function(app){
     app.put("/recipe/update", session, recipeData.updateRecipe);
     app.delete("/recipe/remove/:id", session, recipeData.removeRecipe);
     app.post("/recipes/create/spreadsheet", session, upload.single("recipes"), recipeData.createFromSpreadsheet);
-    app.get("/recipes/download/spreadsheet", recipeData.spreadsheetTemplate);
+    app.get("/recipes/download/spreadsheet", session, recipeData.spreadsheetTemplate);
 
     //Orders
     app.post("/orders/get", session, orderData.getOrders);