Ver código fonte

Bug fix: other locations were showing up as undefined in settings after creating a square merchant.
Bug fix: owner name displayed "undefined" in settings after deleting a merchant.

Lee Morgan 5 anos atrás
pai
commit
a694a7335a

+ 2 - 1
controllers/merchantData.js

@@ -373,7 +373,8 @@ module.exports = {
                 let responseOwner = {
                     _id: res.locals.owner._id,
                     email: res.locals.owner.email,
-                    merchants: res.locals.owner.merchants.slice(1)
+                    merchants: res.locals.owner.merchants.slice(1),
+                    name: res.locals.owner.name
                 };
 
                 response[0].owner = undefined;

+ 1 - 1
controllers/renderer.js

@@ -122,7 +122,7 @@ module.exports = {
                     if(res.locals.owner.merchants[i]._id.toString() === res.locals.merchant._id.toString()){
                         res.locals.owner.merchants.splice(i, 1);
                         break;
-                    } 
+                    }
                 }
 
                 return res.render("dashboardPage/dashboard", {owner: res.locals.owner, merchant: res.locals.merchant, transactions: transactions});

+ 1 - 1
controllers/squareData.js

@@ -321,7 +321,7 @@ module.exports = {
                 let recipes = helper.createRecipesFromSquare(response[1].data.objects, merchant._id);
                 merchant.recipes = recipes;
 
-                let populateOwner = res.locals.owner.populate("merchants", "name");
+                let populateOwner = res.locals.owner.populate("merchants", "name").execPopulate();
 
                 return Promise.all([Recipe.create(recipes), res.locals.owner.save(), merchant.save(), populateOwner]);
             })