spree_backend 4.2.0.rc2 → 4.2.1

data/app/views/spree/admin/payments/source_views/_gateway.html.erb

@@ -8,7 +8,7 @@
       </tr>
       <tr>
         <th><%= Spree.t(:card_type) %>:</th>
-        <td><%= payment.source.cc_type %></td>
+        <td><%= payment.source.display_brand %></td>
       </tr>
       <tr>
         <th><%= Spree.t(:card_number) %>:</th>

data/app/views/spree/admin/prices/_variant_prices.html.erb

@@ -2,11 +2,11 @@
   <div id="variant_prices-table-wrapper">
     <table class="table sortable">
       <colgroup>
-        <col style="width: 15%" />
-        <col style="width: 30%" />
-        <col style="width: 15%" />
-        <col style="width: 20%" />
-        <col style="width: 20%" />
+        <col style="width: 15%">
+        <col style="width: 30%">
+        <col style="width: 15%">
+        <col style="width: 20%">
+        <col style="width: 20%">
       </colgroup>
       <thead>
         <tr data-hook="variant_prices_header">

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

@@ -6,11 +6,11 @@
 <% end %>
 
 <form>
-  <input class="form-control" placeholder="<%= Spree.t('variant_prices_search_placeholder') %>" type="text" id="variant-price-search"/>
+  <input class="form-control" placeholder="<%= Spree.t('variant_prices_search_placeholder') %>" type="text" id="variant-price-search">
 </form>
 
 <%= form_tag nil, { class: 'form-horizontal' } do %>
-  <div class="mt-3">
+  <div class="my-3">
     <%= render 'variant_prices', variant: @product.master %>
   </div>
   <div class="form-actions" data-hook="buttons">

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

@@ -19,7 +19,7 @@
 <%= form_for @product, url: spree.admin_product_url(@product), method: :put do |f| %>
   <fieldset>
     <div id="prototypes" data-hook></div>
-    <div class=" table-responsive">
+    <div class=" table-responsive mb-3">
       <table id="product_properties" class="table sortable" data-hook data-sortable-link="<%= update_positions_admin_product_product_properties_url %>">
         <thead>
           <tr data-hook="product_properties_header">
@@ -41,7 +41,7 @@
   </fieldset>
 <% end %>
 
-<%= javascript_tag do %>
+<script>
   var properties = <%= raw(@properties.to_json) %>;
   $('#product_properties').on('keydown', 'input.autocomplete', function() {
     already_auto_completed = $(this).is('ac_input');
@@ -50,8 +50,7 @@
       $(this).focus();
     }
   });
-<% end %>
-
+</script>
 
 <style>
   div.ui-helper-hidden-accessible {display:none;}

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

@@ -1,6 +1,4 @@
-
 <div data-hook="admin_product_form_fields">
-
   <div class="row">
 
     <div class="col-12 col-md-8" data-hook="admin_product_form_left">
@@ -56,7 +54,7 @@
       <div data-hook="admin_product_form_cost_currency" class="omega two columns">
         <%= f.field_container :cost_currency, class: ['form-group'] do %>
           <%= f.label :cost_currency, Spree.t(:cost_currency) %>
-          <%= f.text_field :cost_currency, class: 'form-control' %>
+          <%= f.select :cost_currency, currency_options(@product.cost_currency), {}, { class: 'select2' } %>
           <%= f.error_message_on :cost_currency %>
         <% end %>
       </div>
@@ -68,7 +66,8 @@
 
           <div class="input-group datePickerFrom"
                data-wrap="true"
-               data-max-date="<%= @product.discontinue_on %>" >
+               data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
+               data-max-date="<%= @product.discontinue_on %>">
 
             <%= f.text_field :available_on,
                              value: datepicker_field_value(@product.available_on),
@@ -81,7 +80,6 @@
         <% end %>
       </div>
 
-
       <div data-hook="admin_product_form_discontinue_on">
         <%= f.field_container :discontinue_on, class: ['form-group'] do %>
           <%= f.label :discontinue_on, Spree.t(:discontinue_on) %>
@@ -89,7 +87,8 @@
 
           <div class="input-group datePickerTo"
                data-wrap="true"
-               data-min-date="<%= @product.available_on %>" >
+               data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
+               data-min-date="<%= @product.available_on %>">
 
             <%= f.text_field :discontinue_on,
                               value: datepicker_field_value(@product.discontinue_on),
@@ -195,7 +194,7 @@
       <%= f.label :taxon_ids, Spree.t(:taxons) %>
 
       <% if can? :modify, Spree::Classification %>
-        <%= f.hidden_field :taxon_ids, value: @product.taxon_ids.join(',') %>
+        <%= f.select :taxon_ids, options_from_collection_for_select(@product.taxons, :id, :pretty_name, @product.taxons.pluck(:id)), { include_hidden: true }, multiple: true, class: 'select2-hidden-accessible' %>
       <% elsif @product.taxons.any? %>
         <ul class="text_list">
           <% @product.taxons.each do |taxon| %>
@@ -214,7 +213,7 @@
       <%= f.label :option_type_ids, Spree.t(:option_types) %>
 
       <% if can? :modify, Spree::ProductOptionType %>
-        <%= f.hidden_field :option_type_ids, value: @product.option_type_ids.join(',') %>
+        <%= f.select :option_type_ids, options_from_collection_for_select(Spree::OptionType.all, :id, :name, @product.option_types.pluck(:id)), { include_hidden: true }, multiple: true, class: 'select2-hidden-accessible' %>
       <% elsif @product.option_types.any? %>
         <ul class="text_list">
           <% @product.option_types.each do |type| %>
@@ -246,7 +245,7 @@
     <div data-hook="admin_product_form_meta_description">
       <%= f.field_container :meta_description, class: ['form-group'] do %>
         <%= f.label :meta_description, Spree.t(:meta_description) %>
-        <%= f.text_field :meta_description, class: 'form-control' %>
+        <%= f.text_area :meta_description, class: 'form-control' %>
       <% end %>
     </div>
 

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

@@ -64,6 +64,7 @@
     </thead>
     <tbody>
       <% @collection.each do |product| %>
+        <% available_status = available_status(product) %>
           <tr <%== "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows" class="<%= cycle('odd', 'even') %>">
             <td scope="row" class="image">
               <%= link_to edit_admin_product_path(product) do %>
@@ -72,7 +73,7 @@
             </td>
             <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
             <td class="sku"><%= product.sku rescue '' %></td>
-            <td class="status"><%= available_status(product) %> </td>
+            <td class="status"><%= active_badge(available_status == Spree.t(:available), label: available_status) %></td>
             <td class="text-center"><%= display_price(product) %></td>
             <td class="actions " data-hook="admin_products_index_row_actions">
               <span class="d-flex justify-content-end">

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

@@ -27,7 +27,7 @@
       <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'} %>
+          <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, { include_blank: true }, { class: 'select2-clear w-100' } %>
         <% end %>
       </div>
 
@@ -44,7 +44,9 @@
           <%= f.label :available_on, Spree.t(:available_on) %>
           <%= f.error_message_on :available_on %>
 
-          <div class="input-group datepicker" data-wrap="true">
+          <div class="input-group datepicker"
+               data-wrap="true"
+               data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>">
             <%= f.text_field :available_on,
                              value: datepicker_field_value(@product.available_on),
                              placeholder: Spree.t(:select_a_date),
@@ -59,7 +61,7 @@
       <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' }) %>
+          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2 w-100' }) %>
           <%= f.error_message_on :shipping_category_id %>
         <% end %>
       </div>

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

@@ -33,8 +33,8 @@
                                       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}" %>
+      class: 'variant_track_inventory',
+      id: "variant_track_inventory_#{variant.id}" %>
                   <% end %>
                 </div>
               <% end if can?(:update, @product) && can?(:update, variant) %>

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

@@ -8,7 +8,7 @@
     <% 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">
-      <%= 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">
@@ -18,7 +18,7 @@
   <% 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 %>
@@ -31,5 +31,4 @@
       <%= button Spree.t('actions.update'), 'save.svg' %>
     </div>
   <% end %>
-
 </div>

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-12 col-md-3">
+<div class="row" id="general_fields">
+  <div class="col-12 col-lg-4">
     <%= f.field_container :name, class: ['form-group'] do %>
       <%= f.label :name %>
       <%= f.text_field :name, class: 'form-control' %>
@@ -35,7 +35,7 @@
     <% end %>
   </div>
 
-  <div class="col-12 col-md-6">
+  <div class="col-12 col-lg-4">
     <%= f.field_container :description, class: ['form-group'] do %>
       <%= f.label :description %>
       <%= f.text_area :description, rows: 7, class: 'form-control' %>
@@ -43,11 +43,11 @@
 
     <%= f.field_container :category, class: ['form-group'] 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 %>
   </div>
 
-  <div id="expiry_fields" class="col-12 col-md-3">
+  <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') %>
@@ -57,14 +57,13 @@
         <%= Spree.t(:current_promotion_usage, count: @promotion.credits_count) %>
       </small>
     </div>
-
     <div id="starts_at_field" class="form-group">
       <%= f.label :starts_at %>
       <div class="input-group datePickerFrom"
            data-wrap="true"
            data-enable-time="true"
-           data-date-format="<%= Spree.t('js_date_time', scope: 'date_picker') %>"
-           data-max-date="<%= @promotion.expires_at %>" >
+           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 shadow-none',
                              placeholder: Spree.t('starting_from'),
@@ -78,9 +77,9 @@
       <%= f.label :expires_at %>
       <div class="input-group datePickerTo"
            data-wrap="true"
-           data-enable-time= 'true'
-           data-date-format= "<%= Spree.t('js_date_time', scope: 'date_picker') %>"
-           data-min-date="<%= @promotion.starts_at %>" >
+           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 shadow-none',

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

@@ -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 %>

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

@@ -21,7 +21,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/index.html.erb

@@ -64,13 +64,15 @@
           <td><%= link_to promotion.name, edit_admin_promotion_path(promotion) %></td>
           <td><%= promotion.code %></td>
           <td><%= promotion.description %></td>
-          <td><%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit  %></td>
+          <td><%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit %></td>
           <td><%= Spree.t(:current_promotion_usage, count: promotion.credits_count) %></td>
           <td><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td>
-          <td class="actions actions-2" data-hook="admin_promotions_index_row_actions">
-            <%= link_to_edit promotion, no_text: true if can?(:edit, promotion) %>
-            <%= link_to_clone_promotion promotion, no_text: true if can?(:clone, promotion) %>
-            <%= link_to_delete promotion, no_text: true if can?(:delete, promotion) %>
+          <td class="actions" data-hook="admin_promotions_index_row_actions">
+            <span class="d-flex justify-content-end">
+             <%= link_to_edit promotion, no_text: true if can?(:edit, promotion) %>
+             <%= link_to_clone_promotion promotion, no_text: true if can?(:clone, promotion) %>
+             <%= link_to_delete promotion, no_text: true if can?(:delete, promotion) %>
+            </span>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/promotions/rules/_option_value.html.erb

@@ -1,6 +1,6 @@
 <div class="card-body">
   <div class="promo-rule-option-values">
-    <div class="js-promo-rule-option-values"></div>
+    <div class="js-promo-rule-option-values"></div> <!-- display div for option value select -->
     <button class="btn btn-primary btn-success js-add-promo-rule-option-value">
       <%= svg_icon name: "add.svg", width: '16', height: '16' %>
       <%= Spree.t(:add) %>
@@ -12,11 +12,11 @@
   data: { :'original-option-values' => promotion_rule.preferred_eligible_values } %>
 
 <script type="text/x-handlebars-template" id="promo-rule-option-value-option-values-select-name-template">
-  <%= param_prefix %>[preferred_eligible_values][{{productId}}]
+  <%= param_prefix %>[preferred_eligible_values][{{productId}}][]
 </script>
 
 <script type="text/x-handlebars-template" id="promo-rule-option-value-template">
-  <div class="promo-rule-option-value panel card mb-3">
+  <div class="promo-rule-option-value panel card mb-3" id="promo-rule-option-value-{{productId}}">
     <div class="card-header d-flex justify-content-between">
       <label><%= Spree.t(:product) %> <%= Spree.t(:option_values) %></label>
       <a class="js-remove-promo-rule-option-value delete pull-right">
@@ -24,12 +24,13 @@
       </a>
     </div>
     <div class="card-body row p-3">
-      <div class="col-12 col-md-6">
-        <input class="js-promo-rule-option-value-product-select fullwidth" type="hidden" value="{{ productSelect.value }}">
+      <div class="col-12 col-md-6 product-select">
+        <%= select_tag "product", nil, class: 'js-promo-rule-option-value-product-select d-block w-100', id: "promo-rule-option-value-product-select-{{productId}}" %>
       </div>
-      <div class="col-12 col-md-6">
-        <input class="js-promo-rule-option-value-option-values-select fullwidth" name="<%= param_prefix %>[preferred_eligible_values][{{ productSelect.value }}]" type="hidden" value={{optionValuesSelect.value}}>
+      <div class="col-12 col-md-6 option-value-select">
+        <%= select_tag "#{param_prefix}[preferred_eligible_values][{{ productId }}][]", nil, multiple: true, disabled: true, class: 'js-promo-rule-option-value-option-values-select d-none w-100', id: "promo-rule-option-value-option-values-select-{{productId}}" %>
       </div>
     </div>
   </div>
 </script>
+

data/app/views/spree/admin/promotions/rules/_product.html.erb

@@ -1,7 +1,7 @@
 <div class="card-body">
   <div class="form-group products_rule_products">
     <%= label_tag "#{param_prefix}_product_ids_string", Spree.t('product_rule.choose_products') %>
-    <%= hidden_field_tag "#{param_prefix}[product_ids_string]", promotion_rule.product_ids.join(","), class: "product_picker" %>
+    <%= select "#{param_prefix}", 'product_ids_string', options_from_collection_for_select(promotion_rule.products, :id, :name, promotion_rule.products.pluck(:id)), { include_hidden: true }, multiple: true, class: 'product_picker d-block w-100' %>
   </div>
   <div class="form-group mb-0">
     <%= label_tag Spree.t('product_rule.label') %>

data/app/views/spree/admin/promotions/rules/_taxon.html.erb

@@ -1,7 +1,7 @@
 <div class="card-body">
   <div class="form-group taxons_rule_taxons">
-    <%= label_tag "#{param_prefix}_taxon_ids_string", Spree.t('taxon_rule.choose_taxons') %>
-    <%= hidden_field_tag "#{param_prefix}[taxon_ids_string]", promotion_rule.taxon_ids.join(","), class: "taxon_picker", id: 'product_taxon_ids' %>
+    <%= label_tag "#{param_prefix}_taxon_ids", Spree.t('taxon_rule.choose_taxons') %>
+    <%= select_tag "#{param_prefix}[taxon_ids]", options_from_collection_for_select(promotion_rule.taxons, :id, :pretty_name, promotion_rule.taxon_ids), class: 'taxon_picker d-block w-100', multiple: true, id: :product_taxon_ids %>
   </div>
   <div class="form-group mb-0">
     <%= label_tag Spree.t('taxon_rule.label') %>

data/app/views/spree/admin/promotions/rules/_user.html.erb

@@ -1,6 +1,6 @@
 <div class="card-body">
   <div class="form-group mb-0">
     <%= label_tag Spree.t('user_rule.choose_users') %>
-    <input type='hidden' name='<%= param_prefix %>[user_ids_string]' class='user_picker' value='<%= promotion_rule.user_ids.join(",") %>'>
+    <%= select "#{param_prefix}", 'user_ids_string', options_from_collection_for_select(promotion_rule.users, :id, :email, promotion_rule.users.pluck(:id)), { include_hidden: true }, multiple: true, class: 'user_picker d-block w-100' %>
   </div>
 </div>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_prototype_form_fields">
   <%= f.field_container :name, class: ['form-group'] do %>
-    <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
+    <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br>
     <%= f.text_field :name, class: 'form-control' %>
     <%= f.error_message_on :name %>
   <% end %>

data/app/views/spree/admin/prototypes/show.html.erb

@@ -13,7 +13,7 @@
             <% ot.option_values.each do |ov| %>
               <li>
                 <%= label_tag "option_value_#{ov.id}" do %>
-                  <%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), id: "option_value_#{ov.id}", class: "option-value"  %>
+                  <%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), id: "option_value_#{ov.id}", class: "option-value" %>
                   <div class="option-value__color" style="--presentation: <%= ov.presentation %>"></div>
                 <% end %>
               </li>

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

@@ -11,11 +11,11 @@
   <fieldset>
     <div data-hook="admin_refund_form_fields">
       <div class="form-group">
-        <%= f.label :amount, Spree.t(:amount) %><br/>
+        <%= f.label :amount, Spree.t(:amount) %><br>
         <%= @refund.amount %>
       </div>
       <div class="form-group">
-        <%= f.label :refund_reason_id, Spree.t(:reason) %><br/>
+        <%= f.label :refund_reason_id, Spree.t(:reason) %><br>
         <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {}, {class: 'select2'}) %>
       </div>
     </div>