Commit graph

88 commits

Author SHA1 Message Date
Mathis Kral cb3a33651e Associate rentables with order and event explicitly
This closes #74

Co-authored-by: Theo Reichert <theo.reichert@mailbox.tu-dresden.de>
2023-12-07 17:06:43 +01:00
Mathis Kral 6dab8319a7 Fix broken cart cleanup
This fixes an error occuring when multiple employees were
added to the event before checkout.
2023-12-07 17:06:43 +01:00
Denis Natusch af09dd4a83
Add wage to employee 2023-12-05 10:14:15 +01:00
Denis Natusch 17a0e29dad
Add getAvailableStaffByJob to staff package
Co-authored-by: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
2023-12-05 10:14:15 +01:00
Simon Bruder 2dff2842fc
Adapt inventory to new catalog interface
This also does a major restructuring of the inventory mutate form.

Some things still are not as they should be, but it mostly works like
before. They can be fixed later.

Co-authored-by: Theo Reichert <theo.reichert@mailbox.tu-dresden.de>
2023-11-29 18:42:37 +01:00
Theo Reichert a4099f1de0
Fully adapt catalog to salespoint
Co-authored-by: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
2023-11-29 17:15:04 +01:00
Denis Natusch 0119b1cfa0
Add staff form and bind it to model
Closes #51
2023-11-29 12:25:29 +01:00
Simon Bruder c398c12592
Remove unused parameter in InventoryController
This was introduced in 6bd1c23e2d.
2023-11-27 18:45:38 +01:00
Denis Natusch 8a084b1f2e
Add test for form validator
The validator requires some changes to already existing tests.

Co-authored-by: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
2023-11-27 18:25:55 +01:00
Denis Natusch d7c4482200
Add form validator to users package
Closes #35
Closes #59
Closes #64
Closes #71

Co-authored-by: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
2023-11-27 18:11:07 +01:00
Simon Bruder 4f1ed1f134
Use proper terminology for Staff and Employee
Staff is plural. The singular should be employee or a synonym.

Co-authored-by: Mathis Kral <mathis_tiberius.kral@mailbox.tu-dresden.de>
2023-11-27 18:03:26 +01:00
Simon Bruder a90a8cc051
Simplify staff addition and update 2023-11-27 16:46:46 +01:00
Simon Bruder 14dc478e41
Unify naming of employee id 2023-11-27 16:46:46 +01:00
Simon Bruder 3ebedd4ad8
Remove unused attribute in staff listing 2023-11-27 16:46:45 +01:00
Eren Asker b4dfa72852
Unify adding staff
Co-authored-by: Denis Natusch <denis.natusch@mailbox.tu-dresden.de>
Co-authored-by: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
2023-11-27 16:46:44 +01:00
Eren Asker 403cc56ae0
Return Streamable in StaffManagement.findAll 2023-11-27 16:46:43 +01:00
Erik Hohlfeld 795ccc31d2 Base orderCatalog fully on salespoint 2023-11-26 21:49:55 +01:00
Erik Hohlfeld 8cc44c8121 Fix the remove methods to work again 2023-11-26 21:49:55 +01:00
Erik Hohlfeld eab8e3fee0 Add inventory based product selection 2023-11-26 21:49:55 +01:00
Erik Hohlfeld ddf4d7f645 Change CustomCatalogEntryRepository to extend CrudRepository 2023-11-26 21:49:55 +01:00
Mathis Kral f50fbb5ac4 Add basic order-staff-relation
Works on #73
This contains changes on multiple files to associate
multiple employees with an order and make customers
able to add employees to their order.
Because of SQL JPA things, this will not be final.
2023-11-26 20:34:23 +01:00
Mathis Kral d207386d1d Add staff functionality to CustomCart and CustomOrder
This works on #73
This also contains unit-tests for the CustomOrder.
2023-11-26 20:34:23 +01:00
Theo Reichert e83b6380be
Fix days in calendar and display of events per calendar day 2023-11-24 20:24:14 +01:00
Theo Reichert b836a38942
Add orderCalender 2023-11-24 20:24:13 +01:00
Simon Bruder 391ddaf03b
Create admin user only if it does not yet exist
Fixes #28
2023-11-24 20:21:17 +01:00
Mathis Kral a795fc99aa
Add simple get and post tests to order package
These tests mainly check the correct redirection and working input values,
but not many edge cases or any business logic.

Works on #48
2023-11-24 19:22:54 +01:00
Mathis Kral d012646537 Remove unused function 2023-11-24 18:53:46 +01:00
Paul Heimer f1f9539aae
Add error handling for inventory 2023-11-24 17:25:33 +01:00
Simon Bruder 6bd1c23e2d
Bind inventory mutate form to template
Co-authored-by: Paul Heimer <heimerp54@gmail.com>
2023-11-24 17:25:33 +01:00
Simon Bruder 695bc1d821
Do not use MonetaryAmount in inventory mutate form
While this creates duplicate code in the controller, it will vastly
simplify handling the form values.
2023-11-24 17:25:33 +01:00
Simon Bruder 58dae6532e
Make inventory only accessible for administrator
Fixes #33
2023-11-24 17:25:32 +01:00
Denis Natusch 2515c17de5
Let admin edit all fields of customer 2023-11-24 15:47:23 +01:00
Denis Natusch 79895d715b
Log out user properly after changing own username 2023-11-22 15:25:03 +01:00
Denis Natusch 6c8daa5287
Use enum for job types 2023-11-21 18:06:12 +01:00
Denis Natusch 5aeaf01e0e
Remove surname from staff
Co-authored-by: Simon Bruder <simon.bruder@mailbox.tu-dresden.de>
2023-11-21 18:06:12 +01:00
Denis Natusch 3ecdcffbcd
Simplifiy user id 2023-11-21 18:06:11 +01:00
Erik Hohlfeld 317af597f5
Make orderCatalog use OrderType 2023-11-21 18:04:56 +01:00
Denis Natusch 6759841742
Implement staff with salespoint
Co-authored-by: Eren Asker <eren.asker@mailbox.tu-dresden.de>
2023-11-21 18:04:54 +01:00
Denis Natusch eccff8d2b0
Refuse nullbyte as password
Closes #26
2023-11-21 18:04:54 +01:00
Mathis Kral 27fdc3ef02
Add additional functionality to order package
This adds improved product removal from cart, changeable order time and
nice colors to order list.

Works on #38
2023-11-21 18:04:16 +01:00
Denis Natusch ea24c27d6e
Add more attributes to user/customer
Closes #42
2023-11-21 18:04:15 +01:00
Mathis Kral a8a67a9626
Update basics of order package to salespoint
This removes the calendar, as it currently conflicts with the salespoint
architecture.

Works on #38
2023-11-21 18:04:14 +01:00
Denis Natusch 7dfc7f66f9
Remove unused model parameter from UserController
Closes #21
2023-11-21 18:00:36 +01:00
Denis Natusch 11f00f52f0
Remove AuthenticationManagement
Closes #20
2023-11-21 18:00:36 +01:00
Denis Natusch 9eeb25a281
Make only customers able to delete their own account 2023-11-21 18:00:33 +01:00
Denis Natusch cbb9710371
Logout user when changing the username 2023-11-21 18:00:32 +01:00
Denis Natusch 02551aa802
Make only enabled customers able to be removed 2023-11-21 18:00:32 +01:00
Theo Reichert bb5e89a83d
Update cell in calender links to orders filteredByDay 2023-11-21 18:00:32 +01:00
Theo Reichert 9b71926c58
Fix calender() order in wrong calender day/cell 2023-11-21 18:00:31 +01:00
Mathis Kral c7c8a0126a
Add improved checkout 2023-11-21 18:00:31 +01:00