Hendrik Schutter
0a7722d612
removed register user type and ad
2020-06-15 09:40:32 +02:00
Jannik
d121532fba
Merge remote-tracking branch 'origin/master' into feature/config
2020-06-14 21:15:37 +02:00
Hannes Huber
985169117d
fix nullpointer in settings
2020-06-14 18:19:59 +02:00
Hannes Huber
fa610cae3b
if no orders show hint
2020-06-14 17:56:09 +02:00
CodeSteak
3bb3c5b513
[HOTFIX] of HOTFIX: Use CanonicalPath for check
2020-06-14 16:51:59 +02:00
CodeSteak
15616e05f3
[HOTFIX] Prevent path directory traversal attack for deploy
2020-06-14 15:54:56 +02:00
Philipp Schweizer
0ab185f143
impl trackingID for the UserController
2020-06-13 21:59:18 +02:00
Philipp Schweizer
1dd4b5cfa5
del update query and impl error for trackigID
2020-06-13 20:05:22 +02:00
Philipp Schweizer
266bba095a
merged feature/customer_orders with master
2020-06-13 19:58:30 +02:00
Philipp Schweizer
fa7bdf2f7e
impl error handling
2020-06-13 19:37:34 +02:00
Jannik
ef8aa826a3
Merge pull request 'Fix the cash booking sum on customer order' ( #67 ) from fix/wrong_bookings_on_customer_order into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-13 12:19:18 +02:00
Jannik
114453b5b9
Merge pull request 'Implement Arrival of Supplier Order.' ( #62 ) from feature/supplier_order_arrived_button into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-13 11:59:17 +02:00
CodeSteak
7397698929
fix check for missing article
2020-06-13 11:54:25 +02:00
Lukas Fürderer
327ba182f5
Fix the cash booking sum on customer order
...
Closes #57
2020-06-13 11:10:20 +02:00
Jannik
30226c5c19
Merge pull request 'fixes_ui' ( #66 ) from fixes_ui into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-13 11:03:20 +02:00
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