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

88 Commits

Author SHA1 Message Date
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
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
Philipp Schweizer ebb3c8c235 removes unused Imports and fomattet 2020-06-17 17:23:29 +02:00
Jannik d5825ba7a0
use @Autowired to get AppSettings Object 2020-06-16 20:42:40 +02:00
Jannik 774e62f892
add suppliers to YAMLData, store data in AppSettings() 2020-06-16 19:19:58 +02:00
Jannik e1c00eca8f
fix ApplicationSettings.readConfig() 2020-06-16 18:52:33 +02:00
Jannik d121532fba
Merge remote-tracking branch 'origin/master' into feature/config 2020-06-14 21:15:37 +02:00
Philipp Schweizer 266bba095a merged feature/customer_orders with master 2020-06-13 19:58:30 +02:00
Hendrik Schutter a41889b2cb login in extern loginController, RequestController cleanup, login right after register 2020-06-12 23:48:28 +02:00
Philipp ebeba72278 impl tracking ID 2020-06-10 17:03:59 +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
Hendrik Schutter d078c44027 finished supplier orders 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 0061d25082
Display financial bookings in the ui 2020-06-05 07:49:11 +02:00
CodeSteak 976e2d1949 Implement Warehouse.... 
Sry, only one commit. No time to make history ;D
 2020-06-01 20:25:51 +02:00
Hannes Huber 2394157be8 implement getCustomerOrder 2020-06-01 11:31:12 +02:00
Hannes Huber 106b00a907 show usersettings from db 2020-05-27 13:40:44 +02:00
Tyro ac79e1cf22 Check for inactive accounts 
Check for employee by access on /intern
 2020-05-24 21:51:40 +02:00
Tyro 7686c4cda6 Create rudimentary register class 2020-05-19 15:41:43 +02:00
Hannes Huber 3f5b1efa0c implement search 2020-05-17 13:08:18 +02:00
Hendrik Schutter dc49bc2e8d code cleanuo 2020-05-15 19:45:10 +02:00
Jannik c73435b2a0
Merge remote-tracking branch 'origin/master' into feature/listedArticles 2020-05-15 19:04:02 +02:00
Hendrik Schutter ea8aaa3931 removed PW bypass 2020-05-15 18:16:03 +02:00
Hendrik Schutter a98782bc01 added new route in external controller 2020-05-15 14:14:29 +02:00
Hendrik Schutter d06fd57447 added new route for offered articles page 2020-05-15 11:57:20 +02:00
Hendrik Schutter fd9dcf141e fixes in listed article page and converted form to POST 2020-05-11 15:32:39 +02:00
Hendrik Schutter 09c85fe8cb fixed route for /intern/articles and /intern/suppliers/articles 2020-05-11 14:32:07 +02:00
Hendrik Schutter bba4173269 fixed inputstream once more 2020-05-10 22:19:58 +02:00
Hendrik Schutter 2b3ecb2342 changed listedArticles Request to own Controller 2020-05-10 21:30:50 +02:00
CodeSteak 7d83d723c1 Implement add Items to ShoppingCart 2020-05-10 21:30:50 +02:00
CodeSteak 4338f188f0 fix local merge conflicts in req ctrl 2020-05-10 21:30:50 +02:00
Hannes Huber 8a28aabaf3 ShopIndexController initial implementation 2020-05-10 21:30:50 +02:00
Hendrik Schutter e1d7becc2e added yaml dump&parse class 2020-05-10 21:23:44 +02:00
CodeSteak e406918ca2 Remove commend out code 2020-05-10 16:57:33 +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
Hannes Huber f48f5c40f0 ShopArticleController initial 2020-05-02 14:38:40 +02:00
Jannik 6ab3b63923
Revert "split RequestController acording to mapping" 
This reverts commit 41eb4d0b8f.
 2020-05-01 15:25:50 +02:00
Jannik 41eb4d0b8f
split RequestController acording to mapping 2020-05-01 14:53:35 +02:00
Hannes Huber f67a23bab9 ShopIndexController initial implementation 2020-05-01 12:19:52 +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 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
Jannik 26b64b8ab4
move /user to separate RequestController 2020-03-16 13:49:51 +01:00