spree_retailers 0.50.0.0 → 0.70.0.0

data/.gitignore

@@ -0,0 +1,7 @@
+*.gem
+.bundle
+.DS_Store
+Gemfile.lock
+pkg/*
+test/dummy
+test/dummy_hooks/after_migrate.rb

data/.travis.yml

@@ -0,0 +1,8 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx
+  - ree
+
+script: "bundle exec dummier && bundle exec rake test"

data/Gemfile

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gemspec

data/LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) 2011 Spencer Steffen and Citrus Media Group.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+    * Neither the name of Citrus Media Group nor the names of its
+      contributors may be used to endorse or promote products derived from this
+      software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -1,24 +1,39 @@
 Spree Retailers
 ===============
 
-Spree Retailers is a simple Spree Extension that adds a retailers page as well as a retailers admin.
+Spree Retailers is a Spree extension for listing your company's retail stores on your web site.
 
 
 Installation
 ------------
 
-As usual, add 'spree_retailers' to your Gemfile or install directly.
-
+As usual, add 'spree_retailers' to your Gemfile and run bundle install:
     
-    # 0.50.x
+    # Spree 0.70.x
+    gem 'spree_retailers', '0.70.0.0'
+     
+    # Spree 0.50.x, 0.60.x
     gem 'spree_retailers', '0.50.0.0'
     
-    # 0.40.x 
+    # Spree 0.40.x 
     gem 'spree_retailers', '0.40.0.4'
     
-    # or
+    # install from git
+    gem 'spree_retailers', :git => 'git://github.com/citrus/spree_retailers.git'
+
+
+Next, copy the migration file to your project:
+
+    # Spree 0.40.x, 0.50.x and 0.60.x
+    rake spree_retailers:install
     
-    (sudo) gem install spree_retailers
+    # 0.70.x and above
+    rails g spree_retailers:install
+
+
+Now, migrate your database with:
+
+    rake db:migrate
 
 
 To Do
@@ -27,10 +42,10 @@ To Do
 * Write controller tests
 * Write admin tests
 * Google map integration (we're already geocoding, so why not?)
-* Add International Support
+* Add (better) International Support
 
 
 License
 -------
 
-Copyright (c) 2011 Spencer Steffen, released under the New BSD License All rights reserved.
+Copyright (c) 2011 Spencer Steffen and Citrus, released under the New BSD License All rights reserved.

data/Rakefile

@@ -1,29 +1,10 @@
 # encoding: UTF-8
-require 'rubygems'
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rake'
+require "bundler/gem_tasks"
 require 'rake/testtask'
-#require 'rake/rdoctask'
-
-Bundler::GemHelper.install_tasks
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
+Rake::TestTask.new do |t|
+  t.libs << 'lib' << 'test'
   t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
 end
 
 task :default => :test
-
-
-desc "Builds dummy app for testing"
-task :test_app do
-  require 'spree_retailers/generators/test_app_generator'
-  SpreeRetailers::Generators::TestAppGenerator.start
-end

data/Versionfile

@@ -0,0 +1,4 @@
+"0.70.x" => { :version => "0.70.0.0" }
+"0.60.x" => { :version => "0.50.0.0" }
+"0.50.x" => { :version => "0.50.0.0" }
+"0.40.x" => { :version => "0.40.0.4" }

data/app/controllers/admin/retailers_controller.rb

@@ -1,39 +1,18 @@
-class Admin::RetailersController < Admin::BaseController
+class Admin::RetailersController < Admin::ResourceController
 
-  resource_controller
-
-  actions :all
-
-	create.response do |wants|
-		wants.html {redirect_to admin_retailers_path}
-  end
-    
-	update.response do |wants|
-		wants.html {redirect_to admin_retailers_path}
-  end
-
-  index.response do |wants|
-    wants.html { render :action => :index }
-    wants.json { render :json => @collection.to_json() }
-  end
-  
-  destroy.success.wants.js { render_js_for_destroy }
+  before_filter :get_locations, :except => [:index,:destroy]
 
   private
   
-    def object
-      get_states
-      super
-    end
-    
     def collection
       params[:search] ||= {}
       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])
+      @search = super.search(params[:search])
+      @collection = @search.page(params[:page]).per(Spree::Config[:orders_per_page])
     end
   
-    def get_states
+    def get_locations
+      @countries = Country.all.collect{|country| country.name }.sort
       @states = State.where(:country_id => 214).collect{|state| [state.name, state.abbr] }.sort
     end
   

data/app/controllers/retailers_controller.rb

@@ -1,7 +1,7 @@
 class RetailersController < Spree::BaseController
 
   def index
-    @retailers = Retailer.order(:state, :name)
+    @retailers = Retailer.order(:country, :state, :name)
     @states = {}
     State.where(:abbr => @retailers.collect(&:state).uniq).all.each do |state|
       @states[state.abbr] = state.name

data/app/helpers/retailers_helper.rb

@@ -1,7 +1,10 @@
 module RetailersHelper
   
-  def state_nav_helper
-    states = (@retailers || Retailer.select(:state).group(:state).all).collect(&:state).uniq
+  def state_nav_helper(retailers=[])
+    states = retailers.collect(&:state).uniq
+    
+    puts states
+    
     return "" unless 1 < states.length
     states.collect{|state| link_to(state, "##{state.downcase}") }.join(" | ").html_safe 
   end 

data/app/models/retailer.rb

@@ -1,6 +1,8 @@
 class Retailer < ActiveRecord::Base
   
-  validates_presence_of :name, :address, :city, :state, :zipcode
+  validates :name, :address, :city, :presence => true
+  validates :state, :zipcode, :presence => true, :if => Proc.new{|record| record.country == "United States" }
+  
   validates :email, :email => true, :allow_blank => true
   
   validates_numericality_of :latitude, :longitude, :allow_blank => true

data/app/overrides/spree_retailers.rb

@@ -0,0 +1,5 @@
+Deface::Override.new(:virtual_path  => "layouts/admin",
+                     :name          => "converted_admin_tabs_for_spree_retailers",
+                     :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
+                     :partial       => "admin/hooks/retailers_tab",
+                     :disabled      => false)

data/app/views/admin/hooks/_retailers_tab.html.erb

@@ -1 +1 @@
-<%= tab :retailers %>
+<%= tab :retailers %>

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

@@ -12,7 +12,7 @@
 
 <%= f.field_container :address2 do %>
   <%= f.label :address2, "Address (cont)" %><br />
-  <%= f.text_field :address2, :class => 'text'  %>
+  <%= f.text_field :address2, :class => 'text' %>
   <%= error_message_on :retailer, :address2 %>
 <% end %>
 
@@ -23,12 +23,18 @@
   <%= error_message_on :retailer, :city %>
 <% end %>
 
+
+
 <%= f.field_container :state do %>
   <%= f.label :state, "State" %><br />
-  <%= f.select :state, @states %>
+  <% if @retailer.new_record? || @retailer.country == "United States" %>
+    <%= f.select :state, @states %>
+  <% else %>
+    <%= f.text_field :state, :class => 'text' %>
+  <% end %>
   <%= error_message_on :retailer, :state %>
 <% end %>
-
+  
 
 <%= f.field_container :zipcode do %>
   <%= f.label :zipcode, "Zip" %><br />
@@ -37,6 +43,12 @@
 <% end %>
 
 
+<%= f.field_container :country do %>
+  <%= f.label :country, "Country" %><br />
+  <%= f.select :country, @countries, :selected => @retailer.new_record? ? "United States" : @retailer.country  %>
+  <%= error_message_on :retailer, :country %>
+<% end %>
+
 
 <%= f.field_container :phone do %>
   <%= f.label :phone, "Phone" %><br />
@@ -46,7 +58,7 @@
 
 <%= f.field_container :email do %>
   <%= f.label :email, "Email" %><br />
-  <%= f.text_field :email, :class => 'text' %>
+  <%= f.email_field :email, :class => 'text' %>
   <%= error_message_on :retailer, :email %>
 <% end %>
 
@@ -56,8 +68,38 @@
   <%= error_message_on :retailer, :url %>
 <% end %>
 
-<%= f.field_container :logo do %>
-  <%= f.label :logo, "Logo Image:" %><br />
-  <%= f.file_field :logo, :class => 'file' %>
-  <%= error_message_on :retailer, :logo %>
+<% if @retailer.has_logo? %>
+  <%= f.field_container :logo do %>
+    <p class="current-logo">
+      <%= label_tag 'current_logo', "Current Logo:" %><br />
+      <%= image_tag @retailer.logo.url(:thumb) %>
+    </p>
+    <%= f.label :logo, "Replace Image:" %><br />
+    <%= f.file_field :logo, :class => 'file' %>
+    <%= error_message_on :retailer, :logo %>
+  <% end %>
+<% else %>
+  <%= f.field_container :logo do %>
+    <%= f.label :logo, "Logo Image:" %><br />
+    <%= f.file_field :logo, :class => 'file' %>
+    <%= error_message_on :retailer, :logo %>
+  <% end %>
 <% end %>
+
+<script type="text/javascript">
+//<![CDATA[
+
+  $(document).ready(function() {
+    $('#retailer_country').change(function(evt) {
+	    if (this.options[this.selectedIndex].value == 'United States') {
+	      $('#retailer_state').remove();
+        $('#retailer_state_select').attr('id', 'retailer_state').show();
+	    } else {    
+  	    var p = $('#retailer_state').hide().attr('id', 'retailer_state_select').removeAttr('name').parent('p');
+  	    p.append('<input type="text" name="retailer[state]" id="retailer_state" class="text" />');
+  	  }	    
+    });
+  });
+   
+//]]>
+</script>

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

@@ -1,6 +1,6 @@
 <h1>Edit Retailer</h1>
 
-<% form_for(@retailer, :url => object_url, :html => { :multipart => true, :method => :put }) do |f| %>
+<%= form_for(@retailer, :url => object_url, :html => { :multipart => true, :method => :put }) do |f| %>
   <%= render :partial => "form", :locals => { :f => f } %>
   <p class="form-buttons">
     <%= button t("update") %> <%= link_to t('cancel'), collection_url %>

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

@@ -28,7 +28,7 @@
       <td><%= retailer.address %></td>
       <td><%= retailer.state %></td>
       <td><%= retailer.email %></td>
-      <td><%= retailer.phone %></td>
+      <td><%= number_to_phone retailer.phone %></td>
       <td>
       	<%= link_to_edit retailer %> &nbsp;
       	<%= link_to_delete retailer %> &nbsp;
@@ -38,7 +38,7 @@
   </tbody>
 </table>
 
-<%= will_paginate(:prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;") %>
+<%= paginate @collection %>
 
 
 
@@ -49,16 +49,23 @@
 
   <% @retailer = Retailer.metasearch %>
   <%= form_for [:admin, @retailer] do |f| %>
-    <%- locals = {:f => f} %>
-    <%= hook :admin_pages_index_search, locals do %>
-      <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>
-    <% end %>
+    <p>
+      <label><%= t '.name_contains' %></label><br />
+      <%= f.text_field :name_contains, :size => 25 %>
+    </p>
+    <p>
+      <label><%= t '.email_contains' %></label><br />
+      <%= f.text_field :email_contains, :size => 25 %>
+    </p>
+    <p>
+      <label><%= t '.country_contains' %></label><br />
+      <%= f.text_field :country_contains, :size => 25 %>
+    </p>
+    <p>
+      <label><%= t '.state_contains' %></label><br />
+      <%= f.text_field :state_contains, :size => 25 %>
+    </p>
+    <p><%= button t("search") %></p>
   <% end %>
 </div>
 <% end %>

data/app/views/retailers/_list.html.erb

@@ -2,14 +2,22 @@
   <div class="retailers">
     <h3>Find <%= Spree::Config[:site_name] %> at the following retail locations:</h3>
     
-    <div class="state-nav">
-      <%= state_nav_helper %>
-    </div>
-    
-    <% retailers.group_by(&:state).each do |state, state_retailers| %>
-      <hr/>
-      <h4 id="<%= state.downcase %>"><%= @states[state] %></h4>
-      <%= render :partial => 'retailer', :collection => state_retailers %>
+    <% retailers.group_by(&:country).each do |country, country_retailers| %>
+      
+      <h3><%= country %></h3>
+      
+      <% if country == "United States" %>
+        <div class="state-nav">
+          <%= state_nav_helper(country_retailers) %>
+        </div>
+      <% end %>
+      
+      <% country_retailers.group_by(&:state).each do |state, state_retailers| %>
+        <hr/>
+        <h4 id="<%= state.downcase %>"><%= @states[state] %></h4>
+        <%= render :partial => 'retailer', :collection => state_retailers %>
+      <% end %>
+      
     <% end %>
     
   </div>

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

@@ -1,17 +1,13 @@
 <h1><%= t('retailers') %></h1>
 
 <div class="left">
-  <%= hook :retailers_static_content do %>
-    <p>Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Proin vel ante a orci tempus eleifend ut et magna. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus luctus urna sed urna ultricies ac tempor dui sagittis. In condimentum facilisis porta. Sed nec diam eu diam mattis viverra. Nulla fringilla, orci ac euismod semper, magna diam porttitor mauris, quis sollicitudin sapien justo in libero. Vestibulum mollis mauris enim. Morbi euismod magna ac lorem rutrum elementum. Donec viverra auctor lobortis. Pellentesque eu est.</p>
-  <% end %>  
+  <p>Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Proin vel ante a orci tempus eleifend ut et magna. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus luctus urna sed urna ultricies ac tempor dui sagittis. In condimentum facilisis porta. Sed nec diam eu diam mattis viverra. Nulla fringilla, orci ac euismod semper, magna diam porttitor mauris, quis sollicitudin sapien justo in libero. Vestibulum mollis mauris enim. Morbi euismod magna ac lorem rutrum elementum. Donec viverra auctor lobortis. Pellentesque eu est.</p>
 </div>
      
 <div class="right">
-  <%= hook :retailers_list do %>
-    <% unless !@retailers || @retailers.empty? %>
-      <%= render 'list', :retailers => @retailers %> 
-    <% end %>
+  <% unless !@retailers || @retailers.empty? %>
+    <%= render 'list', :retailers => @retailers %> 
   <% end %>
 </div>
 
-<div class="clear">&nbsp;</div>
+<div class="clear">&nbsp;</div>