solidus_core 4.1.4 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 145d5f977aa13ad4cfb755cde0001dd95033333ddbfba76867939c80c1d45d6c
-  data.tar.gz: cefd0c49cb7ff79a1173851a22a5cfa155824c537ea8575f6ba26c0ce43661c6
+  metadata.gz: c8422983aea32a3cdf481647862a2ada3210d21c38936c0d0af370772bc04b4d
+  data.tar.gz: 6fb241fe0339fce0747a496366f449f69671d90c0a69cd9483ccd1b0229ce7c0
 SHA512:
-  metadata.gz: ca08f277790e62bbc4d38d2987e90eecfe65364da49fbdb149025baa635819e67d8f393f949393fe1d50ecf918a09e7c99235b4404887b4535a7675e3d8309e1
-  data.tar.gz: 9257dce79c75318621786b3d9bd9edcf4e2f3c4f479e6648b20e8d3651739d0a558ae942491ca5ee3342d83190e1a0311c3de710628ff73275ba6ecb906acae2
+  metadata.gz: 5ca4af53faa281166a5a0f345d60a628e96dadbfce58a30d4948a63a21dc7386009d4b2a7c88521dc9979a61d8ac1adc4741e70168cc689e70b7b6f0deeb5368
+  data.tar.gz: 59ea38f49224546adf4bafc2720e6bd583b8823f3e4582c250c3fa949cc1a153479f2d969694f65a0b2e1d224e3c60595cfd0140e69c0e929db7d50a039b679d

data/app/models/spree/order.rb

@@ -630,7 +630,7 @@ module Spree
       if can_complete? || complete?
         valid_store_credit_payments.to_a.sum(&:amount)
       else
-        [total, (user.try(:available_store_credit_total, currency: currency) || 0.0)].min
+        [total, user.try(:available_store_credit_total, currency: currency) || 0.0].min
       end
     end
 

data/app/models/spree/promotion_handler/coupon.rb

@@ -73,7 +73,7 @@ module Spree
 
         unless promotion.eligible?(order, promotion_code: promotion_code)
           set_promotion_eligibility_error_code(promotion)
-          return (error || ineligible_for_this_order)
+          return error || ineligible_for_this_order
         end
 
         # If any of the actions for the promotion return `true`,

data/app/models/spree/stock/splitter/shipping_category.rb

@@ -24,7 +24,7 @@ module Spree
 
         def hash_to_packages(categories)
           packages = []
-          categories.each do |_id, contents|
+          categories.each_value do |contents|
             packages << build_package(contents)
           end
           packages

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -44,6 +44,7 @@ module Spree
       opts[:skip_yarn] = true
       opts[:skip_bootsnap] = true
       opts[:skip_javascript] = true
+      opts[:skip_action_cable] = true
 
       puts "Generating dummy Rails application..."
       invoke Rails::Generators::AppGenerator,

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -3,7 +3,7 @@
           'mysql'
         when 'postgres', 'postgresql'
           'postgres'
-        when 'sqlite', '', nil
+        when /sqlite3?/, '', nil
           'sqlite'
         else
           raise "Invalid DB specified: #{ENV['DB']}"
@@ -19,7 +19,7 @@
 <% db_username = ENV['DB_USERNAME'] %>
 <% db_password = ENV['DB_PASSWORD'] %>
 
-<% case ENV['DB']
+<% case db
   when 'mysql' %>
 development:
   adapter: mysql2

data/lib/spree/app_configuration.rb

@@ -22,6 +22,8 @@ require "spree/core/search/variant"
 require 'spree/preferences/configuration'
 require 'spree/core/environment'
 
+require 'uri'
+
 module Spree
   class AppConfiguration < Preferences::Configuration
     # Preferences (alphabetized to more easily lookup particular preferences)

data/lib/spree/core/state_machines/order.rb

@@ -46,7 +46,11 @@ module Spree
 
               # Persist the state on the order
               after_transition do |order, transition|
-                order.state = order.state
+                # Hard to say if this is really necessary, it was introduced in this commit:
+                # https://github.com/mamhoff/solidus/commit/fa1d66c42e4c04ee7cd1c20d87e4cdb74a226d3d
+                # But it seems to be harmless, so we'll keep it for now.
+                order.state = order.state # rubocop:disable Lint/SelfAssignment
+
                 order.state_changes.create(
                   previous_state: transition.from,
                   next_state:     transition.to,

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "4.1.4"
+  VERSION = "4.1.5"
 
   def self.solidus_version
     VERSION

data/lib/spree/money.rb

@@ -35,7 +35,7 @@ module Spree
       if amount.is_a?(::Money)
         @money = amount
       else
-        currency = (options[:currency] || Spree::Config[:currency])
+        currency = options[:currency] || Spree::Config[:currency]
 
         @money = Monetize.from_string(amount, currency)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 4.1.4
+  version: 4.1.5
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-05 00:00:00.000000000 Z
+date: 2024-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1047,7 +1047,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.