spree_backend 3.7.14.1 → 4.0.0.beta

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

@@ -1,5 +1,7 @@
 <% if can?(:admin, current_store) && Spree::Config[:admin_show_version] %>
-  <div class="spree-version hidden-xs hidden-sm">
+  <small
+    class="spree-version <%= 'd-md-block' if cookies['sidebar-minimized'] == 'false' %> d-none font-weight-bold ml-3 my-3 text-muted"
+    aria-label="Spree Commerce version">
     <%= Spree.version %>
-  </div>
+  </small>
 <% end %>

data/app/views/spree/admin/shared/named_types/_form.html.erb

@@ -4,7 +4,7 @@
     <%= f.text_field :name, class: 'form-control' %>
     <%= f.error_message_on :name %>
   <% end %>
-  <div class="checkbox">
+  <div class="form-group checkbox">
     <%= label_tag :active do %>
       <%= f.check_box :active %>
       <%= Spree.t(:active) %>

data/app/views/spree/admin/shared/sub_menu/_configuration.html.erb

@@ -1,4 +1,4 @@
-<ul data-hook="admin_configurations_sidebar_menu" class="collapse nav nav-pills nav-stacked" id="sidebar-configuration">
+<ul data-hook="admin_configurations_sidebar_menu" class="border-top bg-white collapse nav nav-pills nav-stacked" id="sidebar-configuration">
   <%= configurations_sidebar_menu_item(Spree.t(:general_settings), spree.edit_admin_general_settings_path) if can? :manage, Spree::Config %>
   <%= configurations_sidebar_menu_item(Spree.t(:stores), spree.admin_stores_path) if can? :manage, Spree::Store %>
   <%= configurations_sidebar_menu_item(Spree.t(:tax_categories), spree.admin_tax_categories_path) if can? :manage, Spree::TaxCategory %>

data/app/views/spree/admin/shared/sub_menu/_product.html.erb

@@ -1,4 +1,4 @@
-<ul id="sidebar-product" class="collapse nav nav-pills nav-stacked" data-hook="admin_product_sub_tabs">
+<ul id="sidebar-product" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_product_sub_tabs">
   <%= tab :products, match_path: '/products' %>
   <%= tab :option_types, match_path: '/option_types' %>
   <%= tab :properties %>

data/app/views/spree/admin/shared/sub_menu/_promotion.html.erb

@@ -1,4 +1,4 @@
-<ul id="sidebar-promotions" class="collapse nav nav-pills nav-stacked" data-hook="admin_promotion_sub_tabs">
+<ul id="sidebar-promotions" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_promotion_sub_tabs">
   <%= tab :promotions %>
   <%= tab :promotion_categories %>
 </ul>

data/app/views/spree/admin/shared/sub_menu/_returns.html.erb

@@ -1,4 +1,4 @@
-<ul id="sidebar-returns" class="collapse nav nav-pills nav-stacked" data-hook="admin_returns_sub_tabs">
+<ul id="sidebar-returns" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_returns_sub_tabs">
   <%= tab :return_authorizations, url: spree.admin_return_authorizations_path, match_path: '/return_authorizations' if can?(:admin, Spree::ReturnAuthorization) %>
   <%= tab :customer_returns, url: spree.admin_customer_returns_path, match_path: '/customer_returns' if can?(:admin, Spree::CustomerReturn) %>
 </ul>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_shipping_method_form_fields">
   <div class="row">
-    <div data-hook="admin_shipping_method_form_name_field" class="col-xs-12 col-md-6">
+    <div data-hook="admin_shipping_method_form_name_field" class="col-12 col-lg-6">
       <%= f.field_container :name, class: ['form-group'] do %>
         <%= f.label :name, Spree.t(:name) %>
         <%= f.text_field :name, class: 'form-control' %>
@@ -8,7 +8,7 @@
       <% end %>
     </div>
 
-    <div data-hook="admin_shipping_method_form_display_field" class="col-xs-12 col-md-6">
+    <div data-hook="admin_shipping_method_form_display_field" class="col-12 col-lg-6">
       <%= f.field_container :display_on, class: ['form-group'] do %>
         <%= f.label :display_on, Spree.t(:display) %>
         <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, { include_blank: true }, { class: 'select2' }) %>
@@ -18,7 +18,7 @@
   </div>
 
   <div class="row">
-    <div data-hook="admin_shipping_method_form_internal_name_field" class="col-xs-12 col-md-4">
+    <div data-hook="admin_shipping_method_form_internal_name_field" class="col-12 col-lg-4">
       <%= f.field_container :admin_name, class: ['form-group'] do %>
         <%= f.label :admin_name, Spree.t(:internal_name) %>
         <%= f.text_field :admin_name, class: 'form-control', label: false %>
@@ -26,7 +26,7 @@
       <% end %>
     </div>
 
-    <div data-hook="admin_shipping_method_form_code" class="col-xs-12 col-md-4">
+    <div data-hook="admin_shipping_method_form_code" class="col-12 col-lg-4">
       <%= f.field_container :code, class: ['form-group'] do %>
         <%= f.label :code, Spree.t(:code) %>
         <%= f.text_field :code, class: 'form-control', label: false %>
@@ -34,7 +34,7 @@
       <% end %>
     </div>
 
-    <div data-hook="admin_shipping_method_form_tracking_url_field" class="col-xs-12 col-md-4">
+    <div data-hook="admin_shipping_method_form_tracking_url_field" class="col-12 col-lg-4">
       <%= f.field_container :tracking_url, class: ['form-group'] do %>
         <%= f.label :tracking_url, Spree.t(:tracking_url) %>
         <%= f.text_field :tracking_url, class: 'form-control', placeholder: Spree.t(:tracking_url_placeholder) %>
@@ -45,15 +45,15 @@
 </div>
 
 <div class="row">
-  <div data-hook="admin_shipping_method_form_availability_fields" class="col-xs-12 col-md-6">
-    <div class="panel panel-default categories">
-      <div class="panel-heading">
-        <h1 class="panel-title">
+  <div data-hook="admin_shipping_method_form_availability_fields" class="col-12 col-lg-6">
+    <div class="card mb-3 categories">
+      <div class="card-header">
+        <h1 class="card-title mb-0 h5">
           <%= Spree.t(:shipping_categories) %>
         </h1>
       </div>
 
-      <div class="panel-body">
+      <div class="card-body">
         <%= f.field_container :categories, class: ['form-group'] do %>
           <% Spree::ShippingCategory.all.each do |category| %>
             <div class="checkbox">
@@ -69,15 +69,15 @@
     </div>
   </div>
 
-  <div class="col-xs-12 col-md-6">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h1 class="panel-title">
+  <div class="col-12 col-lg-6">
+    <div class="card mb-3">
+      <div class="card-header">
+        <h1 class="card-title mb-0 h5">
           <%= Spree.t(:zones) %>
         </h1>
       </div>
 
-      <div class="panel-body">
+      <div class="card-body">
         <%= f.field_container :zones, class: ['form-group'] do %>
           <% shipping_method_zones = @shipping_method.zones.to_a %>
           <% Spree::Zone.all.each do |zone| %>
@@ -96,19 +96,19 @@
 </div>
 
 <div class="row">
-  <div data-hook="admin_shipping_method_form_calculator_fields" class="col-xs-12 col-md-6">
+  <div data-hook="admin_shipping_method_form_calculator_fields" class="col-12 col-lg-6">
     <%= render partial: 'spree/admin/shared/calculator_fields', locals: { f: f } %>
   </div>
 
-  <div class="col-xs-12 col-md-6">
-    <div class="panel panel-default tax_categories">
-      <div class="panel-heading">
-        <h1 class="panel-title">
+  <div class="col-12 col-lg-6">
+    <div class="card mb-3 tax_categories">
+      <div class="card-header">
+        <h1 class="card-title mb-0 h5">
           <%= Spree.t(:tax_category) %>
         </h1>
       </div>
 
-      <div class="panel-body">
+      <div class="card-body">
         <%= f.field_container :categories, class: ['form-group'] do %>
           <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, { include_blank: true }, class: "select2" %>
           <%= f.error_message_on :tax_category_id %>

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

@@ -1,12 +1,12 @@
 <div data-hook="admin_state_form_fields" class="row">
-  <div class="col-xs-12 col-md-6">
+  <div class="col-12 col-md-6">
     <%= f.field_container :name, class: ['form-group'] do %>
       <%= f.label :name, Spree.t(:name) %>
       <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
-  <div class="col-xs-12 col-md-6">
+  <div class="col-12 col-md-6">
     <%= f.field_container :abbr, class: ['form-group'] do %>
       <%= f.label :abbr, Spree.t(:abbreviation) %>
       <%= f.text_field :abbr, class: 'form-control' %>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_stock_locations_form_fields">
   <div class="row">
-    <div class="col-xs-12 col-md-9" data-hook="stock_location_names">
+    <div class="col-12 col-md-9" data-hook="stock_location_names">
       <div data-hook="stock_location_name">
         <%= f.field_container :name, class: ['form-group']  do %>
           <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
@@ -16,27 +16,27 @@
       </div>
     </div>
 
-    <div class="col-xs-12 col-md-3" data-hook="stock_location_status">
+    <div class="col-12 col-md-3" data-hook="stock_location_status">
       <strong><%= Spree.t(:status) %></strong>
-      <div class="checkbox" data-hook="stock_location_active">
+      <div class="checkbox my-2" data-hook="stock_location_active">
         <%= label_tag :active do %>
           <%= f.check_box :active %>
           <%= Spree.t(:active) %>
         <% end %>
       </div>
-      <div class="checkbox" data-hook="stock_location_default">
+      <div class="checkbox my-2" data-hook="stock_location_default">
         <%= label_tag :default do %>
           <%= f.check_box :default %>
           <%= Spree.t(:default) %>
         <% end %>
       </div>
-      <div class="checkbox" data-hook="stock_location_backorderable_default">
+      <div class="checkbox my-2" data-hook="stock_location_backorderable_default">
         <%= label_tag :backorderable_default do %>
           <%= f.check_box :backorderable_default %>
           <%= Spree.t(:backorderable_default) %>
         <% end %>
       </div>
-      <div class="checkbox" data-hook="stock_location_propagate_all_variants">
+      <div class="checkbox my-2" data-hook="stock_location_propagate_all_variants">
         <%= label_tag :propagate_all_variants do %>
           <%= f.check_box :propagate_all_variants %>
           <%= Spree.t(:propagate_all_variants) %>

data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb

@@ -2,27 +2,27 @@
   <fieldset>
     <legend><%= Spree.t(:move_stock_between_locations)%></legend>
     <div data-hook="admin_stock_movements_form_fields" class="row">
-      <div class="col-xs-12 col-md-5">
+      <div class="col-12 col-md-5">
         <div class="form-group" id="stock_movement_transfer_from_field">
           <%= label_tag :stock_location_from_id, Spree.t(:transfer_from_location) %>
           <%= select_tag :stock_location_from_id, options_from_collection_for_select(@stock_locations, :id, :name), class: 'select2' %>
         </div>
       </div>
-      <div class="col-xs-12 col-md-5">
+      <div class="col-12 col-md-5">
         <div class="form-group" id="stock_movement_transfer_to_field">
           <%= label_tag :stock_location_to_id, Spree.t(:transfer_to_location) %>
           <%= select_tag :stock_location_to_id, options_from_collection_for_select(@stock_locations, :id, :name), class: 'select2' %>
         </div>
       </div>
 
-      <div class="col-xs-12 col-md-5">
+      <div class="col-12 col-md-5">
         <div class="form-group" id="stock_movement_variant_id_field">
           <%= label_tag 'variant_id', Spree.t(:variant) %>
           <%= select_tag :variant_id, options_from_collection_for_select(@variants, :id, :name_and_sku), class: 'select2' %>
         </div>
       </div>
 
-      <div class="col-xs-12 col-md-5">
+      <div class="col-12 col-md-5">
         <div class="form-group" id="stock_movement_quantity_field">
           <%= label_tag 'quantity', Spree.t(:quantity) %>
           <%= number_field_tag :quantity, 1, class: 'form-control' %>

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

@@ -40,4 +40,4 @@
   </div>
 <% end %>
 
-<%= paginate @stock_movements %>
+<%= paginate @stock_movements, theme: 'twitter-bootstrap-4' %>

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

@@ -6,45 +6,47 @@
   <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { icon: 'add', class: 'btn-success' } %>
 <% end if can? :create, Spree::StockTransfer %>
 
-<div data-hook="admin_orders_index_search" class="well">
-  <fieldset>
-    <legend><%= Spree.t(:search) %></legend>
-    <%= search_form_for @q, url: admin_stock_transfers_path do |f| %>
+<div data-hook="admin_orders_index_search" class="card bg-light mb-3">
+  <div class="card-body">
+    <fieldset>
+      <legend class="border-bottom"><%= Spree.t(:search) %></legend>
+      <%= search_form_for @q, url: admin_stock_transfers_path do |f| %>
 
-      <div class="row no-marginb">
-        <div class="col-xs-12 col-md-4">
-          <div class="form-group">
-            <%= f.label :reference_cont, Spree.t(:reference_contains) %>
-            <%= f.text_field :reference_cont, class: 'form-control' %>
+        <div class="row mb-0">
+          <div class="col-12 col-lg-4">
+            <div class="form-group">
+              <%= f.label :reference_cont, Spree.t(:reference_contains) %>
+              <%= f.text_field :reference_cont, class: 'form-control' %>
+            </div>
           </div>
-        </div>
 
-        <div class="col-xs-12 col-md-4">
-          <div class="form-group">
-            <%= f.label :source_location, Spree.t(:source) %>
-            <%= f.select :source_location_id_eq,
-                 options_from_collection_for_select(@stock_locations, :id, :name, @q.source_location_id_eq),
-                 { include_blank: true }, class: 'select2' %>
+          <div class="col-12 col-lg-4">
+            <div class="form-group">
+              <%= f.label :source_location, Spree.t(:source) %>
+              <%= f.select :source_location_id_eq,
+                  options_from_collection_for_select(@stock_locations, :id, :name, @q.source_location_id_eq),
+                  { include_blank: true }, class: 'select2' %>
+            </div>
           </div>
-        </div>
 
-        <div class="col-xs-12 col-md-4">
-          <div class="form-group">
-            <%= f.label :destination_location, Spree.t(:destination) %>
-            <%= f.select :destination_location_id_eq,
-                 options_from_collection_for_select(@stock_locations, :id, :name, @q.destination_location_id_eq),
-                 { include_blank: true }, class: 'select2' %>
+          <div class="col-12 col-lg-4">
+            <div class="form-group">
+              <%= f.label :destination_location, Spree.t(:destination) %>
+              <%= f.select :destination_location_id_eq,
+                  options_from_collection_for_select(@stock_locations, :id, :name, @q.destination_location_id_eq),
+                  { include_blank: true }, class: 'select2' %>
+            </div>
           </div>
         </div>
-      </div>
 
-      <div class="form-actions">
-        <div data-hook="admin_stock_transfers_index_search_buttons">
-          <%= button Spree.t(:filter_results), 'search' %>
+        <div class="form-actions">
+          <div data-hook="admin_stock_transfers_index_search_buttons">
+            <%= button Spree.t(:filter_results), 'search' %>
+          </div>
         </div>
-      </div>
-    <% end %>
-  </fieldset>
+      <% end %>
+    </fieldset>
+  </div>
 </div>
 
 <% if @stock_transfers.any? %>
@@ -66,7 +68,7 @@
           <td><%= stock_transfer.source_location.try(:name) %></td>
           <td><%= stock_transfer.destination_location.try(:name) %></td>
           <td class="actions actions-1">
-            <%= link_to_with_icon 'show', Spree.t(:show), admin_stock_transfer_path(stock_transfer), class: 'btn btn-default btn-sm', no_text: true, data: {action: 'view'} %>
+            <%= link_to_with_icon 'show', Spree.t(:show), admin_stock_transfer_path(stock_transfer), class: 'btn btn-outline-secondary btn-sm', no_text: true, data: {action: 'view'} %>
           </td>
         </tr>
       <% end %>
@@ -79,4 +81,4 @@
   </div>
 <% end %>
 
-<%= paginate @stock_transfers %>
+<%= paginate @stock_transfers, theme: 'twitter-bootstrap-4' %>

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

@@ -20,14 +20,14 @@
 </script>
 
 <%= form_tag admin_stock_transfers_path, method: :post do %>
-  <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(:transfer_stock) %>
       </h1>
     </div>
 
-    <div class="panel-body">
+    <div class="card-body">
       <div data-hook="admin_stock_movements_form_fields">
         <div class="form-group" id="stock_movement_reference_field">
           <%= label_tag 'reference', raw("#{Spree.t(:reference)} (#{Spree.t(:optional)})") %>
@@ -53,23 +53,25 @@
     </div>
   </div>
 
-  <div class="panel panel-default" id="add-variant-to-transfer">
-    <div class="panel-heading">
-      <h1 class="panel-title">
+  <div class="card mb-3" id="add-variant-to-transfer">
+    <div class="card-header">
+      <h1 class="card-title mb-0 h5">
         <%= Spree.t(:add_variant) %>
       </h1>
     </div>
 
-    <div class="panel-body">
+    <div class="card-body">
       <div class="row">
-        <div class="col-xs-12 col-md-8">
+        <div class="col-12 col-lg-8">
           <div class="form-group" id="stock_movement_variant_id_field">
             <%= label_tag 'variant_id', Spree.t(:variant) %>
-            <%= hidden_field_tag 'transfer_variant', {}, {class: 'fullwidth-input'} %>
+            <div class="input-group">
+              <%= hidden_field_tag 'transfer_variant', {}, { class: 'w-100'} %>
+            </div>
           </div>
         </div>
 
-        <div class="col-xs-12 col-md-4">
+        <div class="col-12 col-lg-4">
           <div class="form-group" id="stock_movement_quantity_field">
             <%= label_tag :transfer_variant_quantity, Spree.t(:quantity) %>
             <div class="input-group">

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

@@ -29,12 +29,11 @@
     <%= f.text_field :mail_from_address, class: 'form-control', required: true %>
     <%= f.error_message_on :mail_from_address %>
   <% end %>
-  <%# TODO: uncomment this and add support for default_currency in store %>
-  <%# <%= f.field_container :default_currency, class: ['form-group'] do %1> %>
-  <%#   <%= f.label :default_currency, Spree.t(:default_currency)  %1> %>
-  <%#   <%= f.text_field :default_currency, class: 'form-control' %1> %>
-  <%#   <%= f.error_message_on :default_currency %1> %>
-  <%# <% end %1> %>
+  <%= f.field_container :default_currency, class: ['form-group'] do %>
+    <%= f.label :default_currency, Spree.t(:default_currency) %>
+    <%= f.text_field :default_currency, class: 'form-control' %>
+    <%= f.error_message_on :default_currency %>
+  <% end %>
   <%= f.field_container :code, class: ['form-group'] do %>
     <%= f.label :code, Spree.t(:code)  %>
     <%= f.text_field :code, class: 'form-control', required: true %>

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

@@ -11,6 +11,7 @@
     <thead>
       <th><%= Spree.t(:name) %></th>
       <th><%= Spree.t(:url) %></th>
+      <th><%= Spree.t(:currency) %></th>
       <th data-hook="admin_stores_index_header_actions" class="actions"></th>
     <thead>
     <tbody>
@@ -18,11 +19,12 @@
         <tr>
           <td><%= store.name %></td>
           <td><%= store.url %></td>
+          <td><%= store.default_currency %></td>
           <td class="actions actions-2 text-center" data-hook="admin_stores_index_row_actions">
             <% if store.default %>
               <%= button_link_to(Spree.t(:store_default), '#', class: 'btn-success btn-sm') %>
             <% else %>
-              <%= button_link_to(Spree.t(:store_set_default_button), spree.set_default_admin_store_path(store), method: :post, class: 'btn-default btn-sm') if can?(:edit, store) %>
+              <%= button_link_to(Spree.t(:store_set_default_button), spree.set_default_admin_store_path(store), method: :post, class: 'btn-outline-secondary btn-sm') if can?(:edit, store) %>
             <% end %>
             <%= link_to_edit_url spree.edit_admin_store_path(store), no_text: true if can?(:edit, store) %>
             <%= link_to_delete store, no_text: true, url: spree.admin_store_path(store) if can?(:destroy, store) %>

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

@@ -15,7 +15,7 @@
     <%= f.text_field :description, class: 'form-control' %>
   <% end %>
 
-  <%= f.field_container :is_default, class: ['checkbox'] do %>
+  <%= f.field_container :is_default, class: ['form-group checkbox'] do %>
     <%= f.label :is_default do %>
       <%= f.check_box :is_default %>
       <%= Spree.t(:default) %>