spree_core 5.4.0.beta5 → 5.4.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2a4eae0b4e102ba4160e435fe81d656ced27b014ed013670226bb8a522b5996
-  data.tar.gz: c8c6737253472a4456f29b06f1ae028b2c4144732fba6dae7d8dd8c5e2b92d8f
+  metadata.gz: d1e118b3f3198080c2006abcd4956ae76608cf6a6a99ed7f16df2380839fe98f
+  data.tar.gz: 8f05ff3e72814788a15c7c145ea62f1f9efb603b5dcd18fcedcd07774274db7a
 SHA512:
-  metadata.gz: ec9479d52b6bcbd036354511897d0ee360da7784aef051f20affe23991b1eaebe8525b7a0173fbc7cdc1310a977909e4b78a33b0cd677869d579d1666bbada7a
-  data.tar.gz: 44b40ddca311ed24ae26cd99b5455a7259a0aa986cb8a9a76598101e4c42ea48042b8f1256365b2734c7e43218337ec7963c78b0bcffc5ab70f62e0f794d4b9e
+  metadata.gz: b6b0596bb455d278630cf6df3e1927034c703f15e4319c856cec8eaa798e871ec671597a3bf07f3cb20846b775a460f77df8e828184fc2b1200c4a394760c361
+  data.tar.gz: c3693f84de9a1b1c26e3572f8c350a498050765242453b3b2a95d3a6956d06476a54db89ec3f21c0ba4bd0eea27edad7da2a2b1ada5f79d9a1eaf70a44084a28

data/app/models/spree/payment/processing.rb

@@ -127,6 +127,8 @@ module Spree
           else
             raise Core::GatewayError, Spree.t(:payment_processing_failed)
           end
+        else
+          yield unless processing?
         end
       end
 

data/app/models/spree/payment_method/check.rb

@@ -4,6 +4,14 @@ module Spree
       %w{capture void}
     end
 
+    def authorize(*)
+      simulated_successful_billing_response
+    end
+
+    def purchase(*)
+      simulated_successful_billing_response
+    end
+
     # Indicates whether its possible to capture the payment
     def can_capture?(payment)
       ['checkout', 'pending'].include?(payment.state)

data/app/services/spree/products/prepare_nested_attributes.rb

@@ -17,11 +17,14 @@ module Spree
     #   prepared_params = service.call
     #
     class PrepareNestedAttributes
+      attr_reader :variants_to_discontinue
+
       def initialize(product, store, params, ability)
         @product = product
         @store = store
         @params = params
         @ability = ability
+        @variants_to_discontinue = []
       end
 
       def call
@@ -75,7 +78,8 @@ module Spree
           params[:option_type_ids] = []
           params[:variants_attributes] = {}
 
-          variants_to_remove.each_with_index do |variant_id, index|
+          populate_variants_to_discontinue
+          variant_ids_to_destroy.each_with_index do |variant_id, index|
             params[:variants_attributes][index.to_s] = { id: variant_id, _destroy: '1' }
           end
 
@@ -122,15 +126,37 @@ module Spree
       def removed_variants_attributes
         return {} unless can_remove_variants?
 
+        populate_variants_to_discontinue
+
         attributes = {}
         last_index = params[:variants_attributes].keys.map(&:to_i).max
-        variants_to_remove.each_with_index do |variant_id, index|
-          attributes[(index + last_index + 1).to_s] = { id: variant_id, _destroy: '1' }
+        variant_ids_to_destroy.each_with_index do |variant_id, index|
+          attributes[(last_index + 1 + index).to_s] = { id: variant_id, _destroy: '1' }
         end
 
         attributes
       end
 
+      def populate_variants_to_discontinue
+        ids = variants_to_remove.select { |vid| variant_ids_with_completed_orders.include?(vid) }
+        @variants_to_discontinue = product.variants.where(id: ids).to_a if ids.any?
+      end
+
+      def variant_ids_to_destroy
+        variants_to_remove - variant_ids_with_completed_orders
+      end
+
+      def variant_ids_with_completed_orders
+        @variant_ids_with_completed_orders ||=
+          product.variants
+                 .joins(:orders)
+                 .merge(Spree::Order.complete)
+                 .reorder(nil)
+                 .distinct
+                 .pluck(:id)
+                 .map(&:to_s)
+      end
+
       def removed_product_option_types_attributes
         return {} unless can_manage_option_types?
 

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.4.0.beta5'.freeze
+  VERSION = '5.4.0.beta6'.freeze
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.4.0.beta5
+  version: 5.4.0.beta6
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-10 00:00:00.000000000 Z
+date: 2026-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -1656,9 +1656,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.beta5
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.beta6
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.beta5
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.beta6
 post_install_message:
 rdoc_options: []
 require_paths: