Commit Graph

218 Commits

Author SHA1 Message Date
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 4048d6c5ad Unify Style of error messages to match rest of ui. 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
Jannik 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
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
Hannes Huber 8f24aee350 fix add should_be_advertised to script 2020-05-10 17:16:17 +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
Hannes Huber 95e52cc79d fix non-formatted and non-vatted price 2020-05-10 14:57:02 +02:00
CodeSteak d4d1426438 Fix decimals in checkout page 2020-05-10 14:34:20 +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
Jannik 69b5b33af8
fix typo in 8dd4cc4459 2020-05-09 19:58:31 +02:00
Jannik 8dd4cc4459
use application.properties when run via bootRun 2020-05-09 19:31:57 +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 beb0131b60 Unify Style of error messages to match rest of ui. 2020-05-06 17:00:28 +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 fd27729072 Fix not using var when accessing sessionStorage 2020-03-06 16:34:12 +01:00
CodeSteak 8bc0161e66 Implement some session storage magic for back buttons 2020-03-06 16:11:26 +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 230d71944f fix abschließen btn text 2020-02-12 20:29:06 +01:00
CodeSteak c756469f05 reimplement "fix flow for loggedout checkout" ( b25a9842e4 ) 2020-02-11 23:36:34 +01:00
CodeSteak 02deef4ad7 disable cache. Fix invalid value 2020-02-11 22:02:18 +01:00
CodeSteak 4d899f4446 fix project setup for enabling production builds 2020-02-09 15:00:07 +01:00
CodeSteak 4946332c30 add prop for thing that makes build jar crash 2020-02-09 11:50:58 +01:00
CodeSteak da8c2e0a2b Merge branch 'master' of git.mosad.xyz:localhorst/e-commerce 2020-02-09 11:40:48 +01:00
CodeSteak 5f51e6e007 dont put database in jar file when building.
The resource folder ends up in the jar file. The database is NOT a
static resource
2020-02-09 11:38:59 +01:00
Hannes Huber 2d2258d02e fix dashboard description 2020-02-08 14:07:50 +01:00
CodeSteak a7f63c65ca fix warehouse link II 2020-02-08 14:05:29 +01:00
CodeSteak 9a28ccd7dd fix warehouse sidebar link 2020-02-08 14:04:06 +01:00
CodeSteak 79a20f54d3 impl error in header 2020-02-06 19:44:51 +01:00
CodeSteak d5ae1df4a6 imple employee custm. 2020-02-06 19:22:41 +01:00
CodeSteak 0f85bf8ef7 fix type lagerplatz 2020-02-05 21:04:22 +01:00
CodeSteak ab1a6b7ea0 fix booking views 2020-02-05 21:01:26 +01:00
CodeSteak a7008c4ce8 unify EUR vs € 2020-02-04 21:32:19 +01:00
CodeSteak 2c9ff570aa impl bad dashboard 2020-02-04 21:30:21 +01:00
CodeSteak 57f8e640c4 fix add settings 2020-02-04 20:13:41 +01:00
CodeSteak f6e57d3a80 fix id list for slots 2020-02-03 20:58:15 +01:00
CodeSteak c4544f18e0 Merge branch 'master' of git.mosad.xyz:localhorst/e-commerce 2020-02-03 20:53:51 +01:00
CodeSteak 58473e58a3 impl Warehouse 2020-02-03 20:53:02 +01:00
Jannik f102246b85
fix error pages 2020-02-03 17:17:55 +01:00
CodeSteak 2fc0b54716 impl suppliers 2020-02-02 00:27:11 +01:00
CodeSteak 06ade43304 impl listed articles 2020-02-01 23:43:44 +01:00
CodeSteak 91b8533c25 implement customers 2020-02-01 22:57:09 +01:00
CodeSteak 622f4cbe23 implment order overview 2020-02-01 15:26:26 +01:00
CodeSteak 307a4fad4c implement Artikels 2020-02-01 15:02:19 +01:00
CodeSteak 088d3ec5f1 implement logo #1 draft 2020-02-01 14:23:13 +01:00
CodeSteak d134f90159 fix manual Booking 2020-01-27 20:39:02 +01:00
CodeSteak b1fd77f6b6 implement accountings 2020-01-27 20:37:54 +01:00
CodeSteak 24d0cfae67 prepare dashboard 2020-01-27 19:04:11 +01:00
CodeSteak f743c4dec6 fix dead link1s 2020-01-26 15:54:37 +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 f53a442fa6 fix login + headerwidth 2020-01-25 22:17:16 +01:00
CodeSteak 26d05eace5 implement login + header 2020-01-25 22:13:26 +01:00
CodeSteak 5cd4f87096 fix users sidebar 2020-01-25 20:36:33 +01:00
CodeSteak 18232fd0cb impl. Notifications 2020-01-25 20:30:26 +01:00