goca-spree-backend 3.1.14.rails.5.0

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

@@ -0,0 +1,32 @@
+<table class="table table-condensed table-bordered" id='refunds' 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.t(:reason) %></th>
+      <% if show_actions %>
+        <th></th>
+      <% end %>
+    </tr>
+  </thead>
+  <tbody>
+    <% refunds.each do |refund| %>
+      <tr id="<%= dom_id(refund) %>" data-hook="refunds_row" class="<%= cycle('odd', 'even', name: 'refund_table_cycle')%>">
+        <td><%= pretty_time(refund.created_at) %></td>
+        <td><%= refund.payment.number %></td>
+        <td class="amount"><%= refund.display_amount %></td>
+        <td><%= payment_method_name(refund.payment) %></td>
+        <td><%= refund.transaction_id %></td>
+        <td><%= truncate(refund.reason.name, length: 100) %></td>
+        <% if show_actions %>
+          <td class="actions actions-1">
+            <%= link_to_with_icon('edit', Spree.t(:edit), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true, :class => "btn btn-default btn-sm") if can?(:edit, refund) %>
+          </td>
+        <% end %>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -0,0 +1,17 @@
+<%= search_form_for @search, :url => spree.sales_total_admin_reports_path  do |s| %>
+  <div class="form-group date-range-filter">
+    <%= label_tag nil, Spree.t(:date_range) %>
+    <div class="date-range-filter row">
+      <div class="col-md-6">
+        <%= s.text_field :completed_at_gt, :class => 'datepicker datepicker-from form-control', :value => datepicker_field_value(params[:q][:completed_at_gt]) %>
+      </div>
+      <div class="col-md-6">
+        <%= s.text_field :completed_at_lt, :class => 'datepicker datepicker-to form-control', :value => datepicker_field_value(params[:q][:completed_at_lt]) %>
+    </div>
+    </div>
+  </div>
+
+  <div class="form-actions">
+    <%= button Spree.t(:search), 'search' %>
+  </div>
+<% end %>

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

@@ -0,0 +1,5 @@
+<% if content_for?(:sidebar) %>
+  <aside id="sidebar" class="main-right-sidebar" data-hook>
+    <%= yield :sidebar %>
+  </aside>
+<% end %>

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

@@ -0,0 +1,24 @@
+<% if content_for?(:table_filter) %>
+  <div class="filter-wrap row">
+    <div class="col-sm-12">
+      <div class="input-group index-filter-button">
+        <span class="input-group-btn">
+          <button class="btn btn-default js-show-index-filters" type="button">
+            <span class="icon icon-chevron-right"></span>
+            <%= Spree.t(:filter) %>
+          </button>
+        </span>
+        <%= form_tag request.fullpath, id: "quick-search" do %>
+          <%= text_field_tag :quick_search, nil, class: "form-control js-quick-search", placeholder: Spree.t(:quick_search) %>
+        <% end %>
+      </div>
+      <% unless defined?(simple) %>
+        <div id="table-filter" data-hook class="well filter-well">
+          <%= yield :table_filter %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="table-active-filters js-filters"></div>
+<% end %>

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

@@ -0,0 +1,48 @@
+<script>
+  Spree.translations = <%==
+  { :date_picker    => Spree.t(:js_format,
+                              :scope => 'date_picker',
+                              :default => 'yy/mm/dd'),
+    :abbr_day_names           => I18n.t(:abbr_day_names, :scope => :date),
+    :add                      => Spree.t(:add),
+    :are_you_sure_delete      => Spree.t(:are_you_sure_delete),
+    :bill_address             => Spree.t(:bill_address),
+    :choose_a_customer        => Spree.t(:choose_a_customer),
+    :confirm_delete           => Spree.t(:confirm_delete),
+    :cut                      => Spree.t(:cut),
+    :destroy                  => Spree.t(:destroy, :scope => :actions),
+    :edit                     => Spree.t(:edit,    :scope => :actions),
+    :save                     => Spree.t(:save,    :scope => :actions),
+    :cancel                   => Spree.t(:cancel,  :scope => :actions),
+    :first_day                => Spree.t(:first_day,
+                                         :scope => 'date_picker',
+                                         :default => 0).to_i,
+    :find_a_taxon             => Spree.t(:find_a_taxon),
+    :item_stock_placeholder   => Spree.t(:choose_location),
+    :loading                  => Spree.t(:loading),
+    :month_names              => I18n.t(:month_names, :scope => :date).instance_eval {|o|
+                                     o.try(:reject, &:blank?) || o},
+    :more                     => Spree.t(:more),
+    :name                     => Spree.t(:name),
+    :next                     => Spree.t(:next),
+    :no_results               => Spree.t(:no_results),
+    :option_type_placeholder  => Spree.t(:option_type_placeholder),
+    :paste                    => Spree.t(:paste),
+    :previous                 => Spree.t(:previous),
+    :remove                   => Spree.t(:remove),
+    :rename                   => Spree.t(:rename),
+    :searching                => Spree.t(:searching),
+    :sku                      => Spree.t(:sku),
+    :type_to_search           => Spree.t(:type_to_search),
+    :taxon_placeholder        => Spree.t(:taxon_placeholder),
+    :variant_placeholder      => Spree.t(:variant_placeholder),
+    :value                    => Spree.t(:value),
+    :currency_separator       => I18n.t('number.currency.format.separator'),
+
+  }.to_json
+%>
+</script>
+
+<% if I18n.locale != :en %>
+  <%= javascript_include_tag "select2_locale_#{I18n.locale}" %>
+<% end %>

data/app/views/spree/admin/shared/_update_order_state.js

@@ -0,0 +1,7 @@
+$('#order_tab_summary h5#order_status').html('<%= j Spree.t(:status) %>: <%= j Spree.t(@order.state, :scope => :order_state) %>');
+$('#order_tab_summary h5#order_total').html('<%= j Spree.t(:total) %>: <%= j @order.display_total.to_html %>');
+
+<% if @order.completed? %>
+  $('#order_tab_summary h5#payment_status').html('<%= j Spree.t(:payment) %>: <%= j Spree.t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %>');
+  $('#order_tab_summary h5#shipment_status').html('<%= j Spree.t(:shipment) %>: <%= j Spree.t(@order.shipment_state, :scope => :shipment_state, :default => [:missing, "none"]) %>');
+<% end %>

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

@@ -0,0 +1,13 @@
+<% content_for :page_title do %>
+  <%= link_to collection_url_label, collection_url %> /
+  <%= @object.name %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>
+
+<%= form_for [:admin, @object] do |f| %>
+  <fieldset>
+    <%= render partial: 'spree/admin/shared/named_types/form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,13 @@
+<div data-hook="admin_named_type_form_fields">
+  <%= f.field_container :name, class: ['form-group'] do %>
+    <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
+    <%= f.text_field :name, class: 'form-control' %>
+    <%= f.error_message_on :name %>
+  <% end %>
+  <div class="checkbox">
+    <%= label_tag :active do %>
+      <%= f.check_box :active %>
+      <%= Spree.t(:active) %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,42 @@
+<% content_for :page_title do %>
+  <%= page_title %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to new_button_text, new_object_url, { icon: 'add', id: 'admin_new_named_type', :class => "btn-success" } %>
+<% end if can? :create, resource %>
+
+<% if @collection.any? %>
+  <table class="table" id='listing_named_types' data-hook>
+    <thead>
+      <tr data-hook="named_types_header">
+        <th><%= Spree.t(:name) %></th>
+        <th><%= Spree.t(:state) %></th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody id="<%= resource_name.to_s.parameterize.underscore %>">
+      <% @collection.each do |named_type| %>
+        <tr id="<%= spree_dom_id named_type %>" data-hook="named_type_row">
+          <td class="align-center">
+            <%= named_type.name %>
+          </td>
+          <td class="align-center">
+            <%= Spree.t(named_type.active? ? :active : :inactive) %>
+          </td>
+          <td class="actions actions-1 text-right">
+            <% if named_type.mutable? %>
+              <%= link_to_edit(named_type, no_text: true) if can? :edit, named_type %>
+              <%= link_to_delete(named_type, no_text: true) if can? :delete, named_type %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: resource_name) %>,
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, resource %>!
+  </div>
+<% end %>

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

@@ -0,0 +1,13 @@
+<% content_for :page_title do %>
+  <%= link_to collection_url_label, collection_url %> /
+  <%= page_title %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>
+
+<%= form_for [:admin, @object] do |f| %>
+  <fieldset>
+    <%= render partial: 'spree/admin/shared/named_types/form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>

data/app/views/spree/admin/shared/sub_menu/_configuration.html.erb

@@ -0,0 +1,23 @@
+<ul data-hook="admin_configurations_sidebar_menu" class="collapse nav nav-pills nav-stacked" id="sidebar-configuration">
+  <%= configurations_sidebar_menu_item(Spree.t(:general_settings), spree.edit_admin_general_settings_path) if can? :manage, Spree::Config %>
+  <%= configurations_sidebar_menu_item(Spree.t(:tax_categories), spree.admin_tax_categories_path) if can? :manage, Spree::TaxCategory %>
+  <%= configurations_sidebar_menu_item(Spree.t(:tax_rates), spree.admin_tax_rates_path) if can? :manage, Spree::TaxRate %>
+  <%= configurations_sidebar_menu_item(Spree.t(:zones), spree.admin_zones_path) if can? :manage, Spree::Zone %>
+  <%= configurations_sidebar_menu_item(Spree.t(:countries), spree.admin_countries_path) if can? :manage, Spree::Country %>
+
+  <% if country = Spree::Country.find_by_id(Spree::Config[:default_country_id]) || Spree::Country.first %>
+    <%= configurations_sidebar_menu_item(Spree.t(:states), spree.admin_country_states_path(country)) if can? :manage, Spree::Country %>
+  <% end %>
+
+  <%= configurations_sidebar_menu_item(Spree.t(:payment_methods), spree.admin_payment_methods_path) if can? :manage, Spree::PaymentMethod %>
+  <%= configurations_sidebar_menu_item(Spree.t(:shipping_methods), spree.admin_shipping_methods_path) if can? :manage, Spree::ShippingMethod %>
+  <%= configurations_sidebar_menu_item(Spree.t(:shipping_categories), spree.admin_shipping_categories_path) if can? :manage, Spree::ShippingCategory %>
+  <%= configurations_sidebar_menu_item(Spree.t(:stock_transfers), spree.admin_stock_transfers_path) if can? :manage, Spree::StockTransfer %>
+  <%= configurations_sidebar_menu_item(Spree.t(:stock_locations), spree.admin_stock_locations_path) if can? :manage, Spree::StockLocation %>
+  <%= configurations_sidebar_menu_item(Spree.t(:store_credit_categories), spree.admin_store_credit_categories_path) if can? :manage, Spree::StoreCreditCategory %>
+  <%= configurations_sidebar_menu_item(Spree.t(:analytics_trackers), spree.admin_trackers_path) if can? :manage, Spree::Tracker %>
+  <%= configurations_sidebar_menu_item(Spree.t(:refund_reasons), spree.admin_refund_reasons_path) if can? :manage, Spree::RefundReason %>
+  <%= configurations_sidebar_menu_item(Spree.t(:reimbursement_types), spree.admin_reimbursement_types_path) if can? :manage, Spree::ReimbursementType %>
+  <%= configurations_sidebar_menu_item(Spree.t(:return_authorization_reasons), spree.admin_return_authorization_reasons_path) if can? :manage, Spree::ReturnAuthorizationReason %>
+  <%= configurations_sidebar_menu_item(Spree.t(:roles), spree.admin_roles_path) if can? :manage, Spree::Role %>
+</ul>

data/app/views/spree/admin/shared/sub_menu/_product.html.erb

@@ -0,0 +1,8 @@
+<ul id="sidebar-product" class="collapse nav nav-pills nav-stacked" data-hook="admin_product_sub_tabs">
+  <%= tab :products, match_path: '/products' %>
+  <%= tab :option_types, match_path: '/option_types' %>
+  <%= tab :properties %>
+  <%= tab :prototypes %>
+  <%= tab :taxonomies, match_path: '/taxonomies' %>
+  <%= tab :taxons, match_path: '/taxons' %>
+</ul>

data/app/views/spree/admin/shared/sub_menu/_promotion.html.erb

@@ -0,0 +1,4 @@
+<ul id="sidebar-promotions" class="collapse nav nav-pills nav-stacked" data-hook="admin_promotion_sub_tabs">
+  <%= tab :promotions %>
+  <%= tab :promotion_categories %>
+</ul>

data/app/views/spree/admin/shared/sub_menu/_returns.html.erb

@@ -0,0 +1,4 @@
+<ul id="sidebar-returns" class="collapse nav nav-pills nav-stacked" data-hook="admin_returns_sub_tabs">
+  <%= tab :return_authorizations, url: spree.admin_return_authorizations_path, match_path: '/return_authorizations' if can?(:admin, Spree::ReturnAuthorization) %>
+  <%= tab :customer_returns, url: spree.admin_customer_returns_path, match_path: '/customer_returns' if can?(:admin, Spree::CustomerReturn) %>
+</ul>

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

@@ -0,0 +1,9 @@
+<div data-hook="admin_shipping_category_form_fields">
+  <div data-hook="name" class="form-group">
+    <%= f.field_container :name, class: ["form-group"] do %>
+      <%= f.label :name, Spree.t(:name) %><br>
+      <%= f.text_field :name, class: 'form-control' %>
+      <%= f.error_message_on :name %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,11 @@
+<% content_for :page_title do %>
+  <%= link_to Spree.t(:shipping_categories), spree.admin_shipping_categories_url %> /
+  <%= @shipping_category.name %>
+<% end %>
+
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @shipping_category } %>
+
+<%= form_for [:admin, @shipping_category] do |f| %>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+<% end %>

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

@@ -0,0 +1,34 @@
+<% content_for :page_title do %>
+  <%= plural_resource_name(Spree::ShippingCategory) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:new_shipping_category), new_object_url, :class => "btn-success", :icon => 'add' %>
+<% end if can? :create, Spree::ShippingCategory %>
+
+<% if @shipping_categories.any? %>
+  <table class="table">
+    <thead>
+      <tr data-hook="categories_header">
+        <th><%= Spree.t(:name) %></th>
+        <th class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @shipping_categories.each do |shipping_category|%>
+      <tr id="<%= spree_dom_id shipping_category %>" data-hook="category_row">
+        <td><%= shipping_category.name %></td>
+        <td class="actions actions-2 text-right">
+          <%= link_to_edit(shipping_category, :no_text => true) if can? :edit, shipping_category %>
+          <%= link_to_delete(shipping_category, :no_text => true) if can? :edit, shipping_category %>
+        </td>
+      </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ShippingCategory)) %>,
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::ShippingCategory %>!
+  </div>
+<% end %>

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

@@ -0,0 +1,13 @@
+<% content_for :page_title do %>
+  <%= link_to Spree.t(:shipping_categories), spree.admin_shipping_categories_url %> /
+  <%= Spree.t(:new_shipping_category) %>
+<% end %>
+
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @shipping_category } %>
+
+<%= form_for [:admin, @shipping_category] do |f| %>
+  <fieldset>
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,119 @@
+<div data-hook="admin_shipping_method_form_fields">
+  <div class="row">
+    <div data-hook="admin_shipping_method_form_name_field" class="col-md-6">
+      <%= f.field_container :name, :class => ['form-group'] do %>
+        <%= f.label :name, Spree.t(:name) %>
+        <%= f.text_field :name, :class => 'form-control' %>
+        <%= f.error_message_on :name %>
+      <% end %>
+    </div>
+
+    <div data-hook="admin_shipping_method_form_display_field" class="col-md-6">
+      <%= f.field_container :display_on, :class => ['form-group'] do %>
+        <%= f.label :display_on, Spree.t(:display) %>
+        <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, { :class => 'select2' }) %>
+        <%= f.error_message_on :display_on %>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="row">
+    <div data-hook="admin_shipping_method_form_internal_name_field" class="col-md-4">
+      <%= f.field_container :admin_name, :class => ['form-group'] do %>
+        <%= f.label :admin_name, Spree.t(:internal_name) %>
+        <%= f.text_field :admin_name, :class => 'form-control', :label => false %>
+        <%= f.error_message_on :admin_name %>
+      <% end %>
+    </div>
+
+    <div data-hook="admin_shipping_method_form_code" class="col-md-4">
+      <%= f.field_container :code, :class => ['form-group'] do %>
+        <%= f.label :code, Spree.t(:code) %>
+        <%= f.text_field :code, :class => 'form-control', :label => false %>
+        <%= f.error_message_on :code %>
+      <% end %>
+    </div>
+
+    <div data-hook="admin_shipping_method_form_tracking_url_field" class="col-md-4">
+      <%= f.field_container :tracking_url, :class => ['form-group'] do %>
+        <%= f.label :tracking_url, Spree.t(:tracking_url) %>
+        <%= f.text_field :tracking_url, :class => 'form-control', :placeholder => Spree.t(:tracking_url_placeholder) %>
+        <%= f.error_message_on :tracking_url %>
+      <% end %>
+    </div>
+  </div>
+</div>
+
+<div class="row">
+  <div data-hook="admin_shipping_method_form_availability_fields" class="col-md-6">
+    <div class="panel panel-default categories">
+      <div class="panel-heading">
+        <h1 class="panel-title">
+          <%= Spree.t(:shipping_categories) %>
+        </h1>
+      </div>
+
+      <div class="panel-body">
+        <%= f.field_container :categories, :class => ['form-group'] do %>
+          <% Spree::ShippingCategory.all.each do |category| %>
+            <div class="checkbox">
+              <%= label_tag do %>
+                <%= check_box_tag('shipping_method[shipping_categories][]', category.id, @shipping_method.shipping_categories.include?(category)) %>
+                <%= category.name %>
+              <% end %>
+            </div>
+          <% end %>
+          <%= f.error_message_on :shipping_category_id %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+
+  <div class="col-md-6">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h1 class="panel-title">
+          <%= Spree.t(:zones) %>
+        </h1>
+      </div>
+
+      <div class="panel-body">
+        <%= f.field_container :zones, :class => ['form-group'] do %>
+          <% shipping_method_zones = @shipping_method.zones.to_a %>
+          <% Spree::Zone.all.each do |zone| %>
+            <div class="checkbox">
+              <%= label_tag do %>
+                <%= check_box_tag('shipping_method[zones][]', zone.id, shipping_method_zones.include?(zone)) %>
+                <%= zone.name %>
+              <% end %>
+            </div>
+          <% end %>
+          <%= f.error_message_on :zone_id %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="row">
+  <div data-hook="admin_shipping_method_form_calculator_fields" class="col-md-6">
+    <%= render :partial => 'spree/admin/shared/calculator_fields', :locals => { :f => f } %>
+  </div>
+
+  <div class="col-md-6">
+    <div class="panel panel-default tax_categories">
+      <div class="panel-heading">
+        <h1 class="panel-title">
+          <%= Spree.t(:tax_category) %>
+        </h1>
+      </div>
+
+      <div class="panel-body">
+        <%= f.field_container :categories, :class => ['form-group'] do %>
+          <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, { include_blank: true }, class: "select2" %>
+          <%= f.error_message_on :tax_category_id %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,17 @@
+<% content_for :page_title do %>
+  <%= link_to Spree.t(:shipping_methods), spree.admin_shipping_methods_url %> /
+  <%= @shipping_method.name %>
+<% end %>
+
+<div data-hook="admin_shipping_method_edit_form_header">
+  <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @shipping_method } %>
+</div>
+
+<div data-hook="admin_shipping_method_edit_form">
+  <%= form_for [:admin, @shipping_method] do |f| %>
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <div data-hook="admin_shipping_method_edit_form_buttons">
+      <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,40 @@
+<% content_for :page_title do %>
+  <%= plural_resource_name(Spree::ShippingMethod) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:new_shipping_method), new_object_url,  :class => "btn-success", :icon => 'add', :id => 'admin_new_shipping_method_link' %>
+<% end if can? :create, Spree::ShippingMethod %>
+
+<% if @shipping_methods.any? %>
+  <table class="table" id='listing_shipping_methods'>
+    <thead>
+      <tr data-hook="admin_shipping_methods_index_headers">
+        <th><%= Spree.t(:name) %></th>
+        <th><%= Spree.t(:zone) %></th>
+        <th><%= Spree.t(:calculator) %></th>
+        <th class="text-center"><%= Spree.t(:display) %></th>
+        <th data-hook="admin_shipping_methods_index_header_actions" class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @shipping_methods.includes(:zones, :calculator).each do |shipping_method|%>
+        <tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows">
+          <td><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td>
+          <td><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>
+          <td><%= shipping_method.calculator.description %></td>
+          <td class="text-center"><%= shipping_method.display_on.blank? ? Spree.t(:both) : Spree.t(shipping_method.display_on) %></td>
+          <td data-hook="admin_shipping_methods_index_row_actions" class="actions actions-2 text-right">
+            <%= link_to_edit(shipping_method, :no_text => true) if can? :edit, shipping_method %>
+            <%= link_to_delete(shipping_method, :no_text => true) if can? :delete, shipping_method %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ShippingMethod)) %>,
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::PaymentMethod %>!
+  </div>
+<% end %>

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

@@ -0,0 +1,20 @@
+<% content_for :page_title do %>
+  <%= link_to Spree.t(:shipping_methods), spree.admin_shipping_methods_url %> /
+  <%= Spree.t(:new_shipping_method) %>
+<% end %>
+
+<div data-hook="admin_shipping_method_new_form_header">
+  <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @shipping_method } %>
+</div>
+
+<div data-hook="admin_shipping_method_new_form">
+  <%= form_for [:admin, @shipping_method] do |f| %>
+    <fieldset>
+      <%= render :partial => 'form', :locals => { :f => f } %>
+
+      <div data-hook="admin_shipping_method_new_form_buttons">
+        <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+      </div>
+    </fieldset>
+  <% end %>
+</div>

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

@@ -0,0 +1,42 @@
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :state_changes } %>
+
+<% content_for :page_title do %>
+  <%= plural_resource_name(Spree::StateChange) %>
+<% end %>
+
+<% if @state_changes.any? %>
+  <table class="table" id="listing_order_state_changes" data-hook>
+    <thead>
+      <tr data-hook="admin_orders_state_changes_headers">
+        <th><%= Spree::StateChange.human_attribute_name(:type) %></th>
+        <th><%= Spree::StateChange.human_attribute_name(:state_from) %></th>
+        <th><%= Spree::StateChange.human_attribute_name(:state_to) %></th>
+        <th><%= Spree::StateChange.human_attribute_name(:user) %></th>
+        <th><%= Spree::StateChange.human_attribute_name(:timestamp) %></th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% @state_changes.each do |state_change| %>
+        <tr>
+          <td><%= Spree.t("state_machine_states.#{state_change.name}") %></td>
+          <td><%= state_change.previous_state ? Spree.t(state_change.previous_state) : Spree.t(:previous_state_missing) %></td>
+          <td><%= Spree.t(state_change.next_state) %></td>
+          <td>
+            <%= link_to state_change.user.login, spree.admin_user_path(state_change.user) if state_change.user %>
+          </td>
+          <td>
+            <%= pretty_time(state_change.created_at) %>
+            <% if state_change.created_at != state_change.updated_at %>
+              <small><%= Spree::StateChange.human_attribute_name(:updated) %>: <%= pretty_time(state_change.updated_at) %></small>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_state_changes) %>
+  </div>
+<% end %>

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

@@ -0,0 +1,15 @@
+<div data-hook="admin_state_form_fields" class="row">
+  <div class="col-md-6">
+    <%= f.field_container :name, class: ['form-group'] do %>
+      <%= f.label :name, Spree.t(:name) %>
+      <%= f.text_field :name, :class => 'form-control' %>
+      <%= f.error_message_on :name %>
+    <% end %>
+  </div>
+  <div class="col-md-6">
+    <%= f.field_container :abbr, class: ['form-group'] do %>
+      <%= f.label :abbr, Spree.t(:abbreviation) %>
+      <%= f.text_field :abbr, :class => 'form-control' %>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/states/_state_list.html.erb

@@ -0,0 +1,26 @@
+<div id="new_state" data-hook></div>
+
+<table class="table" id='listing_states' data-hook>
+  <thead>
+    <tr data-hook="states_header">
+      <th><%= Spree.t(:name) %></th>
+      <th class="text-center"><%= Spree.t(:abbreviation) %></th>
+      <th class="actions"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @states.each do |state| %>
+      <tr id="<%= spree_dom_id state %>" data-hook="states_row">
+        <td><%= state.name %></td>
+        <td class="text-center"><%= state.abbr %></td>
+        <td class="actions actions-2 text-right">
+          <%= link_to_edit(state, :no_text => true) if can? :edit, state %>
+          <%= link_to_delete(state, :no_text => true) if can? :delete, state %>
+        </td>
+      </tr>
+    <% end %>
+    <% if @states.empty? %>
+      <tr><td colspan="3"><%= Spree.t(:none) %></td></tr>
+    <% end %>
+  </tbody>
+</table>