fixed how ordering works

hanjing5 · Jun 17, 2012 · 2506132 · 2506132
1 parent 7c74cc2
commit 2506132
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
@@ -0,0 +1,3 @@
+textarea{
+  height:10em;
+}
diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb
@@ -1,5 +1,6 @@
 class OrdersController < ApplicationController
   def new
+    @place = Place.find(params[:place_id])
   end
 
   def show

diff --git a/app/views/orders/new.html.haml b/app/views/orders/new.html.haml
@@ -1,2 +1,9 @@
 %h1 Orders#new
-%p Find me in app/views/orders/new.html.haml
+%p Find me in app/views/orders/new.html.haml
+
+
+= form_for @order do |o|
+  =o.hidden_field :product_id,@product.id
+  =o.hidden_field :place_id, @place.id
+  =o.submit 'Confirm Purchase'
+
diff --git a/app/views/places/show.html.haml b/app/views/places/show.html.haml
@@ -1,9 +1,8 @@
-%h1 Places#show
-
 %h1 
   Welcome to 
   =@place.name
 
+%h3 Menu
 .menu
   %table{:class=>'table'}
     - @place.products.each do |p|
@@ -14,8 +13,7 @@
           %td
             = number_to_currency p.price
           %td
-            = form_for p.orders.new, :url=>place_product_orders_path(p.place_id, p.id) do |f|
-              = f.submit 'buy'
+            = link_to 'buy', new_place_product_order_path(p.place_id, p.id)
 
 %h2 Add a drink
 .pull-left

diff --git a/config/routes.rb b/config/routes.rb
@@ -14,7 +14,8 @@
   devise_scope :merchants do
     resources :places do
       resources :products do 
-        resources :orders
+        resources :orders do 
+        end
       end
     end
   end