diff --git a/uncloud_v3/README.md b/uncloud_v3/README.md
index aaa1c4e..c21be89 100644
--- a/uncloud_v3/README.md
+++ b/uncloud_v3/README.md
@@ -47,9 +47,10 @@ machine. Use `kubectl get nodes` to verify minikube is up and running.
* Link to ProductOrderForm [done]
* Find suitable timeframes for a product [done]
* Continue to resources / add resources
- * Need to list resources
- * Need to create manytomany relations for each resource resolutling
- in ResourceOrders
+ * Need to list resources [done]
+ * Need to create manytomany relations for each resource resoluting
+ in ResourceOrders1
+ * Need to pass in the price for the selected timeframe
* On submit
* List of
* resources + values
diff --git a/uncloud_v3/app/templates/app/product_detail.html b/uncloud_v3/app/templates/app/product_detail.html
index 00365a6..d003851 100644
--- a/uncloud_v3/app/templates/app/product_detail.html
+++ b/uncloud_v3/app/templates/app/product_detail.html
@@ -1,16 +1,11 @@
{{ object.name }}
-
-
+(description to be added here)
-
-HERE we show a link to order.
diff --git a/uncloud_v3/app/templates/app/product_list.html b/uncloud_v3/app/templates/app/product_list.html
index 7a52e7c..b622c7f 100644
--- a/uncloud_v3/app/templates/app/product_list.html
+++ b/uncloud_v3/app/templates/app/product_list.html
@@ -1,16 +1,5 @@
Select Product
-Product Order
-
- {% for product in object_list %}
- {% if product.slug %}
- -
- {{ product.name }}
-
- {% endif %}
-
- {% endfor %}
-
Product List
{% for product in object_list %}
diff --git a/uncloud_v3/app/templates/app/productorder_form.html b/uncloud_v3/app/templates/app/productorder_form.html
index 79de8f6..8e152f3 100644
--- a/uncloud_v3/app/templates/app/productorder_form.html
+++ b/uncloud_v3/app/templates/app/productorder_form.html
@@ -1,23 +1,31 @@
-Ordering a {{ product }} instance for {{ timeframe }}
-
-we are here?!
+Ordering a {{ product }} instance for {{ timeframe }}
+TODO: catch invalid timeframe
diff --git a/uncloud_v3/app/views.py b/uncloud_v3/app/views.py
index 22a8636..218f264 100644
--- a/uncloud_v3/app/views.py
+++ b/uncloud_v3/app/views.py
@@ -17,6 +17,15 @@ class ProductOrderView(CreateView):
context = super().get_context_data(**kwargs)
context['product'] = get_object_or_404(Product, slug=self.kwargs['product'])
context['timeframe'] = get_object_or_404(TimeFrame, slug=self.kwargs['timeframe'])
+
+ res_price = []
+ for res in context['product'].resources.all():
+ price = res.price_per_time.filter(timeframe=context['timeframe'])[0].price
+ currency = res.price_per_time.filter(timeframe=context['timeframe'])[0].currency
+
+ res_price.append((res, price, currency))
+ context['res_price'] = res_price
+
print(context)
print(self.kwargs)
return context