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
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
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
cdc372d574
Redirect to intern if employee.
2020-06-24 18:40:22 +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
Jannik
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
CodeSteak
577a4f72f0
Clean Shopping Cart on Logout for real
2020-06-24 18:25:42 +02:00
CodeSteak
a2aca7a8ca
Clean Shopping Cart on Logout
2020-06-24 18:23:01 +02:00
Jannik
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
Jannik
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
CodeSteak
5861b61565
Merge branch 'master' into feature/supplier_tracking
2020-06-24 10:44:38 +02:00
CodeSteak
6fbb16fea2
Show advertisements distinct.
2020-06-24 02:20:24 +02:00
CodeSteak
0d547c8903
Fix display order in various locations. closes #120
2020-06-24 02:15:31 +02:00
CodeSteak
5162e3fc19
Fix in stock calculation. closes #118
2020-06-24 02:05:25 +02:00
CodeSteak
8bfe8b37f5
Maybe Fix warehouse booking repo
2020-06-24 02:00:37 +02:00
CodeSteak
2e07d03908
Fix warehouse bookings on CreateOrderAction
2020-06-24 01:48:33 +02:00
CodeSteak
b9e87f5bd4
Add additional infos for order history in /user/... fixes #109
2020-06-24 01:19:37 +02:00
CodeSteak
cd641d6cc4
Fix #113 by fixing initialization of RestServiceForDelivery.
2020-06-24 01:18:16 +02:00
CodeSteak
4e9f7800be
Remove WarehouseBookingReason it was not used.
2020-06-24 00:42:55 +02:00
CodeSteak
8d27c486d5
Add & generate tracking information to (Supplier-)OrderConfirmation. Fixes #110
2020-06-24 00:37:58 +02:00
CodeSteak
714ac4f1de
Fix issues with class loading in Cronjobs
2020-06-24 00:35:18 +02:00
CodeSteak
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
CodeSteak
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
CodeSteak
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
CodeSteak
7fafd14715
Fix variable name
2020-06-21 19:01:25 +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
f42a50d24d
fix CustomerOrder find by order
2020-06-21 18:32:04 +02:00
CodeSteak
a6a2adc7db
implement Config for Supplier and Delivery Service
2020-06-21 16:49:35 +02:00
CodeSteak
a1abbf5329
Implement Supplier AutoSupplierPayment. closes #100
2020-06-21 15:50:27 +02:00
CodeSteak
ffe9af0633
Prevent duplicate Articles from ArticleOffer
2020-06-21 01:07:04 +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
b846b919b7
code clean up
2020-06-21 00:14:00 +02:00
Hendrik Schutter
1f83a82f17
removed user.name and use user.defaultDeliveryAddress.name instead
2020-06-21 00:13:10 +02:00
Hannes Huber
cd1a8568e6
show only one entry per article suggestions fix #96
2020-06-21 00:06:15 +02:00
CodeSteak
9389675b5c
Do not show dupliactes in category search. fixes #85
2020-06-21 00:01:28 +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
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
1812c89994
Fix typo
2020-06-17 18:55:29 +02:00