Skip to content

Commit 9efea2e

Browse files
author
rupert
committed
many small edits to html and emails
1 parent d4204e8 commit 9efea2e

File tree

8 files changed

+109
-94
lines changed

8 files changed

+109
-94
lines changed

app/models/quote.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class Quote < ActiveRecord::Base
1010
belongs_to :processor
1111

1212
validates_presence_of :computer, :if => Proc.new {|q| ["details"].include? q.stage}
13-
validates_presence_of :disk, :message => "selection is required", :if => Proc.new {|q| ["details", "location", "payment"].include? q.stage}
13+
validates_presence_of :disk, :message => "can't be blank", :if => Proc.new {|q| ["details", "location", "payment"].include? q.stage}
1414
validates_presence_of :ram, :grade, :processor, :if => Proc.new {|q| ["details", "location", "payment"].include? q.stage}
1515

1616
validates_format_of :name, :with => /^[\s\w]+$/, :message => "- Please enter your name.", :if => Proc.new{|q| ["location", "payment"].include? q.stage}

app/views/notifier/quote.html.erb

Lines changed: 98 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -2,90 +2,105 @@
22
<html>
33
<head>
44
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
5-
<title>New Quote</title>
5+
<title>New Quote</title> <link href="http://www.laptops-to-go.co.uk/morepics/email_stylesheet.css" rel="stylesheet" type="text/css">
66
</head>
77
<body>
8-
<div>
9-
<div>
10-
<h2><strong>A new quote has been received</strong>
11-
</h2>
12-
</div>
13-
<table width="903" cellpadding="3" cellspacing="5">
14-
<tr>
15-
<td valign="top"><div>Type: </div></td>
16-
<td valign="top">
17-
<div><%= @quote.computer.name %> </div></td>
18-
<td valign="top">&nbsp;</td>
19-
</tr>
20-
<tr>
21-
<td valign="top"><div>Speed: </div></td>
22-
<td valign="top">
23-
<div><%= @quote.processor %></div></td>
24-
<td rowspan="15" valign="top">&nbsp;</td>
25-
</tr>
26-
<tr>
27-
<td valign="top"><div>Ram: </div></td>
28-
<td valign="top">
29-
<div><%= @quote.ram %></div></td>
30-
</tr>
31-
<tr>
32-
<td valign="top"><div>Disk: </div></td>
33-
<td valign="top">
34-
<div><%= @quote.disk %> </div></td>
35-
</tr>
36-
<tr>
37-
<td valign="top"><div>Grade: </div></td>
38-
<td valign="top">
39-
<div><%= @quote.grade %></div></td>
40-
</tr>
41-
<tr>
42-
<td valign="top"><div>Boxed: </div></td>
43-
<td valign="top">
44-
<div><%= @quote.box %></div></td>
45-
</tr>
46-
<tr>
47-
<td valign="top"><div>Price Quoted</div></td>
48-
<td valign="top"><div><%= @quote.calculate -%></div></td>
49-
</tr>
50-
<tr>
51-
<td valign="top"><div>Seller's Name: </div></td>
52-
<td valign="top"><div><%= @quote.name -%></div></td>
53-
</tr>
54-
<tr>
55-
<td valign="top"><div>House Name or Number: </div></td>
56-
<td valign="top"><div><%= @quote.houseid %></div></td>
57-
</tr>
58-
<tr>
59-
<td valign="top"><div>Street Name: </div></td>
60-
<td valign="top"><div><%= @quote.road %></div></td>
61-
</tr>
62-
<tr>
63-
<td valign="top"><div>City: </div></td>
64-
<td valign="top"><div><%= @quote.city %></div></td>
65-
</tr>
66-
<tr>
67-
<td valign="top"><div>Post Code: </div></td>
68-
<td valign="top"><div><%= @quote.postcode %></div></td>
69-
</tr>
70-
<tr>
71-
<td valign="top"><div>Telephone Number: </div></td>
72-
<td valign="top"><div><%= @quote.phone %></div></td>
73-
</tr>
74-
<tr>
75-
<td valign="top"><div>Email Address: </div></td>
76-
<td valign="top"><div><%= @quote.email %></div></td>
77-
</tr>
78-
<tr>
79-
<td valign="top"><div>Pickup Date: </div></td>
80-
<td valign="top">
81-
<div><%= @quote.collection_date %></div></td>
82-
</tr>
83-
<tr>
84-
<td valign="top"><div>Additional Details: </div></td>
85-
<td valign="top">
86-
<div><%= @quote.comment %></div></td>
87-
</tr>
88-
</table>
8+
<div class="pagecontainer">
9+
<table width="800" border="0" align="center" cellpadding="0" cellspacing="0" class="four-border">
10+
<tr>
11+
<td width="43" align="center" valign="middle" class="left_gradient">&nbsp;</td>
12+
<td align="center" valign="middle" bgcolor="#FFFFFF"><table width="714" border="0" cellpadding="3" cellspacing="5">
13+
<tr>
14+
<td colspan="2" align="left" valign="top"><span class="banner-logo">Money<span style="color:red">4</span>Macs.co.uk<br>
15+
0780 0657487 </span></td>
16+
</tr>
17+
<tr>
18+
<td colspan="2" align="left" valign="top">We have received your offer to sell your Apple Mac to us. The full details are below. If there are any errors then please get in touch to let us know. </td>
19+
</tr>
20+
<tr>
21+
<td colspan="2" align="left" valign="top">We will book the courier to collect on the date selected and you should receive a confirmation email confirming the date of collection. If you fail to receive this email then please check your spam filters in case it has been filtered.</td>
22+
</tr>
23+
<tr>
24+
<td colspan="2" align="left" valign="top"><h2>Your Details</h2></td>
25+
</tr>
26+
<tr>
27+
<td width="27%" align="right" valign="top"><div>Type: </div></td>
28+
<td width="73%" align="left" valign="top"><div>Macbook Pro 15 Inch Non Unibody</div></td>
29+
</tr>
30+
<tr>
31+
<td width="27%" align="right" valign="top"><div>Speed: </div></td>
32+
<td width="73%" align="left" valign="top"><div>2.2 GHz Core 2 Duo</div></td>
33+
</tr>
34+
<tr>
35+
<td width="27%" align="right" valign="top"><div>Ram: </div></td>
36+
<td width="73%" align="left" valign="top"><div>2 GB</div></td>
37+
</tr>
38+
<tr>
39+
<td width="27%" align="right" valign="top"><div>Disk: </div></td>
40+
<td width="73%" align="left" valign="top"><div>160GB</div></td>
41+
</tr>
42+
<tr>
43+
<td width="27%" align="right" valign="top"><div>Grade: </div></td>
44+
<td width="73%" align="left" valign="top"><div>Grade B</div></td>
45+
</tr>
46+
<tr>
47+
<td width="27%" align="right" valign="top"><div>Boxed: </div></td>
48+
<td width="73%" align="left" valign="top"><div>true</div></td>
49+
</tr>
50+
<tr>
51+
<td width="27%" align="right" valign="top"><div>Price Quoted</div></td>
52+
<td width="73%" align="left" valign="top"><div>320.00</div></td>
53+
</tr>
54+
<tr>
55+
<td width="27%" align="right" valign="top"><div>Seller's Name: </div></td>
56+
<td width="73%" align="left" valign="top"><div>1</div></td>
57+
</tr>
58+
<tr>
59+
<td width="27%" align="right" valign="top"><div>House Name or Number: </div></td>
60+
<td width="73%" align="left" valign="top"><div>2</div></td>
61+
</tr>
62+
<tr>
63+
<td width="27%" align="right" valign="top"><div>Street Name: </div></td>
64+
<td width="73%" align="left" valign="top"><div>3</div></td>
65+
</tr>
66+
<tr>
67+
<td width="27%" align="right" valign="top"><div>City: </div></td>
68+
<td width="73%" align="left" valign="top"><div>4</div></td>
69+
</tr>
70+
<tr>
71+
<td width="27%" align="right" valign="top"><div>Post Code: </div></td>
72+
<td width="73%" align="left" valign="top"><div>5</div></td>
73+
</tr>
74+
<tr>
75+
<td width="27%" align="right" valign="top"><div>Telephone Number: </div></td>
76+
<td width="73%" align="left" valign="top"><div>6</div></td>
77+
</tr>
78+
<tr>
79+
<td width="27%" align="right" valign="top"><div>Mac's Serial Number: </div></td>
80+
<td width="73%" align="left" valign="top"><div>7</div></td>
81+
</tr>
82+
<tr>
83+
<td width="27%" align="right" valign="top"><div>Email Address: </div></td>
84+
<td width="73%" align="left" valign="top"><div>8</div></td>
85+
</tr>
86+
<tr>
87+
<td width="27%" height="22" align="right" valign="top"><div>Pickup Date: </div></td>
88+
<td width="73%" align="left" valign="top"><div>2011-09-21 07:34:35 UTC</div></td>
89+
</tr>
90+
<tr>
91+
<td width="27%" height="22" align="right" valign="top"><div>Additional Details: </div></td>
92+
<td width="73%" align="left" valign="top"><div>Additional shipping information</div></td>
93+
</tr>
94+
<tr>
95+
<td height="56" colspan="2" align="center" valign="bottom" class="spec_table">This is an automated email. Please do not reply to this email as the email address is not monitored.</td>
96+
</tr>
97+
<tr>
98+
<td height="56" colspan="2" align="center" valign="middle" class="please_note_vat">http://www.money4macs.co.uk | Terms and Conditions</td>
99+
</tr>
100+
</table></td>
101+
<td width="43" align="center" valign="middle" class="right_gradient"></td>
102+
</tr>
103+
</table>
89104
</div>
90105
</body>
91-
</html>
106+
</html>

app/views/quotes/about_us.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<table class="banner-logo" align="center" width="690" cellspacing="0" cellpadding="0" border="0">
22
<tr>
3-
<td class="banner-logo"> Money<span style="color:red">4</span>Macs.co.uk<br/>0117 9021781
3+
<td class="banner-logo"> Money<span style="color:red">4</span>Macs.co.uk<br/>0780 0657487
44
</td>
55
</tr>
66
</table>

app/views/quotes/grading.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<table class="banner-logo" align="center" width="690" cellspacing="0" cellpadding="0" border="0">
22
<tr>
3-
<td class="banner-logo"> Money<span style="color:red">4</span>Macs.co.uk<br/>0117 9021781
3+
<td class="banner-logo"> Money<span style="color:red">4</span>Macs.co.uk<br/>0780 0657487
44
</td>
55
</tr>
66
</table>
@@ -34,7 +34,7 @@
3434
we will deduct £10 from any price quoted as non-UK computers are harder to sell in this country. Please bear
3535
this in mind when you accept your quote.<br>
3636
<br>
37-
If you do not include your charger with a laptop you are selling (including faulty laptops) we will deduct £30
37+
If you do not include your charger with a laptop you are selling (including faulty laptops) we will deduct £25
3838
from the price that we quote for your computer. This is due to the cost of replacing chargers - which is
3939
necessary to sell a laptop on.<br>
4040
<br>

app/views/quotes/how_to_find.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<table class="banner-logo" align="center" width="811" cellspacing="0" cellpadding="0" border="0">
22
<tr>
3-
<td class="banner-logo"> Money<span style="color:red">4</span>Macs.co.uk<br/>0117 9021781
3+
<td class="banner-logo"> Money<span style="color:red">4</span>Macs.co.uk<br/>0780 0657487
44
</td>
55
</tr>
66
</table>

app/views/quotes/new.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<% form_for @quote do |f| %>
22
<table class="banner-logo" align="center" width="811" cellspacing="0" cellpadding="0" border="0">
33
<tr>
4-
<td class="banner-logo"> Money<span style="color:red">4</span>Macs.co.uk<br>0117 9021781
4+
<td class="banner-logo"> Money<span style="color:red">4</span>Macs.co.uk<br>0780 0657487
55

66
</td>
77
</tr>

app/views/quotes/terms_and_conditions.html.erb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<table class="banner-logo" align="center" width="690" cellspacing="0" cellpadding="0" border="0">
22
<tr>
3-
<td class="banner-logo"> Money<span style="color:red">4</span>Macs.co.uk<br/>0117 9021781
3+
<td class="banner-logo"> Money<span style="color:red">4</span>Macs.co.uk<br/>0780 0657487
44
</td>
55
</tr>
66
</table>
77
<table class="four-border" width="690" border="0" cellpadding="3">
88
<td align="left" class="tab-text"> <div align="center">Terms and Conditions </div></td>
99
<tr>
10-
<td align="left" class="simple-text"><p>1: It is the responsibility of the sender to ensure that the Mac is suitably packaged for shipment and will not be damaged in transit. Money4Macs.co.uk and our courier are not responsible for damage caused in transit. The box that your computer originally came in is adequate for shipping. If you do not have the original packaging and are unsure of how to package your item, please feel free to call us on 0117 9021 781 and we will be happy to advise. The Mac MUST be boxed in a minimum of a double walled cardboard box. Small-bubble bubblewrap is ok for laptops as long as you use enough but for desktop computers you MUST use large-bubble bubblewrap as small-bubble bubblewrap is inadequate for the job. If you cannot source any packaging materials we can offer a service to supply them, however we charge £20+VAT for this. Please note that if you would like to purchase packaging supplies from us payment will be required up front and is a separate transaction. It is not taken out of the final payment for your goods. If you believe that the packaging supplied by us is inadequate then please contact us immediately on 0117 9021 781. Any damaged, irreparable goods will either be returned to the sender (see point 2 for charges) or we will pay the faulty rate**. Don&rsquo;t allow the courier to pack the item as they are not qualified to do so.
10+
<td align="left" class="simple-text"><p>1: It is the responsibility of the sender to ensure that the Mac is suitably packaged for shipment and will not be damaged in transit. Money4Macs.co.uk and our courier are not responsible for damage caused in transit. The box that your computer originally came in is adequate for shipping. If you do not have the original packaging and are unsure of how to package your item, please feel free to call us on 0780 0657487 and we will be happy to advise. The Mac MUST be boxed in a minimum of a double walled cardboard box. Small-bubble bubblewrap is ok for laptops as long as you use enough but for desktop computers you MUST use large-bubble bubblewrap as small-bubble bubblewrap is inadequate for the job. If you cannot source any packaging materials we can offer a service to supply them, however we charge £20+VAT for this. Please note that if you would like to purchase packaging supplies from us payment will be required up front and is a separate transaction. It is not taken out of the final payment for your goods. If you believe that the packaging supplied by us is inadequate then please contact us immediately on 0780 0657487. Any damaged, irreparable goods will either be returned to the sender (see point 2 for charges) or we will pay the faulty rate**. Don&rsquo;t allow the courier to pack the item as they are not qualified to do so.
1111
<br>
1212
<br>
1313
2: Our engineers will test your computer and any faults or problems not specified at the time of agreeing to our terms and conditions will affect the quote significantly. In the event this happens, you will be contacted immediately by us. If a machine is tested and is found to be faulty when expected to be working then we pay our book price for faulty macs. This is calculated on age, model and CPU (G4, G5, Intel etc.). If you are not satisfied, you can have the mac returned to you at your cost (See point 6 below). We can provide reports of our testing results upon request. We charge £75+VAT to return faulty or damaged macs should you not accept the faulty book price. This covers the cost of collection, testing and re-delivery.  A new corrected quote will need to be calculated for machines not specified correctly at the quoting process. Should you not accept the corrected quote then the same £75+VAT charge will apply to return the Mac. This covers the cost of collection, testing and re-delivery.
@@ -45,7 +45,7 @@
4545
10: In the unlikely event of damage to our premises through fire, water damage, storms, terrorism, robbery, theft, explosion, act of god or other catastrophic disaster, in which stock/goods are damaged, we are obliged to pay our fully quoted amount as agreed to at time of collection. This amount is payable as per our terms. A full police/insurance report can be forwarded in the extremely unlikely event of any of these circumstances.
4646
<br>
4747
<br>
48-
11: Our courier insures any consignment by default to a maximum £60. If you require extra insurance on your consignment please call us on 0117 9021 781. We deal with additional insurance for consignments on a case by case basis.
48+
11: Our courier insures any consignment by default to a maximum £1000. If you require extra insurance on your consignment please call us on 0780 0657487. We deal with additional insurance for consignments on a case by case basis.
4949
<br>
5050
<br>
5151
12: Any missed collections due to the computer not being available for collection, either due to the premises being closed or the parcel not being ready for collection will be charged at £10+VAT per failed attempt. We are charged this by our courier for any collection attempts that are unsuccessful through no fault of their own. Any failed collection attempts due to a problem with our courier will not be charged.
@@ -60,7 +60,7 @@
6060
15. At present Money4Macs.co.uk only accepts orders from within the British Isles. Highland areas and outlying islands are included but are subject to an additional charge imposed by our courier Interlink Express. The courier company may sometimes change depending on your location as Interlink subcontract other couriers to collect in more remote areas.
6161
<br>
6262
<br>
63-
**Standard faulty rate is dependent on the processor type. For G4 based computers it is £40, for G5 based computers it is £50 and for Intel based computers the faulty rate is £75.
63+
**Standard faulty rate is dependent on the processor type. For G4 based computers it is £40, for G5 based computers it is £50 and for Intel based computers the faulty rate is £70.
6464
<br>
6565
<br>
6666
<strong>Definitions</strong> <br>

config/environment.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@
3838

3939
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
4040
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
41-
# config.i18n.default_locale = :de
41+
config.i18n.default_locale = :en
4242
end

0 commit comments

Comments
 (0)