solidus_backend 4.2.5 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c96093feaa6ba9261f595b553b0f468980377dd35613593e72f8e33b52a79b4
-  data.tar.gz: d7c3390eb838055f27a0628cb6104d519088900d1ff2dcd43a5329f1c5212db2
+  metadata.gz: 855db55d75a9f15861129db90e9f74f7ac4785118361326751e131593b51ed3c
+  data.tar.gz: 2a1845cee94fff5ec8a8b6be562d8bbb4be814739fbf246994f6f7f9b7660b3d
 SHA512:
-  metadata.gz: '0921a2ebe34b7b8f8e16d7188ec2d214df75aea411b642e2bfc9115de25e61e5cd11e7bc12bdf524a38d6f16fc6785abc0e16ebd12524862498b91485ad8e5fa'
-  data.tar.gz: dec66e87eb65a8710784367445b26af350810b9d9f357a85659160580be93d3827922dedda4a10d72d6a2c915878312ff6a604b53c31e756c9edd7c84d5e816e
+  metadata.gz: 4a2c9a211255502d6ffcd5217de8ed1797f728b5f35684cc5cab9e36548fa3575af695d4add1d18d3c26cfb22c5b43e4275fecec21438d5918ec2c28fa3a142c
+  data.tar.gz: 3f4ebcfaf5f21bac101e9dcc64f3fc19c8886cdb0f113a4981176b130f8f9e3a970ab9e0cc3763f91bf92ea7a6675ee743722d1ef98b44bb73015e47fbc0fc78

data/app/assets/config/solidus_backend_manifest.js

@@ -1,9 +1,7 @@
 //= link_tree ../images
+//= link_tree "../stylesheets/spree/backend/themes" .css
 
 //= link spree/backend/all.js
 //= link spree/backend/all.css
 
 //= link solidus_admin/select2_locales
-
-//= link spree/backend/themes/classic.css
-//= link spree/backend/themes/solidus_admin.css

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

@@ -7,5 +7,5 @@ Spree.formatMoney = function(amount, currency) {
   var thousand = Spree.t('currency_delimiter');
   var decimal = Spree.t('currency_separator');
 
-  return accounting.formatMoney(amount, currencyInfo[0], currencyInfo[1], thousand, decimal, currencyInfo[2]).trim();
+  return accounting.formatMoney(amount, currencyInfo[0], currencyInfo[1], thousand, decimal, currencyInfo[2]);
 }

data/app/assets/stylesheets/spree/backend/components/_hint.scss

@@ -1,3 +1,7 @@
 .hint-tooltip {
   cursor: pointer;
+
+  i {
+    color: $color-dark-light;
+  }
 }

data/app/assets/stylesheets/spree/backend/components/_messages.scss

@@ -25,35 +25,28 @@
 }
 
 .flash-wrapper {
+  bottom: 20px;
+  max-width: 320px;
   position: fixed;
-  bottom: 0;
-  left: $width-sidebar;
-  right: 0;
+  right: 20px;
   z-index: 1000;
-
-  .admin-nav-hidden & {
-    left: $width-sidebar-collapsed;
-  }
 }
 
 .flash {
-  border-top: 3px solid;
   padding: 16px;
+  border-radius: 4px;
   text-align: center;
   font-size: 120%;
   color: $body-color;
 
   &.notice {
     background-color: rgba(theme-color-level(warning, -8), .95);
-    border-top-color: theme-color(warning);
   }
   &.success {
     background-color: rgba(theme-color-level(success, -10), .95);
-    border-top-color: theme-color(success);
   }
   &.error {
     background-color: rgba(theme-color-level(danger, -8), .95);
-    border-top-color: theme-color(danger);
   }
 }
 

data/app/assets/stylesheets/spree/backend/components/_navigation.scss

@@ -122,6 +122,22 @@ nav.menu {
   @media print {
     display: none
   }
+
+
+  .dark-only {
+    display: none;
+    @media (prefers-color-scheme: dark) {
+      display: block;
+    }
+  }
+
+  .light-only {
+    display: block;
+    @media (prefers-color-scheme: dark) {
+      display: none;
+    }
+  }
+
 }
 
 .admin-nav-header {
@@ -301,7 +317,8 @@ nav.menu {
 }
 
 .admin-navbar-selection {
-  margin: 0 1.5em;
+  padding: 0 1.5em;
+  width: 100%;
   position: relative;
   overflow: hidden;
   display: inline-flex;
@@ -323,7 +340,7 @@ nav.menu {
     padding: .5rem 0 .5rem .25rem;
   }
 
-   .admin-nav-hidden & {
+  .admin-nav-hidden & {
     position: relative;
 
     select {

data/app/assets/stylesheets/spree/backend/components/_navigation_solidus_admin.scss

@@ -4,7 +4,7 @@ $color-navbar-hover: $color-navbar !default;
 @import "spree/backend/components/switch_solidus_admin";
 
 .solidus-admin--nav {
-  background-color: $color-light;
+  background-color: $solidus-admin-gray-15;
   position: sticky;
   top: 0;
   bottom: 0;
@@ -19,6 +19,20 @@ $color-navbar-hover: $color-navbar !default;
   min-height: 100vh;
   border-right: $color-light-accent 1px solid;
 
+  .dark-only {
+    display: none;
+    @media (prefers-color-scheme: dark) {
+      display: block;
+    }
+  }
+
+  .light-only {
+    display: none;
+    @media (prefers-color-scheme: light) {
+      display: block;
+    }
+  }
+
   &--wrapper {
     position: absolute;
     top: 0;
@@ -79,7 +93,7 @@ $color-navbar-hover: $color-navbar !default;
     }
 
     &--name {
-      line-height: 24px;
+      line-height: 20px;
       font-size: 14px;
       font-weight: 600;
       color: $color-dark;
@@ -87,7 +101,7 @@ $color-navbar-hover: $color-navbar !default;
     }
 
     &--url {
-      line-height: 20px;
+      line-height: 16px;
       font-size: 12px;
       font-weight: 400;
       color: $color-dark-light;
@@ -106,6 +120,7 @@ $color-navbar-hover: $color-navbar !default;
     padding: 0;
     list-style: none;
     text-align: left;
+    margin-bottom: 12px;
 
     li {
       padding: 0;
@@ -122,20 +137,26 @@ $color-navbar-hover: $color-navbar !default;
       padding: 2px 12px;
       width: 100%;
       border-radius: $border-radius;
-      color: $color-primary;
+      color: $solidus-admin-gray-800;
       gap: 12px;
       display: flex;
       align-items: center;
 
       &::before,
       svg {
-        display: inline-block;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
         width: 18px;
         height: 18px;
         padding: 0;
       }
     }
 
+    li > label > span {
+      line-height: 20px;
+    }
+
     li.selected > a {
       background: $color-navbar-active-bg;
       color: $color-navbar-active;

data/app/assets/stylesheets/spree/backend/sections/_promotions.scss

@@ -12,12 +12,6 @@
   }
 }
 
-#actions_container {
-  .edit_promotion {
-    margin-top: 73px;
-  }
-}
-
 .promotion-block {
   padding: 0 1.25rem 0.5rem;
   background-color: lighten($color-border, 5);

data/app/assets/stylesheets/spree/backend/shared/_tables.scss

@@ -38,6 +38,7 @@ table {
         text-align: center;
         border-bottom: none;
         vertical-align: middle;
+        color: $color-dark-light;
 
         &:before {
           padding: 0;
@@ -111,6 +112,10 @@ table {
 
   th a {
     color: $color-dark;
+
+    &:hover {
+      color: $color-dark-light;
+    }
   }
 
   tbody {

data/app/assets/stylesheets/spree/backend/themes/classic_dark.css.scss

@@ -0,0 +1,16 @@
+@import 'spree/backend/themes/classic';
+
+html {
+  background-color: #fff;
+  color: #fff;
+  -webkit-filter: invert(100%);
+  filter: invert(100%) hue-rotate(180deg);
+
+  img {
+    filter: invert(100%) hue-rotate(-180deg);
+  }
+
+  .brand-link img {
+    filter: invert(0%) hue-rotate(0deg);
+  }
+}

data/app/assets/stylesheets/spree/backend/themes/classic_dimmed.css.scss

@@ -0,0 +1,16 @@
+@import 'spree/backend/themes/classic';
+
+html {
+  background-color: #fff;
+  color: #fff;
+  -webkit-filter: invert(85%);
+  filter: invert(85%) hue-rotate(180deg);
+
+  img {
+    filter: invert(100%) hue-rotate(-180deg);
+  }
+
+  .brand-link img {
+    filter: invert(0%) hue-rotate(0deg);
+  }
+}

data/app/assets/stylesheets/spree/backend/themes/solidus_admin/_tables.scss

@@ -1,3 +1,5 @@
+@import "./colors";
+
 table.index {
   // Borders
   border-collapse: separate;

data/app/assets/stylesheets/spree/backend/themes/solidus_admin/_variables.scss

@@ -19,10 +19,10 @@ $color-dark-dark: $solidus-admin-gray-600;
 $color-dark-light: $solidus-admin-gray-500;
 $color-dark-accent: $solidus-admin-gray-200;
 
-$color-primary: $solidus-admin-black;
+$color-primary: $solidus-admin-gray-700;
 $color-primary-light: $solidus-admin-gray-100;
 
-$color-light: $solidus-admin-gray-15;
+$color-light: $solidus-admin-gray-25;
 $color-light-dark: $solidus-admin-gray-50;
 $color-light-accent: $solidus-admin-gray-100;
 
@@ -49,10 +49,10 @@ $color-navbar-active: $solidus-admin-solidus-red;
 $color-navbar-active-bg: $solidus-admin-gray-50;
 $color-navbar-submenu: $color-dark-light;
 $color-navbar-submenu-bg: $color-light;
-$color-navbar-submenu-active: $color-primary;
+$color-navbar-submenu-active: $solidus-admin-solidus-red;
 $color-navbar-footer: $color-dark;
 $color-navbar-footer-bg: $color-light;
-$color-navbar-footer-active: $color-primary;
+$color-navbar-footer-active: $solidus-admin-solidus-red;
 $color-icon-navbar: $color-dark-light;
 
 $color-navbar-hover-bg: $solidus-admin-gray-50;
@@ -61,7 +61,7 @@ $color-navbar-hover: $color-dark;
 // Basic Tabs colors
 $color-tab: $color-dark-light;
 $color-tab-bg: $color-light;
-$color-tab-border: $color-border;
+$color-tab-border: $color-light-accent;
 $color-tab-active: $color-primary;
 $color-tab-active-bg: $color-white;
 $color-tab-active-border: $color-white;
@@ -74,6 +74,7 @@ $color-error: $color-red;
 // Breadcrumb custom variable
 
 $breadcrumb-color: $color-dark-light;
+$breadcrumb-active-color: $color-dark;
 
 // Color for spinner
 $color-spinner: $color-white;
@@ -157,4 +158,14 @@ $main-header-height: 84px;
 $content-wrapper-bg: $color-white;
 $admin-body-bg: $color-white;
 
-$link-hover-color: $solidus-admin-solidus-red;
+// Links
+//--------------------------------------------------------------
+
+$link-color: $solidus-admin-blue;
+$link-hover-color: darken($solidus-admin-blue, 10%);
+
+// Pagination
+//--------------------------------------------------------------
+
+$pagination-color: $color-primary;
+$pagination-hover-color: $color-dark;

data/app/assets/stylesheets/spree/backend/themes/solidus_admin.css.scss

@@ -1,6 +1,7 @@
 @import "spree/backend/globals";
 
 @import "./solidus_admin/variables";
+@import "./solidus_admin/colors";
 
 @import "spree/backend/vendor";
 @import "spree/backend/shared";

data/app/assets/stylesheets/spree/backend/themes/solidus_admin_dark.css.scss

@@ -0,0 +1,16 @@
+@import "./solidus_admin";
+
+html {
+  background-color: #fff;
+  color: #fff;
+  -webkit-filter: invert(100%);
+  filter: invert(100%) hue-rotate(180deg);
+
+  img {
+    filter: invert(100%) hue-rotate(-180deg);
+  }
+
+  .brand-link img {
+    filter: invert(0%) hue-rotate(0deg);
+  }
+}

data/app/assets/stylesheets/spree/backend/themes/solidus_admin_dimmed.css.scss

@@ -0,0 +1,16 @@
+@import "./solidus_admin";
+
+html {
+  background-color: #fff;
+  color: #fff;
+  -webkit-filter: invert(85%);
+  filter: invert(85%) hue-rotate(180deg);
+
+  img {
+    filter: invert(100%) hue-rotate(-180deg);
+  }
+
+  .brand-link img {
+    filter: invert(0%) hue-rotate(0deg);
+  }
+}

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

@@ -9,7 +9,7 @@ module Spree
       destroy.after :update_totals
       update.after :update_totals
 
-      skip_before_action :load_resource, only: [:toggle_state, :edit, :update, :destroy]
+      skip_before_action :load_resource, only: [:edit, :update, :destroy]
 
       before_action :find_adjustment, only: [:destroy, :edit, :update]
 

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

@@ -11,9 +11,15 @@ module Spree
         if locale_is_available?(requested_locale)
           I18n.locale = requested_locale
           session[set_user_language_locale_key] = requested_locale
-          render json: { locale: requested_locale, location: spree.admin_url }
+          respond_to do |format|
+            format.json { render json: { locale: requested_locale, location: spree.admin_url } }
+            format.html { redirect_back_or_to spree.admin_url, notice: t('spree.locale_changed') }
+          end
         else
-          render json: { locale: I18n.locale }, status: 404
+          respond_to do |format|
+            format.json { render json: { locale: I18n.locale }, status: 404 }
+            format.html { redirect_back_or_to spree.admin_url, error: t('spree.error') }
+          end
         end
       end
 

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

@@ -4,8 +4,8 @@ module Spree
   module Admin
     class OrdersController < Spree::Admin::BaseController
       before_action :initialize_order_events
-      before_action :load_order, only: [:edit, :update, :complete, :advance, :cancel, :resume, :approve, :resend, :unfinalize_adjustments, :finalize_adjustments, :cart, :confirm]
-      around_action :lock_order, only: [:update, :advance, :complete, :confirm, :cancel, :resume, :approve, :resend]
+      before_action :load_order, only: [:edit, :complete, :advance, :cancel, :resume, :approve, :resend, :unfinalize_adjustments, :finalize_adjustments, :cart, :confirm]
+      around_action :lock_order, only: [:advance, :complete, :confirm, :cancel, :resume, :approve, :resend]
 
       rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
       respond_to :html

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

@@ -56,7 +56,7 @@ module Spree
       def variant_scope
         scope = Spree::Variant
           .accessible_by(current_ability)
-          .distinct
+          .distinct.order(:sku)
           .includes(
             :images,
             stock_items: :stock_location,

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    class ThemeController < Spree::Admin::BaseController
+      skip_before_action :authorize_admin, only: [:set]
+
+      def set
+        requested_theme = params[:switch_to_theme].presence
+
+        # Avoid interpolating user content into the session key
+        system_theme = params[:system_theme].presence == "dark" ? "dark" : "light"
+        session_key = :"admin_#{system_theme}_theme"
+
+        if theme_is_available?(requested_theme)
+          session[session_key] = requested_theme
+          redirect_back_or_to spree.admin_url, notice: t('spree.theme_changed')
+        else
+          redirect_back_or_to spree.admin_url, error: t('spree.error')
+        end
+      end
+
+      private
+
+      def theme_is_available?(theme)
+        theme && Spree::Backend::Config.themes.key?(theme.to_sym)
+      end
+    end
+  end
+end

data/app/views/spree/admin/images/_image_row.html.erb

@@ -13,11 +13,7 @@
       "spree/admin/shared/modal",
       target: "modal-image-#{image.id}",
       title: image.alt,
-      content: %{
-        <div class='align-center'>
-          #{image_tag(image.url(:large))}
-        </div>
-      }.html_safe
+      content: tag.div(image_tag(image.url(:large)), class: 'align-center')
     ) %>
   </td>
 

data/app/views/spree/admin/promotions/rules/_minimum_quantity.html.erb

@@ -0,0 +1,5 @@
+<div class="field">
+  <% field_name = "#{param_prefix}[preferred_minimum_quantity]" %>
+  <%= label_tag field_name, promotion_rule.model_name.human %>
+  <%= number_field_tag field_name, promotion_rule.preferred_minimum_quantity, class: "fullwidth", min: 1 %>
+</div>

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

@@ -6,7 +6,8 @@
 <title><%= admin_page_title %></title>
 
 <%= favicon_link_tag 'favicon.ico' %>
-<%= stylesheet_link_tag Spree::Backend::Config.theme_path, media: 'all', data: {turbolinks_track: 'reload'} %>
+<%= 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'} %>
 
 <%- if Rails.env.test? %>

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

@@ -17,14 +17,11 @@
     JSON.dump(
       Spree::Config.available_currencies.map { |c|
         format =
-          if c.format.present?
-            c.format.gsub("%u", "%s").gsub("%n", "%v")
-          elsif c.symbol == "" || c.symbol_first
+          if c.symbol == "" || c.symbol_first
             "%s%v"
           else
             "%v %s"
           end
-
         [c.id.to_s.upcase, [
           c.symbol || "¤",
           c.exponent,
@@ -36,7 +33,7 @@
 <script data-hook='admin-custom-translations'>
 </script>
 
-<% if I18n.locale != :en %>
-  <%= javascript_include_tag "solidus_admin/select2_locales/select2_locale_#{I18n.locale}",
-    data: {turbolinks_track: 'reload'} %>
+<% if I18n.locale != :en && I18n.locale %>
+  <% select2_locale_path = "solidus_admin/select2_locales/select2_locale_#{I18n.locale}" %>
+  <%= javascript_include_tag select2_locale_path, data: {turbolinks_track: 'reload'} if Rails.application.assets.find_asset(select2_locale_path) %>
 <% end %>

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

@@ -1,16 +1,14 @@
-<% available_locales = Spree.i18n_available_locales %>
-<% if available_locales.size > 1 %>
-  <label class="admin-navbar-selection admin-locale-selection">
-    <i class="fa fa-globe fa-fw" title="<%= I18n.t('spree.choose_dashboard_locale') %>"></i>
-    <select class="js-locale-selection custom-select fullwidth">
-      <%=
-        options_for_select(
-          available_locales.map do |locale|
-            [I18n.t('spree.i18n.this_file_language', locale: locale, default: locale.to_s, fallback: false), locale]
-          end.sort,
-          selected: I18n.locale,
-        )
-      %>
-    </select>
-  </label>
+<% available_locale_options_for_select = Spree.i18n_available_locales.map {
+  [I18n.t('spree.i18n.this_file_language', locale: _1, default: _1.to_s, fallback: false), _1]
+}.sort %>
+
+<% if available_locale_options_for_select.size > 1 %>
+  <%= form_tag(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>
+      <select class="custom-select fullwidth" onchange="this.form.requestSubmit()">
+        <%= options_for_select(available_locale_options_for_select, I18n.locale) %>
+      </select>
+    </label>
+  <% end %>
 <% end %>

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

@@ -0,0 +1,17 @@
+<% available_locale_options_for_select = Spree.i18n_available_locales.map {
+  [I18n.t('spree.i18n.this_file_language', locale: _1, default: _1.to_s, fallback: false), _1]
+}.sort %>
+
+<% if available_locale_options_for_select.size > 1 %>
+  <li>
+    <%= form_tag(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>
+        <select name="switch_to_locale" onchange="this.form.requestSubmit()">
+          <%= options_for_select(available_locale_options_for_select, selected: I18n.locale) %>
+        </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>
+<% end %>

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

@@ -7,6 +7,7 @@
         <span class="text"><%= t('spree.minimize_menu') %></span>
       <% end %>
       <%= render partial: 'spree/admin/shared/locale_selection' %>
+      <%= render partial: 'spree/admin/shared/theme_selection' %>
       <% if lookup_context.exists?('spree/admin/shared/_navigation_footer') %>
         <%= render partial: 'spree/admin/shared/navigation_footer' %>
       <% else %>

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

@@ -8,7 +8,7 @@
       <%- end %>
 
       <%= link_to "//#{default_store.url}", target: '_blank', class: 'solidus-admin--nav--store-link' do %>
-        <div style="flex-grow: 1">
+        <div style="flex-grow: 1; display: flex; flex-direction: column; gap: 2px;">
           <span class="solidus-admin--nav--store-link--name"><%= default_store.name %></span>
           <span class="solidus-admin--nav--store-link--url"><%= default_store.url %></span>
         </div>
@@ -49,32 +49,8 @@
           </summary>
 
           <ul>
-            <% if (available_locales = Spree.i18n_available_locales).any? %>
-              <li>
-                <label>
-                  <svg aria-hidden="true"><use xlink:href="<%= image_path('spree/backend/themes/solidus_admin/remixicon.symbol.svg') %>#ri-global-line"></use></svg>
-                  <select class="js-locale-selection">
-                    <%= options_for_select(
-                      available_locales
-                        .map do |locale|
-                          [
-                            t(
-                              "spree.i18n.this_file_language",
-                              locale: locale,
-                              default: locale.to_s,
-                              fallback: false
-                            ),
-                            locale
-                          ]
-                        end
-                        .sort,
-                      selected: I18n.locale
-                    ) %>
-                  </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>
-              </li>
-            <% end %>
+            <%= render 'spree/admin/shared/locale_selection_solidus_admin' %>
+            <%= render 'spree/admin/shared/theme_selection_solidus_admin' %>
 
             <% if can?(:admin, spree_current_user) %>
               <li data-hook="user-account-link">

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

@@ -0,0 +1,21 @@
+<% theme_options_for_select = Spree::Backend::Config.themes.keys.map { |theme| [theme.to_s.humanize, theme] }.sort %>
+
+<%= form_tag(admin_set_theme_path(format: :html), method: :put, style: "width: 100%;", class: "light-only") do %>
+  <%= hidden_field_tag :system_theme, :light %>
+  <label class="admin-navbar-selection">
+    <i class="fa fa-sun-o fa-fw" title="<%= I18n.t('spree.choose_dashboard_theme') %>"></i>
+    <select name="switch_to_theme" class="custom-select fullwidth" onchange="this.form.requestSubmit()">
+      <%= options_for_select(theme_options_for_select, session[:admin_light_theme] || Spree::Backend::Config.theme) %>
+    </select>
+  </label>
+<% end %>
+
+<%= form_tag(admin_set_theme_path(format: :html), method: :put, style: "width: 100%;", class: "dark-only") do %>
+  <%= hidden_field_tag :system_theme, :dark %>
+  <label class="admin-navbar-selection">
+    <i class="fa fa-moon-o fa-fw" title="<%= I18n.t('spree.choose_dashboard_theme') %>"></i>
+    <select name="switch_to_theme" class="custom-select fullwidth" onchange="this.form.requestSubmit()">
+      <%= options_for_select(theme_options_for_select, session[:admin_dark_theme] || Spree::Backend::Config.dark_theme) %>
+    </select>
+  </label>
+<% end %>

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

@@ -0,0 +1,25 @@
+<% theme_options_for_select = Spree::Backend::Config.themes.keys.map { |theme| [theme.to_s.humanize, theme] }.sort %>
+
+<li>
+  <%= form_tag(admin_set_theme_path(format: :html), method: :put, style: "width: 100%;", class: "light-only") do %>
+    <%= hidden_field_tag :system_theme, :light %>
+    <label>
+      <svg aria-hidden="true"><use xlink:href="<%= image_path('spree/backend/themes/solidus_admin/remixicon.symbol.svg') %>#ri-sun-line"></use></svg>
+      <select name="switch_to_theme" onchange="this.form.requestSubmit()">
+        <%= options_for_select(theme_options_for_select, session[:admin_light_theme] || Spree::Backend::Config.theme) %>
+      </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 %>
+
+  <%= form_tag(admin_set_theme_path(format: :html), method: :put, style: "width: 100%;", class: "dark-only") do %>
+    <%= hidden_field_tag :system_theme, :dark %>
+    <label>
+      <svg aria-hidden="true"><use xlink:href="<%= image_path('spree/backend/themes/solidus_admin/remixicon.symbol.svg') %>#ri-moon-line"></use></svg>
+      <select name="switch_to_theme" onchange="this.form.requestSubmit()">
+        <%= options_for_select(theme_options_for_select, session[:admin_dark_theme] || Spree::Backend::Config.dark_theme) %>
+      </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/config/routes.rb

@@ -6,6 +6,7 @@ Spree::Core::Engine.routes.draw do
     get '/search/products', to: "search#products", as: :search_products
 
     put '/locale/set', to: 'locale#set', defaults: { format: :json }, as: :set_locale
+    put '/theme/set', to: 'theme#set', defaults: { format: :json }, as: :set_theme
 
     resources :dashboards, only: [] do
       collection do

data/lib/spree/backend.rb

@@ -7,7 +7,6 @@ require 'jquery-rails'
 require 'sassc-rails'
 require 'handlebars_assets'
 require 'font-awesome-rails'
-require 'autoprefixer-rails'
 require 'jbuilder'
 require 'kaminari'
 require 'responders'

data/lib/spree/backend_configuration/menu_item.rb

@@ -78,17 +78,18 @@ module Spree
       end
 
       def match_path?(request)
-        if match_path.is_a? Regexp
-          request.fullpath =~ match_path
-        elsif match_path.respond_to?(:call)
-          match_path.call(request)
-        elsif match_path
-          request.fullpath.starts_with?("#{spree.admin_path}#{match_path}")
-        elsif url.present?
-          request.fullpath.to_s.starts_with?(url.to_s)
-        elsif @sections.present?
-          @sections.include?(request.controller_class.controller_name.to_sym)
-        end
+        matches =
+          if match_path.is_a? Regexp
+            request.fullpath =~ match_path
+          elsif match_path.respond_to?(:call)
+            match_path.call(request)
+          elsif match_path
+            request.fullpath.starts_with?("#{spree.admin_path}#{match_path}")
+          end
+        matches ||= request.fullpath.to_s.starts_with?(url.to_s) if url.present?
+        matches ||= @sections.include?(request.controller_class.controller_name.to_sym) if @sections.present?
+
+        matches
       end
 
       def url

data/lib/spree/backend_configuration.rb

@@ -11,15 +11,24 @@ module Spree
     #   @return [Hash] A hash containing the themes that are available for the admin panel
     preference :themes, :hash, default: {
       classic: 'spree/backend/all',
+      classic_dark: 'spree/backend/themes/classic_dark',
+      classic_dark_dimmed: 'spree/backend/themes/classic_dimmed',
+      solidus: 'spree/backend/themes/solidus_admin',
+      solidus_dark: 'spree/backend/themes/solidus_admin_dark',
+      solidus_dimmed: 'spree/backend/themes/solidus_admin_dimmed',
       solidus_admin: 'spree/backend/themes/solidus_admin'
     }
 
     # @!attribute [rw] theme
     #   @return [String] Default admin theme name
-    versioned_preference :theme, :string, initial_value: 'classic', boundaries: { "4.2.0" => "solidus_admin" }
+    versioned_preference :theme, :string, initial_value: 'classic', boundaries: { "4.2.0" => "solidus_admin", "4.4.0" => "solidus" }
 
-    def theme_path(user_theme = nil)
-      user_theme ? themes.fetch(user_theme.to_sym) : themes.fetch(theme.to_sym)
+    # @!attribute [rw] dark_theme
+    #   @return [String] Dark admin theme name
+    versioned_preference :dark_theme, :string, initial_value: 'classic', boundaries: { "4.2.0" => "solidus_admin", "4.4.0" => 'solidus_dark' }
+
+    def theme_path(user_theme)
+      themes.fetch(user_theme&.to_sym, themes.fetch(theme.to_sym))
     end
 
     # @!attribute [rw] admin_updated_navbar

data/solidus_backend.gemspec

@@ -33,6 +33,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'responders'
   s.add_dependency 'sassc-rails'
 
-  s.add_dependency 'autoprefixer-rails', '~> 10.2', '>= 10.2.5.1'
   s.add_dependency 'handlebars_assets', '~> 0.23'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 4.2.5
+  version: 4.3.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-19 00:00:00.000000000 Z
+date: 2023-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -122,26 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: autoprefixer-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.2.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.2.5.1
 - !ruby/object:Gem::Dependency
   name: handlebars_assets
   requirement: !ruby/object:Gem::Requirement
@@ -348,10 +328,14 @@ files:
 - app/assets/stylesheets/spree/backend/shared/index.scss
 - app/assets/stylesheets/spree/backend/spree_admin.scss
 - app/assets/stylesheets/spree/backend/themes/classic.css.scss
+- app/assets/stylesheets/spree/backend/themes/classic_dark.css.scss
+- app/assets/stylesheets/spree/backend/themes/classic_dimmed.css.scss
 - app/assets/stylesheets/spree/backend/themes/solidus_admin.css.scss
 - app/assets/stylesheets/spree/backend/themes/solidus_admin/_colors.scss
 - app/assets/stylesheets/spree/backend/themes/solidus_admin/_tables.scss
 - app/assets/stylesheets/spree/backend/themes/solidus_admin/_variables.scss
+- app/assets/stylesheets/spree/backend/themes/solidus_admin_dark.css.scss
+- app/assets/stylesheets/spree/backend/themes/solidus_admin_dimmed.css.scss
 - app/assets/stylesheets/spree/backend/vendor/index.scss
 - app/concerns/spree/admin/sets_user_language_locale_key.rb
 - app/controllers/spree/admin/adjustment_reasons_controller.rb
@@ -403,6 +387,7 @@ files:
 - app/controllers/spree/admin/taxonomies_controller.rb
 - app/controllers/spree/admin/taxons/attachment_controller.rb
 - app/controllers/spree/admin/taxons_controller.rb
+- app/controllers/spree/admin/theme_controller.rb
 - app/controllers/spree/admin/users/api_key_controller.rb
 - app/controllers/spree/admin/users_controller.rb
 - app/controllers/spree/admin/variant_property_rule_values_controller.rb
@@ -550,6 +535,7 @@ files:
 - app/views/spree/admin/promotions/rules/_first_order.html.erb
 - app/views/spree/admin/promotions/rules/_first_repeat_purchase_since.html.erb
 - app/views/spree/admin/promotions/rules/_item_total.html.erb
+- app/views/spree/admin/promotions/rules/_minimum_quantity.html.erb
 - app/views/spree/admin/promotions/rules/_nth_order.html.erb
 - app/views/spree/admin/promotions/rules/_one_use_per_user.html.erb
 - app/views/spree/admin/promotions/rules/_option_value.html.erb
@@ -598,6 +584,7 @@ files:
 - app/views/spree/admin/shared/_image.html.erb
 - app/views/spree/admin/shared/_js_locale_data.html.erb
 - app/views/spree/admin/shared/_locale_selection.html.erb
+- app/views/spree/admin/shared/_locale_selection_solidus_admin.html.erb
 - app/views/spree/admin/shared/_menu.html.erb
 - app/views/spree/admin/shared/_modal.html.erb
 - app/views/spree/admin/shared/_navigation.html.erb
@@ -624,6 +611,8 @@ files:
 - app/views/spree/admin/shared/_table_filter.html.erb
 - app/views/spree/admin/shared/_tabs.html.erb
 - 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/_variant_search.html.erb
 - app/views/spree/admin/shared/named_types/_edit.html.erb
 - app/views/spree/admin/shared/named_types/_form.html.erb
@@ -930,7 +919,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.