localhorst/e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity
338 Commits 2 Branches 2 Tags
2f7116aa095f69a41de5678b61731a59fb67e39c
Commit Graph
71 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
localhorst 2f7116aa09 store existing article in warehouse 2020-06-10 16:11:15 +02:00
localhorst f448ca64ad set delivery date on order from supplier 2020-06-09 17:47:03 +02:00
localhorst bd6be54149 removed space in SupplierOrderRepo 2020-06-07 11:45:53 +02:00
localhorst 99612165f5 fixed review requests 2020-06-07 11:44:50 +02:00
localhorst 9dff6adb3d rebase to master 2020-06-05 21:25:38 +02:00
localhorst 445b504188 code cleanup 2020-06-05 21:20:54 +02:00
localhorst bd8b3db7f3 added post form for marking order as delivered 2020-06-05 21:18:04 +02:00
localhorst 8a4ff4cfa5 added supplier bookings table 2020-06-05 21:18:04 +02:00
localhorst 2245309198 added supplier balance label 2020-06-05 21:18:04 +02:00
localhorst d078c44027 finished supplier orders 2020-06-05 21:18:04 +02:00
localhorst bd8b07990b finished show orders based on supplier 2020-06-05 21:18:04 +02:00
localhorst 2f4c45ed71 show orders based on supplier 2020-06-05 21:18:04 +02:00
localhorst b600040bf3 basic detail page for supplier 2020-06-05 21:18:04 +02:00
localhorst 4f5e1fe185 list suppliers page 2020-06-05 21:18:04 +02:00
localhorst e138476d76 code cleanup 2020-06-05 18:05:10 +02:00
localhorst c1b9588189 added post form for marking order as delivered 2020-06-05 17:37:19 +02:00
localhorst 5e05100d21 added supplier bookings table 2020-06-05 15:43:46 +02:00
localhorst 93a5863fbe added supplier balance label 2020-06-05 13:10:16 +02:00
localhorst 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
localhorst 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
localhorst 38fcda708f check if article.image is null 2020-06-01 10:53:10 +02:00
localhorst 1cb52a20d4 finished supplier orders 2020-05-30 23:32:01 +02:00
localhorst 67c101ebea finished show orders based on supplier 2020-05-30 21:13:25 +02:00
localhorst 657d315850 show orders based on supplier 2020-05-30 20:16:27 +02:00
localhorst 407229f15d changed cheapest supplier ref in offered article entity 2020-05-30 16:49:20 +02:00
localhorst 5d7ecbdfb7 basic detail page for supplier 2020-05-30 16:43:07 +02:00
localhorst c8d3ab3ff0 list suppliers page 2020-05-30 16:16:14 +02:00
localhorst 1b2e75a82c updates scripts 2020-05-30 12:29:40 +02:00
localhorst 286edb33ed show supplier name at offered article page 2020-05-30 11:52:30 +02:00
localhorst 35861d3664 fixed styling for edit/add btn 2020-05-27 21:53:58 +02:00
localhorst 08dc4bcb47 fixed spaces in textarea 2020-05-27 21:43:26 +02:00
localhorst a38b817f20 fixed empty input fields fixes #32 2020-05-27 21:07:31 +02:00
localhorst 019f5d8f1b code cleanup 2020-05-23 14:19:43 +02:00
localhorst 620e163a14 added feature to change an article image 2020-05-23 14:18:33 +02:00
localhorst fcdf0e776d set default img if article is added to listed articles 2020-05-23 10:45:14 +02:00
localhorst a3efa4092a removed old static product images 2020-05-23 09:40:52 +02:00
localhorst ba570852a7 added id´s to inputs 2020-05-21 10:27:26 +02:00
localhorst 9cfb1cd0ad add offered article to listed article 2020-05-19 16:30:27 +02:00
localhorst d8032c2bd7 load offeredArticles from DB and display basic info 2020-05-19 00:12:26 +02:00
localhorst d4be2b9e94 Revert "Revert "added link from listedArticles page to related offered article"" 
This reverts commit 3c69f38367.
 2020-05-16 22:48:40 +02:00
localhorst 14bef592c4 Revert "Revert "UImodel for offeredArticle page, html cleanup"" 
This reverts commit 0840eda369.
 2020-05-16 22:48:20 +02:00
localhorst 0840eda369 Revert "UImodel for offeredArticle page, html cleanup" 
This reverts commit e0f638f0bd.
 2020-05-16 22:46:42 +02:00
localhorst 3c69f38367 Revert "added link from listedArticles page to related offered article" 
This reverts commit 39fb735f21.
 2020-05-16 22:46:18 +02:00
localhorst 39fb735f21 added link from listedArticles page to related offered article 2020-05-16 21:49:31 +02:00
localhorst e0f638f0bd UImodel for offeredArticle page, html cleanup 2020-05-16 13:42:07 +02:00
localhorst 4f6388e4b9 fixed links to offered articles page 2020-05-15 20:57:56 +02:00
localhorst b1840dd845 code cleanup 2020-05-15 19:47:26 +02:00
localhorst dc49bc2e8d code cleanuo 2020-05-15 19:45:10 +02:00
localhorst 8c777ca1ff fixed merge bug: cascade = CascadeType.ALL in Article to Categories 2020-05-15 19:31:31 +02:00
localhorst ea8aaa3931 removed PW bypass 2020-05-15 18:16:03 +02:00
localhorst 56efbd7940 code cleanup 2020-05-15 18:13:12 +02:00
localhorst a98782bc01 added new route in external controller 2020-05-15 14:14:29 +02:00
localhorst d06fd57447 added new route for offered articles page 2020-05-15 11:57:20 +02:00
localhorst 197a774fb2 removed data folder 2020-05-14 23:14:33 +02:00
localhorst af99e8107d added change for stock, price and autobuy values on article edit page 2020-05-14 22:16:06 +02:00
localhorst c69b20b914 added POST that changes the article WIP 2020-05-12 22:52:01 +02:00
localhorst fd9dcf141e fixes in listed article page and converted form to POST 2020-05-11 15:32:39 +02:00
localhorst 09c85fe8cb fixed route for /intern/articles and /intern/suppliers/articles 2020-05-11 14:32:07 +02:00
localhorst 22d2744c8c GET article edit page 2020-05-11 11:58:26 +02:00
localhorst c14ae996be Merge branch 'feature/listedArticles' of git.mosad.xyz:localhorst/e-commerce into feature/listedArticles 2020-05-10 21:32:19 +02:00
localhorst a2f20938cd show listedArticles 2020-05-10 21:30:50 +02:00
localhorst 2b3ecb2342 changed listedArticles Request to own Controller 2020-05-10 21:30:50 +02:00
localhorst 2135c48646 show listedArticles 2020-05-10 15:26:50 +02:00
localhorst d66b3d1385 changed listedArticles Request to own Controller 2020-05-09 23:01:25 +02:00
localhorst dac2d0511a finished about pages 2020-01-17 18:03:28 +01:00
localhorst 9fd050edab added eclipse gitignore 2020-01-14 20:56:36 +01:00
localhorst 7177bc8f09 fixes links in footer; added about pages 2020-01-14 20:50:47 +01:00
localhorst 16e71f7335 added links in footer 2020-01-13 17:30:39 +01:00
localhorst 9f372c7057 added about pages 2020-01-13 17:21:49 +01:00
localhorst e315b9ecf8 updated authors 2019-10-22 19:29:10 +02:00
localhorstandGitea 097206c9f0 Initial commit 2019-10-19 16:57:36 +02:00