spree_backend 4.1.1 → 4.5.0

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

@@ -5,66 +5,67 @@
   <%= Spree.t(:new_product) %>
 <% end %>
 
-<%= form_for [:admin, @product], html: { multipart: true } do |f| %>
-  <fieldset data-hook="new_product">
-    <%= f.field_container :name, class: ['form-group'] do %>
-      <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
-      <%= f.text_field :name, class: 'form-control title', required: :required %>
-      <%= f.error_message_on :name %>
-    <% end %>
+<div class="card">
+  <div class="card-body">
+    <%= form_for [:admin, @product], html: { multipart: true } do |f| %>
+      <fieldset data-hook="new_product">
+        <%= f.field_container :name do %>
+          <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
+          <%= f.text_field :name, class: 'form-control title', required: :required %>
+          <%= f.error_message_on :name %>
+        <% end %>
 
-    <div data-hook="new_product_attrs" class="row">
-      <% unless @product.has_variants? %>
-        <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' %>
-            <%= f.error_message_on :sku %>
+        <div data-hook="new_product_attrs" class="row">
+          <% unless @product.has_variants? %>
+            <div data-hook="new_product_sku" class="col-12 col-md-4">
+              <%= f.field_container :sku do %>
+                <%= f.label :sku, Spree.t(:sku) %>
+                <%= f.text_field :sku, size: 16, class: 'form-control' %>
+                <%= f.error_message_on :sku %>
+              <% end %>
+            </div>
           <% end %>
-        </div>
-      <% end %>
 
-      <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-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 %>
-          <%= f.error_message_on :price %>
-        <% end %>
-      </div>
+          <div data-hook="new_product_prototype" class="col-12 col-md-4">
+            <%= f.field_container :prototype do %>
+              <%= f.label :prototype_id, Spree.t(:prototype) %>
+              <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, { include_blank: true }, { class: 'select2-clear w-100' } %>
+            <% end %>
+          </div>
 
-      <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 %>
-          <%= f.text_field :available_on, class: 'datepicker form-control' %>
-        <% end %>
-      </div>
+          <div data-hook="new_product_price" class="col-12 col-md-4">
+            <%= f.field_container :price do %>
+            <%= f.label :price, raw(Spree.t(:master_price) + required_span_tag) %>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><%= currency_symbol(current_currency) %></span>
+              </div>
+              <%= f.text_field :price, value: number_to_currency(@product.price, unit: ''), class: 'form-control', required: :required %>
+            </div>
+              <%= f.error_message_on :price %>
+            <% end %>
+          </div>
 
-      <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 }) %>
-          <%= f.error_message_on :shipping_category_id %>
-        <% end %>
-      </div>
+          <div data-hook="new_product_shipping_category" class="col-12 col-md-4">
+            <%= f.field_container :shipping_category do %>
+              <%= f.label :shipping_category_id, raw(Spree.t(:shipping_categories) + required_span_tag) %>
+              <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { selected: @product.shipping_category_id }, { class: 'select2 w-100' }) %>
+              <%= f.error_message_on :shipping_category_id %>
+            <% end %>
+          </div>
 
-    </div>
+        </div>
 
-    <div data-hook="product-from-prototype" id="product-from-prototype">
-      <%= render template: 'spree/admin/prototypes/show' if @prototype %>
-    </div>
+        <div data-hook="product-from-prototype" id="product-from-prototype">
+          <%= render template: 'spree/admin/prototypes/show' if @prototype %>
+        </div>
 
-    <%= render partial: 'spree/admin/shared/new_resource_links' %>
+        <%= render partial: 'spree/admin/shared/new_resource_links' %>
 
-  </fieldset>
-<% end %>
+      </fieldset>
+    <% end %>
+  </div>
+</div>
 
 <script type="text/javascript">
 //<![CDATA[

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

@@ -6,73 +6,74 @@
     <%= render 'add_stock_form' %>
   </div>
 <% end %>
-
-<div class="card mb-3">
-  <table class="table table-bordered" id="listing_product_stock">
-    <thead>
-      <tr data-hook="admin_product_stock_management_index_headers">
-        <th colspan="2"><%= Spree.t(:variant) %></th>
-        <th colspan="3"><%= Spree.t(:stock_location_info) %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @variants.each do |variant| %>
-        <% if variant.stock_items.present? %>
-          <tr id="<%= spree_dom_id variant %>" data-hook="admin_product_stock_management_index_rows">
-            <td class="image text-center">
-              <% if variant.images.present? %>
-                <%= image_tag main_app.url_for(variant.images.first.url(:mini)) %>
-              <% end %>
-            </td>
-            <td>
-              <%= variant.sku_and_options_text %>
-              <%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :put, class: 'toggle_variant_track_inventory' do %>
-                <div class="checkbox">
-                  <%= label_tag "track_inventory_#{ variant.id }" do %>
-                    <%= check_box_tag 'track_inventory', 1, variant.track_inventory?,
-                                      class: 'track_inventory_checkbox', id: "track_inventory_#{ variant.id }" %>
-                    <%= Spree.t(:track_inventory) %>
-                    <%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?,
-			class: 'variant_track_inventory',
-			id: "variant_track_inventory_#{variant.id}" %>
-                  <% end %>
-                </div>
-              <% end if can?(:update, @product) && can?(:update, variant) %>
-            </td>
-
-            <td colspan="3" class="stock_location_info">
-              <table class="table table-bordered mb-0">
-                <thead>
-                  <th><%= Spree.t(:stock_location) %></th>
-                  <th class="text-center"><%= Spree.t(:count_on_hand) %></th>
-                  <th class="text-center"><%= Spree.t(:backorderable) %></th>
-                  <th class="actions text-center"></th>
-                </thead>
-                <tbody>
-                  <% variant.stock_items.each do |item| %>
-                    <% next unless @stock_locations.include?(item.stock_location) %>
-                    <tr id="stock-item-<%= item.id %>">
-                      <td><%= item.stock_location.name %></td>
-                      <td class="text-center"><%= item.count_on_hand %></td>
-                      <td class="text-center">
-                        <%= form_tag admin_stock_item_path(item), method: :put, class: 'toggle_stock_item_backorderable' do %>
-                          <%= check_box_tag 'stock_item[backorderable]', true,
-                                item.backorderable?,
-                                class: 'stock_item_backorderable',
-                                id: "stock_item_backorderable_#{item.stock_location.id}" %>
-                        <% end if can? :update, item %>
-                      </td>
-                      <td class="actions actions-1 text-center">
-                        <%= link_to_with_icon('delete', Spree.t(:remove), [:admin, item], method: :delete, remote: true, class: 'icon_link btn btn-danger btn-sm', data: { action: :remove, confirm: Spree.t(:are_you_sure) }, no_text: true) if can? :destroy, item %>
-                      </td>
-                    </tr>
-                  <% end %>
-                </tbody>
-              </table>
-            </td>
-          <% end %>
+<div class="mb-3">
+  <div class="table-responsive border rounded bg-white">
+    <table class="table" id="listing_product_stock">
+      <thead class="text-muted">
+        <tr data-hook="admin_product_stock_management_index_headers">
+          <th colspan="2"><%= Spree.t(:variant) %></th>
+          <th colspan="3"><%= Spree.t(:stock_location_info) %></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
+      </thead>
+      <tbody>
+        <% @variants.each do |variant| %>
+          <% if variant.stock_items.present? %>
+            <tr id="<%= spree_dom_id variant %>" data-hook="admin_product_stock_management_index_rows">
+              <td class="image text-center">
+                <%= small_image(variant) %>
+              </td>
+              <td>
+                <%= variant.sku_and_options_text %>
+                <%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :put, class: 'toggle_variant_track_inventory' do %>
+                  <div class="checkbox">
+                    <%= label_tag "track_inventory_#{ variant.id }" do %>
+                      <%= check_box_tag 'track_inventory', 1, variant.track_inventory?,
+                                        class: 'track_inventory_checkbox', id: "track_inventory_#{ variant.id }" %>
+                      <%= Spree.t(:track_inventory) %>
+                      <%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?,
+        class: 'variant_track_inventory',
+        id: "variant_track_inventory_#{variant.id}" %>
+                    <% end %>
+                  </div>
+                <% end if can?(:update, @product) && can?(:update, variant) %>
+              </td>
+
+              <td colspan="3" class="stock_location_info">
+                <table class="table border rounded mb-0">
+                  <thead class="text-muted">
+                    <th><%= Spree.t(:stock_location) %></th>
+                    <th class="text-center"><%= Spree.t(:count_on_hand) %></th>
+                    <th class="text-center"><%= Spree.t(:backorderable) %></th>
+                    <th class="actions text-center"></th>
+                  </thead>
+                  <tbody>
+                    <% variant.stock_items.each do |item| %>
+                      <% next unless @stock_locations.include?(item.stock_location) %>
+                      <tr id="stock-item-<%= item.id %>">
+                        <td><%= link_to item.stock_location.name, spree.edit_admin_stock_location_path(item.stock_location) %></td>
+                        <td class="text-center"><%= item.count_on_hand %></td>
+                        <td class="text-center">
+                          <%= form_tag admin_stock_item_path(item), method: :put, class: 'toggle_stock_item_backorderable' do %>
+                            <%= check_box_tag 'stock_item[backorderable]', true,
+                                  item.backorderable?,
+                                  class: 'stock_item_backorderable',
+                                  id: "stock_item_backorderable_#{item.stock_location.id}" %>
+                          <% end if can? :update, item %>
+                        </td>
+                        <td class="actions">
+                          <span class="d-flex justify-content-center">
+                            <%= link_to_with_icon('delete.svg', Spree.t(:remove), [:admin, item], method: :delete, remote: true, class: 'icon_link btn btn-danger btn-sm', data: { action: :remove, confirm: Spree.t(:are_you_sure) }, no_text: true) if can? :destroy, item %>
+                          </span>
+                        </td>
+                      </tr>
+                    <% end %>
+                  </tbody>
+                </table>
+              </td>
+            <% end %>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
 </div>

data/app/views/spree/admin/promotion_actions/create.js.erb

@@ -1,6 +1,6 @@
 $('#actions').append('<%= escape_javascript( render(partial: 'spree/admin/promotions/promotion_action', object: @promotion_action) ) %>');
 $('#actions .no-objects-found').hide();
-$(document).ready(function(){
+$(document).ready(function() {
   $(".variant_autocomplete").variantAutocomplete();
   //enable select2 functions for recently added box
   $('.type-select.select2').last().select2();

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

@@ -1,11 +1,11 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_category } %>
 
-<%= f.field_container :name, class: ['form-group'] do %>
+<%= f.field_container :name do %>
   <%= f.label :name %>
   <%= f.text_field :name, class: 'form-control' %>
   <%= f.error_message_on :name %>
 <% end %>
-<%= f.field_container :code, class: ['form-group'] do %>
+<%= f.field_container :code do %>
   <%= f.label :code %>
   <%= f.text_field :code, class: 'form-control' %>
 <% end %>

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

@@ -3,12 +3,14 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_promotion_category), new_object_url, icon: 'add', class: 'btn-success' %>
+  <%= button_link_to Spree.t(:new_promotion_category), new_object_url, icon: 'add.svg', class: 'btn-success' %>
 <% end if can?(:create, Spree::PromotionCategory) %>
 
 <% if @promotion_categories.any? %>
+
+<div class="table-responsive border rounded bg-white">
   <table class="table">
-    <thead>
+    <thead class="text-muted">
       <th><%= Spree::PromotionCategory.human_attribute_name :name %></th>
       <th><%= Spree::PromotionCategory.human_attribute_name :code %></th>
       <th></th>
@@ -18,16 +20,19 @@
         <tr>
           <td><%= promotion_category.name %></td>
           <td><%= promotion_category.code %></td>
-          <td class="actions actions-2 text-right">
-            <%= link_to_edit promotion_category, no_text: true if can?(:edit, promotion_category) %>
-            <%= link_to_delete promotion_category, no_text: true if can?(:delete, promotion_category) %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit promotion_category, no_text: true if can?(:edit, promotion_category) %>
+              <%= link_to_delete promotion_category, no_text: true if can?(:delete, promotion_category) %>
+            </span>
           </td>
         </tr>
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::PromotionCategory)) %>,
     <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>

data/app/views/spree/admin/promotion_rules/create.js.erb

@@ -7,4 +7,4 @@ $('.user_picker').userAutocomplete();
 $('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');
 $('#promotion_rule_type').select2();
 
-set_taxon_select('#product_taxon_ids')
+$('#product_taxon_ids').taxonAutocomplete()

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

@@ -1,24 +1,24 @@
 <div class="card-header">
-  <h1 class="card-title mb-0 h5">
+  <h5 class="card-title mb-0 h6">
     <%= Spree.t(:promotion_actions) %>
-  </h1>
+  </h5>
 </div>
 <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] } ) %>
+    <% options = options_for_select(  @actions.map(&:name).map {|name| [ Spree.t("promotion_action_types.#{name.demodulize.underscore}.name"), name] } ) %>
 
     <div class="form-group">
-      <%= label_tag :action_type, Spree.t(:add_action_of_type)%>
+      <%= label_tag :action_type, Spree.t(:add_action_of_type) %>
       <%= select_tag 'action_type', options, class: 'select2' %>
     </div>
     <div class="form-actions">
-      <%= button Spree.t(:add), 'plus', 'submit', class: "btn-success" %>
+      <%= button Spree.t(:add), 'add.svg', 'submit', class: "btn-success" %>
     </div>
 
   <% end %>
 
   <%= form_for @promotion, url: spree.admin_promotion_path(@promotion), method: :put do |f| %>
-    <div id="actions" class="filter_list margint">
+    <div id="actions" class="filter_list mt-3">
       <% if @promotion.actions.any? %>
         <%= render partial: 'promotion_action',  collection: @promotion.actions %>
       <% else %>
@@ -28,8 +28,7 @@
       <% end %>
     </div>
     <div class="actions promotion-update">
-      <%= button Spree.t('actions.update'), 'save' %>
+      <%= button Spree.t('actions.update'), 'save.svg' %>
     </div>
   <% end %>
-
 </div>

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

@@ -1,26 +1,28 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion } %>
 
-<div class="row" id="general_fields" >
-  <div class="col-6 col-md-3">
-    <%= f.field_container :name, class: ['form-group'] do %>
+<div class="row" id="general_fields">
+  <div class="col-12 col-lg-4">
+    <%= f.field_container :name do %>
       <%= f.label :name %>
       <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>
     <% end %>
 
-    <%= f.field_container :code, class: ['form-group'] do %>
-      <%= f.label :code %>
-      <%= f.text_field :code, class: 'form-control' %>
-    <% end %>
+    <div class="form-group">
+      <%= f.field_container :code do %>
+        <%= f.label :code %>
+        <%= f.text_field :code, class: 'form-control' %>
+      <% end %>
 
-    <%= f.field_container :generate_code, class: ['checkbox'] do %>
-      <%= f.label :generate_code do %>
-        <%= f.check_box :generate_code %>
-        <%= Spree.t(:generate_code) %>
+      <%= f.field_container :generate_code, class: ['checkbox'] do %>
+        <%= f.label :generate_code do %>
+          <%= f.check_box :generate_code %>
+          <%= Spree.t(:generate_code) %>
+        <% end %>
       <% end %>
-    <% end %>
+    </div>
 
-    <%= f.field_container :path, class: ['form-group'] do %>
+    <%= f.field_container :path do %>
       <%= f.label :path %>
       <%= f.text_field :path, class: 'form-control' %>
     <% end %>
@@ -33,35 +35,66 @@
     <% end %>
   </div>
 
-  <div class="col-12 col-md-6">
-    <%= f.field_container :description, class: ['form-group'] do %>
+  <div class="col-12 col-lg-4">
+    <%= f.field_container :description do %>
       <%= f.label :description %>
       <%= f.text_area :description, rows: 7, class: 'form-control' %>
     <% end %>
 
-    <%= f.field_container :category, class: ['form-group'] do %>
+    <%= f.field_container :category do %>
       <%= f.label :promotion_category %>
-      <%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
+      <%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2 w-100' }) %>
+    <% end %>
+
+    <% if @stores.count > 1 %>
+      <%= f.field_container :stores do %>
+        <%= f.label :promotion_stores, Spree.t(:stores) %>
+        <%= collection_select(:promotion, :store_ids, @stores, :id, :unique_name, {}, { multiple: true, class: 'select2' }) %>
+      <% end %>
     <% end %>
   </div>
 
-  <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' %>
+  <div id="expiry_fields" class="col-12 col-lg-4">
+    <div class="form-group">
+      <%= f.field_container :usage_limit do %>
+        <%= f.label :usage_limit, Spree.t('limit_usage_to') %>
+        <%= f.number_field :usage_limit, min: 0, class: 'form-control hide-number-toggle' %>
+      <% end %>
       <small class="form-text text-muted">
         <%= Spree.t(:current_promotion_usage, count: @promotion.credits_count) %>
       </small>
-    <% end %>
-
+    </div>
     <div id="starts_at_field" class="form-group">
       <%= f.label :starts_at %>
-      <%= f.datetime_field :starts_at, class: 'form-control' %>
+      <div class="input-group datePickerFrom"
+           data-wrap="true"
+           data-enable-time="true"
+           data-alt-format="<%= Spree.t(:fpr_human_friendly_date_time_format, scope: 'date_picker', default: 'M j, Y H:i') %>"
+           data-max-date="<%= @promotion.expires_at %>">
+        <%= f.datetime_field :starts_at,
+                             class: 'form-control',
+                             placeholder: Spree.t('starting_from'),
+                             'data-input':'' %>
+
+        <%= render partial: 'spree/admin/shared/cal_close' %>
+      </div>
     </div>
 
     <div id="expires_at_field" class="form-group">
       <%= f.label :expires_at %>
-      <%= f.datetime_field :expires_at, class: 'form-control' %>
+      <div class="input-group datePickerTo"
+           data-wrap="true"
+           data-enable-time='true'
+           data-alt-format="<%= Spree.t(:fpr_human_friendly_date_time_format, scope: 'date_picker', default: 'M j, Y H:i') %>"
+           data-min-date="<%= @promotion.starts_at %>">
+        <%= f.datetime_field :expires_at,
+                              placeholder:Spree.t('ends_at'),
+                              class: 'form-control',
+                              'data-input':'' %>
+
+        <%= render partial: 'spree/admin/shared/cal_close' %>
+      </div>
     </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 %> card  mb-3" id="<%= dom_id promotion_action %>">
   <% type_name = promotion_action.class.name.demodulize.underscore %>
   <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>
+    <%= link_to_with_icon 'delete.svg', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), remote: true, method: :delete, class: 'delete order-2' %>
+    <h5 class="card-title h5 mb-0 promotion-title"><%= Spree.t("promotion_action_types.#{type_name}.description") %></h5>
   </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,14 +1,14 @@
 <div class="promotion_rule promotion-block card mb-3" id="<%= dom_id promotion_rule %>">
   <% type_name = promotion_rule.class.name.demodulize.underscore %>
   <div class="card-header d-flex justify-content-between">
-    <%= link_to_with_icon 'delete', '',
+    <%= link_to_with_icon 'delete.svg', '',
       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'>
+    <h5 class='card-title h5 mb-0 promotion-title'>
       <%= Spree.t("promotion_rule_types.#{type_name}.description") %>
-    </h3>
+    </h5>
   </div>
   <% param_prefix = "promotion[promotion_rules_attributes][#{promotion_rule.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>

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

@@ -1,18 +1,18 @@
 <div class="card-header">
-  <h1 class="card-title mb-0 h5">
+  <h5 class="card-title mb-0 h6">
     <%= Spree.t(:rules) %>
-  </h1>
+  </h5>
 </div>
 <div id="rule_fields" class="card-body">
 
   <%= 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) %>
       <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), class: 'select2') %>
     </div>
     <div class="form-actions">
-      <%= button Spree.t(:add), 'plus', 'submit', class: "btn-success" %>
+      <%= button Spree.t(:add), 'add.svg', 'submit', class: "btn-success" %>
     </div>
 
   <% end %>
@@ -29,7 +29,7 @@
       <% end %>
     </div>
 
-    <div id="rules" class="filter_list margint">
+    <div id="rules" class="filter_list mt-3">
       <% if @promotion.rules.any? %>
         <%= render partial: 'promotion_rule', collection: @promotion.rules, locals: {} %>
       <% else %>
@@ -40,7 +40,7 @@
     </div>
 
     <div class="promotion-update actions">
-      <%= button Spree.t('actions.update'), 'ok' %>
-    </div>    
+      <%= button Spree.t('actions.update'), 'save.svg' %>
+    </div>
   <% end %>
 </div>

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

@@ -23,7 +23,7 @@
     <% end %>
   </div>
   <% if promotion_action.calculator.respond_to?(:preferences) %>
-    <div class="alert alert-info js-warning margint mb-0">
+    <div class="alert alert-info js-warning mt-3 mb-0">
       <%= Spree.t(:calculator_settings_warning) %>
     </div>
   <% end %>

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

@@ -14,6 +14,7 @@
           <%= label_tag field_name, Spree.t(key.to_s) %>
           <%= preference_field_tag(field_name,
                                    promotion_action.calculator.get_preference(key),
+                                   key: key,
                                    type: promotion_action.calculator.preference_type(key)) %>
         <% end %>
         <%= hidden_field_tag "#{param_prefix}[calculator_attributes][id]", promotion_action.calculator.id %>
@@ -21,7 +22,7 @@
     <% end %>
   </div>
   <% if promotion_action.calculator.respond_to?(:preferences) %>
-    <div class="alert alert-info js-warning margint mb-0">
+    <div class="alert alert-info js-warning mt-3 mb-0">
       <%= Spree.t(:calculator_settings_warning) %>
     </div>
   <% end %>

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

@@ -15,7 +15,7 @@
         <% 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" %>
+          <%= select_tag "#{line_item_prefix}[variant_id]", line_item.variant_id, class: 'variant_autocomplete d-block w-100' %>
         </div>
         <div class="form-group mb-0">
           <%= label_tag "#{line_item_prefix}_quantity", Spree.t(:quantity) %>

data/app/views/spree/admin/promotions/calculators/_default_fields.html.erb

@@ -5,6 +5,7 @@
     <%= preference_field_tag(
       field_name,
       calculator.get_preference(key),
-      type: calculator.preference_type(key)) %>
+      type: calculator.preference_type(key),
+      key: key) %>
   </div>
 <% end %>

data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb

@@ -40,7 +40,7 @@
             name="{{valueField.name}}" type="text" value={{valueField.value}}>
         </div>
       </div>
-      <a class="js-remove-tier btn btn-outline-secondary btn-sm"><span class="icon icon-delete"></span></a>
+      <a class="js-remove-tier btn btn-light btn-sm"><span class="icon icon-delete"></span></a>
     </div>
   </div>
 </script>