spree-2-2-stable updates

Gemfile

@@ -1,13 +1,11 @@
 source 'http://rubygems.org'
 
-gem 'spree', '~> 1.3.2'
-
-if RUBY_VERSION < "1.9"
-  gem "ruby-debug"
-else
-  gem "ruby-debug19"
+group :development, :test do
+  gem 'spree',                  github: 'spree/spree', branch: '2-1-stable'
+  gem 'spree_auth_devise',      github: 'spree/spree_auth_devise', branch: '2-1-stable'
 end
 
+=begin
 group :test do
   gem 'rspec-rails', '2.12.0'
   gem 'sqlite3'
@@ -17,8 +15,9 @@ group :test do
   gem 'launchy'
   gem 'pry'
 end
-
 group :assets do
   gem 'coffee-rails'
 end
+=end
+
 gemspec

Rakefile

@@ -1,46 +1,15 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/packagetask'
-require 'rubygems/package_task'
-require 'rspec/core/rake_task'
-require 'spree/core/testing_support/common_rake'
-
-gemfile = File.expand_path('../spec/test_app/Gemfile', __FILE__)
-if File.exists?(gemfile) && (%w(spec cucumber).include?(ARGV.first.to_s) || ARGV.size == 0)
-  require 'bundler'
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  Bundler.setup
-
-  require 'rspec'
-  require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new
-end
-
-desc "Default Task"
-task :default => [:spec ]
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-spec = eval(File.read('spree_flexi_variants.gemspec'))
+require 'rspec/core/rake_task'
+require 'spree/testing_support/common_rake'
 
-Gem::PackageTask.new(spec) do |p|
-  p.gem_spec = spec
-end
+RSpec::Core::RakeTask.new
 
-desc "Release to gemcutter"
-task :release => :package do
-  require 'rake/gemcutter'
-  Rake::Gemcutter::Tasks.new(spec).define
-  Rake::Task['gem:push'].invoke
-end
+task :default => [:spec]
 
-desc "Generates a dummy app for testing"
+desc 'Generates a dummy app for testing'
 task :test_app do
   ENV['LIB_NAME'] = 'spree_flexi_variants'
-  Rake::Task['common:test_app'].invoke
-end
-
-namespace :test_app do
-  desc 'Rebuild test database'
-  task :rebuild_dbs do
-    system("cd spec/test_app && bundle exec rake db:drop db:migrate RAILS_ENV=test")
-  end
+  Rake::Task['common:test_app'].invoke 'Spree::User'
 end

app/assets/javascripts/admin/spree_flexi_variants.js

@@ -1,4 +1,4 @@
-//= require admin/spree_core
+//= require spree/backend
 //= require jquery.formatCurrency-1.4.0.min
 //= require i18n/jquery.formatCurrency.all
 //= require_tree

app/assets/javascripts/store/spree_flexi_variants.js

@@ -1,4 +1,4 @@
-//= require store/spree_core
+//= require spree/frontend
 //= require jquery.formatCurrency-1.4.0.min
 //= require i18n/jquery.formatCurrency.all
 //= require_self

app/controllers/spree/admin/ad_hoc_option_values_controller.rb

@@ -13,7 +13,9 @@ def update_positions
     def destroy
       ad_hoc_option_value = AdHocOptionValue.find(params[:id])
       ad_hoc_option_value.destroy
-      render :text => nil
+      redirect_to edit_admin_product_ad_hoc_option_type_path(
+        ad_hoc_option_value.ad_hoc_option_type.product_id,
+        ad_hoc_option_value.ad_hoc_option_type_id)
     end
   end
 end

app/controllers/spree/admin/ad_hoc_variant_exclusions_controller.rb

@@ -16,15 +16,15 @@ def create
 
       ave.product=@product
       ave.save
-      redirect_to admin_product_ad_hoc_variant_exclusions_url(@product)
+      redirect_to admin_product_ad_hoc_variant_exclusions_path(@product)
     end
 
     # TODO how is this different than the default 'destroy'.  maybe I don't need this method
     def remove
       @product=@ad_hoc_variant_exclusion.product
       @ad_hoc_variant_exclusion.destroy
       flash.notice = I18n.t("notice_messages.ad_hoc_variant_exclusion_removed")
-      redirect_to admin_product_ad_hoc_variant_exclusions_url(@product)
+      redirect_to admin_product_ad_hoc_variant_exclusions_path(@product)
     end
 
     protected

app/controllers/spree/orders_controller_decorator.rb

@@ -9,25 +9,20 @@ module Spree
     # Currently, we are assuming the inbound ad_hoc_option_values and customizations apply to the entire inbound product/variant 'group', as more surgery
     # needs to occur in the cart partial for this to be done 'right'
     #
+    # Adds a new item to the order (creating a new order if none already exists)
     def populate
-      @order = current_order(true)
+      populator = Spree::OrderPopulator.new(current_order(create_order_if_necessary: true), current_currency)
 
-      params[:products].each do |product_id,variant_id|
-        quantity = params[:quantity].to_i if !params[:quantity].is_a?(Hash)
-        quantity = params[:quantity][variant_id].to_i if params[:quantity].is_a?(Hash)
-        @order.add_variant(Variant.find(variant_id), quantity, ad_hoc_option_value_ids, product_customizations) if quantity > 0
-      end if params[:products]
+      if populator.populate(params[:variant_id], params[:quantity], ad_hoc_option_value_ids, product_customizations)
+        current_order.ensure_updated_shipments
 
-      params[:variants].each do |variant_id, quantity|
-        quantity = quantity.to_i
-        @order.add_variant(Variant.find(variant_id), quantity, ad_hoc_option_value_ids, product_customizations) if quantity > 0
-      end if params[:variants]
-
-      fire_event('spree.cart.add')
-      fire_event('spree.order.contents_changed')
-
-      redirect_to cart_path if request.format.html?
+        respond_with(@order) do |format|
+          format.html { redirect_to cart_path }
+        end
+      else
+        flash[:error] = populator.errors.full_messages.join(" ")
+        redirect_to :back
+      end
     end
-
   end
 end

app/helpers/spree/admin/base_helper_decorator.rb

@@ -1,15 +0,0 @@
-module Spree
-  module Admin
-    BaseHelper.module_eval do
-      #renders hidden field and link to remove record using nested_attributes
-      def link_to_remove_nested_fields(name, f, options = {})
-        name = '' if options[:no_text]
-        options[:class] = '' unless options[:class]
-        options[:class] += 'no-text with-tip' if options[:no_text]
-        options[:nest] = '' unless options[:nest]
-        url = f.object.persisted? ? [:admin, options[:nest], f.object] : '#'
-        link_to_with_icon('icon-trash', name, url, :class => "remove_fields #{options[:class]}", :data => {:action => 'remove'}, :title => t(:remove)) + f.hidden_field(:_destroy)
-      end
-    end
-  end
-end

app/models/spree/ad_hoc_option_type.rb

@@ -8,7 +8,7 @@ class AdHocOptionType < ActiveRecord::Base
     accepts_nested_attributes_for :ad_hoc_option_values, :allow_destroy => true
 
     # currently no controller for normal users present 
-    attr_accessible :is_required, :ad_hoc_option_values_attributes, :product_id, :option_type_id, :position
+    #attr_accessible :is_required, :ad_hoc_option_values_attributes, :product_id, :option_type_id, :position
 
     default_scope order(:position)
 

app/models/spree/ad_hoc_option_value.rb

@@ -6,7 +6,7 @@ class AdHocOptionValue < ActiveRecord::Base
     has_many :excluded_ad_hoc_option_values, :dependent => :destroy
 
     # currently no controller for normal users present
-    attr_accessible :price_modifier, :ad_hoc_option_type_id, :option_value_id, :selected, :cost_price_modifier
+    #attr_accessible :price_modifier, :ad_hoc_option_type_id, :option_value_id, :selected, :cost_price_modifier
 
     # this opens up a can of worms..deleting option values and having historical data still intact...ugh...what to do?...add 'deleted_at' somewhere along the chain?
     # has_many :ad_hoc_option_values_line_items, :dependent => :destroy

app/models/spree/calculator/amount_times_constant.rb

@@ -5,7 +5,7 @@ class Calculator::AmountTimesConstant < Calculator
     preference :min_amount, :integer, :default=>0
     preference :max_amount, :integer, :default=>100
 
-    attr_accessible :preferred_multiplier, :preferred_min_amount, :preferred_max_amount
+    #attr_accessible :preferred_multiplier, :preferred_min_amount, :preferred_max_amount
 
     def self.description
       "Amount Times Constant Calculator"

app/models/spree/calculator/customization_image.rb

@@ -1,7 +1,9 @@
+require_dependency 'spree/calculator'
+
 module Spree
   class Calculator::CustomizationImage < Calculator
     preference :price, :decimal
-    attr_accessible :preferred_price, :decimal
+    #attr_accessible :preferred_price, :decimal
 
     def self.description
       "Product Customization Image Calculator"

app/models/spree/calculator/engraving.rb

@@ -1,7 +1,9 @@
+require_dependency 'spree/calculator'
+
 module Spree
   class Calculator::Engraving < Calculator
     preference :price_per_letter, :decimal
-    attr_accessible :preferred_price_per_letter
+    #attr_accessible :preferred_price_per_letter
 
     def self.description
       "Engraving Calculator"
@@ -24,7 +26,7 @@ def compute(product_customization, variant=nil)
 
       # expecting only one CustomizedProductOption
       opt = product_customization.customized_product_options.detect {|cpo| cpo.customizable_product_option.name == "inscription" } rescue ''
-      opt.value.length * preferred_price_per_letter
+      opt.value.length * (preferred_price_per_letter || 0)
     end
 
     def valid_configuration?(product_customization)

app/models/spree/calculator/no_charge.rb

@@ -0,0 +1,28 @@
+require_dependency 'spree/calculator'
+
+module Spree
+  class Calculator::NoCharge < Calculator
+    def self.description
+      "This customization has no charge"
+    end
+
+    def self.register
+      super
+      ProductCustomizationType.register_calculator(self)
+    end
+
+    def create_options
+      # This calculator knows that it needs one CustomizableOption named amount
+      [
+      ]
+    end
+
+    def compute(product_customization, variant=nil)
+      return 0
+    end
+
+    def valid_configuration?(product_customization)
+      true
+    end
+  end
+end

app/models/spree/calculator/product_area.rb

@@ -10,7 +10,7 @@ class Calculator::ProductArea < Calculator
     preference :min_height, :integer, :default => 0
     preference :max_height, :integer, :default => 100
 
-    attr_accessible :preferred_multiplier, :preferred_min_pricing_area, :preferred_min_width, :preferred_max_width,:preferred_min_height, :preferred_max_height
+    #attr_accessible :preferred_multiplier, :preferred_min_pricing_area, :preferred_min_width, :preferred_max_width,:preferred_min_height, :preferred_max_height
 
     # preference :min_area, :integer  # the minimum sized frame we'll sell
 

app/models/spree/customizable_product_option.rb

@@ -2,6 +2,6 @@ module Spree
   class CustomizableProductOption < ActiveRecord::Base
     belongs_to :product_customization_type
     delegate :calculator, :to => :product_customization_type
-    attr_accessible :name, :presentation, :description, :product_customization_type_id
+    #attr_accessible :name, :presentation, :description, :product_customization_type_id
   end
 end

app/models/spree/excluded_ad_hoc_option_value.rb

@@ -3,6 +3,6 @@ class ExcludedAdHocOptionValue < ActiveRecord::Base
     belongs_to :ad_hoc_variant_exclusion
     belongs_to :ad_hoc_option_value
 
-    attr_accessible :ad_hoc_variant_exclusion, :ad_hoc_option_value_id
+    #attr_accessible :ad_hoc_variant_exclusion, :ad_hoc_option_value_id
   end
 end

app/models/spree/line_item_decorator.rb

@@ -34,7 +34,7 @@ def options_text
     end
 
     def cost_price
-      variant.cost_price + ad_hoc_option_values.map(&:cost_price).inject(0, :+)
+      (variant.cost_price || 0) + ad_hoc_option_values.map(&:cost_price).inject(0, :+)
     end
 
     def cost_money

app/models/spree/order_contents_decorator.rb

@@ -0,0 +1,63 @@
+module Spree
+  OrderContents.class_eval do
+    # Get current line item for variant if exists
+    # Add variant qty to line_item
+    def add(variant, quantity = 1, currency = nil, shipment = nil, ad_hoc_option_value_ids = [], product_customizations = [])
+      line_item = add_to_line_item(variant, quantity, currency, shipment, ad_hoc_option_value_ids, product_customizations)
+      reload_totals
+      PromotionHandler::Cart.new(order, line_item).activate
+      ItemAdjustments.new(line_item).update
+      reload_totals
+      line_item
+    end
+
+    private
+      def add_to_line_item(variant, quantity, currency=nil, shipment=nil, ad_hoc_option_value_ids = [], product_customizations = [])
+        line_item = grab_line_item_by_variant(variant, false, ad_hoc_option_value_ids, product_customizations)
+
+        if line_item
+          line_item.target_shipment = shipment
+          line_item.quantity += quantity.to_i
+          line_item.currency = currency unless currency.nil?
+        else
+          line_item = order.line_items.new(quantity: quantity, variant: variant)
+          line_item.target_shipment = shipment
+
+          line_item.product_customizations = product_customizations
+          product_customizations.each {|pc| pc.line_item = line_item}
+
+          product_customizations.map(&:save) # it is now safe to save the customizations we built
+
+          # find, and add the configurations, if any.  these have not been fetched from the db yet.              line_items.first.variant_id
+          # we postponed it (performance reasons) until we actaully knew we needed them
+          povs=[]
+          ad_hoc_option_value_ids.each do |cid|
+            povs << AdHocOptionValue.find(cid)
+          end
+          line_item.ad_hoc_option_values = povs
+
+          offset_price   = povs.map(&:price_modifier).compact.sum + product_customizations.map {|pc| pc.price(variant)}.sum
+
+          if currency
+            line_item.currency = currency unless currency.nil?
+            line_item.price    = variant.price_in(currency).amount + offset_price
+          else
+            line_item.price    = variant.price + offset_price
+          end
+        end
+
+        line_item.save
+        line_item
+      end
+
+      def grab_line_item_by_variant(variant, raise_error = false, ad_hoc_option_value_ids = [], product_customizations = [])
+        line_item = order.find_line_item_by_variant(variant, ad_hoc_option_value_ids, product_customizations)
+
+        if !line_item.present? && raise_error
+          raise ActiveRecord::RecordNotFound, "Line item not found for variant #{variant.sku}"
+        end
+
+        line_item
+      end
+  end
+end