diff --git a/src/main/java/com/example/clientproject/web/controllers/signUpAndIn/SignInController.java b/src/main/java/com/example/clientproject/web/controllers/signUpAndIn/SignInController.java index 2f482b51a6c142ebf6c3b72220f4d9f0e31d52a0..c6bda81ea1ee9aca20a09379b7db7f0d48593db8 100644 --- a/src/main/java/com/example/clientproject/web/controllers/signUpAndIn/SignInController.java +++ b/src/main/java/com/example/clientproject/web/controllers/signUpAndIn/SignInController.java @@ -78,7 +78,7 @@ public class SignInController { if(shopId == 1){ shopId = userPermissionsRepo.findByUserId(userId).get(1).getShop().getShopId(); } - return "redirect:/businessDetails?shopId="+shopId; + return "redirect:/redirect?url=businessDetails?shopId="+shopId; } List<Categories> categories = catRepo.findAll(); model.addAttribute("loggedInUser", user.get()); diff --git a/src/main/resources/static/js/registerbusiness.js b/src/main/resources/static/js/registerbusiness.js index 985522e31d1995d8b092995594e5e850f859549c..fb10ea50f7ff7c97023ce5b05507dec1f5b083e3 100644 --- a/src/main/resources/static/js/registerbusiness.js +++ b/src/main/resources/static/js/registerbusiness.js @@ -142,6 +142,11 @@ function progress(){ url.value = document.getElementById("business_register_url_prefix").value + url.value; document.getElementById("businessTags").value = tags; + if(!/^([0-9]+)$/.test(document.getElementById("earnings").value)){ + document.getElementById("business_register_amount_help") + .innerHTML = "Please enter a whole number" + return + } document.getElementById("businessForm").submit(); } @@ -239,6 +244,7 @@ function addTag(e){ inputField.value = "" } } + function removeTag(e){ let text = e.parentElement.children[0].innerHTML tags = tags.filter(tag =>{return tag!=text});