spree_backend 4.2.0.rc4 → 4.2.0.rc5

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

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

@@ -16,7 +16,7 @@
         </tr>
       </thead>
       <tbody>
-        <% @roles.each do |role|%>
+        <% @roles.each do |role| %>
           <tr id="<%= spree_dom_id role %>" data-hook="admin_roles_index_rows">
             <td><%= role.name %></td>
             <td class="actions text-right">

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

@@ -27,8 +27,8 @@
           <% end %>
       <% end %>
 
-      <% if defined?(spree_logout_path) %>
-          <%= link_to spree_logout_path, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+      <% if admin_logout_link %>
+          <%= link_to admin_logout_link, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
             <%= svg_icon name: "exit.svg", width: '18', height: '18' %>
             &nbsp;
             <%= Spree.t(:logout) %>

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

@@ -36,9 +36,9 @@
 </div>
 
 <% content_for :head do %>
-  <%= javascript_tag do %>
+  <script>
     $(document).ready(function(){
       $('#<%= s_or_b %>country select').on('change', function() { update_state('<%= s_or_b %>'); });
     });
-  <% end %>
+  </script>
 <% end %>

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

@@ -1,7 +1,7 @@
 <% if target && target.errors.any? %>
   <div id="errorExplanation" class="errorExplanation alert alert-danger" data-hook>
     <p>
-      <strong><%= Spree.t(:errors_prohibited_this_record_from_being_saved, count: target.errors.size) %>:</strong><br/>
+      <strong><%= Spree.t(:errors_prohibited_this_record_from_being_saved, count: target.errors.size) %>:</strong><br>
     </p>
     <ul class="ul-with-markup">
      <% target.errors.full_messages.each do |msg| %>

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

@@ -19,13 +19,13 @@
 <%= javascript_include_tag 'spree/backend/all' %>
 <%= render "spree/admin/shared/translations" %>
 
-<%= javascript_tag do %>
+<script>
   <%== "var AUTH_TOKEN = #{form_authenticity_token.inspect};" %>
   <%== "Spree.api_key = '#{try_spree_current_user.spree_api_key}';" if try_spree_current_user %>
   <%== "var ADDRESS_FIELDS = #{Spree::Address::ADDRESS_FIELDS}" %>
   <% if Rails.env.test? %>
   jQuery.fx.off = false
   <% end %>
-<% end %>
+</script>
 
 <%= yield :head %>

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

@@ -1,5 +1,4 @@
 <header class="header logged-in">
-
   <nav class="navbar fixed-top navbar-dark align-items-middle">
     <div class="col-3 col-sm-4 p-0 d-lg-none">
       <button
@@ -23,5 +22,4 @@
       <%= render partial: 'spree/admin/shared/account_nav' %>
     </div>
   </nav>
-
 </header>

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

@@ -30,7 +30,7 @@
 
   <% if can? :admin, Spree::Admin::ReportsController %>
     <ul class="nav nav-sidebar border-bottom" id="sidebarReport">
-      <%= tab *Spree::BackendConfiguration::REPORT_TABS, icon: 'report.svg'  %>
+      <%= tab *Spree::BackendConfiguration::REPORT_TABS, icon: 'report.svg' %>
     </ul>
   <% end %>
 

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

@@ -15,7 +15,7 @@
     </thead>
     <tbody>
       <% refunds.each do |refund| %>
-        <tr id="<%= dom_id(refund) %>" data-hook="refunds_row" class="<%= cycle('odd', 'even', name: 'refund_table_cycle')%>">
+        <tr id="<%= dom_id(refund) %>" data-hook="refunds_row" class="<%= cycle('odd', 'even', name: 'refund_table_cycle') %>">
           <td><%= pretty_time(refund.created_at) %></td>
           <td><%= link_to refund.payment.number, spree.admin_order_payment_path(refund.payment.order, refund.payment) %></td>
           <td class="amount"><%= refund.display_amount %></td>

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

@@ -5,7 +5,8 @@
       <div class="col-12 col-md-6 mb-3 mb-md-0">
         <div class="input-group datePickerFrom"
              data-wrap="true"
-             data-max-date="<%= params[:q][:completed_at_lt] %>" >
+             data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
+             data-max-date="<%= params[:q][:completed_at_lt] %>">
           <%= s.text_field :completed_at_gt,
                            class: 'form-control shadow-none',
                            placeholder: Spree.t(:starting_from),
@@ -19,7 +20,8 @@
       <div class="col-12 col-md-6 mt-3 mt-md-0">
         <div class="input-group datePickerTo"
              data-wrap="true"
-             data-min-date="<%= params[:q][:completed_at_gt] %>" >
+             data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
+             data-min-date="<%= params[:q][:completed_at_gt] %>">
 
           <%= s.text_field :completed_at_lt,
                            class: 'form-control shadow-none',

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

@@ -10,40 +10,6 @@
     confirm_delete:           Spree.t(:confirm_delete),
     currency_separator:       I18n.t('number.currency.format.separator'),
     cut:                      Spree.t(:cut),
-
-    date_picker:              Spree.t(:js_format, scope: 'date_picker', default: 'yy/mm/dd'),
-    firstDay:                 Spree.t(:first_day, scope: 'date_picker', default: (0).to_i),
-    rangeSep:                 Spree.t(:rangeSeparator, scope: 'date_picker', default: ' to '),
-    weekAbbr:                 Spree.t(:weekAbbreviation, scope: 'date_picker', default: 'Wk'),
-    scrollTitle:              Spree.t(:scrollTitle, scope: 'date_picker', default: 'Scroll to increment'),
-    toggleTitle:              Spree.t(:toggleTitle, scope: 'date_picker', default: 'Click to toggle'),
-    am:                       Spree.t(:am, scope: 'date_picker', default: 'AM'),
-    pm:                       Spree.t(:pm, scope: 'date_picker', default: 'PM'),
-    yearAriaLabel:            Spree.t(:yearAriaLabel, scope: 'date_picker', default: 'Year'),
-    hourAriaLabel:            Spree.t(:hourAriaLabel, scope: 'date_picker', default: 'Hour'),
-    minuteAriaLabel:          Spree.t(:minuteAriaLabel, scope: 'date_picker', default: 'Minute'),
-
-    sun:                      Spree.t(:sun, scope: 'date_picker', default: 'Sun'),
-    mon:                      Spree.t(:mon, scope: 'date_picker', default: 'Mon'),
-    tue:                      Spree.t(:tue, scope: 'date_picker', default: 'Tue'),
-    wed:                      Spree.t(:wed, scope: 'date_picker', default: 'Wed'),
-    thu:                      Spree.t(:thu, scope: 'date_picker', default: 'Thu'),
-    fri:                      Spree.t(:fri, scope: 'date_picker', default: 'Fri'),
-    sat:                      Spree.t(:sat, scope: 'date_picker', default: 'Sat'),
-
-    lh_jan:                   Spree.t(:lh_jan, scope: 'date_picker', default: 'January'),
-    lh_feb:                   Spree.t(:lh_feb, scope: 'date_picker', default: 'February'),
-    lh_mar:                   Spree.t(:lh_mar, scope: 'date_picker', default: 'March'),
-    lh_apr:                   Spree.t(:lh_apr, scope: 'date_picker', default: 'April'),
-    lh_may:                   Spree.t(:lh_may, scope: 'date_picker', default: 'May'),
-    lh_jun:                   Spree.t(:lh_jun, scope: 'date_picker', default: 'June'),
-    lh_jul:                   Spree.t(:lh_jul, scope: 'date_picker', default: 'July'),
-    lh_aug:                   Spree.t(:lh_aug, scope: 'date_picker', default: 'August'),
-    lh_sep:                   Spree.t(:lh_sep, scope: 'date_picker', default: 'September'),
-    lh_oct:                   Spree.t(:lh_oct, scope: 'date_picker', default: 'October'),
-    lh_nov:                   Spree.t(:lh_nov, scope: 'date_picker', default: 'November'),
-    lh_dec:                   Spree.t(:lh_dec, scope: 'date_picker', default: 'December'),
-
     destroy:                  Spree.t(:destroy, scope: :actions),
     edit:                     Spree.t(:edit,    scope: :actions),
     find_a_taxon:             Spree.t(:find_a_taxon),
@@ -58,6 +24,8 @@
     no_results:               Spree.t(:no_results),
     option_type_placeholder:  Spree.t(:option_type_placeholder),
     paste:                    Spree.t(:paste),
+    date_format:              Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d'),
+    date_time_format:         Spree.t(:js_date_time, scope: 'date_picker', default: 'Y/m/d - H:i'),
     previous:                 Spree.t(:previous),
     remove:                   Spree.t(:remove),
     rename:                   Spree.t(:rename),
@@ -72,11 +40,14 @@
     tags_placeholder:         Spree.t(:tags_placeholder),
     tracking:                 Spree.t(:tracking),
     variant_placeholder:      Spree.t(:variant_placeholder),
-    value:                    Spree.t(:value)
+    value:                    Spree.t(:value),
+
+                              # Substitute - for _ converting zh-tw to zh_tw
+                              # Flatpickr not making things easy here.
+    flatpickr_locale:         "#{flatpickr_local_fallback.sub("-", "_")}"
   }.to_json
 %>
 </script>
 
-<% if I18n.locale != :en %>
-  <%= javascript_include_tag "select2_locale_#{I18n.locale}" %>
-<% end %>
+<%= javascript_include_tag "select2_locale_#{select2_local_fallback}" %>
+<%= javascript_include_tag "flatpickr/l10n/#{flatpickr_local_fallback}" %>

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

@@ -16,7 +16,7 @@
       </tr>
     </thead>
     <tbody>
-      <% @shipping_categories.each do |shipping_category|%>
+      <% @shipping_categories.each do |shipping_category| %>
       <tr id="<%= spree_dom_id shipping_category %>" data-hook="category_row">
         <td><%= shipping_category.name %></td>
         <td class="actions actions-2 text-right">
@@ -27,7 +27,7 @@
       <% end %>
     </tbody>
   </table>
-</div>  
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ShippingCategory)) %>,

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

@@ -19,7 +19,7 @@
       </tr>
     </thead>
     <tbody>
-      <% @shipping_methods.includes(:zones, :calculator).each do |shipping_method|%>
+      <% @shipping_methods.includes(:zones, :calculator).each do |shipping_method| %>
         <tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows">
           <td><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td>
           <td>
@@ -37,7 +37,7 @@
       <% end %>
     </tbody>
   </table>
-</div>  
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ShippingMethod)) %>,

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

@@ -8,11 +8,11 @@
 
 <div data-hook="country" class="form-group">
   <%= label_tag :country, Spree.t(:country) %>
-  <select id="country" class='observe_field select2' data-base-url="<%=admin_states_path(format: :js) %>?country_id=" data-update="#state-list">
+  <select id="country" class='observe_field select2' data-base-url="<%= admin_states_path(format: :js) %>?country_id=" data-update="#state-list">
     <%= options_from_collection_for_select(@countries, :id, :name, @country.id) %>
   </select>
 </div>
 
 <div id="state-list" data-hook>
-  <%= render partial: 'state_list'%>
+  <%= render partial: 'state_list' %>
 </div>

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

@@ -3,7 +3,7 @@
     <div class="col-12 col-md-9" data-hook="stock_location_names">
       <div data-hook="stock_location_name">
         <%= f.field_container :name, class: ['form-group']  do %>
-          <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
+          <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br>
           <%= f.text_field :name, class: 'form-control', required: true %>
           <%= f.error_message_on :name %>
         <% end %>

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

@@ -1,6 +1,6 @@
 <%= form_tag transfer_stock_admin_stock_locations_path do %>
   <fieldset>
-    <legend><%= Spree.t(:move_stock_between_locations)%></legend>
+    <legend><%= Spree.t(:move_stock_between_locations) %></legend>
     <div data-hook="admin_stock_movements_form_fields" class="row">
       <div class="col-12 col-md-5">
         <div class="form-group" id="stock_movement_transfer_from_field">

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

@@ -19,12 +19,12 @@
     </thead>
     <tbody>
       <% @stock_locations.each do |stock_location|
-           @edit_url = edit_admin_stock_location_path(stock_location)
-           @delete_url = admin_stock_location_path(stock_location)
-      %>
+           @edit_url = spree.edit_admin_stock_location_path(stock_location)
+           @delete_url = spree.admin_stock_location_path(stock_location) %>
+
         <tr id="<%= spree_dom_id stock_location %>" data-hook="stock_location_row">
           <td><%= display_name(stock_location) %></td>
-          <td><%= link_to Spree.t(:stock_movements), admin_stock_location_stock_movements_path(stock_location.id) %> </td>
+          <td><%= link_to Spree.t(:stock_movements), spree.admin_stock_location_stock_movements_path(stock_location.id) %> </td>
           <td><%= active_badge(stock_location.active, label: Spree.t(state(stock_location))) %></td>
           <td class="actions actions-2 text-center">
             <%= link_to_edit(stock_location, no_text: true) if can? :create, stock_location %>

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

@@ -5,7 +5,7 @@
   <% end %>
   <%= f.field_container :stock_item_id, class: ['form-group'] do %>
     <%= f.label :stock_item_id, Spree.t(:stock_item_id) %>
-    <%= f.text_field 'stock_item_id', :'data-stock-location-id' => params[:stock_location_id] %>
+    <%= select_tag 'stock_movement[stock_item_id]', nil , class: 'variant_autocomplete d-block w-100', :'data-stock-location-id' => params[:stock_location_id] %>
   <% end %>
 </div>
 

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

@@ -17,13 +17,13 @@
     </colgroup>
     <thead>
       <tr data-hook="admin_stock_movements_index_headers">
-        <th><%= Spree.t(:stock_item) %>
+        <th><%= Spree.t(:variant) %>
         <th><%= Spree.t(:quantity) %></th>
         <th><%= Spree.t(:action) %></th>
       </tr>
     </thead>
     <tbody>
-      <% @stock_movements.each do |stock_movement|%>
+      <% @stock_movements.each do |stock_movement| %>
         <tr id="<%= spree_dom_id stock_movement %>" data-hook="admin_stock_movements_index_rows">
           <td>
             <%= display_variant(stock_movement) %>

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

@@ -66,7 +66,7 @@
           <div class="form-group" id="stock_movement_variant_id_field">
             <%= label_tag 'variant_id', Spree.t(:variant) %>
             <div class="input-group">
-              <%= select_tag 'transfer_variant', nil, class: 'd-block w-100', id: 'transfer_variant'  %>
+              <%= select_tag 'transfer_variant', nil, class: 'd-block w-100', id: 'transfer_variant' %>
             </div>
           </div>
         </div>

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

@@ -40,5 +40,4 @@
       <%= render partial: 'stock_movements', object: @stock_transfer.destination_movements %>
     </fieldset>
   <% end %>
-
 </fieldset>