Преглед изворни кода

Unify some of the error messages so that they are not so scatter shot.

Lee Morgan пре 5 година
родитељ
комит
b96a8a3300

+ 2 - 2
controllers/helper.js

@@ -87,7 +87,7 @@ module.exports = {
                 return Transaction.create(transactions);
             })
             .catch((err)=>{
-                req.session.error = "ERROR: UNABLE TO RETRIEVE DATA FROM CLOVER";
+                req.session.error = "ERROR: UNABLE TO RETRIEVE DATA";
                 return res.redirect("/");
             });
     },
@@ -179,7 +179,7 @@ module.exports = {
                 return transactions;
             })
             .catch((err)=>{
-                return "ERROR: UNABLE TO UPDATE TRANSACTION DATA";
+                return "ERROR: UNABLE TO UPDATE DATA";
             });
     },
 

+ 2 - 2
controllers/ingredientData.js

@@ -112,7 +112,7 @@ module.exports = {
                 if(err.name === "ValidationError"){
                     return res.json(err.errors[Object.keys(err.errors)[0]].properties.message);
                 }
-                return res.json("ERROR: UNABLE TO UPDATE THE INGREDIENT");
+                return res.json("ERROR: UNABLE TO UPDATE DATA");
             });
     },
 
@@ -228,7 +228,7 @@ module.exports = {
                 if(err.name === "ValidationError"){
                     return res.json(err.errors[Object.keys(err.errors)[0]].properties.message);
                 }
-                return res.json("ERROR: UNABLE TO RETRIEVE USER DATA");
+                return res.json("ERROR: UNABLE TO RETRIEVE DATA");
             });
     }
 }

+ 1 - 1
controllers/merchantData.js

@@ -153,7 +153,7 @@ module.exports = {
 
                     return merchant.save();
                 }else{
-                    req.session.error = "ERROR: UNABLE TO RETRIEVE USER DATA";
+                    req.session.error = "ERROR: UNABLE TO RETRIEVE DATA";
                     return res.redirect("/");
                 }
             })

+ 1 - 1
controllers/orderData.js

@@ -54,7 +54,7 @@ module.exports = {
                 return res.json(orders);
             })
             .catch((err)=>{
-                return res.json("ERROR: UNABLE TO RETRIEVE YOUR ORDERS");
+                return res.json("ERROR: UNABLE TO RETRIEVE DATA");
             });
     },
 

+ 1 - 1
controllers/otherData.js

@@ -30,7 +30,7 @@ module.exports = {
                 }
             })
             .catch((err)=>{
-                req.session.error = "ERROR: UNABLE TO RETRIEVE USER DATA";
+                req.session.error = "ERROR: UNABLE TO RETRIEVE DATA";
 
                 return res.redirect("/");
             });

+ 2 - 2
controllers/recipeData.js

@@ -84,7 +84,7 @@ module.exports = {
                 if(err.name === "ValidationError"){
                     return res.json(err.errors[Object.keys(err.errors)[0]].properties.message);
                 }
-                return res.json("ERROR: UNABLE TO UPDATE RECIPE");
+                return res.json("ERROR: UNABLE TO UPDATE DATA");
             });
     },
 
@@ -112,7 +112,7 @@ module.exports = {
                 if(err.name === "ValidationError"){
                     return res.json(err.errors[Object.keys(err.errors)[0]].properties.message);
                 }
-                return res.json("ERROR: UNABLE TO RETRIEVE USER DATA");
+                return res.json("ERROR: UNABLE TO RETRIEVE DATA");
             });
     },
 

+ 1 - 1
controllers/renderer.js

@@ -80,7 +80,7 @@ module.exports = {
                     req.session.error = "PLEASE VERIFY YOUR EMAIL ADDRESS";
                     return res.redirect(`/verify/email/${merchant2._id}`);
                 }
-                req.session.error = "ERROR: UNABLE TO RETRIEVE USER DATA";
+                req.session.error = "ERROR: UNABLE TO RETRIEVE DATA";
                 return res.redirect("/");
             });
     },

+ 1 - 1
controllers/transactionData.js

@@ -50,7 +50,7 @@ module.exports = {
                 return res.json(transactions);
             })
             .catch((err)=>{
-                return res.json("ERROR: UNABLE TO RETRIEVE YOUR TRANSACTIONS");
+                return res.json("ERROR: UNABLE TO RETRIEVE DATA");
             });
     },
 

+ 6 - 6
views/dashboardPage/bundle.js

@@ -1579,7 +1579,7 @@ let editIngredient = {
             }
         })
         .catch((err)=>{
-            controller.createBanner("SOMETHING WENT WRONG, PLEASE REFRESH THE PAGE", "error");
+            controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
         })
         .finally(()=>{
             loader.style.display = "none";
@@ -1710,7 +1710,7 @@ let editRecipe = {
                 }
             })
             .catch((err)=>{
-                controller.createBanner("SOMETHING WENT WRONG, PLEASE REFRESH THE PAGE", "error");
+                controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
             })
             .finally(()=>{
                 loader.style.display = "none";
@@ -1916,7 +1916,7 @@ let newIngredient = {
                 
             })
             .catch((err)=>{
-                controller.createBanner("SOMETHING WENT WRONG.  TRY REFRESHING THE PAGE", "error");
+                controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
             })
             .finally(()=>{
                 loader.style.display = "none";
@@ -2025,7 +2025,7 @@ let newOrder = {
                 }
             })
             .catch((err)=>{
-                controller.createBanner("SOMETHING WENT WRONG, PLEASE REFRESH THE PAGE", "error");
+                controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
             })
             .finally(()=>{
                 loader.style.display = "none";
@@ -3642,7 +3642,7 @@ let home = {
                     }
                 })
                 .catch((err)=>{
-                    controller.createBanner("SOMETHING WENT WRONG.  PLEASE REFRESH THE PAGE", "error");
+                    controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
                 })
                 .finally(()=>{
                     loader.style.display = "none";
@@ -3953,7 +3953,7 @@ let recipeBook = {
                 }
             })
             .catch((err)=>{
-                controller.createBanner("SOMETHING WENT WRONG.  PLEASE REFRESH THE PAGE", "error");
+                controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
             })
             .finally(()=>{
                 loader.style.display = "none";

+ 1 - 1
views/dashboardPage/js/sidebars/editIngredient.js

@@ -111,7 +111,7 @@ let editIngredient = {
             }
         })
         .catch((err)=>{
-            controller.createBanner("SOMETHING WENT WRONG, PLEASE REFRESH THE PAGE", "error");
+            controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
         })
         .finally(()=>{
             loader.style.display = "none";

+ 1 - 1
views/dashboardPage/js/sidebars/editRecipe.js

@@ -119,7 +119,7 @@ let editRecipe = {
                 }
             })
             .catch((err)=>{
-                controller.createBanner("SOMETHING WENT WRONG, PLEASE REFRESH THE PAGE", "error");
+                controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
             })
             .finally(()=>{
                 loader.style.display = "none";

+ 1 - 1
views/dashboardPage/js/sidebars/newIngredient.js

@@ -105,7 +105,7 @@ let newIngredient = {
                 
             })
             .catch((err)=>{
-                controller.createBanner("SOMETHING WENT WRONG.  TRY REFRESHING THE PAGE", "error");
+                controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
             })
             .finally(()=>{
                 loader.style.display = "none";

+ 1 - 1
views/dashboardPage/js/sidebars/newOrder.js

@@ -97,7 +97,7 @@ let newOrder = {
                 }
             })
             .catch((err)=>{
-                controller.createBanner("SOMETHING WENT WRONG, PLEASE REFRESH THE PAGE", "error");
+                controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
             })
             .finally(()=>{
                 loader.style.display = "none";

+ 1 - 1
views/dashboardPage/js/strands/home.js

@@ -270,7 +270,7 @@ let home = {
                     }
                 })
                 .catch((err)=>{
-                    controller.createBanner("SOMETHING WENT WRONG.  PLEASE REFRESH THE PAGE", "error");
+                    controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
                 })
                 .finally(()=>{
                     loader.style.display = "none";

+ 1 - 1
views/dashboardPage/js/strands/recipeBook.js

@@ -105,7 +105,7 @@ let recipeBook = {
                 }
             })
             .catch((err)=>{
-                controller.createBanner("SOMETHING WENT WRONG.  PLEASE REFRESH THE PAGE", "error");
+                controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
             })
             .finally(()=>{
                 loader.style.display = "none";