mirrors/swt23w23
1
0
Fork 0
mirror of https://github.com/st-tu-dresden-praktikum/swt23w23 synced 2024-06-30 21:03:42 +02:00
Code Issues Packages Projects Releases Wiki Activity
363 commits 56 branches 0 tags 16 MiB
Commit graph

47 commits

Author SHA1 Message Date
Theo Reichert c1e561821c Replace order id in template with order type 2024-01-19 23:36:24 +01:00
Erik Hohlfeld 5aefd4e05f Filter and distinguish products in orderCatalog 2024-01-19 19:00:51 +01:00
Mathis Kral e6542dce7a Add missing order tests 2024-01-18 09:29:06 +01:00
Mathis Kral 8929868895 Fix checkout bug where items got deleted 
This works on #145.
Before this, if an item got removed out of the inventory by the
admin and the user tried to checkout, the application crashed.
 2024-01-18 09:29:06 +01:00
Mathis Kral fd76f700c9 Fix warning for deprecated constructor 2024-01-16 20:00:39 +01:00
Denis Natusch f808c2497d Remove employee if associated with order 2024-01-15 19:25:20 +01:00
Theo Reichert ff8bbdca15
Resolve some intentionality issues 2024-01-12 15:25:18 +01:00
Theo Reichert d27c1958d7
Introduce new lines to reduce code smells 2024-01-12 15:25:18 +01:00
Mathis Kral 2ccc9fcdfb Update /allOrders/{day} to work with status-filter 
This works on #115

Co-authored-by: Theo Reichert <theo.reichert@mailbox.tu-dresden.de>
 2024-01-09 14:04:11 +01:00
Theo Reichert ea78ec93b7 Add working filtration of orders for admin 2024-01-09 14:04:11 +01:00
Mathis Kral f961071265 Add employee query to order controller 
This was simply forgotten before cross-testing.
 2024-01-09 13:50:10 +01:00
Simon Bruder 7365b384e3
Make metric variable 
This was somehow overlooked, but it should work.

This needs to change how the InventoryMutateForm handles quantities, as
the amount has to be split from the metric for addition to work.
 2024-01-09 10:53:12 +01:00
Simon Bruder 6297f3c073
Update copyright dates of recently changed files 
I forgot to update them in commits
743e459d41,
90d368a95b,
7fbd26d84c,
and 2d87b3928b.

It also adds swt23w23 as copyright owner on the time recording, as this
was forgotten when the attributions had initially been added.
 2024-01-06 22:06:48 +01:00
Simon Bruder 90d368a95b
Implement hashCode/equals on ID for Entities 
This also drops an angry comment that was the result of not being able
to fathom the default behaviour.

Fixes #87.
 2024-01-04 11:43:20 +01:00
Mathis Kral 44c9eb8f3a Add order backend for kundenwunsch 
This checks if the requested product to add is suitable for the event.
This works on #100
 2023-12-14 20:11:35 +01:00
Simon Bruder bac025fd0a
Make project REUSE compliant 
This finally makes the licensing under AGPL-3.0-or-later explicit after
I got the okay from the kickstart source owners.

This also checks the REUSE compliance in a pre commit hook, and
therefore also in CI.
 2023-12-11 17:59:14 +01:00
Simon Bruder 580d3a6af6
Implement per-month employee working hours 
Closes #76

Co-auther-by: Denis Natusch <denis.natusch@mailbox.tu-dresden.de>
 2023-12-09 00:35:43 +01:00
Paul Heimer e4d23d8e81
Add invoice for customer 2023-12-08 17:37:52 +01:00
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
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
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
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
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
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
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
Mathis Kral b3d93685c3
Add filteredByDay to OrderController 2023-11-21 18:00:31 +01:00
Theo Reichert 1777e268db
Add calender to OrderController 
calender displays `order.id`s per day
 2023-11-21 18:00:29 +01:00
Theo Reichert 397027a650
Add calender to OrderController 
calender can't count orders per day
 2023-11-21 18:00:28 +01:00
Mathis Kral 052b8e1a75
Remove unnecessary print statements 2023-11-21 18:00:25 +01:00
Mathis Kral dfd892d04b
Remove swearing 2023-11-21 18:00:24 +01:00
Mathis Kral d8bcb311dc
Add checkout and change of orderType 2023-11-21 18:00:24 +01:00
Mathis Kral 8eb8281e5c
Add functionality for adding products to an event 2023-11-21 18:00:23 +01:00
Mathis Kral c49210ca3c
Add link to eventPlanner.html in the controller 2023-11-21 18:00:23 +01:00
Mathis Kral b3b817b869
Add full order data to orders.html table 2023-11-21 18:00:21 +01:00
Mathis Kral f5454ddab5
Add order removal 2023-11-21 18:00:21 +01:00
Mathis Kral 895b68c028
Add orderRepositoryIterator in orders.html 2023-11-21 18:00:21 +01:00
Mathis Kral dcae05cd24
Add data initialization and total count of orders 2023-11-21 18:00:20 +01:00
Mathis Kral 6ce60ec3de
Add date to CustomOrder 2023-11-21 18:00:20 +01:00
Mathis Kral 4269e278a5
Add CustomOrderDataInitializer 2023-11-21 18:00:20 +01:00
Mathis Kral 5b4aaec73a
Add OrderController, CustomOrder, CustomOrderRepository 2023-11-21 18:00:19 +01:00