solidus_backend 4.2.3 → 4.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6267a01ab8a45958e1f7df1632238e14de1544ac777187e7e2eaa58d36ec054
-  data.tar.gz: 01b2e9db90f1474080ede9a684eda4b5fc958fbba0899c6a1fc32bea8a3b8b9f
+  metadata.gz: 3c96093feaa6ba9261f595b553b0f468980377dd35613593e72f8e33b52a79b4
+  data.tar.gz: d7c3390eb838055f27a0628cb6104d519088900d1ff2dcd43a5329f1c5212db2
 SHA512:
-  metadata.gz: b6017f2fa9ea50ca39efaf4e1110236404be68cd5a06b318804ffae31e53d634fa27de2d1acc655fc0e20472335384baba4d49bd6e3c05ab858356a3df17038f
-  data.tar.gz: 1c62f8dbc04d83d7a90d3e0b1034a6bf2c48e740859a21891d28348cc1cda0c590cd9f9407a85055fa6d4e0981a37820c2b05ec9948be3b6bb1eb535706132ee
+  metadata.gz: '0921a2ebe34b7b8f8e16d7188ec2d214df75aea411b642e2bfc9115de25e61e5cd11e7bc12bdf524a38d6f16fc6785abc0e16ebd12524862498b91485ad8e5fa'
+  data.tar.gz: dec66e87eb65a8710784367445b26af350810b9d9f357a85659160580be93d3827922dedda4a10d72d6a2c915878312ff6a604b53c31e756c9edd7c84d5e816e

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]);
+  return accounting.formatMoney(amount, currencyInfo[0], currencyInfo[1], thousand, decimal, currencyInfo[2]).trim();
 }

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

@@ -28,7 +28,7 @@ module Spree
         invoke_callbacks(:update, :before)
 
         attributes = payment_method_params
-        attributes.each do |key, _value|
+        attributes.each_key do |key|
           if key.include?("password") && attributes[key].blank?
             attributes.delete(key)
           end

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

@@ -68,7 +68,7 @@ module Spree
         if updating_variant_property_rules?
           url_params = {}
           url_params[:ovi] = []
-          params[:product][:variant_property_rules_attributes].each do |_index, param_attrs|
+          params[:product][:variant_property_rules_attributes].each_value do |param_attrs|
             url_params[:ovi] += param_attrs[:option_value_ids]
           end
           spree.admin_product_product_properties_url(@product, url_params)
@@ -133,7 +133,7 @@ module Spree
       def normalize_variant_property_rules
         return unless updating_variant_property_rules?
 
-        params[:product][:variant_property_rules_attributes].each do |_index, param_attrs|
+        params[:product][:variant_property_rules_attributes].each_value do |param_attrs|
           param_attrs[:option_value_ids] = param_attrs[:option_value_ids].split(',')
         end
       end

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.order(:sku)
+          .distinct
           .includes(
             :images,
             stock_items: :stock_location,

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

@@ -17,11 +17,14 @@
     JSON.dump(
       Spree::Config.available_currencies.map { |c|
         format =
-          if c.symbol == "" || c.symbol_first
+          if c.format.present?
+            c.format.gsub("%u", "%s").gsub("%n", "%v")
+          elsif c.symbol == "" || c.symbol_first
             "%s%v"
           else
             "%v %s"
           end
+
         [c.id.to_s.upcase, [
           c.symbol || "¤",
           c.exponent,

data/lib/spree/backend_configuration/menu_item.rb

@@ -78,18 +78,17 @@ module Spree
       end
 
       def match_path?(request)
-        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
+        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
       end
 
       def url

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.2.5
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-02 00:00:00.000000000 Z
+date: 2025-02-19 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.3
+        version: 4.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 4.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -930,7 +930,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.4.17
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.