spree_wholesale 0.40.0.beta4.1 → 0.40.0.beta4.2

data/README.md

@@ -19,7 +19,7 @@ Install from the source:
 Or install the (beta) gem:
     
     gem install spree_wholesale --pre
-    echo "gem 'spree_wholesale', '0.40.0.beta4'" >> Gemfile
+    echo "gem 'spree_wholesale', '0.40.0.beta4.1'" >> Gemfile
     
     rake spree_wholesale:install
     rake db:migrate
@@ -51,7 +51,7 @@ To create a demo of SpreeWholesaleExample
     cd spree_wholesale_example
     
     echo "gem 'spree', '0.40.0'" >> Gemfile
-    echo "gem 'spree_wholesale', '0.40.0.beta4'" >> Gemfile
+    echo "gem 'spree_wholesale', '0.40.0.beta4.1'" >> Gemfile
     rm public/index.html
     
     bundle install
@@ -65,7 +65,7 @@ To create a demo of SpreeWholesaleExample
     
 or shorthand:
     
-    rails new spree_wholesale_example; cd spree_wholesale_example; echo "gem 'spree', '0.40.0'" >> Gemfile; echo "gem 'spree_wholesale', '0.40.0.beta4'" >> Gemfile; rm public/index.html
+    rails new spree_wholesale_example; cd spree_wholesale_example; echo "gem 'spree', '0.40.0'" >> Gemfile; echo "gem 'spree_wholesale', '0.40.0.beta4.1'" >> Gemfile; rm public/index.html
     rake spree:install spree_wholesale:install db:migrate db:seed spree_wholesale:create_role
   
 If you want sample data:
@@ -90,7 +90,7 @@ Then finish by booting up the rails server:
 
 All in one swoop:
   
-    rails new spree_wholesale_example; cd spree_wholesale_example; echo "gem 'spree', '0.40.0'" >> Gemfile; echo "gem 'spree_wholesale', '0.40.0.beta4'" >> Gemfile; rm public/index.html; bundle install; rake spree:install spree_wholesale:install db:migrate db:seed spree_wholesale:create_role spree_sample:install db:sample spree_wholesale:assume_wholesale_prices; echo "@import url('wholesale.css');"|cat - public/stylesheets/screen.css > /tmp/out && mv /tmp/out public/stylesheets/screen.css; rails s
+    rails new spree_wholesale_example; cd spree_wholesale_example; echo "gem 'spree', '0.40.0'" >> Gemfile; echo "gem 'spree_wholesale', '0.40.0.beta4.1'" >> Gemfile; rm public/index.html; bundle install; rake spree:install spree_wholesale:install db:migrate db:seed spree_wholesale:create_role spree_sample:install db:sample spree_wholesale:assume_wholesale_prices; echo "@import url('wholesale.css');"|cat - public/stylesheets/screen.css > /tmp/out && mv /tmp/out public/stylesheets/screen.css; rails s
     
 
 To do the same as above but install from the source instead, run:

data/Rakefile

@@ -5,33 +5,97 @@ require 'rake/packagetask'
 require 'rake/gempackagetask'
 
 
+root = ENV["RAILS_ROOT"] || File.expand_path('../spec/test_app', __FILE__)
+
+env = File.join(root, 'config', 'environment.rb')
+
+puts "(Rails Root: #{root})"
+
+
 spec = eval(File.read('spree_wholesale.gemspec'))
-env = File.expand_path('../../config/environment', __FILE__)
 
 Rake::GemPackageTask.new(spec) do |p|
   p.gem_spec = spec
 end
 
 
-desc "Test Spree Wholesale Extension"
-task :test_extension do
-
-  require env
-  require File.expand_path('../test/test_helper', __FILE__)
+namespace :spree_wholesale do
+  desc "Test Spree Wholesale Extension"
+  task :test do
+  
+    require env
+    require File.expand_path('../test/test_helper', __FILE__)
+      
+    Dir["test/**/*.rb"].reject{|file| file.match(/test_helper/) != nil }.each do |file|
+      puts "Loading #{file}"
+      load file
+    end
     
-  Dir["test/**/*.rb"].reject{|file| file.match(/test_helper/) != nil }.each do |file|
-    puts "Loading #{file}"
-    load file
   end
-  
 end
 
+#
+#
+#if File.exists?(env)
+#  desc "Default Task"
+#  task :default => [ :test_extension ]
+#else
+#  desc "Default Task"
+#  task :default => []
+#  puts "environment.rb not found! Try modifying the path to your rails application."
+#end
+
+desc "Default Task"
+task :default => [ :test_extension ]
+
+
+
+
+# TODO: pull in the spree/core/Rakefile bits that set up for testing
+desc "Regenerates a Rails 3 app for testing"
+task :test_app do
+# TODO - this path requires a certain directory structure -- need
+# to think about how to refactor
+  require '../spree/lib/generators/spree/test_app_generator'
+  class WishlistTestAppGenerator < Spree::Generators::TestAppGenerator
+    def tweak_gemfile
+      append_file "Gemfile" ,
+        <<-gems
 
-if File.exists?(env)
-  desc "Default Task"
-  task :default => [ :test_extension ]
-else
-  desc "Default Task"
-  task :default => []
-  puts "environment.rb not found! Try modifying the path to your rails application."
+gem 'spree_core', '>=0.40.0'
+gem 'spree_auth', '>=0.40.0'
+gem 'spree_wholesale', :path => "#{File.dirname(__FILE__)}"
+
+        gems
+    end
+
+    def install_spree_gems
+      inside "test_app" do
+        run 'rake spree_core:install'
+        run 'rake spree_auth:install'
+        run 'rake spree_wholesale:install'
+      end
+    end
+
+#    def install_spree_auth
+#      inside "test_app" do
+#        run 'rake spree_auth:install'
+#      end
+#    ends
+
+    def migrate_db
+      run_migrations
+    end
+  end
+  WishlistTestAppGenerator.start
 end
+
+namespace :test_app do
+  desc 'Rebuild test database'
+  task :rebuild_db do
+    system("cd spec/test_app && rake db:drop db:migrate RAILS_ENV=test")
+  end
+end
+
+
+

data/app/controllers/admin/base_controller_decorator.rb

@@ -0,0 +1,11 @@
+[Spree::BaseController, Admin::BaseController].each do |controller|
+
+  controller.class_eval do
+    
+    def default_country
+      Country.find Spree::Config[:default_country_id]
+    end
+    
+  end
+  
+end

data/app/controllers/admin/wholesalers_controller.rb

@@ -0,0 +1,70 @@
+class Admin::WholesalersController < Admin::BaseController
+  
+  resource_controller
+  
+  include SpreeWholesale::WholesalerController
+  
+  before_filter :check_json_authenticity, :only => :index
+  
+  index.response do |wants|
+    wants.html { render :action => :index }
+    wants.json { render :json => json_data }
+  end
+
+  destroy.success.wants.js { render_js_for_destroy }
+
+
+  before_filter :approval_setup, :only => [ :approve, :reject ]
+
+
+  def approve
+    return redirect_to request.referer, :flash => { :error => "Wholesaler is already active." } if @wholesaler.active?
+    @wholesaler.activate!
+    redirect_to request.referer, :flash => { :notice => "Wholesaler was successfully approved." }
+  end
+  
+  def reject
+    return redirect_to request.referer, :flash => { :error => "Wholesaler is already rejected." } unless @wholesaler.active?
+    @wholesaler.deactivate!
+    redirect_to request.referer, :flash => { :notice => "Wholesaler was successfully rejected." }
+  end
+  
+  def approval_setup
+    @wholesaler = Wholesaler.find(params[:id])
+    @role = Role.find_by_name("wholesaler")
+  end
+
+
+  private
+
+  # Allow different formats of json data to suit different ajax calls
+  def json_data
+    json_format = params[:json_format] or 'default'
+    case json_format
+    when 'basic'
+      collection.map {|u| {'id' => u.id, 'name' => u.email}}.to_json
+    else
+      collection.to_json(:include =>
+        {:bill_address => {:include => [:state, :country]},
+        :ship_address => {:include => [:state, :country]}})
+    end
+  end
+
+  def collection
+    return @collection if @collection.present?
+    unless request.xhr?
+      @search = Wholesaler.searchlogic(params[:search])
+
+      #set order by to default or form result
+      @search.order ||= "ascend_by_email"
+
+      @collection = @search.do_search.includes(:user => [:roles]).paginate(:per_page => Spree::Config[:admin_products_per_page], :page => params[:page])
+
+      #scope = scope.conditions "lower(email) = ?", @filter.email.downcase unless @filter.email.blank?
+    else
+      @collection = Wholesaler.includes(:user => [:roles], :bill_address => [:state, :country],
+                                  :ship_address => [:state, :country]).where("wholesalers.company like :search",
+                                                                               {:search => "#{params[:q].strip}%"}).limit(params[:limit] || 100)
+    end
+  end  
+end

data/app/controllers/checkout_controller_decorator.rb

@@ -0,0 +1,15 @@
+CheckoutController.instance_eval do 
+  
+  before_filter :get_addresses
+  
+end
+
+CheckoutController.class_eval do 
+
+  def get_addresses
+    return unless current_user.has_role?("wholesaler") && !current_user.wholesaler.nil?
+    @order.bill_address = current_user.wholesaler.bill_address
+    @order.ship_address = current_user.wholesaler.ship_address
+  end
+
+end

data/app/controllers/wholesalers_controller.rb

@@ -0,0 +1,5 @@
+class WholesalersController < Spree::BaseController
+  
+  include SpreeWholesale::WholesalerController
+  
+end

data/app/models/ability.rb

@@ -0,0 +1,71 @@
+# Implementation class for Cancan gem.  Instead of overriding this class, consider adding new permissions
+# using the special +register_ability+ method which allows extensions to add their own abilities.
+#
+# See http://github.com/ryanb/cancan for more details on cancan.
+class Ability
+  include CanCan::Ability
+
+  class_attribute :abilities
+  self.abilities = Set.new
+
+  # Allows us to go beyond the standard cancan initialize method which makes it difficult for engines to
+  # modify the default +Ability+ of an application.  The +ability+ argument must be a class that includes
+  # the +CanCan::Ability+ module.  The registered ability should behave properly as a stand-alone class
+  # and therefore should be easy to test in isolation.
+  def self.register_ability(ability)
+    self.abilities.add(ability)
+  end
+
+  def initialize(user)
+    self.clear_aliased_actions
+
+    # override cancan default aliasing (we don't want to differentiate between read and index)
+    alias_action :edit, :to => :update
+    alias_action :new, :to => :create
+    alias_action :new_action, :to => :create
+    alias_action :show, :to => :read
+
+    user ||= User.new
+    if user.has_role? 'admin'
+      can :manage, :all
+    else
+      #############################
+      can :read, User do |resource|
+        resource == user
+      end
+      can :update, User do |resource|
+        resource == user
+      end
+      can :create, User
+      #############################
+      can :read, Order do |order, token|
+        order.user == user || order.token && token == order.token
+      end
+      can :update, Order do |order, token|
+        order.user == user || order.token && token == order.token
+      end
+      can :create, Order
+      #############################
+      can :read, Product
+      can :index, Product
+      #############################
+      can :read, Taxon
+      can :index, Taxon
+      #############################
+      can :index, Wholesaler
+      can :new, Wholesaler
+      can :create, Wholesaler
+      can :read, Wholesaler do |resource|
+        resource.user == user
+      end
+      #############################
+    end
+
+    #include any abilities registered by extensions, etc.
+    Ability.abilities.each do |clazz|
+      ability = clazz.send(:new, user)
+      @can_definitions = abilities + ability.send(:abilities)
+    end
+
+  end
+end

data/app/models/{application_controller_decorator.rb → application_helper_decorator.rb}

@@ -2,7 +2,6 @@ ApplicationHelper.module_eval do
 
   def wholesaler_signed_in?
     current_user && current_user.has_role?("wholesaler")
-  end
-  
+  end  
   
 end

data/app/models/country_decorator.rb

@@ -0,0 +1,3 @@
+Country.instance_eval do
+  has_many :states, :order => "name ASC"
+end

data/app/models/order_decorator.rb

@@ -12,7 +12,6 @@ Order.class_eval do
   end
   
   def to_fullsale!
-    puts "TO FULLSALE"
     self.wholesale = false
     set_line_item_prices(:price)
     update!
@@ -20,7 +19,6 @@ Order.class_eval do
   end
     
   def to_wholesale!
-    puts "TO WHOLESALE"
     self.wholesale = true
     set_line_item_prices(:wholesale_price)
     update!

data/app/models/spree_current_order_decorator.rb

@@ -1,16 +1,3 @@
-#Spree::CurrentOrder.module_eval do
-#
-#  def before_save_new_order
-#    
-#    if current_user
-#      @current_order.user ||= current_user
-#      @current_order.wholesale = current_user.has_role?("wholesaler")
-#    end
-#    
-#  end
-#
-#end
-
 module Spree
   module CurrentOrder
 

data/app/models/user_decorator.rb

@@ -0,0 +1,5 @@
+User.instance_eval do 
+  
+  has_one :wholesaler
+  
+end

data/app/models/wholesaler.rb

@@ -0,0 +1,45 @@
+class Wholesaler < ActiveRecord::Base
+  
+  belongs_to :user
+  
+  belongs_to :ship_address, :foreign_key => "shipping_address_id", :class_name => "Address"
+  belongs_to :bill_address, :foreign_key => "billing_address_id", :class_name => "Address"
+  
+  validates_presence_of [ :company, :buyer_contact, :manager_contact, :phone, :taxid ]
+
+  validates_each :user_id, :billing_address_id, :shipping_address_id do |record,attr,value|
+    record.errors.add attr, 'must not contain any errors.' if value.to_i == 0
+  end
+  
+  delegate_belongs_to :user, :roles
+  delegate_belongs_to :user, :email
+  
+  def self.term_options
+    %(Net 10, Net 15, Net 30, COD, Credit Card).split(", ")
+  end
+    
+  def activate!
+    get_wholesale_role
+    return false if user.roles.include?(@role)
+    user.roles << @role
+    user.save
+  end
+  
+  def deactivate!
+    get_wholesale_role
+    return false unless user.roles.include?(@role)
+    user.roles.delete(@role)
+    user.save
+  end
+  
+  def active?
+    user.has_role? "wholesaler"
+  end
+  
+  private
+  
+    def get_wholesale_role
+      @role = Role.find_by_name("wholesaler")
+    end
+  
+end

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

@@ -0,0 +1 @@
+<%= tab :wholesalers %>

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

@@ -0,0 +1,129 @@
+<%- locals = {:f => f} %>
+
+<div class="leftie">
+  <%= hook :admin_wholesaler_form_fields, locals do %>
+  
+  <%= render "shared/error_messages", :target => @wholesaler %>
+  
+  <fieldset>
+    <legend>Wholesaler Details:</legend>
+  
+    <%= f.field_container :company do %>
+      <%= f.label :company, t(".company") %><br />
+      <%= f.text_field :company  %>
+      <%= error_message_on :wholesaler, :company %>
+    <% end %>
+  
+    <%= f.field_container :buyer_contact do %>
+      <%= f.label :buyer_contact, t(".buyer_contact") %><br />
+      <%= f.text_field :buyer_contact  %>
+      <%= error_message_on :wholesaler, :buyer_contact %>
+    <% end %>
+  
+    <%= f.field_container :manager_contact do %>
+      <%= f.label :manager_contact, t(".manager_contact") %><br />
+      <%= f.text_field :manager_contact  %>
+      <%= error_message_on :wholesaler, :manager_contact %>
+    <% end %>
+  
+    <%= f.field_container :phone do %>
+      <%= f.label :phone, t(".phone") %><br />
+      <%= f.text_field :phone  %>
+      <%= error_message_on :wholesaler, :phone %>
+    <% end %>
+  
+    <%= f.field_container :fax do %>
+      <%= f.label :fax, t(".fax") %><br />
+      <%= f.text_field :fax  %>
+      <%= error_message_on :wholesaler, :fax %>
+    <% end %>
+  
+    <%= f.field_container :resale_number do %>
+      <%= f.label :resale_number, t(".resale_number") %><br />
+      <%= f.text_field :resale_number  %>
+      <%= error_message_on :wholesaler, :resale_number %>
+    <% end %>
+  
+    <%= f.field_container :taxid do %>
+      <%= f.label :taxid, t(".taxid") %><br />
+      <%= f.text_field :taxid  %>
+      <%= error_message_on :wholesaler, :taxid %>
+    <% end %>
+  
+    <%= f.field_container :web_address do %>
+      <%= f.label :web_address, t(".web_address") %><br />
+      <%= f.text_field :web_address  %>
+      <%= error_message_on :wholesaler, :web_address %>
+    <% end %>
+  
+    <%= f.field_container :terms do %>
+      <%= f.label :terms, t(".terms") %><br />
+      <%= f.text_field :terms  %>
+      <%= error_message_on :wholesaler, :terms %>
+    <% end %>
+  
+    <%= f.field_container :notes do %>
+      <%= f.label :notes, t(".notes") %><br />
+      <%= f.text_area :notes  %>
+      <%= error_message_on :wholesaler, :notes %>
+    <% end %>
+  
+  </fieldset>
+  <% end %>
+  
+  
+  <fieldset>
+    <legend>User Details:</legend>
+    <% if @user.new_record? %>
+      <%= fields_for :user, @user do |uf| %>
+        <%= render "shared/error_messages", :target => @user %>
+        <%= render 'admin/users/form', :f => uf %>
+      <% end %>
+    <% else %>
+    <p>
+      <b>User Id:</b>
+      <%= link_to @user.id, admin_user_path(@user) %>
+      <br/>
+      <%= link_to "view user", admin_user_path(@user) %> / 
+      <%= link_to "edit user", edit_admin_user_path(@user) %> /
+      <%= render "user_options" %>      
+    </p>
+    <% end %>
+  </fieldset>
+  
+  
+</div>
+
+<div class="rightie">
+  
+  <fieldset>
+    <legend>Billing Address Details:</legend>
+    <%= fields_for :bill_address, @bill_address do |af| %>
+      <%= render "shared/error_messages", :target => @bill_address %>
+      <%= render 'shared/address_form', :form => af, :address => @bill_address, :billing => true %>
+    <% end %>
+  </fieldset>
+  
+  
+  <fieldset id="fields_ship_address">
+    <legend>Shipping Address Details:</legend>
+    <%= fields_for :ship_address, @ship_address do |af| %>
+      <%= render "shared/error_messages", :target => @ship_address %>
+      <%= render 'shared/address_form', :form => af, :address => @ship_address %>
+    <% end %>
+  </fieldset>
+  
+</div>
+<script type="text/javascript">
+//<![CDATA[
+
+	$('#wholesaler_use_billing').change(function(evt) {
+    $('#fields_ship_address').css('display', $(this).is(':checked') ? 'none' : 'block');
+  }).change();   
+  
+  <% unless @ship_address.new_record? || @bill_address != @ship_address %>
+    $('#wholesaler_use_billing').attr('checked', true);
+  <% end %>  
+   
+//]]>
+</script>