localhorst/e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity
380 Commits 2 Branches 2 Tags
d5825ba7a0388afd545e20b7ac999ddd423631b8
Commit Graph
63 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Seil0 d5825ba7a0 use @Autowired to get AppSettings Object 2020-06-16 20:42:40 +02:00
Seil0 774e62f892 add suppliers to YAMLData, store data in AppSettings() 2020-06-16 19:19:58 +02:00
Seil0 e1c00eca8f fix ApplicationSettings.readConfig() 2020-06-16 18:52:33 +02:00
Seil0 d121532fba Merge remote-tracking branch 'origin/master' into feature/config 2020-06-14 21:15:37 +02:00
Seil0 76550be9e7 Merge pull request 'Allow partial discount on supplier orders' (#68) from fix/discount_calculation_in_supplier_service into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-13 12:21:26 +02:00
Seil0 ef8aa826a3 Merge pull request 'Fix the cash booking sum on customer order' (#67) from fix/wrong_bookings_on_customer_order into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-13 12:19:18 +02:00
Seil0 114453b5b9 Merge pull request 'Implement Arrival of Supplier Order.' (#62) from feature/supplier_order_arrived_button into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-13 11:59:17 +02:00
Seil0 30226c5c19 Merge pull request 'fixes_ui' (#66) from fixes_ui into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-13 11:03:20 +02:00
Seil0 d2b98f083b Merge pull request 'fix missing cells in TODO-Warehouse. fixes #63' (#64) from feature/63_fix_todo_ui into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-13 10:26:36 +02:00
Seil0 16803d2b12 Merge pull request 'feature/customers' (#58) from feature/customers into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-12 00:52:53 +02:00
Seil0 7f643987f3 fix wrong closing tags in customerOrder/id.html 2020-06-10 19:12:34 +02:00
Seil0 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
Seil0 e7e2017825 Merge pull request 'Show a hyphen in supplier column if an article is not offered by anyone' (#56) from fix/null_pointer_deref_in_SupplierOfferController into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-09 14:06:51 +02:00
Seil0 6317780dfa Merge pull request 'Implement Warehouse....' (#47) from feature/intern_warehouse into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-08 13:40:10 +02:00
Seil0 41320473d9 Merge pull request 'feature/supplier_page' (#52) from feature/supplier_page into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-07 15:00:56 +02:00
Seil0 d4ddd8a9a3 Merge pull request 'feature/user' (#38) from feature/user into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-03 18:36:06 +02:00
Seil0 21502a0b1c Merge branch 'master' into feature/user 2020-06-01 19:03:42 +02:00
Seil0 b38ffdea34 Merge pull request 'feature/offered_article_supplier' (#40) from feature/offered_article_supplier into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-01 17:10:21 +02:00
Seil0 6988d3f213 minor code clean up 2020-06-01 17:10:04 +02:00
Seil0 f5ad05f49f Merge branch 'master' into feature/offered_article_supplier 2020-06-01 17:04:52 +02:00
Seil0 e539a9433a Merge pull request 'implement better search' (#43) from feature/search into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-01 16:59:37 +02:00
Seil0 b14c565e81 Merge pull request 'Store the cheapest supplier for each offered article in the database' (#41) from feature/reorder_cronjob into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-01 16:53:58 +02:00
Seil0 b04d627695 Merge pull request 'check if article.image is null' (#44) from fix/image_null into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-01 16:51:23 +02:00
Seil0 1a1502b38c Merge pull request 'feature/reorder_cronjob' (#27) from feature/reorder_cronjob into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-05-29 16:20:04 +02:00
Seil0 d55a50ab29 [supplier] update gradle to version 6.4 2020-05-29 16:18:22 +02:00
Seil0 e9a3cb51ba Merge pull request 'fix/intern_articles' (#39) from fix/intern_articles into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-05-28 13:23:01 +02:00
Seil0 f4b0d6a576 fix html warnings [2] 2020-05-28 13:22:28 +02:00
Seil0 2bf383b113 fix html warnings 2020-05-28 13:20:42 +02:00
Seil0 ff5b0afc93 Merge pull request 'feature/delivery_api' (#25) from feature/delivery_api into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-05-28 12:19:29 +02:00
Seil0 747eb1cde2 Merge pull request 'feature/register' (#24) from feature/register into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-05-25 10:51:33 +02:00
Seil0 e571e21281 Merge pull request 'feature/image' (#26) from feature/image into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-05-23 18:51:15 +02:00
Seil0 32c6b8cb68 Merge pull request 'feature/offeredArticle' (#23) from feature/offeredArticle into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-05-21 20:25:53 +02:00
Seil0 525a5f7eb1 Merge branch 'master' into feature/offeredArticle 2020-05-21 20:23:47 +02:00
Seil0 5c5df83872 Merge pull request 'feature/search' (#19) from feature/search into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-05-18 09:42:06 +02:00
Seil0 2bbf8260f4 Merge pull request 'WIP feature/listedArticles' (#15) from feature/listedArticles into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-05-15 19:48:21 +02:00
Seil0 c73435b2a0 Merge remote-tracking branch 'origin/master' into feature/listedArticles 2020-05-15 19:04:02 +02:00
Seil0 f2fc51384e Merge pull request 'update dependencies & gradle' (#12) from feature/spring-boot-2.2.7 into master 
Reviewed-by: CodeSteak <codesteak@shellf.art>
 2020-05-13 19:45:46 +02:00
Seil0 922e21a454 update dependencies & gradle 
* gradle 5.6.2 -> 6.4
* spring boot 2.2.2 -> 2.2.7
* sqlite-jdbc 3.28.0 -> 3.31.1
 2020-05-13 18:28:21 +02:00
Seil0andlocalhorst 3a3b7abad0 fix typo 2020-05-10 21:30:50 +02:00
Seil0 89eaeaed40 Merge pull request 'feature/basic_functions' (#7) from feature/basic_functions into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-05-10 17:48:31 +02:00
Seil0 7a42122a9a fix typo 2020-05-10 15:31:20 +02:00
Seil0 69b5b33af8 fix typo in 8dd4cc4459 2020-05-09 19:58:31 +02:00
Seil0 8dd4cc4459 use application.properties when run via bootRun 2020-05-09 19:31:57 +02:00
Seil0 6ab3b63923 Revert "split RequestController acording to mapping" 
This reverts commit 41eb4d0b8f.
 2020-05-01 15:25:50 +02:00
Seil0 41eb4d0b8f split RequestController acording to mapping 2020-05-01 14:53:35 +02:00
Seil0 26b64b8ab4 move /user to separate RequestController 2020-03-16 13:49:51 +01:00
Seil0 f102246b85 fix error pages 2020-02-03 17:17:55 +01:00
Seil0 de8aaae8cc added customer/orderhistory 2020-01-22 19:27:45 +01:00
Seil0 9681dceb8b reworked login/register, GetMapping fixes 2020-01-20 20:22:37 +01:00
Seil0 ec0f67784b create database and customer table if it does not exist 2020-01-15 20:30:48 +01:00
Seil0 25101f14e7 added databases in the resource folder to gitignore 2020-01-15 20:03:53 +01:00
Seil0 27029333c0 Delete 'prototype/src/main/resources/test.db' 2020-01-15 20:02:31 +01:00
Seil0andGitea 1c6d7c8032 Merge branch 'sqlite' of localhorst/e-commerce into master 2020-01-15 11:09:40 +01:00
Seil0 1c27a2a53e removed unneeded spring-boot dependency 2020-01-15 11:07:57 +01:00
Seil0 26e9e2bfc0 sqlite part 1 2020-01-15 10:56:53 +01:00
Seil0 7bbf5eb963 sqlite part 0 2020-01-15 10:56:53 +01:00
Seil0 d3be609d16 added customer account settings [Part 1] 
* moved footer Mapping to the bottom of RequestController()
 2020-01-15 10:55:24 +01:00
Seil0 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
Seil0 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
Seil0 87bb9d4a44 added a first GUI Prototype 
* based on ecom.css
* accessible via localhost:8080/
 2019-11-26 16:21:29 +01:00
Seil0 6f6f705495 updated spring boot to 2.2.1 
* added a header as fragment
 2019-11-25 16:15:36 +01:00
Seil0 89748e7ef5 added a very simple Spring Boot Web App prototype 2019-11-19 19:34:57 +01:00
Seil0 588c4491fd Added charter, this will be removed once the wiki is ready 2019-10-20 11:58:24 +02:00