localhorst
/
e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity
485 Commits 2 Branches 2 Tags 7.2 MiB
Commit Graph

238 Commits

Author SHA1 Message Date
CodeSteak bdd1017232 Set Default Payment on first order 2020-06-25 11:46:01 +02:00
Jannik b993700ae4 Merge pull request 'feature/employee_login_defaults' (#124) from feature/employee_login_defaults into master 
Reviewed-on: #124
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-24 19:00:36 +02:00
Jannik e87d0d8cdd Merge pull request 'feature/optimize_create_order_whbookings' (#117) from feature/optimize_create_order_whbookings into master 
Reviewed-on: #117
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-24 18:57:45 +02:00
CodeSteak fb222c9213 Merge branch 'master' into feature/employee_login_defaults 2020-06-24 18:57:05 +02:00
CodeSteak cf9ab66e68 Hide /intern/ link if non employee. closes #76 2020-06-24 18:40:57 +02:00
Jannik 2290f01a8f Merge pull request 'feature/fix_delivery_api' (#116) from feature/fix_delivery_api into master 
Reviewed-on: #116
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-24 18:38:03 +02:00
Jannik 3bc0996c73 Merge pull request 'Add & generate tracking information to (Supplier-)OrderConfirmation. Fixes #110' (#114) from feature/supplier_tracking into master 
Reviewed-on: #114
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-24 18:37:15 +02:00
Lukas Fürderer 3b7317a831 Fix typo 7 2020-06-24 18:19:14 +02:00
CodeSteak f0c9823e45 Clearify Inventory view with text. 2020-06-24 09:53:19 +02:00
CodeSteak b9e87f5bd4 Add additional infos for order history in /user/... fixes #109 2020-06-24 01:19:37 +02:00
CodeSteak 8d27c486d5 Add & generate tracking information to (Supplier-)OrderConfirmation. Fixes #110 2020-06-24 00:37:58 +02:00
CodeSteak d5181f149a Fix showing CustomerOrder all CustomerOrders in my orders. fix displaying orders in random order 2020-06-21 18:58:15 +02:00
CodeSteak 62df2346c3 fix template crashing when defaultAddr == null 2020-06-21 16:28:00 +02:00
CodeSteak 2989b54593 Merge pull request 'fix_change_user_name' (#104) from fix_change_user_name into master 2020-06-21 00:15:57 +02:00
Hendrik Schutter 1f83a82f17 removed user.name and use user.defaultDeliveryAddress.name instead 2020-06-21 00:13:10 +02:00
CodeSteak 53cdb20091 Merge pull request 'Fix the warehouse diagrams on the dashboard' (#103) from fix/dashboard_warehouse_statistics into master 2020-06-21 00:02:50 +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
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
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
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
Jannik 2442a477c8
add missing "|" 2020-06-17 18:43:06 +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 486f237135 fix creditcard num not being set leading to crash 2020-06-16 23:50:10 +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 0a7722d612 removed register user type and ad 2020-06-15 09:40:32 +02:00
Hannes Huber fa610cae3b if no orders show hint 2020-06-14 17:56:09 +02:00
Philipp Schweizer 0ab185f143 impl trackingID for the UserController 2020-06-13 21:59:18 +02:00
Philipp Schweizer 266bba095a merged feature/customer_orders with master 2020-06-13 19:58:30 +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 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
Hannes Huber 1590821f64 delete bonuspoints and notifications html 2020-06-12 11:15:05 +02:00
Hannes Huber c194f44308 implement customers detail bookings 2020-06-10 19:28:12 +02:00
Hannes Huber 49e26039a3 implement customers detail part 1 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