spree_core 5.3.1 → 5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 955b622bdd29054fb4bdb3e336a4a72e36c03f20e54cec6704aed0ed00407f17
-  data.tar.gz: 2b0d4168fa45ce1814d16b42c54241b1b63034a586281bccd5fb6297f1634aac
+  metadata.gz: 8852343e0b0e126beaff8b5745ca76527a0c436344f670c2cdab2f27eeb1f23f
+  data.tar.gz: a3378bc532a952c8d72190c5ebfb244c07b103a8f4bb67ec3bcf889278395a45
 SHA512:
-  metadata.gz: 68f6b6296a2d489c54009a8d52586e268d01c7894785c6cf1d5d0d428a6e8fa2365b8b29296bbc4a4452004efedea81c397d73ceb3047f6e9d9e9370af41fc7e
-  data.tar.gz: 6ec77c2ecee5028ee57e03664dfb2fec39794867e04659fb0fcb1d7042287a8b912705f1c20674a9be68c00c0050a54d6cc3e05bc73b36f9112b1c2bfb931619
+  metadata.gz: 893e2c5b7d12b76c599a35ed91df5062fb8849144c4dd34cfc528b59c7c8d993ef523e443d3aba36e949af5814f68105af80fc3caee9295919d53eb5fe3ed137
+  data.tar.gz: 81cdf22db519e0695e36363a097a0b6703e4bba5a44aff5989bb225d5ea2f16e1ffa087507c2af57254bdd1c3fd0b24b5649b56bca0ee8b38bc46bee59172041

data/app/models/spree/export.rb

@@ -57,6 +57,10 @@ module Spree
     #
     attribute :record_selection, :string, default: 'filtered'
 
+    def event_serializer_class
+      Spree::Events::ExportSerializer
+    end
+
     def done?
       attachment.present? && attachment.attached?
     end
@@ -196,7 +200,7 @@ module Spree
       def model_class
         klass = "Spree::#{to_s.demodulize.singularize}".safe_constantize
 
-        raise NameError, "Missing model class for #{to_s}" unless klass
+        raise NameError, "Missing model class for #{self}" unless klass
 
         klass
       end

data/app/models/spree/import.rb

@@ -225,6 +225,10 @@ module Spree
       @current_ability ||= Spree.ability_class.new(user, { store: store })
     end
 
+    def event_serializer_class
+      Spree::Events::ImportSerializer
+    end
+
     class << self
       # Returns the available types for the import
       # @return [Array<Class>]

data/app/models/spree/order/address_book.rb

@@ -14,13 +14,17 @@ module Spree
       end
 
       def bill_address_id=(id)
+        return if bill_address_id == id
+
         address = Spree::Address.find_by(id: id)
-        if address && address.user_id == user_id
+        # rubocop:disable Style/ConditionalAssignment
+        if address && user_id.present? && address.user_id == user_id
           self['bill_address_id'] = address.id
-          bill_address.reload
         else
           self['bill_address_id'] = nil
         end
+        # rubocop:enable Style/ConditionalAssignment
+        reset_bill_address
       end
 
       def bill_address_attributes=(attributes)
@@ -29,13 +33,17 @@ module Spree
       end
 
       def ship_address_id=(id)
+        return if ship_address_id == id
+
         address = Spree::Address.find_by(id: id)
-        if address && address.user_id == user_id
+        # rubocop:disable Style/ConditionalAssignment
+        if address && user_id.present? && address.user_id == user_id
           self['ship_address_id'] = address.id
-          ship_address.reload
         else
           self['ship_address_id'] = nil
         end
+        # rubocop:enable Style/ConditionalAssignment
+        reset_ship_address
       end
 
       def ship_address_attributes=(attributes)

data/app/models/spree/order/store_credit.rb

@@ -66,7 +66,10 @@ module Spree
       # @return [BigDecimal] The total amount of store credits applied to the order.
       def total_applied_store_credit
         if payments.loaded?
-          payments.find_all(&:store_credit?).find_all(&:valid?).sum(&:amount) || BigDecimal::ZERO
+          payments.
+            find_all(&:store_credit?).
+            reject(&:has_invalid_state?).
+            sum(&:amount) || BigDecimal::ZERO
         else
           payments.store_credits.valid.sum(:amount)
         end

data/app/models/spree/payment.rb

@@ -278,6 +278,10 @@ module Spree
       end
     end
 
+    def has_invalid_state?
+      INVALID_STATES.include?(state)
+    end
+
     private
 
     def set_amount
@@ -302,10 +306,6 @@ module Spree
       publish_event('payment.voided')
     end
 
-    def has_invalid_state?
-      INVALID_STATES.include?(state)
-    end
-
     def validate_source
       if source && !source.valid?
         source.errors.map { |error| { field: error.attribute, message: error&.message } }.each do |err|

data/app/models/spree/report.rb

@@ -31,6 +31,10 @@ module Spree
     #
     has_one_attached :attachment, service: Spree.private_storage_service_name
 
+    def event_serializer_class
+      Spree::Events::ReportSerializer
+    end
+
     def self.report_type
       name.demodulize.underscore
     end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.3.1'.freeze
+  VERSION = '5.3.2'.freeze
 
   def self.version
     VERSION

data/lib/spree/testing_support/common_rake.rb

@@ -3,7 +3,7 @@ require 'generators/spree/dummy_model/dummy_model_generator'
 
 desc 'Generates a dummy app for testing'
 namespace :common do
-  task :test_app, :user_class do |_t, args|
+  task :test_app, [:authentication, :user_class, :admin_user_class, :css, :javascript, :install_admin, :install_storefront] do |_t, args|
     args.with_defaults(
       authentication: 'dummy',
       user_class: 'Spree::LegacyUser',

data/lib/spree/testing_support/extension_rake.rb

@@ -2,8 +2,21 @@ require 'spree/testing_support/common_rake'
 
 desc 'Generates a dummy app for testing an extension'
 namespace :extension do
-  task :test_app, [:authentication, :user_class] do |_t, args|
+  task :test_app, [:options] do |_t, args|
     Spree::DummyGeneratorHelper.inject_extension_requirements = true
-    Rake::Task['common:test_app'].execute(args)
+    # Support both hash passed as first arg and named options
+    options = args[:options].is_a?(Hash) ? args[:options] : args.to_h
+    Rake::Task['common:test_app'].execute(Rake::TaskArguments.new(
+      [:authentication, :user_class, :admin_user_class, :css, :javascript, :install_admin, :install_storefront],
+      [
+        options[:authentication],
+        options[:user_class],
+        options[:admin_user_class],
+        options[:css],
+        options[:javascript],
+        options[:install_admin],
+        options[:install_storefront]
+      ]
+    ))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.3.2
 platform: ruby
 authors:
 - Sean Schofield
@@ -1717,9 +1717,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.3.1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.3.2
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.3.1
+  source_code_uri: https://github.com/spree/spree/tree/v5.3.2
 rdoc_options: []
 require_paths:
 - lib