diff --git a/app/models/spree/shipping_rate.rb b/app/models/spree/shipping_rate.rb index 710a8a25b4..ce94b5f808 100644 --- a/app/models/spree/shipping_rate.rb +++ b/app/models/spree/shipping_rate.rb @@ -12,13 +12,6 @@ module Spree references(:shipping_method). order("cost ASC") } - scope :backend, - -> { - includes(:shipping_method). - where(ShippingMethod.on_backend_query). - references(:shipping_method). - order("cost ASC") - } delegate :order, :currency, to: :shipment delegate :name, to: :shipping_method diff --git a/app/views/spree/admin/orders/_shipment.html.haml b/app/views/spree/admin/orders/_shipment.html.haml index e9fcb169de..653f93ea5c 100644 --- a/app/views/spree/admin/orders/_shipment.html.haml +++ b/app/views/spree/admin/orders/_shipment.html.haml @@ -38,7 +38,7 @@ %td{ :colspan => "5" } %div.field.alpha.five.columns = label_tag 'selected_shipping_rate_id', Spree.t(:shipping_method) - = select_tag :selected_shipping_rate_id, options_for_select(shipment.shipping_rates.backend.map { |sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id), { :class => 'select2 fullwidth', :data => { 'shipment-number' => shipment.number } } + = select_tag :selected_shipping_rate_id, options_for_select(shipment.shipping_rates.map { |sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id), { :class => 'select2 fullwidth', :data => { 'shipment-number' => shipment.number } } %td.actions - if can? :update, shipment