spree_backend 4.2.0.rc4 → 4.2.3

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-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
+             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-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
+             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),
@@ -72,11 +38,15 @@
     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>

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

@@ -14,7 +14,7 @@
         <%= image_tag main_app.url_for(@store.logo) %>
       <% end %>
       <%= f.field_container :logo, class: ['form-group'] do %>
-        <%= f.label :logo, Spree.t(:logo) %><br />
+        <%= f.label :logo, Spree.t(:logo) %><br>
         <%= f.file_field :logo %>
         <%= f.error_message_on :logo %>
       <% end %>
@@ -24,7 +24,7 @@
         <%= image_tag main_app.url_for(@store.mailer_logo.variant(resize: '244x104>')) %>
       <% end %>
       <%= f.field_container :mailer_logo, class: ['form-group'] do %>
-        <%= f.label :mailer_logo, Spree.t(:mailer_logo) %><br />
+        <%= f.label :mailer_logo, Spree.t(:mailer_logo) %><br>
         <%= f.file_field :mailer_logo, accept: 'image/png, image/jpeg' %>
         <%= f.error_message_on :mailer_logo %>
       <% end %>
@@ -43,7 +43,7 @@
       <%= f.error_message_on :code %>
     <% end %>
     <%= f.field_container :url, class: ['form-group'] do %>
-      <%= f.label :url, raw(Spree.t(:url) + required_span_tag)  %>
+      <%= f.label :url, raw(Spree.t(:url) + required_span_tag) %>
       <div class="input-group mb-3">
         <div class="input-group-prepend">
           <span class="input-group-text" id="basic-addon3">https://</span>
@@ -68,12 +68,12 @@
       <%= f.error_message_on :seo_title %>
     <% end %>
     <%= f.field_container :meta_description, class: ['form-group'] do %>
-      <%= f.label :meta_description, Spree.t(:meta_description)  %>
+      <%= f.label :meta_description, Spree.t(:meta_description) %>
       <%= f.text_area :meta_description, class: 'form-control' %>
       <%= f.error_message_on :meta_description %>
     <% end %>
     <%= f.field_container :meta_keywords, class: ['form-group'] do %>
-      <%= f.label :meta_keywords, Spree.t(:meta_keywords)  %>
+      <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
       <%= f.text_field :meta_keywords, class: 'form-control' %>
       <%= f.error_message_on :meta_keywords %>
     <% end %>
@@ -132,7 +132,7 @@
   </div>
   <div class="card-body">
     <%= f.field_container :default_currency, class: ['form-group'] do %>
-      <%= f.label :default_currency, Spree.t(:currency) %>
+      <%= f.label :default_currency %>
       <%= f.select :default_currency, currency_options(@store.default_currency), {}, { class: 'select2' } %>
       <%= f.error_message_on :default_currency %>
     <% end %>
@@ -150,15 +150,20 @@
       <%= f.error_message_on :checkout_zone_id %>
     <% end %>
     <%= f.field_container :default_locale, class: ['form-group'] do %>
-      <%= f.label :default_locale, Spree.t('i18n.language') %>
-      <%= f.select :default_locale, options_from_collection_for_select(all_locales_options, :last, :first, @store.default_locale), {}, { class: 'select2' } %>
+      <%= f.label :default_locale %>
+      <%= f.select :default_locale, options_from_collection_for_select(all_locales_options, :last, :first, @store.default_locale || I18n.locale), {}, { class: 'select2' } %>
       <%= f.error_message_on :default_locale %>
       <% unless defined?(SpreeI18n) %>
         <small class="form-text text-muted">
-          <%= raw(Spree.t('store_form.languages_help')) %>
+          <%= raw(Spree.t('store_form.locales_help')) %>
         </small>
       <% end %>
     <% end %>
+    <%= f.field_container :supported_locales, class: ['form-group'] do %>
+      <%= f.label :supported_locales, Spree.t(:supported_locales) %>
+      <%= f.select :supported_locales, options_from_collection_for_select(all_locales_options, :last, :first, @store.supported_locales&.split(',')), {}, { multiple: true, class: 'select2' } %>
+      <%= f.error_message_on :supported_locales %>
+    <% end %>
     <%= f.field_container :default_country_id, class: ['form-group'] do %>
       <%= f.label :default_country_id, Spree.t('i18n.default_country') %>
       <%= f.select :default_country_id, options_from_collection_for_select(@countries, :id, :name, @store.default_country_id || Spree::Config[:default_country_id]), {}, { class: 'select2' } %>
@@ -182,7 +187,7 @@
     </div>
 
     <%= f.field_container :facebook, class: ['form-group'] do %>
-      <%= f.label :facebook, Spree.t(:facebook)  %>
+      <%= f.label :facebook, Spree.t(:facebook) %>
       <div class="input-group mb-3">
         <div class="input-group-prepend">
           <span class="input-group-text" id="basic-addon3">https://facebook.com</span>
@@ -192,7 +197,7 @@
       <%= f.error_message_on :facebook %>
     <% end %>
     <%= f.field_container :twitter, class: ['form-group'] do %>
-      <%= f.label :twitter, Spree.t(:twitter)  %>
+      <%= f.label :twitter, Spree.t(:twitter) %>
       <div class="input-group mb-3">
         <div class="input-group-prepend">
           <span class="input-group-text" id="basic-addon3">https://twitter.com</span>
@@ -202,7 +207,7 @@
       <%= f.error_message_on :twitter %>
     <% end %>
     <%= f.field_container :instagram, class: ['form-group'] do %>
-      <%= f.label :instagram, Spree.t(:instagram)  %>
+      <%= f.label :instagram, Spree.t(:instagram) %>
       <div class="input-group mb-3">
         <div class="input-group-prepend">
           <span class="input-group-text" id="basic-addon3">https://instagram.com</span>
@@ -226,17 +231,17 @@
     </div>
 
     <%= f.field_container :description, class: ['form-group'] do %>
-      <%= f.label :description, Spree.t(:description)  %>
+      <%= f.label :description, Spree.t(:description) %>
       <%= f.text_area :description, class: 'form-control' %>
       <%= f.error_message_on :description %>
     <% end %>
     <%= f.field_container :address, class: ['form-group'] do %>
-      <%= f.label :address, Spree.t(:address)  %>
+      <%= f.label :address, Spree.t(:address) %>
       <%= f.text_area :address, class: 'form-control' %>
       <%= f.error_message_on :address %>
     <% end %>
     <%= f.field_container :contact_phone, class: ['form-group'] do %>
-      <%= f.label :contact_phone, Spree.t(:contact_phone)  %>
+      <%= f.label :contact_phone, Spree.t(:contact_phone) %>
       <%= f.text_field :contact_phone, class: 'form-control' %>
       <%= f.error_message_on :contact_phone %>
     <% end %>

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

@@ -12,7 +12,8 @@
     <thead>
       <th><%= Spree.t(:name) %></th>
       <th><%= Spree.t(:url) %></th>
-      <th><%= Spree.t(:currency) %></th>
+      <th><%= Spree.t(:supported_currencies) %></th>
+      <th><%= Spree.t(:supported_locales) %></th>
       <th><%= Spree.t(:default) %>?</th>
       <th data-hook="admin_stores_index_header_actions" class="actions"></th>
     <thead>
@@ -21,7 +22,8 @@
         <tr>
           <td><%= store.unique_name %></td>
           <td><%= link_to store.url, store.formatted_url, target: :blank %></td>
-          <td><%= store.default_currency %></td>
+          <td><%= store.supported_currencies_list.map(&:iso_code).join(', ') %></td>
+          <td><%= store.supported_locales_list.map {|l| locale_presentation(l).first }.join(', ') %></td>
           <td><%= active_badge(store.default) %></td>
           <td class="actions actions-2 text-right" data-hook="admin_stores_index_row_actions">
             <%= link_to_edit_url spree.edit_admin_store_path(store), no_text: true if can?(:edit, store) %>

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

@@ -21,8 +21,8 @@
     <tbody>
       <% @tax_categories.each do |tax_category|
            @edit_url = edit_admin_tax_category_path(tax_category)
-           @delete_url = admin_tax_category_path(tax_category)
-      %>
+           @delete_url = admin_tax_category_path(tax_category) %>
+
         <tr id="<%= spree_dom_id tax_category %>" data-hook="tax_row">
           <td><%= tax_category.name %></td>
           <td><%= tax_category.tax_code %></td>