solidus_backend 1.3.2 → 1.4.0.beta1

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

@@ -1,6 +1,6 @@
-<% content_for :page_title do %>
-  <%= link_to "#{Spree.t(:editing_user)} #{@user.email}", edit_admin_user_url(@user) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::LegacyUser), spree.admin_users_path) %>
+<% admin_breadcrumb(@user.email) %>
+
 
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :account %>
@@ -36,11 +36,11 @@
       </div>
       <div class="filter-actions actions">
         <%= form_tag spree.clear_api_key_admin_user_path(@user), :method => :put do %>
-          <%= button Spree.t('clear_key', :scope => 'api'), 'trash' %>
+          <%= button Spree.t('clear_key', :scope => 'api') %>
         <% end %>
 
         <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
-          <%= button Spree.t('regenerate_key', :scope => 'api'), 'refresh' %>
+          <%= button Spree.t('regenerate_key', :scope => 'api') %>
         <% end %>
       </div>
 
@@ -50,7 +50,7 @@
 
       <div class="filter-actions actions">
         <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
-          <%= button Spree.t('generate_key', :scope => 'api'), 'key' %>
+          <%= button Spree.t('generate_key', :scope => 'api') %>
         <% end %>
       </div>
     <% end %>

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

@@ -1,11 +1,10 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:listing_users) %>
-<% end %>
+<% admin_breadcrumb(plural_resource_name(Spree::LegacyUser)) %>
+
 
 <% content_for :page_actions do %>
   <% if can?(:admin, Spree.user_class) && can?(:create, Spree.user_class) %>
     <li>
-      <%= button_link_to Spree.t(:new_user), new_admin_user_url, :icon => 'plus', :id => 'admin_new_user_link' %>
+      <%= button_link_to Spree.t(:new_user), new_admin_user_url, :id => 'admin_new_user_link' %>
     </li>
   <% end %>
 <% end %>
@@ -52,7 +51,7 @@
         <%= f.text_field :email_cont, :class => 'fullwidth' %>
       </div>
       <div data-hook="admin_users_index_search_buttons">
-        <%= button Spree.t(:search), 'search' %>
+        <%= button Spree.t(:search) %>
       </div>
     <% end %>
   </div>

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

@@ -1,6 +1,7 @@
-<% content_for :page_title do %>
-  <%= link_to "#{Spree.t(:"admin.user.items_purchased")} #{@user.email}", edit_admin_user_url(@user) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::LegacyUser), spree.admin_users_path) %>
+<% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
+<% admin_breadcrumb(Spree.t('admin.user.items_purchased')) %>
+
 
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :items %>

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

@@ -1,12 +1,5 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:new_user) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_users_list), spree.admin_users_path, :icon => 'arrow-left' %>
-  </li>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::LegacyUser), spree.admin_users_path) %>
+<% admin_breadcrumb(Spree.t(:new_user)) %>
 
 <div data-hook="admin_user_new_form_header">
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>

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

@@ -1,6 +1,7 @@
-<% content_for :page_title do %>
-  <%= link_to "#{Spree.t(:"admin.user.order_history")} #{@user.email}", edit_admin_user_url(@user) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::LegacyUser), spree.admin_users_path) %>
+<% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
+<% admin_breadcrumb(Spree.t('admin.user.order_history')) %>
+
 
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :orders %>

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

@@ -64,6 +64,7 @@
 
     <div class="field four columns omega" data-hook="tax_category">
       <%= f.label :tax_category %>
+      <%= f.field_hint :tax_category %>
       <%= f.collection_select :tax_category_id,
                               @tax_categories,
                               :id,

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

@@ -1,11 +1,12 @@
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Variants' } %>
 
-<% content_for :page_title do %>
-  &#x2f; <%= @variant.options_text %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Variant), admin_product_variants_path(@product)) %>
+<% admin_breadcrumb(@variant.options_text) %>
+
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @variant } %>
 
+
 <%= form_for [:admin, @product, @variant] do |f| %>
   <fieldset>
     <legend><%= t('.edit_variant') %></legend>

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

@@ -1,5 +1,8 @@
 <%= render 'spree/admin/shared/product_tabs', current: 'Variants' %>
 
+<% admin_breadcrumb(plural_resource_name(Spree::Variant)) %>
+
+
 <% if @variants.any? || @product.variants.only_deleted.any?%>
   <%= render "table_filter", product: @product %>
   <%= render "table", variants: @variants %>
@@ -8,9 +11,9 @@
     <p class='first_add_option_types no-objects-found' data-hook="first_add_option_types">
       <%= Spree.t(:to_add_variants_you_must_first_define) %>
       <% if can?(:display, Spree::OptionType) %>
-        <%= link_to Spree::OptionType.model_name.human(count: :other), admin_option_types_path%>
+        <%= link_to plural_resource_name(Spree::OptionType), admin_option_types_path%>
       <% else %>
-        <%= Spree::OptionType.model_name.human(count: :other) %>
+        <%= plural_resource_name(Spree::OptionType) %>
       <% end %>
     </p>
   <% elsif @product.empty_option_values? %>
@@ -20,7 +23,7 @@
     </div>
   <% else %>
     <div class="alpha twelve columns no-objects-found">
-      <%= Spree.t(:no_resource, resource: Spree::Variant.model_name.human(count: :other)) %>
+      <%= Spree.t(:no_resource, resource: plural_resource_name(Spree::Variant)) %>
       <% if can? :create, Spree::Variant %>
         <%= link_to Spree.t(:create_one), new_object_url, remote: true %>
       <% end %>
@@ -33,11 +36,10 @@
     <ul class="inline-menu" data-hook="toolbar">
       <% if can?(:create, Spree::Variant) %>
         <li id="new_var_link" data-hook>
-          <%= link_to_with_icon 'plus',
-                                Spree.t(:new_variant),
-                                new_admin_product_variant_url(@product),
-                                :remote => :true,
-                                :class => 'button' %>
+          <%= link_to Spree.t(:new_variant),
+                      new_admin_product_variant_url(@product),
+                      remote: :true,
+                      class: 'button' %>
         </li>
       <% end %>
     </ul>

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

@@ -1,5 +1,10 @@
+<%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Variants' } %>
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @variant } %>
 
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Variant), admin_product_variants_path(@product)) %>
+<% admin_breadcrumb(Spree.t(:new_variant)) %>
+
+
 <%= form_for [:admin, @product, @variant] do |f| %>
   <fieldset data-hook="admin_variant_new_form">
     <legend><%= t('.new_variant') %></legend>

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

@@ -1,9 +1,9 @@
 <div id="country_members" data-hook="member" class="omega six columns">
   <fieldset class="no-border-bottom">
-    <legend align="center"><%= Spree::Country.model_name.human(count: :other) %></legend>
+    <legend align="center"><%= plural_resource_name(Spree::Country) %></legend>
 
     <%= zone_form.field_container :country_ids do %>
-      <%= zone_form.label :country_ids, Spree::Country.model_name.human(count: :other) %><br>
+      <%= zone_form.label :country_ids, plural_resource_name(Spree::Country) %><br>
       <%= zone_form.collection_select :country_ids, @countries, :id, :name, {}, { :multiple => true, :class => "select2 fullwidth" } %>
     <% end %>
   </fieldset>

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

@@ -1,9 +1,9 @@
 <div id="state_members" data-hook="member" class="omega six columns">
   <fieldset class="no-border-bottom">
-    <legend align="center"><%= Spree::State.model_name.human(count: :other) %></legend>
+    <legend align="center"><%= plural_resource_name(Spree::State) %></legend>
 
     <%= zone_form.field_container :state_ids do %>
-      <%= zone_form.label :state_ids, Spree::State.model_name.human(count: :other) %><br>
+      <%= zone_form.label :state_ids, plural_resource_name(Spree::State) %><br>
       <%= zone_form.collection_select :state_ids, @states, :id, :name, {}, { :multiple => true, :class => "select2 fullwidth" } %>
     <% end %>
   </fieldset>

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

@@ -1,13 +1,12 @@
 <%= render 'spree/admin/shared/areas_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:editing_zone) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.areas')) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Zone), spree.admin_zones_path) %>
+<% admin_breadcrumb(@zone.name) %>
+
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_zones_list), admin_zones_path, :icon => 'arrow-left' %>
-  </li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @zone } %>

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

@@ -1,13 +1,14 @@
 <%= render 'spree/admin/shared/areas_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree::Zone.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.areas')) %>
+<% admin_breadcrumb(plural_resource_name(Spree::Zone)) %>
+
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Zone) %>
     <li>
-      <%= button_link_to Spree.t(:new_zone), new_object_url, :icon => 'plus', :id => 'admin_new_zone_link' %>
+      <%= button_link_to Spree.t(:new_zone), new_object_url, :id => 'admin_new_zone_link' %>
     </li>
   <% end %>
 <% end %>

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

@@ -1,13 +1,12 @@
 <%= render 'spree/admin/shared/areas_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:new_zone) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.areas')) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Zone), spree.admin_zones_path) %>
+<% admin_breadcrumb(Spree.t(:new_zone)) %>
+
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_zones_list), spree.admin_zones_path, :icon => 'arrow-left' %>
-  </li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @zone } %>
@@ -16,6 +15,6 @@
   <%= render :partial => 'form', :locals => { :zone_form => zone_form } %>
 
   <div class="clear"></div>
-  
+
   <%= render :partial => 'spree/admin/shared/new_resource_links' %>
 <% end %>

data/app/views/spree/layouts/admin.html.erb

@@ -4,30 +4,43 @@
     <%= render 'spree/admin/shared/head' %>
   </head>
 
-  <body class="admin">
+  <body class="admin <%= "new-layout" if @admin_layout %>">
     <%= render "spree/admin/shared/navigation" %>
     <%= render "spree/admin/shared/header" %>
     <%= render "spree/admin/shared/flash" %>
     <%= render "spree/admin/shared/spinner" %>
 
-    <div class="main-content" id="wrapper" data-hook>
-      <div class="container">
-        <div class="row">
-          <div class="<%= 'with-sidebar ' if content_for?(:sidebar) %>" id="content" data-hook>
-            <% if content_for?(:tabs) %>
-              <div class="sixteen columns">
-                <%= yield :tabs %>
+    <div class="content-wrapper <%= @admin_layout.presence %> <%= "has-sidebar" if content_for?(:sidebar) %>" id="wrapper" data-hook>
+      <% if @admin_layout %>
+        <div class="content">
+          <div class="content-main">
+            <%= yield :tabs %>
+            <%= render "spree/admin/shared/table_filter" %>
+            <%= yield %>
+          </div>
+
+          <%= render "spree/admin/shared/sidebar" %>
+        </div>
+      <% else %>
+        <% # Legacy layout %>
+        <div class="container">
+          <div class="row">
+            <div class="<%= 'with-sidebar ' if content_for?(:sidebar) %>" id="content" data-hook>
+              <% if content_for?(:tabs) %>
+                <div class="sixteen columns">
+                  <%= yield :tabs %>
+                </div>
+              <% end %>
+              <div class="js-content-below-tabs <%= if content_for?(:sidebar) then 'twelve' else 'sixteen' end %> columns">
+                <%= render :partial => 'spree/admin/shared/table_filter' %>
+                <%= yield %>
               </div>
-            <% end %>
-            <div class="js-content-below-tabs <%= if content_for?(:sidebar) then 'twelve' else 'sixteen' end %> columns">
-              <%= render :partial => 'spree/admin/shared/table_filter' %>
-              <%= yield %>
-            </div>
 
-            <%= render 'spree/admin/shared/sidebar' %>
+              <%= render 'spree/admin/shared/sidebar' %>
+            </div>
           </div>
         </div>
-      </div>
+      <% end %>
     </div>
 
     <div data-hook="admin_footer_scripts"></div>

data/config/initializers/form_builder.rb

@@ -9,6 +9,12 @@ class ActionView::Helpers::FormBuilder
   def error_message_on(method, options = {})
     @template.error_message_on(@object_name, method, objectify_options(options))
   end
+
+  def field_hint(method, options = {})
+    title = options[:title] || @object.class.human_attribute_name(method)
+    text = options[:text] || I18n.t(method, scope: [:spree, :hints, @object.class.model_name.i18n_key])
+    @template.admin_hint(title, text)
+  end
 end
 
 ActionView::Base.field_error_proc = proc{ |html_tag, _instance| "<span class=\"field_with_errors\">#{html_tag}</span>".html_safe }

data/config/routes.rb

@@ -1,4 +1,4 @@
-Spree::Core::Engine.add_routes do
+Spree::Core::Engine.routes.draw do
   namespace :admin do
     get '/search/users', to: "search#users", as: :search_users
     get '/search/products', to: "search#products", as: :search_products
@@ -130,11 +130,7 @@ Spree::Core::Engine.add_routes do
       end
     end
 
-    resource :general_settings, only: [:edit, :update] do
-      collection do
-        post :clear_cache
-      end
-    end
+    resource :general_settings, only: [:edit, :update]
 
     resources :return_items, only: [:update]
 

data/spec/controllers/spree/admin/cancellations_controller_spec.rb

@@ -4,7 +4,7 @@ describe Spree::Admin::CancellationsController do
   stub_authorization!
 
   describe "#index" do
-    subject { spree_get :index, order_id: order.number }
+    subject { get :index, order_id: order.number }
 
     let(:order) { create(:order_ready_to_ship, line_items_count: 1) }
 
@@ -18,13 +18,13 @@ describe Spree::Admin::CancellationsController do
   end
 
   describe "#cancel" do
-    subject { spree_post :short_ship, order_id: order.number, inventory_unit_ids: inventory_units.map(&:id) }
+    subject { post :short_ship, order_id: order.number, inventory_unit_ids: inventory_units.map(&:id) }
 
     let(:order) { create(:order_ready_to_ship, number: "R100", state: "complete", line_items_count: 1) }
     let(:referer) { "order_admin_page" }
 
     context "no inventory unit ids are provided" do
-      subject { spree_post :short_ship, order_id: order.number }
+      subject { post :short_ship, order_id: order.number }
 
       it "redirects back" do
         subject

data/spec/controllers/spree/admin/customer_returns_controller_spec.rb

@@ -10,7 +10,7 @@ module Spree
         let(:customer_return) { create(:customer_return) }
 
         subject do
-          spree_get :index, { order_id: customer_return.order.to_param }
+          get :index, { order_id: customer_return.order.to_param }
         end
 
         before { subject }
@@ -31,7 +31,7 @@ module Spree
         let!(:second_active_reimbursement_type) { create(:reimbursement_type) }
 
         subject do
-          spree_get :new, { order_id: order.to_param }
+          get :new, { order_id: order.to_param }
         end
 
         it "loads the order" do
@@ -126,7 +126,7 @@ module Spree
         let!(:manual_intervention_return_item) { customer_return.return_items.order('id').third.tap(&:require_manual_intervention!) }
 
         subject do
-          spree_get :edit, { order_id: order.to_param, id: customer_return.to_param }
+          get :edit, { order_id: order.to_param, id: customer_return.to_param }
         end
 
         it "loads the order" do
@@ -202,7 +202,7 @@ module Spree
           }
         end
 
-        subject { spree_post :create, customer_return_params }
+        subject { post :create, customer_return_params }
 
         it { expect { subject }.to change { Spree::CustomerReturn.count }.by(1) }
         it do

data/spec/controllers/spree/admin/missing_products_controller_spec.rb

@@ -9,7 +9,7 @@ describe Spree::Admin::ProductsController, type: :controller do
 
   # Regression test for GH https://github.com/spree/spree/issues/538
   it "cannot find a non-existent product" do
-    spree_get :edit, id: "non-existent-product"
+    get :edit, id: "non-existent-product"
     expect(response).to redirect_to(spree.admin_products_path)
     expect(flash[:error]).to eql("Product is not found")
   end

data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb

@@ -15,13 +15,13 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
         expect(order).to receive(:update_attributes) { true }
         expect(order).to receive(:next) { false }
         attributes = { order_id: order.number, order: { email: "" } }
-        spree_put :update, attributes
+        put :update, attributes
       end
 
       it "does refresh the shipment rates with all shipping methods" do
         expect(order).to receive(:refresh_shipment_rates)
         attributes = { order_id: order.number, order: { email: "" } }
-        spree_put :update, attributes
+        put :update, attributes
       end
 
       # Regression spec
@@ -37,7 +37,7 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
         end
 
         it 'allows the updating of an email address' do
-          expect { spree_put :update, attributes }.to change { order.reload.email }.to eq 'foo@bar.com'
+          expect { put :update, attributes }.to change { order.reload.email }.to eq 'foo@bar.com'
           expect(response).to be_redirect
         end
       end
@@ -53,7 +53,7 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
           }
 
           expect {
-            spree_put :update, attributes
+            put :update, attributes
           }.to change{ order.reload.user }.to(assigned_user)
         end
       end
@@ -70,7 +70,7 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
           }
 
           expect {
-            spree_put :update, attributes
+            put :update, attributes
           }.not_to change{ order.reload.user }
         end
       end