spree_wholesale 0.40.0.beta2 → 0.40.0.beta2.3

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.beta1'" >> Gemfile
+    echo "gem 'spree_wholesale', '0.40.0.beta2'" >> Gemfile
     
     rake spree_wholesale:install
     rake db:migrate
@@ -32,7 +32,7 @@ If you want to generate sample wholesale prices:
 This will assume 66% wholesale discount.
 
 
-If you'd like run tests, install from the source, the run:
+If you'd like run tests, install from the source, then run:
   
     cd your/spree/project/spree_wholesale
     rake

data/Rakefile

@@ -0,0 +1,30 @@
+require File.expand_path('../../config/application', __FILE__)
+
+require 'rubygems'
+require 'rake'
+require 'rake/testtask'
+require 'rake/packagetask'
+require 'rake/gempackagetask'
+
+
+spec = eval(File.read('spree_wholesale.gemspec'))
+
+Rake::GemPackageTask.new(spec) do |p|
+  p.gem_spec = spec
+end
+
+
+desc "Test Spree Wholesale Extension"
+task :test_extension do
+  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
+  
+end
+
+
+desc "Default Task"
+task :default => [ :test_extension ]

data/config/locales/en.yml

@@ -0,0 +1,15 @@
+en:
+  wholesale: "Wholesale"
+  wholesale_customer: "Wholesale Customer ID: #%{id}"
+  
+  admin:
+    hooks:
+      product_form_right:
+        master_wholesale_price: "Master Wholesale Price"
+      admin_orders_index_search:
+        show_wholesale_orders: "Show only wholesale orders"
+        
+    variants:
+      form:
+        wholesale_price: "Wholesale Price"
+    

data/db/migrate/add_wholesale_price_to_variants.rb

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

data/db/migrate/add_wholesale_to_orders.rb

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

data/lib/spree_wholesale.rb

@@ -15,9 +15,6 @@ module SpreeWholesale
       Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
         Rails.env.production? ? require(c) : load(c)
       end
-      
-      Spree::Auth::Config.set :registration_step => false
-      
     end
 
     config.to_prepare &method(:activate).to_proc

data/lib/tasks/install.rake

@@ -17,6 +17,9 @@ namespace :spree_wholesale do
     
       source = File.expand_path('../../../db/migrate', __FILE__)
       destination = File.join(Rails.root, 'db', 'migrate')
+      
+      FileUtils.mkdir_p(destination)
+      
       migrations = Dir.entries(destination).select{|file| file.match('.rb') }
       
       files = Dir.entries(source).select{|file| file.match('.rb') }

data/public/stylesheets/wholesale.css

@@ -0,0 +1,10 @@
+span.price_msrp,
+span.price_wholesale { 
+  display: block;
+}
+span.price_msrp {
+  color: #c00e0e;
+}
+span.price_wholesale {
+  color: #68962c;
+}

metadata

@@ -7,7 +7,8 @@ version: !ruby/object:Gem::Version
   - 40
   - 0
   - beta2
-  version: 0.40.0.beta2
+  - 3
+  version: 0.40.0.beta2.3
 platform: ruby
 authors: 
 - Spencer Steffen
@@ -59,11 +60,11 @@ extra_rdoc_files: []
 files: 
 - README.md
 - LICENSE
+- config/locales/en.yml
 - 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/orders_controller_decorator.rb
 - app/models/line_item_decorator.rb
 - app/models/order_decorator.rb
@@ -82,7 +83,11 @@ files:
 - app/views/hooks/_wholesale_customer_id.html.erb
 - app/views/orders/show.html.erb
 - app/views/shared/_products.html.erb
-has_rdoc: true
+- db/migrate/add_wholesale_price_to_variants.rb
+- db/migrate/add_wholesale_to_orders.rb
+- public/stylesheets/wholesale.css
+- Rakefile
+has_rdoc: false
 homepage: http://github.com/citrus/spree_wholesale
 licenses: []
 

data/lib/wholesale_products_helper.rb

@@ -1,26 +0,0 @@
-#module WholesaleProductsHelper
-#
-#  # returns the price of the product to show for display purposes
-#  def product_price(product_or_variant, options={})
-#    options.assert_valid_keys(:format_as_currency, :show_vat_text)
-#    options.reverse_merge! :format_as_currency => true, :show_vat_text => Spree::Config[:show_price_inc_vat]
-#
-#    puts "-----"
-#    puts current_user.roles.inspect
-#    
-#    if current_user.has_role?("wholesaler")
-#      _amount = product_or_variant.wholesale_price
-#      amount = _amount if 0.0 < _amount
-#    end
-#    
-#    amount ||= product_or_variant.price
-#    
-#    
-#    
-#    amount += Calculator::Vat.calculate_tax_on(product_or_variant) if Spree::Config[:show_price_inc_vat]
-#    options.delete(:format_as_currency) ? format_price(amount, options) : amount
-#  end
-#  
-#end
-#
-#ProductsHelper.send(:include, WholesaleProductsHelper)