config/locales/en-US.yml @@ -1,14 +1,15 @@ <tr class="volume_price"> - <td valign="top"><%=@variant.sku %></td> - <td valign="top"><%=@variant.product.name %></td> - <td valign="top"><%=variant_options @variant %></td> <td valign="top"> - <%= f.error_message_on(:range) %> - <%=f.text_field(:range, :size => 10)%> + <%= error_message_on(f.object, :range) %> + <%= f.text_field(:range, :size => 10) %> </td> <td valign="top"> - <%= f.error_message_on(:amount) %> - <%=f.text_field(:amount, :size => 10)%> + <%= error_message_on(f.object, :amount) %> + <%= f.text_field(:amount, :size => 10) %> </td> - <td valign="top"><%= f.remove_link t("Delete") %></td> + <td valign="top"> + <%= error_message_on(f.object, :position) %> + <%= f.text_field(:position, :size => 3) %> + </td> + <td valign="top"><%= f.remove_link icon('delete') + ' ' + t("remove") %></td> </tr> \ No newline at end of file app/views/admin/variants/_volume_price.html.erb @@ -1,27 +1,28 @@ -<%= render :partial => 'shared/product_sub_menu' %> -<h1><%= t("Editing Product") %></h1> -<%= render :partial => 'shared/product_tabs', :locals => {:current => "Variants"} %> +<%= render :partial => 'admin/shared/product_sub_menu' %> + +<%= render :partial => 'admin/shared/product_tabs', :locals => {:current => "Variants"} %> + <%= error_messages_for :variant %> <% form_for(:variant, :url => object_url, :html => { :method => :put }) do |f| %> <%= render :partial => "form", :locals => { :f => f } %> - <h3><%= t("Volume Prices") %></h3> - <table class="admin-report" width="545"> + + <h3><%= t("volume_prices") %></h3> + <table class="index"> <thead> <tr> - <th><%=t("SKU")%></th> - <th width="150"><%=t("Product")%></th> - <th><%=t("Variant")%></th> - <th><%=t("Range")%></th> - <th><%=t("Amount")%></th> - <th><%=t("Actiion")%></th> + <th><%= t("range") %></th> + <th><%= t("amount") %></th> + <th><%= t("position") %></th> + <th><%= t("action") %></th> </tr> </thead> <tbody id="volume_prices"> <%= f.render_associated_form(@variant.volume_prices) %> </tbody> </table> - <%= f.add_associated_link(t("Add Volume Price"), @variant.volume_prices.build) %> - <br/><br/> - <%= render :partial => 'shared/edit_resource_links' %> + <%= f.add_associated_link(icon('add') + ' ' + t("add_volume_price"), @variant.volume_prices.build) %> + <br/><br/> + + <%= render :partial => 'admin/shared/edit_resource_links' %> <% end %> \ No newline at end of file app/views/admin/variants/edit.html.erb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe VolumePrice do before(:each) do - @volume_price = VolumePrice.new(:variant => Variant.new) + @volume_price = VolumePrice.new(:variant => Variant.new, :amount => 10) end it "should not interepret a Ruby range as being opend ended" do spec/models/volume_price_spec.rb @@ -18,6 +18,7 @@ class VolumePricingExtension < Spree::Extension def activate Variant.class_eval do has_many :volume_prices, :attributes => true, :order => :position, :dependent => :destroy + accepts_nested_attributes_for :volume_prices # calculates the price based on quantity def volume_price(quantity) @@ -32,22 +33,33 @@ class VolumePricingExtension < Spree::Extension Order.class_eval do # override the add_variant functionality so that we can adjust the price based on possible volume adjustment def add_variant(variant, quantity=1) - current_item = line_items.in_order(variant) - - price = variant.volume_price(quantity) - + current_item = contains?(variant) + price = variant.volume_price(quantity) # Added if current_item current_item.increment_quantity unless quantity > 1 current_item.quantity = (current_item.quantity + quantity) if quantity > 1 - current_item.price = price + current_item.price = price # Added current_item.save else - current_item = LineItem.new(:quantity => quantity, :variant => variant, :price => price) + current_item = LineItem.new(:quantity => quantity, :variant => variant, :price => price) # Changed self.line_items << current_item end + + # populate line_items attributes for additional_fields entries + # that have populate => [:line_item] + Variant.additional_fields.select{|f| !f[:populate].nil? && f[:populate].include?(:line_item) }.each do |field| + value = "" + + if field[:only].nil? || field[:only].include?(:variant) + value = variant.send(field[:name].gsub(" ", "_").downcase) + elsif field[:only].include?(:product) + value = variant.product.send(field[:name].gsub(" ", "_").downcase) + end + current_item.update_attribute(field[:name].gsub(" ", "_").downcase, value) + end end end - + LineItem.class_eval do before_update :check_volume_pricing volume_pricing_extension.rb lang/en-US.yml d47078ef1f97dba7abff80f52a86e3bbdb2f8a65 Jeff Schuil jeff@yourelevation.com http://github.com/railsdog/spree-volume-pricing/commit/17d33645d4ddd4a23306c60f3ae59bd13fd326c2 17d33645d4ddd4a23306c60f3ae59bd13fd326c2 2009-07-09T16:43:31-07:00 2009-07-09T16:43:31-07:00 Update existing extension to work with spree 0.8.5 88a080c83676213d4711a20e1740ba236010d1f8 Jeff Schuil jeff@yourelevation.com