CodeSteak
9389675b5c
Do not show dupliactes in category search. fixes #85
2020-06-21 00:01:28 +02:00
Lukas Fürderer
97a7f3a8ad
Fix the warehouse diagrams on the dashboard
...
- Show the correct utilization
- Display values as correct percentages
Closes #99
2020-06-20 23:54:33 +02:00
CodeSteak
aa2f42a10a
Add password restrictions fixes #91
2020-06-20 23:47:53 +02:00
CodeSteak
f128a8b9ed
Make reason for manuel booking required. fixes #90
2020-06-20 23:35:56 +02:00
CodeSteak
d77b8c046a
Fix bad query for article slot sum
2020-06-20 23:24:06 +02:00
CodeSteak
8fdfe9cc69
Catch failing delivery server
2020-06-20 22:51:18 +02:00
CodeSteak
e5332a3348
Fix String -> UUIDs -> String in method causing crash
2020-06-20 22:25:52 +02:00
CodeSteak
c3eaf5ac11
Remove unused db fields
2020-06-20 22:10:53 +02:00
CodeSteak
fa75beb9c4
Fix 6284a4d7bf
altering template
2020-06-20 22:09:25 +02:00
Jannik
4bef17dc0a
Merge pull request 'feature/dashboard' ( #83 ) from feature/dashboard into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-19 14:12:44 +02:00
Danny
79e4986880
delete blank line
2020-06-19 14:11:32 +02:00
CodeSteak
181a09e16b
Merge pull request 'feature/config' ( #78 ) from feature/config into master
...
Reviewed-by: CodeSteak <codesteak@shellf.art>
2020-06-18 14:09:46 +02:00
Jannik
f4aae9c581
ignore config.yml
2020-06-18 14:07:59 +02:00
Jannik
ea0c8c45d6
rename eCommerce_config.yml to config.yml
...
* if no config file is present, create a default config file
2020-06-18 14:04:54 +02:00
Philipp Schweizer
bcbebe8e8d
master merged into feature/customer_orders
2020-06-18 01:11:11 +02:00
Philipp Schweizer
187656814e
String Error -> Enum ErrorHandling Logic removed from model class
2020-06-18 00:50:43 +02:00
Jannik
8c0652b26b
exit if the settings file has not been found
...
* use a final variable for the settings file name
2020-06-17 22:32:48 +02:00
Lukas Fürderer
93cfbb4a27
Merge remote-tracking branch 'origin/master'
2020-06-17 18:59:10 +02:00
Lukas Fürderer
68cc35cec3
Fix typo 6
2020-06-17 18:57:42 +02:00
Lukas Fürderer
b2ee048f25
Fix typo 5
2020-06-17 18:57:23 +02:00
Lukas Fürderer
020a30474e
Fix typo 4
2020-06-17 18:56:32 +02:00
Lukas Fürderer
4bfc8a2cc6
Fix typo 3
2020-06-17 18:56:02 +02:00
Lukas Fürderer
0ff873baaa
Fix typo 2
2020-06-17 18:55:50 +02:00
Lukas Fürderer
1812c89994
Fix typo
2020-06-17 18:55:29 +02:00
Jannik
2442a477c8
add missing "|"
2020-06-17 18:43:06 +02:00
Philipp Schweizer
ebb3c8c235
removes unused Imports and fomattet
2020-06-17 17:23:29 +02:00
CodeSteak
e6c068e71a
Secretly fix number 0 showing on 'Warenkorb'
2020-06-17 00:23:05 +02:00
CodeSteak
86e3ced19b
Secretly fix searchbar not showing term when searching
2020-06-17 00:17:50 +02:00
CodeSteak
44df9e4b4f
Secretly add Favicon
2020-06-17 00:11:55 +02:00
CodeSteak
18cbfbf148
Fix template strings with a starting "/"
2020-06-17 00:02:46 +02:00
CodeSteak
486f237135
fix creditcard num not being set leading to crash
2020-06-16 23:50:10 +02:00
CodeSteak
3b1d378968
Fix not creating directory when uploading file
2020-06-16 23:38:35 +02:00
Jannik
5a0b303601
Merge branch 'master' into feature/config
2020-06-16 20:44:10 +02:00
Jannik
d5825ba7a0
use @Autowired to get AppSettings Object
2020-06-16 20:42:40 +02:00
Jannik
774e62f892
add suppliers to YAMLData, store data in AppSettings()
2020-06-16 19:19:58 +02:00
Jannik
e1c00eca8f
fix ApplicationSettings.readConfig()
2020-06-16 18:52:33 +02:00
Danny
e904eba7a4
Merge remote-tracking branch 'origin/feature/manual_cronjobs' into feature/dashboard
...
Butfixes
2020-06-15 21:41:54 +02:00
Danny
6284a4d7bf
Dashboard working
2020-06-15 17:47:55 +02:00
Lukas Fürderer
3b364ae815
Allow employees to trigger cronjobs manually
2020-06-15 16:23:42 +02:00
Hendrik Schutter
18f35c43e7
remove spaces
2020-06-15 10:46:04 +02:00
Hendrik Schutter
709c80fa37
add fist admin user after start
2020-06-15 10:43:16 +02:00
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