Can now edit loyalty points for customer on andriod, and pets now have breed dropdown

This commit is contained in:
Alex
2026-04-13 18:25:11 -06:00
parent 53a11449ac
commit 40955b616b
13 changed files with 143 additions and 24 deletions

View File

@@ -39,6 +39,8 @@ public class UserRequest {
private Boolean active = true;
private Integer loyaltyPoints;
public String getUsername() {
return username;
}
@@ -127,6 +129,14 @@ public class UserRequest {
this.active = active;
}
public Integer getLoyaltyPoints() {
return loyaltyPoints;
}
public void setLoyaltyPoints(Integer loyaltyPoints) {
this.loyaltyPoints = loyaltyPoints;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;

View File

@@ -75,6 +75,9 @@ public class UserService {
user.setStaffRole(trimToNull(request.getStaffRole()));
user.setPrimaryStore(resolveStore(request.getPrimaryStoreId()));
user.setActive(request.getActive() != null ? request.getActive() : true);
if (request.getLoyaltyPoints() != null) {
user.setLoyaltyPoints(request.getLoyaltyPoints());
}
validateUniquePhone(user.getPhone(), null);
@@ -111,6 +114,9 @@ public class UserService {
user.setStaffRole(trimToNull(request.getStaffRole()));
user.setPrimaryStore(resolveStore(request.getPrimaryStoreId()));
user.setActive(request.getActive() != null ? request.getActive() : true);
if (request.getLoyaltyPoints() != null) {
user.setLoyaltyPoints(request.getLoyaltyPoints());
}
if (invalidateToken) {
user.setTokenVersion(user.getTokenVersion() + 1);
}