CodeSteak
6fbb16fea2
Show advertisements distinct.
2020-06-24 02:20:24 +02:00
CodeSteak
fb53c68be3
Merge pull request 'implement Config for Supplier and Delivery Service' ( #107 ) from feature/reading_config into master
...
reviewed by Lukas
2020-06-21 22:22:43 +02:00
CodeSteak
f42a50d24d
fix CustomerOrder find by order
2020-06-21 18:32:04 +02:00
CodeSteak
a6a2adc7db
implement Config for Supplier and Delivery Service
2020-06-21 16:49:35 +02:00
Hannes Huber
cd1a8568e6
show only one entry per article suggestions fix #96
2020-06-21 00:06:15 +02:00
CodeSteak
9389675b5c
Do not show dupliactes in category search. fixes #85
2020-06-21 00:01:28 +02:00
CodeSteak
d77b8c046a
Fix bad query for article slot sum
2020-06-20 23:24:06 +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
bcbebe8e8d
master merged into feature/customer_orders
2020-06-18 01:11:11 +02:00
Philipp Schweizer
ebb3c8c235
removes unused Imports and fomattet
2020-06-17 17:23:29 +02:00
Danny
6284a4d7bf
Dashboard working
2020-06-15 17:47:55 +02:00
Hendrik Schutter
18f35c43e7
remove spaces
2020-06-15 10:46:04 +02:00
Hendrik Schutter
709c80fa37
add fist admin user after start
2020-06-15 10:43:16 +02:00
Philipp Schweizer
1dd4b5cfa5
del update query and impl error for trackigID
2020-06-13 20:05:22 +02:00
Philipp Schweizer
266bba095a
merged feature/customer_orders with master
2020-06-13 19:58:30 +02:00
CodeSteak
56f4ec0dda
Implement Arrival of Supplier Order.
2020-06-12 19:22:36 +02:00
Philipp
ebeba72278
impl tracking ID
2020-06-10 17:03:59 +02:00
Philipp
f671baf7f0
Error with package path
2020-06-10 14:51:12 +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
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
8a4ff4cfa5
added supplier bookings table
2020-06-05 21:18:04 +02:00
Hendrik Schutter
d078c44027
finished supplier orders
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
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
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
b7134a60da
rename CustomerOrderRepo in Cronjob
2020-06-01 20:25:31 +02:00
Jannik
21502a0b1c
Merge branch 'master' into feature/user
2020-06-01 19:03:42 +02:00
Hannes Huber
2394157be8
implement getCustomerOrder
2020-06-01 11:31:12 +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
e1df56147b
Merge remote-tracking branch 'origin/master' into feature/reorder_cronjob
2020-05-28 10:39:38 +02:00
Hannes Huber
e4d6642d61
order orders by newest first
2020-05-27 15:52:51 +02:00
Hannes Huber
614a929592
code cleanup
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
8386629088
Implement the reorder cronjob
2020-05-25 17:08:15 +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
620e163a14
added feature to change an article image
2020-05-23 14:18:33 +02:00
Hendrik Schutter
fcdf0e776d
set default img if article is added to listed articles
2020-05-23 10:45:14 +02:00
Jannik
525a5f7eb1
Merge branch 'master' into feature/offeredArticle
2020-05-21 20:23:47 +02:00
Hendrik Schutter
9cfb1cd0ad
add offered article to listed article
2020-05-19 16:30:27 +02:00
Hendrik Schutter
d8032c2bd7
load offeredArticles from DB and display basic info
2020-05-19 00:12:26 +02:00
Hannes Huber
d739b15410
fix missing import
2020-05-17 13:11:32 +02:00
Hannes Huber
bc350b3177
implement only show Searchresults which are in Stock
2020-05-17 13:09:26 +02:00
Hannes Huber
6b9db3eed5
implement errorhandling
2020-05-17 13:09:26 +02:00