From c01b198f95ef57cda162bf850f5405bd3ef771ad Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 14 Mar 2014 15:34:18 +1100
Subject: [PATCH] Minor tweaks

---
 .../darkswarm/controllers/checkout_controller.js.coffee       | 2 +-
 app/views/shop/shop/_about_us.html.haml                       | 4 ++--
 app/views/shop/shop/_contact.html.haml                        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/controllers/checkout_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/checkout_controller.js.coffee
index ffb8a8afb6..575d046f59 100644
--- a/app/assets/javascripts/darkswarm/controllers/checkout_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/checkout_controller.js.coffee
@@ -19,7 +19,7 @@ angular.module("Checkout").controller "CheckoutCtrl", ($scope, $rootScope, order
     $scope.order.shipping_methods[$scope.order.shipping_method_id]
 
   $scope.shippingMethodChanged = ->
-    $scope.require_ship_address = $scope.shippingMethod().require_ship_address
+    $scope.require_ship_address = $scope.shippingMethod().require_ship_address if $scope.shippingMethod()
 
   $scope.purchase = (event)->
     event.preventDefault()
diff --git a/app/views/shop/shop/_about_us.html.haml b/app/views/shop/shop/_about_us.html.haml
index cf48da4f81..d4530b3c6e 100644
--- a/app/views/shop/shop/_about_us.html.haml
+++ b/app/views/shop/shop/_about_us.html.haml
@@ -6,5 +6,5 @@
     %img.about.right{src: @distributor.promo_image.url(:large)}
     %p= @distributor.long_description.andand.html_safe
     
-    .panel
-      = @distributor.distributor_info.andand.html_safe
+    -#.panel
+      -#= @distributor.distributor_info.andand.html_safe
diff --git a/app/views/shop/shop/_contact.html.haml b/app/views/shop/shop/_contact.html.haml
index 77232f2853..c00723896b 100644
--- a/app/views/shop/shop/_contact.html.haml
+++ b/app/views/shop/shop/_contact.html.haml
@@ -6,11 +6,11 @@
       %p
         %strong E
         %a{href: "mailto:#{@distributor.email}"}= @distributor.email
-      
         - unless @distributor.website.blank?
+          %br 
           %strong W
           %a{href: @distributor.website}= @distributor.website
-
+        %br 
         = [@distributor.address.address1, @distributor.address.address2].join ", "
         %br
         = @distributor.address.city