From c06c8cacd2f06d566aa51603144e051c399518cc Mon Sep 17 00:00:00 2001
From: Benjamin Cousaert <benj_cous@hotmail.com>
Date: Sat, 6 Dec 2014 12:03:08 +0100
Subject: [PATCH] Add index action and view for orders

---
 app/controllers/orders_controller.rb | 5 +++++
 app/views/orders/_order.html.erb     | 5 +++++
 app/views/orders/index.html.erb      | 3 +++
 app/views/orders/new.html.erb        | 7 -------
 config/routes.rb                     | 2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 app/views/orders/_order.html.erb
 create mode 100644 app/views/orders/index.html.erb

diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb
index b474a74..fc6bc2f 100644
--- a/app/controllers/orders_controller.rb
+++ b/app/controllers/orders_controller.rb
@@ -28,6 +28,11 @@ class OrdersController < ApplicationController
     end
   end
 
+  def index
+    @user = User.find(params[:user_id])
+    @orders = @user.orders
+  end
+
   private
 
     def order_params
diff --git a/app/views/orders/_order.html.erb b/app/views/orders/_order.html.erb
new file mode 100644
index 0000000..eafe974
--- /dev/null
+++ b/app/views/orders/_order.html.erb
@@ -0,0 +1,5 @@
+<p>
+  <% order.products.each do |p| %>
+    <%= p.order_products.find_by(order: order).count.to_s + " " + p.name %>
+  <% end %>
+</p>
diff --git a/app/views/orders/index.html.erb b/app/views/orders/index.html.erb
new file mode 100644
index 0000000..cbbaa97
--- /dev/null
+++ b/app/views/orders/index.html.erb
@@ -0,0 +1,3 @@
+<h2><%= @user.nickname %></h2>
+
+<%= render @orders %>
diff --git a/app/views/orders/new.html.erb b/app/views/orders/new.html.erb
index 63be5c0..943f97f 100644
--- a/app/views/orders/new.html.erb
+++ b/app/views/orders/new.html.erb
@@ -13,10 +13,3 @@
   <% end %>
   <%= f.submit "Order", class: "btn btn-primary " %>
 <% end %>
-
-
-<div style="padding-top: 50px;" class="order_list ">
-  <p>
-  Nothing ordered yet!
-  </p>
-</div>
diff --git a/config/routes.rb b/config/routes.rb
index a049993..7119aea 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,7 +3,7 @@ Rails.application.routes.draw do
   root "users#index"
 
   resources :users do
-    resources :orders, only: [:new, :create]
+    resources :orders, only: [:new, :create, :index]
   end
 
   resources :products