Hendrik Schutter
e0e853a575
fixes from PR review
2020-06-13 10:41:59 +02:00
Hendrik Schutter
a41889b2cb
login in extern loginController, RequestController cleanup, login right after register
2020-06-12 23:48:28 +02:00
Hendrik Schutter
0f7d248d40
add radio BTNs to register
2020-06-12 23:31:57 +02:00
CodeSteak
11ade7b8f9
fix missing cells in TODO-Warehouse. fixes #63
2020-06-12 19:57:50 +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
Hannes Huber
1590821f64
delete bonuspoints and notifications html
2020-06-12 11:15:05 +02:00
Hannes Huber
938d16301d
fix stuff
2020-06-10 20:10:12 +02:00
Hannes Huber
5a59ac11b0
code cleanup
2020-06-10 19:28:12 +02:00
Hannes Huber
c194f44308
implement customers detail bookings
2020-06-10 19:28:12 +02:00
Lukas Fürderer
fc68e231d3
Allow the user to create manual bookings
2020-06-10 19:28:07 +02:00
Hannes Huber
6d8a36b7ac
implement customers detail part 2
2020-06-10 19:27:38 +02:00
Hannes Huber
49e26039a3
implement customers detail part 1
2020-06-10 19:27:38 +02:00
Lukas Fürderer
28834431ce
Display financial bookings in the ui
2020-06-10 19:27:38 +02:00
Hannes Huber
5691f0eeec
implement customers index
2020-06-10 19:27:16 +02:00
Jannik
7f643987f3
fix wrong closing tags in customerOrder/id.html
2020-06-10 19:12:34 +02:00
Jannik
6b8bf25e0e
Merge pull request 'feature/cash_bookings' ( #55 ) from feature/cash_bookings into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-10 19:04:45 +02:00
Philipp
ebeba72278
impl tracking ID
2020-06-10 17:03:59 +02:00
Philipp
f671baf7f0
Error with package path
2020-06-10 14:51:12 +02:00
Lukas Fürderer
691916894f
Apply some changes according to comments on the pullrequest
2020-06-10 11:48:38 +02:00
Lukas Fürderer
03d557d67b
Show a hyphen in supplier column if an article is not offered by anyone
...
Closes #54
2020-06-08 18:56:35 +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
CodeSteak
eb82d05f4f
Use Spring model for template attributes
2020-06-08 09:14:11 +02:00
Jannik
41320473d9
Merge pull request 'feature/supplier_page' ( #52 ) from feature/supplier_page into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-07 15:00:56 +02:00
Hendrik Schutter
bd6be54149
removed space in SupplierOrderRepo
2020-06-07 11:45:53 +02:00
Hendrik Schutter
99612165f5
fixed review requests
2020-06-07 11:44:50 +02:00
Hendrik Schutter
9dff6adb3d
rebase to master
2020-06-05 21:25:38 +02:00
Hendrik Schutter
445b504188
code cleanup
2020-06-05 21:20:54 +02:00
Hendrik Schutter
bd8b3db7f3
added post form for marking order as delivered
2020-06-05 21:18:04 +02:00
Hendrik Schutter
8a4ff4cfa5
added supplier bookings table
2020-06-05 21:18:04 +02:00
Hendrik Schutter
2245309198
added supplier balance label
2020-06-05 21:18:04 +02:00
Hendrik Schutter
d078c44027
finished supplier orders
2020-06-05 21:18:04 +02:00
Hendrik Schutter
bd8b07990b
finished show orders based on supplier
2020-06-05 21:18:04 +02:00
Hendrik Schutter
2f4c45ed71
show orders based on supplier
2020-06-05 21:18:04 +02:00
Hendrik Schutter
b600040bf3
basic detail page for supplier
2020-06-05 21:18:04 +02:00
Hendrik Schutter
4f5e1fe185
list suppliers page
2020-06-05 21:18:04 +02:00
Lukas Fürderer
f348d33c94
Show the balances of the main and vat account in the dashboard
2020-06-05 19:17:44 +02:00
Lukas Fürderer
6f90b9c941
Fix a bug where bookings were invisible if they affected only one account
2020-06-05 18:58:16 +02:00
Lukas Fürderer
e53c1e0872
Allow the user to create manual bookings
2020-06-05 18:45:25 +02:00
Hendrik Schutter
e138476d76
code cleanup
2020-06-05 18:05:10 +02:00
Hendrik Schutter
c1b9588189
added post form for marking order as delivered
2020-06-05 17:37:19 +02:00
Hendrik Schutter
5e05100d21
added supplier bookings table
2020-06-05 15:43:46 +02:00
Hendrik Schutter
93a5863fbe
added supplier balance label
2020-06-05 13:10:16 +02:00
Hannes Huber
7f652e38f0
fix nullpointer in category search
2020-06-05 12:32:34 +02:00
Lukas Fürderer
0061d25082
Display financial bookings in the ui
2020-06-05 07:49:11 +02:00
Jannik
d4ddd8a9a3
Merge pull request 'feature/user' ( #38 ) from feature/user into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-03 18:36:06 +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
fc239983a7
Fix article links.
2020-06-01 21:15:27 +02:00
CodeSteak
5e1170839e
Update Gross Price in Article Edit View. Fixes #31
2020-06-01 21:11:15 +02:00
CodeSteak
2ef9eb29ac
Show Tax in Article Edit View. Fixes #48
2020-06-01 20:46:00 +02:00
Hannes Huber
f4ba79a4cd
add id's to form inputs
2020-06-01 20:27:19 +02:00
CodeSteak
976e2d1949
Implement Warehouse....
...
Sry, only one commit. No time to make history ;D
2020-06-01 20:25:51 +02:00
Hannes Huber
b7134a60da
rename CustomerOrderRepo in Cronjob
2020-06-01 20:25:31 +02:00
Hannes Huber
ff4c984f54
fix error message
2020-06-01 20:24:45 +02:00
Jannik
21502a0b1c
Merge branch 'master' into feature/user
2020-06-01 19:03:42 +02:00
Jannik
6988d3f213
minor code clean up
2020-06-01 17:10:04 +02:00
Jannik
f5ad05f49f
Merge branch 'master' into feature/offered_article_supplier
2020-06-01 17:04:52 +02:00
Jannik
e539a9433a
Merge pull request 'implement better search' ( #43 ) from feature/search into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-01 16:59:37 +02:00
Jannik
b14c565e81
Merge pull request 'Store the cheapest supplier for each offered article in the database' ( #41 ) from feature/reorder_cronjob into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-01 16:53:58 +02:00
Jannik
b04d627695
Merge pull request 'check if article.image is null' ( #44 ) from fix/image_null into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-01 16:51:23 +02:00
Hannes Huber
839bebcd89
trim searchterm
2020-06-01 11:58:08 +02:00
Hannes Huber
3775f96f3f
implement getCustomerOrderDetail
2020-06-01 11:53:29 +02:00
Hannes Huber
2394157be8
implement getCustomerOrder
2020-06-01 11:31:12 +02:00
Danny
922e3cadef
Bugfix register
2020-06-01 11:13:03 +02:00
Danny
0fb1d5704e
Bufix: After register, you now logged in
2020-06-01 11:11:34 +02:00
Hannes Huber
dfa528484c
Merge branch 'master' into feature/user
2020-06-01 10:57:55 +02:00
Hendrik Schutter
38fcda708f
check if article.image is null
2020-06-01 10:53:10 +02:00
Hannes Huber
9238162a4c
implement better search
2020-06-01 10:52:19 +02:00
Hendrik Schutter
1cb52a20d4
finished supplier orders
2020-05-30 23:32:01 +02:00
Hendrik Schutter
67c101ebea
finished show orders based on supplier
2020-05-30 21:13:25 +02:00
Hendrik Schutter
657d315850
show orders based on supplier
2020-05-30 20:16:27 +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
Hendrik Schutter
407229f15d
changed cheapest supplier ref in offered article entity
2020-05-30 16:49:20 +02:00
Hendrik Schutter
5d7ecbdfb7
basic detail page for supplier
2020-05-30 16:43:07 +02:00
Hendrik Schutter
c8d3ab3ff0
list suppliers page
2020-05-30 16:16:14 +02:00
Hendrik Schutter
1b2e75a82c
updates scripts
2020-05-30 12:29:40 +02:00
Hendrik Schutter
286edb33ed
show supplier name at offered article page
2020-05-30 11:52:30 +02:00
Jannik
1a1502b38c
Merge pull request 'feature/reorder_cronjob' ( #27 ) from feature/reorder_cronjob into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-05-29 16:20:04 +02:00
Jannik
e9a3cb51ba
Merge pull request 'fix/intern_articles' ( #39 ) from fix/intern_articles into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-05-28 13:23:01 +02:00
Jannik
f4b0d6a576
fix html warnings [2]
2020-05-28 13:22:28 +02:00
Jannik
2bf383b113
fix html warnings
2020-05-28 13:20:42 +02:00
Jannik
ff5b0afc93
Merge pull request 'feature/delivery_api' ( #25 ) from feature/delivery_api into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-05-28 12:19:29 +02:00
Lukas Fürderer
d5540c1979
Small changes according to comments on the pullrequest
2020-05-28 10:58:11 +02:00
Lukas Fürderer
e1df56147b
Merge remote-tracking branch 'origin/master' into feature/reorder_cronjob
2020-05-28 10:39:38 +02:00
Hendrik Schutter
35861d3664
fixed styling for edit/add btn
2020-05-27 21:53:58 +02:00
Hendrik Schutter
08dc4bcb47
fixed spaces in textarea
2020-05-27 21:43:26 +02:00
Hendrik Schutter
a38b817f20
fixed empty input fields fixes #32
2020-05-27 21:07:31 +02:00
Hannes Huber
8a2eff1fe9
code cleanup
2020-05-27 19:03:18 +02:00
Hannes Huber
e4d6642d61
order orders by newest first
2020-05-27 15:52:51 +02:00
Hannes Huber
9406bbc4ac
fix nullpointer again
2020-05-27 15:10:12 +02:00
Hannes Huber
e5b28250c2
fix payment method null pointer
2020-05-27 14:56:15 +02:00
Hannes Huber
db1d3d31b2
fix register
2020-05-27 14:55:51 +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
60699ed847
fix error handling
2020-05-27 13:40:44 +02:00
Hannes Huber
83ad1f3999
remove advertisementflag
2020-05-27 13:40:44 +02:00
Hannes Huber
5b4c0be1c8
add Errorhandling to UpdateSettingsAction
2020-05-27 13:40:44 +02:00
Hannes Huber
0256c19e8f
implement change User Settings
2020-05-27 13:40:44 +02:00
Hannes Huber
adcd840154
remove notification center
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
Hannes Huber
7c73f69865
remove bonuspoints
2020-05-27 13:40:44 +02:00
Danny
7c467c8641
bugfix register
2020-05-27 12:22:24 +02:00
Lukas Fürderer
ffb683bdd0
Set the advertise flag if at least one supplier wants it to be set
2020-05-25 17:19:25 +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
Jannik
e571e21281
Merge pull request 'feature/image' ( #26 ) from feature/image into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-05-23 18:51:15 +02:00
Hendrik Schutter
019f5d8f1b
code cleanup
2020-05-23 14:19:43 +02:00
Hendrik Schutter
620e163a14
added feature to change an article image
2020-05-23 14:18:33 +02:00
Lukas Fürderer
6892a11688
Merge branch 'feature/supplier_api' into feature/reorder_cronjob
2020-05-23 11:16:46 +02:00
Hendrik Schutter
fcdf0e776d
set default img if article is added to listed articles
2020-05-23 10:45:14 +02:00
Hendrik Schutter
a3efa4092a
removed old static product images
2020-05-23 09:40:52 +02:00
Jannik
525a5f7eb1
Merge branch 'master' into feature/offeredArticle
2020-05-21 20:23:47 +02:00
Hendrik Schutter
ba570852a7
added id´s to inputs
2020-05-21 10:27:26 +02:00
Philipp Schweizer
caf5430a06
delivery_api finished
2020-05-19 20:38:22 +02:00
Tyro
da78ab4990
register working
2020-05-19 18:47:15 +02:00
Hendrik Schutter
9cfb1cd0ad
add offered article to listed article
2020-05-19 16:30:27 +02:00
Tyro
7686c4cda6
Create rudimentary register class
2020-05-19 15:41:43 +02:00
Hendrik Schutter
d8032c2bd7
load offeredArticles from DB and display basic info
2020-05-19 00:12:26 +02:00
Hannes Huber
7b6882b12b
format code
2020-05-18 09:41:02 +02:00
Hannes Huber
d739b15410
fix missing import
2020-05-17 13:11:32 +02:00
Hannes Huber
0c66a713b4
add some comments
2020-05-17 13:10:04 +02:00
Hannes Huber
d0785308d4
code cleanup
2020-05-17 13:09:51 +02:00
Hannes Huber
bc350b3177
implement only show Searchresults which are in Stock
2020-05-17 13:09:26 +02:00
Hannes Huber
8d6a1f4053
implement only show advertisements which are in stock
2020-05-17 13:09:26 +02:00
Hannes Huber
6b9db3eed5
implement errorhandling
2020-05-17 13:09:26 +02:00
Hannes Huber
3f5b1efa0c
implement search
2020-05-17 13:08:18 +02:00
Hendrik Schutter
d4be2b9e94
Revert "Revert "added link from listedArticles page to related offered article""
...
This reverts commit 3c69f38367
.
2020-05-16 22:48:40 +02:00
Hendrik Schutter
14bef592c4
Revert "Revert "UImodel for offeredArticle page, html cleanup""
...
This reverts commit 0840eda369
.
2020-05-16 22:48:20 +02:00
Hendrik Schutter
0840eda369
Revert "UImodel for offeredArticle page, html cleanup"
...
This reverts commit e0f638f0bd
.
2020-05-16 22:46:42 +02:00
Hendrik Schutter
3c69f38367
Revert "added link from listedArticles page to related offered article"
...
This reverts commit 39fb735f21
.
2020-05-16 22:46:18 +02:00
Hendrik Schutter
39fb735f21
added link from listedArticles page to related offered article
2020-05-16 21:49:31 +02:00
Hendrik Schutter
e0f638f0bd
UImodel for offeredArticle page, html cleanup
2020-05-16 13:42:07 +02:00
Hendrik Schutter
4f6388e4b9
fixed links to offered articles page
2020-05-15 20:57:56 +02:00
Hendrik Schutter
b1840dd845
code cleanup
2020-05-15 19:47:26 +02:00
Hendrik Schutter
dc49bc2e8d
code cleanuo
2020-05-15 19:45:10 +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
ea8aaa3931
removed PW bypass
2020-05-15 18:16:03 +02:00
Hendrik Schutter
56efbd7940
code cleanup
2020-05-15 18:13:12 +02:00
Hendrik Schutter
a98782bc01
added new route in external controller
2020-05-15 14:14:29 +02:00
Lukas Fürderer
0de35f1a51
Implement scheduled execution of cronjobs
2020-05-15 13:47:54 +02:00
Hannes Huber
f403a6e1c4
fix in stock bug
2020-05-15 12:33:32 +02:00
Hendrik Schutter
d06fd57447
added new route for offered articles page
2020-05-15 11:57:20 +02:00
Hendrik Schutter
197a774fb2
removed data folder
2020-05-14 23:14:33 +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
Jannik
922e21a454
update dependencies & gradle
...
* gradle 5.6.2 -> 6.4
* spring boot 2.2.2 -> 2.2.7
* sqlite-jdbc 3.28.0 -> 3.31.1
2020-05-13 18:28:21 +02:00