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

controllers/transactionData.js

@@ -112,11 +112,6 @@ module.exports = {
     },
 
     createFromSpreadsheet: function(req, res){
-        if(!req.session.user){
-            req.session.error = "MUST BE LOGGED IN TO DO THAT";
-            return res.redirect("/");
-        }
-
         //read file, get the correct sheet, create array from sheet
         let workbook = xlsx.readFile(req.file.path);
         fs.unlink(req.file.path, ()=>{});
@@ -164,12 +159,13 @@ module.exports = {
             }
         }
 
-        Merchant.findOne({_id: req.session.user})
+        res.locals.merchant
             .populate("recipes")
             .populate("inventory.ingredient")
+            .execPopulate()
             .then((merchant)=>{
                 let transaction = new Transaction({
-                    merchant: req.session.user,
+                    merchant: res.locals.merchant._id,
                     date: spreadsheetDate,
                     recipes: []
                 });

routes.js

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