Carriers and service levels for shipping methods

backend/app/views/spree/admin/shipping_methods/_form.html.erb

@@ -33,6 +33,24 @@
     </div>
   </div>
 
+  <div class="alpha omega twelve columns">
+    <div class="alpha six columns">
+      <%= f.field_container :carrier do %>
+        <%= f.label :carrier %><br />
+        <%= f.text_field :carrier, :class => 'fullwidth', :label => false  %>
+        <%= error_message_on :shipping_method, :carrier %>
+      <% end %>
+    </div>
+
+    <div class="omega six columns">
+      <%= f.field_container :service_level do %>
+        <%= f.label :service_level %><br />
+        <%= f.text_field :service_level, :class => 'fullwidth', :label => false  %>
+        <%= error_message_on :shipping_method, :service_level %>
+      <% end %>
+    </div>
+  </div>
+
   <div data-hook="admin_shipping_method_form_tracking_url_field" class="alpha twelve columns">
     <%= f.field_container :tracking_url do %>
       <%= f.label :tracking_url, Spree.t(:tracking_url) %><br />

core/config/locales/en.yml

@@ -105,6 +105,9 @@ en:
         amount: Amount
       spree/role:
         name: Name
+      spree/shipping_method:
+        carrier: Carrier
+        service_level: Service Level
       spree/state:
         abbr: Abbreviation
         name: Name

core/db/migrate/20160122182105_add_carrier_and_service_level_to_spree_shipping_methods.rb

@@ -0,0 +1,6 @@
+class AddCarrierAndServiceLevelToSpreeShippingMethods < ActiveRecord::Migration
+  def change
+    add_column :spree_shipping_methods, :carrier, :string
+    add_column :spree_shipping_methods, :service_level, :string
+  end
+end

core/lib/spree/testing_support/factories/shipping_method_factory.rb

@@ -3,6 +3,8 @@
     zones { |a| [Spree::Zone.global] }
     name 'UPS Ground'
     code 'UPS_GROUND'
+    carrier 'UPS'
+    service_level '1DAYGROUND'
 
     before(:create) do |shipping_method, evaluator|
       if shipping_method.shipping_categories.empty?