spree_backend 3.7.14.1 → 4.0.0.beta

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

@@ -55,11 +55,18 @@
   <%= field_container f.object, :state, class: ["form-group", "#{type}-row"] do %>
     <%= f.label :state_id, Spree.t(:state) %>
     <span id="<%= s_or_b %>state">
+      <% if f.object.country.try(:states) %>
+
       <%= f.text_field :state_name,
-            style: "display: #{f.object.country.states.empty? ? 'block' : 'none' };",
-            disabled: !f.object.country.states.empty?, class: 'form-control state_name' %>
-      <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, { class: 'select2', style: "display: #{f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty? } %>
-    </span>
+            style: "display: #{f.object.country.try(:states) && f.object.country.states.empty? ? 'block' : 'none' };",
+            disabled: !(f.object.country.try(:states) && f.object.country.states.empty?), class: 'form-control state_name' %>
+        <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, { class: 'select2', style: "display: #{ f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty? } %>
+      <% else %>
+        <div>
+          <em>No country set.</em>
+        </div>
+      <% end %>
+      </span>
     <%= error_message_on f.object, :state_id %>
   <% end %>
 

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

@@ -1,12 +1,12 @@
-<div id="calculator_fields" data-hook class="panel panel-default">
+<div id="calculator_fields" data-hook class="card mb-3">
 
-  <div class="panel-heading">
-    <h1 class="panel-title">
+  <div class="card-header">
+    <h1 class="card-title mb-0 h5">
       <%= Spree.t(:calculator) %>
     </h1>
   </div>
 
-  <div id="preference-settings" data-hook class="panel-body">
+  <div id="preference-settings" data-hook class="card-body">
     <div class="form-group">
       <%= f.label(:calculator_type, Spree.t(:calculator), for: 'calc_type') %>
       <%= f.select(:calculator_type, @calculators.map { |c| [c.description, c.name] }, {}, {id: 'calc_type', class: 'select2'}) %>

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

@@ -1,8 +1,8 @@
 <% if content_for?(:page_title) || content_for?(:page_actions) %>
   <div class="content-header <%= "with-page-tabs" if content_for?(:page_tabs) %> page-header">
-    <div class="row">
+    <div class="row align-items-center  <%= if content_for?(:page_tabs) then "pb-0" else "border-bottom" end %> mb-4">
       <% if content_for?(:page_title) %>
-        <h1 class="col-xs-<%= content_for?(:page_actions) ? '6' : '12'  %>">
+        <h1 class="h4 pl-0 mb-0 col-<%= content_for?(:page_actions) ? '6' : '12'  %>">
           <%= yield :page_title %>
           <% if content_for?(:page_title_small) %>
             <small><%= yield :page_title_small %></small>
@@ -11,13 +11,13 @@
       <% end %>
 
       <% if content_for?(:page_actions) %>
-        <div class="page-actions col-xs-6" data-hook="toolbar">
+        <div class="page-actions col-6 pr-0" data-hook="toolbar">
           <%= yield :page_actions %>
         </div>
       <% end %>
 
       <% if content_for?(:page_tabs) %>
-        <ul class="nav nav-tabs">
+        <ul class="nav nav-tabs w-100 mt-4">
           <%= yield :page_tabs %>
         </ul>
       <% end %>

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

@@ -1,26 +1,23 @@
 <header class="header logged-in">
 
-  <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-    <div class="container-fluid">
-      <div class="row">
-        <div class="navbar-header col-xs-3 col-md-2">
-          <%= link_to(
-            image_tag(Spree::Config[:admin_interface_logo], id: 'logo'),
-            spree.admin_path,
-            class: "logo navbar-brand"
-          ) %>
-            <span class="navbar-toggle" id="sidebar-toggle">
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-            </span>
-        </div>
-        <div class="col-xs-9 col-md-10">
-          <div class="navbar-right">
-            <%= render partial: 'spree/admin/shared/account_nav' %>
-          </div>
-        </div>
-      </div>
+  <nav class="navbar fixed-top navbar-dark align-items-stretch" role="navigation">
+    <div class="navbar-header col-3 col-md-2">
+      <%= link_to(
+        image_tag(Spree::Config[:admin_interface_logo], id: 'logo'),
+        spree.admin_path,
+        class: "logo navbar-brand"
+      ) %>
+      <button
+        id="sidebar-toggle"
+        class="navbar-toggler h-100 position-absolute m-0 p-0"
+        type="button"
+        aria-expanded="false"
+        aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+      </button>
+    </div>
+    <div class="col-9 col-md-10 pr-0">
+      <%= render partial: 'spree/admin/shared/account_nav' %>
     </div>
   </nav>
 

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

@@ -5,15 +5,14 @@
 <% end %>
 
 <div class="row index-pagination-row">
-  <div class="col-xs-6">
-    <%= paginate collection %>
+  <div class="col-6">
+    <%= paginate collection, theme: 'twitter-bootstrap-4' %>
   </div>
-  <div class="col-xs-6">
+  <div class="col-6 justify-content-end">
     <div class="pagination-wrap">
-      <%= form_tag(per_page_dropdown_params(args), { method: :get, class: 'js-per-page-form form-inline' }) do %>
+      <%= form_tag(per_page_dropdown_params(args), { method: :get, class: 'js-per-page-form form-inline justify-content-end' }) do %>
         <%= per_page_dropdown %>
       <% end %>
-      <div class="clearfix"></div>
     </div>
   </div>
 </div>

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

@@ -1,41 +1,43 @@
-<% if can? :admin, Spree::Order %>
-  <ul class="nav nav-sidebar">
-    <%= tab *Spree::BackendConfiguration::ORDER_TABS, icon: 'shopping-cart' %>
-  </ul>
-<% end %>
+<nav>
+  <% if can? :admin, Spree::Order %>
+    <ul class="nav nav-sidebar border-bottom">
+      <%= tab *Spree::BackendConfiguration::ORDER_TABS, icon: 'shopping-cart' %>
+    </ul>
+  <% end %>
 
-<% if can?(:admin, Spree::ReturnAuthorization) || can?(:admin, Spree::CustomerReturn) %>
-  <ul class="nav nav-sidebar">
-    <%= main_menu_tree Spree.t(:returns), icon: "transfer", sub_menu: "returns", url: "#sidebar-returns" %>
-  </ul>
-<% end %>
+  <% if can?(:admin, Spree::ReturnAuthorization) || can?(:admin, Spree::CustomerReturn) %>
+    <ul class="nav nav-sidebar border-bottom">
+      <%= main_menu_tree Spree.t(:returns), icon: "transfer", sub_menu: "returns", url: "#sidebar-returns" %>
+    </ul>
+  <% end %>
 
-<% if can? :admin, Spree::Product %>
-  <ul class="nav nav-sidebar">
-    <%= main_menu_tree Spree.t(:products), icon: "th-large", sub_menu: "product", url: "#sidebar-product" %>
-  </ul>
-<% end %>
+  <% if can? :admin, Spree::Product %>
+    <ul class="nav nav-sidebar border-bottom">
+      <%= main_menu_tree Spree.t(:products), icon: "th-large", sub_menu: "product", url: "#sidebar-product" %>
+    </ul>
+  <% end %>
 
-<% if can? :admin, Spree::Admin::ReportsController %>
-  <ul class="nav nav-sidebar">
-    <%= tab *Spree::BackendConfiguration::REPORT_TABS, icon: 'file'  %>
-  </ul>
-<% end %>
+  <% if can? :admin, Spree::Admin::ReportsController %>
+    <ul class="nav nav-sidebar border-bottom">
+      <%= tab *Spree::BackendConfiguration::REPORT_TABS, icon: 'file'  %>
+    </ul>
+  <% end %>
 
-<% if can? :admin, Spree::Promotion %>
-  <ul class="nav nav-sidebar">
-    <%= main_menu_tree Spree.t(:promotions), icon: "gift", sub_menu: "promotion", url: "#sidebar-promotions" %>
-  </ul>
-<% end %>
+  <% if can? :admin, Spree::Promotion %>
+    <ul class="nav nav-sidebar border-bottom">
+      <%= main_menu_tree Spree.t(:promotions), icon: "gift", sub_menu: "promotion", url: "#sidebar-promotions" %>
+    </ul>
+  <% end %>
 
-<% if Spree.user_class && can?(:admin, Spree.user_class) %>
-  <ul class="nav nav-sidebar">
-    <%= tab *Spree::BackendConfiguration::USER_TABS, url: spree.admin_users_path, icon: 'user' %>
-  </ul>
-<% end %>
+  <% if Spree.user_class && can?(:admin, Spree.user_class) %>
+    <ul class="nav nav-sidebar border-bottom">
+      <%= tab *Spree::BackendConfiguration::USER_TABS, url: spree.admin_users_path, icon: 'user' %>
+    </ul>
+  <% end %>
 
-<% if can? :admin, current_store %>
-  <ul class="nav nav-sidebar">
-    <%= main_menu_tree Spree.t(:configurations), icon: "wrench", sub_menu: "configuration", url: "#sidebar-configuration" %>
-  </ul>
-<% end %>
+  <% if can? :admin, current_store %>
+    <ul class="nav nav-sidebar border-bottom">
+      <%= main_menu_tree Spree.t(:configurations), icon: "wrench", sub_menu: "configuration", url: "#sidebar-configuration" %>
+    </ul>
+  <% end %>
+</nav>

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

@@ -1,8 +1,7 @@
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h3 class="panel-title"><%= Spree.t(:summary) %></h3>
+<div class="card mb-3">
+  <div class="card-header">
+    <h3 class="card-title mb-0 h5"><%= Spree.t(:summary) %></h3>
   </div>
-
   <table class="table table-condensed table-bordered" id="order_tab_summary" data-hook>
     <tbody class="additional-info">
       <tr>
@@ -10,7 +9,7 @@
           <strong><%= Spree.t(:status) %>:</strong>
         </td>
         <td>
-          <span class="state label label-<%= @order.state %>">
+          <span class="state badge badge-<%= @order.state %>">
             <%= Spree.t(@order.state, scope: :order_state) %>
           </span>
         </td>
@@ -76,7 +75,7 @@
             <strong><%= Spree.t(:shipment) %>:</strong>
           </td>
           <td id='shipment_status'>
-            <span class="state label label-<%= @order.shipment_state %>">
+            <span class="state badge badge-<%= @order.shipment_state %>">
               <%= Spree.t(@order.shipment_state, scope: :shipment_states, default: [:missing, "none"]) %>
             </span>
           </td>
@@ -86,7 +85,7 @@
             <strong><%= Spree.t(:payment) %>:</strong>
           </td>
           <td id='payment_status'>
-            <span class="state label label-<%= @order.payment_state %>">
+            <span class="state badge badge-<%= @order.payment_state %>">
               <%= Spree.t(@order.payment_state, scope: :payment_states, default: [:missing, "none"]) %>
             </span>
           </td>

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

@@ -4,62 +4,89 @@
 <% end %>
 
 <% content_for :sidebar do %>
-  <ul class="nav nav-pills nav-stacked" data-hook="admin_order_tabs">
+  <ul class="nav flex-column nav-pills" data-hook="admin_order_tabs">
     <% if ((can? :update, @order) && (@order.shipments.size.zero? || @order.shipments.shipped.size.zero?)) %>
-      <li<%== ' class="active"' if current == :cart %> data-hook='admin_order_tabs_cart_details'>
-        <%= link_to_with_icon 'edit', Spree.t(:cart), cart_admin_order_url(@order) %>
+      <li data-hook='admin_order_tabs_cart_details'>
+        <%= link_to_with_icon 'edit',
+          Spree.t(:cart),
+          cart_admin_order_url(@order),
+          class: "#{'active' if current == :cart} nav-link" %>
       </li>
     <% end %>
 
-    <% if ((can?(:update, @order) && can?(:display, Spree::Store)) && (@order.shipments.size.zero? || @order.shipments.shipped.size.zero?)) %>
-      <li<%== ' class="active"' if current == :store %> data-hook='admin_order_tabs_store_details'>
-        <%= link_to_with_icon 'home', Spree.t(:store), store_admin_order_url(@order) %>
+    <% if ((can?(:update, @order) && can?(:read, Spree::Store)) && (@order.shipments.size.zero? || @order.shipments.shipped.size.zero?)) %>
+      <li data-hook='admin_order_tabs_store_details'>
+        <%= link_to_with_icon 'home',
+          Spree.t(:store),
+          store_admin_order_url(@order),
+          class: "#{'active' if current == :store} nav-link" %>
       </li>
     <% end %>
 
     <% if can?(:update, @order) && @order.checkout_steps.include?("address") %>
-      <li<%== ' class="active"' if current == :customer_details %> data-hook='admin_order_tabs_customer_details'>
-        <%= link_to_with_icon 'user', Spree.t(:customer), spree.admin_order_customer_url(@order) %>
+      <li data-hook='admin_order_tabs_customer_details'>
+        <%= link_to_with_icon 'user',
+          Spree.t(:customer),
+          spree.admin_order_customer_url(@order),
+          class: "#{'active' if current == :customer_details} nav-link" %>
       </li>
     <% end %>
 
     <% if can? :update, @order %>
-      <li<%== ' class="active"' if current == :shipments %> data-hook='admin_order_tabs_shipment_details'>
-        <%= link_to_with_icon 'road', Spree.t(:shipments), edit_admin_order_url(@order) %>
+      <li data-hook='admin_order_tabs_shipment_details'>
+        <%= link_to_with_icon 'road',
+          Spree.t(:shipments),
+          edit_admin_order_url(@order),
+          class: "#{'active' if current == :shipments} nav-link" %>
       </li>
     <% end %>
 
     <% if can? :index, Spree::Adjustment %>
-      <li<%== ' class="active"' if current == :adjustments %> data-hook='admin_order_tabs_adjustments'>
-        <%= link_to_with_icon 'wrench', Spree.t(:adjustments), spree.admin_order_adjustments_url(@order) %>
+      <li data-hook='admin_order_tabs_adjustments'>
+        <%= link_to_with_icon 'wrench',
+          Spree.t(:adjustments),
+          spree.admin_order_adjustments_url(@order),
+          class: "#{'active' if current == :adjustments} nav-link" %>
       </li>
     <% end %>
 
     <% if can?(:index, Spree::Payment) %>
-      <li<%== ' class="active"' if current == :payments %> data-hook='admin_order_tabs_payments'>
-        <%= link_to_with_icon 'credit-card', Spree.t(:payments), spree.admin_order_payments_url(@order) %>
+      <li data-hook='admin_order_tabs_payments'>
+        <%= link_to_with_icon 'credit-card',
+          Spree.t(:payments),
+          spree.admin_order_payments_url(@order),
+          class: "#{'active' if current == :payments} nav-link" %>
       </li>
     <% end %>
 
     <% if can? :index, Spree::ReturnAuthorization %>
       <% if @order.completed? %>
-        <li<%== ' class="active"' if current == :return_authorizations %> data-hook='admin_order_tabs_return_authorizations'>
-          <%= link_to_with_icon 'transfer', Spree.t(:return_authorizations), spree.admin_order_return_authorizations_url(@order) %>
+        <li data-hook='admin_order_tabs_return_authorizations'>
+          <%= link_to_with_icon 'transfer',
+            Spree.t(:return_authorizations),
+            spree.admin_order_return_authorizations_url(@order),
+            class: "#{'active' if current == :return_authorizations} nav-link" %>
         </li>
       <% end %>
     <% end %>
 
     <% if can? :index, Spree::CustomerReturn %>
       <% if @order.completed? %>
-        <li<%== ' class="active"' if current == :customer_returns %>>
-          <%= link_to_with_icon 'transfer', Spree.t(:customer_returns), spree.admin_order_customer_returns_url(@order) %>
+        <li>
+          <%= link_to_with_icon 'transfer',
+            Spree.t(:customer_returns),
+            spree.admin_order_customer_returns_url(@order),
+            class: "#{'active' if current == :customer_returns} nav-link" %>
         </li>
       <% end %>
     <% end %>
 
     <% if can? :update, @order %>
-      <li<%== ' class="active"' if current == :state_changes %> data-hook='admin_order_tabs_state_changes'>
-        <%= link_to_with_icon 'refresh', Spree::StateChange.human_attribute_name(:state_changes), spree.admin_order_state_changes_url(@order) %>
+      <li data-hook='admin_order_tabs_state_changes'>
+        <%= link_to_with_icon 'refresh',
+          Spree::StateChange.human_attribute_name(:state_changes),
+          spree.admin_order_state_changes_url(@order),
+          class: "#{'active' if current == :state_changes} nav-link" %>
       </li>
     <% end %>
   </ul>

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

@@ -4,21 +4,45 @@
 <% end %>
 
 <% content_for :sidebar do %>
-  <ul class="nav nav-pills nav-stacked" data-hook="admin_product_tabs">
-    <%= content_tag :li, class: ('active' if current == :details) do %>
-      <%= link_to_with_icon 'edit', Spree.t(:details), edit_admin_product_url(@product) %>
+  <ul class="nav flex-column nav-pills" data-hook="admin_product_tabs">
+    <%= content_tag :li do %>
+      <%= link_to_with_icon 'edit',
+        Spree.t(:details),
+        edit_admin_product_url(@product),
+        class: "nav-link #{'active' if current == :details}" %>
+
     <% end if can?(:admin, Spree::Product) %>
-    <%= content_tag :li, class: ('active' if current == :images) do %>
-      <%= link_to_with_icon 'picture', Spree.t(:images), spree.admin_product_images_url(@product) %>
+
+    <%= content_tag :li do %>
+      <%= link_to_with_icon 'picture',
+        Spree.t(:images),
+        spree.admin_product_images_url(@product),
+        class: "nav-link #{'active' if current == :images}" %>
+
     <% end if can?(:admin, Spree::Image) && !@product.deleted? %>
-    <%= content_tag :li, class: ('active' if current == :variants) do %>
-      <%= link_to_with_icon 'th-large', Spree.t(:variants),  spree.admin_product_variants_url(@product) %>
+
+    <%= content_tag :li do %>
+      <%= link_to_with_icon 'th-large',
+        Spree.t(:variants),
+        spree.admin_product_variants_url(@product),
+        class: "nav-link #{'active' if current == :variants}" %>
+
     <% end if can?(:admin, Spree::Variant) && !@product.deleted? %>
-    <%= content_tag :li, class: ('active' if current == :properties) do %>
-      <%= link_to_with_icon 'list-alt', Spree.t(:properties), spree.admin_product_product_properties_url(@product) %>
+
+    <%= content_tag :li do %>
+      <%= link_to_with_icon 'list-alt',
+        Spree.t(:properties),
+        spree.admin_product_product_properties_url(@product),
+        class: "nav-link #{'active' if current == :properties}" %>
+
     <% end if can?(:admin, Spree::ProductProperty) && !@product.deleted? %>
-    <%= content_tag :li, class: ('active' if current == :stock) do %>
-      <%= link_to_with_icon 'home', Spree.t(:stock), stock_admin_product_url(@product) %>
+
+    <%= content_tag :li do %>
+      <%= link_to_with_icon 'home',
+        Spree.t(:stock),
+        stock_admin_product_url(@product),
+        class: "nav-link #{'active' if current == :stock}" %>
+
     <% end if can?(:admin, Spree::StockItem) && !@product.deleted? %>
   </ul>
 <% end %>

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

@@ -23,7 +23,7 @@
         <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) %>
+            <%= 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-outline-secondary btn-sm") if can?(:edit, refund) %>
           </td>
         <% end %>
       </tr>

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

@@ -1,20 +1,22 @@
 <% if content_for?(:table_filter) %>
   <div class="filter-wrap row">
-    <div class="col-xs-12">
+    <div class="col-12">
       <div class="input-group index-filter-button">
         <span class="input-group-btn">
-          <button class="btn btn-default js-show-index-filters" type="button">
+          <button class="btn 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 %>
+        <%= form_tag request.fullpath, id: "quick-search", class: 'flex-grow-1' 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 id="table-filter" data-hook class="card bg-light filter-well">
+          <div class="card-body">
+            <%= yield :table_filter %>
+          </div>
         </div>
       <% end %>
     </div>