From 3e9584bb1c3a3b69e5bb86159effffd342fdd9fd Mon Sep 17 00:00:00 2001
From: Frances Botsford <frances@edx.org>
Date: Wed, 11 Sep 2013 13:40:26 -0400
Subject: [PATCH] cleanup on vcert payment error and receipt billing info

---
 lms/templates/shoppingcart/error.html                 | 2 --
 lms/templates/shoppingcart/verified_cert_receipt.html | 5 +----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/lms/templates/shoppingcart/error.html b/lms/templates/shoppingcart/error.html
index da88dc1a78..662bb948e9 100644
--- a/lms/templates/shoppingcart/error.html
+++ b/lms/templates/shoppingcart/error.html
@@ -9,6 +9,4 @@
 <section class="container">
     <p><h1>${_("There was an error processing your order!")}</h1></p>
     ${error_html}
-
-    <p><a href="${reverse('shoppingcart.views.show_cart')}">${_("Return to cart to retry payment")}</a></p>
 </section>
diff --git a/lms/templates/shoppingcart/verified_cert_receipt.html b/lms/templates/shoppingcart/verified_cert_receipt.html
index 3adf659748..c029023801 100644
--- a/lms/templates/shoppingcart/verified_cert_receipt.html
+++ b/lms/templates/shoppingcart/verified_cert_receipt.html
@@ -202,10 +202,7 @@
 
             <div class="copy">
               <p>${_("Billed To")}:
-                <span class="name-first">${order.bill_to_first}</span> <span class="name-last">${order.bill_to_last}</span><br />
-                <span class="address-street1">${order.bill_to_street1}</span> <span class="address-street2">${order.bill_to_street2}</span><br />
-                <span class="address-city">${order.bill_to_city}</span>, <span class="address-state">${order.bill_to_state}</span> <span class="address-postalcode">${order.bill_to_postalcode}</span><br />
-                <span class="address-country">${order.bill_to_country.upper()}</span>
+                <span class="name-first">${order.bill_to_first}</span> <span class="name-last">${order.bill_to_last}</span> (<span class="address-city">${order.bill_to_city}</span>, <span class="address-state">${order.bill_to_state}</span> <span class="address-postalcode">${order.bill_to_postalcode}</span> <span class="address-country">${order.bill_to_country.upper()}</span>)
               </p>
             </div>
           </li>