From 2e4e591080e228dec676acf40b9e7bc4b044b8bc Mon Sep 17 00:00:00 2001
From: Neil Smith <neil.git@njae.me.uk>
Date: Thu, 12 Mar 2009 20:39:40 +0000
Subject: [PATCH] Updated order display
---
app/views/orders/index.html.erb | 10 ++-
config/database.sample.yml | 2 +-
db/schema.rb | 128 ++++++++++++++++----------------
3 files changed, 71 insertions(+), 69 deletions(-)
diff --git a/app/views/orders/index.html.erb b/app/views/orders/index.html.erb
index 640e77e..308635e 100644
--- a/app/views/orders/index.html.erb
+++ b/app/views/orders/index.html.erb
@@ -1,4 +1,5 @@
-<h1>Listing orders</h1>
+<div id="product-list">
+ <h1>Listing orders</h1>
<table>
<tr>
@@ -10,7 +11,7 @@
</tr>
<% for order in @orders %>
- <tr>
+ <tr class="<%= cycle('list-line-odd', 'list-line-even') %>">
<td><%=h order.name %></td>
<td><%=h order.address %></td>
<td><%=h order.email %></td>
@@ -21,9 +22,9 @@
<td><%= link_to 'Destroy', order, :confirm => 'Are you sure?', :method => :delete %></td>
</tr>
<% for li in order.line_items %>
- <tr>
+ <tr class="<%= current_cycle %>">
<td> </td>
- <td colspan="3"><i><%= li.quantity%> ×
+ <td colspan="7"><i><%= li.quantity%> ×
<%= h li.product.title %> =
<%= number_to_currency li.total_price, :unit => "£" %>
</i></td>
@@ -36,3 +37,4 @@
<br />
<%= link_to 'New order', new_order_path %>
+</div>
\ No newline at end of file
diff --git a/config/database.sample.yml b/config/database.sample.yml
index f955bb4..8acbc82 100644
--- a/config/database.sample.yml
+++ b/config/database.sample.yml
@@ -21,7 +21,7 @@ development:
pool: 5
username: depot
password:
- socket: /var/run/mysqld/mysqld.sock
+ # asocket: /var/run/mysqld/mysqld.sock
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
diff --git a/db/schema.rb b/db/schema.rb
index 53e465e..e5e49d9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,64 +1,64 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file,
-# please use the migrations feature of Active Record to incrementally modify your database, and
-# then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20090311202750) do
-
- create_table "line_items", :force => true do |t|
- t.integer "product_id", :null => false
- t.integer "order_id", :null => false
- t.integer "quantity", :null => false
- t.decimal "total_price", :precision => 8, :scale => 2, :null => false
- t.datetime "created_at"
- t.datetime "updated_at"
- end
-
- add_index "line_items", ["order_id"], :name => "fk_line_item_orders"
- add_index "line_items", ["product_id"], :name => "fk_line_item_products"
-
- create_table "orders", :force => true do |t|
- t.string "name"
- t.text "address"
- t.string "email"
- t.string "pay_type", :limit => 10
- t.datetime "created_at"
- t.datetime "updated_at"
- end
-
- create_table "products", :force => true do |t|
- t.string "title"
- t.text "description"
- t.string "image_url"
- t.datetime "created_at"
- t.datetime "updated_at"
- t.decimal "price", :precision => 8, :scale => 2, :default => 0.0
- t.date "date_available"
- t.date "date_available_until"
- end
-
- create_table "sessions", :force => true do |t|
- t.string "session_id", :null => false
- t.text "data"
- t.datetime "created_at"
- t.datetime "updated_at"
- end
-
- add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
- add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
-
- create_table "users", :force => true do |t|
- t.string "name"
- t.string "hashed_password"
- t.string "salt"
- t.datetime "created_at"
- t.datetime "updated_at"
- end
-
-end
+# This file is auto-generated from the current state of the database. Instead of editing this file,
+# please use the migrations feature of Active Record to incrementally modify your database, and
+# then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your database schema. If you need
+# to create the application database on another system, you should be using db:schema:load, not running
+# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20090311202750) do
+
+ create_table "line_items", :force => true do |t|
+ t.integer "product_id", :null => false
+ t.integer "order_id", :null => false
+ t.integer "quantity", :null => false
+ t.decimal "total_price", :precision => 8, :scale => 2, :null => false
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ end
+
+ add_index "line_items", ["order_id"], :name => "fk_line_item_orders"
+ add_index "line_items", ["product_id"], :name => "fk_line_item_products"
+
+ create_table "orders", :force => true do |t|
+ t.string "name"
+ t.text "address"
+ t.string "email"
+ t.string "pay_type", :limit => 10
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ end
+
+ create_table "products", :force => true do |t|
+ t.string "title"
+ t.text "description"
+ t.string "image_url"
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ t.decimal "price", :precision => 8, :scale => 2, :default => 0.0
+ t.date "date_available"
+ t.date "date_available_until"
+ end
+
+ create_table "sessions", :force => true do |t|
+ t.string "session_id", :default => "", :null => false
+ t.text "data"
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ end
+
+ add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
+ add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
+
+ create_table "users", :force => true do |t|
+ t.string "name"
+ t.string "hashed_password"
+ t.string "salt"
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ end
+
+end
--
2.43.0