Quellcode durchsuchen

Merchant and owner are now delete if there is an error during registration.

Lee Morgan vor 5 Jahren
Ursprung
Commit
3987028074
2 geänderte Dateien mit 6 neuen und 79 gelöschten Zeilen
  1. 2 1
      controllers/squareData.js
  2. 4 78
      views/dashboardPage/js/modal.js

+ 2 - 1
controllers/squareData.js

@@ -1,7 +1,6 @@
 const Owner = require("../models/owner.js");
 const Merchant = require("../models/merchant.js");
 const Recipe = require("../models/recipe.js");
-const Transaction = require("../models/transaction.js");
 
 const helper = require("./helper.js");
 
@@ -149,6 +148,8 @@ module.exports = {
                 }else{
                     req.session.error = "ERROR: UNABLE TO CREATE NEW USER";
                 }
+                Merchant.deleteOne({_id: merchant._id});
+                Owner.deleteOne({_id: owner._id});
                 return res.redirect("/");
             });
     },

+ 4 - 78
views/dashboardPage/js/modal.js

@@ -30,12 +30,13 @@ let modal = {
             .then((response)=>{
                 if(typeof(response) === "string"){
                     controller.createBanner(response, "error");
+                }else{
+                    controller.createBanner("THANK YOU FOR YOUR INPUT", "success");
+                    controller.closeModal();
                 }
-                controller.createBanner("THANK YOU FOR YOUR INPUT", "success");
-                controller.closeModal();
             })
             .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";
@@ -46,7 +47,6 @@ let modal = {
         let form = document.getElementById("modalNewMerchant");
         form.style.display = "flex";
         form.onsubmit = ()=>{this.submitNewMerchantNone()};
-        document.getElementById("newMerchantSquareButton").onclick = ()=>{this.submitNewMerchantSquare()};
     },
 
     submitNewMerchantNone(){
@@ -94,80 +94,6 @@ let modal = {
             .finally(()=>{
                 loader.style.display = "none";
             });
-    },
-
-    submitNewMerchantSquare: function(){
-        let loader = document.getElementById("loaderContainer");
-        loader.style.display = "flex";
-
-        fetch("/square/locations")
-            .then(response => response.json())
-            .then((response)=>{
-                if(typeof(response) === "string"){
-                    controller.createBanner(response, "error");
-                }else{
-                    controller.closeModal();
-                    controller.openModal("squareLocations", response);
-                }
-            })
-            .catch((err)=>{
-                controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
-            })
-            .finally(()=>{
-                loader.style.display = "none";
-            });
-    },
-
-    squareLocations: function(locations){
-        document.getElementById("modalSquareLocations").style.display = "flex";
-        document.getElementById("squareLocationsCancel").onclick = ()=>{controller.closeModal()};
-        let container = document.getElementById("squareLocationsButtons");
-
-        while(container.children.length > 0){
-            container.removeChild(container.firstChild);
-        }
-
-        for(let i = 0; i < locations.length; i++){
-            let button = document.createElement("button");
-            button.innerText = locations[i].name;
-            button.classList.add("button");
-            button.onclick = ()=>{this.createSquareLocation(locations[i].id)};
-            container.appendChild(button);
-        }
-    },
-
-    createSquareLocation: function(id){
-        let loader = document.getElementById("loaderContainer");
-        loader.style.display = "flex";
-
-        fetch(`/square/add/${id}`)
-            .then(response => response.json())
-            .then((response)=>{
-                if(typeof(response) === "string"){
-                    controller.createBanner(response, "error");
-                }else{
-                    window.merchant = new Merchant(
-                        response[1].name,
-                        response[0].email,
-                        response[1].pos,
-                        response[1].inventory,
-                        response[1].recipes,
-                        [],
-                        response[0]
-                    );
-
-                    state.updateMerchant();
-                    controller.closeModal();
-                    controller.openStrand("home");
-                    controller.createBanner(`NEW MERCHANT, "${response[1].name}", CREATED`, "success");
-                }
-            })
-            .catch((err)=>{
-                controller.createBanner("SOMETHING WENT WRONG. PLEASE REFRESH THE PAGE", "error");
-            })
-            .finally(()=>{
-                loader.style.display = "none";
-            });
     }
 };