Navigation

← Previous Changeset
Next Changeset →

Changeset 1259

Timestamp:

11/16/06 22:53:30 (2 years ago)

Author:

james

Message:

added fields to order

Files:

peasantonline/app/controllers/catalog_controller.rb (modified) (1 diff)
peasantonline/app/models/order.rb (modified) (1 diff)
peasantonline/app/views/catalog/checkout.rhtml (modified) (9 diffs)
peasantonline/db/migrate/025_billing_and_ccv_fields_for_orders.rb (added)
peasantonline/db/schema.rb (modified) (2 diffs)
peasantonline/public/stylesheets/catalog.css (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

peasantonline/app/controllers/catalog_controller.rb

r1244	r1259
151	151	:first_name => @order.first_name,
152	152	:last_name => @order.last_name,
153		:card_number => @order.cc_num
	153	:card_number => @order.cc_num,
	154	:card_code => @order.cc_cvv
154	155	)
155	156

peasantonline/app/models/order.rb

r1244	r1259
1	1	class Order < ActiveRecord::Base
2		validates_presence_of :first_name, :last_name, :cc_num, :address, :email, :state
	2	validates_presence_of :first_name, :last_name, :cc_num, :cc_cvv, :address, :email, :state
3	3	has_many :line_items
4	4

peasantonline/app/views/catalog/checkout.rhtml

r1133	r1259
1	1	<div id="checkout-form">
2	2	<%= error_messages_for 'order' %>
3		<fieldset>
4		<legend>Please Enter Your Details</legend>
	3	<br /><br />
5	4	<% form_for :order, :url => { :action => :save_order } do \|form\| %>
	5	<fieldset>
	6	<legend>Billing Information (must match your Credit Card statement)</legend>
	7
6	8	<p>
7	9	<table border="0" cellspacing="0" cellpadding="0">
…	…
9	11	<td>
10	12	<label for="order_first_name">First Name:</label><br />
11		<%= form.text_field :first_name, :size => 20 %>
	13	<%= form.text_field :first_name, :size => 20, :class=>"req" %>
12	14	</td>
13	15	<td>
14	16	<label for="order_last_name">Last Name:</label><br />
15		<%= form.text_field :last_name, :size => 20 %>
	17	<%= form.text_field :last_name, :size => 20, :class=>"req" %>
16	18	</td>
17	19	</tr>
…	…
22	24	<p>
23	25	<label for="order_address">Address:</label><br />
24		<%= form.text_field :address, :size => 40 %><br />
	26	<%= form.text_field :address, :size => 40, :class=>"req" %><br />
25	27	<%= form.text_field :address_2, :size => 40 %>
26	28	</p>
…	…
31	33	<td>
32	34	<label for="order_city">City:</label><br />
33		<%= form.text_field :city, :size => 30 %>
	35	<%= form.text_field :city, :size => 30, :class=>"req" %>
34	36	</td>
35	37	<td>
36	38	<label for="order_state">State:</label><br />
37		<select id="order_state" name="order[state]" size="1">
	39	<select id="order_state" name="order[state]" size="1" class="req">
38	40	<option value="">Select: </option>
39	41	<option value="AK">AK</option>
…	…
92	94	<td>
93	95	<label for="order_zip">Zip code:</label><br />
94		<%= form.text_field :zip, :size => 10 %>
	96	<%= form.text_field :zip, :size => 10, :class=>"req" %>
95	97	</td>
96	98	</tr>
…	…
99	101	<p>
100	102	<label for="order_country">Country:</label><br />
101		<select id="order_country" name="order[country]" size="1">
	103	<select id="order_country" name="order[country]" size="1" class="req">
102	104	<option>United States</option>
103	105	<option>Canada</option>
…	…
109	111	</select>
110	112	</p>
	113
	114	<p>
	115	<table border="0" cellspacing="0" cellpadding="0">
	116	<tr>
	117	<td>
	118	<label for="order_cc_num">Credit Card Number:</label><br />
	119	<%= form.text_field :cc_num, :size => 40, :class=>"req" %><br />
	120	</td>
	121	<td>
	122	<label for="order_cc_cvv">Security Code</label><br />
	123	<%= form.text_field :cc_cvv, :size => 6, :class=>"req" %><br />(on the back of your card)
	124	</td>
	125	</tr>
	126	<tr>
	127	<td colspan="2">
	128	<label for="order_cc_exp">Credit Card Expiration:</label><br />
	129	<select id="order_cc_exp_mm" name="order[cc_exp_mm]" size="1" class="req">
	130	<option value="01">(01) Jan</option>
	131	<option value="02">(02) Feb</option>
	132	<option value="03">(03) Mar</option>
	133	<option value="04">(04) Apr</option>
	134	<option value="05">(05) May</option>
	135	<option value="06">(06) Jun</option>
	136	<option value="07">(07) Jul </option>
	137	<option value="08">(08) Aug </option>
	138	<option value="09">(09) Sep </option>
	139	<option value="10">(10) Oct </option>
	140	<option value="11">(11) Nov </option>
	141	<option value="12">(12) Dec </option>
	142	</select>/<select id="order_cc_exp_yy" name="order[cc_exp_yy]" size="1" class="req">
	143	<option value="2006">2006</option>
	144	<option value="2007">2007</option>
	145	<option value="2008">2008</option>
	146	<option value="2009">2009</option>
	147	<option value="2010">2010</option>
	148	<option value="2011">2011</option>
	149	<option value="2012">2012</option>
	150	<option value="2013">2013</option>
	151	<option value="2014">2014</option>
	152	<option value="2015">2015</option>
	153	</select>
	154	</td>
	155	</tr>
	156	</table>
	157
	158	</p>
	159
	160	</fieldset><br /><br />
	161	<fieldset>
	162	<legend>Shipping Information (if different than billing)</legend>
	163	<p>
	164	<table border="0" cellspacing="0" cellpadding="0">
	165	<tr>
	166	<td>
	167	<label for="order_first_name_shipping">First Name:</label><br />
	168	<%= form.text_field :first_name_shipping, :size => 20 %>
	169	</td>
	170	<td>
	171	<label for="order_last_name_shipping">Last Name:</label><br />
	172	<%= form.text_field :last_name_shipping, :size => 20 %>
	173	</td>
	174	</tr>
	175	</table>
	176	</p>
	177
	178
	179	<p>
	180	<label for="order_address_shipping">Address:</label><br />
	181	<%= form.text_field :address_shipping, :size => 40 %><br />
	182	<%= form.text_field :address_2_shipping, :size => 40 %>
	183	</p>
	184
	185	<p>
	186	<table border="0" cellspacing="0" cellpadding="0">
	187	<tr>
	188	<td>
	189	<label for="order_city_shipping">City:</label><br />
	190	<%= form.text_field :city_shipping, :size => 30 %>
	191	</td>
	192	<td>
	193	<label for="order_state_shipping">State:</label><br />
	194	<select id="order_state_shipping" name="order[state_shipping]" size="1">
	195	<option value="">Select: </option>
	196	<option value="AK">AK</option>
	197	<option value="AL">AL</option>
	198	<option value="AR">AR</option>
	199	<option value="AZ">AZ</option>
	200	<option value="CA">CA</option>
	201	<option value="CO">CO</option>
	202	<option value="CT">CT</option>
	203	<option value="DC">DC</option>
	204	<option value="DE">DE</option>
	205	<option value="FL">FL</option>
	206	<option value="GA">GA</option>
	207	<option value="HI">HI</option>
	208	<option value="IA">IA</option>
	209	<option value="ID">ID</option>
	210	<option value="IL">IL</option>
	211	<option value="IN">IN</option>
	212	<option value="KS">KS</option>
	213	<option value="KY">KY</option>
	214	<option value="LA">LA</option>
	215	<option value="MA">MA</option>
	216	<option value="MD">MD</option>
	217	<option value="ME">ME</option>
	218	<option value="MI">MI</option>
	219	<option value="MN">MN</option>
	220	<option value="MO">MO</option>
	221	<option value="MS">MS</option>
	222	<option value="MT">MT</option>
	223	<option value="NC">NC</option>
	224	<option value="ND">ND</option>
	225	<option value="NE">NE</option>
	226	<option value="NH">NH</option>
	227	<option value="NJ">NJ</option>
	228	<option value="NM">NM</option>
	229	<option value="NV">NV</option>
	230	<option value="NY">NY</option>
	231	<option value="OH">OH</option>
	232	<option value="OK">OK</option>
	233	<option value="OR">OR</option>
	234	<option value="PA">PA</option>
	235	<option value="RI">RI</option>
	236	<option value="SC">SC</option>
	237	<option value="SD">SD</option>
	238	<option value="TN">TN</option>
	239	<option value="TX">TX</option>
	240	<option value="UT">UT</option>
	241	<option value="VA">VA</option>
	242	<option value="VT">VT</option>
	243	<option value="WA">WA</option>
	244	<option value="WI">WI</option>
	245	<option value="WV">WV</option>
	246	<option value="WY">WY</option>
	247	</select>
	248	</td>
	249	<td>
	250	<label for="order_zip_shipping">Zip code:</label><br />
	251	<%= form.text_field :zip_shipping, :size => 10 %>
	252	</td>
	253	</tr>
	254	</table>
	255	</p>
	256	<p>
	257	<label for="order_country_shipping">Country:</label><br />
	258	<select id="order_country_shipping" name="order[country_shipping]" size="1">
	259	<option>United States</option>
	260	<option>Canada</option>
	261	<option>Australia</option>
	262	<option>France</option>
	263	<option>Germany</option>
	264	<option>New Zealand</option>
	265	<option>United Kingdom</option>
	266	</select>
	267	</p>
	268	</fieldset> <br /><br />
	269	<fieldset>
	270	<legend>Other Order Information</legend>
	271
111	272	<p>
112	273	<label for="order_shipping">Shipping:</label><br />
113		<select id="order_shipping" name="order[shipping]" size="1">
	274	<select id="order_shipping" name="order[shipping]" size="1" class="req">
114	275	<option value="9.95">US - $9.95</option>
115	276	<option value="15.00">Can - $15.00</option>
…	…
120	281	<p>
121	282	<label for="order_phone">Phone:</label><br />
122		<%= form.text_field :phone, :size => 20 %>
	283	<%= form.text_field :phone, :size => 20, :class=>"req" %>
123	284	</p>
124	285
125	286	<p>
126	287	<label for="order_email">E-Mail:</label><br />
127		<%= form.text_field :email, :size => 25 %>
128		</p>
129
130		<p>
131		<table border="0" cellspacing="0" cellpadding="0">
132		<tr>
133		<td>
134		<label for="order_cc_num">Credit Card Number:</label><br />
135		<%= form.text_field :cc_num, :size => 40 %>
136		</td>
137		<td>
138		<label for="order_cc_exp">Credit Card Expiration:</label><br />
139		<select id="order_cc_exp_mm" name="order[cc_exp_mm]" size="1">
140		<option value="01">(01) Jan</option>
141		<option value="02">(02) Feb</option>
142		<option value="03">(03) Mar</option>
143		<option value="04">(04) Apr</option>
144		<option value="05">(05) May</option>
145		<option value="06">(06) Jun</option>
146		<option value="07">(07) Jul </option>
147		<option value="08">(08) Aug </option>
148		<option value="09">(09) Sep </option>
149		<option value="10">(10) Oct </option>
150		<option value="11">(11) Nov </option>
151		<option value="12">(12) Dec </option>
152		</select>/<select id="order_cc_exp_yy" name="order[cc_exp_yy]" size="1">
153		<option value="2006">2006</option>
154		<option value="2007">2007</option>
155		<option value="2008">2008</option>
156		<option value="2009">2009</option>
157		<option value="2010">2010</option>
158		<option value="2011">2011</option>
159		<option value="2012">2012</option>
160		<option value="2013">2013</option>
161		<option value="2014">2014</option>
162		<option value="2015">2015</option>
163		</select>
164		</td>
165		</tr>
166		</table>
167
168		</p>
	288	<%= form.text_field :email, :size => 25, :class=>"req" %>
	289	</p>
	290
169	291
170	292	<p>
…	…
176	298	Please note: Michigan orders will have a 6% sales tax added automatically.
177	299	</p>
178
	300	</fieldset>
179	301	<%= submit_tag "Place Order", :class => "submit" %>
180	302	<% end %>
181		</fieldset>
	303
182	304	</div>

peasantonline/db/schema.rb

r1233	r1259
3	3	# then regenerate this schema definition.
4	4
5		ActiveRecord::Schema.define(:version => 24) do
	5	ActiveRecord::Schema.define(:version => 25) do
6	6
7	7	create_table "categories", :force => true do \|t\|
…	…
50	50	t.column "sales_tax", :float
51	51	t.column "status", :string, :default => "NEW"
	52	t.column "first_name_shipping", :string
	53	t.column "last_name_shipping", :string
	54	t.column "address_shipping", :string
	55	t.column "address_2_shipping", :string
	56	t.column "city_shipping", :string
	57	t.column "zip_shipping", :string
	58	t.column "country_shipping", :string
	59	t.column "cc_cvv", :integer
52	60	end
53	61

peasantonline/public/stylesheets/catalog.css

r1231 r1259

236 236 color: #FFFFFF;
237 237 }
238 .req {
239 border: 2px solid #EEEE66;
240 }

r1231	r1259
236	236	color: #FFFFFF;
237	237	}
	238	.req {
	239	border: 2px solid #EEEE66;
	240	}

Navigation

Changeset 1259

Legend:

peasantonline/app/controllers/catalog_controller.rb

peasantonline/app/models/order.rb

peasantonline/app/views/catalog/checkout.rhtml

peasantonline/db/schema.rb

peasantonline/public/stylesheets/catalog.css

Download in other formats: