Skip to content
Snippets Groups Projects
Commit 7aad4cef authored by Seb Barnard's avatar Seb Barnard :speech_balloon:
Browse files

Added validation to income input

parent 397ce8b1
No related branches found
No related tags found
3 merge requests!114LoggingService service class, new method to add a log to the "Logs" table when...,!104Branch Update,!103Issue thirty four
...@@ -78,7 +78,7 @@ public class SignInController { ...@@ -78,7 +78,7 @@ public class SignInController {
if(shopId == 1){ if(shopId == 1){
shopId = userPermissionsRepo.findByUserId(userId).get(1).getShop().getShopId(); 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(); List<Categories> categories = catRepo.findAll();
model.addAttribute("loggedInUser", user.get()); model.addAttribute("loggedInUser", user.get());
......
...@@ -142,6 +142,11 @@ function progress(){ ...@@ -142,6 +142,11 @@ function progress(){
url.value = document.getElementById("business_register_url_prefix").value + url.value; url.value = document.getElementById("business_register_url_prefix").value + url.value;
document.getElementById("businessTags").value = tags; 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(); document.getElementById("businessForm").submit();
} }
...@@ -239,6 +244,7 @@ function addTag(e){ ...@@ -239,6 +244,7 @@ function addTag(e){
inputField.value = "" inputField.value = ""
} }
} }
function removeTag(e){ function removeTag(e){
let text = e.parentElement.children[0].innerHTML let text = e.parentElement.children[0].innerHTML
tags = tags.filter(tag =>{return tag!=text}); tags = tags.filter(tag =>{return tag!=text});
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment