spree_backend 3.1.14 → 3.2.0.rc1

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

@@ -3,13 +3,13 @@
     <div class="col-md-5">
       <%= f.field_container :name, class: ['form-group'] do %>
         <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
-        <%= text_field :taxon, :name, :class => 'form-control' %>
-        <%= f.error_message_on :name, :class => 'error-message' %>
+        <%= text_field :taxon, :name, class: 'form-control' %>
+        <%= f.error_message_on :name, class: 'error-message' %>
       <% end %>
 
       <%= f.field_container :permalink_part, class: ['form-group'] do %>
         <%= f.label :permalink_part, Spree.t(:permalink) %> <span class="required">*</span>
-        <%= text_field_tag :permalink_part, @permalink_part, :class => 'form-control' %>
+        <%= text_field_tag :permalink_part, @permalink_part, class: 'form-control' %>
         <p class="help-block" id="permalink_part_display">
           <%= @taxon.permalink.split('/')[0...-1].join('/') + '/' %>
         </p>
@@ -24,23 +24,23 @@
     <div class="col-md-7">
       <%= f.field_container :description, class: ['form-group'] do %>
         <%= f.label :description, Spree.t(:description) %>
-        <%= f.text_area :description, :class => 'form-control', :rows => 6 %>
+        <%= f.text_area :description, class: 'form-control', rows: 6 %>
       <% end %>
     </div>
   </div>
 
   <%= f.field_container :meta_title, class: ['form-group'] do %>
     <%= f.label :meta_title, Spree.t(:meta_title) %>
-    <%= f.text_field :meta_title, :class => 'form-control', :rows => 6 %>
+    <%= f.text_field :meta_title, class: 'form-control', rows: 6 %>
   <% end %>
 
   <%= f.field_container :meta_description, class: ['form-group'] do %>
     <%= f.label :meta_description, Spree.t(:meta_description) %>
-    <%= f.text_field :meta_description, :class => 'form-control', :rows => 6 %>
+    <%= f.text_field :meta_description, class: 'form-control', rows: 6 %>
   <% end %>
 
   <%= f.field_container :meta_keywords, class: ['form-group'] do %>
     <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
-    <%= f.text_field :meta_keywords, :class => 'form-control', :rows => 6 %>
+    <%= f.text_field :meta_keywords, class: 'form-control', rows: 6 %>
   <% end %>
 </div>

data/app/views/spree/admin/taxons/_taxon_table.html.erb

@@ -12,7 +12,7 @@
         <td><%= taxon.name %></td>
         <td><%= taxon_path taxon %></td>
         <td class="actions">
-          <%= link_to_delete taxon, :url => remove_admin_product_taxon_url(@product, taxon), :name => icon('delete') + ' ' + Spree.t(:remove) %>
+          <%= link_to_delete taxon, url: remove_admin_product_taxon_url(@product, taxon), name: icon('delete') + ' ' + Spree.t(:remove) %>
         </td>
       </tr>
     <% end %>

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

@@ -15,18 +15,3 @@
     <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy), icon: "remove" %>
   </div>
 <% end %>
-
-<% content_for :head do %>
-  <%= javascript_tag do %>
-    $(document).ready(function() {
-      var field  = $('#permalink_part'),
-          target = $('#permalink_part_display'),
-          permalink_part_default = target.text().trim();
-
-      target.text(permalink_part_default + field.val());
-      field.on('keyup blur', function () {
-        target.text(permalink_part_default + $(this).val());
-      });
-    });
-  <% end %>
-<% end %>

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

@@ -9,5 +9,5 @@
 
   <ul id="taxon_products" class="taxon"></ul>
 
-  <%= render :partial => "spree/admin/products/autocomplete", :formats => :js %>
+  <%= render partial: "spree/admin/products/autocomplete", formats: :js %>
 </div>

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

@@ -2,7 +2,7 @@
   <div class="col-md-4" data-hook="analytics_id">
     <%= f.field_container :analytics_id, class: ["form-group"], "data-hook" => "analytics_id" do %>
       <%= f.label :analytics_id, Spree.t(:google_analytics_id) %>
-      <%= f.text_field :analytics_id, :class => 'form-control' %>
+      <%= f.text_field :analytics_id, class: 'form-control' %>
       <%= f.error_message_on :analytics_id %>
     <% end %>
   </div>

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

@@ -3,11 +3,11 @@
   <%= @tracker.analytics_id %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @tracker } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @tracker } %>
 
 <%= form_for [:admin, @tracker] do |f| %>
   <fieldset>
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
   </fieldset>
 <% end %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_tracker), new_object_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_tracker_link' %>
+  <%= button_link_to Spree.t(:new_tracker), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_tracker_link' %>
 <% end if can? :create, Spree::Tracker %>
 
 <% if @trackers.any? %>
@@ -27,8 +27,8 @@
           <td><%= tracker.analytics_id %></td>
           <td class="text-center"><%= tracker.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td class="actions text-right">
-            <%= link_to_edit(tracker, :no_text => true) if can? :edit, tracker %>
-            <%= link_to_delete(tracker, :no_text => true) if can? :delete, tracker %>
+            <%= link_to_edit(tracker, no_text: true) if can? :edit, tracker %>
+            <%= link_to_delete(tracker, no_text: true) if can? :delete, tracker %>
           </td>
         </tr>
       <% end %>

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

@@ -3,11 +3,11 @@
   <%= Spree.t(:new_tracker) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @tracker } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @tracker } %>
 
 <%= form_for [:admin, @tracker] do |f| %>
   <fieldset>
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
   </fieldset>
 <% end %>

data/app/views/spree/admin/users/_addresses_form.html.erb

@@ -10,7 +10,7 @@
       <div class="panel-body">
         <%= f.fields_for :bill_address, (@user.bill_address || Spree::Address.default(@user, "bill")) do |ba_form| %>
           <% ba_form.object ||= Spree::Address.new(country: Spree::Country.new) %>
-          <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :type => "billing" } %>
+          <%= render partial: 'spree/admin/shared/address_form', locals: { f: ba_form, type: "billing" } %>
         <% end %>
       </div>
     </div>
@@ -27,7 +27,7 @@
       <div class="panel-body">
         <%= f.fields_for :ship_address, (@user.ship_address || Spree::Address.default(@user, "ship")) do |sa_form| %>
           <% sa_form.object ||= Spree::Address.new(country: Spree::Country.new) %>
-          <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :type => "shipping" } %>
+          <%= render partial: 'spree/admin/shared/address_form', locals: { f: sa_form, type: "shipping" } %>
         <% end %>
       </div>
     </div>

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

@@ -2,7 +2,7 @@
   <div class="col-md-6">
     <%= f.field_container :email, class: ['form-group'] do %>
       <%= f.label :email, Spree.t(:email) %>
-      <%= f.email_field :email, :class => 'form-control' %>
+      <%= f.email_field :email, class: 'form-control' %>
       <%= f.error_message_on :email %>
     <% end %>
 
@@ -23,13 +23,13 @@
   <div data-hook="admin_user_form_password_fields" class="col-md-6">
     <%= f.field_container :password, class: ['form-group'] do %>
       <%= f.label :password, Spree.t(:password) %>
-      <%= f.password_field :password, :class => 'form-control' %>
+      <%= f.password_field :password, class: 'form-control' %>
       <%= f.error_message_on :password %>
     <% end %>
 
     <%= f.field_container :password_confirmation, class: ['form-group'] do %>
       <%= f.label :password_confirmation, Spree.t(:confirm_password) %>
-      <%= f.password_field :password_confirmation, :class => 'form-control' %>
+      <%= f.password_field :password_confirmation, class: 'form-control' %>
       <%= f.error_message_on :password_confirmation %>
     <% end %>
   </div>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_user), new_admin_user_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_user_link' %>
+  <%= button_link_to Spree.t(:new_user), new_admin_user_url, class: "btn-success", icon: 'add', id: 'admin_new_user_link' %>
 <% end %>
 
 <% content_for :table_filter_title do %>
@@ -21,19 +21,19 @@
         <div class="col-md-6">
           <div class="form-group">
             <%= f.label Spree.t(:first_name) %>
-            <%= f.text_field :bill_address_firstname_cont, :class => 'form-control' %>
+            <%= f.text_field :bill_address_firstname_cont, class: 'form-control' %>
           </div>
         </div>
         <div class="col-md-6">
           <div class="form-group">
             <%= f.label Spree.t(:last_name) %>
-            <%= f.text_field :bill_address_lastname_cont, :class => 'form-control' %>
+            <%= f.text_field :bill_address_lastname_cont, class: 'form-control' %>
           </div>
         </div>
       </div>
       <div class="form-group">
         <%= f.label Spree.t(:company) %>
-        <%= f.text_field :bill_address_company_cont, :class => 'form-control' %>
+        <%= f.text_field :bill_address_company_cont, class: 'form-control' %>
       </div>
       <div data-hook="admin_users_index_search_buttons" class="form-actions">
         <%= button Spree.t(:search), 'search' %>
@@ -46,7 +46,7 @@
   <thead>
     <tr data-hook="admin_users_index_headers">
       <th>
-        <%= sort_link @search,:email, Spree.t(:user), {}, {:title => 'users_email_title'} %>
+        <%= sort_link @search,:email, Spree.t(:user), {}, {title: 'users_email_title'} %>
       </th>
       <th data-hook="admin_users_index_header_actions" class="actions"></th>
     </tr>
@@ -56,8 +56,8 @@
       <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">
         <td class='user_email'><%=link_to user.email, edit_admin_user_url(user) %></td>
         <td data-hook="admin_users_index_row_actions" class="actions actions-2 text-right">
-          <%= link_to_edit user, :no_text => true %>
-          <%= link_to_delete user, :no_text => true %>
+          <%= link_to_edit user, no_text: true %>
+          <%= link_to_delete user, no_text: true %>
         </td>
       </tr>
     <% end %>

data/app/views/spree/admin/users/items.html.erb

@@ -30,8 +30,8 @@
                 <%= mini_image(item.variant) %>
               </td>
               <td class="item-name">
-                <%= item.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
-                <% if item.variant.sku.present? %>
+                <%= item.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
+                <% if item.sku.present? %>
                   <strong><%= Spree.t(:sku) %>:</strong> <%= item.variant.sku %>
                 <% end %>
               </td>

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

@@ -4,15 +4,15 @@
 <% end %>
 
 <div data-hook="admin_user_new_form_header">
-  <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @user } %>
+  <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @user } %>
 </div>
 
 <div data-hook="admin_user_new_form">
   <%= form_for [:admin, @user], url: spree.admin_users_url, method: :post do |f| %>
-    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render partial: 'form', locals: { f: f } %>
 
     <div data-hook="admin_user_new_form_buttons">
-      <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+      <%= render partial: 'spree/admin/shared/new_resource_links' %>
     </div>
   <% end %>
 </div>

data/app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb

@@ -13,21 +13,38 @@
       <tr>
         <td>{{variant.name}}</td>
         {{#if variant.track_inventory}}
-          {{#if variant.total_on_hand}}
-            <td class="text-center">{{variant.total_on_hand}}</td>
+          {{#if variant.is_orderable}}
+            <td class="text-center">
+              {{variant.total_on_hand}}
+            </td>
+
             <td class="text-center">
               <input class="quantity form-control" id="variant_quantity" data-variant-id="{{variant.id}}" type="number" min="1" value="1">
             </td>
             <td class="actions actions-1 text-center">
               <button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
                 <span class="icon icon-add"></span>
-                </button>
+              </button>
             </td>
           {{else}}
-            <td class="text-center"><%= Spree.t(:out_of_stock) %></td>
-            <td class="text-center">0</td>
-            <td></td>
-            <td></td>
+            {{#if variant.is_backorderable}}
+              <td class="text-center">
+                {{variant.total_on_hand}} (<%= Spree.t(:backorders_allowed) %>)
+              </td>
+
+              <td class="text-center">
+                <input class="quantity form-control" id="variant_quantity" data-variant-id="{{variant.id}}" type="number" min="1" value="1">
+              </td>
+              <td class="actions actions-1 text-center">
+                <button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                  <span class="icon icon-add"></span>
+                </button>
+              </td>
+            {{else}}
+              <td class="text-center"><%= Spree.t(:out_of_stock) %></td>
+              <td class="text-center">0</td>
+              <td></td>
+            {{/if}}
           {{/if}}
         {{else}}
           <td class="text-center"><%= Spree.t(:doesnt_track_inventory) %></td>

data/app/views/spree/admin/variants/_autocomplete_stock.js.erb

@@ -39,6 +39,7 @@
             {{else}}
               <td><%= Spree.t(:out_of_stock) %></td>
               <td>0</td>
+              <td></td>
             {{/if}}
           {{/unless}}
         </tr>

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

@@ -5,28 +5,28 @@
         <div class="form-group" data-hook="presentation">
           <%= label :new_variant, option_type.presentation %>
           <%= f.collection_select 'option_value_ids', option_type.option_values, :id, :presentation,
-            { :include_blank => true }, { :name => 'variant[option_value_ids][]', :class => 'select2' } %>
+            { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2' } %>
         </div>
       <% end %>
 
       <div class="form-group" data-hook="sku">
         <%= f.label :sku, Spree.t(:sku) %>
-        <%= f.text_field :sku, :class => 'form-control' %>
+        <%= f.text_field :sku, class: 'form-control' %>
       </div>
 
       <div class="form-group" data-hook="price">
         <%= f.label :price, Spree.t(:price) %>
-        <%= f.text_field :price, :value => number_to_currency(@variant.price, :unit => ''), :class => 'form-control' %>
+        <%= f.text_field :price, value: number_to_currency(@variant.price, unit: ''), class: 'form-control' %>
       </div>
 
       <div class="form-group" data-hook="cost_price">
         <%= f.label :cost_price, Spree.t(:cost_price) %>
-        <%= f.text_field :cost_price, :value => number_to_currency(@variant.cost_price, :unit => ''), :class => 'form-control' %>
+        <%= f.text_field :cost_price, value: number_to_currency(@variant.cost_price, unit: ''), class: 'form-control' %>
       </div>
 
       <div class="form-group" data-hook="tax_category">
         <%= f.label :tax_category_id, Spree.t(:tax_category) %>
-        <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
+        <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
       </div>
 
       <div class="form-group" data-hook="discontinue_on">
@@ -41,8 +41,8 @@
   <div class="col-md-6" data-hook="admin_variant_form_additional_fields">
     <% [:weight, :height, :width, :depth].each do |field| %>
       <div class="form-group" data-hook="<%= field %>"><%= f.label field, Spree.t(field) %>
-        <% value = number_with_precision(@variant.send(field), :precision => 2) %>
-        <%= f.text_field field, :value => value, :class => 'form-control' %>
+        <% value = number_with_precision(@variant.send(field), precision: 2) %>
+        <%= f.text_field field, value: value, class: 'form-control' %>
       </div>
     <% end %>
   </div>

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

@@ -1,11 +1,11 @@
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @variant } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @variant } %>
 
 <%= form_for [:admin, @product, @variant] do |f| %>
   <div class="well">
     <fieldset data-hook="admin_variant_new_form">
       <legend><%= Spree.t(:new_variant) %></legend>
-      <%= render :partial => 'form', :locals => { :f => f } %>
-      <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+      <%= render partial: 'form', locals: { f: f } %>
+      <%= render partial: 'spree/admin/shared/new_resource_links' %>
     </fieldset>
   </div>
 <% end %>

data/app/views/spree/admin/zones/_country_members.html.erb

@@ -9,7 +9,7 @@
     <div class="panel-body">
       <%= zone_form.field_container :country_ids, class: ['form-group'] do %>
         <%= zone_form.label :country_ids, Spree.t(:countries) %>
-        <%= zone_form.collection_select :country_ids, @countries, :id, :name, {}, { :multiple => true, :class => "select2" } %>
+        <%= zone_form.collection_select :country_ids, @countries, :id, :name, {}, { multiple: true, class: "select2" } %>
       <% end %>
     </div>
   </div>  

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

@@ -8,13 +8,13 @@
       <div class="panel-body">
         <%= zone_form.field_container :name, class: ['form-group'] do %>
           <%= zone_form.label :name, Spree.t(:name) %>
-          <%= zone_form.text_field :name, :class => 'form-control' %>
+          <%= zone_form.text_field :name, class: 'form-control' %>
           <%= zone_form.error_message_on :name %>
         <% end %>
 
         <%= zone_form.field_container :description, class: ['form-group'] do %>
           <%= zone_form.label :description, Spree.t(:description) %>
-          <%= zone_form.text_field :description, :class => 'form-control' %>
+          <%= zone_form.text_field :description, class: 'form-control' %>
         <% end %>
 
         <div data-hook="default" class="checkbox">
@@ -28,13 +28,13 @@
           <strong><%= Spree.t(:type) %></strong>
           <div class="radio">
             <%= label_tag :country_based do %>
-              <%= zone_form.radio_button('kind', 'country', { :id => 'country_based' }) %>
+              <%= zone_form.radio_button('kind', 'country', { id: 'country_based' }) %>
               <%= Spree.t(:country_based) %>
             <% end %>
           </div>
           <div class="radio">
             <%= label_tag :state_based do %>
-              <%= zone_form.radio_button('kind', 'state', { :id => 'state_based' }) %>
+              <%= zone_form.radio_button('kind', 'state', { id: 'state_based' }) %>
               <%= Spree.t(:state_based) %>
             <% end %>
           </div>
@@ -43,7 +43,7 @@
     </div>
   </div>
   <div class="col-md-6">
-    <%= render :partial => 'state_members', :locals => { :zone_form => zone_form }%>
-    <%= render :partial => 'country_members', :locals => { :zone_form => zone_form } %>
+    <%= render partial: 'state_members', locals: { zone_form: zone_form }%>
+    <%= render partial: 'country_members', locals: { zone_form: zone_form } %>
   </div>
 </div>

data/app/views/spree/admin/zones/_state_members.html.erb

@@ -9,7 +9,7 @@
     <div class="panel-body">
       <%= zone_form.field_container :state_ids, class: ['form-group'] do %>
         <%= zone_form.label :state_ids, Spree.t(:states) %>
-        <%= zone_form.collection_select :state_ids, @states, :id, :name, {}, { :multiple => true, :class => "select2" } %>
+        <%= zone_form.collection_select :state_ids, @states, :id, :name, {}, { multiple: true, class: "select2" } %>
       <% end %>
     </div>
   </div>

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

@@ -3,10 +3,10 @@
   <%= @zone.name %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @zone } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @zone } %>
 
 <%= form_for [:admin, @zone] do |zone_form| %>
-  <%= render :partial => 'form', :locals => { :zone_form => zone_form } %>
+  <%= render partial: 'form', locals: { zone_form: zone_form } %>
 
-  <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+  <%= render partial: 'spree/admin/shared/edit_resource_links' %>
 <% end %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_zone), new_object_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_zone_link' %>
+  <%= button_link_to Spree.t(:new_zone), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_zone_link' %>
 <% end if can? :create, Spree::Zone %>
 
 <%= paginate @zones %>
@@ -12,9 +12,9 @@
   <table class="table" id='listing_zones' data-hook>
     <thead>
       <tr data-hook="zones_header">
-        <th><%= sort_link @search,:name, Spree.t(:name), :title => 'zones_order_by_name_title' %></th>
+        <th><%= sort_link @search,:name, Spree.t(:name), title: 'zones_order_by_name_title' %></th>
         <th>
-          <%= sort_link @search,:description, Spree.t(:description), {}, {:title => 'zones_order_by_description_title'} %>
+          <%= sort_link @search,:description, Spree.t(:description), {}, {title: 'zones_order_by_description_title'} %>
         </th>
         <th><%= Spree.t(:default_tax_zone) %></th>
         <th class="actions"></th>
@@ -27,8 +27,8 @@
           <td><%= zone.description %></td>
           <td><%= zone.default_tax? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td class="actions actions-2 text-right">
-            <%= link_to_edit(zone, :no_text => true) if can? :edit, zone %>
-            <%= link_to_delete(zone, :no_text => true) if can? :delete, zone %>
+            <%= link_to_edit(zone, no_text: true) if can? :edit, zone %>
+            <%= link_to_delete(zone, no_text: true) if can? :delete, zone %>
           </td>
         </tr>
       <% end %>

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

@@ -3,9 +3,9 @@
   <%= Spree.t(:new_zone) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @zone } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @zone } %>
 
 <%= form_for [:admin, @zone] do |zone_form| %>
-  <%= render :partial => 'form', :locals => { :zone_form => zone_form } %>  
-  <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+  <%= render partial: 'form', locals: { zone_form: zone_form } %>  
+  <%= render partial: 'spree/admin/shared/new_resource_links' %>
 <% end %>

data/config/routes.rb

@@ -1,8 +1,5 @@
 Spree::Core::Engine.add_routes do
   namespace :admin, path: Spree.admin_path do
-    get '/search/users', to: "search#users", as: :search_users
-    get '/search/products', to: "search#products", as: :search_products
-
     resources :promotions do
       resources :promotion_rules
       resources :promotion_actions
@@ -41,8 +38,6 @@ Spree::Core::Engine.add_routes do
       resources :variants_including_master, only: [:update]
     end
 
-    get '/variants/search', to: "variants#search", as: :search_variants
-
     resources :option_types do
       collection do
         post :update_positions
@@ -130,11 +125,7 @@ Spree::Core::Engine.add_routes do
       resources :taxons
     end
 
-    resources :taxons, only: [:index, :show] do
-      collection do
-        get :search
-      end
-    end
+    resources :taxons, only: [:index, :show]
 
     resources :reports, only: [:index] do
       collection do
@@ -143,7 +134,7 @@ Spree::Core::Engine.add_routes do
       end
     end
 
-    resources :reimbursement_types, only: [:index]
+    resources :reimbursement_types
     resources :refund_reasons, except: :show
     resources :return_authorization_reasons, except: :show
 
@@ -181,5 +172,6 @@ Spree::Core::Engine.add_routes do
     end
   end
 
-  get Spree.admin_path, to: 'admin/root#index', as: :admin
+  spree_path = Rails.application.routes.url_helpers.try(:spree_path, trailing_slash: true) || '/'
+  get Spree.admin_path, to: redirect((spree_path + Spree.admin_path + '/orders').gsub('//', '/')), as: :admin
 end

data/lib/spree/backend/engine.rb

@@ -3,7 +3,7 @@ module Spree
     class Engine < ::Rails::Engine
       config.middleware.use "Spree::Backend::Middleware::SeoAssist"
 
-      initializer "spree.backend.environment", :before => :load_config_initializers do |app|
+      initializer "spree.backend.environment", before: :load_config_initializers do |app|
         Spree::Backend::Config = Spree::BackendConfiguration.new
       end
 
@@ -13,20 +13,16 @@ module Spree
       end
 
       # sets the manifests / assets to be precompiled, even when initialize_on_precompile is false
-      initializer "spree.assets.precompile", :group => :all do |app|
+      initializer "spree.assets.precompile", group: :all do |app|
         app.config.assets.paths << "#{Rails.root}/app/assets/fonts"
         app.config.assets.precompile << /\.(?:svg|eot|woff|ttf)$/
 
         app.config.assets.precompile += %w[
           spree/backend/all*
-          spree/backend/orders/edit_form.js
           spree/backend/address_states.js
-          jqPlot/excanvas.min.js
-          spree/backend/images/new.js
           jquery.jstree/themes/spree/*
           fontawesome-webfont*
           select2_locale*
-          jquery.alerts/images/*
         ]
       end
     end