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

90 commits

Author SHA1 Message Date
Mathis Kral fbe8ce6953
Fix wrong price calculation on invoice 2024-01-27 14:00:45 +01:00
Erik Hohlfeld 5aefd4e05f Filter and distinguish products in orderCatalog 2024-01-19 19:00:51 +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 668d758ed0 Add uniform price formatting 
This works on #144
 2024-01-16 20:00:39 +01:00
Simon Bruder a78b225de9
Fix spelling error in footer 
Fixes #137
 2024-01-12 13:06:04 +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 da24ca79a1 Update order template only allow values COMPLETED or CANCELED 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
Denis Natusch 13641bc6a2
Use form for editing customer profile 2024-01-08 16:00:40 +01:00
Simon Bruder b0279a5c78
Add source code link to layout template 
This is required by the terms of the AGPL.

The link to the source code is to a mirror of the original repository,
as the original can’t be made public.
 2023-12-11 20:31:43 +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 3e2cc3d0b2
Allow specifying order types in inventory 
Fixes #95
 2023-12-09 12:02:37 +01:00
Simon Bruder 0200330625
Explicitly handle placement of inventory buttons 2023-12-09 12:02:36 +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 cc05fb2e2e Use the beloved ASCII art as banner 2023-12-07 20:09:59 +01:00
Simon Bruder 0b90fb30c1
Decrease javamoney log level 
Otherwise, the console is flooded with dozens of useless identical
messages.
 2023-12-07 19:58:30 +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
Simon Bruder ee7ab27a6d
Remove legacy from inventory template 
The comments are already addressed (or not needed). Also, UUIDs really
are long and do not add any benefit to the administrator.
 2023-12-05 12:17:22 +01:00
Denis Natusch af09dd4a83
Add wage to employee 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
Denis Natusch 0119b1cfa0
Add staff form and bind it to model 
Closes #51
 2023-11-29 12:25:29 +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 14dc478e41
Unify naming of employee id 2023-11-27 16:46:46 +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
Theo Reichert 53c40fec2f
Fix link from calender day to page with orders on this day 2023-11-24 20:24:14 +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
Denis Natusch 2515c17de5
Let admin edit all fields of customer 2023-11-24 15:47:23 +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
Erik Hohlfeld 317af597f5
Make orderCatalog use OrderType 2023-11-21 18:04:56 +01:00
Denis Natusch 2248e8eeef
Replace address input with textarea 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
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
Simon Bruder 0c4286e198
Use valid e-mail in footer 2023-11-21 18:00:38 +01:00
Theo Reichert 5cc1596363
Fix template and css for calender 2023-11-21 18:00:37 +01:00
Simon Bruder 5446483776
Use more friendly welcome message 
Co-authored-by: Erik Hohlfeld <erik.hohlfeld@mailbox.tu-dresden.de>
 2023-11-21 18:00:37 +01:00
Simon Bruder 09a79e0b95
Make footer more professional 2023-11-21 18:00:37 +01:00
Simon Bruder 32f997464e
Don’t use messages 
The system won’t be multilingual anyway, so this just adds complexity
and things to trip over.

Closes #25
 2023-11-21 18:00:36 +01:00
Simon Bruder 0f4b174460
Remove duplicate title elements 
The title element should only be set by the layout template.
 2023-11-21 18:00:35 +01:00