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

43 Commits

Author SHA1 Message Date
Jannik 2290f01a8f Merge pull request 'feature/fix_delivery_api' (#116) from feature/fix_delivery_api into master 
Reviewed-on: #116
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-24 18:38:03 +02:00
CodeSteak cd641d6cc4 Fix #113 by fixing initialization of RestServiceForDelivery. 2020-06-24 01:18:16 +02:00
CodeSteak 8d27c486d5 Add & generate tracking information to (Supplier-)OrderConfirmation. Fixes #110 2020-06-24 00:37:58 +02:00
Hendrik Schutter 1f83a82f17 removed user.name and use user.defaultDeliveryAddress.name instead 2020-06-21 00:13:10 +02:00
CodeSteak e5332a3348 Fix String -> UUIDs -> String in method causing crash 2020-06-20 22:25:52 +02:00
Jannik 4bef17dc0a Merge pull request 'feature/dashboard' (#83) from feature/dashboard into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-06-19 14:12:44 +02:00
Philipp Schweizer 187656814e String Error -> Enum ErrorHandling Logic removed from model class 2020-06-18 00:50:43 +02:00
Danny 6284a4d7bf Dashboard working 2020-06-15 17:47:55 +02:00
Philipp Schweizer 266bba095a merged feature/customer_orders with master 2020-06-13 19:58:30 +02:00
Philipp Schweizer fa7bdf2f7e impl error handling 2020-06-13 19:37:34 +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
Lukas Fürderer 327ba182f5
Fix the cash booking sum on customer order 
Closes #57
 2020-06-13 11:10:20 +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
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
Hendrik Schutter bd8b3db7f3 added post form for marking order as delivered 2020-06-05 21:18:04 +02:00
Lukas Fürderer 0061d25082
Display financial bookings in the ui 2020-06-05 07:49:11 +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 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 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
Hannes Huber dfa528484c Merge branch 'master' into feature/user 2020-06-01 10:57:55 +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
Lukas Fürderer d5540c1979
Small changes according to comments on the pullrequest 2020-05-28 10:58:11 +02:00
Hannes Huber e5b28250c2 fix payment method null pointer 2020-05-27 14:56:15 +02:00
Hannes Huber 614a929592 code cleanup 2020-05-27 13:40:44 +02:00
Hannes Huber 60699ed847 fix error handling 2020-05-27 13:40:44 +02:00
Hannes Huber 83ad1f3999 remove advertisementflag 2020-05-27 13:40:44 +02:00
Hannes Huber 5b4c0be1c8 add Errorhandling to UpdateSettingsAction 2020-05-27 13:40:44 +02:00
Hannes Huber 0256c19e8f implement change User Settings 2020-05-27 13:40:44 +02:00
Hannes Huber b5495bda3d show all Orders 2020-05-27 13:40:44 +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
Lukas Fürderer 0de35f1a51
Implement scheduled execution of cronjobs 2020-05-15 13:47:54 +02:00
Hannes Huber edcdb2e9cf fix use Math.min for loopcount 2020-05-10 17:25:48 +02:00
CodeSteak 731f4761fa Show error if articles are not avail during checkout. 2020-05-10 14:29:08 +02:00
Hannes Huber c0ce1e23c3 fix better quantities for UI 2020-05-08 13:01:29 +02:00
Hannes Huber e4b4698a27 Advertised Articles now shown correctly 2020-05-08 10:37:42 +02:00
CodeSteak b2f927e48d Implement CreateCustomerOrderAction; Not implemented: correct booking and WarehouseBooking fetching... 
Puhh, that was a struggle to get working. Damn JPA Shit
 2020-05-05 22:56:12 +02:00
CodeSteak de6c750e7f Refactor Package Layout 2020-04-29 22:44:16 +02:00