spree_core 5.3.0 → 5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d6583fe2ea61bf166c3e25d8739ea9b953b396c35acfbb4e47edde6d612d59d
-  data.tar.gz: 3bc0a7d98a739e16e3857eabdf23cbb25a989f17cf7186ae0632ced2bff36ac4
+  metadata.gz: 8852343e0b0e126beaff8b5745ca76527a0c436344f670c2cdab2f27eeb1f23f
+  data.tar.gz: a3378bc532a952c8d72190c5ebfb244c07b103a8f4bb67ec3bcf889278395a45
 SHA512:
-  metadata.gz: 66a7c9d1bbe53c07cf36032a2b61ebf850489a3e5b3e515c2916ad9bfa685b10e7a2bc7d8d0a5de1cb8241e7b96e0c31eb60de3351e306e6347a25f52032faf3
-  data.tar.gz: 9dca332fe825e8342f9b2492bbd555e3d6b2868ae1a5a9f5f99a163d86efd28fba5c0bb63df74f9b304f1b2fb65f8aa9481bbca22c6757b13c7a05851c1d456e
+  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/app/services/spree/data_feeds/google/required_attributes.rb

@@ -10,6 +10,7 @@ module Spree
           return failure(nil, error: 'No image link') if get_image_link(input[:variant], input[:product]).nil?
 
           information['id'] = input[:variant].id
+          information['item_group_id'] = input[:product].id
           information['title'] = format_title(input[:product], input[:variant])
           information['description'] = get_description(input[:product], input[:variant])
           information['link'] = "#{input[:store].url}/products/#{input[:product].slug}"

data/app/services/spree/gift_cards/apply.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Applies a gift card to an order
 # under the hood it creates a store credit payment record and updates the gift card amount used
 # @param gift_card [Spree::GiftCard] the gift card to apply
@@ -16,6 +17,14 @@ module Spree
         # we shouldn't allow a gift card to be applied to an order with a different currency
         return failure(:gift_card_mismatched_currency) if gift_card.currency != order.currency
 
+        # gift card requires logged user
+        if gift_card.user.present?
+          # user must be logged in
+          return failure(:gift_card_customer_not_logged_in) if order.user.blank?
+          # user must be the same as the gift card user
+          return failure(:gift_card_mismatched_customer) if gift_card.user != order.user
+        end
+
         amount = [gift_card.amount_remaining, order.total].min
         store = order.store
 

data/config/locales/en.yml

@@ -1190,7 +1190,10 @@ en:
     gift_card_already_redeemed: The Gift Card has already been redeemed.
     gift_card_applied: The Gift Card was successfully applied to your order!
     gift_card_batch: Gift Card Batch
+    gift_card_customer_not_logged_in: Gift Card cannot be applied with guest user.
     gift_card_expired: The Gift Card has expired.
+    gift_card_mismatched_currency: Gift Card cannot be applied with current currency.
+    gift_card_mismatched_customer: This gift card is associated with another user.
     gift_card_removed: The Gift Card was successfully removed from your order
     gift_card_using_store_credit_error: You can't apply the Gift Card after you applied the store credit.
     gift_cards: Gift Cards

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.3.0'.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',
@@ -20,8 +20,7 @@ namespace :common do
     javascript_enabled = args[:javascript].to_b
     css_enabled = args[:css].to_b
 
-    # Admin and Storefront require JavaScript and CSS (Tailwind) to function properly
-    javascript_enabled ||= install_admin || install_storefront
+    # Admin and Storefront require CSS (Tailwind) to function properly
     css_enabled ||= install_admin || install_storefront
 
     puts args
@@ -32,9 +31,6 @@ namespace :common do
     dummy_app_args = [
       "--lib_name=#{ENV['LIB_NAME']}"
     ]
-    # Use API mode only if no frontend components are needed
-    use_api_mode = !install_storefront && !install_admin && !javascript_enabled && !css_enabled
-    dummy_app_args << '--api' if use_api_mode
     dummy_app_args << '--javascript' if javascript_enabled
     dummy_app_args << '--css=tailwind' if css_enabled
 

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.0
+  version: 5.3.2
 platform: ruby
 authors:
 - Sean Schofield
@@ -107,6 +107,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.1
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: carmen
   requirement: !ruby/object:Gem::Requirement
@@ -1703,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.0
+  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.0
+  source_code_uri: https://github.com/spree/spree/tree/v5.3.2
 rdoc_options: []
 require_paths:
 - lib
@@ -1720,7 +1734,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 4.0.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: The bare bones necessary for Spree
 test_files: []