Jannik
3bc0996c73
Merge pull request 'Add & generate tracking information to (Supplier-)OrderConfirmation. Fixes #110 ' ( #114 ) from feature/supplier_tracking into master
...
Reviewed-on: #114
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-24 18:37:15 +02:00
CodeSteak
4e9f7800be
Remove WarehouseBookingReason it was not used.
2020-06-24 00:42:55 +02:00
CodeSteak
8d27c486d5
Add & generate tracking information to (Supplier-)OrderConfirmation. Fixes #110
2020-06-24 00:37:58 +02:00
CodeSteak
a1abbf5329
Implement Supplier AutoSupplierPayment. closes #100
2020-06-21 15:50:27 +02:00
Hendrik Schutter
b846b919b7
code clean up
2020-06-21 00:14:00 +02:00
Hendrik Schutter
1f83a82f17
removed user.name and use user.defaultDeliveryAddress.name instead
2020-06-21 00:13:10 +02:00
CodeSteak
c3eaf5ac11
Remove unused db fields
2020-06-20 22:10:53 +02:00
CodeSteak
fa75beb9c4
Fix 6284a4d7bf
altering template
2020-06-20 22:09:25 +02:00
Jannik
4bef17dc0a
Merge pull request 'feature/dashboard' ( #83 ) from feature/dashboard into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-19 14:12:44 +02:00
Danny
6284a4d7bf
Dashboard working
2020-06-15 17:47:55 +02:00
Philipp Schweizer
0ab185f143
impl trackingID for the UserController
2020-06-13 21:59:18 +02:00
CodeSteak
a664b42853
Allow reuse of empty warehouse slots. Also fixes #59
2020-06-12 19:48:21 +02:00
CodeSteak
56f4ec0dda
Implement Arrival of Supplier Order.
2020-06-12 19:22:36 +02:00
Lukas Fürderer
8fff0e2dca
Merge remote-tracking branch 'origin/master' into feature/cash_bookings
2020-06-08 18:15:34 +02:00
CodeSteak
78a7ad053a
Merge branch 'master' into feature/intern_warehouse
2020-06-08 09:22:06 +02:00
CodeSteak
f6554629d7
Merge branch 'master' into feature/intern_warehouse
2020-06-08 09:14:50 +02:00
Lukas Fürderer
0061d25082
Display financial bookings in the ui
2020-06-05 07:49:11 +02:00
CodeSteak
a192f0ac51
Set Tracing Id in Warehouse/finish not in Checkout. This was wrong.
2020-06-03 16:55:36 +02:00
CodeSteak
976e2d1949
Implement Warehouse....
...
Sry, only one commit. No time to make history ;D
2020-06-01 20:25:51 +02:00
Jannik
21502a0b1c
Merge branch 'master' into feature/user
2020-06-01 19:03:42 +02:00
Hannes Huber
dfa528484c
Merge branch 'master' into feature/user
2020-06-01 10:57:55 +02:00
Lukas Fürderer
e7e3864b4c
Store the cheapest supplier for each offered article in the database
2020-05-30 18:25:23 +02:00
Lukas Fürderer
e1df56147b
Merge remote-tracking branch 'origin/master' into feature/reorder_cronjob
2020-05-28 10:39:38 +02:00
Hannes Huber
e5b28250c2
fix payment method null pointer
2020-05-27 14:56:15 +02:00
Hannes Huber
846e448f01
code cleanup
2020-05-27 13:40:44 +02:00
Hannes Huber
614a929592
code cleanup
2020-05-27 13:40:44 +02:00
Hannes Huber
83ad1f3999
remove advertisementflag
2020-05-27 13:40:44 +02:00
Hannes Huber
b5495bda3d
show all Orders
2020-05-27 13:40:44 +02:00
Hannes Huber
106b00a907
show usersettings from db
2020-05-27 13:40:44 +02:00
Lukas Fürderer
8386629088
Implement the reorder cronjob
2020-05-25 17:08:15 +02:00
Jannik
747eb1cde2
Merge pull request 'feature/register' ( #24 ) from feature/register into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-05-25 10:51:33 +02:00
Tyro
ac79e1cf22
Check for inactive accounts
...
Check for employee by access on /intern
2020-05-24 21:51:40 +02:00
Hendrik Schutter
d8032c2bd7
load offeredArticles from DB and display basic info
2020-05-19 00:12:26 +02:00
Hendrik Schutter
8c777ca1ff
fixed merge bug: cascade = CascadeType.ALL in Article to Categories
2020-05-15 19:31:31 +02:00
Jannik
c73435b2a0
Merge remote-tracking branch 'origin/master' into feature/listedArticles
2020-05-15 19:04:02 +02:00
Hendrik Schutter
56efbd7940
code cleanup
2020-05-15 18:13:12 +02:00
Lukas Fürderer
0de35f1a51
Implement scheduled execution of cronjobs
2020-05-15 13:47:54 +02:00
Hendrik Schutter
af99e8107d
added change for stock, price and autobuy values on article edit page
2020-05-14 22:16:06 +02:00
Hendrik Schutter
a2f20938cd
show listedArticles
2020-05-10 21:30:50 +02:00
Hannes Huber
262640a2b4
change Databasename and add Advertisementflag
2020-05-10 21:30:50 +02:00
Hannes Huber
1e7266e554
implement imageserving and first part of ArticleRepository
2020-05-10 21:30:50 +02:00
CodeSteak
572a999467
Implement proper querying of warehouse slot sums and booking accounts.
2020-05-10 21:30:50 +02:00
CodeSteak
2ec3ad32ea
Implement CreateCustomerOrderAction; Not implemented: correct booking and WarehouseBooking fetching...
...
Puhh, that was a struggle to get working. Damn JPA Shit
2020-05-10 21:30:50 +02:00
CodeSteak
d2bf6e8c52
implement checkout for non logged in users.
2020-05-10 21:30:50 +02:00
CodeSteak
7d83d723c1
Implement add Items to ShoppingCart
2020-05-10 21:30:50 +02:00
Hannes Huber
530034a40e
fix unused imports and unneeded empty lines
2020-05-10 17:19:18 +02:00
CodeSteak
bd2aeb63f6
Remove unneeded comment
2020-05-10 17:05:19 +02:00
CodeSteak
713c8ebe86
Comment empty constructors
2020-05-10 17:03:40 +02:00
CodeSteak
d1301f6988
Fix naming-convension-error in ArticleOffer
2020-05-10 14:30:00 +02:00
Hannes Huber
c097e58bf3
change Databasename and add Advertisementflag
2020-05-08 10:00:22 +02:00