db/sample/flexi_shipping_rates.yml db/sample/shipping_categories.yml db/sample/shipping_methods.yml lib/spree/flexi_rate_shipping/calculator.rb spec/models/flexi_shipping_calculator_spec.rb @@ -16,5 +16,6 @@ class Admin::FlexiShippingRatesController < ApplicationController private def load_data @available_categories = ShippingCategory.find :all, :order => :name + @available_zones = Zone.find :all, :order => :name end end app/controllers/admin/flexi_shipping_rates_controller.rb @@ -1,6 +1,8 @@ class FlexiShippingRate < ActiveRecord::Base belongs_to :shipping_category + belongs_to :zone + validates_presence_of :first_item_price validates_presence_of :max_items app/models/flexi_shipping_rate.rb @@ -5,6 +5,12 @@ :shipping_category_id, @available_categories, :id, :name, {}, {"style" => "width:200px"}) %></td> </tr> + <tr> + <td><%=t("Zone")%>:</td> + <td><%= collection_select(:flexi_shipping_rate, + :zone_id, @available_zones, :id, :name, + {}, {"style" => "width:200px"}) %></td> + </tr> <tr> <td><%=t("First Item Price")%>:</td> <td><%= f.text_field :first_item_price, {"style" => "width:60px"} %></td> app/views/admin/flexi_shipping_rates/_form.html.erb @@ -3,6 +3,7 @@ <thead> <tr> <th><%=t("Shipping Category")%></th> + <th><%=t("Zone")%></th> <th><%=t("First Item Price")%></th> <th><%=t("Additional Item Price")%></th> <th><%=t("Max. Number of Items")%></th> @@ -13,6 +14,7 @@ <% @flexi_shipping_rates.each do |flexi_shipping_rate| %> <tr class="<%= cycle('even', 'odd') %>"> <td><%=flexi_shipping_rate.shipping_category.name %></td> + <td><%=flexi_shipping_rate.zone.name %></td> <td><%=number_to_currency(flexi_shipping_rate.first_item_price) %></td> <td><%=number_to_currency(flexi_shipping_rate.additional_item_price) %></td> <td><%=flexi_shipping_rate.max_items %></td> app/views/admin/flexi_shipping_rates/index.html.erb @@ -2,6 +2,7 @@ class CreateFlexiShippingRates < ActiveRecord::Migration def self.up create_table :flexi_shipping_rates do |t| t.references :shipping_category + t.references :zone t.decimal :first_item_price, :precision => 8, :scale => 2 t.decimal :additional_item_price, :precision => 8, :scale => 2 t.integer :max_items, :default => 0 db/migrate/20081020154802_create_flexi_shipping_rates.rb @@ -22,6 +22,10 @@ class FlexiRateShippingExtension < Spree::Extension belongs_to :shipping_category end + Zone.class_eval do + has_many :flexi_shipping_rates + end + Admin::ConfigurationsController.class_eval do before_filter :add_flexi_rate_links, :only => :index def add_flexi_rate_links @@ -33,38 +37,4 @@ class FlexiRateShippingExtension < Spree::Extension def deactivate end - - def calculate_shipping(order) - rates = {} - rate_count = {} - order.line_items.each do |li| - - li.quantity.times do - sc = li.variant.product.shipping_category - sc ||= ShippingCategory.new() - fsr = sc.flexi_shipping_rate - fsr ||= FlexiShippingRate.new(:id => 'default', :first_item_price => 0, :max_items => 1) - rate_count.has_key?(fsr.id) ? rate_count[fsr.id] += 1 : rate_count[fsr.id] = 1 - - rates[fsr.id] = 0 unless rates.has_key? fsr.id - - if rates[fsr.id] == 0 - #first time to add a product from this flexi-rate - rates[fsr.id] += fsr.first_item_price - else - #additional time to add a product from this flexi-rate - - if rate_count[fsr.id] % fsr.max_items == 1 - rates[fsr.id] += fsr.first_item_price - else - rates[fsr.id] += fsr.additional_item_price - end - - end - end - - end - - return rates.values.inject(0){|sum, c| sum + c} - end end \ No newline at end of file flexi_rate_shipping_extension.rb @@ -14,129 +14,3 @@ describe FlexiShippingRate do end end - - -describe FlexiRateShippingExtension do - before(:each) do - @flexi_shipping_rate1 = mock_model(FlexiShippingRate, :first_item_price => 10.0, :additional_item_price => 2.0, :max_items => 6) - @shipping_category1 = mock_model(ShippingCategory, :flexi_shipping_rate => @flexi_shipping_rate1) - @product1 = mock_model(Product, :shipping_category => @shipping_category1) - @variant1 = mock_model(Variant, :product => @product1) - - end - - it "should calculate shipping with no flexi shipping rate" do - @shipping_category1 = mock_model(ShippingCategory, :flexi_shipping_rate => nil) - @product1 = mock_model(Product, :shipping_category => @shipping_category1) - @variant1 = mock_model(Variant, :product => @product1) - - @line_item1 = mock_model(LineItem, :variant => @variant1, :quantity => 1) - @line_items = [@line_item1] - @order = mock_model(Order, :line_items => @line_items) - - FlexiRateShippingExtension.new().calculate_shipping(@order).should == 0.0 - end - - it "should calculate shipping with one product with no flexi shipping rate" do - @no_rate_shipping_category = mock_model(ShippingCategory, :flexi_shipping_rate => nil) - @product1 = mock_model(Product, :shipping_category => @no_rate_shipping_category) - @variant1 = mock_model(Variant, :product => @product1) - - @line_item1 = mock_model(LineItem, :variant => @variant1, :quantity => 1) - - @product2 = mock_model(Product, :shipping_category => @shipping_category1) - @variant2 = mock_model(Variant, :product => @product2) - @line_item2 = mock_model(LineItem, :variant => @variant2, :quantity => 2) - - @line_items = [@line_item1, @line_item2] - @order = mock_model(Order, :line_items => @line_items) - - FlexiRateShippingExtension.new().calculate_shipping(@order).should == 12.0 - end - - - it "should calculate shipping with one product with no shipping category" do - @product1 = mock_model(Product, :shipping_category => nil) - @variant1 = mock_model(Variant, :product => @product1) - - @line_item1 = mock_model(LineItem, :variant => @variant1, :quantity => 7) - - @product2 = mock_model(Product, :shipping_category => @shipping_category1) - @variant2 = mock_model(Variant, :product => @product2) - @line_item2 = mock_model(LineItem, :variant => @variant2, :quantity => 2) - - @line_items = [@line_item1, @line_item2] - @order = mock_model(Order, :line_items => @line_items) - - FlexiRateShippingExtension.new().calculate_shipping(@order).should == 12.0 - end - - it "should calculate shipping with no shipping category" do - @product1 = mock_model(Product, :shipping_category => nil) - @variant1 = mock_model(Variant, :product => @product1) - - @line_item1 = mock_model(LineItem, :variant => @variant1, :quantity => 7) - @line_items = [@line_item1] - @order = mock_model(Order, :line_items => @line_items) - - FlexiRateShippingExtension.new().calculate_shipping(@order).should == 0.0 - end - - it "should calculate shipping correctly using one flexi shipping rate and one product" do - @line_item1 = mock_model(LineItem, :variant => @variant1, :quantity => 7) - @line_items = [@line_item1] - @order = mock_model(Order, :line_items => @line_items) - - FlexiRateShippingExtension.new().calculate_shipping(@order).should == 30.0 - end - - it "should calculate shipping correctly using one flexi shipping rate and multiple products" do - @line_item1 = mock_model(LineItem, :variant => @variant1, :quantity => 3) - - @product2 = mock_model(Product, :shipping_category => @shipping_category1) - @variant2 = mock_model(Variant, :product => @product2) - @line_item2 = mock_model(LineItem, :variant => @variant2, :quantity => 2) - - @product3 = mock_model(Product, :shipping_category => @shipping_category1) - @variant3 = mock_model(Variant, :product => @product3) - @line_item3 = mock_model(LineItem, :variant => @variant3, :quantity => 4) - - @line_items = [@line_item1, @line_item2, @line_item3] - @order = mock_model(Order, :line_items => @line_items) - - FlexiRateShippingExtension.new().calculate_shipping(@order).should == 34.0 - end - - it "should calculate shipping correctly using two different flexi shipping rates" do - - @flexi_shipping_rate2 = mock_model(FlexiShippingRate, :first_item_price => 50, :additional_item_price => 10, :max_items => 10) - @shipping_category2 = mock_model(ShippingCategory, :flexi_shipping_rate => @flexi_shipping_rate2) - @product2 = mock_model(Product, :shipping_category => @shipping_category2) - @variant2 = mock_model(Variant, :product => @product2) - - @line_item1 = mock_model(LineItem, :variant => @variant1, :quantity => 6) - @line_item2 = mock_model(LineItem, :variant => @variant2, :quantity => 3) - @line_items = [@line_item1, @line_item2] - @order = mock_model(Order, :line_items => @line_items) - - FlexiRateShippingExtension.new().calculate_shipping(@order).should == 90.0 - end - - - it "should calculate shipping correctly using two different flexi shipping rates, one with no addition_item_price" do - - @flexi_shipping_rate2 = mock_model(FlexiShippingRate, :first_item_price => 50, :additional_item_price => nil, :max_items => 1) - @shipping_category2 = mock_model(ShippingCategory, :flexi_shipping_rate => @flexi_shipping_rate2) - @product2 = mock_model(Product, :shipping_category => @shipping_category2) - @variant2 = mock_model(Variant, :product => @product2) - - @line_item1 = mock_model(LineItem, :variant => @variant1, :quantity => 6) - @line_item2 = mock_model(LineItem, :variant => @variant2, :quantity => 1) - @line_items = [@line_item1, @line_item2] - @order = mock_model(Order, :line_items => @line_items) - - FlexiRateShippingExtension.new().calculate_shipping(@order).should == 70.0 - end - - -end spec/models/flexi_shipping_rate_spec.rb spec/helpers/admin/flexi_shipping_rates_helper_spec.rb a81c548f3e7fc57001663af4a1e2b3fd7878c364 Brian Quinn briandquinn@gmail.com http://github.com/BDQ/spree-flexi-rate-shipping/commit/430593c4c44e7768fc4cc5d0178eaa1d54e044e6 430593c4c44e7768fc4cc5d0178eaa1d54e044e6 2008-10-30T03:58:04-07:00 2008-10-30T03:58:04-07:00 Associated FlexiShippingRate with Zone to ensure correct calculation for multiple shipping zone, added sample data 0a29dd1d0e70d987975d747a103ee70965519b19 Brian Quinn briandquinn@gmail.com