From f45ed42bdbcf3d51c0f74ad531a87ce181248676 Mon Sep 17 00:00:00 2001 From: alexs Date: Thu, 8 Aug 2013 11:42:45 +1000 Subject: [PATCH] Skeleton for the search results. --- app/controllers/enterprises_controller.rb | 6 ++++++ app/models/enterprise.rb | 4 ++++ app/views/enterprises/search.html.haml | 4 ++++ app/views/home/new_landing_page.html.haml | 2 +- config/routes.rb | 1 + 5 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 app/views/enterprises/search.html.haml diff --git a/app/controllers/enterprises_controller.rb b/app/controllers/enterprises_controller.rb index 1c314670d5..54d4859a0b 100644 --- a/app/controllers/enterprises_controller.rb +++ b/app/controllers/enterprises_controller.rb @@ -31,4 +31,10 @@ class EnterprisesController < BaseController @searcher = Spree::Config.searcher_class.new(options) @products = @searcher.retrieve_products end + + def search + suburb = Suburb.find_by_postcode(params[:postcode]) + @enterpsises = Enterprise.all + render :layout => "landing_page" + end end diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb index bdcf9c9201..d3e8ace54d 100644 --- a/app/models/enterprise.rb +++ b/app/models/enterprise.rb @@ -65,6 +65,10 @@ class Enterprise < ActiveRecord::Base count(distinct: true) end + def self.search_near(suburb) + Enterprise.near [suburb.latitude, suburb.longitude] + end + def has_supplied_products_on_hand? self.supplied_products.where('count_on_hand > 0').present? end diff --git a/app/views/enterprises/search.html.haml b/app/views/enterprises/search.html.haml new file mode 100644 index 0000000000..08e5b63c5d --- /dev/null +++ b/app/views/enterprises/search.html.haml @@ -0,0 +1,4 @@ +- @enterpsises.each do |enterprise| + .row + .large-12.columns + = enterprise.name \ No newline at end of file diff --git a/app/views/home/new_landing_page.html.haml b/app/views/home/new_landing_page.html.haml index b599884bce..06d93498a4 100644 --- a/app/views/home/new_landing_page.html.haml +++ b/app/views/home/new_landing_page.html.haml @@ -5,7 +5,7 @@ .large-10.large-centered.columns #postcode_select_box .row - = form_tag do + = form_tag search_enterprises_path do .large-10.columns = text_field_tag :postcode, "", class: "right", placeholder: "Enter your postcode..." .large-2.columns diff --git a/config/routes.rb b/config/routes.rb index 4da15b82bb..e5363e7dd8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,7 @@ Openfoodweb::Application.routes.draw do resources :enterprises do get :suppliers, :on => :collection get :distributors, :on => :collection + post :search, :on => :collection end namespace :admin do