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

data/config/routes.rb

@@ -1,3 +1,14 @@
 Rails.application.routes.draw do
   
+  resources :wholesalers
+  
+  namespace(:admin) do
+    resources :wholesalers do
+      member do
+        get :approve
+        get :reject
+      end
+    end
+  end
+
 end

data/db/migrate/install_spree_wholesale.rb

@@ -0,0 +1,36 @@
+class InstallSpreeWholesale < ActiveRecord::Migration
+  
+  def self.up
+  
+    create_table :wholesalers do |t|
+      t.references :user
+      t.integer :billing_address_id
+      t.integer :shipping_address_id
+      t.string :company
+      t.string :buyer_contact
+      t.string :manager_contact
+      t.string :phone
+      t.string :fax
+      t.string :resale_number
+      t.string :taxid
+      t.string :web_address
+      t.string :terms
+      t.string :alternate_email
+      t.text   :notes
+    end
+  
+    add_index :wholesalers, [:billing_address_id, :shipping_address_id]
+  
+    add_column :orders,   :wholesale,       :boolean, :default   => false
+    add_column :variants, :wholesale_price, :decimal, :precision => 8, :scale => 2, :null => false, :default => 0
+
+  end
+
+  def self.down
+    remove_column :variants, :wholesale_price
+    remove_column :orders,   :wholesale
+
+    drop_table :wholesalers
+  end
+
+end

data/lib/spree_wholesale/wholesaler_controller.rb

@@ -0,0 +1,122 @@
+module SpreeWholesale
+  module WholesalerController
+
+
+    def self.included(mod)
+      mod.instance_eval do
+        resource_controller
+        before_filter :use_billing?, :only => [ :create, :update ] 
+        before_filter :setup_defaults, :only => [:new,:create,:edit,:update]
+        
+        index.before :new_wholesale_user
+        
+        helper_method :wholesale_role
+        
+      end
+      mod.send(:include, ClassMethods)
+    end
+    
+    module ClassMethods
+      
+      #=================================================
+      # Overwrite point
+      
+      def after_wholesaler_create
+        flash[:notice] = "Thank you for your interest in becoming a wholesaler! We'll be in touch shortly."
+        redirect_to wholesalers_path
+      end
+      
+      def after_wholesaler_failed_create
+        flash[:error] = "Wholesale account could not be created!"
+        render :action => :new
+      end
+  
+      #=================================================
+      
+      def wholesale_role
+        @wholesale_role ||= Role.find_or_create_by_name("wholesaler")
+      end
+      
+      def new_wholesale_user
+        @user = User.new
+      end
+      
+      def validate_wholesaler_parts
+        uv = @user.valid?
+        bv = @bill_address.valid?
+        sv = @ship_address.valid?
+        valid = uv && bv && sv
+        if valid
+          @wholesaler.user = @user if @user.save
+          @wholesaler.bill_address = @bill_address if @bill_address.save
+          @wholesaler.ship_address = @ship_address if @ship_address.save
+        end
+        @wholesaler.valid? && valid
+      end
+      
+      def create
+        if validate_wholesaler_parts && @wholesaler.valid? && @wholesaler.save
+          return after_wholesaler_create
+        else
+          return after_wholesaler_failed_create
+        end
+      end
+      
+      def update
+        validate_wholesaler_parts
+        @wholesaler.save
+        super
+      end
+      
+      
+      
+      def use_billing?
+        @use_billing ||= params[:wholesaler].delete(:use_billing).to_i == 1
+      end
+      
+      def setup_defaults
+        
+        params[:wholesaler] ||= {}
+        
+        if request.get? && params[:dev]
+          params[:wholesaler] = {"company"=>"Test Company", "buyer_contact"=>"Mr Contacter", "manager_contact"=>"Mr Manager", "phone"=>"555-555-5555", "fax"=>"555-555-5555 ext 1", "resale_number"=>"13414214", "taxid"=>"555-55-5555", "web_address"=>"testcompany.com", "terms"=>"Credit Card", "notes"=>""}
+          params[:user] = {"email"=>"wholesale-#{rand(100)}@example.com", :password => "password" , :password_confirmation => "password" }
+          params[:bill_address] = {"firstname"=>"Mister","lastname"=>"Accountant","address1"=>"123 Anystreet", "address2"=>"", "city"=>"Anytown", "state_id"=>"276110813", "zipcode"=>"98765", "country_id"=>"214", "phone"=>"555-555-5555"}
+        end
+      
+        @roles = Role.all
+      
+        case params[:action]
+          when 'new', 'create'
+            @wholesaler = Wholesaler.new(params[:wholesaler])    
+            @user = User.new(params[:user])
+            @bill_address = Address.new((params[:bill_address] || {}).merge(:country => default_country))  
+            
+            if use_billing?
+              @ship_address = @bill_address
+            else
+              @ship_address = Address.new((params[:ship_address] || {}).merge(:country => default_country))  
+            end      
+            
+          when 'edit', 'update', 'destroy'
+            @wholesaler = Wholesaler.find(params[:id])
+            @user = @wholesaler.user
+            @bill_address = @wholesaler.bill_address
+            @ship_address = @wholesaler.ship_address
+        end
+            
+        if params[:action] == 'update'
+          if !use_billing? && @bill_address.id == @ship_address.id
+            @ship_address = Address.new((params[:ship_address] || {}).merge(:country => default_country))  
+          elsif use_billing? && @bill_address.id != @ship_address.id
+            @wholesaler.ship_address.destroy
+            @ship_address = @bill_address          
+          end
+        end
+        
+      end
+    
+    end
+  
+  end
+end

data/lib/spree_wholesale_hooks.rb

@@ -12,4 +12,8 @@ class SpreeWholesaleHooks < Spree::ThemeSupport::HookListener
   insert_after :admin_orders_index_rows,    'admin/hooks/admin_orders_index_rows'
   insert_after :admin_orders_index_search,  'admin/hooks/admin_orders_index_search'
   
+  insert_after :admin_tabs,  'admin/hooks/wholesale_tab'
+  
+  
+  
 end

data/lib/tasks/install.rake

@@ -1,14 +1,8 @@
 namespace :spree_wholesale do
 
-  def load_environment
-    puts "loading environment..."
-    require File.join(Rails.root, 'config', 'environment')
-  end
-
   desc "Copies all migrations and assets (NOTE: This will be obsolete with Rails 3.1)"
   task :install do
     Rake::Task['spree_wholesale:install:migrations'].invoke
-    Rake::Task['spree_wholesale:install:assets'].invoke
   end
   
   namespace :install do
@@ -37,14 +31,6 @@ namespace :spree_wholesale do
         end
       end
     end
-
-    desc "Copies all assets (NOTE: This will be obsolete with Rails 3.1)"
-    task :assets do
-      source = File.join(File.dirname(__FILE__), '..', '..', 'public')
-      destination = File.join(Rails.root, 'public')
-      puts "INFO: Mirroring assets from #{source} to #{destination}"
-      Spree::FileUtilz.mirror_files(source, destination)
-    end
   end
 
 end

data/lib/tasks/spree_wholesale.rake

@@ -1,5 +1,10 @@
 namespace :spree_wholesale do
 
+  def load_environment
+    puts "Loading environment..."
+    require File.join(Rails.root, 'config', 'environment')
+  end
+
   desc "Creates wholesale role"
   task :create_role do
     
@@ -26,10 +31,14 @@ namespace :spree_wholesale do
     load_environment
     
     Variant.all.each do |variant|
-      variant.wholesale_price = variant.price * 0.66
-      variant.save
+      price = variant.price * 0.66
+      ActiveRecord::Base.connection.execute("UPDATE variants SET wholesale_price = #{price} WHERE id = #{variant.id}")
     end
     
   end
+  
+  
+  
+  
 
 end

data/public/stylesheets/admin/wholesalers.css

@@ -0,0 +1,14 @@
+input.required, select.required {
+  color: #222;
+}
+
+.leftie, .rightie {
+  display: block;
+  width: 49%;  
+}
+.leftie {
+  float: left;
+}
+.rightie {
+  float: right;
+}

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 40
   - 0
   - beta4
-  - 1
-  version: 0.40.0.beta4.1
+  - 2
+  version: 0.40.0.beta4.2
 platform: ruby
 authors: 
 - Spencer Steffen
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 -08:00
+date: 2011-01-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,32 +62,54 @@ files:
 - LICENSE
 - config/locales/en.yml
 - config/routes.rb
+- lib/spree_wholesale/wholesaler_controller.rb
 - lib/spree_wholesale.rb
 - lib/spree_wholesale_hooks.rb
 - lib/tasks/install.rake
 - lib/tasks/spree_wholesale.rake
 - lib/wholesale_products_helper.rb
+- app/controllers/admin/base_controller_decorator.rb
 - app/controllers/admin/orders_controller_decorator.rb
-- app/models/application_controller_decorator.rb
+- app/controllers/admin/wholesalers_controller.rb
+- app/controllers/checkout_controller_decorator.rb
+- app/controllers/wholesalers_controller.rb
+- app/models/ability.rb
+- app/models/application_helper_decorator.rb
+- app/models/country_decorator.rb
 - app/models/line_item_decorator.rb
 - app/models/order_decorator.rb
 - app/models/product_decorator.rb
 - app/models/products_helper_decorator.rb
 - app/models/spree_current_order_decorator.rb
+- app/models/user_decorator.rb
 - app/models/variant_decorator.rb
+- app/models/wholesaler.rb
 - app/views/admin/hooks/_admin_orders_index_headers.html.erb
 - app/views/admin/hooks/_admin_orders_index_rows.html.erb
 - app/views/admin/hooks/_admin_orders_index_search.html.erb
 - app/views/admin/hooks/_product_form_right.html.erb
+- app/views/admin/hooks/_wholesale_tab.html.erb
 - app/views/admin/variants/_form.html.erb
+- app/views/admin/wholesalers/_form.html.erb
+- app/views/admin/wholesalers/_user_options.html.erb
+- app/views/admin/wholesalers/edit.html.erb
+- app/views/admin/wholesalers/index.html.erb
+- app/views/admin/wholesalers/new.html.erb
+- app/views/admin/wholesalers/show.html.erb
 - app/views/checkout/_summary.html.erb
 - app/views/hooks/_cart_item_price.html.erb
 - app/views/hooks/_cart_item_total.html.erb
 - app/views/hooks/_wholesale_customer_id.html.erb
+- app/views/hooks/_wholesale_static_content.html.erb
 - app/views/orders/show.html.erb
+- app/views/shared/_address_form.html.erb
 - app/views/shared/_products.html.erb
-- db/migrate/add_wholesale_price_to_variants.rb
-- db/migrate/add_wholesale_to_orders.rb
+- app/views/shared/_store_menu.html.erb
+- app/views/wholesalers/_fields.html.erb
+- app/views/wholesalers/index.html.erb
+- app/views/wholesalers/new.html.erb
+- db/migrate/install_spree_wholesale.rb
+- public/stylesheets/admin/wholesalers.css
 - public/stylesheets/wholesale.css
 - Rakefile
 has_rdoc: false

data/db/migrate/add_wholesale_price_to_variants.rb

@@ -1,9 +0,0 @@
-class AddWholesalePriceToVariants < ActiveRecord::Migration
-  def self.up
-    add_column :variants, :wholesale_price, :decimal, :precision => 8, :scale => 2, :null => false, :default => 0.0
-  end
-
-  def self.down
-    remove_column :variants, :wholesale_price
-  end
-end

data/db/migrate/add_wholesale_to_orders.rb

@@ -1,9 +0,0 @@
-class AddWholesaleToOrders < ActiveRecord::Migration
-  def self.up
-    add_column :orders, :wholesale, :boolean, :default => false
-  end
-
-  def self.down
-    remove_column :orders, :wholesale
-  end
-end