spree_backend 3.7.14.1 → 4.0.0.beta

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

@@ -1,13 +1,14 @@
 <div data-hook="admin_tax_rate_form_fields">
-  <div class="panel panel-default" data-hook="tax_rates">
-    <div class="panel-heading">
-      <h1 class="panel-title">
+  <div class="card mb-3" data-hook="tax_rates">
+    <div class="card-header">
+      <h1 class="card-title mb-0 h5">
         <%= Spree.t(:general_settings) %>
       </h1>
     </div>
 
-    <div class="panel-body">
-      <div class="col-xs-12 col-md-6">
+    <div class="card-body">
+      <div class="row">
+      <div class="col-12 col-lg-6">
         <div data-hook="name" class="form-group">
           <%= f.label :name, Spree.t(:name) %>
           <%= f.text_field :name, class: 'form-control' %>
@@ -17,10 +18,10 @@
             <%= f.label :amount, Spree.t(:rate) %>
             <%= f.text_field :amount, class: 'form-control' %>
             <%= f.error_message_on :amount %>
+            <small class="form-text text-muted">
+              <%= Spree.t(:tax_rate_amount_explanation) %>
+            </small>
           <% end %>
-          <p class="help-block">
-            <%= Spree.t(:tax_rate_amount_explanation) %>
-          </p>
         </div>
         <div data-hook="included" class="form-group">
           <%= f.label :included_in_price do %>
@@ -30,7 +31,7 @@
         </div>
       </div>
 
-      <div class="col-xs-12 col-md-6">
+      <div class="col-12 col-lg-6">
         <div data-hook="zone" class="form-group">
           <%= f.label :zone, Spree.t(:zone) %>
           <%= f.collection_select(:zone_id, @available_zones, :id, :name, {}, {class: 'select2'}) %>
@@ -46,6 +47,7 @@
           <% end %>
         </div>
       </div>
+      </div>
     </div>
 
   </div>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_inside_taxon_form">
   <div class="row">
-    <div class="col-xs-12 col-md-5">
+    <div class="col-12 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' %>
@@ -10,9 +10,9 @@
       <%= f.field_container :permalink, class: ['form-group'] do %>
         <%= label_tag :permalink_part, Spree.t(:permalink) %> <span class="required">*</span>
         <%= text_field_tag :permalink_part, @permalink_part, class: 'form-control', required: true %>
-        <p class="help-block" id="permalink_part_display">
+        <small class="form-text text-muted" id="permalink_part_display">
           <%= @taxon.permalink.split('/')[0...-1].join('/') + '/' %>
-        </p>
+        </small>
       <% end %>
 
       <%= f.field_container :icon, class: ['form-group'] do %>
@@ -22,7 +22,7 @@
       <% end %>
     </div>
 
-    <div class="col-xs-12 col-md-7">
+    <div class="col-12 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 %>

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

@@ -1,13 +1,13 @@
 <div class="row">
-  <div data-hook="bill_address_wrapper" class="col-xs-12 col-md-6">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h1 class="panel-title">
+  <div data-hook="bill_address_wrapper" class="col-12 col-lg-6">
+    <div class="card mb-3">
+      <div class="card-header">
+        <h1 class="card-title mb-0 h5">
           <%= Spree.t(:billing_address) %>
         </h1>
       </div>
 
-      <div class="panel-body">
+      <div class="card-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" } %>
@@ -16,15 +16,15 @@
     </div>
   </div>
 
-  <div data-hook="ship_address_wrapper" class="col-xs-12 col-md-6">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h1 class="panel-title">
+  <div data-hook="ship_address_wrapper" class="col-12 col-lg-6">
+    <div class="card mb-3">
+      <div class="card-header">
+        <h1 class="card-title mb-0 h5">
           <%= Spree.t(:shipping_address) %>
         </h1>
       </div>
 
-      <div class="panel-body">
+      <div class="card-body">
           <p class="field checkbox" data-hook="use_billing">
             <%= label_tag :use_billing, id: 'use_billing' do %>
               <% checked = @user.bill_address.nil? ? false : @user.bill_address == @user.ship_address %>

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

@@ -1,5 +1,5 @@
 <div data-hook="admin_user_form_fields" class="row">
-  <div class="col-xs-12 col-md-6">
+  <div class="col-12 col-md-6">
     <%= f.field_container :email, class: ['form-group'] do %>
       <%= f.label :email, Spree.t(:email) %>
       <%= f.email_field :email, class: 'form-control' %>
@@ -20,7 +20,7 @@
 
   </div>
 
-  <div data-hook="admin_user_form_password_fields" class="col-xs-12 col-md-6">
+  <div data-hook="admin_user_form_password_fields" class="col-12 col-md-6">
     <%= f.field_container :password, class: ['form-group'] do %>
       <%= f.label :password, Spree.t(:password) %>
       <%= f.password_field :password, class: 'form-control' %>

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

@@ -1,6 +1,6 @@
-<div data-hook="admin_user_lifetime_stats" class="panel panel-default">
-  <div class="panel-heading">
-    <h1 class="panel-title">
+<div data-hook="admin_user_lifetime_stats" class="card mb-3">
+  <div class="card-header">
+    <h1 class="card-title mb-0 h5">
       <%= Spree.t(:lifetime_stats) %>
     </h1>
   </div>

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

@@ -3,21 +3,36 @@
 <% end %>
 
 <% content_for :sidebar do %>
-  <ul class="nav nav-pills nav-stacked" data-hook="admin_user_tab_options">
-    <li<%== ' class="active"' if current == :account %>>
-      <%= link_to_with_icon 'user', Spree.t(:"admin.user.account"), spree.edit_admin_user_path(@user) %>
+  <ul class="nav flex-column nav-pills" data-hook="admin_user_tab_options">
+    <li>
+      <%= link_to_with_icon 'user',
+        Spree.t(:"admin.user.account"),
+        spree.edit_admin_user_path(@user),
+        class: "nav-link #{'active' if current == :account}" %>
     </li>
-    <li<%== ' class="active"' if current == :address %>>
-      <%= link_to_with_icon 'user', Spree.t(:"admin.user.addresses"), spree.addresses_admin_user_path(@user) %>
+    <li>
+      <%= link_to_with_icon 'user',
+        Spree.t(:"admin.user.addresses"),
+        spree.addresses_admin_user_path(@user),
+        class: "nav-link #{'active' if current == :address}" %>
     </li>
-    <li<%== ' class="active"' if current == :orders %>>
-      <%= link_to_with_icon 'shopping-cart', Spree.t(:"admin.user.orders"), spree.orders_admin_user_path(@user) %>
+    <li>
+      <%= link_to_with_icon 'shopping-cart',
+        Spree.t(:"admin.user.orders"),
+        spree.orders_admin_user_path(@user),
+        class: "nav-link #{'active' if current == :orders}" %>
     </li>
-    <li<%== ' class="active"' if current == :items %>>
-      <%= link_to_with_icon 'edit', Spree.t(:"admin.user.items"), spree.items_admin_user_path(@user) %>
+    <li>
+      <%= link_to_with_icon 'edit',
+        Spree.t(:"admin.user.items"),
+        spree.items_admin_user_path(@user),
+        class: "nav-link #{'active' if current == :items}" %>
     </li>
-    <li<%== ' class="active"' if current == :store_credits %>>
-      <%= link_to_with_icon 'money', Spree.t(:"admin.user.store_credits"), spree.admin_user_store_credits_path(@user) %>
+    <li>
+      <%= link_to_with_icon 'money',
+        Spree.t(:"admin.user.store_credits"),
+        spree.admin_user_store_credits_path(@user),
+        class: "nav-link #{'active' if current == :store_credits}" %>
     </li>
   </ul>
 <% end %>

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

@@ -16,8 +16,10 @@
 
       <%= render partial: 'addresses_form', locals: { f: f } %>
 
-      <div class="form-actions text-center well" data-hook="admin_user_edit_form_button">
-        <%= render partial: 'spree/admin/shared/edit_resource_links', locals: { collection_url: spree.admin_users_url } %>
+      <div class="form-actions text-center card bg-light mb-3" data-hook="admin_user_edit_form_button">
+        <div class="card-body">
+          <%= render partial: 'spree/admin/shared/edit_resource_links', locals: { collection_url: spree.admin_users_url } %>
+        </div>
       </div>
     <% end %>
   </div>

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

@@ -5,14 +5,14 @@
   <%= @user.email %>
 <% end %>
 
-<div data-hook="admin_user_edit_general_settings" class="panel panel-default">
-  <div class="panel-heading">
-    <h1 class="panel-title">
+<div data-hook="admin_user_edit_general_settings" class="card mb-3">
+  <div class="card-header">
+    <h1 class="card-title mb-0 h5">
       <%= Spree.t(:general_settings) %>
     </h1>
   </div>
 
-  <div class="panel-body">
+  <div class="card-body">
     <div data-hook="admin_user_edit_form_header">
       <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @user } %>
     </div>
@@ -29,14 +29,14 @@
   </div>
 </div>
 
-<div data-hook="admin_user_api_key" id="admin_user_edit_api_key" class="panel panel-default">
-  <div class="panel-heading">
-    <h1 class="panel-title">
+<div data-hook="admin_user_api_key" id="admin_user_edit_api_key" class="card mb-3">
+  <div class="card-header">
+    <h1 class="card-title mb-0 h5">
       <%= Spree.t('access', scope: 'api') %>
     </h1>
   </div>
 
-  <div class="panel-body">
+  <div class="card-body">
     <% if @user.spree_api_key.present? %>
       <div class="form-group">
         <div id="current-api-key">

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

@@ -18,13 +18,13 @@
         <%= f.text_field :email_cont, class: "form-control js-quick-search-target js-filterable" %>
       </div>
       <div class="row">
-        <div class="col-xs-12 col-md-6">
+        <div class="col-12 col-lg-6">
           <div class="form-group">
             <%= f.label :bill_address_firstname_cont, Spree.t(:first_name) %>
             <%= f.text_field :bill_address_firstname_cont, class: 'form-control js-filterable' %>
           </div>
         </div>
-        <div class="col-xs-12 col-md-6">
+        <div class="col-12 col-lg-6">
           <div class="form-group">
             <%= f.label :bill_address_lastname_cont, Spree.t(:last_name) %>
             <%= f.text_field :bill_address_lastname_cont, class: 'form-control js-filterable' %>
@@ -71,4 +71,4 @@
   </div>
 <% end %>
 
-<%= paginate @users %>
+<%= paginate @users, theme: 'twitter-bootstrap-4' %>

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

@@ -7,7 +7,7 @@
 <% end %>
 
 <fieldset data-hook="admin_user_items_purchased">
-  <%= paginate @orders %>
+  <%= paginate @orders, theme: 'twitter-bootstrap-4' %>
 
   <% if @orders.any? %>
     <%# TODO add search interface %>
@@ -60,7 +60,7 @@
       <%= link_to Spree.t(:add_one), spree.new_admin_order_path %>!
     </div>
   <% end %>
-  <%= paginate @orders %>
+  <%= paginate @orders, theme: 'twitter-bootstrap-4' %>
 </fieldset>
 
 <%= render 'spree/admin/users/lifetime_stats' %>

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

@@ -7,7 +7,7 @@
 <% end %>
 
 <fieldset data-hook="admin_user_order_history">
-  <%= paginate @orders %>
+  <%= paginate @orders, theme: 'twitter-bootstrap-4' %>
 
   <% if @orders.any? %>
     <%# TODO add search interface %>
@@ -46,7 +46,7 @@
     </div>
   <% end %>
 
-  <%= paginate @orders %>
+  <%= paginate @orders, theme: 'twitter-bootstrap-4' %>
 </fieldset>
 
 <%= render 'spree/admin/users/lifetime_stats' %>

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

@@ -1,15 +1,15 @@
 <script type='text/template' id='variant_autocomplete_template'>
-  <div class='variant-autocomplete-item media'>
-    <figure class='variant-image media-left'>
+  <div class='variant-autocomplete-item media align-items-center'>
+    <figure class='variant-image media-left mb-0 mr-3'>
       {{#if variant.image }}
-        <img src='{{variant.image}}' class="thumbnail no-marginb" />
+        <img src='{{variant.image}}' class="thumbnail mb-0" />
       {{ else }}
-        <img src='<%= image_path("noimage/mini.png") %>' class="thumbnail no-marginb" />
+        <img src='<%= image_path("noimage/mini.png") %>' class="thumbnail mb-0" />
       {{/if}}
     </figure>
 
     <div class='variant-details media-body'>
-      <h5 class="variant-name media-heading">{{variant.name}}</h5>
+      <h5 class="variant-name media-heading h6 mb-0">{{variant.name}}</h5>
       {{#if variant.option_values}}
         {{#each variant.option_values}}
           <strong>{{this.option_type_presentation}}:</strong> {{this.presentation}}<br/>

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

@@ -1,7 +1,7 @@
 <script type='text/template' id='variant_autocomplete_stock_template'>
 
   <label><%= Spree.t(:select_stock) %></label>
-  <table class="table table-condensed table-bordered stock-levels no-marginb" data-hook="stock-levels">
+  <table class="table table-condensed table-bordered stock-levels mb-0" data-hook="stock-levels">
     <thead>
       <th><%= Spree.t(:location) %></th>
       <th><%= Spree.t(:count_on_hand) %></th>

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

@@ -1,5 +1,5 @@
 <div class="row">
-  <div data-hook="admin_variant_form_fields" class="col-xs-12 col-md-6">
+  <div data-hook="admin_variant_form_fields" class="col-12 col-md-6">
     <div data-hook="variants">
       <% @product.option_types.each do |option_type| %>
         <div class="form-group" data-hook="presentation">
@@ -38,7 +38,7 @@
     </div>
   </div>
 
-  <div class="col-xs-12 col-md-6" data-hook="admin_variant_form_additional_fields">
+  <div class="col-12 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) %>

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

@@ -21,11 +21,11 @@
     <td>
       <input class="quantity form-control" id="item_quantity" type="number" min="1" value="1" max="{{max_quantity}}">
     </td>
-    <td class='actions'>
-      <a href='#' class='cancel-split with-tip btn btn-sm btn-default' title='Cancel'>
+    <td class='actions text-center'>
+      <a href='#' class='cancel-split with-tip btn btn-sm btn-outline-secondary' title='Cancel'>
         <span class="icon icon-arrow-left"></span>
       </a>
-      <a href='#' class='save-split with-tip btn btn-sm btn-success' title='Save'>
+      <a href='#' class='icon-save-split save-split with-tip btn btn-sm btn-success' title='Save'>
         <span class="icon icon-save"></span>
       </a>
     </td>

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

@@ -51,7 +51,7 @@
     <p class='first_add_option_types no-objects-found' data-hook="first_add_option_types">
       <%= Spree.t(:to_add_variants_you_must_first_define) %>
       <%= link_to(Spree.t(:option_types), spree.admin_product_url(@product)) %>
-      <% if can?(:display, Spree::OptionType) && can?([:create, :display], Spree::OptionValue) %>
+      <% if can?(:read, Spree::OptionType) && can?([:create, :read], Spree::OptionValue) %>
         <%= Spree.t(:and) %>
         <%= link_to Spree.t(:option_values), spree.admin_option_types_url %>
       <% end %>
@@ -60,6 +60,6 @@
 <% else %>
   <% content_for :page_actions do %>
     <%= button_link_to(Spree.t(:new_variant), spree.new_admin_product_variant_url(@product), { remote: :true, icon: 'add', :'data-update' => 'new_variant', class: 'btn-success', id: 'new_var_link' }) if can? :create, Spree::Variant %>
-    <%= button_link_to (@deleted.blank? ? Spree.t(:show_deleted) : Spree.t(:show_active)), spree.admin_product_variants_url(@product, deleted: @deleted.blank? ? "on" : "off"), { class: 'btn-default', icon: 'filter' } %>
+    <%= button_link_to (@deleted.blank? ? Spree.t(:show_deleted) : Spree.t(:show_active)), spree.admin_product_variants_url(@product, deleted: @deleted.blank? ? "on" : "off"), { class: 'btn-outline-secondary', icon: 'filter' } %>
   <% end %>
 <% end %>

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

@@ -1,11 +1,13 @@
 <%= 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' %>
-    </fieldset>
+  <div class="card mb-3 bg-light">
+    <div class="card-body">
+      <fieldset data-hook="admin_variant_new_form">
+        <legend class="border-bottom"><%= Spree.t(:new_variant) %></legend>
+        <%= render partial: 'form', locals: { f: f } %>
+        <%= render partial: 'spree/admin/shared/new_resource_links' %>
+      </fieldset>
+    </div>
   </div>
 <% end %>

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

@@ -1,12 +1,12 @@
 <div id="country_members" data-hook="member">
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h1 class="panel-title">
+  <div class="card mb-3">
+    <div class="card-header">
+      <h1 class="card-title mb-0 h5">
         <%= Spree.t(:countries) %>
       </h1>
     </div>
 
-    <div class="panel-body">
+    <div class="card-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" } %>

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

@@ -1,11 +1,11 @@
 <div class="row">
-  <div class="col-xs-12 col-md-6" data-hook="admin_zone_form_fields">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h1 class="panel-title"><%= Spree.t(:general_settings)%></h1>
+  <div class="col-12 col-lg-6" data-hook="admin_zone_form_fields">
+    <div class="card mb-3">
+      <div class="card-header">
+        <h1 class="card-title mb-0 h5"><%= Spree.t(:general_settings)%></h1>
       </div>
 
-      <div class="panel-body">
+      <div class="card-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' %>
@@ -17,7 +17,7 @@
           <%= zone_form.text_field :description, class: 'form-control' %>
         <% end %>
 
-        <div data-hook="default" class="checkbox">
+        <div data-hook="default" class="form-group checkbox">
           <%= label_tag "zone[#{:default_tax}" do %>
             <%= zone_form.check_box :default_tax %>
             <%= Spree.t(:default_tax_zone) %>
@@ -26,13 +26,13 @@
 
         <div data-hook="type" class="form-group">
           <strong><%= Spree.t(:type) %></strong>
-          <div class="radio">
+          <div class="radio my-2">
             <%= label_tag :country_based do %>
               <%= zone_form.radio_button('kind', 'country', { id: 'country_based' }) %>
               <%= Spree.t(:country_based) %>
             <% end %>
           </div>
-          <div class="radio">
+          <div class="radio my-2">
             <%= label_tag :state_based do %>
               <%= zone_form.radio_button('kind', 'state', { id: 'state_based' }) %>
               <%= Spree.t(:state_based) %>
@@ -42,7 +42,7 @@
       </div>
     </div>
   </div>
-  <div class="col-xs-12 col-md-6">
+  <div class="col-12 col-lg-6">
     <%= render partial: 'state_members', locals: { zone_form: zone_form }%>
     <%= render partial: 'country_members', locals: { zone_form: zone_form } %>
   </div>