solidus_backend 4.7.1 → 4.8.0

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

@@ -3,6 +3,8 @@
 module Spree
   module Admin
     class BaseController < Spree::BaseController
+      include Spree::Core::ControllerHelpers::Timezone
+
       helper "spree/admin/navigation"
       layout "spree/layouts/admin"
 
@@ -49,7 +51,7 @@ module Spree
       end
 
       def config_locale
-        Spree::Backend::Config[:locale]
+        Spree::Backend::Config.locale
       end
 
       def lock_order

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -23,12 +23,16 @@ module Spree
         end
 
         def update
-          if @order.contents.update_cart(order_params)
+          if should_associate_user?
+            requested_user = Spree.user_class.accessible_by(current_ability, :show).find_by(id: params[:user_id])
 
-            if should_associate_user?
-              requested_user = Spree.user_class.find(params[:user_id])
-              @order.associate_user!(requested_user, @order.email.blank?)
+            unless requested_user
+              return resource_not_found(flash_class: Spree.user_class, redirect_url: edit_admin_order_customer_url(@order))
             end
+          end
+
+          if @order.contents.update_cart(order_params)
+            @order.associate_user!(requested_user, @order.email.blank?) if requested_user
 
             unless @order.completed?
               @order.contents.advance

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

@@ -16,7 +16,7 @@ module Spree
 
       def index
         params[:q] ||= {}
-        params[:q][:completed_at_not_null] ||= "1" if Spree::Config[:show_only_complete_orders_by_default]
+        params[:q][:completed_at_not_null] ||= "1" if Spree::Config.show_only_complete_orders_by_default
         @show_only_completed = params[:q][:completed_at_not_null] == "1"
         params[:q][:s] ||= @show_only_completed ? "completed_at desc" : "created_at desc"
         params[:q][:completed_at_not_null] = "" unless @show_only_completed
@@ -53,7 +53,7 @@ module Spree
         @search = Spree::Order.accessible_by(current_ability, :index).ransack(params[:q])
         @orders = @search.result.includes([:user])
           .page(params[:page])
-          .per(params[:per_page] || Spree::Config[:orders_per_page])
+          .per(params[:per_page] || Spree::Config.orders_per_page)
 
         # Restore dates
         params[:q][:created_at_gt] = created_at_gt
@@ -61,7 +61,7 @@ module Spree
       end
 
       def new
-        user = Spree.user_class.find_by(id: params[:user_id]) if params[:user_id]
+        user = Spree.user_class.accessible_by(current_ability, :show).find_by(id: params[:user_id]) if params[:user_id]
         order_importer_params = order_params
         order_importer_params[:bill_address] = user&.bill_address
         order_importer_params[:ship_address] = user&.ship_address

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

@@ -9,6 +9,7 @@ module Spree
       before_action :load_payment, except: [:create, :new, :index, :fire]
       before_action :load_payment_for_fire, only: :fire
       before_action :load_data
+      before_action :load_log_entries, only: [:show]
       before_action :require_bill_address, only: [:index]
 
       helper ::Spree::Admin::OrdersHelper
@@ -16,7 +17,7 @@ module Spree
       respond_to :html
 
       def index
-        @payments = @order.payments.includes(refunds: :reason)
+        @payments = @order.payments.includes(:payment_method, refunds: :reason)
         @refunds = @payments.flat_map(&:refunds)
         redirect_to new_admin_order_payment_url(@order) if @payments.empty?
       end
@@ -57,6 +58,11 @@ module Spree
       def fire
         return unless (event = params[:e]) && @payment.payment_source
 
+        unless @payment.actions.include?(event)
+          flash[:error] = t("spree.cannot_perform_operation")
+          return
+        end
+
         # Because we have a transition method also called void, we do this to avoid conflicts.
         event = "void_transaction" if event == "void"
         if @payment.send("#{event}!")
@@ -104,6 +110,13 @@ module Spree
         @payment = Spree::Payment.find(params[:id])
       end
 
+      def load_log_entries
+        @all_log_entries = Spree::LogEntry
+          .where(source: @payment)
+          .or(Spree::LogEntry.where(source: @payment.refunds))
+          .order(:created_at)
+      end
+
       def load_payment_for_fire
         load_payment
         authorize! params[:e].to_sym, @payment
@@ -114,7 +127,7 @@ module Spree
       end
 
       def require_bill_address
-        if Spree::Config[:order_bill_address_used] && @order.bill_address.nil?
+        if Spree::Config.order_bill_address_used && @order.bill_address.nil?
           flash[:notice] = t("spree.fill_in_customer_info")
           redirect_to edit_admin_order_customer_url(@order)
         end

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

@@ -93,7 +93,7 @@ module Spree
           .order(id: :asc)
           .includes(product_includes)
           .page(params[:page])
-          .per(Spree::Config[:admin_products_per_page])
+          .per(Spree::Config.admin_products_per_page)
       end
 
       def update_before

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

@@ -18,7 +18,7 @@ module Spree
         @search = @collection.ransack(params[:q])
         @collection = @search.result
           .page(params[:page])
-          .per(Spree::Config[:properties_per_page])
+          .per(Spree::Config.properties_per_page)
 
         @collection
       end

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

@@ -5,6 +5,7 @@ module Spree
     class RefundsController < ResourceController
       belongs_to "spree/payment"
       before_action :load_order
+      before_action :ensure_refundable_payment, only: [:new, :create]
 
       helper_method :refund_reasons
 
@@ -37,6 +38,13 @@ module Spree
         @order = @payment.order if @payment
       end
 
+      def ensure_refundable_payment
+        return if Spree::Config.refundable_payment_states.include?(@payment.state)
+
+        flash[:error] = t("spree.payment_is_not_refundable")
+        redirect_to admin_order_payments_path(@order)
+      end
+
       def refund_reasons
         @refund_reasons ||= Spree::RefundReason.active.all
       end

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

@@ -50,7 +50,7 @@ module Spree
         )
         @variant_display_attributes = self.class.variant_display_attributes
         @variants = Spree::Config.variant_search_class.new(params[:variant_search_term], scope: variant_scope).results
-          .order(id: :desc).page(params[:page]).per(params[:per_page] || Spree::Config[:orders_per_page])
+          .order(id: :desc).page(params[:page]).per(params[:per_page] || Spree::Config.orders_per_page)
       end
 
       def variant_scope

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

@@ -15,7 +15,7 @@ module Spree
       end
 
       def collection
-        super.page(params[:page]).per(Spree::Config[:admin_products_per_page])
+        super.page(params[:page]).per(Spree::Config.admin_products_per_page)
       end
     end
   end

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

@@ -110,7 +110,7 @@ module Spree
 
       def build_resource
         parent.store_credits.build(
-          currency: Spree::Config[:currency]
+          currency: Spree::Config.currency
         )
       end
     end

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

@@ -13,6 +13,13 @@ module Spree
 
       private
 
+      def permitted_resource_params
+        super.tap do |store_params|
+          without_address_parameters = store_params[:address_attributes]&.except(:country_id, :state_id, :reverse_charge_status)&.compact_blank&.empty?
+          store_params.delete(:address_attributes) if without_address_parameters
+        end
+      end
+
       def store_params
         params.require(:store).permit(permitted_params)
       end

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

@@ -21,7 +21,7 @@ module Spree
           .order(:zone_id)
         @collection = @collection
           .page(params[:page])
-          .per(Spree::Config[:admin_products_per_page])
+          .per(Spree::Config.admin_products_per_page)
       end
     end
   end

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

@@ -42,6 +42,10 @@ module Spree
           set_roles
           set_stock_locations
 
+          if @user.respond_to?(:timezone) && @user.saved_change_to_timezone? && @user == spree_current_user
+            session[:solidus_timezone] = nil
+          end
+
           flash[:success] = t("spree.account_updated")
           redirect_to edit_admin_user_url(@user)
         else
@@ -66,7 +70,7 @@ module Spree
       def orders
         params[:q] ||= {}
         @search = Spree::Order.reverse_chronological.ransack(params[:q].merge(user_id_eq: @user.id))
-        @orders = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
+        @orders = @search.result.page(params[:page]).per(Spree::Config.admin_products_per_page)
       end
 
       def items
@@ -78,7 +82,7 @@ module Spree
           }
         ).ransack(params[:q].merge(user_id_eq: @user.id))
 
-        @orders = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
+        @orders = @search.result.page(params[:page]).per(Spree::Config.admin_products_per_page)
       end
 
       def model_class
@@ -93,7 +97,7 @@ module Spree
         @search = super.ransack(params[:q])
         @collection = @search.result.includes(:spree_roles)
         @collection = @collection.includes(:orders)
-        @collection = @collection.page(params[:page]).per(Spree::Config[:admin_products_per_page])
+        @collection = @collection.page(params[:page]).per(Spree::Config.admin_products_per_page)
       end
 
       def user_params

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

@@ -27,7 +27,7 @@ module Spree
         end
 
         search = Spree::Config.variant_search_class.new(params[:variant_search_term], scope: base_variant_scope)
-        @collection = search.results.includes(variant_includes).page(params[:page]).per(Spree::Config[:admin_variants_per_page])
+        @collection = search.results.includes(variant_includes).page(params[:page]).per(Spree::Config.admin_variants_per_page)
       end
 
       def load_data

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

@@ -4,7 +4,7 @@ module Spree
   module Admin
     module ProductsHelper
       def frontend_product_path(product)
-        Spree::Backend::Config[:frontend_product_path].call(self, product)
+        Spree::Backend::Config.frontend_product_path.call(self, product)
       end
 
       def show_rebuild_vat_checkbox?

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -41,7 +41,7 @@
   </fieldset>
 
   <div class="row">
-    <% if Spree::Config[:order_bill_address_used] %>
+    <% if Spree::Config.order_bill_address_used %>
       <div class="col-6" data-hook="bill_address_wrapper">
         <fieldset class="no-border-bottom">
           <legend align="center"><%= t('spree.billing_address') %></legend>
@@ -57,7 +57,7 @@
     <div class="col-6" data-hook="ship_address_wrapper">
       <fieldset class="no-border-bottom">
         <legend align="center"><%= t('spree.shipping_address') %></legend>
-        <% if Spree::Config[:order_bill_address_used] %>
+        <% if Spree::Config.order_bill_address_used %>
           <div class="field">
             <span data-hook="use_billing">
               <label>

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

@@ -32,7 +32,7 @@
         <div data-hook="auto_capture" class="field">
           <%= f.label :auto_capture %>
           <%= f.select :auto_capture,
-            [["#{t('spree.use_app_default')} (#{Spree::Config[:auto_capture] ? t('spree.say_yes') : t('spree.say_no')})", ''],
+            [["#{t('spree.use_app_default')} (#{Spree::Config.auto_capture ? t('spree.say_yes') : t('spree.say_no')})", ''],
              [t('spree.say_yes'), true],
              [t('spree.say_no'), false]],
           {},

data/app/views/spree/admin/payments/_log_entries.html.erb

@@ -1,12 +1,14 @@
 <table class='index' id='listing_log_entries'>
   <colgroup>
-    <col style="width: 30%">
-    <col style="width: 60%">
+    <col style="width: 25%">
+    <col style="width: 15%">
+    <col style="width: 50%">
     <col style="width: 10%">
   </colgroup>
   <thead>
     <tr>
       <th><%= Spree::LogEntry.human_attribute_name(:created_at) %></th>
+      <th><%= Spree::LogEntry.human_attribute_name(:source) %></th>
       <th><%= Spree::LogEntry.human_attribute_name(:details) %></th>
       <th></th>
     </tr>
@@ -17,6 +19,9 @@
       <td>
         <%= pretty_time(entry.created_at) %>
       </td>
+      <td>
+        <%= entry.source_type.constantize.model_name.human %>
+      </td>
       <td>
         <pre><%= entry.parsed_details.message %></pre>
       </td>

data/app/views/spree/admin/payments/show.html.erb

@@ -21,9 +21,9 @@
   </fieldset>
 <% end %>
 
-<% if @payment.log_entries.any? %>
+<% if @all_log_entries.any? %>
   <fieldset class="no-border-bottom">
     <legend><%= plural_resource_name(Spree::LogEntry) %></legend>
-    <%= render 'spree/admin/payments/log_entries', log_entries: @payment.log_entries %>
+    <%= render 'spree/admin/payments/log_entries', log_entries: @all_log_entries %>
   </fieldset>
 <% end %>

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

@@ -6,7 +6,7 @@
     <%= f.text_field :name, class: 'fullwidth' %>
   </div>
 
-  <% if Spree::Config[:company] %>
+  <% if Spree::Config.company %>
     <div class="field <%= "#{type}-row" %>">
       <%= f.label :company %>
       <%= f.text_field :company, class: 'fullwidth' %>
@@ -18,10 +18,12 @@
     <%= f.text_field :address1, class: 'fullwidth' %>
   </div>
 
-  <div class="field <%= "#{type}-row" %>">
-    <%= f.label :address2 %>
-    <%= f.text_field :address2, class: 'fullwidth' %>
-  </div>
+  <% unless local_assigns.fetch(:excludes, []).include?(:address2) %>
+    <div class="field <%= "#{type}-row" %>">
+      <%= f.label :address2 %>
+      <%= f.text_field :address2, class: 'fullwidth' %>
+    </div>
+  <% end %>
 
   <div class="field <%= "#{type}-row" %>">
     <%= f.label :city %>
@@ -59,15 +61,19 @@
     </span>
   </div>
 
-  <div class="field <%= "#{type}-row" %>">
-    <%= f.label :phone %>
-    <%= f.phone_field :phone, class: 'fullwidth' %>
-  </div>
+  <% unless local_assigns.fetch(:excludes, []).include?(:phone) %>
+    <div class="field <%= "#{type}-row" %>">
+      <%= f.label :phone %>
+      <%= f.phone_field :phone, class: 'fullwidth' %>
+    </div>
+  <% end %>
 
-  <div class="field <%= "#{type}-row" %>">
-    <%= f.label :email %>
-    <%= f.email_field :email, class: 'fullwidth' %>
-  </div>
+  <% unless local_assigns.fetch(:excludes, []).include?(:email) %>
+    <div class="field <%= "#{type}-row" %>">
+      <%= f.label :email %>
+      <%= f.email_field :email, class: 'fullwidth' %>
+    </div>
+  <% end %>
   
   <% if Spree::Backend::Config.show_reverse_charge_fields %>
     <div class="field <%= "#{type}-row" %>">

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

@@ -5,7 +5,7 @@
 
 <title><%= admin_page_title %></title>
 
-<%= favicon_link_tag 'favicon.ico' %>
+<%= favicon_link_tag 'spree/backend/favicon.ico' %>
 <%= stylesheet_link_tag Spree::Backend::Config.theme_path(session[:admin_light_theme]), media: '(prefers-color-scheme: light)', data: {turbolinks_track: 'reload'} %>
 <%= stylesheet_link_tag Spree::Backend::Config.theme_path(session[:admin_dark_theme]), media: '(prefers-color-scheme: dark)', data: {turbolinks_track: 'reload'} %>
 <%= javascript_include_tag 'spree/backend/all', data: {turbolinks_track: 'reload'} %>

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

@@ -5,7 +5,7 @@
 <% if available_locale_options_for_select.size > 1 %>
   <%= form_tag(spree.admin_set_locale_path(format: :html), method: :put, style: "width: 100%;") do %>
     <label class="admin-navbar-selection admin-locale-selection">
-      <i class="fa fa-globe fa-fw" title="<%= I18n.t('spree.choose_dashboard_locale') %>"></i>
+      <i class="fa fa-language fa-fw" title="<%= I18n.t('spree.choose_dashboard_locale') %>"></i>
       <select class="custom-select fullwidth" onchange="this.form.requestSubmit()">
         <%= options_for_select(available_locale_options_for_select, I18n.locale) %>
       </select>

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

@@ -6,7 +6,7 @@
   <li>
     <%= form_tag(spree.admin_set_locale_path(format: :html), method: :put, style: "width: 100%;") do %>
       <label>
-        <svg aria-hidden="true"><use xlink:href="<%= image_path('spree/backend/themes/solidus_admin/remixicon.symbol.svg') %>#ri-global-line"></use></svg>
+        <svg aria-hidden="true"><use xlink:href="<%= image_path('spree/backend/themes/solidus_admin/remixicon.symbol.svg') %>#ri-translate-2"></use></svg>
         <select name="switch_to_locale" onchange="this.form.requestSubmit()">
           <%= options_for_select(available_locale_options_for_select, selected: I18n.locale) %>
         </select>

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

@@ -6,6 +6,7 @@
       <%= button_tag class: 'btn fa fa-chevron-circle-left', id: 'admin-nav-toggle', type: :button do %>
         <span class="text"><%= t('spree.minimize_menu') %></span>
       <% end %>
+      <%= render partial: 'spree/admin/shared/timezone_selection' %>
       <%= render partial: 'spree/admin/shared/locale_selection' %>
       <%= render partial: 'spree/admin/shared/theme_selection' %>
       <% if lookup_context.exists?('spree/admin/shared/_navigation_footer') %>

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

@@ -1,5 +1,5 @@
 <header class="admin-nav-header">
   <%= link_to spree.admin_path, class: 'brand-link' do %>
-    <%= image_tag(Spree::Config[:admin_interface_logo]) %>
+    <%= image_tag(Spree::Config.admin_interface_logo) %>
   <%- end %>
 </header>

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

@@ -4,7 +4,7 @@
   <aside class="solidus-admin--nav">
     <header class="solidus-admin--nav--section">
       <%= link_to spree.admin_path, class: 'solidus-admin--nav--logo' do %>
-        <%= image_tag(Spree::Config[:admin_interface_logo]) %>
+        <%= image_tag(Spree::Config.admin_interface_logo) %>
       <%- end %>
 
       <%= link_to "//#{default_store.url}", target: '_blank', class: 'solidus-admin--nav--store-link' do %>
@@ -33,7 +33,7 @@
                 data-legacy-label="<%= 'spree.navigation.switch_to_legacy'.then { t(_1, default: t(_1, locale: :en)) } %>"
                 data-admin-label="<%= 'spree.navigation.switch_to_solidus_admin'.then { t(_1, default: t(_1, locale: :en)) } %>"
               ></span>
-              <span><input type="checkbox" id="solidus-admin-switch" class="solidus-admin--nav--switch"/></span>
+              <span><input type="checkbox" id="solidus-admin-switch" class="solidus-admin--nav--switch"></span>
             </label>
           </li>
         </ul>
@@ -49,6 +49,7 @@
           </summary>
 
           <ul>
+            <%= render 'spree/admin/shared/timezone_selection_solidus_admin' %>
             <%= render 'spree/admin/shared/locale_selection_solidus_admin' %>
             <%= render 'spree/admin/shared/theme_selection_solidus_admin' %>
 

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

@@ -0,0 +1,10 @@
+<% available_timezones_for_select = ActiveSupport::TimeZone.all.map(&:name) %>
+
+<%= form_tag(url_for, method: :get, style: "width: 100%;") do %>
+  <label class="admin-navbar-selection admin-timezone-selection">
+    <i class="fa fa-globe fa-fw" title="<%= I18n.t('spree.choose_dashboard_timezone') %>"></i>
+    <select name="solidus_timezone" class="custom-select fullwidth" onchange="this.form.requestSubmit()">
+      <%= options_for_select(available_timezones_for_select, selected: Time.zone.name) %>
+    </select>
+  </label>
+<% end %>

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

@@ -0,0 +1,13 @@
+<% available_timezones_for_select = ActiveSupport::TimeZone.all.map(&:name) %>
+
+<li>
+  <%= form_tag(url_for, method: :get, style: "width: 100%;") do %>
+    <label>
+      <svg aria-hidden="true"><use xlink:href="<%= image_path('spree/backend/themes/solidus_admin/remixicon.symbol.svg') %>#ri-time-zone-line"></use></svg>
+      <select name="solidus_timezone" onchange="this.form.requestSubmit()">
+        <%= options_for_select(available_timezones_for_select, selected: Time.zone.name) %>
+      </select>
+      <svg aria-hidden="true"><use xlink:href="<%= image_path('spree/backend/themes/solidus_admin/remixicon.symbol.svg') %>#ri-expand-up-down-line"></use></svg>
+    </label>
+  <% end %>
+</li>

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

@@ -41,6 +41,13 @@
         <%= f.error_message_on :reverse_charge_status %>
       <% end %>
     <% end %>
+
+    <fieldset class="no-border-bottom js-addresses-form" data-hook="store_address_wrapper">
+      <legend align="center"><%= Spree::Address.model_name.human %></legend>
+      <%= f.fields_for :address, f.object.address || Spree::Address.new(country: Spree::Country.find_by(iso: Spree::Config.default_country_iso)) do |address_form| %>
+        <%= render partial: 'spree/admin/shared/address_form', locals: { f: address_form, type: "store", excludes: Spree::Config.address_requires_phone ? [:address2, :email] : [:address2, :email, :phone] } %>
+      <% end %>
+    </fieldset>
   </div>
   <div class="col-12 col-md-6">
     <%= f.field_container :url do %>

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

@@ -35,7 +35,7 @@
       </div>
     <% end %>
 
-    <% if Spree::Config[:can_restrict_stock_management] && can?(:show, Spree::StockLocation) %>
+    <% if Spree::Config.can_restrict_stock_management && can?(:show, Spree::StockLocation) %>
       <div data-hook="admin_user_form_stock_locations" class="field">
         <%= label_tag nil, plural_resource_name(Spree::StockLocation) %>
         <ul>
@@ -76,5 +76,12 @@
         <% end %>
       <% end %>
     <% end %>
+
+    <% if can?(:update, @user) && @user.respond_to?(:timezone) %>
+      <%= f.field_container :timezone do %>
+        <%= f.label :timezone %>
+        <%= f.time_zone_select :timezone, nil, {include_blank: t("spree.none")}, class: "select2 fullwidth" %>
+      <% end %>
+    <% end %>
   </div>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 4.7.1
+  version: 4.8.0
 platform: ruby
 authors:
 - Solidus Team
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.1
+        version: 4.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.1
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.1
+        version: 4.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.1
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -155,11 +155,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
 - Rakefile
 - app/assets/config/solidus_backend_manifest.js
-- app/assets/images/favicon.ico
 - app/assets/images/solidus-style-guide-logo.png
+- app/assets/images/spree/backend/favicon.ico
 - app/assets/images/spree/backend/themes/solidus_admin/remixicon.license.txt
 - app/assets/images/spree/backend/themes/solidus_admin/remixicon.symbol.svg
 - app/assets/javascripts/spree/backend.js
@@ -563,6 +564,8 @@ files:
 - app/views/spree/admin/shared/_taxes_tabs.html.erb
 - app/views/spree/admin/shared/_theme_selection.html.erb
 - app/views/spree/admin/shared/_theme_selection_solidus_admin.html.erb
+- app/views/spree/admin/shared/_timezone_selection.html.erb
+- app/views/spree/admin/shared/_timezone_selection_solidus_admin.html.erb
 - app/views/spree/admin/shared/_variant_search.html.erb
 - app/views/spree/admin/shared/named_types/_edit.html.erb
 - app/views/spree/admin/shared/named_types/_form.html.erb
@@ -877,7 +880,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.
 test_files: []