solidus_backend 1.2.3 → 1.3.0.beta1

data/app/views/spree/admin/shared/_order_summary.html.erb

@@ -8,46 +8,46 @@
       <dd id='order_user_link'><%= link_to @order.user.email, edit_admin_user_path(@order.user) %></dd>
     <% end %>
 
-    <dt data-hook='admin_order_tab_subtotal_title'><%= Spree.t(:subtotal) %>:</dt>
+    <dt data-hook='admin_order_tab_subtotal_title'><%= Spree::Order.human_attribute_name(:item_total) %>:</dt>
     <dd id='item_total'><%= @order.display_item_total.to_html %></dd>
     <% if checkout_steps.include?("delivery") && @order.ship_total > 0 %>
-      <dt data-hook='admin_order_tab_ship_total_title'><%= Spree.t(:ship_total) %>:</dt>
+      <dt data-hook='admin_order_tab_ship_total_title'><%= Spree::Order.human_attribute_name(:shipment_total) %>:</dt>
       <dd id='ship_total'><%= @order.display_ship_total.to_html %></dd>
     <% end %>
 
     <% if @order.included_tax_total != 0 %>
-      <dt data-hook='admin_order_tab_included_tax_title'><%= Spree.t(:tax_included) %>:</dt>
+      <dt data-hook='admin_order_tab_included_tax_title'><%= Spree::Order.human_attribute_name(:included_tax_total) %>:</dt>
       <dd id='included_tax_total'><%= @order.display_included_tax_total.to_html %></dd>
     <% end %>
 
     <% if @order.additional_tax_total != 0 %>
-      <dt data-hook='admin_order_tab_additional_tax_title'><%= Spree.t(:tax) %>:</dt>
+      <dt data-hook='admin_order_tab_additional_tax_title'><%= Spree::Order.human_attribute_name(:additional_tax_total) %>:</dt>
       <dd id='additional_tax_total'><%= @order.display_additional_tax_total.to_html %></dd>
     <% end %>
 
-    <dt data-hook='admin_order_tab_total_title'><%= Spree.t(:total) %>:</dt>
+    <dt data-hook='admin_order_tab_total_title'><%= Spree::Order.human_attribute_name(:total) %>:</dt>
     <dd id='order_total'><%= @order.display_total.to_html %></dd>
 
     <% if @order.completed? %>
-      <dt><%= Spree.t(:shipment) %>: </dt>
+      <dt><%= Spree::Shipment.model_name.human %>: </dt>
       <dd id='shipment_status'><span class="state <%= @order.shipment_state %>"><%= Spree.t(@order.shipment_state, :scope => :shipment_states, :default => [:missing, "none"]) %></span></dd>
-      <dt><%= Spree.t(:payment) %>: </dt>
+      <dt><%= Spree::Payment.model_name.human %>: </dt>
       <dd id='payment_status'><span class="state <%= @order.payment_state %>"><%= Spree.t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %></span></dd>
-      <dt data-hook='admin_order_tab_date_completed_title'><%= Spree.t(:date_completed) %>:</dt>
+      <dt data-hook='admin_order_tab_date_completed_title'><%= Spree::Order.human_attribute_name(:completed_at) %>:</dt>
       <dd id='date_complete'><%= pretty_time(@order.completed_at) %></dd>
     <% end %>
 
     <% if @order.approved? %>
-      <dt><%= Spree.t(:approver) %></dt>
+      <dt><%= Spree::Order.human_attribute_name(:approver) %></dt>
       <dd><%= @order.approver.try(:email) || @order.approver_name %></dd>
-      <dt><%= Spree.t(:approved_at) %></dt>
+      <dt><%= Spree::Order.human_attribute_name(:approved_at) %></dt>
       <dd><%= pretty_time(@order.approved_at) %></dd>
     <% end %>
 
     <% if @order.canceled? && @order.canceler && @order.canceled_at %>
-      <dt><%= Spree.t(:canceler) %></dt>
+      <dt><%= Spree::Order.human_attribute_name(:canceler) %></dt>
       <dd><%= @order.canceler.email %></td>
-      <dt><%= Spree.t(:canceled_at) %></dt>
+      <dt><%= Spree::Order.human_attribute_name(:canceled_at) %></dt>
       <dd><%= pretty_time(@order.canceled_at) %></dd>
     <% end %>
   </dl>

data/app/views/spree/admin/shared/_order_tabs.html.erb

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= link_to "#{Spree.t(:order)} ##{@order.number}", spree.edit_admin_order_path(@order) %>
+  <%= link_to "#{Spree::Order.model_name.human} ##{@order.number}", spree.edit_admin_order_path(@order) %>
 <% end %>
 
 <% content_for :sidebar_title do %>
@@ -8,5 +8,8 @@
 
 <% content_for :sidebar do %>
   <%= render "spree/admin/shared/order_summary", checkout_steps: @order.checkout_steps %>
+<% end %>
+
+<% content_for :tabs do %>
   <%= render "spree/admin/shared/order_submenu", current: current, checkout_steps: @order.checkout_steps %>
 <% end %>

data/app/views/spree/admin/shared/_payments_tabs.html.erb

@@ -0,0 +1,9 @@
+<% content_for :tabs do %>
+  <nav>
+    <ul class="tabs" data-hook="admin_settings_payments_tabs">
+      <% if can?(:display, Spree::PaymentMethod) %>
+        <%= settings_tab_item Spree::PaymentMethod.model_name.human(count: :other), admin_payment_methods_path %>
+      <% end %>
+    </ul>
+  </nav>
+<% end %>

data/app/views/spree/admin/shared/_product_sub_menu.html.erb

@@ -1,4 +1,4 @@
-<ul id="sub_nav" class="admin-subnav" data-hook="admin_product_sub_tabs">
+<ul class="admin-subnav" data-hook="admin_product_sub_tabs">
   <% if can? :admin, Spree::Product %>
     <%= tab :products, match_path: '/products' %>
   <% end %>
@@ -11,7 +11,7 @@
   <% if can? :admin, Spree::Prototype %>
     <%= tab :prototypes %>
   <% end %>
-  <% if can? :admin, Spree::Taxonomy %>
+  <% if can? :display, Spree::Taxonomy %>
     <%= tab :taxonomies %>
   <% end %>
   <% if can? :admin, Spree::Taxon %>

data/app/views/spree/admin/shared/_product_tabs.html.erb

@@ -1,30 +1,25 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_product) %> &ldquo;<%= @product.name %>&rdquo;
+  <%= Spree::Product.model_name.human(count: :other) %> &#x2f; <%= @product.name %>
 <% end %>
 
-<% content_for :sidebar_title do %>
-  <span class="sku"><%= @product.sku %></span>
-<% end %>
-
-<% content_for :sidebar do %>
-  <nav class="menu">
-    <ul data-hook="admin_product_tabs">
+<% content_for :tabs do %>
+  <nav>
+    <ul class="tabs" data-hook="admin_product_tabs">
       <%= content_tag :li, :class => ('active' if current == 'Product Details') do %>
-        <%= link_to_with_icon 'edit', Spree.t(:product_details), edit_admin_product_url(@product) %>
+        <%= link_to_with_icon 'edit', Spree.t(:product_details), spree.edit_admin_product_url(@product) %>
       <% end if can?(:admin, Spree::Product) %>
       <%= content_tag :li, :class => ('active' if current == 'Images') do %>
-        <%= link_to_with_icon 'picture-o', Spree.t(:images), admin_product_images_url(@product) %>
+        <%= link_to_with_icon 'picture-o', Spree.t(:images), spree.admin_product_images_url(@product) %>
       <% end if can?(:admin, Spree::Image) %>
       <%= content_tag :li, :class => ('active' if current == 'Variants') do %>
-        <%= link_to_with_icon 'th-large', Spree.t(:variants),  admin_product_variants_url(@product) %>
+        <%= link_to_with_icon 'th-large', Spree::Variant.model_name.human(count: :other),  spree.admin_product_variants_url(@product) %>
       <% end if can?(:admin, Spree::Variant) %>
       <%= content_tag :li, :class => ('active' if current == 'Product Properties') do %>
-        <%= link_to_with_icon 'tasks', Spree.t(:product_properties), admin_product_product_properties_url(@product) %>
+        <%= link_to_with_icon 'tasks', Spree::ProductProperty.model_name.human(count: :other), spree.admin_product_product_properties_url(@product) %>
       <% end if can?(:admin, Spree::ProductProperty) %>
       <%= content_tag :li, :class => ('active' if current == 'Stock Management') do %>
-        <%= link_to_with_icon 'cubes', Spree.t(:stock_management), admin_product_stock_url(@product) %>
+        <%= link_to_with_icon 'cubes', Spree.t(:stock_management), spree.admin_product_stock_url(@product) %>
       <% end if can?(:admin, Spree::StockItem) %>
     </ul>
   </nav>
-
 <% end %>

data/app/views/spree/admin/shared/_promotion_sub_menu.html.erb

@@ -1,4 +1,4 @@
-<ul id="sub_nav" class="admin-subnav" data-hook="admin_promotion_sub_tabs">
+<ul class="admin-subnav" data-hook="admin_promotion_sub_tabs">
   <% if can? :admin, Spree::Promotion %>
     <%= tab :promotions %>
   <% end %>

data/app/views/spree/admin/shared/_refunds.html.erb

@@ -1,11 +1,11 @@
 <table class="index" id='payments' data-order-id='<%= @order.number %>'>
   <thead>
     <tr data-hook="refunds_header">
-      <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
-      <th><%= Spree.t(:payment_identifier) %></th>
-      <th><%= Spree.t(:amount) %></th>
-      <th><%= Spree.t(:payment_method) %></th>
-      <th><%= Spree.t(:transaction_id) %></th>
+      <th><%= Spree::Refund.human_attribute_name(:created_at) %></th>
+      <th><%= Spree::Payment.human_attribute_name(:number) %></th>
+      <th><%= Spree::Refund.human_attribute_name(:amount) %></th>
+      <th><%= Spree::PaymentMethod.model_name.human %></th>
+      <th><%= Spree::Refund.human_attribute_name(:transaction_id) %></th>
       <th><%= Spree.t(:reason) %></th>
       <% if show_actions %>
         <th class="actions"></th>
@@ -23,7 +23,7 @@
         <td class="align-center"><%= truncate(refund.reason.name, length: 100) %></td>
         <% if show_actions %>
           <td class="actions">
-            <%= link_to_with_icon 'edit', Spree.t(:edit), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true %>
+            <%= link_to_with_icon 'edit', Spree.t('actions.edit'), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true %>
           </td>
         <% end %>
       </tr>

data/app/views/spree/admin/shared/_settings_checkout_tabs.html.erb

@@ -0,0 +1,21 @@
+<% content_for :tabs do %>
+  <nav>
+    <ul class="tabs" data-hook="admin_settings_checkout_tabs">
+      <% if can?(:display, Spree::RefundReason) %>
+        <%= settings_tab_item Spree::RefundReason.model_name.human(count: :other), admin_refund_reasons_path %>
+      <% end %>
+
+      <% if can?(:display, Spree::ReimbursementType) %>
+        <%= settings_tab_item Spree::ReimbursementType.model_name.human(count: :other), admin_reimbursement_types_path %>
+      <% end %>
+
+      <% if can?(:display, Spree::ReturnReason) %>
+        <%= settings_tab_item Spree::ReturnReason.model_name.human(count: :other), admin_return_reasons_path %>
+      <% end %>
+
+      <% if can?(:display, Spree::AdjustmentReason) %>
+        <%= settings_tab_item Spree::AdjustmentReason.model_name.human(count: :other), admin_adjustment_reasons_path %>
+      <% end %>
+    </ul>
+  </nav>
+<% end %>

data/app/views/spree/admin/shared/_settings_sub_menu.html.erb

@@ -0,0 +1,26 @@
+<ul class="admin-subnav" data-hook="admin_settings_sub_tabs">
+  <% if can?(:edit, :general_settings) || can?(:display, Spree::Tracker) %>
+    <%= tab :general_settings, label: :general, url: spree.edit_admin_general_settings_path, match_path: /\/general_settings|\/trackers/ %>
+  <% end %>
+
+  <% if can?(:display, Spree::PaymentMethod) %>
+    <%= tab :payments, url: admin_payment_methods_path %>
+  <% end %>
+
+  <% if can?(:display, Spree::Zone) || can?(:display, Spree::Country) || can?(:display, Spree::State) %>
+    <%= tab :areas, url: admin_zones_path %>
+  <% end %>
+
+  <% if can?(:display, Spree::TaxCategory) || can?(:display, Spree::TaxRate) %>
+    <%= tab :taxes, url: admin_tax_categories_path %>
+  <% end %>
+
+  <% if can?(:display, Spree::RefundReason) || can?(:display, Spree::ReimbursementType) ||
+     can?(:display, Spree::ReturnReason) || can?(:display, Spree::AdjustmentReason) %>
+    <%= tab :checkout, url: admin_refund_reasons_path %>
+  <% end %>
+
+  <% if can?(:display, Spree::ShippingMethod) || can?(:display, Spree::ShippingCategory) || can?(:display, Spree::StockLocation) %>
+    <%= tab :shipping, url: admin_shipping_methods_path %>
+  <% end %>
+</ul>

data/app/views/spree/admin/shared/_shipping_tabs.html.erb

@@ -0,0 +1,17 @@
+<% content_for :tabs do %>
+  <nav>
+    <ul class="tabs" data-hook="admin_settings_shipping_tabs">
+      <% if can?(:display, Spree::ShippingMethod) %>
+        <%= settings_tab_item Spree::ShippingMethod.model_name.human(count: :other), admin_shipping_methods_path %>
+      <% end %>
+
+      <% if can?(:display, Spree::ShippingCategory) %>
+        <%= settings_tab_item Spree::ShippingCategory.model_name.human(count: :other), admin_shipping_categories_path %>
+      <% end %>
+
+      <% if can?(:display, Spree::StockLocation) %>
+        <%= settings_tab_item Spree::StockLocation.model_name.human(count: :other), spree.admin_stock_locations_path %>
+      <% end %>
+    </ul>
+  </nav>
+<% end %>

data/app/views/spree/admin/shared/_spinner.html.erb

@@ -0,0 +1,6 @@
+<div id="progress">
+  <div class="wrapper">
+    <div id="spinner" class="spinner"></div>
+    <div class="progress-message"><%= Spree.t(:loading) %>...</div>
+  </div>
+</div>

data/app/views/spree/admin/shared/_stock_sub_menu.html.erb

@@ -1,8 +1,8 @@
-<ul id="sub_nav" class="admin-subnav" data-hook="admin_stock_transfer_sub_tabs">
+<ul class="admin-subnav" data-hook="admin_stock_transfer_sub_tabs">
   <% if can? :admin, Spree::StockItem %>
-    <%= tab :stock_items, label: 'management', match_path: '/stock_items' %>
+    <%= tab :stock_items, match_path: '/stock_items' %>
   <% end %>
   <% if can? :admin, Spree::StockTransfer %>
-    <%= tab :stock_transfers, label: 'transfers', match_path: '/stock_transfers' %>
+    <%= tab :stock_transfers, match_path: '/stock_transfers' %>
   <% end %>
 </ul>

data/app/views/spree/admin/shared/_table_filter.html.erb

@@ -1,5 +1,5 @@
 <% if content_for?(:table_filter) %>
-  <div id="table-filter" data-hook class="<%= if content_for?(:sidebar) then 'twelve' else 'sixteen' end %> columns">
+  <div id="table-filter" data-hook>
     <fieldset>
       <legend align="center"><%= yield :table_filter_title %></legend>
       <%= yield :table_filter %>

data/app/views/spree/admin/shared/_tabs.html.erb

@@ -13,7 +13,9 @@
 <% end %>
 
 <% if can? :admin, :general_settings %>
-  <%= tab *Spree::BackendConfiguration::CONFIGURATION_TABS, label: Spree.t(:settings), icon: 'wrench', url: spree.edit_admin_general_settings_path %>
+  <%= tab *Spree::BackendConfiguration::CONFIGURATION_TABS, label: :settings, icon: 'wrench', url: spree.edit_admin_general_settings_path do %>
+    <% render partial: 'spree/admin/shared/settings_sub_menu' %>
+  <% end %>
 <% end %>
 
 <% if can? :admin, Spree::Promotion %>
@@ -23,7 +25,7 @@
 <% end %>
 
 <% if can? :admin, Spree::StockItem %>
-  <%= tab(:stock_items, :stock_transfers, url: spree.admin_stock_items_path, label: Spree.t(:stock), icon: 'cubes', match_path: %r(^/admin/stock)) do %>
+  <%= tab(*Spree::BackendConfiguration::STOCK_TABS, url: spree.admin_stock_items_path, label: :stock, icon: 'cubes', match_path: %r(^/admin/stock)) do %>
     <%- render partial: 'spree/admin/shared/stock_sub_menu' %>
   <%- end %>
 <% end %>

data/app/views/spree/admin/shared/_taxes_tabs.html.erb

@@ -0,0 +1,13 @@
+<% content_for :tabs do %>
+  <nav>
+    <ul class="tabs" data-hook="admin_settings_taxes_tabs">
+      <% if can? :display, Spree::TaxCategory %>
+        <%= settings_tab_item Spree::TaxCategory.model_name.human(count: :other), admin_tax_categories_path %>
+      <% end %>
+
+      <% if can? :display, Spree::TaxRate %>
+        <%= settings_tab_item Spree::TaxRate.model_name.human(count: :other), admin_tax_rates_path %>
+      <% end %>
+    </ul>
+  </nav>
+<% end %>

data/app/views/spree/admin/shared/_variant_search.html.erb

@@ -2,12 +2,12 @@
   <%= form_for :variant_search, url: form_path, method: :get do |f| %>
     <div class="field-block alpha four columns">
       <div class="field">
-        <%= label_tag nil, Spree.t(:stock_location) %>
+        <%= label_tag nil, Spree::StockLocation.model_name.human %>
         <%= select_tag :stock_location_id, options_from_collection_for_select(stock_locations, :id, :name, params[:stock_location_id]), { :include_blank => true, :class => 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location) } %>
       </div>
     </div>
     <div data-hook="add_product_name" class="field <%= if content_for?(:sidebar) then 'eight' else 'twelve' end %> columns alpha">
-      <%= label_tag :add_variant_id, Spree.t(:variant) %>
+      <%= label_tag :add_variant_id, Spree::Variant.model_name.human %>
       <%= text_field_tag :variant_search_term, params[:variant_search_term], :class => "fullwidth", :placeholder => Spree.t(:variant_search_placeholder) %>
     </div>
 

data/app/views/spree/admin/shared/named_types/_edit.html.erb

@@ -1,3 +1,5 @@
+<%= render 'spree/admin/shared/settings_checkout_tabs' %>
+
 <% content_for :page_title do %>
   <%= page_title %> <i class="fa fa-arrow-right"></i>
   <%= @object.name %>

data/app/views/spree/admin/shared/named_types/_form.html.erb

@@ -2,14 +2,12 @@
   <div class="row">
     <div class="alpha four columns">
       <%= f.field_container :name do %>
-        <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
+        <%= f.label :name, class: 'required' %><br />
         <%= f.text_field :name, :class => 'fullwidth' %>
       <% end %>
       <div class="checkbox">
-        <label>
-          <%= f.check_box :active %>
-          <%= Spree.t(:active) %>
-        </label>
+        <%= f.check_box :active %>
+        <%= f.label :active %>
       </div>
     </div>
   </div>

data/app/views/spree/admin/shared/named_types/_index.html.erb

@@ -1,4 +1,4 @@
-<%= render partial: 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/settings_checkout_tabs' %>
 
 <% content_for :page_title do %>
   <%= page_title %>
@@ -48,9 +48,8 @@
   </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: resource_name) %>
-    <% if can?(:create, Spree::ReturnReason) %>
-      <%= link_to Spree.t(:add_one), new_object_url %>!
-    <% end %>
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: resource,
+                 new_resource_url: new_object_url %>
   </div>
 <% end %>

data/app/views/spree/admin/shared/named_types/_new.html.erb

@@ -1,3 +1,5 @@
+<%= render 'spree/admin/shared/settings_checkout_tabs' %>
+
 <% content_for :page_title do %>
   <%= page_title %>
 <% end %>

data/app/views/spree/admin/shipping_categories/_form.html.erb

@@ -1,6 +1,6 @@
 <div data-hook="admin_shipping_category_form_fields">
   <div data-hook="name" class="field align-center">
-    <%= label_tag :shipping_category_name, Spree.t(:name) %><br>
-    <%= f.text_field :name %>    
+    <%= f.label :name %><br>
+    <%= f.text_field :name %>
   </div>
 </div>

data/app/views/spree/admin/shipping_categories/edit.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/shipping_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:editing_shipping_category) %>

data/app/views/spree/admin/shipping_categories/index.html.erb

@@ -1,7 +1,7 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/shipping_tabs' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:shipping_categories) %>
+  <%= Spree::ShippingCategory.model_name.human(count: :other) %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -20,7 +20,7 @@
   </colgroup>
   <thead>
     <tr data-hook="categories_header">
-      <th><%= Spree.t(:name) %></th>
+      <th><%= Spree::ShippingCategory.human_attribute_name(:name) %></th>
       <th class="actions"></th>
     </tr>
   </thead>
@@ -43,9 +43,8 @@
 </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/shipping_category')) %>
-    <% if can?(:create, Spree::ShippingCategory) %>
-      <%= link_to Spree.t(:add_one), spree.new_admin_shipping_category_path %>!
-    <% end %>
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::ShippingCategory,
+                 new_resource_url: new_object_url %>
   </div>
 <% end %>

data/app/views/spree/admin/shipping_categories/new.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/shipping_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:new_shipping_category) %>

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

@@ -1,7 +1,7 @@
 <div data-hook="admin_shipping_method_form_fields" class="alpha twelve columns">
   <div data-hook="admin_shipping_method_form_name_field" class="alpha six columns">
     <%= f.field_container :name do %>
-      <%= f.label :name, Spree.t(:name) %><br />
+      <%= f.label :name %><br />
       <%= f.text_field :name, :class => 'fullwidth' %>
       <%= error_message_on :shipping_method, :name %>
     <% end %>
@@ -9,7 +9,7 @@
 
   <div data-hook="admin_shipping_method_form_display_field" class="omega six columns">
     <%= f.field_container :display_on do %>
-      <%= f.label :display_on, Spree.t(:display) %><br />
+      <%= f.label :display_on %><br />
       <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2 fullwidth'}) %>
       <%= error_message_on :shipping_method, :display_on %>
     <% end %>
@@ -18,7 +18,7 @@
   <div class="alpha omega twelve columns">
     <div data-hook="admin_shipping_method_form_internal_name_field" class="alpha six columns">
       <%= f.field_container :admin_name do %>
-        <%= f.label :admin_name, Spree.t(:internal_name) %><br />
+        <%= f.label :admin_name %><br />
         <%= f.text_field :admin_name, :class => 'fullwidth', :label => false  %>
         <%= error_message_on :shipping_method, :admin_name %>
       <% end %>
@@ -26,16 +26,34 @@
 
     <div data-hook="admin_shipping_method_form_code" class="omega six columns">
       <%= f.field_container :code do %>
-        <%= f.label :code, Spree.t(:code) %><br />
+        <%= f.label :code %><br />
         <%= f.text_field :code, :class => 'fullwidth', :label => false  %>
         <%= error_message_on :shipping_method, :code %>
       <% end %>
     </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 />
+      <%= f.label :tracking_url %><br />
       <%= f.text_field :tracking_url, :class => 'fullwidth', :placeholder => Spree.t(:tracking_url_placeholder) %>
       <%= error_message_on :shipping_method, :tracking_url %>
     <% end %>
@@ -45,7 +63,7 @@
 <div class="alpha six columns">
   <div data-hook="admin_shipping_method_form_availability_fields" class="alpha six columns">
     <fieldset class="categories no-border-bottom">
-      <legend align="center"><%= Spree.t(:shipping_categories) %></legend>
+      <legend align="center"><%= Spree::ShippingCategory.model_name.human(count: :other) %></legend>
       <%= f.field_container :categories do %>
         <% Spree::ShippingCategory.all.each do |category| %>
           <%= label_tag do %>
@@ -60,7 +78,7 @@
 
   <div class="alpha six columns">
     <fieldset class="no-border-bottom">
-      <legend align="center"><%= Spree.t(:zones) %></legend>
+      <legend align="center"><%= Spree::Zone.model_name.human(count: :other) %></legend>
       <%= f.field_container :zones do %>
         <% shipping_method_zones = @shipping_method.zones.to_a %>
         <% Spree::Zone.all.each do |zone| %>
@@ -83,7 +101,7 @@
 <div class="alpha six columns">
   <div class="alpha six columns">
     <fieldset class="tax_categories no-border-bottom">
-      <legend align="center"><%= Spree.t(:tax_category) %></legend>
+      <legend align="center"><%= Spree::TaxCategory.model_name.human %></legend>
         <%= f.field_container :tax_categories do %>
           <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, {include_blank: true}, class: "select2 fullwidth" %>
           <%= error_message_on :shipping_method, :tax_category_id %>