localhorst
/
e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity
274 Commits 2 Branches 2 Tags 7.2 MiB
Commit Graph

274 Commits

Author SHA1 Message Date
Hendrik Schutter 9660e52f34 Merge pull request 'feature/31_js_magic_article_edit' (#50) from feature/31_js_magic_article_edit into master 2020-06-02 07:47:28 +02:00
Hendrik Schutter 72ddfa42ef Merge pull request 'Show Tax in Article Edit View. Fixes #48' (#49) from feature/48_not_showing_tax_edit_view into master 2020-06-02 07:47:04 +02:00
CodeSteak 5e1170839e Update Gross Price in Article Edit View. Fixes #31 2020-06-01 21:11:15 +02:00
CodeSteak 2ef9eb29ac Show Tax in Article Edit View. Fixes #48 2020-06-01 20:46:00 +02:00
Jannik 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
Jannik 6988d3f213
minor code clean up 2020-06-01 17:10:04 +02:00
Jannik f5ad05f49f
Merge branch 'master' into feature/offered_article_supplier 2020-06-01 17:04:52 +02:00
Jannik 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
Jannik 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
Jannik 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
Hannes Huber 839bebcd89 trim searchterm 2020-06-01 11:58:08 +02:00
Danny 922e3cadef Bugfix register 2020-06-01 11:13:03 +02:00
Danny 0fb1d5704e Bufix: After register, you now logged in 2020-06-01 11:11:34 +02:00
Hendrik Schutter 38fcda708f check if article.image is null 2020-06-01 10:53:10 +02:00
Hannes Huber 9238162a4c implement better search 2020-06-01 10:52:19 +02:00
Lukas Fürderer e7e3864b4c
Store the cheapest supplier for each offered article in the database 2020-05-30 18:25:23 +02:00
Hendrik Schutter 407229f15d changed cheapest supplier ref in offered article entity 2020-05-30 16:49:20 +02:00
Hendrik Schutter 1b2e75a82c updates scripts 2020-05-30 12:29:40 +02:00
Hendrik Schutter 286edb33ed show supplier name at offered article page 2020-05-30 11:52:30 +02:00
Jannik 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
Jannik d55a50ab29
[supplier] update gradle to version 6.4 2020-05-29 16:18:22 +02:00
CodeSteak e4489ff3a6 Merge branch 'feature/supplier_api' into feature/reorder_cronjob 2020-05-29 16:13:29 +02:00
CodeSteak 2c2b5c1d0f Add Missing Gradle Folder to Repo 2020-05-29 16:12:28 +02:00
Jannik 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
Jannik f4b0d6a576
fix html warnings [2] 2020-05-28 13:22:28 +02:00
Jannik 2bf383b113
fix html warnings 2020-05-28 13:20:42 +02:00
Jannik 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
Lukas Fürderer d5540c1979
Small changes according to comments on the pullrequest 2020-05-28 10:58:11 +02:00
Lukas Fürderer e1df56147b
Merge remote-tracking branch 'origin/master' into feature/reorder_cronjob 2020-05-28 10:39:38 +02:00
Hendrik Schutter 35861d3664 fixed styling for edit/add btn 2020-05-27 21:53:58 +02:00
Hendrik Schutter 08dc4bcb47 fixed spaces in textarea 2020-05-27 21:43:26 +02:00
Hendrik Schutter a38b817f20 fixed empty input fields fixes #32 2020-05-27 21:07:31 +02:00
Philipp Schweizer 42a02effa6 fixed pull request #25 2020-05-27 14:24:05 +02:00
Danny 7c467c8641 bugfix register 2020-05-27 12:22:24 +02:00
Lukas Fürderer ffb683bdd0
Set the advertise flag if at least one supplier wants it to be set 2020-05-25 17:19:25 +02:00
Lukas Fürderer 8386629088
Implement the reorder cronjob 2020-05-25 17:08:15 +02:00
Jannik 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
Tyro ac79e1cf22 Check for inactive accounts 
Check for employee by access on /intern
 2020-05-24 21:51:40 +02:00
Philipp Schweizer 40013f0812 Merge remote-tracking branch 'origin/feature/delivery_api' into feature/delivery_api 2020-05-24 20:06:43 +02:00
Philipp Schweizer 77892c9dfc fixed pull request #25 2020-05-24 20:05:50 +02:00
Philipp Schweizer cff9417dc5 fixed pull request #24 2020-05-24 20:04:03 +02:00
Jannik 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
Hendrik Schutter 019f5d8f1b code cleanup 2020-05-23 14:19:43 +02:00
Hendrik Schutter 620e163a14 added feature to change an article image 2020-05-23 14:18:33 +02:00
Lukas Fürderer 6892a11688
Merge branch 'feature/supplier_api' into feature/reorder_cronjob 2020-05-23 11:16:46 +02:00
Hendrik Schutter fcdf0e776d set default img if article is added to listed articles 2020-05-23 10:45:14 +02:00
Hendrik Schutter a3efa4092a removed old static product images 2020-05-23 09:40:52 +02:00
Jannik 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
Jannik 525a5f7eb1
Merge branch 'master' into feature/offeredArticle 2020-05-21 20:23:47 +02:00
Hendrik Schutter ba570852a7 added id´s to inputs 2020-05-21 10:27:26 +02:00