solidus_backend 4.4.2 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 602d9da7564a152698058099a995e4461f349787acb78417dcd06bf023ab61bd
-  data.tar.gz: eba97d71844688e10152970efe41728847101ecf19533edbb8ce2bd4340744c6
+  metadata.gz: 7130001c5b3ccbd6cec823fc5a7115e3d8dda61d83bc0aae2ba85ced3d98272a
+  data.tar.gz: e5c0d4d67bb04cba1b3155ba70fce9fe213e0a61f20e8839111e6cff3a7c1809
 SHA512:
-  metadata.gz: f9a7433fa54b2ced0bdd37b18549e518de78c8c00a2219c05b2c5e4ec6afe2b3c788ceed2352cd2227fff379c926067f93553ef8046f79163fbf19bebfbc46e9
-  data.tar.gz: 4741eceedf989b46244c737a7bd88e8fab23f8d67e3ae3ce4efe35d46856d29ea89058cc125748befe40c5ac82357c45a6291aff650cc09354a237e11871a33f
+  metadata.gz: '09017549f00cae27ee5c011f7d148a77cf6d470877f34e99aad44527e2ac01788f91dd258972b4a75bfa2980e0ac78246a884b14916e7f28c6d0ef86c03135f2'
+  data.tar.gz: 64884cb9999e915fa84768ab8bba317470e976085432a45f9eb444647f109cb90b2eb1b9afaafa201a766db6a0f71014f3c6ad8272f7afbfa3dc6fbf2d4cc4ba

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

@@ -1,25 +1,49 @@
-$.fn.taxonAutocomplete = function () {
+$.fn.taxonAutocomplete = function (options) {
   'use strict';
 
+  var defaultOptions = {
+    multiple: true,
+    placeholder: Spree.translations.taxon_placeholder
+  };
+
+  options = $.extend({}, defaultOptions, options);
+
   this.select2({
-      placeholder: Spree.translations.taxon_placeholder,
-      multiple: true,
+      placeholder: options.placeholder,
+      multiple: options.multiple,
       initSelection: function (element, callback) {
-        var ids = element.val(),
-            count = ids.split(",").length;
-
-        Spree.ajax({
-          type: "GET",
-          url: Spree.pathFor('api/taxons'),
-          data: {
-            ids: ids,
-            per_page: count,
-            without_children: true
-          },
-          success: function (data) {
-            callback(data['taxons']);
-          }
-        });
+        var ids = element.val();
+
+        if (options.multiple) {
+          var count = ids.split(",").length;
+
+          Spree.ajax({
+            type: "GET",
+            url: Spree.pathFor('api/taxons'),
+            data: {
+              ids: ids,
+              per_page: count,
+              without_children: true
+            },
+            success: function (data) {
+              callback(data['taxons']);
+            }
+          });
+        } else {
+
+          Spree.ajax({
+            type: "GET",
+            url: Spree.pathFor('api/taxons'),
+            data: {
+              ids: ids,
+              per_page: 1,
+              without_children: true
+            },
+            success: function (data) {
+              callback(data['taxons'][0]);
+            }
+          });
+        }
       },
       ajax: {
         url: Spree.pathFor('api/taxons'),
@@ -53,5 +77,11 @@ $.fn.taxonAutocomplete = function () {
 };
 
 Spree.ready(function () {
-  $('#product_taxon_ids, .taxon_picker').taxonAutocomplete();
+  $('#product_taxon_ids, .taxon_picker').taxonAutocomplete({
+    multiple: true,
+  });
+
+  $('#product_primary_taxon_id').taxonAutocomplete({
+    multiple: false,
+  });
 });

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

@@ -68,6 +68,14 @@ module Spree
         redirect_to redirect_url
         nil
       end
+
+      def handle_unauthorized_access
+        if unauthorized_redirect
+          instance_exec(&unauthorized_redirect)
+        else
+          Spree::Backend::Config.unauthorized_redirect_handler_class.new(self).call
+        end
+      end
     end
   end
 end

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

@@ -36,6 +36,13 @@
           <% end %>
         </div>
 
+        <div data-hook="admin_product_form_primary_taxons">
+          <%= f.field_container :primary_taxon do %>
+            <%= f.label :primary_taxon_id %><br>
+            <%= f.hidden_field :primary_taxon_id, value: @product.primary_taxon_id %>
+          <% end %>
+        </div>
+
         <div data-hook="admin_product_form_option_types">
           <%= f.field_container :option_types do %>
             <%= f.label :option_type_ids, plural_resource_name(Spree::OptionType) %>
@@ -172,6 +179,24 @@
           </div>
         </div>
       <% else %>
+        <div data-hook="admin_product_form_gtin">
+          <%= f.field_container :gtin do %>
+            <%= f.label :gtin %>
+            <%= f.text_field :gtin %>
+          <% end %>
+        </div>
+
+        <div data-hook="admin_product_form_condition">
+          <%= f.field_container :condition do %>
+            <%= f.label :condition %>
+            <%= f.select :condition,
+                Spree::Variant.conditions.map { |key, value| [t("spree.condition.#{key}"), value] },
+                { include_blank: t('spree.unset') },
+                class: 'custom-select'
+            %>
+          <% end %>
+        </div>
+
         <div id="shipping_specs" class="row">
           <% [:height, :width, :depth, :weight].each_with_index do |field, index| %>
             <div id="shipping_specs_<%= field %>_field" class="col-6">

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

@@ -24,7 +24,7 @@
     <fieldset class="no-border-bottom">
       <legend><%= t('.address') %></legend>
 
-      <%= f.field_container :check_stock_on_transfer do %>
+      <%= f.field_container :address1 do %>
         <%= f.label :address1 %>
         <%= f.text_field :address1, class: 'fullwidth' %>
       <% end %>

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

@@ -7,6 +7,23 @@
           <%= f.text_field :sku, class: 'fullwidth' %>
         </div>
       </div>
+
+      <div class="col-3">
+        <div class="field" data-hook="gtin">
+          <%= f.label :gtin %>
+          <%= f.text_field :gtin, class: 'fullwidth' %>
+        </div>
+      </div>
+
+      <div class="col-3">
+        <div class="field" data-hook="condition">
+          <%= f.label :condition %>
+          <%= f.select :condition,
+                Spree::Variant.conditions.map { |key, value| [t("spree.condition.#{key}"), value] },
+                { include_blank: t('spree.unset') },
+                class: 'custom-select fullwidth' %>
+        </div>
+      </div>
       <div class="col-3">
         <div class="field checkbox" data-hook="track_inventory">
           <label>

data/lib/spree/backend_configuration.rb

@@ -140,6 +140,13 @@ module Spree
     autoload :STOCK_TABS, 'spree/backend_configuration/deprecated_tab_constants'
     autoload :USER_TABS, 'spree/backend_configuration/deprecated_tab_constants'
 
+    # By default, this is set to +Spree::UnauthorizedRedirectHandler+. If you need your admin to behave
+    # differently when a user is unauthorized, you can create your own class that respects the same interface.
+    #
+    # @!attribute [rw] unauthorized_redirect_handler_class
+    #   @return [Class] The class that will handle unauthorized access errors.
+    class_name_attribute :unauthorized_redirect_handler_class, default: "Spree::UnauthorizedRedirectHandler"
+
     # Items can be added to the menu by using code like the following:
     #
     # Spree::Backend::Config.configure do |config|

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 4.4.2
+  version: 4.5.1
 platform: ruby
 authors:
 - Solidus Team
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-09 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.2
+        version: 4.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.2
+        version: 4.5.1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.2
+        version: 4.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.2
+        version: 4.5.1
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -844,7 +843,6 @@ licenses:
 - BSD-3-Clause
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -859,8 +857,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.5
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.
 test_files: []