5b483d5c5d
rename prototype folder -> web_backend. closes #75
2020-06-26 10:00:05 +02:00
624ade2032
Merge pull request 'Set Default Payment on first order' ( #128 ) from feature/update_credit_card_on_order into master
...
Reviewed-on: #128
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-06-25 12:40:19 +02:00
99b123565c
Merge pull request 'Show all articles if no term is provided. fixes #127 ' ( #129 ) from feature/fix_seatch_showing_err into master
...
Reviewed-on: #129
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-06-25 12:39:33 +02:00
be6de240bb
fix encoding err in supplier cfg
2020-06-25 12:13:47 +02:00
7cf1819460
add session timeout
2020-06-25 12:10:38 +02:00
17f0c645f1
Show all articles if no term is provided. fixes #127
2020-06-25 11:52:27 +02:00
bdd1017232
Set Default Payment on first order
2020-06-25 11:46:01 +02:00
f4299c33c1
Merge pull request 'feature/email_validation_fe' ( #126 ) from feature/email_validation_fe into master
...
Reviewed-on: #126
Reviewed-by: Lukas <lukas@xn--frderer-n2a.de >
2020-06-25 11:23:44 +02:00
f86a14b2f8
Fix Email pattern, disallow whitespace
2020-06-25 11:16:54 +02:00
2fb5826a3b
Validate Email in FE
2020-06-25 11:10:20 +02:00
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
5d506a1526
Merge pull request 'Fix display order in various locations. closes #120 ' ( #121 ) from feateure/display_order_intern into master
...
Reviewed-on: #121
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-06-24 18:59:14 +02:00
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
fb222c9213
Merge branch 'master' into feature/employee_login_defaults
2020-06-24 18:57:05 +02:00
cf9ab66e68
Hide /intern/ link if non employee. closes #76
2020-06-24 18:40:57 +02:00
cdc372d574
Redirect to intern if employee.
2020-06-24 18:40:22 +02:00
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
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
758c6810ab
Merge pull request 'Clean Shopping Cart on Logout' ( #123 ) from feature/clean_shopping_on_logout into master
...
Reviewed-on: #123
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-06-24 18:27:24 +02:00
577a4f72f0
Clean Shopping Cart on Logout for real
2020-06-24 18:25:42 +02:00
a2aca7a8ca
Clean Shopping Cart on Logout
2020-06-24 18:23:01 +02:00
3b7317a831
Fix typo 7
2020-06-24 18:19:14 +02:00
32921a3f87
Merge pull request 'Remove WarehouseBookingReason it was not used.' ( #115 ) from feature/remove_unused_warehouse_booking_reason into master
...
Reviewed-on: #115
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-06-24 15:03:47 +02:00
63e9bc2336
Merge pull request 'Fix in stock calculation. closes #118 ' ( #119 ) from feature/display_article_shop_in_stock into master
...
Reviewed-on: #119
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-06-24 15:03:04 +02:00
31bff55a20
Merge pull request 'Show advertisements distinct.' ( #122 ) from feature/show_ads_distinct into master
...
Reviewed-on: #122
Reviewed-by: Jannik Seiler <seil0@mosad.xyz >
2020-06-24 14:59:50 +02:00
5861b61565
Merge branch 'master' into feature/supplier_tracking
2020-06-24 10:44:38 +02:00
f0c9823e45
Clearify Inventory view with text.
2020-06-24 09:53:19 +02:00
6fbb16fea2
Show advertisements distinct.
2020-06-24 02:20:24 +02:00
0d547c8903
Fix display order in various locations. closes #120
2020-06-24 02:15:31 +02:00
5162e3fc19
Fix in stock calculation. closes #118
2020-06-24 02:05:25 +02:00
8bfe8b37f5
Maybe Fix warehouse booking repo
2020-06-24 02:00:37 +02:00
2e07d03908
Fix warehouse bookings on CreateOrderAction
2020-06-24 01:48:33 +02:00
b9e87f5bd4
Add additional infos for order history in /user/... fixes #109
2020-06-24 01:19:37 +02:00
cd641d6cc4
Fix #113 by fixing initialization of RestServiceForDelivery.
2020-06-24 01:18:16 +02:00
4e9f7800be
Remove WarehouseBookingReason it was not used.
2020-06-24 00:42:55 +02:00
8d27c486d5
Add & generate tracking information to (Supplier-)OrderConfirmation. Fixes #110
2020-06-24 00:37:58 +02:00
714ac4f1de
Fix issues with class loading in Cronjobs
2020-06-24 00:35:18 +02:00
186db31b17
Merge pull request 'Fix showing CustomerOrder all CustomerOrders in my orders. fix displaying orders in random order' ( #108 ) from feature/fix_show_orders into master
...
reviewed by Lukas
2020-06-21 22:22:53 +02:00
fb53c68be3
Merge pull request 'implement Config for Supplier and Delivery Service' ( #107 ) from feature/reading_config into master
...
reviewed by Lukas
2020-06-21 22:22:43 +02:00
19cf6ccfc5
Merge pull request 'Implement Supplier AutoSupplierPayment. closes #100 ' ( #105 ) from feature/supplier_auto_payment into master
2020-06-21 22:13:41 +02:00
7fafd14715
Fix variable name
2020-06-21 19:01:25 +02:00
d5181f149a
Fix showing CustomerOrder all CustomerOrders in my orders. fix displaying orders in random order
2020-06-21 18:58:15 +02:00
a950ecb2b9
Make delivery/gradlew executable
2020-06-21 18:42:33 +02:00
f42a50d24d
fix CustomerOrder find by order
2020-06-21 18:32:04 +02:00
33118ddb2f
Mark lost delivery as delivered. #spaghetticode
2020-06-21 18:25:33 +02:00
a6a2adc7db
implement Config for Supplier and Delivery Service
2020-06-21 16:49:35 +02:00
62df2346c3
fix template crashing when defaultAddr == null
2020-06-21 16:28:00 +02:00
c1a0ecdcf3
fix delivery server crashing when tracking id not found
2020-06-21 16:13:48 +02:00
a1abbf5329
Implement Supplier AutoSupplierPayment. closes #100
2020-06-21 15:50:27 +02:00
deaf283a98
remove db blob
2020-06-21 01:08:58 +02:00
