added default parameter

.gitignore

@@ -10,3 +10,5 @@ nbproject
 doc/notes.txt
 Gemfile.lock
 spec/dummy
+coverage
+/*.gem

Gemfile

@@ -5,19 +5,4 @@ group :development, :test do
   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'
-  gem 'factory_girl_rails', '~> 1.7.0'
-  gem 'ffaker'
-  gem 'capybara', '2.0.2'
-  gem 'launchy'
-  gem 'pry'
-end
-group :assets do
-  gem 'coffee-rails'
-end
-=end
-
 gemspec

README.md

@@ -32,9 +32,31 @@ Installation
     gem 'spree_flexi_variants', :git=>'git@github.com:jsqu99/spree_flexi_variants.git'
 
     bundle install
-
     bundle exec rails g spree_flexi_variants:install
 
+Developer Setup
+---------------
+
+While developing this extension you can use bundlers support for local git repos (http://bundler.io/v1.5/git.html):
+
+    bundle config local.spree_flexi_variants ~/repos/spree_flexi_variants
+
+and do not forget to change Gemfile.lock before deployment:
+
+    bundle config --delete local.spree_flexi_variants
+
+When you create new migrations, you can import them to the project using this gem by:
+
+    bundle exec rake railties:install:migrations FROM=spree_flexi_variants
+
+
+
+Run Test
+--------
+
+  rake test_app
+  bundle exec rspec
+
 ## Examples
 
 
@@ -55,3 +77,10 @@ See the [wiki](https://github.com/jsqu99/spree_flexi_variants/wiki) for more det
 Many, many thanks to [Brian Quinn](https://github.com/BDQ) for selflessly volunteering his time to mentor me throughout the development process.
 
 Copyright (c) 2011 Jeff Squires, released under the New BSD License
+
+
+TODO
+----
+
+- AdHocVariantExclusionsController remove / delete doesnt work
+- AdHocOptionTypesController remove / delete doesnt work

Versionfile

@@ -12,6 +12,7 @@
 #
 #
 #
+"2.1.x" => { :branch => "2-1-stable" }
 "1.2.x" => { :branch => "spree-1-2-stable" }
 "1.1.x" => { :branch => "spree-1-1-stable" }
 "1.0.x" => { :branch => "spree-1-0-stable" }

app/assets/stylesheets/admin/spree_flexi_variants.css

@@ -1,3 +1,3 @@
 /*
- *= require admin/spree_core
+ *= require admin/spree_backend
 */

app/assets/stylesheets/store/spree_flexi_variants.css

@@ -1,4 +1,14 @@
 /*
  *= require store/spree_core
- *= require_self
+ *= require self
 */
+
+
+
+#ad_hoc_options {
+    margin-top: 20px;
+    overflow: auto;
+}
+table#cart-detail dl {margin-left: 10px;}
+table#cart-detail dt {font-weight: normal;}
+table#cart-detail dl p {margin:0;}

app/controllers/spree/admin/ad_hoc_option_types_controller.rb

@@ -13,17 +13,19 @@ def add_option_value
       redirect_to edit_admin_product_ad_hoc_option_type_url(@ad_hoc_option_type.product, @ad_hoc_option_type)
     end
 
-    def remove
+    def before_destroy
       # TODO: when removing an option type, we need to check if removing the option type from an
       # associated exclusion causes the exclusion to only have one member.  If so, we'll need to
       # remove the entire exclusion
-      @product=@ad_hoc_option_type.product
-      @ad_hoc_option_type.destroy
-      flash.notice = I18n.t("notice_messages.option_type_removed")
-      redirect_to selected_admin_product_ad_hoc_option_types_url(@product)
+      # so: implement own destroy action, without using before/after callbacks
+      # flash.notice = I18n.t('notice_messages.option_type_removed')
     end
 
     protected
+    def location_after_destroy
+      selected_admin_product_ad_hoc_option_types_url(@object.product)
+    end
+
     def location_after_save
       selected_admin_product_ad_hoc_option_types_url(@ad_hoc_option_type.product)
     end

app/models/spree/ad_hoc_option_type.rb

@@ -10,7 +10,7 @@ class AdHocOptionType < ActiveRecord::Base
     # currently no controller for normal users present 
     #attr_accessible :is_required, :ad_hoc_option_values_attributes, :product_id, :option_type_id, :position
 
-    default_scope order(:position)
+    default_scope { order(:position) }
 
     # price_modifier_type
     # is_required

app/models/spree/ad_hoc_option_value.rb

@@ -5,22 +5,36 @@ class AdHocOptionValue < ActiveRecord::Base
     belongs_to :option_value
     has_many :excluded_ad_hoc_option_values, :dependent => :destroy
 
+    validates :price_modifier, presence: true
+
     # currently no controller for normal users present
     #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
 
-    # price_modifier
     alias :option_type :ad_hoc_option_type
     acts_as_list :scope => :ad_hoc_option_type
-    default_scope order("position asc")
+    default_scope { order('position asc') }
 
     delegate :name, :to => :option_value
     delegate :presentation, :to => :option_value
 
+    before_validation :default_values
+
+    def default_values
+      # set and save without validation
+      update_attribute :price_modifier, option_value.total_price
+    end
+
     def cost_price
-      cost_price_modifier || price_modifier || 0
+      cost_price_modifier || price_presence(:price_modifier) || 0
+    end
+
+    private
+    def price_presence(price_field)
+      val = send(price_field)
+      val == 0.0 || !val ? nil : val
     end
   end
 end

app/models/spree/line_item_decorator.rb

@@ -4,6 +4,17 @@ module Spree
     has_many :ad_hoc_option_values, :through => :ad_hoc_option_values_line_items
     has_many :product_customizations, :dependent => :destroy
 
+    #validate :ad_hoc_option_values_required
+
+    # def ad_hoc_option_values_required
+    #   required_type_ids = product.ad_hoc_option_types.select{|t| t.is_required }.map &:id
+    #   selected_type_ids = ad_hoc_option_values.select{|v| v.ad_hoc_option_type.is_required }.map &:id
+    #   valid = required_type_ids.uniq.sort == selected_type_ids.uniq.sort
+    #   unless valid
+    #     errors.add(:ad_hoc_option_values, I18n.t('.required'))
+    #   end
+    # end
+
     def options_text
       str = Array.new
       unless self.ad_hoc_option_values.empty? 

app/models/spree/option_value_decorator.rb

@@ -1,5 +1,15 @@
 module Spree
   OptionValue.class_eval do
     has_many :ad_hoc_option_values, :dependent => :destroy
+
+    has_attached_file :attachment,
+                      styles: { mini: '48x48>', small: '100x100>', product: '240x240>' },
+                      default_style: :product,
+                      url: '/spree/options/:id/:style/:basename.:extension',
+                      path: ':rails_root/public/spree/options/:id/:style/:basename.:extension',
+                      default_url: '/assets/default_options.png'
+
+    include Spree::Core::S3Support
+    supports_s3 :attachment
   end
 end

app/models/spree/order_decorator.rb

@@ -33,11 +33,11 @@ def contains?(variant, ad_hoc_option_value_ids, product_customizations)
       find_line_item_by_variant(variant, ad_hoc_option_value_ids, product_customizations).present?
     end
 
-    def find_line_item_by_variant(variant, ad_hoc_option_value_ids, product_customizations)
+    def find_line_item_by_variant(variant, ad_hoc_option_value_ids = [], product_customizations = [])
       line_items.detect do |li|
         li.variant_id == variant.id &&
-          matching_configurations(li.ad_hoc_option_values,ad_hoc_option_value_ids) &&
-          matching_customizations(li.product_customizations,product_customizations)
+          matching_configurations(li.ad_hoc_option_values, ad_hoc_option_value_ids) &&
+          matching_customizations(li.product_customizations, product_customizations)
       end
     end
 
@@ -64,17 +64,19 @@ def customization_pairs(product_customizations)
       Set.new pairs
     end
 
-    def matching_configurations(existing_povs,new_povs)
+    def matching_configurations(existing_povs, new_povs)
       # if there aren't any povs, there's a 'match'
-      return true if existing_povs.empty? && new_povs.empty?
+      # if no new povs given, we dont need to compare anything
+      return true if (existing_povs.empty? && new_povs.empty?) || (new_povs.empty?)
 
       existing_povs.map(&:id).sort == new_povs.map(&:to_i).sort
     end
 
-    def matching_customizations(existing_customizations,new_customizations)
+    def matching_customizations(existing_customizations, new_customizations)
 
       # if there aren't any customizations, there's a 'match'
-      return true if existing_customizations.empty? && new_customizations.empty?
+      # # if no new customizations given, we dont need to compare anything
+      return true if (existing_customizations.empty? && new_customizations.empty?) || (new_customizations.empty?)
 
       # exact match of all customization types?
       return false unless existing_customizations.map(&:product_customization_type_id).sort == new_customizations.map(&:product_customization_type_id).sort

app/models/spree/order_populator_decorator.rb

@@ -35,7 +35,7 @@ def attempt_cart_add(variant_id, quantity, ad_hoc_option_value_ids, product_cust
       if quantity > 0
         line_item = @order.contents.add(variant, quantity, currency, nil, ad_hoc_option_value_ids, product_customizations)
         unless line_item.valid?
-          errors.add(:base, line_item.errors.messages.values.join(" "))
+          errors.add(:base, line_item.errors.messages.values.join(' '))
           return false
         end
       end