diff --git a/core/app/controllers/admin/configurations_controller.rb b/core/app/controllers/admin/configurations_controller.rb index e356293ada7..2a324ee88fc 100644 --- a/core/app/controllers/admin/configurations_controller.rb +++ b/core/app/controllers/admin/configurations_controller.rb @@ -19,7 +19,6 @@ def initialize_extension_links @extension_links = [ {:link => admin_shipping_methods_path, :link_text => t("shipping_methods"), :description => t("shipping_methods_description")}, {:link => admin_shipping_categories_path, :link_text => t("shipping_categories"), :description => t("shipping_categories_description")}, - {:link => admin_shipping_rates_path, :link_text => t("shipping_rates"), :description => t("shipping_rates_description")}, ] + @@extension_links end diff --git a/core/app/models/shipping_category.rb b/core/app/models/shipping_category.rb index 8c374eb4b0e..1b456c694e2 100644 --- a/core/app/models/shipping_category.rb +++ b/core/app/models/shipping_category.rb @@ -1,5 +1,3 @@ class ShippingCategory < ActiveRecord::Base - has_many :shipping_rates - validates_presence_of :name end diff --git a/core/app/models/shipping_charge.rb b/core/app/models/shipping_charge.rb index a97f8fbb85f..100319151ae 100644 --- a/core/app/models/shipping_charge.rb +++ b/core/app/models/shipping_charge.rb @@ -3,8 +3,7 @@ def calculate_adjustment adjustment_source && calculate_shipping_charge end - # Calculates shipping cost using calculators from shipping_rates and shipping_method - # shipping_method calculator is used when there's no corresponding shipping_rate calculator + # Calculates shipping cost using calculators from shipping_method # # shipping costs are calculated for each shipping_category - so if order have items # from 3 shipping categories, shipping cost will triple. diff --git a/core/app/models/shipping_method.rb b/core/app/models/shipping_method.rb index 143e6faecce..10d05000fb5 100644 --- a/core/app/models/shipping_method.rb +++ b/core/app/models/shipping_method.rb @@ -1,16 +1,12 @@ class ShippingMethod < ActiveRecord::Base DISPLAY = [:both, :front_end, :back_end] belongs_to :zone - has_many :shipping_rates has_many :shipments has_calculator def calculate_cost(shipment) rate_calculators = {} - shipping_rates.each do |sr| - rate_calculators[sr.shipping_category_id] = sr.calculator - end calculated_costs = shipment.line_items.group_by{|li| li.product.shipping_category_id diff --git a/core/app/views/admin/configurations/index.html.erb b/core/app/views/admin/configurations/index.html.erb index 1181b60f855..d3548345e3d 100644 --- a/core/app/views/admin/configurations/index.html.erb +++ b/core/app/views/admin/configurations/index.html.erb @@ -45,10 +45,6 @@ <%= link_to t("shipping_categories"), admin_shipping_categories_path %> <%= t("shipping_categories_description") %> - - <%= link_to t("shipping_rates"), admin_shipping_rates_path %> - <%= t("shipping_rates_description") %> - <%= link_to t("inventory_settings"), admin_inventory_settings_path %> <%= t("inventory_setting_description") %> diff --git a/core/app/views/admin/shipping_rates/_form.html.erb b/core/app/views/admin/shipping_rates/_form.html.erb deleted file mode 100644 index c6fd7a26841..00000000000 --- a/core/app/views/admin/shipping_rates/_form.html.erb +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - -
<%=t("shipping_category")%>:<%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name) %>
<%=t("shipping_method")%>:<%= f.collection_select(:shipping_method_id, @shipping_methods, :id, :name) %>
- -<%= render "admin/shared/calculator_fields", :f => f %> \ No newline at end of file diff --git a/core/app/views/admin/shipping_rates/edit.html.erb b/core/app/views/admin/shipping_rates/edit.html.erb deleted file mode 100644 index 263b1b5ab33..00000000000 --- a/core/app/views/admin/shipping_rates/edit.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -

<%= t("editing_shipping_rate") %>

-<%= render "shared/error_messages", :target => @shipping_rate %> -<%= form_for(@shipping_rate, :url => object_url, :html => { :method => :put }) do |f| %> - <%= render :partial => "form", :locals => { :f => f } %> - <%= render :partial => "admin/shared/edit_resource_links" %> -<% end %> diff --git a/core/app/views/admin/shipping_rates/index.html.erb b/core/app/views/admin/shipping_rates/index.html.erb deleted file mode 100644 index d27907dfdf2..00000000000 --- a/core/app/views/admin/shipping_rates/index.html.erb +++ /dev/null @@ -1,32 +0,0 @@ -
- -
-
-

<%=t("shipping_rates") %>

- - - - - - - - - - - <% @shipping_rates.each do |shipping_rate|%> - - - - - - - <% end %> - -
<%=t("shipping_method")%><%=t("shipping_category")%><%=t("calculator")%><%=t("action")%>
<%=shipping_rate.shipping_method.name %><%=shipping_rate.shipping_category.name %><%=shipping_rate.calculator.description %> - <%= link_to_edit shipping_rate %>   - <%= link_to_delete shipping_rate %> -
diff --git a/core/app/views/admin/shipping_rates/new.html.erb b/core/app/views/admin/shipping_rates/new.html.erb deleted file mode 100644 index 26546ffb32e..00000000000 --- a/core/app/views/admin/shipping_rates/new.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -

<%= t("new_shipping_rate") %>

- -<%= render "shared/error_messages", :target => @shipping_rate %> - -<%= form_for(@shipping_rate, :url => collection_url) do |f| %> - <%= render :partial => "form", :locals => { :f => f } %> - <%= render :partial => "admin/shared/new_resource_links" %> -<% end %> diff --git a/core/config/locales/en_spree.yml b/core/config/locales/en_spree.yml index 6a4f19f5a25..7130997ad36 100644 --- a/core/config/locales/en_spree.yml +++ b/core/config/locales/en_spree.yml @@ -352,7 +352,6 @@ en: editing_prototype: "Editing Prototype" editing_shipping_category: "Editing Shipping Category" editing_shipping_method: "Editing Shipping Method" - editing_shipping_rate: Editing Shipping Rate editing_state: "Editing State" editing_tax_category: "Editing Tax Category" editing_tax_rate: "Editing Tax Rate" @@ -499,7 +498,6 @@ en: new_shipment: "New Shipment" new_shipping_category: "New Shipping Category" new_shipping_method: "New Shipping Method" - new_shipping_rate: New Shipping Rate new_state: "New State" new_tax_category: "New Tax Category" new_tax_rate: "New Tax Rate" @@ -805,8 +803,6 @@ en: shipping_method: "Shipping Method" shipping_methods: "Shipping Methods" shipping_methods_description: "Manage shipping methods" - shipping_rates: "Shipping Rates" - shipping_rates_description: "Manage shipping rates" shipping_total: "Shipping Total" shop_by_taxonomy: "Shop by %{taxonomy}" shopping_cart: "Shopping Cart" diff --git a/core/config/routes.rb b/core/config/routes.rb index f5cdc568d17..debf1be38e9 100755 --- a/core/config/routes.rb +++ b/core/config/routes.rb @@ -187,7 +187,6 @@ resources :shipments resources :shipping_methods resources :shipping_categories - resources :shipping_rates resources :tax_rates resource :tax_settings resources :calculators diff --git a/core/db/migrate/20090823005402_spree_zero_nine_zero.rb b/core/db/migrate/20090823005402_spree_zero_nine_zero.rb index 5375cd13129..851a9600864 100644 --- a/core/db/migrate/20090823005402_spree_zero_nine_zero.rb +++ b/core/db/migrate/20090823005402_spree_zero_nine_zero.rb @@ -337,11 +337,6 @@ def self.up t.datetime "updated_at" end - create_table "shipping_rates", :force => true do |t| - t.integer "shipping_category_id" - t.integer "shipping_method_id" - end - create_table "state_events", :force => true do |t| t.integer "order_id" t.integer "user_id"