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

259 Commits

Author SHA1 Message Date
Hendrik Schutter b1840dd845 code cleanup 2020-05-15 19:47:26 +02:00
Hendrik Schutter dc49bc2e8d code cleanuo 2020-05-15 19:45:10 +02:00
Hendrik Schutter 8c777ca1ff fixed merge bug: cascade = CascadeType.ALL in Article to Categories 2020-05-15 19:31:31 +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 56efbd7940 code cleanup 2020-05-15 18:13:12 +02:00
Hendrik Schutter a98782bc01 added new route in external controller 2020-05-15 14:14:29 +02:00
Lukas Fürderer 0de35f1a51
Implement scheduled execution of cronjobs 2020-05-15 13:47:54 +02:00
Hannes Huber f403a6e1c4 fix in stock bug 2020-05-15 12:33:32 +02:00
Hendrik Schutter d06fd57447 added new route for offered articles page 2020-05-15 11:57:20 +02:00
Hendrik Schutter af99e8107d added change for stock, price and autobuy values on article edit page 2020-05-14 22:16:06 +02:00
Hendrik Schutter c69b20b914 added POST that changes the article WIP 2020-05-12 22:52:01 +02:00
CodeSteak c92e485018 Implement API Bindings for SupplierService 2020-05-12 22:42:25 +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 22d2744c8c GET article edit page 2020-05-11 11:58:26 +02:00
Hendrik Schutter bba4173269 fixed inputstream once more 2020-05-10 22:19:58 +02:00
Hendrik Schutter a2f20938cd show listedArticles 2020-05-10 21:30:50 +02:00
Hendrik Schutter 2b3ecb2342 changed listedArticles Request to own Controller 2020-05-10 21:30:50 +02:00
Hannes Huber 143a53acf5 fix better quantities for UI 2020-05-10 21:30:50 +02:00
Hannes Huber bb4aa79243 implement personalized suggestions 2020-05-10 21:30:50 +02:00
Hannes Huber 82dacef4c0 Advertised Articles now shown correctly 2020-05-10 21:30:50 +02:00
Hannes Huber 262640a2b4 change Databasename and add Advertisementflag 2020-05-10 21:30:50 +02:00
Hannes Huber 1e7266e554 implement imageserving and first part of ArticleRepository 2020-05-10 21:30:50 +02:00
CodeSteak 572a999467 Implement proper querying of warehouse slot sums and booking accounts. 2020-05-10 21:30:50 +02:00
CodeSteak 5f071939d3 Renice error handling 2020-05-10 21:30:50 +02:00
CodeSteak 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 d2bf6e8c52 implement checkout for non logged in users. 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 e9e072b26b ShopIndexController without databasestuff 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
Hannes Huber edcdb2e9cf fix use Math.min for loopcount 2020-05-10 17:25:48 +02:00
Hannes Huber 530034a40e fix unused imports and unneeded empty lines 2020-05-10 17:19:18 +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
Hannes Huber a62e3e8a63 fix only show ordered Articles from specific Customer 2020-05-10 15:28:39 +02:00
Hannes Huber 7f95cef13b fix personalized suggestions 2020-05-10 15:03:45 +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
Hannes Huber c0ce1e23c3 fix better quantities for UI 2020-05-08 13:01:29 +02:00
Hannes Huber 1bd267a26d implement personalized suggestions 2020-05-08 11:44:30 +02:00
Hannes Huber e4b4698a27 Advertised Articles now shown correctly 2020-05-08 10:37:42 +02:00
Hannes Huber c097e58bf3 change Databasename and add Advertisementflag 2020-05-08 10:00:22 +02:00
Hannes Huber 4fd80bb3c7 implement imageserving and first part of ArticleRepository 2020-05-08 10:00:22 +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
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 8f081823ca ShopIndexController without databasestuff 2020-05-01 14:40:43 +02:00
Hannes Huber f67a23bab9 ShopIndexController initial implementation 2020-05-01 12:19:52 +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
Jannik 26b64b8ab4
move /user to separate RequestController 2020-03-16 13:49:51 +01:00
CodeSteak d7b9a08829 Refactor checkout 2020-03-06 15:19:56 +01:00
CodeSteak 96e8b19f41 Implement message for info 2020-03-05 20:34:59 +01:00
CodeSteak c756469f05 reimplement "fix flow for loggedout checkout" ( b25a9842e4 ) 2020-02-11 23:36:34 +01:00
CodeSteak 4d899f4446 fix project setup for enabling production builds 2020-02-09 15:00:07 +01:00
CodeSteak 79a20f54d3 impl error in header 2020-02-06 19:44:51 +01:00
CodeSteak 58473e58a3 impl Warehouse 2020-02-03 20:53:02 +01:00
CodeSteak 06ade43304 impl listed articles 2020-02-01 23:43:44 +01:00
CodeSteak 307a4fad4c implement Artikels 2020-02-01 15:02:19 +01:00
CodeSteak b1fd77f6b6 implement accountings 2020-01-27 20:37:54 +01:00
CodeSteak 62324e4760 add bonuspoint option for checkout 2020-01-26 13:55:23 +01:00
CodeSteak b25a9842e4 fix flow for loggedout checkout 2020-01-26 13:47:54 +01:00
CodeSteak 26d05eace5 implement login + header 2020-01-25 22:13:26 +01:00
CodeSteak 18232fd0cb impl. Notifications 2020-01-25 20:30:26 +01:00
CodeSteak 5ae07a444e build controller 2020-01-23 19:08:04 +01:00
CodeSteak 3814f8d420 reorder files 2020-01-23 18:46:49 +01:00
Jannik de8aaae8cc
added customer/orderhistory 2020-01-22 19:27:45 +01:00
Philipp Schweizer c204a5e5a0 Merge branch 'customers_suppliers_templates' 2020-01-20 21:51:48 +01:00
Philipp Schweizer c8cdcf2a8c template Files for customers and suppliers created 2020-01-20 20:59:35 +01:00
Jannik 9681dceb8b
reworked login/register, GetMapping fixes 2020-01-20 20:22:37 +01:00
Lukas Fürderer ef08c8d1c8
Implement a prototype to add new articles 2020-01-19 18:48:09 +01:00
Lukas Fürderer ececdac3a9
Implement a prototype for notifications 2020-01-19 18:46:32 +01:00
CodeSteak d4e670218f Merge branch 'master' of git.mosad.xyz:localhorst/e-commerce 2020-01-19 18:43:51 +01:00
CodeSteak b7ad62d2f2 add manual accounting route 2020-01-19 18:43:19 +01:00
Hannes Huber 619e586280 add checkout 2020-01-18 15:34:54 +01:00
CodeSteak ce201c5d85 add accounting pages 2020-01-16 21:01:15 +01:00
CodeSteak d7161d3796 move internal pages from employee to intern 2020-01-16 20:17:48 +01:00
Jannik ec0f67784b
create database and customer table if it does not exist 2020-01-15 20:30:48 +01:00
Jannik 26e9e2bfc0
sqlite part 1 2020-01-15 10:56:53 +01:00
Jannik 7bbf5eb963
sqlite part 0 2020-01-15 10:56:53 +01:00
Jannik d3be609d16
added customer account settings [Part 1] 
* moved footer Mapping to the bottom of RequestController()
 2020-01-15 10:55:24 +01:00
Hendrik Schutter 7177bc8f09 fixes links in footer; added about pages 2020-01-14 20:50:47 +01:00
CodeSteak 4d153b8d87 (Partial) Implement of listedArticlesEdit.html 2020-01-12 19:42:04 +01:00
CodeSteak 255195715f Implement Listed Articles Overview 2020-01-12 18:00:40 +01:00
CodeSteak 17d2e741cf Fix templateName casing for articledetail and searchresults 2020-01-12 16:03:42 +01:00
Hannes Huber 213c5a2c94 initial searchresult and detailview 2020-01-11 16:39:34 +01:00
Jannik a44efe06b7
reworked login to actually use a database 
* added a very basic login setup, see wiki.mosad.xyz for more information
* updated spring boot to 2.2.2
 2019-12-08 17:16:17 +01:00
Jannik adf1502b2b
added a minimal login dialog 
* added session cookie being set on login, login-data is not stored or validated
 2019-12-08 12:24:28 +01:00
Jannik 87bb9d4a44
added a first GUI Prototype 
* based on ecom.css
* accessible via localhost:8080/
 2019-11-26 16:21:29 +01:00
Jannik 6f6f705495
updated spring boot to 2.2.1 
* added a header as fragment
 2019-11-25 16:15:36 +01:00
Jannik 89748e7ef5
added a very simple Spring Boot Web App prototype 2019-11-19 19:34:57 +01:00