f5ad05f49f
Merge branch 'master' into feature/offered_article_supplier
2020-06-01 17:04:52 +02:00
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
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
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
839bebcd89
trim searchterm
2020-06-01 11:58:08 +02:00
3775f96f3f
implement getCustomerOrderDetail
2020-06-01 11:53:29 +02:00
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
dfa528484c
Merge branch 'master' into feature/user
2020-06-01 10:57:55 +02:00
38fcda708f
check if article.image is null
2020-06-01 10:53:10 +02:00
9238162a4c
implement better search
2020-06-01 10:52:19 +02:00
1cb52a20d4
finished supplier orders
2020-05-30 23:32:01 +02:00
67c101ebea
finished show orders based on supplier
2020-05-30 21:13:25 +02:00
657d315850
show orders based on supplier
2020-05-30 20:16:27 +02:00
e7e3864b4c
Store the cheapest supplier for each offered article in the database
2020-05-30 18:25:23 +02:00
407229f15d
changed cheapest supplier ref in offered article entity
2020-05-30 16:49:20 +02:00
5d7ecbdfb7
basic detail page for supplier
2020-05-30 16:43:07 +02:00
c8d3ab3ff0
list suppliers page
2020-05-30 16:16:14 +02:00
1b2e75a82c
updates scripts
2020-05-30 12:29:40 +02:00
286edb33ed
show supplier name at offered article page
2020-05-30 11:52:30 +02:00
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
d55a50ab29
[supplier] update gradle to version 6.4
2020-05-29 16:18:22 +02:00
e4489ff3a6
Merge branch 'feature/supplier_api' into feature/reorder_cronjob
2020-05-29 16:13:29 +02:00
2c2b5c1d0f
Add Missing Gradle Folder to Repo
2020-05-29 16:12:28 +02:00
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
f4b0d6a576
fix html warnings [2]
2020-05-28 13:22:28 +02:00
2bf383b113
fix html warnings
2020-05-28 13:20:42 +02:00
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
d5540c1979
Small changes according to comments on the pullrequest
2020-05-28 10:58:11 +02:00
e1df56147b
Merge remote-tracking branch 'origin/master' into feature/reorder_cronjob
2020-05-28 10:39:38 +02:00
35861d3664
fixed styling for edit/add btn
2020-05-27 21:53:58 +02:00
08dc4bcb47
fixed spaces in textarea
2020-05-27 21:43:26 +02:00
a38b817f20
fixed empty input fields fixes #32
2020-05-27 21:07:31 +02:00
8a2eff1fe9
code cleanup
2020-05-27 19:03:18 +02:00
e4d6642d61
order orders by newest first
2020-05-27 15:52:51 +02:00
9406bbc4ac
fix nullpointer again
2020-05-27 15:10:12 +02:00
e5b28250c2
fix payment method null pointer
2020-05-27 14:56:15 +02:00
db1d3d31b2
fix register
2020-05-27 14:55:51 +02:00
42a02effa6
fixed pull request #25
2020-05-27 14:24:05 +02:00
819cca7f2a
Merge remote-tracking branch 'origin/feature/user' into feature/user
2020-05-27 13:41:04 +02:00
846e448f01
code cleanup
2020-05-27 13:40:44 +02:00
614a929592
code cleanup
2020-05-27 13:40:44 +02:00
60699ed847
fix error handling
2020-05-27 13:40:44 +02:00
83ad1f3999
remove advertisementflag
2020-05-27 13:40:44 +02:00
5b4c0be1c8
add Errorhandling to UpdateSettingsAction
2020-05-27 13:40:44 +02:00
0256c19e8f
implement change User Settings
2020-05-27 13:40:44 +02:00
adcd840154
remove notification center
2020-05-27 13:40:44 +02:00
b5495bda3d
show all Orders
2020-05-27 13:40:44 +02:00
106b00a907
show usersettings from db
2020-05-27 13:40:44 +02:00
