spree_backend 4.2.0.rc2 → 4.2.1

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 %>
@@ -25,7 +25,7 @@
       <% end %>
       <%= f.field_container :reason, class: ['form-group'] do %>
         <%= f.label :refund_reason_id, Spree.t(:reason) %>
-        <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'select2'}) %>
+        <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'select2-clear'}) %>
         <%= f.error_message_on :reason %>
       <% end %>
     </div>

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

@@ -26,7 +26,9 @@
             <% return_item = item_fields.object %>
             <tr>
               <td>
-                <div class="variant-name"><%= return_item.inventory_unit.variant.name %></div>
+                <div class="variant-name">
+                  <%= link_to return_item.inventory_unit.variant.name, spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
+                </div>
                 <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
               </td>
               <td>
@@ -49,7 +51,7 @@
                 <% if return_item.exchange_processed? %>
                   <%= return_item.exchange_variant.exchange_name %>
                 <% else %>
-                  <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :exchange_name, { include_blank: true }, { class: "select2 return-item-exchange-selection" } %>
+                  <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :exchange_name, { include_blank: true }, { class: "select2-clear return-item-exchange-selection" } %>
                 <% end %>
               </td>
             </tr>
@@ -64,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">
@@ -91,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/reimbursements/show.html.erb

@@ -24,7 +24,9 @@
         <% @reimbursement.return_items.each do |return_item| %>
           <tr>
             <td>
-              <div class="variant-name"><%= return_item.inventory_unit.variant.name %></div>
+              <div class="variant-name">
+                <%= link_to return_item.inventory_unit.variant.name, spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
+              </div>
               <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
             </td>
             <td>

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

@@ -33,7 +33,9 @@
             <% end %>
           </td>
           <td>
-            <div class="variant-name"><%= inventory_unit.variant.name %></div>
+            <div class="variant-name">
+              <%= link_to return_item.inventory_unit.variant.name, spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
+            </div>
             <div class="variant-options"><%= inventory_unit.variant.options_text %></div>
           </td>
           <td><%= inventory_unit.state.humanize %></td>
@@ -59,7 +61,7 @@
           </td>
           <td>
             <% if editable %>
-              <%= item_fields.select :preferred_reimbursement_type_id, @reimbursement_types.collect{|r|[r.name.humanize, r.id]}, {include_blank: true}, {class: 'select2'} %>
+              <%= item_fields.select :preferred_reimbursement_type_id, @reimbursement_types.collect{|r|[r.name.humanize, r.id]}, {include_blank: true}, {class: 'select2-clear'} %>
             <% end %>
           </td>
           <td>
@@ -67,7 +69,7 @@
               <% if return_item.exchange_processed? %>
                 <%= return_item.exchange_variant.exchange_name %>
               <% else %>
-                <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :exchange_name, { include_blank: true }, { class: "select2 return-item-exchange-selection" } %>
+                <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :exchange_name, { include_blank: true }, { class: "select2-clear return-item-exchange-selection" } %>
               <% end %>
             <% end %>
           </td>
@@ -82,13 +84,13 @@
 
   <%= f.field_container :stock_location, class: ['form-group'] do %>
     <%= f.label :stock_location, Spree.t(:stock_location) %> <span class="required">*</span>
-    <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'select2', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
+    <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'select2-clear', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
     <%= f.error_message_on :stock_location %>
   <% end %>
 
   <%= f.field_container :reason, class: ['form-group'] do %>
     <%= f.label :reason, Spree.t(:reason) %> <span class="required">*</span>
-    <%= f.select :return_authorization_reason_id, @reasons.collect{|r|[r.name, r.id]}, {include_blank: true}, {class: 'select2', "data-placeholder" => Spree.t(:select_a_return_authorization_reason)} %>
+    <%= f.select :return_authorization_reason_id, @reasons.collect{|r|[r.name, r.id]}, {include_blank: true}, {class: 'select2-clear', "data-placeholder" => Spree.t(:select_a_return_authorization_reason)} %>
     <%= f.error_message_on :reason %>
   <% end %>
 

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

@@ -27,9 +27,9 @@
         <tr id="<%= spree_dom_id(return_authorization) %>" data-hook="rma_row">
           <td><%= return_authorization.number %></td>
           <td>
-            <span class="badge badge-<%= return_authorization.state %>">
+            <strong class="badge badge-<%= return_authorization.state %> text-uppercase">
               <%= Spree.t("return_authorization_states.#{return_authorization.state}") %>
-            </span>
+            </strong>
           </td>
           <td><%= return_authorization.display_pre_tax_total.to_html %></td>
           <td><%= pretty_time(return_authorization.created_at) %></td>

data/app/views/spree/admin/return_index/customer_returns.html.erb

@@ -41,9 +41,9 @@
           <td><%= link_to customer_return.order.number, spree.edit_admin_order_path(customer_return.order) %></td>
           <td>
             <% if customer_return.fully_reimbursed? %>
-              <span class="badge badge-success"><%= Spree.t(:reimbursed) %></span>
+              <span class="badge badge-success text-uppercase"><%= Spree.t(:reimbursed) %></span>
             <% else %>
-              <span class="badge badge-info"><%= Spree.t(:incomplete) %></span>
+              <span class="badge badge-inactive text-uppercase"><%= Spree.t(:incomplete) %></span>
             <% end %>
           </td>
           <td><%= customer_return.display_pre_tax_total.to_html %></td>

data/app/views/spree/admin/return_index/return_authorizations.html.erb

@@ -33,7 +33,7 @@
         <div class="col-12 col-lg-6">
           <div class="form-group">
             <%= label_tag :q_state_eq, Spree.t(:status) %>
-            <%= f.select :state_eq, Spree::ReturnAuthorization.state_machines[:state].states.collect {|s| [Spree.t("return_authorization_states.#{s.name}"), s.value]}, {include_blank: true}, class: 'select2 js-filterable' %>
+            <%= f.select :state_eq, Spree::ReturnAuthorization.state_machines[:state].states.collect {|s| [Spree.t("return_authorization_states.#{s.name}"), s.value]}, {include_blank: true}, class: 'select2-clear js-filterable' %>
           </div>
         </div>
       </div>
@@ -63,7 +63,7 @@
           <td><%= link_to return_authorization.number, spree.edit_admin_order_return_authorization_path(return_authorization.order, return_authorization) %></td>
           <td><%= link_to return_authorization.order.number, spree.edit_admin_order_path(return_authorization.order) %></td>
           <td>
-            <span class="badge badge-<%= return_authorization.state %>"><%= Spree.t("return_authorization_states.#{return_authorization.state}") %></span>
+            <span class="badge badge-<%= return_authorization.state %> text-uppercase"><%= Spree.t("return_authorization_states.#{return_authorization.state}") %></span>
           </td>
           <td class="actions actions-1 text-right">
             <%= link_to_edit return_authorization, url: spree.edit_admin_order_return_authorization_path(return_authorization.order, return_authorization), no_text: true if can?(:edit, return_authorization) %>

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

@@ -5,7 +5,7 @@
       <%= svg_icon name: "user.svg", width: '24', height: '24' %>
     </button>
 
-    <div class="dropdown-menu dropdown-menu-right mt-2 p-0 mr-2">
+    <div class="dropdown-menu dropdown-menu-right overflow-hidden mt-2 p-0 mr-2">
       <div class="dropdown-item px-0 text-center bg-light">
         <span class="d-block text-dark py-2 px-4"><%= try_spree_current_user.email %></span>
       </div>
@@ -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

@@ -4,25 +4,25 @@
     <% if field == "country" %>
       <%= field_container (s_or_b + '_' + field), nil, class: ["form-group", "#{type}-row"] do %>
         <%= f.label :country_id, Spree.t(:country) %>
-        <span id="<%= s_or_b %>country">
-          <%= f.collection_select :country_id, available_countries, :id, :name, {}, { class: 'select2' } %>
-        </span>
+        <div id="<%= s_or_b %>country">
+          <%= f.collection_select :country_id, available_countries, :id, :name, {}, { class: 'select2 w-100' } %>
+        </div>
       <% end %>
     <% elsif field == "state" %>
       <%= field_container (s_or_b + '_' + field), :state, class: ["form-group", "#{type}-row"] do %>
         <%= f.label :state_id, Spree.t(:state) %>
-        <span id="<%= s_or_b %>state">
+        <div id="<%= s_or_b %>state">
           <% if f.object.country.try(:states) %>
             <%= f.text_field :state_name,
                              style: "display: #{f.object.country.try(:states) && f.object.country.states.empty? ? 'block' : 'none' };",
                              disabled: !(f.object.country.try(:states) && f.object.country.states.empty?), class: 'form-control state_name' %>
-            <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, { class: 'select2', style: "display: #{ f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty? } %>
+            <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, { class: 'select2 w-100', disabled: f.object.country.states.empty? } %>
           <% else %>
             <div>
               <em><%= Spree.t(:no_country) %></em>
             </div>
           <% end %>
-        </span>
+        </div>
         <%= error_message_on f.object, :state_id %>
       <% end %>
     <% else %>
@@ -36,9 +36,9 @@
 </div>
 
 <% content_for :head do %>
-  <%= javascript_tag do %>
+  <script>
     $(document).ready(function(){
-      $('span#<%= s_or_b %>country .select2').on('change', function() { update_state('<%= s_or_b %>'); });
+      $('#<%= 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,9 +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 %>
-<% end %>
+  <%== "var ADDRESS_FIELDS = #{Spree::Address::ADDRESS_FIELDS}" %>
+  <% if Rails.env.test? %>
+  jQuery.fx.off = false
+  <% 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/_order_summary.html.erb

@@ -10,7 +10,7 @@
           <strong><%= Spree.t(:status) %>:</strong>
         </td>
         <td>
-          <span class="state badge badge-<%= @order.state %>">
+          <span class="state badge badge-<%= @order.state %> text-uppercase">
             <%= Spree.t(@order.state, scope: :order_state) %>
           </span>
         </td>
@@ -71,26 +71,30 @@
       </tr>
 
       <% if @order.completed? %>
-        <tr>
-          <td>
-            <strong><%= Spree.t(:shipment) %>:</strong>
-          </td>
-          <td id='shipment_status'>
-            <span class="state badge badge-<%= @order.shipment_state %>">
-              <%= Spree.t(@order.shipment_state, scope: :shipment_states, default: [:missing, "none"]) %>
-            </span>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <strong><%= Spree.t(:payment) %>:</strong>
-          </td>
-          <td id='payment_status'>
-            <span class="state badge badge-<%= @order.payment_state %>">
-              <%= Spree.t(@order.payment_state, scope: :payment_states, default: [:missing, "none"]) %>
-            </span>
-          </td>
-        </tr>
+        <% if @order.shipment_state.present? %>
+          <tr>
+            <td>
+              <strong><%= Spree.t(:shipment) %>:</strong>
+            </td>
+            <td id='shipment_status'>
+              <span class="state badge badge-<%= @order.shipment_state %> text-uppercase">
+                <%= Spree.t(@order.shipment_state, scope: :shipment_states, default: [:missing, "none"]) %>
+              </span>
+            </td>
+          </tr>
+        <% end %>
+        <% if @order.payment_state.present? %>
+          <tr>
+            <td>
+              <strong><%= Spree.t(:payment) %>:</strong>
+            </td>
+            <td id='payment_status'>
+              <span class="state badge badge-<%= @order.payment_state %> text-uppercase">
+                <%= Spree.t(@order.payment_state, scope: :payment_states, default: [:missing, "none"]) %>
+              </span>
+            </td>
+          </tr>
+        <% end %>
         <tr>
           <td data-hook='admin_order_tab_date_completed_title'>
             <strong><%= Spree.t(:date_completed) %>:</strong>

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

@@ -23,6 +23,15 @@
       </li>
     <% end %>
 
+    <% if can? :update, @order %>
+      <li data-hook='admin_order_tabs_channel_details'>
+        <%= link_to_with_icon 'split.svg',
+          Spree.t(:channel),
+          channel_admin_order_url(@order),
+          class: "#{'active' if current == :channel} nav-link" %>
+      </li>
+    <% end %>
+
     <% if can?(:update, @order) && @order.checkout_steps.include?("address") %>
       <li data-hook='admin_order_tabs_customer_details'>
         <%= link_to_with_icon 'user.svg',

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

@@ -15,9 +15,9 @@
     </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><%= refund.payment.number %></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>
           <td><%= payment_method_name(refund.payment) %></td>
           <td><%= refund.transaction_id %></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),
@@ -64,6 +30,7 @@
     save:                     Spree.t(:save,    scope: :actions),
     searching:                Spree.t(:searching),
     server_error:             Spree.t(:server_error),
+    select_an_option:         Spree.t(:select_an_option),
     sku:                      Spree.t(:sku),
     type_to_search:           Spree.t(:type_to_search),
     taxon_placeholder:        Spree.t(:taxon_placeholder),
@@ -71,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}" %>