Issue thirty

See merge request !105

Issue thirty four

See merge request !103

# Conflicts:
#   src/main/java/com/example/clientproject/web/controllers/BusinessDetails.java

Quick fix for broken entities "Logs" and "Events" due to duplicate attributes

See merge request !102

Fixing the data script changes made

See merge request !100

Branch Update

See merge request !99

# Conflicts:
#   src/main/resources/database/schema.sql

LoggingService service class, new method to add a log to the "Logs" table when given required data, new and altered methods in "JWTUtils" to allow for new "Super Admin" functionality required

added buttons to increase/decrease stamp position

See merge request !98

Added better example data to table populator script

See merge request !97

Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago

Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>

merge into develop

See merge request !96

Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago

Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>

Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago

increase/decrease buttons only show up if user is shop admin, and added reward code pop-up upon claim

Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>

Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago

Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>