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

90 Commits

Author SHA1 Message Date
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
CodeSteak cd641d6cc4 Fix #113 by fixing initialization of RestServiceForDelivery. 2020-06-24 01:18:16 +02:00
CodeSteak 8d27c486d5 Add & generate tracking information to (Supplier-)OrderConfirmation. Fixes #110 2020-06-24 00:37:58 +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 d5181f149a Fix showing CustomerOrder all CustomerOrders in my orders. fix displaying orders in random order 2020-06-21 18:58:15 +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 d77b8c046a Fix bad query for article slot sum 2020-06-20 23:24:06 +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
Philipp Schweizer ebb3c8c235 removes unused Imports and fomattet 2020-06-17 17:23:29 +02:00
CodeSteak 18cbfbf148 Fix template strings with a starting "/" 2020-06-17 00:02:46 +02:00
CodeSteak 3b1d378968 Fix not creating directory when uploading file 2020-06-16 23:38:35 +02:00
Danny 6284a4d7bf Dashboard working 2020-06-15 17:47:55 +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
CodeSteak 7397698929 fix check for missing article 2020-06-13 11:54:25 +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 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 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
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 e53c1e0872
Allow the user to create manual bookings 2020-06-05 18:45:25 +02:00
Lukas Fürderer 0061d25082
Display financial bookings in the ui 2020-06-05 07:49:11 +02:00