spree_backend 4.2.0.rc3 → 4.2.2

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

@@ -18,7 +18,7 @@
 
 <% if @order.line_items.empty? %>
   <div class="alert alert-warning">
-    <%= Spree.t(:your_order_is_empty_add_product)%>
+    <%= Spree.t(:your_order_is_empty_add_product) %>
   </div>
 <% end %>
 

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

@@ -23,6 +23,7 @@
             <div class="col-12 col-md-6 mb-3 mb-md-0">
               <div class="input-group datePickerFrom"
                    data-wrap="true"
+                   data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
                    data-max-date="<%= params[:q][:created_at_lt] %>">
                 <%= f.text_field :created_at_gt,
                   class: 'form-control js-filterable shadow-none',
@@ -36,6 +37,7 @@
             <div class="col-12 col-md-6 mt-3 mt-md-0">
               <div class="input-group datePickerTo"
                    data-wrap="true"
+                   data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
                    data-min-date="<%= params[:q][:created_at_gt] %>">
 
                 <%= f.text_field :created_at_lt,

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

@@ -20,7 +20,7 @@
       </tr>
     </thead>
     <tbody id="sortVert">
-      <% @payment_methods.each do |method|%>
+      <% @payment_methods.each do |method| %>
         <tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows">
           <td class="move-handle text-center">
             <% if can?(:edit, method) %>

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

@@ -19,12 +19,11 @@
 
         <div class="payment-methods my-3" id="payment_method_<%= method.id %>">
           <% if method.source_required? %>
-            <%=render partial: "spree/admin/payments/source_forms/#{method.method_type}",
+            <%= render partial: "spree/admin/payments/source_forms/#{method.method_type}",
                        locals: {
                          payment_method: method,
                          previous_cards: method.reusable_sources(@order)
-                       }
-            %>
+                       } %>
           <% end %>
         </div>
       <% end %>

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

@@ -18,8 +18,7 @@
 <%= render partial: "spree/admin/payments/source_views/#{@payment.payment_method.method_type}",
            locals: {
              payment: @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment
-           }
-%>
+           } %>
 
 <div class="alert alert-success" data-hook="amount">
   <%= Spree.t(:amount) %>: <%= @payment.display_amount.to_html %>

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

@@ -6,11 +6,10 @@
     </div>
       <div class="form-group previous_cards card-body mb-0" data-hook="previous_cards">
         <ul class="m-0 p-0">
-
             <% previous_cards.each do |card| %>
               <li>
                 <label>
-                  <%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.brand.upcase + ' - ' + card.display_number %>
+                  <%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.display_brand + ' - ' + card.display_number %>
                 </label>
               </li>
             <% end %>
@@ -24,7 +23,7 @@
       </div>
   </div>
 <% end %>
-  <div id="card_form<%= payment_method.id %>" class="margint row" data-hook>
+  <div id="card_form<%= payment_method.id %>" class="mt-3 row" data-hook>
     <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
     <div data-hook="card_number" class="form-group col-12">
@@ -32,7 +31,7 @@
       <%= label_tag "card_number#{payment_method.id}", raw(Spree.t(:card_number) + required_span_tag) %>
       <%= text_field_tag "#{param_prefix}[number]", '', class: 'required form-control cardNumber', id: "card_number#{payment_method.id}", maxlength: 19 %>
       <span id="card_type" style="display:none;">
-        ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
+        ( <span id="looks_like"><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
           <span id="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>
         )
       </span>

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">
@@ -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.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'  %>
+        <%= 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| %>

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

@@ -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),

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/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' %>
@@ -47,7 +47,7 @@
     <% 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/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/_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') %>
-    <%= select_tag "#{param_prefix}[taxon_ids_string]", nil, class: 'taxon_picker d-block w-100', 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/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>

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

@@ -11,11 +11,11 @@
   <fieldset>
     <div data-hook="admin_refund_form_fields">
       <div class="form-group">
-        <%= f.label :payment_amount, Spree.t(:payment_amount) %><br/>
+        <%= f.label :payment_amount, Spree.t(:payment_amount) %><br>
         <%= @refund.payment.amount %>
       </div>
       <div class="form-group">
-        <%= f.label :credit_allowed, Spree.t(:credit_allowed) %><br/>
+        <%= f.label :credit_allowed, Spree.t(:credit_allowed) %><br>
         <%= @refund.payment.credit_allowed %>
       </div>
       <%= f.field_container :amount, class: ['form-group'] do %>

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

@@ -66,7 +66,7 @@
   </div>
 <% end %>
 
-<fieldset class="margint">
+<fieldset class="mt-3">
   <legend><%= Spree.t(:calculated_reimbursements) %></legend>
   <div class="table-responsive">
     <table class="table table-condensed table-bordered">
@@ -93,7 +93,6 @@
       <%= "#{Spree.t('note')}: #{Spree.t('this_order_has_already_received_a_refund')}. #{Spree.t('make_sure_the_above_reimbursement_amount_is_correct')}." %>
     </div>
   <% end %>
-
   <div class="form-actions" data-hook="reimburse-buttons">
     <% if !@reimbursement.reimbursed? %>
       <%= button_to [:perform, :admin, @order, @reimbursement], { class: 'btn btn-primary', method: 'post' } do %>