CodeSteak
bdd1017232
Set Default Payment on first order
2020-06-25 11:46:01 +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
CodeSteak
cdc372d574
Redirect to intern if employee.
2020-06-24 18:40:22 +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
CodeSteak
5861b61565
Merge branch 'master' into feature/supplier_tracking
2020-06-24 10:44:38 +02:00
CodeSteak
f0c9823e45
Clearify Inventory view with text.
2020-06-24 09:53:19 +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
33118ddb2f
Mark lost delivery as delivered. #spaghetticode
2020-06-21 18:25:33 +02:00
CodeSteak
a6a2adc7db
implement Config for Supplier and Delivery Service
2020-06-21 16:49:35 +02:00
CodeSteak
62df2346c3
fix template crashing when defaultAddr == null
2020-06-21 16:28:00 +02:00
CodeSteak
c1a0ecdcf3
fix delivery server crashing when tracking id not found
2020-06-21 16:13:48 +02:00
CodeSteak
a1abbf5329
Implement Supplier AutoSupplierPayment. closes #100
2020-06-21 15:50:27 +02:00
CodeSteak
deaf283a98
remove db blob
2020-06-21 01:08:58 +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
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
CodeSteak
9389675b5c
Do not show dupliactes in category search. fixes #85
2020-06-21 00:01:28 +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
ffea25c082
Merge pull request 'Fix bad query for article slot sum' ( #102 ) from feature/89_fix_lagerstand into master
2020-06-20 23:30:12 +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
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
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
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
CodeSteak
7397698929
fix check for missing article
2020-06-13 11:54:25 +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
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
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
CodeSteak
976e2d1949
Implement Warehouse....
...
Sry, only one commit. No time to make history ;D
2020-06-01 20:25:51 +02:00
CodeSteak
e4489ff3a6
Merge branch 'feature/supplier_api' into feature/reorder_cronjob
2020-05-29 16:13:29 +02:00
CodeSteak
2c2b5c1d0f
Add Missing Gradle Folder to Repo
2020-05-29 16:12:28 +02:00
CodeSteak
c92e485018
Implement API Bindings for SupplierService
2020-05-12 22:42:25 +02:00
CodeSteak
62d811db1d
Implement First Draft of Supplier API
2020-05-12 22:41:08 +02:00
CodeSteak and localhorst
4048d6c5ad
Unify Style of error messages to match rest of ui.
2020-05-10 21:30:50 +02:00
CodeSteak and localhorst
572a999467
Implement proper querying of warehouse slot sums and booking accounts.
2020-05-10 21:30:50 +02:00
CodeSteak and localhorst
5f071939d3
Renice error handling
2020-05-10 21:30:50 +02:00
CodeSteak and localhorst
2ec3ad32ea
Implement CreateCustomerOrderAction; Not implemented: correct booking and WarehouseBooking fetching...
...
Puhh, that was a struggle to get working. Damn JPA Shit
2020-05-10 21:30:50 +02:00
CodeSteak and localhorst
d2bf6e8c52
implement checkout for non logged in users.
2020-05-10 21:30:50 +02:00
CodeSteak and localhorst
7d83d723c1
Implement add Items to ShoppingCart
2020-05-10 21:30:50 +02:00
CodeSteak and localhorst
4338f188f0
fix local merge conflicts in req ctrl
2020-05-10 21:30:50 +02:00
CodeSteak
bd2aeb63f6
Remove unneeded comment
2020-05-10 17:05:19 +02:00
CodeSteak
713c8ebe86
Comment empty constructors
2020-05-10 17:03:40 +02:00
CodeSteak
e406918ca2
Remove commend out code
2020-05-10 16:57:33 +02:00
CodeSteak
e167832164
Merge branch 'feature/basic_functions' of git.mosad.xyz:localhorst/e-commerce into feature/basic_functions
2020-05-10 15:39:35 +02:00
CodeSteak
777786f5b6
Remove old missleading comment
2020-05-10 15:39:24 +02:00
CodeSteak
d4d1426438
Fix decimals in checkout page
2020-05-10 14:34:20 +02:00
CodeSteak
d1301f6988
Fix naming-convension-error in ArticleOffer
2020-05-10 14:30:00 +02:00
CodeSteak
731f4761fa
Show error if articles are not avail during checkout.
2020-05-10 14:29:08 +02:00
CodeSteak
beb0131b60
Unify Style of error messages to match rest of ui.
2020-05-06 17:00:28 +02:00
CodeSteak
cdce22968d
Implement proper querying of warehouse slot sums and booking accounts.
2020-05-06 14:10:37 +02:00
CodeSteak
f5a99700a0
Renice error handling
2020-05-05 23:34:17 +02:00
CodeSteak
b2f927e48d
Implement CreateCustomerOrderAction; Not implemented: correct booking and WarehouseBooking fetching...
...
Puhh, that was a struggle to get working. Damn JPA Shit
2020-05-05 22:56:12 +02:00
CodeSteak
d681f240e1
implement checkout for non logged in users.
2020-05-05 18:59:15 +02:00
CodeSteak
31059b4894
Implement add Items to ShoppingCart
2020-05-05 17:24:25 +02:00
CodeSteak
cbaec13d38
fix local merge conflicts in req ctrl
2020-05-05 17:22:35 +02:00
CodeSteak
a5152aaa3d
Merge remote-tracking branch 'origin/feature/start' into feature/basic_functions
2020-05-05 16:48:37 +02:00
CodeSteak
0d0f8e3272
Merge branch 'master' of git.mosad.xyz:localhorst/e-commerce
2020-05-01 10:52:53 +02:00
CodeSteak
da9a737fd0
Fix Duplicate Names of Controllers
2020-05-01 10:48:12 +02:00
CodeSteak
411760e1d4
Move repos to own package
2020-04-29 23:07:47 +02:00
CodeSteak
de6c750e7f
Refactor Package Layout
2020-04-29 22:44:16 +02:00
CodeSteak
bad1d94f8a
add controllers and packages
2020-04-28 22:41:29 +02:00
CodeSteak
1186c390fb
Implement Entries // TODO: Move to packages, add Repos.
2020-04-28 21:02:33 +02:00
CodeSteak
14161b7fd3
Reformat (all the) Code
2020-04-27 09:48:24 +02:00
CodeSteak
7c82b7b547
Build Prototype for Login
2020-04-08 18:27:46 +02:00
CodeSteak
fd27729072
Fix not using var when accessing sessionStorage
2020-03-06 16:34:12 +01:00
CodeSteak
8bc0161e66
Implement some session storage magic for back buttons
2020-03-06 16:11:26 +01:00
CodeSteak
