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

504 Commits

Author SHA1 Message Date
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
Lukas Fürderer a950ecb2b9 Make delivery/gradlew executable 2020-06-21 18:42:33 +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
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 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
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
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
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 f4aae9c581
ignore config.yml 2020-06-18 14:07:59 +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 8416783e0a merged 2020-06-18 01:13:03 +02:00
Philipp Schweizer bcbebe8e8d master merged into feature/customer_orders 2020-06-18 01:11:11 +02:00
Philipp Schweizer a570696795 feature/customer_orders merged into master 2020-06-18 01:07: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
Hannes Huber ef07447abc fix json-file 2020-06-17 20:42:08 +02:00
Lukas Fürderer bb7b35dc28 Increase the amount of commits 2020-06-17 19:00:49 +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
Lukas Fürderer 1812c89994 Fix typo 2020-06-17 18:55:29 +02:00
Jannik 2442a477c8
add missing "|" 2020-06-17 18:43:06 +02:00
Philipp Schweizer ebb3c8c235 removes unused Imports and fomattet 2020-06-17 17:23:29 +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