solidus_core 4.1.3 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3600d5a533290c099382476478e8eeb060d3596363939f726d1e02125e88aa1
-  data.tar.gz: b3fa5cfb3f1e6f7a67bd3a893766292375b7b7217d21bd314666648b98a3615c
+  metadata.gz: c8422983aea32a3cdf481647862a2ada3210d21c38936c0d0af370772bc04b4d
+  data.tar.gz: 6fb241fe0339fce0747a496366f449f69671d90c0a69cd9483ccd1b0229ce7c0
 SHA512:
-  metadata.gz: 318e5325ee20610090fbd4113ecd6bc3493b36f690ad4650b6186144f0615558be34279f779454d59b5a2089b3c672c37b9b65b9cd1ec85022ed26d184f755cf
-  data.tar.gz: 7b072c3828d8a943f34eb9182e17923b4475014550583d7515d65458a7fe1db8778589654659526048456b29e2be80ca637c6f86fe5dd88c92cc35b1d9d86f68
+  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/reimbursement_tax_calculator.rb

@@ -12,7 +12,7 @@ module Spree
   class ReimbursementTaxCalculator
     class << self
       def call(reimbursement)
-        reimbursement.return_items.includes(:inventory_unit).each do |return_item|
+        reimbursement.return_items.includes(:inventory_unit).find_each do |return_item|
           set_tax!(return_item)
         end
       end

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/app/models/spree/stock_location.rb

@@ -121,7 +121,7 @@ module Spree
 
     def ensure_one_default
       if default
-        Spree::StockLocation.where(default: true).where.not(id: id).each do |stock_location|
+        Spree::StockLocation.where(default: true).where.not(id: id).find_each do |stock_location|
           stock_location.default = false
           stock_location.save!
         end

data/app/models/spree/variant.rb

@@ -397,7 +397,7 @@ module Spree
     end
 
     def create_stock_items
-      StockLocation.where(propagate_all_variants: true).each do |stock_location|
+      StockLocation.where(propagate_all_variants: true).find_each do |stock_location|
         stock_location.propagate_variant(self)
       end
     end

data/db/default/spree/states.rb

@@ -9,7 +9,7 @@ def create_states(subregions, country)
 end
 
 ActiveRecord::Base.transaction do
-  Spree::Country.all.each do |country|
+  Spree::Country.all.find_each do |country|
     carmen_country = Carmen::Country.coded(country.iso)
     next unless carmen_country.subregions?
 

data/db/migrate/20180710170104_create_spree_store_credit_reasons_table.rb

@@ -17,7 +17,7 @@ class CreateSpreeStoreCreditReasonsTable < ActiveRecord::Migration[5.1]
       t.timestamps
     end
 
-    StoreCreditUpdateReason.all.each do |update_reason|
+    StoreCreditUpdateReason.all.find_each do |update_reason|
       StoreCreditReason.create!(name: update_reason.name)
     end
 
@@ -45,7 +45,7 @@ class CreateSpreeStoreCreditReasonsTable < ActiveRecord::Migration[5.1]
       end
     end
 
-    StoreCreditReason.all.each do |store_credit_reason|
+    StoreCreditReason.all.find_each do |store_credit_reason|
       StoreCreditUpdateReason.create!(name: store_credit_reason.name)
     end
 

data/db/migrate/20220317165036_set_promotions_with_any_policy_to_all_if_possible.rb

@@ -2,7 +2,7 @@
 
 class SetPromotionsWithAnyPolicyToAllIfPossible < ActiveRecord::Migration[5.2]
   def up
-    Spree::Promotion.where(match_policy: :any).includes(:promotion_rules).all.each do |promotion|
+    Spree::Promotion.where(match_policy: :any).includes(:promotion_rules).all.find_each do |promotion|
       if promotion.promotion_rules.length <= 1
         promotion.update!(match_policy: :all)
       else

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/controller_helpers/order.rb

@@ -45,7 +45,7 @@ module Spree
 
         def set_current_order
           if spree_current_user && current_order
-            spree_current_user.orders.by_store(current_store).incomplete.where('id != ?', current_order.id).each do |order|
+            spree_current_user.orders.by_store(current_store).incomplete.where('id != ?', current_order.id).find_each do |order|
               current_order.merge!(order, spree_current_user)
             end
           end

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.3"
+  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.3
+  version: 4.1.5
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-02 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.4.17
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.