spree_backend 4.2.0.rc4 → 4.2.0.rc5

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 %>
@@ -151,7 +151,7 @@
     <% 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.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">
@@ -182,7 +182,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 +192,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 +202,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 +226,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/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>

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

@@ -22,15 +22,15 @@
       </tr>
     </thead>
     <tbody>
-      <% @tax_rates.each do |tax_rate|%>
+      <% @tax_rates.each do |tax_rate| %>
       <tr id="<%= spree_dom_id tax_rate %>" data-hook="rate_row">
-        <td><%=tax_rate.zone.try(:name) || Spree.t(:not_available) %></td>
-        <td><%=tax_rate.name %></td>
-        <td><%=tax_rate.tax_category.try(:name) || Spree.t(:not_available) %></td>
-        <td><%=tax_rate.amount %></td>
+        <td><%= tax_rate.zone.try(:name) || Spree.t(:not_available) %></td>
+        <td><%= tax_rate.name %></td>
+        <td><%= tax_rate.tax_category.try(:name) || Spree.t(:not_available) %></td>
+        <td><%= tax_rate.amount %></td>
         <td><%= active_badge(tax_rate.included_in_price?) %></td>
         <td><%= active_badge(tax_rate.show_rate_in_label?) %></td>
-        <td><%=tax_rate.calculator.to_s %></td>
+        <td><%= tax_rate.calculator.to_s %></td>
         <td class="actions actions-2 text-right">
           <%= link_to_edit(tax_rate, no_text: true) if can? :edit, tax_rate %>
           <%= link_to_delete(tax_rate, no_text: true) if can? :delete, tax_rate %>

data/app/views/spree/admin/taxonomies/_js_head.html.erb

@@ -3,6 +3,5 @@
     $(document).ready(function(){
       setup_taxonomy_tree(taxonomy_id);
     });
-    "
-  %>
+    " %>
 <% end %>

data/app/views/spree/admin/taxonomies/_list.html.erb

@@ -9,7 +9,7 @@
     </thead>
     <tbody id="sortVert">
       <% @taxonomies.each do |taxonomy| %>
-        <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row" >
+        <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row">
           <td class="move-handle">
             <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
           </td>

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

@@ -33,8 +33,7 @@
     <% if @taxon.icon.present? %>
       <%= link_to Spree.t(:remove_image),
         remove_icon_admin_taxonomy_taxon_url(@taxonomy.id, @taxon.id),
-        method: :delete
-      %>
+        method: :delete %>
     <% end %>
   <% end %>
 

data/app/views/spree/admin/taxons/_taxon_table.html.erb

@@ -8,12 +8,12 @@
       </tr>
     </thead>
     <tbody>
-      <% taxons.each do |taxon| %>
+      <% taxons.each do |taxonp| %>
         <tr id="<%= spree_dom_id(taxon) %>" data-hook="taxons_row">
           <td><%= taxon.name %></td>
           <td><%= taxon_path taxon %></td>
           <td class="actions">
-            <%= link_to_delete taxon, url: remove_admin_product_taxon_url(@product, taxon), name: icon('delete.svg) + ' ' + Spree.t(:remove) %>
+            <%= link_to_delete taxon, url: remove_admin_product_taxon_url(@product, taxon), name: icon('delete.svg') + ' ' + Spree.t(:remove) %>
           </td>
         </tr>
       <% end %>

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

@@ -17,7 +17,6 @@
         </div>
       <% end %>
     </div>
-
   </div>
 
   <div data-hook="admin_user_form_password_fields" class="col-12 col-md-6">

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

@@ -49,7 +49,7 @@
           <%= button Spree.t('clear_key', scope: 'api'), 'delete.svg', 'submit', class: "btn-danger" %>
         <% end %>
 
-        <span class="or"><%= Spree.t(:or)%></span>
+        <span class="or"><%= Spree.t(:or) %></span>
 
         <%= form_tag spree.generate_api_key_admin_user_path(@user), method: :put do %>
           <%= button Spree.t('regenerate_key', scope: 'api'), 'recycle.svg' %>

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

@@ -56,9 +56,9 @@
         </tr>
       </thead>
       <tbody>
-        <% @users.each do |user|%>
+        <% @users.each do |user| %>
           <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">
-            <td class='user_email'><%=link_to user.email, edit_admin_user_url(user) %></td>
+            <td class='user_email'><%= link_to user.email, edit_admin_user_url(user) %></td>
             <td data-hook="admin_users_index_row_actions" class="actions actions-2 text-right">
               <%= link_to_edit user, no_text: true if can?(:edit, user) %>
               <%= link_to_delete user, no_text: true if can?(:delete, user) %>

data/app/views/spree/admin/users/items.html.erb

@@ -31,7 +31,7 @@
               </td>
               <td class="item-name">
                 <%= item.name %>
-                <br />
+                <br>
                 <%= "(#{item.options_text})" if item.options_text.present? %>
                 <% if item.sku.present? %>
                   <strong><%= Spree.t(:sku) %>:</strong> <%= item.variant.sku %>

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

@@ -42,7 +42,9 @@
       <div class="form-group" data-hook="discontinue_on">
           <%= f.label :discontinue_on, Spree.t(:discontinue_on) %>
           <%= f.error_message_on :discontinue_on %>
-          <div class="input-group datepicker" data-wrap="true" >
+          <div class="input-group datepicker"
+               data-wrap="true"
+               data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>">
             <%= f.text_field :discontinue_on,
                              value: datepicker_field_value(@variant.discontinue_on),
                              placeholder: Spree.t(:select_a_date),

data/app/views/spree/admin/zones/_country_members.html.erb

@@ -12,5 +12,5 @@
         <%= zone_form.collection_select :country_ids, @countries, :id, :name, {}, { multiple: true, class: "select2" } %>
       <% end %>
     </div>
-  </div>  
+  </div>
 </div>

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

@@ -2,7 +2,7 @@
   <div class="col-12 col-lg-6" data-hook="admin_zone_form_fields">
     <div class="card mb-3">
       <div class="card-header">
-        <h1 class="card-title mb-0 h5"><%= Spree.t(:general_settings)%></h1>
+        <h1 class="card-title mb-0 h5"><%= Spree.t(:general_settings) %></h1>
       </div>
 
       <div class="card-body">
@@ -43,7 +43,7 @@
     </div>
   </div>
   <div class="col-12 col-lg-6">
-    <%= render partial: 'state_members', locals: { zone_form: zone_form }%>
+    <%= render partial: 'state_members', locals: { zone_form: zone_form } %>
     <%= render partial: 'country_members', locals: { zone_form: zone_form } %>
   </div>
 </div>

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

@@ -6,6 +6,6 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @zone } %>
 
 <%= form_for [:admin, @zone] do |zone_form| %>
-  <%= render partial: 'form', locals: { zone_form: zone_form } %>  
+  <%= render partial: 'form', locals: { zone_form: zone_form } %>
   <%= render partial: 'spree/admin/shared/new_resource_links' %>
 <% end %>

data/app/views/spree/layouts/admin.html.erb

@@ -57,8 +57,8 @@
               <%#-------------------------------------------------%>
               <%# Main content                                    %>
               <%#-------------------------------------------------%>
-              <div class="<%= content_for?(:sidebar) ? 'with-sidebar col-12 col-lg-9' : 'col-12'  %>" id="content" data-hook>
-                <%= render partial: 'spree/admin/shared/table_filter' if content_for?(:table_filter)%>
+              <div class="<%= content_for?(:sidebar) ? 'with-sidebar col-12 col-lg-9' : 'col-12' %>" id="content" data-hook>
+                <%= render partial: 'spree/admin/shared/table_filter' if content_for?(:table_filter) %>
                 <%= yield %>
               </div>
 
@@ -87,6 +87,5 @@
     <%# Alerts                                          %>
     <%#-------------------------------------------------%>
     <%= flash_alert(flash) %>
-    
   </body>
 </html>

data/config/initializers/assets.rb

@@ -1 +1 @@
-Rails.application.config.assets.precompile += %w(admin/* credit_cards/credit_card.gif)
+Rails.application.config.assets.precompile += %w(admin/* credit_cards/credit_card.gif flatpickr/l10n*)

data/spree_backend.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'spree_api', s.version
   s.add_dependency 'spree_core', s.version
 
-  s.add_dependency 'bootstrap',       '>= 4.3.1', '< 4.6.0'
+  s.add_dependency 'bootstrap',       '>= 4.3.1', '< 4.7.0'
   s.add_dependency 'glyphicons',      '~> 1.0.2'
   s.add_dependency 'flatpickr',       '~> 4.6.0'
   s.add_dependency 'inline_svg',      '~> 1.5'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc4
+  version: 4.2.0.rc5
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc4
+        version: 4.2.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc4
+        version: 4.2.0.rc5
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc4
+        version: 4.2.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc4
+        version: 4.2.0.rc5
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -48,7 +48,7 @@ dependencies:
         version: 4.3.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
         version: 4.3.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: glyphicons
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,6 @@ files:
 - app/assets/javascripts/spree/backend/admin.js
 - app/assets/javascripts/spree/backend/calculator.js
 - app/assets/javascripts/spree/backend/checkouts/edit.js
-- app/assets/javascripts/spree/backend/flatpickr_locals.js
 - app/assets/javascripts/spree/backend/gateway.js
 - app/assets/javascripts/spree/backend/general_settings.js
 - app/assets/javascripts/spree/backend/handlebar_extensions.js
@@ -653,9 +652,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc4
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc5
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc4
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc5
 post_install_message:
 rdoc_options: []
 require_paths:

data/app/assets/javascripts/spree/backend/flatpickr_locals.js

@@ -1,37 +0,0 @@
-/* global flatpickr */
-document.addEventListener('DOMContentLoaded', function() {
-  flatpickr.l10ns.default.firstDayOfWeek = Spree.translations.firstDay
-  flatpickr.l10ns.default.rangeSeparator = Spree.translations.rangeSep
-  flatpickr.l10ns.default.weekAbbreviation = Spree.translations.weekAbbr
-  flatpickr.l10ns.default.scrollTitle = Spree.translations.scrollTitle
-  flatpickr.l10ns.default.toggleTitle = Spree.translations.toggleTitle
-  flatpickr.l10ns.default.amPM = [Spree.translations.am, Spree.translations.pm]
-  flatpickr.l10ns.default.yearAriaLabel = Spree.translations.yearAriaLabel
-  flatpickr.l10ns.default.hourAriaLabel = Spree.translations.hourAriaLabel
-  flatpickr.l10ns.default.minuteAriaLabel = Spree.translations.minuteAriaLabel
-  flatpickr.l10ns.default.weekdays = {
-    shorthand: [
-      Spree.translations.sun,
-      Spree.translations.mon,
-      Spree.translations.tue,
-      Spree.translations.wed,
-      Spree.translations.thu,
-      Spree.translations.fri,
-      Spree.translations.sat]
-  }
-  flatpickr.l10ns.default.months = {
-    longhand: [
-      Spree.translations.lh_jan,
-      Spree.translations.lh_feb,
-      Spree.translations.lh_mar,
-      Spree.translations.lh_apr,
-      Spree.translations.lh_may,
-      Spree.translations.lh_jun,
-      Spree.translations.lh_jul,
-      Spree.translations.lh_aug,
-      Spree.translations.lh_sep,
-      Spree.translations.lh_oct,
-      Spree.translations.lh_nov,
-      Spree.translations.lh_dec]
-  }
-})