From 58e5724f81f5bc8030a4b286806fb801c4e7d780 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 10 Oct 2012 12:08:35 +1100
Subject: [PATCH] Display supplier details on supplier page

---
 app/controllers/spree/suppliers_controller.rb | 3 ++-
 app/views/spree/suppliers/show.html.erb       | 7 +++++++
 spec/requests/consumer/suppliers_spec.rb      | 6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 app/views/spree/suppliers/show.html.erb

diff --git a/app/controllers/spree/suppliers_controller.rb b/app/controllers/spree/suppliers_controller.rb
index 3b3f29cead..9ec5c0625b 100644
--- a/app/controllers/spree/suppliers_controller.rb
+++ b/app/controllers/spree/suppliers_controller.rb
@@ -6,9 +6,10 @@ module Spree
       options = {:supplier_id => params[:id]}
       options.merge(params.reject { |k,v| k == :id })
 
+      @supplier = Supplier.find params[:id]
+
       @searcher = Config.searcher_class.new(options)
       @products = @searcher.retrieve_products
-      render :template => 'spree/products/index'
     end
   end
 end
diff --git a/app/views/spree/suppliers/show.html.erb b/app/views/spree/suppliers/show.html.erb
new file mode 100644
index 0000000000..57ba45cd09
--- /dev/null
+++ b/app/views/spree/suppliers/show.html.erb
@@ -0,0 +1,7 @@
+<h2><%= @supplier.name %></h2>
+
+<div class="supplier-description"><%= @supplier.long_description %></div>
+
+<h3>Available Now</h3>
+
+<%= render :template => 'spree/products/index' %>
diff --git a/spec/requests/consumer/suppliers_spec.rb b/spec/requests/consumer/suppliers_spec.rb
index a1eb1d40e8..f993f6fcb3 100644
--- a/spec/requests/consumer/suppliers_spec.rb
+++ b/spec/requests/consumer/suppliers_spec.rb
@@ -30,7 +30,11 @@ feature %q{
     visit spree.root_path
     click_link s.name
 
-    # Then I should see the product
+    # Then I should see the supplier details
+    page.should have_selector 'h2', :text => s.name
+    page.should have_selector 'div.supplier-description', :text => s.long_description
+
+    # And I should see the product
     page.should have_content p.name
   end
 end