spree_backend 4.2.0.rc5 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 661c4ea54cb3f641be07d818710678496c47b7c52740291b6ed53083e28fb830
-  data.tar.gz: e4eb12865f64f1dd5de03dd5a70548556f588a0646c81776757b6b8d50b0aec8
+  metadata.gz: 0a77e87c4b85d35709151d5f3e17ed234d4575c3d7cf8d9ba25406271471cee9
+  data.tar.gz: 03b7a255af3e75e9b0376dd92f844db6ec9cc7acd714b0c586f87ad31fa5fe5e
 SHA512:
-  metadata.gz: a0438029b7fc2caa555ede1118025e7e5a47187052702089f2dc908eb4661c06171a3f421462a2764d93c27f5fc149a5d65882261609d3b2634dd4d058c8b5cc
-  data.tar.gz: f5c360a0f0a24849ab80171eddb29b2631ac5cb86fa51299c27710ac14b77a9a0b6078d3f4b40cebab4c167403f58f5303e228f6f3151c88049c615969b6d2ea
+  metadata.gz: ac1ea6505ba5b55b63ffe801062503660190ee11bac23dab2084b67d4e79f424f19a6fba6ab804d0d1c357e1bb62726377afaee1f9d9a47289ee7ff9823d8db9
+  data.tar.gz: a50b60c3e76c03b17297f33a96b6599f98c9a6746011bc0aec0d056f917d68499b51c70a1e4eba4e194c6e5f99be4772c479e9cb1a77d041316646825cd953a1

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

@@ -11,7 +11,7 @@
 //= require jquery.jstree/jquery.jstree
 //= require jquery_ujs
 //= require jquery-ui/widgets/autocomplete
-//= require select2
+//= require select2-full
 //= require underscore-min.js
 
 //= require spree

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

@@ -120,7 +120,7 @@ jQuery(function ($) {
   $('.js-filterable').each(function () {
     var $this = $(this)
 
-    if ($this.val() !== null && $this.val() !== '' && $this.val().length !== 0) {
+    if ($this.val() !== null && $this.val() !== '' && $this.val().length !== 0 && !$this.hasClass('flatpickr-alt-input')) {
       var ransackValue, filter
       var ransackFieldId = $this.attr('id')
       var label = $('label[for="' + ransackFieldId + '"]')
@@ -223,29 +223,26 @@ $.fn.radioControlsVisibilityOfElement = function (dependentElementSelector) {
 }
 
 document.addEventListener('DOMContentLoaded', function() {
-  var dateFrom = flatpickr('.datePickerFrom', {
-    locale: Spree.translations.flatpickr_locale,
+  flatpickr.setDefaults({
+    altInput: true,
     time_24hr: true,
-    monthSelectorType: 'static',
+    altInputClass: 'flatpickr-alt-input',
+    locale: Spree.translations.flatpickr_locale
+  })
+
+  var dateFrom = flatpickr('.datePickerFrom', {
     onChange: function(selectedDates) {
       dateTo.set('minDate', selectedDates[0])
     }
   })
 
   var dateTo = flatpickr('.datePickerTo', {
-    locale: Spree.translations.flatpickr_locale,
-    monthSelectorType: 'static',
-    time_24hr: true,
     onChange: function(selectedDates) {
       dateFrom.set('maxDate', selectedDates[0])
     }
   })
 
-  flatpickr('.datepicker', {
-    locale: Spree.translations.flatpickr_locale,
-    monthSelectorType: 'static',
-    time_24hr: true
-  })
+  flatpickr('.datepicker', { })
 })
 
 $(document).ready(function() {

data/app/assets/stylesheets/spree/backend/global/_mixins.scss

@@ -0,0 +1,19 @@
+// Mixin to prefix several properties at once
+
+// EXAMPLE
+// @include prefix((
+//   appearance: none,
+//   touch-callout: none,
+//   user-select: none
+// ), webkit moz ms khtml);
+
+@mixin prefix($declarations, $prefixes: ()) {
+  @each $property, $value in $declarations {
+    @each $prefix in $prefixes {
+      #{'-' + $prefix + '-' + $property}: $value;
+    }
+
+    // Output standard non-prefixed declaration
+    #{$property}: $value;
+  }
+}

data/app/assets/stylesheets/spree/backend/plugins/_flatpickr.scss

@@ -1,95 +1,113 @@
-// Adaptive icon from calendar to close.
-@mixin swith-appended-icon {
-  &:placeholder-shown:not(:focus) + * {
-      @content;
+.flatpickr-calendar {
+  // Custom Flatpickr styling for Spree + BS4.
+  .flatpickr-current-month {
+    span.cur-month:hover {
+      background: transparent;
+    }
+      .numInputWrapper {
+      margin-left: 3px;
+      border-radius: $border-radius;
+      overflow: hidden;
+    }
+
+    .flatpickr-monthDropdown-months {
+      @include prefix((
+        appearance: none
+      ), webkit moz ms khtml);
+
+      padding: 0.2em;
+      border-radius: $border-radius;
+    }
   }
-}
 
-input.flatpickr-input {
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  background-color: white !important;
-}
+  .numInputWrapper span.arrowUp {
+    border-color: transparent;
+    border-radius: 0;
+  }
 
-.flatpickr-current-month .numInputWrapper {
-  margin-left: 3px;
-  border-radius: $border-radius;
-  overflow: hidden;
-}
-.flatpickr-current-month span.cur-month:hover {
-  background: transparent;
-}
-.numInputWrapper span.arrowUp {
-  border-color: transparent;
-  border-radius: 0;
-}
-.numInputWrapper span.arrowDown {
-  border-color: transparent;
-  border-radius: 0;
-}
+  .numInputWrapper span.arrowDown {
+    border-color: transparent;
+    border-radius: 0;
+  }
 
-.input-group {
-  input.flatpickr-input{
-    @include swith-appended-icon  {
-      opacity: 0;
-    }
+  .flatpickr-day {
+    margin: 2px 0;
+    border-radius: $border-radius ;
   }
-}
 
-.append_under {
-  position: absolute;
-  right: 0;
-  top: 0;
-  z-index: 0;
-  height: 100%;
-}
+  .flatpickr-months .flatpickr-prev-month:hover svg,
+  .flatpickr-months .flatpickr-next-month:hover svg {
+    fill: $primary;
+  }
 
-.flatpickr-day {
-  margin: 2px 0;
-  border-radius: $border-radius ;
-}
+  .flatpickr-time {
+    border-radius: 0 0 5px 5px;
+    &:after {
+      display: none;
+    }
+    .numInputWrapper {
+      span {
+        border-color: transparent;
+        border-radius: 0;
+      }
+    }
+  }
 
-// Fix Flatpickr bug where things jusy highlight for no reason.
-input.flatpickr-input[readonly] {
-  -webkit-touch-callout: none; /* iOS Safari */
-    -webkit-user-select: none; /* Safari */
-     -khtml-user-select: none; /* Konqueror HTML */
-       -moz-user-select: none; /* Old versions of Firefox */
-        -ms-user-select: none; /* Internet Explorer/Edge */
-            user-select: none; /* Non-prefixed version, currently
-                                  supported by Chrome, Edge, Opera and Firefox */
+  // Required to stop an opened cal showing above the nav bar.
+  &.open {
+    z-index: $zindex-dropdown;
+  }
 }
 
-.flatpickr-months .flatpickr-prev-month:hover svg,
-.flatpickr-months .flatpickr-next-month:hover svg {
-  fill: $primary;
+// Mixin for calendar toggle icon show/hide.
+@mixin swith-appended-icon {
+  &:placeholder-shown:not(:focus) + * {
+      @content;
+  }
 }
 
-// Force rounded corner for the toggle cal and close icons.
-.input-group >
-.input-group-append:not(:last-child) >
-.force-round {
-  z-index: 5;
-  border-top-right-radius: $border-radius !important;
-  border-bottom-right-radius: $border-radius !important;
-}
+.input-group.datePickerFrom,
+.input-group.datePickerTo,
+.input-group.datepicker {
+  input.flatpickr-alt-input[readonly] {
+    // Flatpickr alternate input is read-only,
+    // style it as an active input field.
+    background-color: white !important;
 
-div.flatpickr-calendar.open {
-  z-index: $zindex-dropdown;
-}
+    // Fix a bug where occasionally the whole screen will highlight
+    // if you clicked the Flatpcikr input box while moving the cursor.
+    @include prefix((
+      appearance: none,
+      touch-callout: none,
+      user-select: none
+    ), webkit moz ms khtml);
 
-.flatpickr-time {
-  border-radius: 0 0 5px 5px;
-  &:after {
-    display: none;
+    @include swith-appended-icon  {
+      opacity: 0;
+    }
   }
-  .numInputWrapper {
-      span {
-        border-color: transparent;
-        border-radius: 0;
 
-      }
+  // Required for calendar toggle icon show/hide.
+  .append_under {
+    position: absolute;
+    right: 0;
+    top: 0;
+    z-index: 0;
+    height: 100%;
+  }
+
+  // Styling for calendar toggle icon toggle
+  .input-group-append:not(:last-child) >
+  .force-round {
+    z-index: 5;
+    border-top-right-radius: $border-radius !important;
+    border-bottom-right-radius: $border-radius !important;
+  }
 
+  // Styling for calendar toggle icon toggle
+  .form-control:not(:first-child),
+  .input-group >.flatpickr-alt-input:not(:first-child) {
+    border-top-left-radius: $border-radius !important;
+    border-bottom-left-radius: $border-radius !important;
   }
 }

data/app/assets/stylesheets/spree/backend/spree_admin.css.scss

@@ -1,4 +1,5 @@
 @import 'global/variables';
+@import 'global/mixins';
 
 @import 'bootstrap';
 @import 'glyphicons';

data/app/controllers/spree/admin/base_controller.rb

@@ -3,6 +3,7 @@ module Spree
     class BaseController < Spree::BaseController
       helper 'spree/admin/navigation'
       helper 'spree/locale'
+      helper 'spree/currency'
       layout 'spree/layouts/admin'
 
       before_action :authorize_admin

data/app/controllers/spree/admin/stores_controller.rb

@@ -5,6 +5,7 @@ module Spree
       before_action :set_default_currency, only: :new
       before_action :set_default_locale, only: :new
       before_action :normalize_supported_currencies, only: [:create, :update]
+      before_action :normalize_supported_locales, only: [:create, :update]
       before_action :set_default_country_id, only: :new
       before_action :load_all_countries, only: [:new, :edit, :update, :create]
       before_action :load_all_zones, only: %i[new edit]
@@ -127,6 +128,12 @@ module Spree
         end
       end
 
+      def normalize_supported_locales
+        if params[:store][:supported_locales]&.is_a?(Array)
+          params[:store][:supported_locales] = params[:store][:supported_locales].compact.uniq.reject(&:blank?).join(',')
+        end
+      end
+
       def set_default_country_id
         @store.default_country_id = Spree::Config[:default_country_id]
       end

data/app/helpers/spree/admin/base_helper.rb

@@ -58,7 +58,7 @@ module Spree
 
       def datepicker_field_value(date)
         unless date.blank?
-          l(date, format: Spree.t('date_picker.format', default: '%Y/%m/%d'))
+          l(date, format: '%Y/%m/%d')
         end
       end
 

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

@@ -23,7 +23,7 @@
             <div class="col-12 col-md-6 mb-3 mb-md-0">
               <div class="input-group datePickerFrom"
                    data-wrap="true"
-                   data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
+                   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',
@@ -37,7 +37,7 @@
             <div class="col-12 col-md-6 mt-3 mt-md-0">
               <div class="input-group datePickerTo"
                    data-wrap="true"
-                   data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
+                   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/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 %>

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/products/_form.html.erb

@@ -66,7 +66,7 @@
 
           <div class="input-group datePickerFrom"
                data-wrap="true"
-               data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
+               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,
@@ -87,7 +87,7 @@
 
           <div class="input-group datePickerTo"
                data-wrap="true"
-               data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
+               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,

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

@@ -46,7 +46,7 @@
 
           <div class="input-group datepicker"
                data-wrap="true"
-               data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>">
+               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/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="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,13 +57,12 @@
         <%= 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', default: 'Y/m/d - H:i') %>"
+           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',
@@ -79,7 +78,7 @@
       <div class="input-group datePickerTo"
            data-wrap="true"
            data-enable-time='true'
-           data-date-format="<%= Spree.t(:js_date_time, scope: 'date_picker', default: 'Y/m/d - H:i') %>"
+           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'),

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

@@ -5,7 +5,7 @@
       <div class="col-12 col-md-6 mb-3 mb-md-0">
         <div class="input-group datePickerFrom"
              data-wrap="true"
-             data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
+             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',
@@ -20,7 +20,7 @@
       <div class="col-12 col-md-6 mt-3 mt-md-0">
         <div class="input-group datePickerTo"
              data-wrap="true"
-             data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
+             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,

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

@@ -24,8 +24,6 @@
     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),
@@ -45,6 +43,7 @@
                               # Substitute - for _ converting zh-tw to zh_tw
                               # Flatpickr not making things easy here.
     flatpickr_locale:         "#{flatpickr_local_fallback.sub("-", "_")}"
+
   }.to_json
 %>
 </script>

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

@@ -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.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' } %>

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/variants/_form.html.erb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc5
+  version: 4.2.0
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-25 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.rc5
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc5
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc5
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc5
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -270,6 +270,7 @@ files:
 - app/assets/stylesheets/spree/backend/components/_spinner.scss
 - app/assets/stylesheets/spree/backend/components/_tables.scss
 - app/assets/stylesheets/spree/backend/components/_taxon_products_view.scss
+- app/assets/stylesheets/spree/backend/global/_mixins.scss
 - app/assets/stylesheets/spree/backend/global/_variables.scss
 - app/assets/stylesheets/spree/backend/plugins/_flatpickr.scss
 - app/assets/stylesheets/spree/backend/plugins/_jquery_ui.scss
@@ -337,7 +338,6 @@ files:
 - app/controllers/spree/admin/zones_controller.rb
 - app/helpers/spree/admin/adjustments_helper.rb
 - app/helpers/spree/admin/base_helper.rb
-- app/helpers/spree/admin/currency_helper.rb
 - app/helpers/spree/admin/customer_returns_helper.rb
 - app/helpers/spree/admin/images_helper.rb
 - app/helpers/spree/admin/navigation_helper.rb
@@ -652,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.rc5
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc5
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -666,9 +666,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubygems_version: 3.1.4

data/app/helpers/spree/admin/currency_helper.rb

@@ -1,14 +0,0 @@
-module Spree
-  module Admin
-    module CurrencyHelper
-      def currency_options(selected_value = nil)
-        selected_value ||= Spree::Config[:currency]
-        currencies = ::Money::Currency.table.map do |_code, details|
-          iso = details[:iso_code]
-          [iso, "#{details[:name]} (#{iso})"]
-        end
-        options_from_collection_for_select(currencies, :first, :last, selected_value)
-      end
-    end
-  end
-end