e-commerce

localhorst/e-commerce

Archived

Fork 0

Commit Graph

Select branches

Hide Pull Requests

master

release

#102

#103

#104

#105

#106

#107

#108

#114

#115

#116

#117

#119

#12

#121

#122

#123

#124

#126

#128

#129

#130

#131

#132

#15

#19

#2

#23

#24

#25

#26

#27

#3

#38

#39

#4

#40

#41

#43

#44

#47

#49

#5

#50

#52

#55

#56

#58

#6

#62

#64

#66

#67

#68

#7

#73

#74

#77

#78

#80

#82

#83

1.0.0

v1.0-final-1

3c69f38367 Revert "added link from listedArticles page to related offered article" localhorst 2020-05-16 22:46:18 +02:00
39fb735f21 added link from listedArticles page to related offered article localhorst 2020-05-16 21:49:31 +02:00
e0f638f0bd UImodel for offeredArticle page, html cleanup localhorst 2020-05-16 13:42:07 +02:00
4f6388e4b9 fixed links to offered articles page localhorst 2020-05-15 20:57:56 +02:00
2bbf8260f4 Merge pull request 'WIP feature/listedArticles' (#15) from feature/listedArticles into master Jannik Seiler 2020-05-15 19:48:21 +02:00
b1840dd845 code cleanup localhorst 2020-05-15 19:47:26 +02:00
dc49bc2e8d code cleanuo localhorst 2020-05-15 19:45:10 +02:00
8c777ca1ff fixed merge bug: cascade = CascadeType.ALL in Article to Categories localhorst 2020-05-15 19:31:31 +02:00
c73435b2a0 Merge remote-tracking branch 'origin/master' into feature/listedArticles Seil0 2020-05-15 19:04:02 +02:00
ea8aaa3931 removed PW bypass localhorst 2020-05-15 18:16:03 +02:00
56efbd7940 code cleanup localhorst 2020-05-15 18:13:12 +02:00
a98782bc01 added new route in external controller localhorst 2020-05-15 14:14:29 +02:00
0de35f1a51 Implement scheduled execution of cronjobs Lukas Fürderer 2020-05-15 13:47:54 +02:00
f403a6e1c4 fix in stock bug Hannes 2020-05-15 12:33:32 +02:00
d06fd57447 added new route for offered articles page localhorst 2020-05-15 11:57:20 +02:00
197a774fb2 removed data folder localhorst 2020-05-14 23:14:33 +02:00
af99e8107d added change for stock, price and autobuy values on article edit page localhorst 2020-05-14 22:16:06 +02:00
f2fc51384e Merge pull request 'update dependencies & gradle' (#12) from feature/spring-boot-2.2.7 into master Jannik Seiler 2020-05-13 19:45:46 +02:00
922e21a454 update dependencies & gradle Seil0 2020-05-13 18:28:21 +02:00
c69b20b914 added POST that changes the article WIP localhorst 2020-05-12 22:52:01 +02:00
c92e485018 Implement API Bindings for SupplierService CodeSteak 2020-05-12 22:42:25 +02:00
62d811db1d Implement First Draft of Supplier API CodeSteak 2020-05-12 22:41:08 +02:00
fd9dcf141e fixes in listed article page and converted form to POST localhorst 2020-05-11 15:32:39 +02:00
09c85fe8cb fixed route for /intern/articles and /intern/suppliers/articles localhorst 2020-05-11 14:32:07 +02:00
22d2744c8c GET article edit page localhorst 2020-05-11 11:58:26 +02:00
bba4173269 fixed inputstream once more localhorst 2020-05-10 22:19:58 +02:00
c14ae996be Merge branch 'feature/listedArticles' of git.mosad.xyz:localhorst/e-commerce into feature/listedArticles localhorst 2020-05-10 21:32:19 +02:00
3a3b7abad0 fix typo Seil0 2020-05-10 15:31:20 +02:00
a2f20938cd show listedArticles localhorst 2020-05-10 15:26:50 +02:00
2b3ecb2342 changed listedArticles Request to own Controller localhorst 2020-05-09 23:01:25 +02:00
143a53acf5 fix better quantities for UI Hannes 2020-05-08 13:01:29 +02:00
bb4aa79243 implement personalized suggestions Hannes 2020-05-08 11:44:30 +02:00
82dacef4c0 Advertised Articles now shown correctly Hannes 2020-05-08 10:37:42 +02:00
262640a2b4 change Databasename and add Advertisementflag Hannes 2020-05-08 09:58:29 +02:00
1e7266e554 implement imageserving and first part of ArticleRepository Hannes 2020-05-07 15:48:00 +02:00
4048d6c5ad Unify Style of error messages to match rest of ui. CodeSteak 2020-05-06 17:00:28 +02:00
572a999467 Implement proper querying of warehouse slot sums and booking accounts. CodeSteak 2020-05-06 14:10:37 +02:00
5f071939d3 Renice error handling CodeSteak 2020-05-05 23:34:17 +02:00
2ec3ad32ea Implement CreateCustomerOrderAction; Not implemented: correct booking and WarehouseBooking fetching... CodeSteak 2020-05-05 22:56:12 +02:00
d2bf6e8c52 implement checkout for non logged in users. CodeSteak 2020-05-05 18:59:15 +02:00
7d83d723c1 Implement add Items to ShoppingCart CodeSteak 2020-05-05 17:24:25 +02:00
4338f188f0 fix local merge conflicts in req ctrl CodeSteak 2020-05-05 17:22:35 +02:00
e9e072b26b ShopIndexController without databasestuff Hannes 2020-05-01 14:40:43 +02:00
8a28aabaf3 ShopIndexController initial implementation Hannes 2020-05-01 12:19:52 +02:00
e1d7becc2e added yaml dump&parse class localhorst 2020-05-10 21:23:44 +02:00
89eaeaed40 Merge pull request 'feature/basic_functions' (#7) from feature/basic_functions into master Jannik Seiler 2020-05-10 17:48:31 +02:00
edcdb2e9cf fix use Math.min for loopcount Hannes 2020-05-10 17:25:48 +02:00
530034a40e fix unused imports and unneeded empty lines Hannes 2020-05-10 17:19:18 +02:00
8f24aee350 fix add should_be_advertised to script Hannes 2020-05-10 17:16:17 +02:00
bd2aeb63f6 Remove unneeded comment CodeSteak 2020-05-10 17:05:19 +02:00
713c8ebe86 Comment empty constructors CodeSteak 2020-05-10 17:03:40 +02:00
e406918ca2 Remove commend out code CodeSteak 2020-05-10 16:57:33 +02:00
e167832164 Merge branch 'feature/basic_functions' of git.mosad.xyz:localhorst/e-commerce into feature/basic_functions CodeSteak 2020-05-10 15:39:35 +02:00
777786f5b6 Remove old missleading comment CodeSteak 2020-05-10 15:39:24 +02:00
7a42122a9a fix typo Seil0 2020-05-10 15:31:20 +02:00
a62e3e8a63 fix only show ordered Articles from specific Customer Hannes 2020-05-10 15:28:39 +02:00
2135c48646 show listedArticles localhorst 2020-05-10 15:26:50 +02:00
7f95cef13b fix personalized suggestions Hannes 2020-05-10 15:03:45 +02:00
95e52cc79d fix non-formatted and non-vatted price Hannes 2020-05-10 14:57:02 +02:00
d4d1426438 Fix decimals in checkout page CodeSteak 2020-05-10 14:34:20 +02:00
d1301f6988 Fix naming-convension-error in ArticleOffer CodeSteak 2020-05-10 14:30:00 +02:00
731f4761fa Show error if articles are not avail during checkout. CodeSteak 2020-05-10 14:29:08 +02:00
d66b3d1385 changed listedArticles Request to own Controller localhorst 2020-05-09 23:01:25 +02:00
69b5b33af8 fix typo in 8dd4cc4459 Seil0 2020-05-09 19:58:31 +02:00
8dd4cc4459 use application.properties when run via bootRun Seil0 2020-05-09 19:31:57 +02:00
c0ce1e23c3 fix better quantities for UI Hannes 2020-05-08 13:01:29 +02:00
1bd267a26d implement personalized suggestions Hannes 2020-05-08 11:44:30 +02:00
e4b4698a27 Advertised Articles now shown correctly Hannes 2020-05-08 10:37:42 +02:00
c097e58bf3 change Databasename and add Advertisementflag Hannes 2020-05-08 09:58:29 +02:00
4fd80bb3c7 implement imageserving and first part of ArticleRepository Hannes 2020-05-07 15:48:00 +02:00
beb0131b60 Unify Style of error messages to match rest of ui. CodeSteak 2020-05-06 17:00:28 +02:00
cdce22968d Implement proper querying of warehouse slot sums and booking accounts. CodeSteak 2020-05-06 14:10:37 +02:00
f5a99700a0 Renice error handling CodeSteak 2020-05-05 23:34:17 +02:00
b2f927e48d Implement CreateCustomerOrderAction; Not implemented: correct booking and WarehouseBooking fetching... CodeSteak 2020-05-05 22:56:12 +02:00
d681f240e1 implement checkout for non logged in users. CodeSteak 2020-05-05 18:59:15 +02:00
31059b4894 Implement add Items to ShoppingCart CodeSteak 2020-05-05 17:24:25 +02:00
cbaec13d38 fix local merge conflicts in req ctrl CodeSteak 2020-05-05 17:22:35 +02:00
a5152aaa3d Merge remote-tracking branch 'origin/feature/start' into feature/basic_functions CodeSteak 2020-05-05 16:48:37 +02:00
f48f5c40f0 ShopArticleController initial Hannes 2020-05-02 14:38:40 +02:00
6ab3b63923 Revert "split RequestController acording to mapping" Seil0 2020-05-01 14:53:35 +02:00
41eb4d0b8f split RequestController acording to mapping Seil0 2020-05-01 14:53:35 +02:00
8f081823ca ShopIndexController without databasestuff Hannes 2020-05-01 14:40:43 +02:00
f67a23bab9 ShopIndexController initial implementation Hannes 2020-05-01 12:19:52 +02:00
0d0f8e3272 Merge branch 'master' of git.mosad.xyz:localhorst/e-commerce CodeSteak 2020-05-01 10:52:53 +02:00
da9a737fd0 Fix Duplicate Names of Controllers CodeSteak 2020-05-01 10:48:12 +02:00
10480bebce Move intern ArticleController to intern Hannes 2020-04-30 10:32:48 +02:00
411760e1d4 Move repos to own package CodeSteak 2020-04-29 23:07:47 +02:00
de6c750e7f Refactor Package Layout CodeSteak 2020-04-29 22:44:16 +02:00
bad1d94f8a add controllers and packages CodeSteak 2020-04-28 22:41:29 +02:00
1186c390fb Implement Entries // TODO: Move to packages, add Repos. CodeSteak 2020-04-28 21:02:33 +02:00
14161b7fd3 Reformat (all the) Code CodeSteak 2020-04-27 09:48:24 +02:00
7c82b7b547 Build Prototype for Login CodeSteak 2020-04-08 18:27:46 +02:00
26b64b8ab4 move /user to separate RequestController Seil0 2020-03-16 13:49:51 +01:00
fd27729072 Fix not using var when accessing sessionStorage CodeSteak 2020-03-06 16:34:12 +01:00
8bc0161e66 Implement some session storage magic for back buttons CodeSteak 2020-03-06 16:11:26 +01:00
d7b9a08829 Refactor checkout CodeSteak 2020-03-06 15:19:56 +01:00
96e8b19f41 Implement message for info CodeSteak 2020-03-05 20:34:59 +01:00
230d71944f fix abschließen btn text CodeSteak 2020-02-12 20:29:06 +01:00
c756469f05 reimplement "fix flow for loggedout checkout" ( b25a9842e4 ) CodeSteak 2020-02-11 23:36:34 +01:00
02deef4ad7 disable cache. Fix invalid value CodeSteak 2020-02-11 22:02:18 +01:00