solidus_backend 3.4.2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17837f45af5eca410007017b8197f53b25748fdf9dfdd4d09235745e1c92e930
-  data.tar.gz: 28a418a03810e78c9e25e50b053c5027efbfce4eaaf7ad0586d7973dde7f40ff
+  metadata.gz: 5de35cbe73ca913a8cb68611b23b3edbc4e1bdb4f4b47277e3c0e7952b11c6a5
+  data.tar.gz: a72c2b284154c2a4c0b7bfb24a282a4ea4d90cd51e81987e7bbe179380d7c48d
 SHA512:
-  metadata.gz: 8a8eca9b9fe217589fd3bc4177575614a76a91cee1f5b5e53658f8b4a352f23e6443fc2afedaa012834bd07c8074fd65fdb8067c7d1f83c400c2b14647abee72
-  data.tar.gz: a40d957176333f436255b20890274044d927b66da86c2e81ca513abb69f0ff6204d896b132be072c827b8cea38f92d993b6c6351fe415d90c6c1af3aa3f3069f
+  metadata.gz: 8cb21de79fb0fc2d1123ecda5930280d194d684ef446df41c485cd06f649e85760280c956560085199cad16fd0abb1bcf44c0e7c426850ba106c4b9cb97e9413
+  data.tar.gz: 6d7e8bdea1dce6ff1d855daf1f5e63f5b28246b1e936153ace0eb50a8efda9149b26108083a07fd2a1199603ff3e4d934314473904d636758a6c9c7819c45d56

data/app/assets/config/solidus_backend_manifest.js

@@ -4,3 +4,5 @@
 //= link spree/backend/all.css
 
 //= link solidus_admin/select2_locales
+
+//= link_directory ../stylesheets/spree/backend/themes .css

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

@@ -17,27 +17,8 @@
     *                                                       you need to ensure that the attributes are allowed to be Ransacked.
     */
   $.fn.variantAutocomplete = function(options) {
-    function extraParameters(term) {
-      if (typeof(options) === 'object') {
-        if (typeof(options['searchParameters']) === 'function') {
-          return options['searchParameters'](term)
-        } else {
-          console.warn(
-            "Solidus deprecation: Passing an object of parameters to variantAutocomplete is deprecated. Instead, on the options object, please declare `searchParameters` as a function returning the parameters.\n\n",
-            "Deprecated usage:\n",
-            "$('#id').variantAutocomplete({\n",
-            "  suppliable_only: true\n",
-            "})",
-            "\n\nNew usage:\n",
-            "$('#id').variantAutocomplete({\n",
-            "  searchParameters: function (_selectSearchTerm) { return { suppliable_only: true  } }\n",
-            "})"
-          )
-        }
-      }
-
-      return {}
-    }
+    // Default options
+    options = options || {}
 
     this.select2({
       placeholder: Spree.translations.variant_placeholder,
@@ -58,14 +39,15 @@
           }
         },
         data: function(term, page) {
-          var searchData = {
+          const extraParameters = options["searchParameters"] ? options["searchParameters"](term) : {}
+
+          return {
             variant_search_term: term,
             token: Spree.api_key,
-            page: page
-          };
-          return _.extend(searchData, extraParameters(term));
+            page: page,
+            ...extraParameters,
+          }
         },
-
         results: function(data, page) {
           window.variants = data["variants"];
           return {

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

@@ -14,6 +14,7 @@ $padding-y-navbar-submenu: 9px;
   display: block;
   height: 39px;
   z-index: 1;
+  margin-bottom: 1em;
 
   span {
     font-size: $font-size-sm;
@@ -288,22 +289,34 @@ nav.menu {
   }
 }
 
-.admin-locale-selection {
-  margin: 1em;
+.admin-navbar-selection {
+  margin: 0 1.5em;
   position: relative;
+  overflow: hidden;
+  display: inline-flex;
+  align-items: baseline;
+  min-height: 1.5em;
+
+  i {
+    cursor: pointer;
+    padding-right: 2.4em;
+    min-width: 1em;
+    height: 1em;
+  }
 
   &::after {
-    content: "\f0ac";
     font-family: "FontAwesome";
     position: absolute;
     top: 0;
     left: 0;
     padding: .5rem 0 .5rem .25rem;
-    z-index: -1;
   }
 
-  .admin-nav-hidden & {
-    .js-locale-selection.custom-select {
+   .admin-nav-hidden & {
+    position: relative;
+
+    select {
+      background-image: none;
       background-color: transparent;
       background-position: 1.5rem center;
       background-size: 8px 9px;
@@ -313,6 +326,10 @@ nav.menu {
       overflow: hidden;
       text-indent: 1rem;
       z-index: 1;
+      cursor: pointer;
+
+      // Move the select back to the left so it catches clicks
+      transform: translateX(-3rem);
 
       &:focus {
         box-shadow: none;
@@ -326,14 +343,16 @@ nav.menu {
   bottom: 0;
 }
 
+body.admin-nav-hidden .admin-nav:not(.fits) {
+  .admin-navbar-selection::after {
+    z-index: 0;
+  }
+}
+
 .admin-login-nav {
   list-style: none;
   padding: 0;
-  margin: 1rem 0;
-
-  li {
-    padding: 0.3rem 1.2rem;
-  }
+  margin: 1em 1.5em;
 
   a {
     display: inline-block;
@@ -345,7 +364,8 @@ nav.menu {
   }
 
   i {
-    margin-right: 0.5rem;
+    margin-right: 1.2em;
+    min-width: 1em;
   }
 }
 

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

@@ -0,0 +1,15 @@
+@import 'spree/backend/components/actions';
+@import 'spree/backend/components/breadcrumb';
+@import 'spree/backend/components/buttons';
+@import 'spree/backend/components/number_with_currency';
+@import 'spree/backend/components/hint';
+@import 'spree/backend/components/image_placeholder';
+@import 'spree/backend/components/list_group';
+@import 'spree/backend/components/messages';
+@import 'spree/backend/components/progress';
+@import 'spree/backend/components/table-filter';
+@import 'spree/backend/components/navigation';
+@import 'spree/backend/components/sidebar';
+@import 'spree/backend/components/editable_table';
+@import 'spree/backend/components/pills';
+@import 'spree/backend/components/tabs';

data/app/assets/stylesheets/spree/backend/globals/index.scss

@@ -0,0 +1,5 @@
+@import 'spree/backend/globals/functions';
+@import 'spree/backend/globals/deprecation';
+@import 'spree/backend/globals/variables_override';
+@import 'spree/backend/globals/variables';
+@import 'spree/backend/globals/deprecated_variables';

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

@@ -0,0 +1,3 @@
+@import 'spree/backend/plugins/select2';
+@import 'spree/backend/plugins/bootstrap_tooltip';
+@import 'spree/backend/plugins/sortable';

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

@@ -18,11 +18,6 @@
   }
 }
 
-#promotion-policy-select {
-  overflow: auto;
-  margin-bottom: 1.5rem;
-}
-
 .promotion-block {
   padding: 0 1.25rem 0.5rem;
   background-color: lighten($color-border, 5);

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

@@ -0,0 +1,14 @@
+@import 'spree/backend/sections/adjustments';
+@import 'spree/backend/sections/orders';
+@import 'spree/backend/sections/products';
+@import 'spree/backend/sections/variants';
+@import 'spree/backend/sections/promotions';
+@import 'spree/backend/sections/bulk_transfer';
+@import 'spree/backend/sections/return_authorizations';
+@import 'spree/backend/sections/log_entries';
+@import 'spree/backend/sections/taxonomies';
+@import 'spree/backend/sections/taxons';
+@import 'spree/backend/sections/users';
+@import 'spree/backend/sections/store_credits';
+@import 'spree/backend/sections/stock_management';
+@import 'spree/backend/sections/style_guide';

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

@@ -0,0 +1,9 @@
+@import 'spree/backend/shared/fonts';
+@import 'spree/backend/shared/typography';
+@import 'spree/backend/shared/images';
+@import 'spree/backend/shared/tables';
+@import 'spree/backend/shared/icons';
+@import 'spree/backend/shared/forms';
+@import 'spree/backend/shared/layout';
+@import 'spree/backend/shared/header';
+@import 'spree/backend/shared/utilities';

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

@@ -1,56 +1,5 @@
-@import 'spree/backend/globals/functions';
-@import 'spree/backend/globals/deprecation';
-@import 'spree/backend/globals/variables_override';
-@import 'spree/backend/globals/variables';
-@import 'spree/backend/globals/deprecated_variables';
+@import 'spree/backend/themes/classic';
 
-@import 'bootstrap_custom';
-@import 'solidus_admin/bootstrap/bootstrap';
-
-@import 'spree/backend/globals/mixins';
-
-@import 'spree/backend/shared/fonts';
-@import 'spree/backend/shared/typography';
-@import 'spree/backend/shared/images';
-@import 'spree/backend/shared/tables';
-@import 'spree/backend/shared/icons';
-@import 'spree/backend/shared/forms';
-@import 'spree/backend/shared/layout';
-@import 'spree/backend/shared/header';
-@import 'spree/backend/shared/utilities';
-
-@import 'spree/backend/components/actions';
-@import 'spree/backend/components/breadcrumb';
-@import 'spree/backend/components/buttons';
-@import 'spree/backend/components/number_with_currency';
-@import 'spree/backend/components/hint';
-@import 'spree/backend/components/image_placeholder';
-@import 'spree/backend/components/list_group';
-@import 'spree/backend/components/messages';
-@import 'spree/backend/components/progress';
-@import 'spree/backend/components/table-filter';
-@import 'spree/backend/components/navigation';
-@import 'spree/backend/components/sidebar';
-@import 'spree/backend/components/editable_table';
-@import 'spree/backend/components/pills';
-@import 'spree/backend/components/tabs';
-
-@import 'font-awesome';
-@import 'spree/backend/plugins/select2';
-@import 'spree/backend/plugins/bootstrap_tooltip';
-@import 'spree/backend/plugins/sortable';
-
-@import 'spree/backend/sections/adjustments';
-@import 'spree/backend/sections/orders';
-@import 'spree/backend/sections/products';
-@import 'spree/backend/sections/variants';
-@import 'spree/backend/sections/promotions';
-@import 'spree/backend/sections/bulk_transfer';
-@import 'spree/backend/sections/return_authorizations';
-@import 'spree/backend/sections/log_entries';
-@import 'spree/backend/sections/taxonomies';
-@import 'spree/backend/sections/taxons';
-@import 'spree/backend/sections/users';
-@import 'spree/backend/sections/store_credits';
-@import 'spree/backend/sections/stock_management';
-@import 'spree/backend/sections/style_guide';
+@warn "[Solidus] [Deprecation] " +
+  "importing or requiring `spree/backend/spree_admin` is deprecated and will be removed in the next major. " +
+  "Please use `spree/backend/themes/classic` instead.";

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

@@ -0,0 +1,6 @@
+@import 'spree/backend/globals';
+@import 'spree/backend/vendor';
+@import 'spree/backend/shared';
+@import 'spree/backend/components';
+@import 'spree/backend/plugins';
+@import 'spree/backend/sections';

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

@@ -0,0 +1,56 @@
+table.index {
+  // Borders
+  border-collapse: separate;
+  border-spacing: 0;
+
+  > thead > tr > th:first-child {
+    border-top-left-radius: 4px;
+  }
+
+  > thead > tr > th:last-child {
+    border-top-right-radius: 4px;
+  }
+
+  > tbody > tr:last-child > td:first-child {
+    border-bottom-left-radius: 4px;
+  }
+
+  > tbody > tr:last-child > td:last-child {
+    border-bottom-right-radius: 4px;
+  }
+
+  > thead > tr > th {
+    border-top: 1px solid $theme-gray-100;
+    border-bottom: none
+  }
+
+  > thead > tr > th,
+  > tbody > tr > td {
+    &:first-child {
+      border-left: 1px solid $theme-gray-100;
+    }
+
+    &:last-child {
+      border-right: 1px solid $theme-gray-100;
+    }
+  }
+
+  > tbody > tr:last-child > td {
+    border-bottom: 1px solid $theme-gray-100;
+  }
+
+  // Colors
+  > th {
+    background-color: $theme-gray-15;
+    color: $theme-gray-600;
+  }
+
+  > td {
+    background-color: $theme-white;
+    color: $theme-black;
+  }
+}
+
+table#listing_products > tbody > tr > td > img {
+  width: 24px;
+}

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

@@ -0,0 +1,204 @@
+
+// -------------------------------------------------------------
+//   Variables used in all other files
+//--------------------------------------------------------------
+
+// Fonts
+//--------------------------------------------------------------
+$font-size-pill: 11px;
+$label-font-size: 12px;
+
+// Colors
+//--------------------------------------------------------------
+
+// Primary palette
+$theme-solidus-red: #ef3023;
+$theme-black: #222222;
+$theme-graphite: #c7ccc7;
+$theme-graphite-light: #d8dad8;
+$theme-sand: #f5f3f0;
+$theme-white: #ffffff;
+
+// Secondary palette
+$theme-yellow: #fdc071;
+$theme-orange: #f68050;
+$theme-blue: #2554b1;
+$theme-moss: #2d3925;
+$theme-forest: #096756;
+$theme-midnight: #163449;
+$theme-pink: #f6d7e2;
+$theme-plum: #3a0e31;
+$theme-sky: #cbdff1;
+$theme-seafoam: #c1e0de;
+$theme-dune: #e6bf9b;
+
+// UI Red
+$theme-red-100: #f8d6d3;
+$theme-red-200: #f1ada7;
+$theme-red-300: #ea8980;
+$theme-red-400: #e36054;
+$theme-red-500: #dc3728;
+$theme-red-600: #b12c20;
+$theme-red-700: #862219;
+$theme-red-800: #561610;
+$theme-red-900: #2b0b08;
+
+// Grayscale
+$theme-gray-15: #fafafa;
+$theme-gray-25: #f5f5f5;
+$theme-gray-50: #f0f0f0;
+$theme-gray-100: #dedede;
+$theme-gray-200: #cfcfcf;
+$theme-gray-300: #bababa;
+$theme-gray-400: #a3a3a3;
+$theme-gray-500: #737373;
+$theme-gray-600: #616161;
+$theme-gray-700: #4a4a4a;
+$theme-gray-800: #333333;
+
+// Basic color palette for admin
+
+$color-dark: $theme-gray-800;
+$color-dark-dark: $theme-gray-600;
+$color-dark-light: $theme-gray-500;
+$color-dark-accent: $theme-gray-200;
+
+$color-primary: $theme-black;
+$color-primary-light: $theme-gray-100;
+
+$color-light: $theme-gray-15;
+$color-light-dark: $theme-gray-50;
+$color-light-accent: $theme-gray-100;
+
+$color-white: $theme-white;
+
+$color-red: $theme-red-600;
+$color-yellow: $theme-yellow;
+$color-green: $theme-forest;
+
+// Basic accents for admin
+$box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.12);
+
+// Body base colors
+$color-border: $color-light-dark;
+$color-disabled: $color-dark-light;
+
+// Basic navigation colors
+$color-header-bg: $theme-white;
+$color-sidebar-bg: $color-light;
+$color-sidebar-border: $color-border;
+$color-navbar: $color-dark;
+$color-navbar-bg: $color-light;
+$color-navbar-active: $theme-solidus-red;
+$color-navbar-active-bg: $theme-gray-25;
+$color-navbar-submenu: $color-dark-light;
+$color-navbar-submenu-bg: $color-light;
+$color-navbar-submenu-active: $color-primary;
+$color-navbar-footer: $color-dark;
+$color-navbar-footer-bg: $color-light;
+$color-navbar-footer-active: $color-primary;
+$color-icon-navbar: $color-dark-light;
+
+$color-navbar-hover-bg: $theme-gray-25;
+$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-active: $color-primary;
+$color-tab-active-bg: $color-white;
+$color-tab-active-border: $color-white;
+
+// Basic flash colors
+$color-success: $color-green;
+$color-notice: $color-yellow;
+$color-error: $color-red;
+
+// Breadcrumb custom variable
+
+$breadcrumb-color: $color-dark-light;
+
+// Color for spinner
+$color-spinner: $color-white;
+
+// Style Guide
+$color-style-guide-code: darken($color-light, 10%);
+$color-style-guide-link: darken($color-light, 65%);
+$color-style-guide-nav: $color-light;
+$color-style-guide-nav-border: darken($color-light, 5%);
+$color-style-guide-nav-link: darken($color-light, 65%);
+$color-style-guide-nav-link-hover: darken($color-light, 5%);
+$color-style-guide-section-border: darken($color-light, 10%);
+$color-style-guide-swatch-border: darken($color-light, 10%);
+$color-style-guide-table-border: $theme-sky;
+
+// Table colors
+$color-tbl-odd: $color-white;
+$color-tbl-even: $color-light;
+$color-tbl-thead: $color-light;
+
+// Pill colors
+//
+// For now these are custom assigned colors just for this section. As we go
+// about updating other areas of the admin we will likely want to pull these
+// colors out into better named variables.
+$color-pill-text: $theme-gray-800;
+$color-pill-neutral: $theme-gray-100;
+$color-pill-neutral-text: $color-pill-text;
+$color-pill-complete: $theme-sky;
+$color-pill-complete-text: $color-pill-text;
+$color-pill-active: $theme-seafoam;
+$color-pill-active-text: $color-pill-text;
+$color-pill-inactive: $color-pill-neutral;
+$color-pill-inactive-text: $theme-gray-600;
+$color-pill-pending: $theme-yellow;
+$color-pill-pending-text: $color-pill-text;
+$color-pill-warning: $theme-orange;
+$color-pill-warning-text: $color-pill-text;
+$color-pill-error: $theme-red-300;
+$color-pill-error-text: $color-pill-text;
+
+// Available states
+$states: (
+  active,
+  address,
+  awaiting_return,
+  backorder,
+  balance_due,
+  canceled,
+  cart,
+  checkout,
+  complete,
+  completed,
+  confirm,
+  credit_owed,
+  delivery,
+  error,
+  failed,
+  inactive,
+  paid,
+  payment,
+  pending,
+  ready,
+  returned,
+  shipped,
+  void
+);
+
+// Sidebar
+//--------------------------------------------------------------
+$width-sidebar: 240px;
+$width-sidebar-flyout: 225px;
+$width-sidebar-collapsed: 52px;
+$sidebar-transition: 250ms ease-in;
+$border-sidebar: 1px solid $color-sidebar-border;
+
+// Main
+//--------------------------------------------------------------
+$main-header-height: 84px;
+
+$content-wrapper-bg: $color-white;
+$admin-body-bg: $color-white;
+
+$link-hover-color: $theme-solidus-red;

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

@@ -0,0 +1,11 @@
+@import "spree/backend/globals";
+
+@import "./solidus_admin/variables";
+
+@import "spree/backend/vendor";
+@import "spree/backend/shared";
+@import "spree/backend/components";
+@import "spree/backend/plugins";
+@import "spree/backend/sections";
+
+@import "./solidus_admin/tables";

data/app/assets/stylesheets/spree/backend/vendor/index.scss

@@ -0,0 +1,11 @@
+@import "solidus_admin/select2";
+@import "solidus_admin/flatpickr/flatpickr";
+@import "prism";
+
+@import 'spree/backend/bootstrap_custom';
+@import 'solidus_admin/bootstrap/bootstrap';
+@import 'font-awesome';
+
+// These mixins will modify existing Bootstrap ones and need to be imported
+// after the Bootstrap has been processed.
+@import 'spree/backend/globals/mixins';

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

@@ -1,11 +1,6 @@
 /*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
-
- *= require solidus_admin/select2
- *= require solidus_admin/flatpickr/flatpickr
- *= require prism
-
- *= require spree/backend/spree_admin
-*/
+ * This is a manifest file that is here only for legacy support purposes, please refer to themes direcly via 
+ * appropriate `Spree::Config` settings.
+ *
+ *= require spree/backend/themes/classic
+ */

data/app/concerns/spree/admin/sets_user_language_locale_key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     module SetsUserLanguageLocaleKey

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

@@ -8,6 +8,8 @@ module Spree
 
       before_action :authorize_admin
 
+      respond_to :html
+
       private
 
       # Overrides ControllerHelpers::Common

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

@@ -79,12 +79,16 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   def update_positions
     ActiveRecord::Base.transaction do
       positions = params[:positions]
-      records = model_class.where(id: positions.keys).to_a
 
       positions.each do |id, index|
-        # To permit the use of UUID as id, we compare models id in database
-        # and in params under the string representation instead of integer
-        records.find { |r| r.id.to_s == id }&.set_list_position(index)
+        # Yes here there is a N+1 but acts_as_list use after update callback
+        # so we can't keep not reloaded data without create a bug
+        # (spec : backend/spec/controllers/spree/admin/resource_controller_spec.rb)
+        # "with take care of acts_as_list's after update callback" test
+        #
+        # TODO : create a global set_list_position on all concerned objects
+        # maybe in the acts_as_list gem
+        model_class.where(id: id).first&.set_list_position(index)
       end
     end
 

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

@@ -44,6 +44,7 @@ module Spree
       #   * :label to override link text, otherwise based on the first resource name (translated)
       #   * :route to override automatically determining the default route
       #   * :match_path as an alternative way to control when the tab is active, /products would match /admin/products, /admin/products/5/variants etc.
+      #   * :match_path can also be a callable that takes a request and determines whether the menu item is selected for the request.
       def tab(*args, &_block)
         options = { label: args.first.to_s }
 
@@ -66,6 +67,8 @@ module Spree
 
         selected = if options[:match_path].is_a? Regexp
           request.fullpath =~ options[:match_path]
+        elsif options[:match_path].respond_to?(:call)
+          options[:match_path].call(request)
         elsif options[:match_path]
           request.fullpath.starts_with?("#{spree.admin_path}#{options[:match_path]}")
         else

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

@@ -22,13 +22,6 @@ module Spree
         safe_join(links, " ".html_safe)
       end
 
-      # @deprecated use `Spree::LineItem#display_amount` instead
-      def line_item_shipment_price(line_item, quantity)
-        Spree::Money.new(line_item.price * quantity, { currency: line_item.currency })
-      end
-      deprecate deprecator: Spree::Deprecation,
-        line_item_shipment_price: "use Spree::LineItem#display_amount instead"
-
       # Addresss Verification System response code
       #
       # @see https://en.wikipedia.org/wiki/Address_verification_service

data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb

@@ -50,7 +50,7 @@
           <td>
             <%= form_for [:admin, return_item] do |f| %>
               <%= f.hidden_field 'reception_status_event', value: 'receive' %>
-              <%= f.button t('spree.actions.receive'), class: 'with-tip', "data-action" => 'save' %>
+              <%= f.submit t('spree.actions.receive'), class: 'btn btn-primary' %>
             <% end %>
           </td>
         <% end %>

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

@@ -39,9 +39,7 @@
     <% if @customer_return.completely_decided? %>
       <%= form_for [:admin, @order, Spree::Reimbursement.new] do |f| %>
         <%= hidden_field_tag :build_from_customer_return_id, @customer_return.id %>
-        <%= f.button class: 'button' do %>
-          <%= t('spree.create_reimbursement') %>
-        <% end %>
+        <%= f.submit t('spree.create_reimbursement'), class: 'btn btn-primary' %>
       <% end %>
     <% else %>
       <div class="no-objects-found">

data/app/views/spree/admin/promotions/_rules.html.erb

@@ -18,16 +18,6 @@
 
     <%= form_for @promotion, url: object_url, method: :put do |f| %>
       <fieldset class="no-border-top">
-        <% if Spree::Config.allow_promotions_any_match_policy %>
-          <div id="promotion-policy-select" class="align-center row">
-            <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>
-              <div class="col-6">
-                <label><%= f.radio_button :match_policy, policy %> <%= t "spree.promotion_form.match_policies.#{policy}" %></label>
-              </div>
-            <% end %>
-          </div>
-        <% end %>
-
         <div id="rules" class="filter_list">
           <% if @promotion.rules.any? %>
             <div class="col-12">

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

@@ -98,10 +98,10 @@
             <%= promotion.usage_count %>
           </td>
           <td>
-            <%= Spree::RailsCompatibility.to_fs(promotion.starts_at, :long) if promotion.starts_at %>
+            <%= promotion.starts_at.to_fs(:long) if promotion.starts_at %>
           </td>
           <td>
-            <%= Spree::RailsCompatibility.to_fs(promotion.expires_at, :long) if promotion.expires_at %>
+            <%= promotion.expires_at.to_fs(:long) if promotion.expires_at %>
           </td>
           <td class="actions">
             <% if can?(:edit, promotion) %>

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

@@ -62,9 +62,7 @@
   </fieldset>
 
   <div class="form-buttons filter-actions actions" data-hook="buttons">
-    <%= f.button do %>
-      <%= t('spree.update') %>
-    <% end %>
+    <%= f.submit t('spree.update'), class: "btn btn-primary" %>
   </div>
   <br>
 <% end %>
@@ -96,7 +94,7 @@
   <% end %>
   <div class="form-buttons filter-actions actions" data-hook="reimburse-buttons">
     <% if !@reimbursement.reimbursed? %>
-      <%= button_to [:perform, :admin, @order, @reimbursement], { class: 'button btn btn-primary', method: 'post' } do %>
+      <%= button_to [:perform, :admin, @order, @reimbursement], { class: 'button btn btn-primary', method: 'post', data: { disable_with: t('spree.reimburse') }} do %>
         <%= t('spree.reimburse') %>
       <% end %>
       <%= link_to t('spree.actions.cancel'), url_for([:edit, :admin, @order, @reimbursement.customer_return]), class: 'btn btn-default' %>

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

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

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

@@ -1,6 +1,7 @@
 <% available_locales = Spree.i18n_available_locales %>
 <% if available_locales.size > 1 %>
-  <div class="admin-locale-selection">
+  <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(
@@ -11,5 +12,5 @@
         )
       %>
     </select>
-  </div>
+  </label>
 <% end %>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_tax_rate_form_fields">
     <fieldset data-hook="tax_rates" class=" no-border-bottom">
-      <legend align="center"><%= t('spree.general_settings') %></legend>
+      <legend align="center"><%= t('spree.store') %></legend>
       <div class="row">
 
         <div class="col-5">

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

@@ -3,7 +3,7 @@
 
     <div data-hook="admin_zone_form_fields">
       <fieldset class="no-border-bottom">
-        <legend align="center"><%= t('spree.general_settings') %></legend>
+        <legend align="center"><%= t('spree.store') %></legend>
 
         <%= zone_form.field_container :name do %>
           <%= zone_form.label :name %><br>

data/bin/rails

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/spree/backend/engine', __dir__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __dir__)
+require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+
+require "rails/all"
+require "rails/engine/commands"

data/lib/spree/backend_configuration/menu_item.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Spree
+  class BackendConfiguration < Preferences::Configuration
+    # An item which should be drawn in the admin menu
+    class MenuItem
+      attr_reader :icon, :label, :partial, :condition, :sections, :match_path
+
+      attr_accessor :position
+
+      # @param sections [Array<Symbol>] The sections which are contained within
+      #   this admin menu section.
+      # @param icon [String] The icon to draw for this menu item
+      # @param condition [Proc] A proc which returns true if this menu item
+      #   should be drawn. If nil, it will be replaced with a proc which always
+      #   returns true.
+      # @param label [Symbol] The translation key for a label to use for this
+      #   menu item.
+      # @param partial [String] A partial to draw within this menu item for use
+      #   in declaring a submenu
+      # @param url [String] A url where this link should send the user to
+      # @param position [Integer] The position in which the menu item should render
+      #   nil will cause the item to render last
+      # @param match_path [String, Regexp, callable] (nil) If the {url} to determine the active tab is ambigous
+      #   you can pass a String, Regexp or callable to identify this menu item. The callable
+      #   accepts a request object and returns a Boolean value.
+      def initialize(
+        sections,
+        icon,
+        condition: nil,
+        label: nil,
+        partial: nil,
+        url: nil,
+        position: nil,
+        match_path: nil
+      )
+
+        @condition = condition || -> { true }
+        @sections = sections
+        @icon = icon
+        @label = label || sections.first
+        @partial = partial
+        @url = url
+        @position = position
+        @match_path = match_path
+      end
+
+      def url
+        if @url.respond_to?(:call)
+          @url.call
+        else
+          @url
+        end
+      end
+    end
+  end
+end

data/lib/spree/backend_configuration.rb

@@ -1,11 +1,27 @@
 # frozen_string_literal: true
 
 require 'spree/preferences/configuration'
+require 'spree/backend_configuration/menu_item'
 
 module Spree
   class BackendConfiguration < Preferences::Configuration
     preference :locale, :string, default: I18n.default_locale
 
+    # @!attribute [rw] themes
+    #   @return [Hash] A hash containing the themes that are available for the admin panel
+    preference :themes, :hash, default: {
+      classic: 'spree/backend/all',
+      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.1.0.a" => "solidus_admin" }
+
+    def theme_path(user_theme = nil)
+      user_theme ? themes.fetch(user_theme.to_sym) : themes.fetch(theme.to_sym)
+    end
+
     preference :frontend_product_path,
       :proc,
       default: proc {
@@ -33,49 +49,6 @@ module Spree
     STOCK_TABS         ||= [:stock_items]
     USER_TABS          ||= [:users, :store_credits]
 
-    # An item which should be drawn in the admin menu
-    class MenuItem
-      attr_reader :icon, :label, :partial, :condition, :sections, :url, :match_path
-
-      attr_accessor :position
-
-      # @param sections [Array<Symbol>] The sections which are contained within
-      #   this admin menu section.
-      # @param icon [String] The icon to draw for this menu item
-      # @param condition [Proc] A proc which returns true if this menu item
-      #   should be drawn. If nil, it will be replaced with a proc which always
-      #   returns true.
-      # @param label [Symbol] The translation key for a label to use for this
-      #   menu item.
-      # @param partial [String] A partial to draw within this menu item for use
-      #   in declaring a submenu
-      # @param url [String] A url where this link should send the user to
-      # @param position [Integer] The position in which the menu item should render
-      #   nil will cause the item to render last
-      # @param match_path [String, Regexp] (nil) If the {url} to determine the active tab is ambigous
-      #   you can pass a String or Regexp to identify this menu item
-      def initialize(
-        sections,
-        icon,
-        condition: nil,
-        label: nil,
-        partial: nil,
-        url: nil,
-        position: nil,
-        match_path: nil
-      )
-
-        @condition = condition || -> { true }
-        @sections = sections
-        @icon = icon
-        @label = label || sections.first
-        @partial = partial
-        @url = url
-        @position = position
-        @match_path = match_path
-      end
-    end
-
     # Items can be added to the menu by using code like the following:
     #
     # Spree::Backend::Config.configure do |config|

data/solidus_backend.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
     f.match(%r{^(spec|script)/})
   end
 
-  s.required_ruby_version = '>= 2.7.0'
+  s.required_ruby_version = '>= 3.0.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'solidus_api', s.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 4.1.0
 platform: ruby
 authors:
 - Solidus Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-04 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -303,17 +303,20 @@ files:
 - app/assets/stylesheets/spree/backend/components/_stock_table.scss
 - app/assets/stylesheets/spree/backend/components/_table-filter.scss
 - app/assets/stylesheets/spree/backend/components/_tabs.scss
+- app/assets/stylesheets/spree/backend/components/index.scss
 - app/assets/stylesheets/spree/backend/globals/_deprecated_variables.scss
 - app/assets/stylesheets/spree/backend/globals/_deprecation.scss
 - app/assets/stylesheets/spree/backend/globals/_functions.scss
 - app/assets/stylesheets/spree/backend/globals/_mixins.scss
 - app/assets/stylesheets/spree/backend/globals/_variables.scss
 - app/assets/stylesheets/spree/backend/globals/_variables_override.scss
+- app/assets/stylesheets/spree/backend/globals/index.scss
 - app/assets/stylesheets/spree/backend/globals/mixins/_caret.scss
 - app/assets/stylesheets/spree/backend/globals/mixins/_line_through.scss
 - app/assets/stylesheets/spree/backend/plugins/_bootstrap_tooltip.scss
 - app/assets/stylesheets/spree/backend/plugins/_select2.scss
 - app/assets/stylesheets/spree/backend/plugins/_sortable.scss
+- app/assets/stylesheets/spree/backend/plugins/index.scss
 - app/assets/stylesheets/spree/backend/sections/_adjustments.scss
 - app/assets/stylesheets/spree/backend/sections/_bulk_transfer.scss
 - app/assets/stylesheets/spree/backend/sections/_image_settings.scss
@@ -329,6 +332,7 @@ files:
 - app/assets/stylesheets/spree/backend/sections/_taxons.scss
 - app/assets/stylesheets/spree/backend/sections/_users.scss
 - app/assets/stylesheets/spree/backend/sections/_variants.scss
+- app/assets/stylesheets/spree/backend/sections/index.scss
 - app/assets/stylesheets/spree/backend/shared/_fonts.scss
 - app/assets/stylesheets/spree/backend/shared/_forms.scss
 - app/assets/stylesheets/spree/backend/shared/_header.scss
@@ -338,8 +342,13 @@ files:
 - app/assets/stylesheets/spree/backend/shared/_tables.scss
 - app/assets/stylesheets/spree/backend/shared/_typography.scss
 - app/assets/stylesheets/spree/backend/shared/_utilities.scss
+- app/assets/stylesheets/spree/backend/shared/index.scss
 - app/assets/stylesheets/spree/backend/spree_admin.scss
-- app/assets/stylesheets/spree/backend/themes/blue_steel/globals/_variables_override.scss
+- app/assets/stylesheets/spree/backend/themes/classic.css.scss
+- app/assets/stylesheets/spree/backend/themes/solidus_admin.css.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/vendor/index.scss
 - app/concerns/spree/admin/sets_user_language_locale_key.rb
 - app/controllers/spree/admin/adjustment_reasons_controller.rb
 - app/controllers/spree/admin/adjustments_controller.rb
@@ -721,6 +730,7 @@ files:
 - app/views/spree/admin/zones/new.html.erb
 - app/views/spree/layouts/admin.html.erb
 - app/views/spree/layouts/admin_style_guide.html.erb
+- bin/rails
 - config/initializers/assets.rb
 - config/initializers/form_builder.rb
 - config/routes.rb
@@ -731,6 +741,7 @@ files:
 - lib/spree/backend/config.rb
 - lib/spree/backend/engine.rb
 - lib/spree/backend_configuration.rb
+- lib/spree/backend_configuration/menu_item.rb
 - lib/spree_backend.rb
 - solidus_backend.gemspec
 - vendor/assets/fonts/inter/Inter-Regular.woff
@@ -896,7 +907,7 @@ licenses:
 - BSD-3-Clause
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -904,15 +915,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.4.9
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.
 test_files: []

data/app/assets/stylesheets/spree/backend/themes/blue_steel/globals/_variables_override.scss

@@ -1,25 +0,0 @@
-$cerulean:                       hsl(216, 57, 47);
-
-$white:                          hsl(220, 0, 100);
-$gray-light:                     hsl(220, 9, 71);
-$gray:                           hsl(220, 8, 23);
-$gray-dark:                      hsl(220, 12, 18);
-$black:                          hsl(220, 19, 13);
-
-$color-primary:                  $cerulean;
-
-$color-sidebar-bg:              $gray;
-$color-sidebar-border:          very-light(#5498DA, 12); // $color-border
-$color-navbar:                  $gray-light;
-$color-navbar-bg:               $gray;
-$color-navbar-active:           $white;
-$color-navbar-active-bg:        $color-primary;
-$color-navbar-submenu:          tint($gray-light, 40%);
-$color-navbar-submenu-bg:       $gray-dark;
-$color-navbar-submenu-active:   tint($color-primary, 20%);
-$color-navbar-footer:           $color-navbar;
-$color-navbar-footer-active:    $color-navbar-active;
-
-// Sidebar
-//--------------------------------------------------------------
-$border-sidebar:                 none;