--- a/app/controllers/orders_controller.rb	Mon Mar 10 03:24:46 2008 +0900
+++ b/app/controllers/orders_controller.rb	Mon Mar 10 09:38:39 2008 +0900
@@ -1,19 +1,10 @@ class OrdersController < ApplicationCont
 class OrdersController < ApplicationController
-  # GET /orders
-  # GET /orders.xml
-  def index
-    @orders = Order.find(:all)
+  before_filter :assign_session_order
 
-    respond_to do |format|
-      format.html # index.html.erb
-      format.xml  { render :xml => @orders }
-    end
-  end
-
-  # GET /orders/1
-  # GET /orders/1.xml
+  # GET /order
+  # GET /order.xml
   def show
-    @order = Order.find(params[:id])
+    # @order = Order.find(params[:id])
 
     respond_to do |format|
       format.html # show.html.erb
@@ -21,10 +12,10 @@ class OrdersController < ApplicationCont
     end
   end
 
-  # GET /orders/new
-  # GET /orders/new.xml
+  # GET /order/new
+  # GET /order/new.xml
   def new
-    @order = Order.new
+    # @order = Order.new
 
     respond_to do |format|
       format.html # new.html.erb
@@ -32,20 +23,20 @@ class OrdersController < ApplicationCont
     end
   end
 
-  # GET /orders/1/edit
+  # GET /order/edit
   def edit
-    @order = Order.find(params[:id])
+    # @order = Order.find(params[:id])
   end
 
-  # POST /orders
-  # POST /orders.xml
+  # POST /order
+  # POST /order.xml
   def create
-    @order = Order.new(params[:order])
+    # @order = Order.new(params[:order])
 
     respond_to do |format|
       if @order.save
         flash[:notice] = 'Order was successfully created.'
-        format.html { redirect_to(@order) }
+        format.html { redirect_to(order_path) }
         format.xml  { render :xml => @order, :status => :created, :location => @order }
       else
         format.html { render :action => "new" }
@@ -54,15 +45,15 @@ class OrdersController < ApplicationCont
     end
   end
 
-  # PUT /orders/1
-  # PUT /orders/1.xml
+  # PUT /order
+  # PUT /order.xml
   def update
-    @order = Order.find(params[:id])
+    # @order = Order.find(params[:id])
 
     respond_to do |format|
       if @order.update_attributes(params[:order])
         flash[:notice] = 'Order was successfully updated.'
-        format.html { redirect_to(@order) }
+        format.html { redirect_to(order_url) }
         format.xml  { head :ok }
       else
         format.html { render :action => "edit" }
@@ -71,15 +62,24 @@ class OrdersController < ApplicationCont
     end
   end
 
-  # DELETE /orders/1
-  # DELETE /orders/1.xml
+  # DELETE /order
+  # DELETE /order.xml
   def destroy
-    @order = Order.find(params[:id])
+    # @order = Order.find(params[:id])
     @order.destroy
 
     respond_to do |format|
-      format.html { redirect_to(orders_url) }
+      format.html { redirect_to(order_url) }
       format.xml  { head :ok }
     end
   end
+
+  private
+    def assign_session_order
+      unless session[:order_id].blank?
+	@order = Order.find(session[:order_id])
+      else
+	@order = Order.create
+      end
+    end
 end