spree_backend 4.2.0.rc2 → 4.2.1

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>
@@ -20,21 +21,27 @@
       <% @stores.each do |store| %>
         <tr>
           <td><%= store.unique_name %></td>
-          <td><%= link_to store.url, 'https://' + store.url, target: :blank %></td>
-          <td><%= store.default_currency %></td>
-          <td><%= store.default ? "<strong>#{Spree.t(:say_yes)}</strong>".html_safe : Spree.t(:say_no) %>
+          <td><%= link_to store.url, store.formatted_url, target: :blank %></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">
-            <% if can?(:edit, store) && !store.default %>
-              <%= link_to_with_icon('save.svg', Spree.t(:store_set_default_button), spree.set_default_admin_store_path(store), no_text: true, method: :put, class: 'btn btn-warning btn-sm with-tip') %>
-            <% end %>
             <%= link_to_edit_url spree.edit_admin_store_path(store), no_text: true if can?(:edit, store) %>
+
+            <% if can?(:edit, store) %>
+              <% btn_url = store.default? ? '#' : spree.set_default_admin_store_path(store) %>
+              <% btn_class = store.default? ? 'outline-secondary disabled' : 'warning' %>
+              <% btn_label = store.default? ? nil : Spree.t(:store_set_default_button) %>
+              <%= link_to_with_icon('save.svg', btn_label, btn_url, no_text: true, method: (store.default? ? nil : :put), class: "btn btn-#{btn_class} btn-sm with-tip", aria: {disabled: store.default?}) %>
+            <% end %>
+
             <%= link_to_delete store, no_text: true, url: spree.admin_store_path(store) if can?(:destroy, store) %>
           </td>
         </tr>
       <% end %>
     </tbody>
   </table>
-</div>  
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StoreCredit)) %>

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

@@ -21,13 +21,13 @@
     <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>
           <td><%= tax_category.description %></td>
-          <td><%= tax_category.is_default? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td><%= active_badge(tax_category.is_default?) %></td>
           <td class="actions actions-2 text-right">
             <%= link_to_edit(tax_category, no_text: true) if can? :edit, tax_category %>
             <%= link_to_delete(tax_category, no_text: true) if can? :delete, tax_category %>

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.included_in_price? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-        <td><%=tax_rate.show_rate_in_label? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-        <td><%=tax_rate.calculator.to_s %></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 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

@@ -1,43 +1,46 @@
 <div data-hook="admin_inside_taxon_form">
-  <div class="row">
-    <div class="col-12 col-md-5">
-      <%= f.field_container :name, class: ['form-group'] do %>
-        <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
-        <%= text_field :taxon, :name, class: 'form-control' %>
-        <%= f.error_message_on :name, class: 'error-message' %>
-      <% end %>
+  <%= f.field_container :name, class: ['form-group'] do %>
+    <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
+    <%= text_field :taxon, :name, class: 'form-control' %>
+    <%= f.error_message_on :name, class: 'error-message' %>
+  <% end %>
 
-      <%= f.field_container :permalink, class: ['form-group'] do %>
-        <%= label_tag :permalink_part, Spree.t(:permalink) %> <span class="required">*</span>
-        <%= text_field_tag :permalink_part, @permalink_part, class: 'form-control', required: true %>
-        <small class="form-text text-muted" id="permalink_part_display">
-          <%= @taxon.permalink.split('/')[0...-1].join('/') + '/' %>
-        </small>
-      <% end %>
+  <%= f.field_container :permalink, class: ['form-group'] do %>
+    <%= label_tag :permalink_part, raw(Spree.t(:permalink) + required_span_tag) %>
+    <div class="input-group mb-3">
+      <div class="input-group-prepend">
+        <span class="input-group-text" id="basic-addon3">
+          <%= [current_store.formatted_url, 't', @parent_permalink].join('/') %>
+        </span>
+      </div>
+      <%= text_field_tag :permalink_part, @permalink_part, class: 'form-control', required: true %>
+    </div>
+  <% end %>
 
-      <%= f.field_container :hide_from_nav, class: ['form-group'] do %>
-        <%= f.label :hide_from_nav do %>
-          <%= Spree.t(:hide_from_subcategories_nav) %>
-          <br>
-          <%= f.check_box :hide_from_nav, { checked: @taxon.hide_from_nav } %>
-          <small><%= Spree.t(:say_yes) %></small>
-        <% end %>
-      <% end %>
+  <%= f.field_container :hide_from_nav, class: ['form-group'] do %>
+    <%= f.label :hide_from_nav do %>
+      <%= Spree.t(:hide_from_subcategories_nav) %>
+      <br>
+      <%= f.check_box :hide_from_nav, { checked: @taxon.hide_from_nav } %>
+      <small><%= Spree.t(:say_yes) %></small>
+    <% end %>
+  <% end %>
 
-      <%= f.field_container :icon, class: ['form-group'] do %>
-        <%= f.label :icon, Spree.t(:header_banner) %>
-        <%= image_tag(main_app.url_for(@taxon.icon.try(:attachment)), class: 'w-100') if @taxon.icon %>
-        <%= f.file_field :icon %>
-      <% end %>
-    </div>
+  <%= f.field_container :icon, class: ['form-group'] do %>
+    <%= f.label :icon, Spree.t(:header_banner) %>
+    <%= image_tag(main_app.url_for(@taxon.icon.try(:attachment)), class: 'w-100') if @taxon.icon %>
+    <%= f.file_field :icon %>
+    <% if @taxon.icon.present? %>
+      <%= link_to Spree.t(:remove_image),
+        remove_icon_admin_taxonomy_taxon_url(@taxonomy.id, @taxon.id),
+        method: :delete %>
+    <% end %>
+  <% end %>
 
-    <div class="col-12 col-md-7">
-      <%= f.field_container :description, class: ['form-group'] do %>
-        <%= f.label :description, Spree.t(:description) %>
-        <%= f.text_area :description, class: 'form-control', rows: 6 %>
-      <% end %>
-    </div>
-  </div>
+  <%= f.field_container :description, class: ['form-group'] do %>
+    <%= f.label :description, Spree.t(:description) %>
+    <%= f.text_area :description, class: 'form-control', rows: 6 %>
+  <% end %>
 
   <%= f.field_container :meta_title, class: ['form-group'] do %>
     <%= f.label :meta_title, Spree.t(:meta_title) %>

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/taxons/index.html.erb

@@ -4,7 +4,7 @@
 
 <div class="taxon-products-view">
   <div class="form-group">
-    <%= text_field_tag :taxon_id %>
+    <%= select_tag :taxon_id, nil, class: 'd-block w-100' %>
   </div>
 
   <ul id="taxon_products" class="taxon row"></ul>

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

@@ -25,12 +25,10 @@
       </div>
 
       <div class="card-body">
-          <p class="field checkbox" data-hook="use_billing">
-            <%= label_tag :use_billing, id: 'use_billing' do %>
-              <% checked = @user.bill_address.nil? ? false : @user.bill_address == @user.ship_address %>
-              <%= check_box_tag 'user[use_billing]', '1', checked %>
-              <%= Spree.t(:use_billing_address) %>
-            <% end %>
+          <p class="form-group" data-hook="use_billing">
+            <% checked = @user.bill_address.nil? ? false : @user.bill_address == @user.ship_address %>
+            <%= check_box_tag 'user[use_billing]', '1', checked, class: 'checkbox' %>
+            <%= label_tag :use_billing, Spree.t(:use_billing_address), for: 'user_use_billing', id: 'use_billing', class: 'form-check-label' %>
           </p>
         <%= f.fields_for :ship_address, (@user.ship_address || Spree::Address.default(@user, "ship")) do |sa_form| %>
           <% sa_form.object ||= Spree::Address.new(country: Spree::Country.new) %>

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

@@ -6,10 +6,10 @@
           <%= label :new_variant, option_type.presentation %>
           <% if option_type.name == 'color' %>
             <%= f.collection_select 'option_value_ids', option_type.option_values, :id, :name,
-              { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2' } %>
+              { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2-clear', id: "option_value_ids-#{option_type.id}" } %>
           <% else %>
             <%= f.collection_select 'option_value_ids', option_type.option_values, :id, :presentation,
-              { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2' } %>
+              { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2-clear', id: "option_value_ids-#{option_type.id}"  } %>
           <% end %>
         </div>
       <% end %>
@@ -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-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),

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

@@ -24,7 +24,7 @@
         <tr id="<%= spree_dom_id zone %>" data-hook="zones_row">
           <td><%= zone.name %></td>
           <td><%= zone.description %></td>
-          <td><%= zone.default_tax? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td><%= active_badge(zone.default_tax?) %></td>
           <td class="actions actions-2 text-right">
             <%= link_to_edit(zone, no_text: true) if can? :edit, zone %>
             <%= link_to_delete(zone, no_text: true) if can? :delete, zone %>

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/config/routes.rb

@@ -86,6 +86,8 @@ Spree::Core::Engine.add_routes do
         put :resume
         get :store
         put :set_store
+        get :channel
+        put :set_channel
       end
 
       resources :state_changes, only: [:index]
@@ -134,7 +136,11 @@ Spree::Core::Engine.add_routes do
       collection do
         post :update_positions
       end
-      resources :taxons
+      resources :taxons do
+        member do
+          delete :remove_icon
+        end
+      end
     end
 
     resources :taxons, only: [:index, :show]

data/spree_backend.gemspec

@@ -28,11 +28,11 @@ 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'
   s.add_dependency 'jquery-rails',    '~> 4.3'
   s.add_dependency 'jquery-ui-rails', '~> 6.0.1'
-  s.add_dependency 'select2-rails',   '~> 3.5.0'
+  s.add_dependency 'select2-rails',   '~> 4.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc2
+  version: 4.2.1
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2021-03-05 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.rc2
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc2
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc2
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc2
+        version: 4.2.1
 - !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
@@ -135,14 +135,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 4.0.0
 description: Required dependency for Spree
 email: hello@spreecommerce.org
 executables: []
@@ -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
@@ -246,7 +245,6 @@ files:
 - app/assets/javascripts/spree/backend/stock_management.js
 - app/assets/javascripts/spree/backend/stock_movement.js
 - app/assets/javascripts/spree/backend/stock_transfer.js
-- app/assets/javascripts/spree/backend/tag_picker.js
 - app/assets/javascripts/spree/backend/taxon_autocomplete.js
 - app/assets/javascripts/spree/backend/taxon_permalink_preview.js
 - app/assets/javascripts/spree/backend/taxon_tree_menu.js
@@ -272,10 +270,12 @@ 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
-- app/assets/stylesheets/spree/backend/plugins/_select2.scss
+- app/assets/stylesheets/spree/backend/plugins/_select2_custom.scss
+- app/assets/stylesheets/spree/backend/plugins/select2_bootstrap4.scss
 - app/assets/stylesheets/spree/backend/shared/_base.scss
 - app/assets/stylesheets/spree/backend/shared/_forms.scss
 - app/assets/stylesheets/spree/backend/shared/_glyphicons_urls_fix.scss
@@ -338,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
@@ -376,7 +375,6 @@ files:
 - app/views/spree/admin/customer_returns/edit.html.erb
 - app/views/spree/admin/customer_returns/index.html.erb
 - app/views/spree/admin/customer_returns/new.html.erb
-- app/views/spree/admin/general_settings/_form.html.erb
 - app/views/spree/admin/general_settings/edit.html.erb
 - app/views/spree/admin/images/_form.html.erb
 - app/views/spree/admin/images/edit.html.erb
@@ -391,6 +389,7 @@ files:
 - app/views/spree/admin/orders/_add_line_item.html.erb
 - app/views/spree/admin/orders/_add_product.html.erb
 - app/views/spree/admin/orders/_adjustments.html.erb
+- app/views/spree/admin/orders/_channel_form.html.erb
 - app/views/spree/admin/orders/_form.html.erb
 - app/views/spree/admin/orders/_line_items.html.erb
 - app/views/spree/admin/orders/_line_items_edit_form.html.erb
@@ -400,6 +399,7 @@ files:
 - app/views/spree/admin/orders/_shipment_manifest.html.erb
 - app/views/spree/admin/orders/_store_form.html.erb
 - app/views/spree/admin/orders/cart.html.erb
+- app/views/spree/admin/orders/channel.html.erb
 - app/views/spree/admin/orders/customer_details/_autocomplete.js.erb
 - app/views/spree/admin/orders/customer_details/_form.html.erb
 - app/views/spree/admin/orders/customer_details/edit.html.erb
@@ -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.rc2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.1
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc2
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -666,12 +666,12 @@ 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.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.