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

474 Commits

Author SHA1 Message Date
Hendrik Schutter e138476d76 code cleanup 2020-06-05 18:05:10 +02:00
Hendrik Schutter c1b9588189 added post form for marking order as delivered 2020-06-05 17:37:19 +02:00
Hendrik Schutter 5e05100d21 added supplier bookings table 2020-06-05 15:43:46 +02:00
Hendrik Schutter 93a5863fbe added supplier balance label 2020-06-05 13:10:16 +02:00
Hannes Huber 7f652e38f0 fix nullpointer in category search 2020-06-05 12:32:34 +02:00
Lukas Fürderer 0061d25082
Display financial bookings in the ui 2020-06-05 07:49:11 +02:00
Jannik 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
CodeSteak a192f0ac51 Set Tracing Id in Warehouse/finish not in Checkout. This was wrong. 2020-06-03 16:55:36 +02:00
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 fc239983a7 Fix article links. 2020-06-01 21:15:27 +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
Hannes Huber f4ba79a4cd add id's to form inputs 2020-06-01 20:27:19 +02:00
CodeSteak 976e2d1949 Implement Warehouse.... 
Sry, only one commit. No time to make history ;D
 2020-06-01 20:25:51 +02:00
Hannes Huber b7134a60da rename CustomerOrderRepo in Cronjob 2020-06-01 20:25:31 +02:00
Hannes Huber ff4c984f54 fix error message 2020-06-01 20:24:45 +02:00
Jannik 21502a0b1c
Merge branch 'master' into feature/user 2020-06-01 19:03:42 +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
Hannes Huber 3775f96f3f implement getCustomerOrderDetail 2020-06-01 11:53:29 +02:00
Hannes Huber 2394157be8 implement getCustomerOrder 2020-06-01 11:31:12 +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
Hannes Huber dfa528484c Merge branch 'master' into feature/user 2020-06-01 10:57:55 +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
Hendrik Schutter 1cb52a20d4 finished supplier orders 2020-05-30 23:32:01 +02:00
Hendrik Schutter 67c101ebea finished show orders based on supplier 2020-05-30 21:13:25 +02:00
Hendrik Schutter 657d315850 show orders based on supplier 2020-05-30 20:16:27 +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 5d7ecbdfb7 basic detail page for supplier 2020-05-30 16:43:07 +02:00
Hendrik Schutter c8d3ab3ff0 list suppliers page 2020-05-30 16:16:14 +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