diff --git a/backend/app/views/spree/admin/shipping_methods/_form.html.erb b/backend/app/views/spree/admin/shipping_methods/_form.html.erb index 5356fb61b80..d5d3828676e 100644 --- a/backend/app/views/spree/admin/shipping_methods/_form.html.erb +++ b/backend/app/views/spree/admin/shipping_methods/_form.html.erb @@ -33,6 +33,24 @@ +
+
+ <%= f.field_container :carrier do %> + <%= f.label :carrier %>
+ <%= f.text_field :carrier, :class => 'fullwidth', :label => false %> + <%= error_message_on :shipping_method, :carrier %> + <% end %> +
+ +
+ <%= f.field_container :service_level do %> + <%= f.label :service_level %>
+ <%= f.text_field :service_level, :class => 'fullwidth', :label => false %> + <%= error_message_on :shipping_method, :service_level %> + <% end %> +
+
+
<%= f.field_container :tracking_url do %> <%= f.label :tracking_url, Spree.t(:tracking_url) %>
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml index 071c6266da0..a13f02438b8 100644 --- a/core/config/locales/en.yml +++ b/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 diff --git a/core/db/migrate/20160122182105_add_carrier_and_service_level_to_spree_shipping_methods.rb b/core/db/migrate/20160122182105_add_carrier_and_service_level_to_spree_shipping_methods.rb new file mode 100644 index 00000000000..2653a55de4d --- /dev/null +++ b/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 diff --git a/core/lib/spree/testing_support/factories/shipping_method_factory.rb b/core/lib/spree/testing_support/factories/shipping_method_factory.rb index 0d730c431b4..c512e2449c4 100644 --- a/core/lib/spree/testing_support/factories/shipping_method_factory.rb +++ b/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?