ソースを参照

Debug switching between merchants.

Lee Morgan 5 年 前
コミット
a9763af455

+ 1 - 2
controllers/merchantData.js

@@ -17,7 +17,7 @@ module.exports = {
     */
     getMerchant: function(req, res){
         let owner = Owner.findOne({"session.sessionId": req.session.owner}).populate("merchants", "name");
-        let merchant = Merchant.findOne({_id: req.params.id});
+        let merchant = Merchant.findOne({_id: req.params.id}).populate("inventory.ingredient").populate("recipes");
         let transactions = Transaction.find({merchant: req.params.id});
 
         Promise.all([owner, merchant, transactions])
@@ -44,7 +44,6 @@ module.exports = {
                 return res.json([responseOwner, response[1], response[2]]);
             })
             .catch((err)=>{
-                console.log(err);
                 if(err === "unfound") return res.json("UNABLE TO FIND THAT MERCHANT");
                 if(err === "permissions") return res.json("YOU DO NOT HAVE PERMISSION TO DO THAT");
                 return res.json("ERROR: UNABLE TO RETRIEVE DATA");

+ 1 - 0
views/dashboardPage/js/dashboard.js

@@ -336,6 +336,7 @@ window.state = {
         ingredients.populateByProperty();
         analytics.displayIngredient();
         analytics.displayRecipe();
+        home.drawRevenueGraph();
     },
 
     updateOrders: function(){

+ 4 - 1
views/dashboardPage/js/strands/account.js

@@ -12,6 +12,10 @@ let account = {
         let container = document.getElementById("settingsMerchants");
         let template = document.getElementById("locationDiv").content.children[0];
 
+        while(container.children.length > 0){
+            container.removeChild(container.firstChild);
+        }
+
         for(let i = 0; i < merchant.owner.merchants.length; i++){
             let div = template.cloneNode(true);
             div.children[0].innerText = merchant.owner.merchants[i].name;
@@ -138,7 +142,6 @@ let account = {
                 }
             })
             .catch((err)=>{
-                console.log(err);
                 controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
             })
             .finally(()=>{

+ 2 - 0
views/dashboardPage/js/strands/home.js

@@ -59,6 +59,8 @@ let home = {
             }
         }
 
+        console.log(dates);
+        console.log(revenue);
         const trace = {
             x: dates,
             y: revenue,