Quellcode durchsuchen

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

Lee Morgan vor 5 Jahren
Ursprung
Commit
ab7ab07bff
2 geänderte Dateien mit 3 neuen und 7 gelöschten Zeilen
  1. 2 6
      controllers/orderData.js
  2. 1 1
      routes.js

+ 2 - 6
controllers/orderData.js

@@ -212,13 +212,9 @@ module.exports = {
     GET - Creates and sends a template xlsx for uploading orders
     */
     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("Order");

+ 1 - 1
routes.js

@@ -46,7 +46,7 @@ module.exports = function(app){
     app.post("/orders/get", session, orderData.getOrders);
     app.post("/order/create", session, orderData.createOrder);
     app.post("/orders/create/spreadsheet", session, upload.single("orders"), orderData.createFromSpreadsheet);
-    app.get("/orders/download/spreadsheet", orderData.spreadsheetTemplate);
+    app.get("/orders/download/spreadsheet", session, orderData.spreadsheetTemplate);
     app.delete("/order/:id", orderData.removeOrder);
 
     //Transactions