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  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c69b20b914 
					 
					
						
						
							
							added POST that changes the article WIP  
						
						 
						
						
						
						
					 
					
						2020-05-12 22:52:01 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c92e485018 
					 
					
						
						
							
							Implement API Bindings for SupplierService  
						
						 
						
						
						
						
					 
					
						2020-05-12 22:42:25 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						62d811db1d 
					 
					
						
						
							
							Implement First Draft of Supplier API  
						
						 
						
						
						
						
					 
					
						2020-05-12 22:41:08 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						fd9dcf141e 
					 
					
						
						
							
							fixes in listed article page and converted form to POST  
						
						 
						
						
						
						
					 
					
						2020-05-11 15:32:39 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						09c85fe8cb 
					 
					
						
						
							
							fixed route for /intern/articles and /intern/suppliers/articles  
						
						 
						
						
						
						
					 
					
						2020-05-11 14:32:07 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						22d2744c8c 
					 
					
						
						
							
							GET article edit page  
						
						 
						
						
						
						
					 
					
						2020-05-11 11:58:26 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c14ae996be 
					 
					
						
						
							
							Merge branch 'feature/listedArticles' of git.mosad.xyz:localhorst/e-commerce into feature/listedArticles  
						
						 
						
						
						
						
					 
					
						2020-05-10 21:32:19 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						3a3b7abad0 
					 
					
						
						
							
							fix typo  
						
						 
						
						
						
						
					 
					
						2020-05-10 21:30:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a2f20938cd 
					 
					
						
						
							
							show listedArticles  
						
						 
						
						
						
						
					 
					
						2020-05-10 21:30:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						2b3ecb2342 
					 
					
						
						
							
							changed listedArticles Request to own Controller  
						
						 
						
						
						
						
					 
					
						2020-05-10 21:30:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						143a53acf5 
					 
					
						
						
							
							fix better quantities for UI  
						
						 
						
						
						
						
					 
					
						2020-05-10 21:30:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						bb4aa79243 
					 
					
						
						
							
							implement personalized suggestions  
						
						 
						
						
						
						
					 
					
						2020-05-10 21:30:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						82dacef4c0 
					 
					
						
						
							
							Advertised Articles now shown correctly  
						
						 
						
						
						
						
					 
					
						2020-05-10 21:30:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						262640a2b4 
					 
					
						
						
							
							change Databasename and add Advertisementflag  
						
						 
						
						
						
						
					 
					
						2020-05-10 21:30:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1e7266e554 
					 
					
						
						
							
							implement imageserving and first part of ArticleRepository  
						
						 
						
						
						
						
					 
					
						2020-05-10 21:30:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						4048d6c5ad 
					 
					
						
						
							
							Unify Style of error messages to match rest of ui.  
						
						 
						
						
						
						
					 
					
						2020-05-10 21:30:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						572a999467 
					 
					
						
						
							
							Implement proper querying of warehouse slot sums and booking accounts.  
						
						 
						
						
						
						
					 
					
						2020-05-10 21:30:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5f071939d3 
					 
					
						
						
							
							Renice error handling  
						
						 
						
						
						
						
					 
					
						2020-05-10 21:30:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d2bf6e8c52 
					 
					
						
						
							
							implement checkout for non logged in users.  
						
						 
						
						
						
						
					 
					
						2020-05-10 21:30:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7d83d723c1 
					 
					
						
						
							
							Implement add Items to ShoppingCart  
						
						 
						
						
						
						
					 
					
						2020-05-10 21:30:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						4338f188f0 
					 
					
						
						
							
							fix local merge conflicts in req ctrl  
						
						 
						
						
						
						
					 
					
						2020-05-10 21:30:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e9e072b26b 
					 
					
						
						
							
							ShopIndexController without databasestuff  
						
						 
						
						
						
						
					 
					
						2020-05-10 21:30:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8a28aabaf3 
					 
					
						
						
							
							ShopIndexController initial implementation  
						
						 
						
						
						
						
					 
					
						2020-05-10 21:30:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						edcdb2e9cf 
					 
					
						
						
							
							fix use Math.min for loopcount  
						
						 
						
						
						
						
					 
					
						2020-05-10 17:25:48 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						530034a40e 
					 
					
						
						
							
							fix unused imports and unneeded empty lines  
						
						 
						
						
						
						
					 
					
						2020-05-10 17:19:18 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8f24aee350 
					 
					
						
						
							
							fix add should_be_advertised to script  
						
						 
						
						
						
						
					 
					
						2020-05-10 17:16:17 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						bd2aeb63f6 
					 
					
						
						
							
							Remove unneeded comment  
						
						 
						
						
						
						
					 
					
						2020-05-10 17:05:19 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						713c8ebe86 
					 
					
						
						
							
							Comment empty constructors  
						
						 
						
						
						
						
					 
					
						2020-05-10 17:03:40 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e406918ca2 
					 
					
						
						
							
							Remove commend out code  
						
						 
						
						
						
						
					 
					
						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  
						
						 
						
						
						
						
					 
					
						2020-05-10 15:39:35 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						777786f5b6 
					 
					
						
						
							
							Remove old missleading comment  
						
						 
						
						
						
						
					 
					
						2020-05-10 15:39:24 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7a42122a9a
	 
				 
					 
					
						
						
							
							fix typo  
						
						 
						
						
						
						
					 
					
						2020-05-10 15:31:20 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a62e3e8a63 
					 
					
						
						
							
							fix only show ordered Articles from specific Customer  
						
						 
						
						
						
						
					 
					
						2020-05-10 15:28:39 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						2135c48646 
					 
					
						
						
							
							show listedArticles  
						
						 
						
						
						
						
					 
					
						2020-05-10 15:26:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7f95cef13b 
					 
					
						
						
							
							fix personalized suggestions  
						
						 
						
						
						
						
					 
					
						2020-05-10 15:03:45 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						95e52cc79d 
					 
					
						
						
							
							fix non-formatted and non-vatted price  
						
						 
						
						
						
						
					 
					
						2020-05-10 14:57:02 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d4d1426438 
					 
					
						
						
							
							Fix decimals in checkout page  
						
						 
						
						
						
						
					 
					
						2020-05-10 14:34:20 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d1301f6988 
					 
					
						
						
							
							Fix naming-convension-error in ArticleOffer  
						
						 
						
						
						
						
					 
					
						2020-05-10 14:30:00 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						731f4761fa 
					 
					
						
						
							
							Show error if articles are not avail during checkout.  
						
						 
						
						
						
						
					 
					
						2020-05-10 14:29:08 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d66b3d1385 
					 
					
						
						
							
							changed listedArticles Request to own Controller  
						
						 
						
						
						
						
					 
					
						2020-05-09 23:01:25 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						69b5b33af8
	 
				 
					 
					
						
						
							
							fix typo in  8dd4cc4459 
						
						 
						
						
						
						
					 
					
						2020-05-09 19:58:31 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8dd4cc4459
	 
				 
					 
					
						
						
							
							use application.properties when run via bootRun  
						
						 
						
						
						
						
					 
					
						2020-05-09 19:31:57 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c0ce1e23c3 
					 
					
						
						
							
							fix better quantities for UI  
						
						 
						
						
						
						
					 
					
						2020-05-08 13:01:29 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1bd267a26d 
					 
					
						
						
							
							implement personalized suggestions  
						
						 
						
						
						
						
					 
					
						2020-05-08 11:44:30 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e4b4698a27 
					 
					
						
						
							
							Advertised Articles now shown correctly  
						
						 
						
						
						
						
					 
					
						2020-05-08 10:37:42 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c097e58bf3 
					 
					
						
						
							
							change Databasename and add Advertisementflag  
						
						 
						
						
						
						
					 
					
						2020-05-08 10:00:22 +02:00