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
Hendrik Schutter
c69b20b914
added POST that changes the article WIP
2020-05-12 22:52:01 +02:00
CodeSteak
c92e485018
Implement API Bindings for SupplierService
2020-05-12 22:42:25 +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
bba4173269
fixed inputstream once more
2020-05-10 22:19:58 +02:00
Jannik
3a3b7abad0
fix typo
2020-05-10 21:30:50 +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
143a53acf5
fix better quantities for UI
2020-05-10 21:30:50 +02:00
Hannes Huber
bb4aa79243
implement personalized suggestions
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
CodeSteak
4048d6c5ad
Unify Style of error messages to match rest of ui.
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
5f071939d3
Renice error handling
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
CodeSteak
4338f188f0
fix local merge conflicts in req ctrl
2020-05-10 21:30:50 +02:00
Hannes Huber
e9e072b26b
ShopIndexController without databasestuff
2020-05-10 21:30:50 +02:00
Hannes Huber
8a28aabaf3
ShopIndexController initial implementation
2020-05-10 21:30:50 +02:00
Hendrik Schutter
e1d7becc2e
added yaml dump&parse class
2020-05-10 21:23:44 +02:00
Jannik
89eaeaed40
Merge pull request 'feature/basic_functions' ( #7 ) from feature/basic_functions into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-05-10 17:48:31 +02:00
Hannes Huber
edcdb2e9cf
fix use Math.min for loopcount
2020-05-10 17:25:48 +02:00
Hannes Huber
530034a40e
fix unused imports and unneeded empty lines
2020-05-10 17:19:18 +02:00
Hannes Huber
8f24aee350
fix add should_be_advertised to script
2020-05-10 17:16:17 +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
e406918ca2
Remove commend out code
2020-05-10 16:57:33 +02:00
CodeSteak
e167832164
Merge branch 'feature/basic_functions' of git.mosad.xyz:localhorst/e-commerce into feature/basic_functions
2020-05-10 15:39:35 +02:00
CodeSteak
777786f5b6
Remove old missleading comment
2020-05-10 15:39:24 +02:00
Hannes Huber
a62e3e8a63
fix only show ordered Articles from specific Customer
2020-05-10 15:28:39 +02:00
Hannes Huber
7f95cef13b
fix personalized suggestions
2020-05-10 15:03:45 +02:00
Hannes Huber
95e52cc79d
fix non-formatted and non-vatted price
2020-05-10 14:57:02 +02:00
CodeSteak
d4d1426438
Fix decimals in checkout page
2020-05-10 14:34:20 +02:00
CodeSteak
d1301f6988
Fix naming-convension-error in ArticleOffer
2020-05-10 14:30:00 +02:00
CodeSteak
731f4761fa
Show error if articles are not avail during checkout.
2020-05-10 14:29:08 +02:00
Jannik
69b5b33af8
fix typo in 8dd4cc4459
2020-05-09 19:58:31 +02:00
Jannik
8dd4cc4459
use application.properties when run via bootRun
2020-05-09 19:31:57 +02:00
Hannes Huber
c0ce1e23c3
fix better quantities for UI
2020-05-08 13:01:29 +02:00
Hannes Huber
1bd267a26d
implement personalized suggestions
2020-05-08 11:44:30 +02:00
Hannes Huber
e4b4698a27
Advertised Articles now shown correctly
2020-05-08 10:37:42 +02:00
Hannes Huber
c097e58bf3
change Databasename and add Advertisementflag
2020-05-08 10:00:22 +02:00
Hannes Huber
4fd80bb3c7
implement imageserving and first part of ArticleRepository
2020-05-08 10:00:22 +02:00
CodeSteak
beb0131b60
Unify Style of error messages to match rest of ui.
2020-05-06 17:00:28 +02:00
CodeSteak
cdce22968d
Implement proper querying of warehouse slot sums and booking accounts.
2020-05-06 14:10:37 +02:00
CodeSteak
f5a99700a0
Renice error handling
2020-05-05 23:34:17 +02:00
CodeSteak
b2f927e48d
Implement CreateCustomerOrderAction; Not implemented: correct booking and WarehouseBooking fetching...
...
Puhh, that was a struggle to get working. Damn JPA Shit
2020-05-05 22:56:12 +02:00
CodeSteak
d681f240e1
implement checkout for non logged in users.
2020-05-05 18:59:15 +02:00
CodeSteak
31059b4894
Implement add Items to ShoppingCart
2020-05-05 17:24:25 +02:00
CodeSteak
cbaec13d38
fix local merge conflicts in req ctrl
2020-05-05 17:22:35 +02:00
CodeSteak
a5152aaa3d
Merge remote-tracking branch 'origin/feature/start' into feature/basic_functions
2020-05-05 16:48:37 +02:00
Hannes Huber
f48f5c40f0
ShopArticleController initial
2020-05-02 14:38:40 +02:00
Jannik
6ab3b63923
Revert "split RequestController acording to mapping"
...
This reverts commit 41eb4d0b8f
.
2020-05-01 15:25:50 +02:00
Jannik
41eb4d0b8f
split RequestController acording to mapping
2020-05-01 14:53:35 +02:00
Hannes Huber
8f081823ca
ShopIndexController without databasestuff
2020-05-01 14:40:43 +02:00
Hannes Huber
f67a23bab9
ShopIndexController initial implementation
2020-05-01 12:19:52 +02:00
CodeSteak
da9a737fd0
Fix Duplicate Names of Controllers
2020-05-01 10:48:12 +02:00
CodeSteak
411760e1d4
Move repos to own package
2020-04-29 23:07:47 +02:00
CodeSteak
de6c750e7f
Refactor Package Layout
2020-04-29 22:44:16 +02:00
CodeSteak
bad1d94f8a
add controllers and packages
2020-04-28 22:41:29 +02:00
CodeSteak
1186c390fb
Implement Entries // TODO: Move to packages, add Repos.
2020-04-28 21:02:33 +02:00
CodeSteak
14161b7fd3
Reformat (all the) Code
2020-04-27 09:48:24 +02:00
CodeSteak
7c82b7b547
Build Prototype for Login
2020-04-08 18:27:46 +02:00
Jannik
26b64b8ab4
move /user to separate RequestController
2020-03-16 13:49:51 +01:00
CodeSteak
fd27729072
Fix not using var when accessing sessionStorage
2020-03-06 16:34:12 +01:00
CodeSteak
8bc0161e66
Implement some session storage magic for back buttons
2020-03-06 16:11:26 +01:00
CodeSteak
d7b9a08829
Refactor checkout
2020-03-06 15:19:56 +01:00
CodeSteak
96e8b19f41
Implement message for info
2020-03-05 20:34:59 +01:00
CodeSteak
230d71944f
fix abschließen btn text
2020-02-12 20:29:06 +01:00
CodeSteak
c756469f05
reimplement "fix flow for loggedout checkout" ( b25a9842e4
)
2020-02-11 23:36:34 +01:00
CodeSteak
02deef4ad7
disable cache. Fix invalid value
2020-02-11 22:02:18 +01:00
CodeSteak
4d899f4446
fix project setup for enabling production builds
2020-02-09 15:00:07 +01:00
CodeSteak
4946332c30
add prop for thing that makes build jar crash
2020-02-09 11:50:58 +01:00
CodeSteak
da8c2e0a2b
Merge branch 'master' of git.mosad.xyz:localhorst/e-commerce
2020-02-09 11:40:48 +01:00
CodeSteak
5f51e6e007
dont put database in jar file when building.
...
The resource folder ends up in the jar file. The database is NOT a
static resource
2020-02-09 11:38:59 +01:00
Hannes Huber
2d2258d02e
fix dashboard description
2020-02-08 14:07:50 +01:00
CodeSteak
a7f63c65ca
fix warehouse link II
2020-02-08 14:05:29 +01:00
CodeSteak
9a28ccd7dd
fix warehouse sidebar link
2020-02-08 14:04:06 +01:00
CodeSteak
79a20f54d3
impl error in header
2020-02-06 19:44:51 +01:00
CodeSteak
d5ae1df4a6
imple employee custm.
2020-02-06 19:22:41 +01:00
CodeSteak
0f85bf8ef7
fix type lagerplatz
2020-02-05 21:04:22 +01:00
CodeSteak
ab1a6b7ea0
fix booking views
2020-02-05 21:01:26 +01:00
CodeSteak
a7008c4ce8
unify EUR vs €
2020-02-04 21:32:19 +01:00
CodeSteak
2c9ff570aa
impl bad dashboard
2020-02-04 21:30:21 +01:00
CodeSteak
57f8e640c4
fix add settings
2020-02-04 20:13:41 +01:00
CodeSteak
f6e57d3a80
fix id list for slots
2020-02-03 20:58:15 +01:00
CodeSteak
c4544f18e0
Merge branch 'master' of git.mosad.xyz:localhorst/e-commerce
2020-02-03 20:53:51 +01:00
CodeSteak
58473e58a3
impl Warehouse
2020-02-03 20:53:02 +01:00
Jannik
f102246b85
fix error pages
2020-02-03 17:17:55 +01:00
CodeSteak
2fc0b54716
impl suppliers
2020-02-02 00:27:11 +01:00
CodeSteak
06ade43304
impl listed articles
2020-02-01 23:43:44 +01:00