spree_backend 3.7.14.1 → 4.0.0.beta

data/app/views/spree/admin/products/_add_stock_form.html.erb

@@ -1,12 +1,12 @@
-<div class="panel-heading">
-  <h1 class="panel-title">
+<div class="card-header">
+  <h1 class="card-title mb-0 h5">
     <%= Spree.t(:add_stock) %>
   </h1>
 </div>
-<div class="panel-body">
+<div class="card-body">
   <%= form_for [:admin, Spree::StockMovement.new], url: admin_stock_items_path do |f| %>
     <div data-hook="admin_stock_movements_form_fields" class="row">
-      <div class="col-xs-12 col-md-2">
+      <div class="col-12 col-lg-2">
         <div class="form-group">
           <%= f.field_container :quantity do %>
             <%= f.label :quantity, Spree.t(:quantity) %>
@@ -14,7 +14,7 @@
           <% end %>
         </div>
       </div>
-      <div class="col-xs-12 col-md-5">
+      <div class="col-12 col-lg-5">
         <div class="form-group">
           <%= f.field_container :stock_location do %>
             <%= label_tag :stock_location_id, Spree.t(:stock_location) %>
@@ -24,7 +24,7 @@
         </div>
       </div>
 
-      <div class="col-xs-12 col-md-5">
+      <div class="col-12 col-lg-5">
         <div class="form-group">
           <%= f.field_container :variant_id do %>
             <%= label_tag 'variant_id', Spree.t(:variant) %>

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

@@ -3,7 +3,7 @@
 
   <div class="row">
 
-    <div class="col-xs-12 col-md-8" data-hook="admin_product_form_left">
+    <div class="col-12 col-md-8" data-hook="admin_product_form_left">
       <div data-hook="admin_product_form_name">
         <%= f.field_container :name, class: ['form-group'] do %>
           <%= f.label :name, raw(Spree.t(:name) + content_tag(:span, ' *', class: 'required')) %>
@@ -29,7 +29,7 @@
       </div>
     </div>
 
-    <div class="col-xs-12 col-md-4" data-hook="admin_product_form_right">
+    <div class="col-12 col-md-4" data-hook="admin_product_form_right">
       <div data-hook="admin_product_form_price">
         <%= f.field_container :price, class: ['form-group'] do %>
           <%= f.label :price, raw(Spree.t(:master_price) + content_tag(:span, ' *', class: "required")) %>
@@ -85,51 +85,53 @@
       </div>
 
       <% if @product.has_variants? %>
-        <div data-hook="admin_product_form_multiple_variants" class="well">
-          <%= f.label :skus, Spree.t(:sku).pluralize %>
-          <div class="info marginb">
-            <%= Spree.t(:info_product_has_multiple_skus, count: @product.variants.size) %>
-            <ul class="text_list">
-              <% @product.variants.first(5).each do |variant| %>
-                <li><%= variant.sku %></li>
+        <div data-hook="admin_product_form_multiple_variants" class="card bg-light mb-3">
+          <div class="card-body">
+            <%= f.label :skus, Spree.t(:sku).pluralize %>
+            <div class="info marginb">
+              <%= Spree.t(:info_product_has_multiple_skus, count: @product.variants.size) %>
+              <ul class="text_list">
+                <% @product.variants.first(5).each do |variant| %>
+                  <li><%= variant.sku %></li>
+                <% end %>
+              </ul>
+              <% if @product.variants.size > 5 %>
+                <em>
+                  <%= Spree.t(:info_number_of_skus_not_shown, count: @product.variants.size - 5) %>
+                </em>
               <% end %>
-            </ul>
-            <% if @product.variants.size > 5 %>
-              <em>
-                <%= Spree.t(:info_number_of_skus_not_shown, count: @product.variants.size - 5) %>
-              </em>
-            <% end %>
-          </div>
-          <div class="info-actions">
-            <% if can?(:admin, Spree::Variant) %>
-              <%= link_to_with_icon 'variants', Spree.t(:manage_variants), spree.admin_product_variants_url(@product), class: "btn btn-default" %>
-            <% end %>
+            </div>
+            <div class="info-actions">
+              <% if can?(:admin, Spree::Variant) %>
+                <%= link_to_with_icon 'variants', Spree.t(:manage_variants), spree.admin_product_variants_url(@product), class: "btn btn-outline-secondary" %>
+              <% end %>
+            </div>
           </div>
         </div>
       <% else %>
         <div id="shipping_specs" class="row">
-          <div class="col-xs-12 col-md-6">
+          <div class="col-12 col-md-6">
             <div id="shipping_specs_weight_field" data-hook="admin_product_form_weight" class="form-group">
               <%= f.label :weight, Spree.t(:weight) %>
               <%= f.text_field :weight, value: number_with_precision(@product.weight, precision: 2), size: 4, class: 'form-control' %>
             </div>
           </div>
 
-          <div class="col-xs-12 col-md-6">
+          <div class="col-12 col-md-6">
             <div id="shipping_specs_height_field" data-hook="admin_product_form_height" class="form-group">
               <%= f.label :height, Spree.t(:height) %>
               <%= f.text_field :height, value: number_with_precision(@product.height, precision: 2), size: 4, class: 'form-control' %>
             </div>
           </div>
 
-          <div class="col-xs-12 col-md-6">
+          <div class="col-12 col-md-6">
             <div id="shipping_specs_width_field" data-hook="admin_product_form_width" class="form-group">
               <%= f.label :width, Spree.t(:width) %>
               <%= f.text_field :width, value: number_with_precision(@product.width, precision: 2), size: 4, class: 'form-control' %>
             </div>
           </div>
 
-          <div class="col-xs-12 col-md-6">
+          <div class="col-12 col-md-6">
             <div id="shipping_specs_depth_field" data-hook="admin_product_form_depth" class="form-group">
               <%= f.label :depth, Spree.t(:depth) %>
               <%= f.text_field :depth, value: number_with_precision(@product.depth, precision: 2), size: 4, class: 'form-control' %>
@@ -195,13 +197,6 @@
     <% end %>
   </div>
 
-  <div data-hook="admin_product_form_tag_list">
-    <%= f.field_container :tag_list, class: ['form-group'] do %>
-      <%= f.label :tag_list, Spree.t(:tags) %>
-      <%= f.hidden_field :tag_list, value: @product.tag_list.join(','), class: 'tag_picker' %>
-    <% end %>
-  </div>
-
   <div data-hook="admin_product_form_meta">
     <div data-hook="admin_product_form_meta_title">
       <%= f.field_container :meta_title, class: ['form-group'] do %>

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

@@ -1,6 +1,6 @@
 <% content_for :page_actions do %>
   <% if frontend_available? %>
-    <%= button_link_to Spree.t(:preview_product), product_url(@product), { class: "btn-default", icon: 'eye-open', id: 'admin_preview_product', target: :_blank } %>
+    <%= button_link_to Spree.t(:preview_product), product_url(@product), { class: "btn-outline-secondary", icon: 'eye-open', id: 'admin_preview_product', target: :_blank } %>
   <% end %>
   <% if can?(:create, Spree::Product) %>
     <%= button_link_to Spree.t(:new_product), new_object_url, { class: "btn-success", icon: 'add', id: 'admin_new_product' } %>

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

@@ -12,27 +12,27 @@
     <%= search_form_for [:admin, @search] do |f| %>
       <%- locals = {f: f} %>
       <div data-hook="admin_products_index_search" class="row">
-        <div class="col-xs-12 col-md-6">
+        <div class="col-12 col-lg-6">
           <div class="form-group">
             <%= f.label :name_cont, Spree.t(:name) %>
             <%= f.text_field :name_cont, size: 15, class: "form-control js-quick-search-target 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 :variants_including_master_sku_cont, Spree.t(:sku) %>
             <%= f.text_field :variants_including_master_sku_cont, size: 15, class: "form-control js-filterable" %>
           </div>
         </div>
-        <div class="col-xs-12 col-md-12">
-          <div class="field checkbox">
+        <div class="col-12">
+          <div class="field checkbox mb-2">
             <label>
               <%= f.check_box :deleted_at_null, {checked: params[:q][:deleted_at_null] == '0'}, '0', '1' %>
               <%= Spree.t(:show_deleted) %>
             </label>
           </div>
 
-          <div class="field checkbox">
+          <div class="field checkbox mb-2">
             <label>
               <%= f.check_box :not_discontinued, {checked: params[:q][:not_discontinued] == '0'}, '0', '1' %>
               <%= Spree.t(:show_discontinued ) %>

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

@@ -15,7 +15,7 @@
 
     <div data-hook="new_product_attrs" class="row">
       <% unless @product.has_variants? %>
-        <div data-hook="new_product_sku" class="col-xs-12 col-md-4">
+        <div data-hook="new_product_sku" class="col-12 col-md-4">
           <%= f.field_container :sku, class: ['form-group'] do %>
             <%= f.label :sku, Spree.t(:sku) %>
             <%= f.text_field :sku, size: 16, class: 'form-control' %>
@@ -24,14 +24,14 @@
         </div>
       <% end %>
 
-      <div data-hook="new_product_prototype" class="col-xs-12 col-md-4">
+      <div data-hook="new_product_prototype" class="col-12 col-md-4">
         <%= f.field_container :prototype, class: ['form-group'] do %>
           <%= f.label :prototype_id, Spree.t(:prototype) %>
           <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, {include_blank: true}, {class: 'select2'} %>
         <% end %>
       </div>
 
-      <div data-hook="new_product_price" class="col-xs-12 col-md-4">
+      <div data-hook="new_product_price" class="col-12 col-md-4">
         <%= f.field_container :price, class: ['form-group'] do %>
           <%= f.label :price, Spree.t(:master_price) %> <span class="required">*</span>
           <%= f.text_field :price, value: number_to_currency(@product.price, unit: ''), class: 'form-control', required: :required %>
@@ -39,7 +39,7 @@
         <% end %>
       </div>
 
-      <div data-hook="new_product_available_on" class="col-xs-12 col-md-4">
+      <div data-hook="new_product_available_on" class="col-12 col-md-4">
         <%= f.field_container :available_on, class: ['form-group'] do %>
           <%= f.label :available_on, Spree.t(:available_on) %>
           <%= f.error_message_on :available_on %>
@@ -47,7 +47,7 @@
         <% end %>
       </div>
 
-      <div data-hook="new_product_shipping_category" class="col-xs-12 col-md-4">
+      <div data-hook="new_product_shipping_category" class="col-12 col-md-4">
         <%= f.field_container :shipping_category, class: ['form-group'] do %>
           <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %><span class="required">*</span>
           <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2', required: :required }) %>

data/app/views/spree/admin/products/stock.html.erb

@@ -2,12 +2,12 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @product } %>
 
 <% if can? :create, Spree::StockMovement %>
-  <div id="add_stock_form" class="panel panel-default">
+  <div id="add_stock_form" class="card mb-3">
     <%= render 'add_stock_form' %>
   </div>
 <% end %>
 
-<div class="panel panel-default">
+<div class="card mb-3">
   <table class="table table-bordered" id="listing_product_stock">
     <thead>
       <tr data-hook="admin_product_stock_management_index_headers">
@@ -41,7 +41,7 @@
             </td>
 
             <td colspan="3" class="stock_location_info">
-              <table class="table table-bordered no-marginb">
+              <table class="table table-bordered mb-0">
                 <thead>
                   <th><%= Spree.t(:stock_location) %></th>
                   <th class="text-center"><%= Spree.t(:count_on_hand) %></th>

data/app/views/spree/admin/promotions/_actions.html.erb

@@ -1,10 +1,10 @@
-<div class="panel-heading">
-  <h1 class="panel-title">
+<div class="card-header">
+  <h1 class="card-title mb-0 h5">
     <%= Spree.t(:promotion_actions) %>
   </h1>
 </div>
-<div id="action_fields" class="panel-body">
-  <%= form_tag spree.admin_promotion_promotion_actions_path(@promotion), remote: true, id: 'new_promotion_action_form' do %>
+<div id="action_fields" class="card-body">
+  <%= form_tag spree.admin_promotion_promotion_actions_path(@promotion), remote: true, id: 'new_promotion_action_form', class: 'mb-3' do %>
     <% options = options_for_select(  Rails.application.config.spree.promotions.actions.map(&:name).map {|name| [ Spree.t("promotion_action_types.#{name.demodulize.underscore}.name"), name] } ) %>
 
     <div class="form-group">

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

@@ -1,7 +1,7 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion } %>
 
 <div class="row" id="general_fields" >
-  <div class="col-xs-6 col-md-3">
+  <div class="col-6 col-md-3">
     <%= f.field_container :name, class: ['form-group'] do %>
       <%= f.label :name %>
       <%= f.text_field :name, class: 'form-control' %>
@@ -33,7 +33,7 @@
     <% end %>
   </div>
 
-  <div class="col-xs-12 col-md-6">
+  <div class="col-12 col-md-6">
     <%= f.field_container :description, class: ['form-group'] do %>
       <%= f.label :description %>
       <%= f.text_area :description, rows: 7, class: 'form-control' %>
@@ -45,23 +45,23 @@
     <% end %>
   </div>
 
-  <div id="expiry_fields" class="col-xs-6 col-md-3">
+  <div id="expiry_fields" class="col-6 col-md-3">
     <%= f.field_container :usage_limit do %>
       <%= f.label :usage_limit %>
       <%= f.number_field :usage_limit, min: 0, class: 'form-control' %>
-      <p class="help-block">
+      <small class="form-text text-muted">
         <%= Spree.t(:current_promotion_usage, count: @promotion.credits_count) %>
-      </p>
+      </small>
     <% end %>
 
     <div id="starts_at_field" class="form-group">
       <%= f.label :starts_at %>
-      <%= f.text_field :starts_at, value: datepicker_field_value(@promotion.starts_at), class: 'datepicker datepicker-from form-control' %>
+      <%= f.datetime_field :starts_at, class: 'form-control' %>
     </div>
 
     <div id="expires_at_field" class="form-group">
       <%= f.label :expires_at %>
-      <%= f.text_field :expires_at, value: datepicker_field_value(@promotion.expires_at), class: 'datepicker datepicker-to form-control' %>
+      <%= f.datetime_field :expires_at, class: 'form-control' %>
     </div>
   </div>
 </div>

data/app/views/spree/admin/promotions/_promotion_action.html.erb

@@ -1,8 +1,8 @@
-<div class="promotion_action promotion-block <%= promotion_action.type.to_s.demodulize.underscore %> panel panel-default" id="<%= dom_id promotion_action %>">
+<div class="promotion_action promotion-block <%= promotion_action.type.to_s.demodulize.underscore %> card  mb-3" id="<%= dom_id promotion_action %>">
   <% type_name = promotion_action.class.name.demodulize.underscore %>
-  <div class="panel-heading">
-    <%= link_to_with_icon 'delete', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), remote: true, method: :delete, class: 'delete pull-right' %>
-    <h3 class="panel-title promotion-title"><%= Spree.t("promotion_action_types.#{type_name}.description") %></h3>
+  <div class="card-header d-flex justify-content-between">
+    <%= link_to_with_icon 'delete', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), remote: true, method: :delete, class: 'delete order-2' %>
+    <h3 class="card-title h5 mb-0 promotion-title"><%= Spree.t("promotion_action_types.#{type_name}.description") %></h3>
   </div>
   <% param_prefix = "promotion[promotion_actions_attributes][#{promotion_action.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_action.id %>

data/app/views/spree/admin/promotions/_promotion_rule.html.erb

@@ -1,11 +1,18 @@
-<div class="promotion_rule promotion-block panel panel-default" id="<%= dom_id promotion_rule %>">
+<div class="promotion_rule promotion-block card mb-3" id="<%= dom_id promotion_rule %>">
   <% type_name = promotion_rule.class.name.demodulize.underscore %>
-  <div class="panel-heading">
-    <%= link_to_with_icon 'delete', '', spree.admin_promotion_promotion_rule_path(@promotion, promotion_rule), remote: true, method: :delete, class: 'delete pull-right' %>
-    <h3 class='panel-title promotion-title <%= 'no-text' if type_name == 'user_logged_in' || type_name == 'first_order'%>'><%= Spree.t("promotion_rule_types.#{type_name}.description") %></h3>
+  <div class="card-header d-flex justify-content-between">
+    <%= link_to_with_icon 'delete', '',
+      spree.admin_promotion_promotion_rule_path(@promotion, promotion_rule),
+      remote: true,
+      method: :delete,
+      class: 'delete order-2' %>
+    <h3 class='card-title h5 mb-0 promotion-title'>
+      <%= Spree.t("promotion_rule_types.#{type_name}.description") %>
+    </h3>
   </div>
   <% param_prefix = "promotion[promotion_rules_attributes][#{promotion_rule.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>
 
-  <%= render partial: "spree/admin/promotions/rules/#{type_name}", locals: { promotion_rule: promotion_rule, param_prefix: param_prefix } %>
+  <%= render partial: "spree/admin/promotions/rules/#{type_name}",
+    locals: { promotion_rule: promotion_rule, param_prefix: param_prefix } %>
 </div>

data/app/views/spree/admin/promotions/_rules.html.erb

@@ -1,11 +1,11 @@
-<div class="panel-heading">
-  <h1 class="panel-title">
+<div class="card-header">
+  <h1 class="card-title mb-0 h5">
     <%= Spree.t(:rules) %>
   </h1>
 </div>
-<div id="rule_fields" class="panel-body">
+<div id="rule_fields" class="card-body">
 
-  <%= form_tag spree.admin_promotion_promotion_rules_path(@promotion), remote: true, id: 'new_product_rule_form' do %>
+  <%= form_tag spree.admin_promotion_promotion_rules_path(@promotion), remote: true, id: 'new_product_rule_form', class: 'mb-3' do %>
     
     <div class="form-group">
       <%= label_tag :promotion_rule_type, Spree.t(:add_rule_of_type) %>
@@ -20,7 +20,7 @@
   <%= form_for @promotion, url: object_url, method: :put do |f| %>
     <div id="promotion-policy-select">
       <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>
-        <div class="radio">
+        <div class="radio my-2">
           <%= f.label "match_policy_#{policy}" do %>
             <%= f.radio_button :match_policy, policy %>
             <%= Spree.t "promotion_form.match_policies.#{policy}" %>

data/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb

@@ -1,6 +1,6 @@
-<div class="panel-body calculator-fields">
-  <div class="row no-marginb">
-    <div class="form-group col-xs-12 col-md-6 no-marginb">
+<div class="card-body calculator-fields">
+  <div class="row mb-0">
+    <div class="form-group col-12 col-md-6 mb-0">
       <% field_name = "#{param_prefix}[calculator_type]" %>
       <%= label_tag field_name, Spree.t(:calculator) %>
       <%= select_tag field_name,
@@ -8,7 +8,7 @@
                      class: 'type-select select2' %>
     </div>
     <% unless promotion_action.new_record? %>
-      <div class="form-group col-xs-12 col-md-6 no-marginb settings">
+      <div class="form-group col-12 col-md-6 mb-0 settings">
         <% type_name = promotion_action.calculator.type.demodulize.underscore %>
         <% if lookup_context.exists?("fields",
             ["spree/admin/promotions/calculators/#{type_name}"], true) %>
@@ -23,7 +23,7 @@
     <% end %>
   </div>
   <% if promotion_action.calculator.respond_to?(:preferences) %>
-    <div class="alert alert-info js-warning margint no-marginb">
+    <div class="alert alert-info js-warning margint mb-0">
       <%= Spree.t(:calculator_settings_warning) %>
     </div>
   <% end %>

data/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb

@@ -1,6 +1,6 @@
-<div class="panel-body calculator-fields">
-  <div class="row no-marginb">
-    <div class="form-group col-xs-12 col-md-6 no-marginb">
+<div class="card-body calculator-fields">
+  <div class="row mb-0">
+    <div class="form-group col-12 col-md-6 mb-0">
       <% field_name = "#{param_prefix}[calculator_type]" %>
       <%= label_tag field_name, Spree.t(:calculator) %>
       <%= select_tag field_name,
@@ -8,7 +8,7 @@
                     class: 'type-select select2' %>
     </div>
     <% unless promotion_action.new_record? %>
-      <div class="form-group col-xs-12 col-md-6 no-marginb settings">
+      <div class="form-group col-12 col-md-6 mb-0 settings">
         <% promotion_action.calculator.preferences.keys.map do |key| %>
           <% field_name = "#{param_prefix}[calculator_attributes][preferred_#{key}]" %>
           <%= label_tag field_name, Spree.t(key.to_s) %>
@@ -21,7 +21,7 @@
     <% end %>
   </div>
   <% if promotion_action.calculator.respond_to?(:preferences) %>
-    <div class="alert alert-info js-warning margint no-marginb">
+    <div class="alert alert-info js-warning margint mb-0">
       <%= Spree.t(:calculator_settings_warning) %>
     </div>
   <% end %>

data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb

@@ -1,4 +1,4 @@
-<div class="panel-body calculator-fields">
+<div class="card-body calculator-fields">
   <% promotion_action.promotion_action_line_items.each do |item| %>
     <% variant = item.variant %>
 
@@ -15,9 +15,9 @@
         <% line_item_prefix = "#{param_prefix}[promotion_action_line_items_attributes][#{index}]" %>
         <div class="form-group">
           <%= label_tag "#{line_item_prefix}_variant_id", Spree.t(:variant) %>
-          <%= hidden_field_tag "#{line_item_prefix}[variant_id]", line_item.variant_id, class: "variant_autocomplete fullwidth-input" %>
+          <%= hidden_field_tag "#{line_item_prefix}[variant_id]", line_item.variant_id, class: "variant_autocomplete" %>
         </div>
-        <div class="form-group no-marginb">
+        <div class="form-group mb-0">
           <%= label_tag "#{line_item_prefix}_quantity", Spree.t(:quantity) %>
           <%= number_field_tag "#{line_item_prefix}[quantity]", line_item.quantity, min: 1, class: 'form-control' %>
         </div>