spree_retailers 0.40.0.4 → 0.50.0.0

data/README.md

@@ -7,8 +7,13 @@ Spree Retailers is a simple Spree Extension that adds a retailers page as well a
 Installation
 ------------
 
-As usual, add 'spree_retalers' to your Gemfile or install directly.
+As usual, add 'spree_retailers' to your Gemfile or install directly.
 
+    
+    # 0.50.x
+    gem 'spree_retailers', '0.50.0.0'
+    
+    # 0.40.x 
     gem 'spree_retailers', '0.40.0.4'
     
     # or
@@ -16,28 +21,6 @@ As usual, add 'spree_retalers' to your Gemfile or install directly.
     (sudo) gem install spree_retailers
 
 
-Demo
-----
-
-To create a spree retailers demo app, run the following:
-  
-    rails new spree_retailers_example 
-    cd spree_retailers_example 
-    echo "gem 'spree', '0.40.3'" >> Gemfile 
-    echo "gem 'spree_retailers'" >> Gemfile 
-    rm public/index.html
-    bundle install
-    rake spree:install spree_retailers:install db:migrate db:seed db:admin:create
-
-Or all at once:
-
-    rails new spree_retailers_example; cd spree_retailers_example; echo "gem 'spree', '0.40.3'" >> Gemfile; echo "gem 'spree_retailers'" >> Gemfile; rm public/index.html; bundle install; rake spree:install spree_retailers:install db:migrate db:seed db:admin:create
-
-`rake spree_sample:install db:sample` if you want to...
-
-Then start the server with `rails s`
-
-
 To Do
 -----
 

data/app/controllers/admin/retailers_controller.rb

@@ -21,32 +21,20 @@ class Admin::RetailersController < Admin::BaseController
 
   private
   
-  def object
-    get_states
-    super
-  end
-  
-  def collection
-    return @collection if @collection.present?
-    unless request.xhr?
+    def object
+      get_states
+      super
+    end
+    
+    def collection
       params[:search] ||= {}
-      params[:search][:order] ||= "ascend_by_name"      
-
-      @search = Retailer.searchlogic(params[:search])
-
-      #set order by to default or form result
-      @search.order ||= "ascend_by_name"
-
-      @collection = @search.do_search.paginate(:per_page => Spree::Config[:admin_products_per_page], :page => params[:page])
-    else
-      @collection = Retailer.find(:all,
-                          :conditions => params[:q] ? ["Retailer.name like :search OR Retailer.email like :search OR Retailer.phone like :search", {:search => "#{params[:q].strip}%"}] : nil,
-                          :limit => (params[:limit] || 100))
+      params[:search][:meta_sort] ||= "name.asc"
+      @search = end_of_association_chain.metasearch(params[:search])
+      @collection = @search.paginate(:per_page => Spree::Config[:orders_per_page], :page => params[:page])
+    end
+  
+    def get_states
+      @states = State.where(:country_id => 214).collect{|state| [state.name, state.abbr] }.sort
     end
-  end
-
-  def get_states
-    @states = State.where(:country_id => 214).collect{|state| [state.name, state.abbr] }.sort
-  end
   
 end

data/app/models/retailer.rb

@@ -9,7 +9,7 @@ class Retailer < ActiveRecord::Base
 
 
   has_attached_file :logo, 
-                    :styles => { :mini => '48x48>', :thumb => '120x100#', :large => '450x400#' },
+                    :styles => { :mini => '48x48>', :thumb => '150x150>', :large => '450x400>' },
                     :default_style => :thumb,
                     :url => "/assets/retailers/:id/:style/:basename.:extension",
                     :path => ":rails_root/public/assets/retailers/:id/:style/:basename.:extension"

data/app/views/admin/retailers/_form.html.erb

@@ -6,20 +6,20 @@
 
 <%= f.field_container :address do %>
   <%= f.label :address, "Address" %><br />
-  <%= f.text_field :address  %>
+  <%= f.text_field :address, :class => 'text' %>
   <%= error_message_on :retailer, :address %>
 <% end %>
 
 <%= f.field_container :address2 do %>
   <%= f.label :address2, "Address (cont)" %><br />
-  <%= f.text_field :address2  %>
+  <%= f.text_field :address2, :class => 'text'  %>
   <%= error_message_on :retailer, :address2 %>
 <% end %>
 
 
 <%= f.field_container :city do %>
   <%= f.label :city, "City" %><br />
-  <%= f.text_field :city  %>
+  <%= f.text_field :city, :class => 'text' %>
   <%= error_message_on :retailer, :city %>
 <% end %>
 
@@ -32,7 +32,7 @@
 
 <%= f.field_container :zipcode do %>
   <%= f.label :zipcode, "Zip" %><br />
-  <%= f.text_field :zipcode  %>
+  <%= f.text_field :zipcode, :class => 'text' %>
   <%= error_message_on :retailer, :zipcode %>
 <% end %>
 
@@ -40,24 +40,24 @@
 
 <%= f.field_container :phone do %>
   <%= f.label :phone, "Phone" %><br />
-  <%= f.text_field :phone  %>
+  <%= f.text_field :phone, :class => 'text' %>
   <%= error_message_on :retailer, :phone %>
 <% end %>
 
 <%= f.field_container :email do %>
   <%= f.label :email, "Email" %><br />
-  <%= f.text_field :email  %>
+  <%= f.text_field :email, :class => 'text' %>
   <%= error_message_on :retailer, :email %>
 <% end %>
 
 <%= f.field_container :url do %>
   <%= f.label :url, "Website URL" %><br />
-  <%= f.text_field :url  %>
+  <%= f.text_field :url, :class => 'text' %>
   <%= error_message_on :retailer, :url %>
 <% end %>
 
 <%= f.field_container :logo do %>
   <%= f.label :logo, "Logo Image:" %><br />
-  <%= f.file_field :logo  %>
+  <%= f.file_field :logo, :class => 'file' %>
   <%= error_message_on :retailer, :logo %>
 <% end %>

data/app/views/admin/retailers/index.html.erb

@@ -13,11 +13,11 @@
 <table class="index">
   <thead>
 	<tr>
-    	<th><%= order @search, :by => :name %></th>
-    	<th><%= order @search, :by => :address %></th>
-    	<th><%= order @search, :by => :state %></th>
-    	<th><%= order @search, :by => :email %></th>
-    	<th><%= order @search, :by => :phone %></th>
+    	<th><%= sort_link @search, :name %></th>
+    	<th><%= sort_link @search, :address %></th>
+    	<th><%= sort_link @search, :state %></th>
+    	<th><%= sort_link @search, :email %></th>
+    	<th><%= sort_link @search, :phone %></th>
     	<th><%= t("action") %></th>
 	</tr>
   </thead>
@@ -41,17 +41,24 @@
 <%= will_paginate(:prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;") %>
 
 
+
+
 <% content_for :sidebar do %>
+<div class="box">
+  <h3><%= t(:search) %></h3>
 
-  <%= form_for @search do |f| %>
-    <div class="box">
-      <h3><%= t(:search) %></h3>
+  <% @retailer = Retailer.metasearch %>
+  <%= form_for [:admin, @retailer] do |f| %>
+    <%- locals = {:f => f} %>
+    <%= hook :admin_pages_index_search, locals do %>
       <p>
-        <%= t("name") %><br />
-        <%= f.text_field :name_contains, :size=> 18 %>
-      </p>
+        <label><%= t '.name_contains' %></label><br />
+        <%= f.text_field :name_contains, :size => 25 %>
+      </p>      
+    <% end %>
+    <%= hook :admin_pages_index_search_buttons, locals do %>
       <p><%= button t("search") %></p>
-    </div>
+    <% end %>
   <% end %>
-
-<% end %>
+</div>
+<% end %>

data/config/locales/en.yml

@@ -1,2 +1,7 @@
 en:
-  retailers: Retailers
+  retailers: Retailers
+  
+  admin:
+    retailers:
+      index:
+        name_contains: Name Contains

data/lib/spree_retailers/version.rb

@@ -1,3 +1,3 @@
 module SpreeRetailers
-  VERSION = "0.40.0.4"
+  VERSION = "0.50.0.0"
 end

metadata

@@ -2,7 +2,7 @@
 name: spree_retailers
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.40.0.4
+  version: 0.50.0.0
 platform: ruby
 authors: 
 - Spencer Steffen
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 -08:00
-default_executable: 
+date: 2011-04-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
@@ -90,7 +89,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id007
-description: Spree Retailers adds a retailer page and admin to Spree Commerce.
+description: Spree Retailers adds a retail store page and admin to Spree Commerce.
 email: 
 - spencer@citrusme.com
 executables: []
@@ -125,7 +124,6 @@ files:
 - app/views/retailers/index.html.erb
 - db/migrate/install_spree_retailers.rb
 - Rakefile
-has_rdoc: true
 homepage: http://github.com/citrus/spree_retailers
 licenses: []
 
@@ -139,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1846554186713783098
+      hash: -2661866179854238972
       segments: 
       - 0
       version: "0"
@@ -148,14 +146,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1846554186713783098
+      hash: -2661866179854238972
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Spree Retailers adds a retailer admin to Spree.