Prechádzať zdrojové kódy

Finish all changes for updating merchant account data.
Just email at this point.

Lee Morgan 5 rokov pred
rodič
commit
b93bdace1b

+ 7 - 2
controllers/merchantData.js

@@ -180,8 +180,13 @@ module.exports = {
     },
     response = Merchant
     */
-    updateData: function(req, res){
+    updateData: async function(req, res){
         if(req.body.email !== res.locals.merchant.email){
+            let merchantCheck = await Merchant.findOne({email: req.body.email});
+            if(merchantCheck !== null){
+                return res.json("USER WITH THIS EMAIL ADDRESS ALREADY EXISTS");
+            }
+
             res.locals.merchant.email = req.body.email;
             res.locals.merchant.status.push("unverified");
 
@@ -194,7 +199,7 @@ module.exports = {
                     link: `${process.env.SITE}/verify/${res.locals.merchant._id}/${res.locals.merchant.verifyId}`
                 })
             };
-            mailgun.messages().send(mailgunData, (err, body)=>{console.log(err)});
+            mailgun.messages().send(mailgunData, (err, body)=>{});
         }
 
         res.locals.merchant.save()

+ 10 - 0
views/dashboardPage/bundle.js

@@ -264,6 +264,10 @@ class Merchant{
         return this._email;
     }
 
+    set email(email){
+        this._email = email;
+    }
+
     get pos(){
         return this._pos;
     }
@@ -2993,7 +2997,13 @@ let account = {
                 if(typeof(response) === "string"){
                     controller.createBanner(response, "error");
                 }else{
+                    controller.createBanner("DATA UPDATED", "success");
+                    if(response.email !== merchant.email){
+                        controller.createBanner("YOU MUST VALIDATE YOUR NEW EMAIL ADDRESS BEFORE YOU CAN LOG IN AGAIN", "alert");
+                    }
 
+                    merchant.email = response.email;
+                    document.getElementById("accountEmail").value = merchant.email;
                 }
             })
             .catch((err)=>{

+ 4 - 0
views/dashboardPage/js/classes/Merchant.js

@@ -148,6 +148,10 @@ class Merchant{
         return this._email;
     }
 
+    set email(email){
+        this._email = email;
+    }
+
     get pos(){
         return this._pos;
     }

+ 6 - 0
views/dashboardPage/js/strands/account.js

@@ -43,7 +43,13 @@ let account = {
                 if(typeof(response) === "string"){
                     controller.createBanner(response, "error");
                 }else{
+                    controller.createBanner("DATA UPDATED", "success");
+                    if(response.email !== merchant.email){
+                        controller.createBanner("YOU MUST VALIDATE YOUR NEW EMAIL ADDRESS BEFORE YOU CAN LOG IN AGAIN", "alert");
+                    }
 
+                    merchant.email = response.email;
+                    document.getElementById("accountEmail").value = merchant.email;
                 }
             })
             .catch((err)=>{