spree_wholesale 0.40.0.beta3 → 0.40.0.beta4.1

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.beta3'" >> Gemfile
+    echo "gem 'spree_wholesale', '0.40.0.beta4'" >> 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.beta3'" >> Gemfile
+    echo "gem 'spree_wholesale', '0.40.0.beta4'" >> 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.beta2.3'" >> 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'" >> Gemfile; rm public/index.html
     rake spree:install spree_wholesale:install db:migrate db:seed spree_wholesale:create_role
   
 If you want sample data:
@@ -86,11 +86,18 @@ Then finish by booting up the rails server:
     rails s
 
 
+
+
 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.beta2.3'" >> 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'" >> 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:
+
+    rails new spree_wholesale_example; cd spree_wholesale_example; echo "gem 'spree', '0.40.0'" >> Gemfile; echo "gem 'spree_wholesale', :git => 'git://github.com/citrus/spree_wholesale.git'" >> 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
+
+
 
 Once the server has loaded add the wholesaler role to your wholesale user(s). Navigate back to the store and check the prices!
 

data/Rakefile

@@ -1,5 +1,3 @@
-require File.expand_path('../../config/application', __FILE__)
-
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
@@ -8,6 +6,7 @@ require 'rake/gempackagetask'
 
 
 spec = eval(File.read('spree_wholesale.gemspec'))
+env = File.expand_path('../../config/environment', __FILE__)
 
 Rake::GemPackageTask.new(spec) do |p|
   p.gem_spec = spec
@@ -16,6 +15,8 @@ end
 
 desc "Test Spree Wholesale Extension"
 task :test_extension do
+
+  require env
   require File.expand_path('../test/test_helper', __FILE__)
     
   Dir["test/**/*.rb"].reject{|file| file.match(/test_helper/) != nil }.each do |file|
@@ -26,5 +27,11 @@ task :test_extension do
 end
 
 
-desc "Default Task"
-task :default => [ :test_extension ]
+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

data/app/models/application_controller_decorator.rb

@@ -1,8 +1,8 @@
 ApplicationHelper.module_eval do
 
-
   def wholesaler_signed_in?
     current_user && current_user.has_role?("wholesaler")
   end
   
+  
 end

data/app/models/line_item_decorator.rb

@@ -8,5 +8,5 @@ LineItem.class_eval do
     self.price = (order.is_wholesale? && variant.is_wholesaleable? ? variant.wholesale_price : variant.price) if variant && self.price.nil?
     
   end
-   
+     
 end

data/app/models/order_decorator.rb

@@ -4,8 +4,28 @@ Order.class_eval do
     wholesale == true      
   end
   
+  def set_line_item_prices(use_price=:price)
+    line_items.includes(:variant).each do |line_item|
+      line_item.price = line_item.variant.send(use_price)
+      line_item.save
+    end
+  end
   
-  
+  def to_fullsale!
+    puts "TO FULLSALE"
+    self.wholesale = false
+    set_line_item_prices(:price)
+    update!
+    save
+  end
+    
+  def to_wholesale!
+    puts "TO WHOLESALE"
+    self.wholesale = true
+    set_line_item_prices(:wholesale_price)
+    update!
+    save
+  end
   
   def add_variant(variant, quantity = 1)
     current_item = contains?(variant)

data/app/models/spree_current_order_decorator.rb

@@ -1,18 +1,48 @@
-Spree::CurrentOrder.module_eval do
+#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
 
-  def before_save_new_order
-    
-    if current_user
-      @current_order.user = current_user
-      @current_order.wholesale = current_user.has_role?("wholesaler")
+module Spree
+  module CurrentOrder
+
+    # This should be overridden by an auth-related extension which would then have the opporutnity to associate the new order with the
+    # current user before saving.
+    def before_save_new_order
+     if current_user
+        @current_order.user ||= current_user
+        @current_order.wholesale = current_user.has_role?("wholesaler")
+      end
     end
-    
-    #puts "before_save_new_order!!!!!"
-    
-    #puts current_user
-    
-    #puts @current_order.inspect
-    
-  end
 
+    # The current incomplete order from the session for use in cart and during checkout
+    def current_order(create_order_if_necessary = false)
+      @current_order = Order.find_by_id(session[:order_id], :include => :adjustments)
+      if create_order_if_necessary and (@current_order.nil? or @current_order.completed?)
+        @current_order = Order.new
+        before_save_new_order
+        @current_order.save!
+      end
+      
+      if current_user && @current_order
+        if current_user.has_role?("wholesaler") && !@current_order.is_wholesale?
+          @current_order.to_wholesale!
+        elsif !current_user.has_role?("wholesaler") && @current_order.is_wholesale?
+          @current_order.to_fullsale!
+        end
+      end
+      
+      session[:order_id] = @current_order ? @current_order.id : nil
+      
+      @current_order
+    end
+  end
 end

data/app/views/hooks/_wholesale_customer_id.html.erb

@@ -1 +1,4 @@
-<h4 class="wholesale-customer-id"><%= t('wholesale_customer', { :id => (@order || order).user_id }) %></h4>
+<% order = (@order || order) %>
+<% if order.is_wholesale? %>
+  <h4 class="wholesale-customer-id"><%= t('wholesale_customer', { :id => order.user_id }) %></h4>
+<% end %>

data/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  
+end

data/lib/wholesale_products_helper.rb

@@ -0,0 +1,26 @@
+#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)

metadata

@@ -6,8 +6,9 @@ version: !ruby/object:Gem::Version
   - 0
   - 40
   - 0
-  - beta3
-  version: 0.40.0.beta3
+  - beta4
+  - 1
+  version: 0.40.0.beta4.1
 platform: ruby
 authors: 
 - Spencer Steffen
@@ -20,6 +21,7 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,10 +33,10 @@ dependencies:
         - 0
         version: 0.40.0
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: spree_auth
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,7 +48,6 @@ dependencies:
         - 0
         version: 0.40.0
   type: :runtime
-  prerelease: false
   version_requirements: *id002
 description: Spree Wholesale adds a wholesale_price field to variants and allows users with a "wholesaler" role to access these prices.
 email: spencer@citrusme.com
@@ -60,10 +61,12 @@ files:
 - README.md
 - LICENSE
 - config/locales/en.yml
+- config/routes.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/orders_controller_decorator.rb
 - app/models/application_controller_decorator.rb
 - app/models/line_item_decorator.rb