Hannes Huber
dfa528484c
Merge branch 'master' into feature/user
2020-06-01 10:57:55 +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
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
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
83ad1f3999
remove advertisementflag
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
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
620e163a14
added feature to change an article image
2020-05-23 14:18:33 +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
Hendrik Schutter
9cfb1cd0ad
add offered article to listed article
2020-05-19 16:30:27 +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
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
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
Hendrik Schutter
d06fd57447
added new route for offered articles page
2020-05-15 11:57:20 +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
c69b20b914
added POST that changes the article WIP
2020-05-12 22:52:01 +02:00
Hendrik Schutter
fd9dcf141e
fixes in listed article page and converted form to POST
2020-05-11 15:32:39 +02:00
Hendrik Schutter
09c85fe8cb
fixed route for /intern/articles and /intern/suppliers/articles
2020-05-11 14:32:07 +02:00
Hendrik Schutter
22d2744c8c
GET article edit page
2020-05-11 11:58:26 +02:00
Hendrik Schutter
a2f20938cd
show listedArticles
2020-05-10 21:30:50 +02:00
Hendrik Schutter
2b3ecb2342
changed listedArticles Request to own Controller
2020-05-10 21:30:50 +02:00
Hannes Huber
82dacef4c0
Advertised Articles now shown correctly
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