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

224 Commits

Author SHA1 Message Date
Jannik 774e62f892
add suppliers to YAMLData, store data in AppSettings() 2020-06-16 19:19:58 +02:00
Jannik e1c00eca8f
fix ApplicationSettings.readConfig() 2020-06-16 18:52:33 +02:00
Jannik d121532fba
Merge remote-tracking branch 'origin/master' into feature/config 2020-06-14 21:15:37 +02:00
Hannes Huber 985169117d fix nullpointer in settings 2020-06-14 18:19:59 +02:00
CodeSteak 3bb3c5b513 [HOTFIX] of HOTFIX: Use CanonicalPath for check 2020-06-14 16:51:59 +02:00
CodeSteak 15616e05f3 [HOTFIX] Prevent path directory traversal attack for deploy 2020-06-14 15:54:56 +02:00
Jannik ef8aa826a3 Merge pull request 'Fix the cash booking sum on customer order' (#67) from fix/wrong_bookings_on_customer_order into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-13 12:19:18 +02:00
Jannik 114453b5b9 Merge pull request 'Implement Arrival of Supplier Order.' (#62) from feature/supplier_order_arrived_button into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-13 11:59:17 +02:00
CodeSteak 7397698929 fix check for missing article 2020-06-13 11:54:25 +02:00
Lukas Fürderer 327ba182f5
Fix the cash booking sum on customer order 
Closes #57
 2020-06-13 11:10:20 +02:00
Hendrik Schutter e0e853a575 fixes from PR review 2020-06-13 10:41:59 +02:00
Hendrik Schutter a41889b2cb login in extern loginController, RequestController cleanup, login right after register 2020-06-12 23:48:28 +02:00
Hendrik Schutter 0f7d248d40 add radio BTNs to register 2020-06-12 23:31:57 +02:00
CodeSteak a664b42853 Allow reuse of empty warehouse slots. Also fixes #59 2020-06-12 19:48:21 +02:00
CodeSteak 56f4ec0dda Implement Arrival of Supplier Order. 2020-06-12 19:22:36 +02:00
Hannes Huber 938d16301d fix stuff 2020-06-10 20:10:12 +02:00
Hannes Huber 5a59ac11b0 code cleanup 2020-06-10 19:28:12 +02:00
Hannes Huber c194f44308 implement customers detail bookings 2020-06-10 19:28:12 +02:00
Lukas Fürderer fc68e231d3 Allow the user to create manual bookings 2020-06-10 19:28:07 +02:00
Hannes Huber 6d8a36b7ac implement customers detail part 2 2020-06-10 19:27:38 +02:00
Hannes Huber 49e26039a3 implement customers detail part 1 2020-06-10 19:27:38 +02:00
Lukas Fürderer 28834431ce Display financial bookings in the ui 2020-06-10 19:27:38 +02:00
Hannes Huber 5691f0eeec implement customers index 2020-06-10 19:27:16 +02:00
Jannik 6b8bf25e0e Merge pull request 'feature/cash_bookings' (#55) from feature/cash_bookings into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-10 19:04:45 +02:00
Lukas Fürderer 691916894f
Apply some changes according to comments on the pullrequest 2020-06-10 11:48:38 +02:00
Lukas Fürderer 03d557d67b
Show a hyphen in supplier column if an article is not offered by anyone 
Closes #54
 2020-06-08 18:56:35 +02:00
Lukas Fürderer 8fff0e2dca
Merge remote-tracking branch 'origin/master' into feature/cash_bookings 2020-06-08 18:15:34 +02:00
CodeSteak 78a7ad053a Merge branch 'master' into feature/intern_warehouse 2020-06-08 09:22:06 +02:00
CodeSteak f6554629d7 Merge branch 'master' into feature/intern_warehouse 2020-06-08 09:14:50 +02:00
CodeSteak eb82d05f4f Use Spring model for template attributes 2020-06-08 09:14:11 +02:00
Jannik 41320473d9 Merge pull request 'feature/supplier_page' (#52) from feature/supplier_page into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-07 15:00:56 +02:00
Hendrik Schutter bd6be54149 removed space in SupplierOrderRepo 2020-06-07 11:45:53 +02:00
Hendrik Schutter 99612165f5 fixed review requests 2020-06-07 11:44:50 +02:00
Hendrik Schutter 445b504188 code cleanup 2020-06-05 21:20:54 +02:00
Hendrik Schutter bd8b3db7f3 added post form for marking order as delivered 2020-06-05 21:18:04 +02:00
Hendrik Schutter 8a4ff4cfa5 added supplier bookings table 2020-06-05 21:18:04 +02:00
Hendrik Schutter 2245309198 added supplier balance label 2020-06-05 21:18:04 +02:00
Hendrik Schutter d078c44027 finished supplier orders 2020-06-05 21:18:04 +02:00
Hendrik Schutter bd8b07990b finished show orders based on supplier 2020-06-05 21:18:04 +02:00
Hendrik Schutter 2f4c45ed71 show orders based on supplier 2020-06-05 21:18:04 +02:00
Hendrik Schutter b600040bf3 basic detail page for supplier 2020-06-05 21:18:04 +02:00
Hendrik Schutter 4f5e1fe185 list suppliers page 2020-06-05 21:18:04 +02:00
Lukas Fürderer f348d33c94
Show the balances of the main and vat account in the dashboard 2020-06-05 19:17:44 +02:00
Lukas Fürderer 6f90b9c941
Fix a bug where bookings were invisible if they affected only one account 2020-06-05 18:58:16 +02:00
Lukas Fürderer e53c1e0872
Allow the user to create manual bookings 2020-06-05 18:45:25 +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
CodeSteak 2ef9eb29ac Show Tax in Article Edit View. Fixes #48 2020-06-01 20:46:00 +02:00