solidus_backend 2.3.1 → 2.4.0.beta1

data/app/views/spree/admin/style_guide/topics/components/_pills.html.erb

@@ -0,0 +1,101 @@
+<p>
+  Pills are useful for showing statuses as an admin can get a better idea of the
+  state of the object by the color alone. These are most effective in a table,
+  as displayed below, but can also be used in other areas of the system where
+  appropriate.
+</p>
+
+<%- snippet = capture do %>
+  <span class="pill pill-complete">Complete</span>
+  <span class="pill pill-active">Active</span>
+  <span class="pill pill-inactive">Inactive</span>
+  <span class="pill pill-pending">Pending</span>
+  <span class="pill pill-warning">Warning</span>
+  <span class="pill pill-error">Error</span>
+<%- end %>
+
+<div class="style-guide-result half">
+  <%= snippet %>
+</div>
+
+<div class="style-guide-code half">
+  <pre><code class="language-html"><%= escape_once snippet %></code></pre>
+</div>
+
+<div class="style-guide-result">
+  <h3>Orders</h3>
+
+  <table>
+    <thead>
+      <th>Date</th>
+      <th>Number</th>
+      <th>Payments</th>
+      <th>Shipments</th>
+      <th>Customer</th>
+      <th>Total</th>
+    </thead>
+    <tbody>
+      <tr>
+        <td>July 18, 2017</td>
+        <td>R1234</td>
+        <td><span class="pill pill-complete">Paid</span></td>
+        <td><span class="pill pill-complete">Shipped</span></td>
+        <td><a href="#">lauren@example.com</a></td>
+        <td>$75.00</td>
+      </tr>
+      <tr>
+        <td>July 17, 2017</td>
+        <td>R1234</td>
+        <td><span class="pill pill-pending">Balance Due</span></td>
+        <td><span class="pill pill-pending">Pending</span></td>
+        <td><a href="#">jessicajones@example.com</a></td>
+        <td>$105.00</td>
+      </tr>
+      <tr>
+        <td>July 15, 2017</td>
+        <td>R1234</td>
+        <td><span class="pill pill-warning">Credit Owed</span></td>
+        <td><span class="pill pill-pending">Ready</span></td>
+        <td><a href="#">john@example.com</a></td>
+        <td>$34.00</td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+<div class="style-guide-result">
+  <h3>Promotions</h3>
+
+  <table>
+    <thead>
+      <th>Code</th>
+      <th>Status</th>
+      <th>Used</th>
+      <th>Start</th>
+      <th>End</th>
+    </thead>
+    <tbody>
+      <tr>
+        <td>FALL2017</td>
+        <td><span class="pill pill-inactive">Inactive</span></td>
+        <td>0</td>
+        <td>September 1, 2017</td>
+        <td>–</td>
+      </tr>
+      <tr>
+        <td>SAVE_20</td>
+        <td><span class="pill pill-active">Active</span></td>
+        <td>651</td>
+        <td>June 20, 2016</td>
+        <td>–</td>
+      </tr>
+      <tr>
+        <td>NEWSLETTER</td>
+        <td><span class="pill pill-inactive">Expired</span></td>
+        <td>358</td>
+        <td>January 1, 2016</td>
+        <td>March 30, 2016</td>
+      </tr>
+    </tbody>
+  </table>
+</div>

data/app/views/spree/admin/style_guide/topics/tables/_building_tables.html.erb

@@ -28,13 +28,13 @@
           Quod si ita se habeat, non possit beatam praestare vitam sapientia.
           Etenim nec iustitia nec amicitia esse omnino poterunt, nisi ipsae per se expetuntur.
         </td>
-        <td class="align-center">$22.99</td>
-        <td class="align-center no-wrap">1 x on hand</td>
-        <td class="align-center">$22.99</td>
+        <td>$22.99</td>
+        <td class="no-wrap">1 x on hand</td>
+        <td>$22.99</td>
       </tr>
       <tr>
         <td colspan="5">UPS Ground (USD)</td>
-        <td class="align-center">
+        <td>
           <span>$5.00</span>
         </td>
       </tr>

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

@@ -38,11 +38,11 @@
          @edit_url = edit_admin_tax_category_path(tax_category)
          @delete_url = admin_tax_category_path(tax_category)
     %>
-      <tr id="<%= spree_dom_id tax_category %>" data-hook="tax_row" class="<%= cycle('odd', 'even')%>">
-        <td class="align-center"><%= tax_category.name %></td>
-        <td class="align-center"><%= tax_category.tax_code %></td>
-        <td class="align-center"><%= tax_category.description %></td>
-        <td class="align-center"><%= tax_category.is_default? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+      <tr id="<%= spree_dom_id tax_category %>" data-hook="tax_row">
+        <td><%= tax_category.name %></td>
+        <td><%= tax_category.tax_code %></td>
+        <td><%= tax_category.description %></td>
+        <td><%= tax_category.is_default? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
         <td class="actions">
           <% if can?(:update, tax_category) %>
             <%= link_to_edit tax_category, no_text: true %>

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

@@ -41,21 +41,21 @@
     </thead>
     <tbody>
       <% @tax_rates.each do |tax_rate|%>
-      <tr id="<%= spree_dom_id tax_rate %>" data-hook="rate_row" class="<%= cycle('odd', 'even')%>">
-        <td class="align-center"><%=tax_rate.zone.try(:name) || Spree.t(:not_available) %></td>
-        <td class="align-center"><%=tax_rate.name %></td>
-        <td class="align-center">
+      <tr id="<%= spree_dom_id tax_rate %>" data-hook="rate_row">
+        <td><%=tax_rate.zone.try(:name) || Spree.t(:not_available) %></td>
+        <td><%=tax_rate.name %></td>
+        <td>
           <% if tax_rate.tax_categories.any? %>
             <%= tax_rate.tax_categories.map(&:name).join(", ") %>
           <% else %>
             <%= Spree.t(:not_available) %>
           <% end %>
         </td>
-        <td class="align-center"><%=tax_rate.amount %></td>
-        <td class="align-center"><%=tax_rate.included_in_price? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-        <td class="align-center"><%=tax_rate.show_rate_in_label? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-        <td class="align-center"><%=tax_rate.expires_at.to_date.to_s(:short_date) if tax_rate.expires_at %></td>
-        <td class="align-center"><%=tax_rate.calculator.to_s %></td>
+        <td><%=tax_rate.amount %></td>
+        <td><%=tax_rate.included_in_price? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+        <td><%=tax_rate.show_rate_in_label? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+        <td><%=tax_rate.expires_at.to_date.to_s(:short_date) if tax_rate.expires_at %></td>
+        <td><%=tax_rate.calculator.to_s %></td>
         <td class="actions">
           <% if can?(:update, tax_rate) %>
             <%= link_to_edit tax_rate, no_text: true %>

data/app/views/spree/admin/taxonomies/_list.html.erb

@@ -6,20 +6,20 @@
   </colgroup>
   <thead>
     <tr data-hook="taxonomies_header">
-      <th class="no-border"></th>
+      <th></th>
       <th><%= Spree::Taxonomy.human_attribute_name(:name) %></th>
       <th class="actions"></th>
     </tr>
   </thead>
   <tbody>
     <% @taxonomies.each do |taxonomy| %>
-      <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row" class="<%= cycle('odd', 'even')%>">
-        <td class="no-border">
+      <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row">
+        <td>
           <% if can?(:update_positions, Spree::Taxonomy) %>
             <span class="handle"></span>
           <% end %>
         </td>
-        <td class="align-center"><%= taxonomy.name %></td>
+        <td><%= taxonomy.name %></td>
         <td class="actions">
           <% if can?(:update, taxonomy) %>
             <%= link_to_edit taxonomy, no_text: true %>

data/app/views/spree/admin/taxons/search.json.jbuilder

@@ -0,0 +1,5 @@
+json.taxons(@taxons) do |taxon|
+  json.id taxon.id
+  json.name taxon.name
+  json.pretty_name taxon.pretty_name
+end

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

@@ -1,6 +1,5 @@
 <% admin_breadcrumb(plural_resource_name(Spree::LegacyUser)) %>
 
-
 <% content_for :page_actions do %>
   <% if can?(:admin, Spree.user_class) && can?(:create, Spree.user_class) %>
     <li>
@@ -9,21 +8,81 @@
   <% end %>
 <% end %>
 
+<% content_for :table_filter_title do %>
+  <%= Spree.t(:search) %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <div data-hook="admin_users_index_search">
+    <%= search_form_for [:admin, @search], url: admin_users_url do |f| %>
+      <div class="row">
+        <div class="col-xs-12 col-md-5">
+          <div class="form-group">
+            <%= f.label :email_cont, Spree.t(:email) %>
+            <%= f.text_field :email_cont, class: "form-control" %>
+          </div>
+        </div>
+        <div class="col-xs-12 col-md-3">
+          <div class="form-group">
+            <%= f.label :spree_roles_id_in, Spree.user_class.human_attribute_name(:spree_roles) %>
+            <%= f.collection_select :spree_roles_id_in, @roles, :id, :name, {},
+              multiple: true, class: 'select2 fullwidth' %>
+          </div>
+        </div>
+        <div class="col-xs-12 col-md-4">
+          <div class="date-range-filter form-group">
+            <%= label_tag :q_created_at_gt, Spree.t(:member_since) %>
+            <div class="date-range-fields input-group">
+              <%= f.text_field :created_at_gt, class: 'datepicker form-control datepicker-from',
+                value: params[:q].try!("[]", :created_at_gt), placeholder: Spree.t(:start) %>
+
+              <span class="range-divider input-group-addon">
+                <i class="fa fa-arrow-right"></i>
+              </span>
+
+              <%= f.text_field :created_at_lt, class: 'datepicker form-control datepicker-to',
+                value: params[:q].try!("[]", :created_at_lt), placeholder: Spree.t(:stop) %>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="actions filter-actions" data-hook="admin_users_index_search_buttons">
+        <%= button Spree.t(:search) %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
+<%= paginate @users, theme: "solidus_admin" %>
+
 <table class="index" id="listing_users" data-hook>
   <colgroup>
-    <col style="width: 85%">
-    <col style="width: 15%">
+    <col style="width: 40%">
+    <col style="width: 20%">
+    <col style="width: 10%">
+    <col style="width: 10%">
+    <col style="width: 10%">
+    <col style="width: 10%">
   </colgroup>
   <thead>
     <tr data-hook="admin_users_index_headers">
-      <th><%= sort_link @search,:email, Spree::LegacyUser.model_name.human, {}, {title: 'users_email_title'} %></th>
+      <th><%= sort_link @search, :email, Spree.user_class.human_attribute_name(:email), {}, {title: 'users_email_title'} %></th>
+      <th><%= Spree.user_class.human_attribute_name(:spree_roles) %></th>
+      <th class="align-center"><%= Spree.t(:num_orders) %></th>
+      <th class="align-center"><%= Spree.user_class.human_attribute_name(:lifetime_value) %></th>
+      <th class="align-center"><%= sort_link @search, :created_at, Spree.t(:member_since) %></th>
       <th data-hook="admin_users_index_header_actions" class="actions"></th>
     </tr>
   </thead>
   <tbody>
     <% @users.each do |user|%>
-      <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows" class="<%= cycle('odd', 'even')%>">
+      <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><%= user.spree_roles.map(&:name).to_sentence %></td>
+        <td class="align-center"><%= link_to user.orders.count, spree.orders_admin_user_path(user) %></td>
+        <td class="align-center"><%= link_to user.display_lifetime_value, spree.items_admin_user_path(user) %></td>
+        <td class="align-center"><%= l user.created_at.to_date %></td>
         <td data-hook="admin_users_index_row_actions" class="actions">
           <% if can?(:edit, user) %>
             <%= link_to_edit user, no_text: true %>
@@ -38,21 +97,3 @@
 </table>
 
 <%= paginate @users, theme: "solidus_admin" %>
-
-<% content_for :sidebar_title do %>
-  <%= Spree.t(:search) %>
-<% end %>
-
-<% content_for :sidebar do %>
-  <div class="box align-center" data-hook="admin_users_index_search">
-    <%= search_form_for [:admin, @search], url: admin_users_url do |f| %>
-      <div class="field">
-        <%= f.label :email_cont, Spree.t(:email) %> <br>
-        <%= f.text_field :email_cont, class: 'fullwidth' %>
-      </div>
-      <div data-hook="admin_users_index_search_buttons">
-        <%= button Spree.t(:search) %>
-      </div>
-    <% end %>
-  </div>
-<% end %>

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

@@ -39,7 +39,7 @@
         <% @orders.each do |order| %>
           <% order.line_items.each do |item| %>
             <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
-              <td class="align-center order-completed-at"><%= l(order.completed_at.to_date) if order.completed_at %></td>
+              <td class="order-completed-at"><%= l(order.completed_at.to_date) if order.completed_at %></td>
               <td class="item-image">
                 <%= render 'spree/admin/shared/image', image: item.variant.display_image, size: :mini %>
               </td>
@@ -49,19 +49,15 @@
                   <strong><%= Spree.t(:sku) %>:</strong> <%= item.variant.sku %>
                 <% end %>
               </td>
-              <td class="align-center item-price"><%= item.single_money.to_html %></td>
-              <td class="align-center item-quantity"><%= item.quantity %></td>
-              <td class="align-center item-total"><%= item.money.to_html %></td>
-              <td class="align-center order-state">
-                <div class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></div>
-                <% if order.payment_state %>
-                  <div class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></div>
-                <% end %>
-                <% if Spree::Order.checkout_step_names.include?(:delivery) && order.shipment_state %>
-                  <div class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") %></div>
-                <% end %>
+              <td class="item-price"><%= item.single_money.to_html %></td>
+              <td class="item-quantity"><%= item.quantity %></td>
+              <td class="item-total"><%= item.money.to_html %></td>
+              <td class="order-state">
+                <span class="pill pill-<%= order.state %>">
+                  <%= Spree.t(order.state, scope: :order_state) %>
+                </span>
               </td>
-              <td class="align-center order-number">
+              <td class="order-number">
                 <% if can?([:admin, :edit], order) %>
                   <%= link_to order.number, edit_admin_order_url(order) %>
                 <% else %>

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

@@ -25,31 +25,47 @@
         <tr data-hook="admin_orders_index_headers">
           <th><%= sort_link @search, :completed_at,   Spree::Order.human_attribute_name(:completed_at), {}, {title: 'orders_completed_at_title'} %></th>
           <th><%= sort_link @search, :number,         Spree::Order.human_attribute_name(:number), {}, {title: 'orders_number_title'} %></th>
-          <th><%= sort_link @search, :state,          Spree::Order.human_attribute_name(:state), {}, {title: 'orders_state_title'} %></th>
+          <th><%= sort_link @search, :state %></th>
+          <th><%= sort_link @search, :payment_state %></th>
+          <% if Spree::Order.checkout_step_names.include?(:delivery) %>
+            <th><%= sort_link @search, :shipment_state %></th>
+          <% end %>
           <th><%= sort_link @search, :total,          Spree::Order.human_attribute_name(:total), {}, {title: 'orders_total_title'} %></th>
         </tr>
       </thead>
       <tbody>
       <% @orders.each do |order| %>
-        <tr data-hook="admin_orders_index_rows" class="state-<%= order.state.downcase %> <%= cycle('odd', 'even') %>">
-          <td class="align-center order-completed-at"><%= l(order.completed_at.to_date) if order.completed_at %></td>
-          <td class="align-center order-number">
+        <tr data-hook="admin_orders_index_rows">
+          <td class="order-completed-at"><%= l(order.completed_at.to_date) if order.completed_at %></td>
+          <td class="order-number">
             <% if can?([:admin, :edit], order) %>
               <%= link_to order.number, edit_admin_order_path(order) %>
             <% else %>
               <%= order.number %>
             <% end %>
           </td>
-          <td class="align-center order-state">
-            <div class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></div>
-            <% if order.payment_state %>
-              <div class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></div>
-            <% end %>
-            <% if Spree::Order.checkout_step_names.include?(:delivery) && order.shipment_state %>
-              <div class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") %></div>
+          <td>
+            <span class="pill pill-<%= order.state %>">
+              <%= Spree.t(order.state, scope: :order_state) %>
+            </span>
+          </td>
+          <td>
+            <% if order.payment_state  %>
+              <span class="pill pill-<%= order.payment_state %>">
+                <%= Spree.t(order.payment_state, scope: :payment_states) %>
+              </span>
             <% end %>
           </td>
-          <td class="align-center order-total"><%= order.display_total.to_html %></td>
+          <% if Spree::Order.checkout_step_names.include?(:delivery) %>
+            <td>
+              <% if order.shipment_state %>
+                <span class="pill pill-<%= order.shipment_state %>">
+                  <%= Spree.t(order.shipment_state, scope: :shipment_states) %>
+                </span>
+              <% end %>
+            </td>
+          <% end %>
+          <td class="order-total"><%= order.display_total.to_html %></td>
         </tr>
       <% end %>
       </tbody>

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

@@ -11,7 +11,8 @@
   </colgroup>
   <thead data-hook="variants_header">
     <tr>
-      <th colspan="2"><%= Spree.t(:options) %></th>
+      <th></th>
+      <th><%= Spree.t(:options) %></th>
       <th><%= Spree::Variant.human_attribute_name(:price) %></th>
       <th><%= Spree::Variant.human_attribute_name(:sku) %></th>
       <th class="actions"></th>
@@ -19,15 +20,15 @@
   </thead>
   <tbody>
   <% variants.each do |variant| %>
-    <tr id="<%= spree_dom_id variant %>" data-hook="variants_row" class="<%= "deleted" if variant.deleted? %> <%= cycle('odd', 'even')%>">
-      <td class="no-border">
+    <tr id="<%= spree_dom_id variant %>" data-hook="variants_row" class="<%= "deleted" if variant.deleted? %>">
+      <td>
         <% if can? :update_positions, Spree::Variant %>
           <span class="handle"></span>
         <% end %>
       </td>
       <td><%= variant.options_text %></td>
-      <td class="align-center"><%= variant.display_price.to_html %></td>
-      <td class="align-center"><%= variant.sku %></td>
+      <td><%= variant.display_price.to_html %></td>
+      <td><%= variant.sku %></td>
       <td class="actions">
         <% if can?(:update, variant) %>
           <%= link_to_edit(variant, no_text: true) unless variant.deleted? %>

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

@@ -2,6 +2,17 @@
 
 <% admin_breadcrumb(plural_resource_name(Spree::Variant)) %>
 
+<% content_for :page_actions do %>
+  <% if can?(:create, Spree::Variant) && !@product.empty_option_values? %>
+    <li id="new_var_link" data-hook>
+      <%= link_to(
+        Spree.t(:new_variant),
+        new_admin_product_variant_url(@product),
+        class: 'button'
+      ) %>
+    </li>
+  <% end %>
+<% end %>
 
 <% if @variants.any? || @product.variants.only_deleted.any?%>
   <%= render "table_filter", product: @product %>
@@ -25,23 +36,8 @@
     <div class="col-9 no-objects-found">
       <%= 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 %>
+        <%= link_to Spree.t(:create_one), new_object_url %>
       <% end %>
     </div>
   <% end %>
 <% end %>
-
-<% if !@product.empty_option_values? %>
-  <% content_for :page_actions do %>
-    <ul class="inline-menu" data-hook="toolbar">
-      <% if can?(:create, Spree::Variant) %>
-        <li id="new_var_link" data-hook>
-          <%= link_to Spree.t(:new_variant),
-                      new_admin_product_variant_url(@product),
-                      remote: :true,
-                      class: 'button' %>
-        </li>
-      <% end %>
-    </ul>
-  <% end %>
-<% end %>

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

@@ -4,10 +4,8 @@
 <% 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>
+  <fieldset class="no-border-top" data-hook="admin_variant_new_form">
     <%= render partial: 'form', locals: { f: f } %>
     <%= render partial: 'spree/admin/shared/new_resource_links' %>
   </fieldset>

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

@@ -1,7 +1,4 @@
-<%= render 'spree/admin/shared/areas_tabs' %>
-
 <% 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) %>
 

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

@@ -1,10 +1,6 @@
-<%= render 'spree/admin/shared/areas_tabs' %>
-
 <% 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>
@@ -34,8 +30,8 @@
     </thead>
     <tbody>
       <% @zones.each do |zone| %>
-        <tr id="<%= spree_dom_id zone %>" data-hook="zones_row" class="<%= cycle('odd', 'even')%>">
-          <td class="align-center"><%= zone.name %></td>
+        <tr id="<%= spree_dom_id zone %>" data-hook="zones_row">
+          <td><%= zone.name %></td>
           <td><%= zone.description %></td>
           <td class="actions">
             <% if can?(:update, zone) %>

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

@@ -1,7 +1,4 @@
-<%= render 'spree/admin/shared/areas_tabs' %>
-
 <% 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)) %>
 

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

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

data/config/routes.rb

@@ -22,10 +22,6 @@ Spree::Core::Engine.routes.draw do
 
     resources :zones
 
-    resources :countries do
-      resources :states
-    end
-    resources :states
     resources :tax_categories
 
     resources :products do

data/lib/spree/backend.rb

@@ -6,11 +6,12 @@ require 'sass-rails'
 require 'bourbon'
 require 'handlebars_assets'
 require 'font-awesome-rails'
+require 'autoprefixer-rails'
+require 'jbuilder'
 
 require 'spree_core'
 require 'spree_api'
 
-require 'spree/responder'
 require 'spree/backend/action_callbacks'
 require 'spree/backend/callbacks'
 require 'spree/backend/engine'

data/solidus_backend.gemspec

@@ -8,7 +8,6 @@ Gem::Specification.new do |s|
   s.summary     = 'Admin interface for the Solidus e-commerce framework.'
   s.description = s.summary
 
-  s.required_ruby_version = '>= 2.1.0'
   s.author      = 'Solidus Team'
   s.email       = 'contact@solidus.io'
   s.homepage    = 'http://solidus.io'
@@ -30,6 +29,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'jquery-rails'
   s.add_dependency 'jquery-ui-rails', '~> 5.0.0'
   s.add_dependency 'font-awesome-rails', '~> 4.0'
+  s.add_dependency 'kaminari', '>= 0.17', '< 2.0'
+  s.add_dependency 'jbuilder', '~> 2.6'
 
   s.add_dependency 'handlebars_assets', '~> 0.23'
+  s.add_dependency 'autoprefixer-rails', '~> 7.1'
 end