From df24bcd58efaff2d8e1902a5d78930c07acb85c6 Mon Sep 17 00:00:00 2001
From: Basho <mmyncke@gmail.com>
Date: Mon, 10 Nov 2014 22:57:37 +0100
Subject: [PATCH] gefaalde orders

---
 app/controllers/orders_controller.rb | 8 ++++----
 app/helpers/orders_helper.rb         | 6 +++++-
 app/helpers/sessions_helper.rb       | 2 +-
 app/models/order.rb                  | 3 ++-
 config/routes.rb                     | 4 ----
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb
index e54f88b..f0b5d1e 100644
--- a/app/controllers/orders_controller.rb
+++ b/app/controllers/orders_controller.rb
@@ -1,5 +1,5 @@
 class OrdersController < ApplicationController
-	before_action :logged_in_user, only: [:create, :destroy]
+	before_action :logged_in_user, only: [ :destroy]
 
   def new
     
@@ -11,12 +11,12 @@ class OrdersController < ApplicationController
 
   def show
   	@user = User.find(params[:id])
-    @order = selected_user.orders.build
+    @order = @user.orders.build
   end
 
   def create
-
-		@order = current_user.orders.build(order_params)
+    user = User.find( 3) #MUST BE FIXED
+    @order = user.orders.build(order_params)
     if @order.save
       #@flash[:success] = "Micropost created!"
       redirect_to root_url
diff --git a/app/helpers/orders_helper.rb b/app/helpers/orders_helper.rb
index 1f13cbf..6b5f214 100644
--- a/app/helpers/orders_helper.rb
+++ b/app/helpers/orders_helper.rb
@@ -1,6 +1,10 @@
 module OrdersHelper
 
+  def select_user(user)
+    selected_user = user.id
+  end
+
   def selected_user
-    @selected_user ||= User.find_by(id: @user.id)
+    return selected_user
   end
 end
diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
index 1c1b45d..f98cd13 100644
--- a/app/helpers/sessions_helper.rb
+++ b/app/helpers/sessions_helper.rb
@@ -8,7 +8,7 @@ module SessionsHelper
     @current_user ||= User.find_by(id: session[:user_id])
   end
 
-   def logged_in?
+  def logged_in?
     !current_user.nil?
   end
 
diff --git a/app/models/order.rb b/app/models/order.rb
index e83f62b..a4090dd 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -1,5 +1,6 @@
 class Order < ActiveRecord::Base
   belongs_to :user
-
+  
+  default_scope -> { order('created_at DESC') }
   validates :products, presence: true, length: { maximum: 140 }
 end
diff --git a/config/routes.rb b/config/routes.rb
index 6d9e801..2f491f1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -27,10 +27,6 @@ Rails.application.routes.draw do
   post   'order'   => 'orders#create'
   delete 'chaos'  => 'orders#destroy'
 
-  resources :orders,  only: [:create, :destroy]
-
-
-
   #account stuff
   get    'signup'  => 'users#new'
   get    'login'   => 'sessions#new'