spree_core 4.8.3 → 4.9.0

data/app/models/spree/variant/webhooks.rb

@@ -0,0 +1,6 @@
+module Spree
+  class Variant < Spree::Base
+    module Webhooks
+    end
+  end
+end

data/app/models/spree/variant.rb

@@ -5,9 +5,7 @@ module Spree
 
     include Spree::MemoizedData
     include Spree::Metadata
-    if defined?(Spree::Webhooks::HasWebhooks)
-      include Spree::Webhooks::HasWebhooks
-    end
+    include Spree::Variant::Webhooks
 
     MEMOIZED_METHODS = %w(purchasable in_stock backorderable tax_category options_text compare_at_price)
 
@@ -108,6 +106,14 @@ module Spree
       not_discontinued.not_deleted.
         for_currency_and_available_price_amount(currency)
     end
+
+    scope :with_option_value, lambda { |option_name, option_value|
+      option_type_ids = OptionType.where(name: option_name).ids
+      return none if option_type_ids.empty?
+
+      joins(:option_values).where(Spree::OptionValue.table_name => { name: option_value, option_type_id: option_type_ids })
+    }
+
     # FIXME: cost price should be represented with DisplayMoney class
     LOCALIZED_NUMBERS = %w(cost_price weight depth width height)
 
@@ -172,6 +178,18 @@ module Spree
       !!deleted_at
     end
 
+    # Returns an array of hashes with the option type name, value and presentation
+    # @return [Array<Hash>]
+    def options
+      option_values.includes(:option_type).map do |option_value|
+        {
+          name: option_value.option_type.name,
+          value: option_value.name,
+          presentation: option_value.presentation
+        }
+      end
+    end
+
     def options=(options = {})
       options.each do |option|
         next if option[:name].blank? || option[:value].blank?

data/app/models/spree/wishlist.rb

@@ -15,6 +15,8 @@ module Spree
     belongs_to :store, class_name: 'Spree::Store'
 
     has_many :wished_items, class_name: 'Spree::WishedItem', dependent: :destroy
+    has_many :variants, through: :wished_items, source: :variant, class_name: 'Spree::Variant'
+    has_many :products, -> { distinct }, through: :variants, source: :product, class_name: 'Spree::Product'
 
     after_commit :ensure_default_exists_and_is_unique
     validates :name, :store, :user, presence: true
@@ -27,6 +29,13 @@ module Spree
       token
     end
 
+    # returns the number of wished items in the wishlist
+    #
+    # @return [Integer]
+    def wished_items_count
+      @wished_items_count ||= variant_ids.count
+    end
+
     def self.get_by_param(param)
       find_by(token: param)
     end

data/app/presenters/spree/variants/options_presenter.rb

@@ -19,10 +19,22 @@ module Spree
         join_options(options)
       end
 
+      def to_hash
+        options = option_values
+        options = sort_options(options)
+        options = present_options_as_hash(options)
+
+        join_hash_options(options)
+      end
+
       private
 
       def sort_options(options)
-        options.sort_by { |o| o.option_type.position }
+        if options.first&.association(:option_type)&.loaded?
+          options.sort_by { |o| o.option_type.position }
+        else
+          options.includes(:option_type).sort_by { |o| o.option_type.position }
+        end
       end
 
       def present_options(options)
@@ -34,7 +46,7 @@ module Spree
       end
 
       def present_color_option(option)
-        "#{option.option_type.presentation}: #{option.name}"
+        "#{option.option_type.presentation}: #{option.presentation}"
       end
 
       def present_option(option)
@@ -44,6 +56,26 @@ module Spree
       def join_options(options)
         options.to_sentence(words_connector: WORDS_CONNECTOR, two_words_connector: WORDS_CONNECTOR)
       end
+
+      def present_options_as_hash(options)
+        options.map do |ov|
+          method = "present_#{ov.option_type.name}_option_as_hash"
+
+          respond_to?(method, true) ? send(method, ov) : present_option_as_hash(ov)
+        end
+      end
+
+      def present_option_as_hash(option)
+        {}.tap do |hash|
+          hash.store(option.option_type.presentation.downcase, option.presentation)
+        end
+      end
+
+      def join_hash_options(options)
+        return {} if options.empty?
+
+        options.inject(:merge).symbolize_keys
+      end
     end
   end
 end

data/app/services/spree/cart/add_item.rb

@@ -16,6 +16,8 @@ module Spree
         options ||= {}
         quantity ||= 1
 
+        return failure(variant, "#{variant.name} is not available in #{order.currency}") if variant.amount_in(order.currency).nil?
+
         line_item = Spree::Dependencies.line_item_by_variant_finder.constantize.new.execute(order: order, variant: variant, options: options)
 
         line_item_created = line_item.nil?

data/app/services/spree/cart/destroy.rb

@@ -7,31 +7,41 @@ module Spree
         run :check_if_can_be_destroyed
         run :cancel_shipments
         run :void_payments
+        run :clear_addresses
         run :destroy_order
       end
 
       private
 
       def check_if_can_be_destroyed(order:)
-        return failure(Spree.t(:cannot_be_destroyed)) unless order&.can_be_destroyed?
+        return failure(false, Spree.t(:cannot_be_destroyed)) unless order&.can_be_destroyed?
 
         success(order: order)
       end
 
       def cancel_shipments(order:)
-        order.shipments.each(&:cancel!)
+        order.shipments.each(&:cancel)
 
         success(order: order)
       end
 
       def void_payments(order:)
-        order.payments.each(&:void!)
+        order.payments.each(&:void)
+
+        success(order: order)
+      end
+
+      def clear_addresses(order:)
+        order.ship_address = nil unless order.ship_address&.can_be_deleted?
+        order.bill_address = nil unless order.bill_address&.can_be_deleted?
 
         success(order: order)
       end
 
       def destroy_order(order:)
-        order.destroy
+        destroyed_result = order.destroy
+
+        return failure(false, Spree.t(:cannot_be_destroyed)) unless destroyed_result.present?
 
         success(order)
       end

data/app/services/spree/seeds/all.rb

@@ -21,6 +21,9 @@ module Spree
           # store & stock location
           Stores.call
           StockLocations.call
+
+          # add store resources
+          PaymentMethods.call
         end
       end
     end

data/app/services/spree/seeds/payment_methods.rb

@@ -0,0 +1,18 @@
+module Spree
+  module Seeds
+    class PaymentMethods
+      prepend Spree::ServiceModule::Base
+
+      def call
+        payment_method = Spree::PaymentMethod::StoreCredit.find_or_initialize_by(
+          name: Spree.t(:store_credit_name),
+          description: Spree.t(:store_credit_name),
+          active: true
+        )
+
+        payment_method.stores = Spree::Store.all if payment_method.new_record?
+        payment_method.save!
+      end
+    end
+  end
+end

data/app/services/spree/seeds/stock_locations.rb

@@ -6,7 +6,7 @@ module Spree
       def call
         country = Spree::Store.default.default_country
         Spree::StockLocation.find_or_create_by!(
-          name: 'default',
+          name: Spree.t(:default_stock_location_name),
           propagate_all_variants: false,
           country: country,
           active: true,

data/app/services/spree/seeds/zones.rb

@@ -7,32 +7,32 @@ module Spree
         eu_vat = Spree::Zone.where(name: 'EU_VAT', description: 'Countries that make up the EU VAT zone.', kind: 'country').first_or_create!
         uk_vat = Spree::Zone.where(name: 'UK_VAT', kind: 'country').first_or_create!
         north_america = Spree::Zone.where(name: 'North America', description: 'USA + Canada', kind: 'country').first_or_create!
-        south_america = Spree::Zone.where(name: 'South America', description: 'South America', kind: 'country').first_or_create!
+        Spree::Zone.where(name: 'South America', description: 'South America', kind: 'country').first_or_create!
         middle_east = Spree::Zone.where(name: 'Middle East', description: 'Middle East', kind: 'country').first_or_create!
         asia = Spree::Zone.where(name: 'Asia', description: 'Asia', kind: 'country').first_or_create!
 
-        %w(PL FI PT RO DE FR SK HU SI IE AT ES IT BE SE LV BG LT CY LU MT DK NL EE HR CZ GR).each do |name|
-          eu_vat.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
-        end
-
+        create_zone_members(eu_vat, %w(PL FI PT RO DE FR SK HU SI IE AT ES IT BE SE LV BG LT CY LU MT DK NL EE HR CZ GR))
+        create_zone_members(north_america, %w(US CA))
+        create_zone_members(middle_east, %w(BH CY EG IR IQ IL JO KW LB OM QA SA SY TR AE YE))
+        create_zone_members(asia, %w(AF AM AZ BH BD BT BN KH CN CX CC GE HK IN ID IR IQ IL JP JO KZ KW KG LA LB MO MY MV MN MM NP
+                                     KP OM PK PS PH QA SA SG KR LK SY TW TJ TH TR TM AE UZ VN YE))
         uk_vat.zone_members.where(zoneable: Spree::Country.find_by(iso: 'GB')).first_or_create!
+      end
 
-        %w(US CA).each do |name|
-          north_america.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
-        end
-
-        %w(BH CY EG IR IQ IL JO KW LB OM QA SA SY TR AE YE).each do |name|
-          middle_east.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
-        end
-
-        %w(AF AM AZ BH BD BT BN KH CN CX CC GE HK IN ID IR IQ IL JP JO KZ KW KG LA LB MO MY MV MN MM NP
-          KP OM PK PS PH QA SA SG KR LK SY TW TJ TH TR TM AE UZ VN YE).each do |name|
-          asia.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
-        end
+      protected
 
-        %w(AR BO BR CL CO EC FK GF GY PY PE SR UY VE).each do |name|
-          south_america.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
+      def create_zone_members(zone, country_codes)
+        countries_ids = Spree::Country.where(iso: country_codes).ids
+        zone_members = countries_ids.map do |country_id|
+          {
+            zoneable_id: country_id,
+            zoneable_type: 'Spree::Country',
+            zone_id: zone.id,
+            created_at: Time.current,
+            updated_at: Time.current
+          }
         end
+        Spree::ZoneMember.insert_all(zone_members)
       end
     end
   end

data/config/locales/en.yml

@@ -576,6 +576,7 @@ en:
     alternative_phone: Alternative Phone
     amount: Amount
     and: and
+    apply_only_on_full_priced_items: Apply only on full priced items
     approve: approve
     approver: Approver
     approved_at: Approved at
@@ -1580,6 +1581,7 @@ en:
     states_required: States Required
     status: Status
     stock: Stock
+    default_stock_location_name: Shop location
     stock_location: Stock Location
     stock_location_info: Stock location info
     stock_locations: Stock Locations

data/db/migrate/20240623172111_add_deleted_at_to_spree_stock_locations.rb

@@ -0,0 +1,6 @@
+class AddDeletedAtToSpreeStockLocations < ActiveRecord::Migration[6.1]
+  def change
+    add_column :spree_stock_locations, :deleted_at, :datetime, if_not_exists: true
+    add_index :spree_stock_locations, :deleted_at, if_not_exists: true
+  end
+end

data/db/migrate/20240725124530_add_refunder_to_spree_refunds.rb

@@ -0,0 +1,6 @@
+class AddRefunderToSpreeRefunds < ActiveRecord::Migration[6.1]
+  def change
+    add_column :spree_refunds, :refunder_id, :bigint, if_not_exists: true
+    add_index :spree_refunds, :refunder_id, if_not_exists: true
+  end
+end

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

@@ -83,11 +83,7 @@ module Spree
         def find_order_by_token_or_user(options = {}, with_adjustments = false)
           options[:lock] ||= false
 
-          includes = if options[:includes]
-                       { line_items: [variant: [:images, :option_values, :product]] }
-                     else
-                       {}
-                     end
+          includes = options[:includes] ? order_includes : {}
 
           # Find any incomplete orders for the token
           incomplete_orders = current_store.orders.incomplete.includes(includes)
@@ -104,6 +100,10 @@ module Spree
 
           order
         end
+
+        def order_includes
+          { line_items: [variant: [:images, :option_values, :product]] }
+        end
       end
     end
   end

data/lib/spree/core/dependencies.rb

@@ -97,7 +97,8 @@ module Spree
         credit_card_finder: 'Spree::CreditCards::Find',
         products_finder: 'Spree::Products::Find',
         taxon_finder: 'Spree::Taxons::Find',
-        line_item_by_variant_finder: 'Spree::LineItems::FindByVariant'
+        line_item_by_variant_finder: 'Spree::LineItems::FindByVariant',
+        variant_finder: 'Spree::Variants::Find'
       }.freeze
 
       include Spree::DependenciesHelper

data/lib/spree/core/preferences/preferable.rb

@@ -101,14 +101,16 @@ module Spree::Preferences::Preferable
 
   private
 
-  def convert_preference_value(value, type)
+  def convert_preference_value(value, type, nullable: false)
     case type
     when :string, :text
       value.to_s
     when :password
       value.to_s
     when :decimal
-      (value.presence || 0).to_s.to_d
+      decimal_value = value.presence
+      decimal_value ||= 0 unless nullable
+      decimal_value.present? ? decimal_value.to_s.to_d : decimal_value
     when :integer
       value.to_i
     when :boolean

data/lib/spree/core/preferences/preferable_class_methods.rb

@@ -2,10 +2,11 @@ module Spree::Preferences
   module PreferableClassMethods
     def preference(name, type, *args)
       options = args.extract_options!
-      options.assert_valid_keys(:default, :deprecated)
+      options.assert_valid_keys(:default, :deprecated, :nullable)
       default = options[:default]
       default = -> { options[:default] } unless default.is_a?(Proc)
       deprecated = options[:deprecated]
+      nullable = options[:nullable]
 
       # cache_key will be nil for new objects, then if we check if there
       # is a pending preference before going to default
@@ -16,7 +17,7 @@ module Spree::Preferences
       end
 
       define_method preference_setter_method(name) do |value|
-        value = convert_preference_value(value, type)
+        value = convert_preference_value(value, type, nullable: nullable)
         preferences[name] = value
 
         Spree::Deprecation.warn("`#{name}` is deprecated. #{deprecated}") if deprecated

data/lib/spree/core/version.rb

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

data/lib/spree/core/webhooks.rb

@@ -1,13 +1,21 @@
 module Spree
   module Webhooks
     def self.disable_webhooks
-      webhooks_disabled_previously = ENV['DISABLE_SPREE_WEBHOOKS']
-      begin
-        ENV['DISABLE_SPREE_WEBHOOKS'] = 'true'
-        yield
-      ensure
-        ENV['DISABLE_SPREE_WEBHOOKS'] = webhooks_disabled_previously
-      end
+      prev_value = disabled?
+      RequestStore.store[:disable_spree_webhooks] = true
+      yield
+    ensure
+      RequestStore.store[:disable_spree_webhooks] = prev_value
+    end
+
+    def self.disabled?
+      # rubocop:disable Style/RedundantFetchBlock
+      RequestStore.fetch(:disable_spree_webhooks) { false }
+      # rubocop:enable Style/RedundantFetchBlock
+    end
+
+    def self.disabled=(value)
+      RequestStore.store[:disable_spree_webhooks] = value
     end
   end
 end

data/lib/spree/core.rb

@@ -19,6 +19,7 @@ require 'ransack'
 require 'state_machines-activerecord'
 require 'active_storage_validations'
 require 'activerecord-typedstore'
+require 'request_store'
 
 # This is required because ActiveModel::Validations#invalid? conflicts with the
 # invalid state of a Payment. In the future this should be removed.

data/lib/spree/money.rb

@@ -28,7 +28,7 @@ module Spree
 
     def initialize(amount, options = {})
       ::Money.default_currency ||= Spree::Store.default.default_currency || 'USD'
-      @money   = Monetize.parse([amount, (options[:currency] || Spree::Store.default.default_currency)].join)
+      @money   = Monetize.parse(amount, (options[:currency] || Spree::Store.default.default_currency))
       @options = Spree::Money.default_formatting_rules.merge(options)
     end
 

data/lib/spree/testing_support/authorization_helpers.rb

@@ -37,12 +37,12 @@ module Spree
             ability_class.register_ability(ability)
           end
 
-          let(:user) { Spree.user_class.new }
+          let(:user) { Spree.admin_user_class.new }
           let(:admin_app) { Spree::OauthApplication.create!(name: 'Admin Panel', scopes: 'admin') }
           let(:admin_token) { Spree::OauthAccessToken.create!(application: admin_app, scopes: 'admin').token }
 
           before do
-            allow(Spree.user_class).to receive(:find_by).and_return(user)
+            allow(Spree.admin_user_class).to receive(:find_by).and_return(user)
             if defined?(Spree::Admin)
               allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(user)
               allow_any_instance_of(Spree::Admin::BaseController).to receive(:admin_oauth_application).and_return(admin_app)

data/lib/spree/testing_support/common_rake.rb

@@ -17,7 +17,7 @@ namespace :common do
     Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}"]
 
     # install frontend libraries
-    unless ['spree/api', 'spree/core', 'spree/sample'].include?(ENV['LIB_NAME'])
+    unless ['spree/api', 'spree/core', 'spree/sample', 'spree/emails'].include?(ENV['LIB_NAME'])
       system('bin/rails importmap:install')
       system('bin/rails turbo:install')
       system('bin/rails stimulus:install')

data/spree_core.gemspec

@@ -57,4 +57,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'mobility', '~> 1.2'
   s.add_dependency 'mobility-ransack', '~> 1.2'
   s.add_dependency 'friendly_id-mobility', '~> 1.0'
+  s.add_dependency 'request_store', '~> 1.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.8.3
+  version: 4.9.0
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-13 00:00:00.000000000 Z
+date: 2024-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -525,6 +525,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: Spree Models, Helpers, Services and core libraries
 email: hello@spreecommerce.org
 executables: []
@@ -550,6 +564,7 @@ files:
 - app/finders/spree/products/find.rb
 - app/finders/spree/stores/find_current.rb
 - app/finders/spree/taxons/find.rb
+- app/finders/spree/variants/find.rb
 - app/finders/spree/variants/option_types_finder.rb
 - app/finders/spree/variants/visible_finder.rb
 - app/helpers/spree/base_helper.rb
@@ -664,6 +679,7 @@ files:
 - app/models/spree/order/emails.rb
 - app/models/spree/order/payments.rb
 - app/models/spree/order/store_credit.rb
+- app/models/spree/order/webhooks.rb
 - app/models/spree/order_contents.rb
 - app/models/spree/order_inventory.rb
 - app/models/spree/order_merger.rb
@@ -672,6 +688,7 @@ files:
 - app/models/spree/payment.rb
 - app/models/spree/payment/gateway_options.rb
 - app/models/spree/payment/processing.rb
+- app/models/spree/payment/webhooks.rb
 - app/models/spree/payment_capture_event.rb
 - app/models/spree/payment_method.rb
 - app/models/spree/payment_method/check.rb
@@ -680,6 +697,7 @@ files:
 - app/models/spree/preference.rb
 - app/models/spree/price.rb
 - app/models/spree/product.rb
+- app/models/spree/product/webhooks.rb
 - app/models/spree/product_option_type.rb
 - app/models/spree/product_promotion_rule.rb
 - app/models/spree/product_property.rb
@@ -716,6 +734,7 @@ files:
 - app/models/spree/refund_reason.rb
 - app/models/spree/reimbursement.rb
 - app/models/spree/reimbursement/credit.rb
+- app/models/spree/reimbursement/emails.rb
 - app/models/spree/reimbursement/reimbursement_type_engine.rb
 - app/models/spree/reimbursement/reimbursement_type_validator.rb
 - app/models/spree/reimbursement_performer.rb
@@ -742,6 +761,8 @@ files:
 - app/models/spree/role.rb
 - app/models/spree/role_user.rb
 - app/models/spree/shipment.rb
+- app/models/spree/shipment/emails.rb
+- app/models/spree/shipment/webhooks.rb
 - app/models/spree/shipment_handler.rb
 - app/models/spree/shipping_calculator.rb
 - app/models/spree/shipping_category.rb
@@ -768,8 +789,10 @@ files:
 - app/models/spree/stock/splitter/shipping_category.rb
 - app/models/spree/stock/splitter/weight.rb
 - app/models/spree/stock_item.rb
+- app/models/spree/stock_item/webhooks.rb
 - app/models/spree/stock_location.rb
 - app/models/spree/stock_movement.rb
+- app/models/spree/stock_movement/webhooks.rb
 - app/models/spree/stock_transfer.rb
 - app/models/spree/store.rb
 - app/models/spree/store_credit.rb
@@ -789,6 +812,7 @@ files:
 - app/models/spree/taxon_image/configuration/active_storage.rb
 - app/models/spree/taxonomy.rb
 - app/models/spree/variant.rb
+- app/models/spree/variant/webhooks.rb
 - app/models/spree/wished_item.rb
 - app/models/spree/wishlist.rb
 - app/models/spree/zone.rb
@@ -851,6 +875,7 @@ files:
 - app/services/spree/seeds/all.rb
 - app/services/spree/seeds/countries.rb
 - app/services/spree/seeds/default_reimbursement_types.rb
+- app/services/spree/seeds/payment_methods.rb
 - app/services/spree/seeds/roles.rb
 - app/services/spree/seeds/shipping_categories.rb
 - app/services/spree/seeds/states.rb
@@ -939,6 +964,8 @@ files:
 - db/migrate/20230512094803_rename_data_feeds_column_provider_to_type.rb
 - db/migrate/20240303174340_fix_spree_stock_item_unique_index.rb
 - db/migrate/20240514105216_add_weight_and_dimension_units_to_spree_variants.rb
+- db/migrate/20240623172111_add_deleted_at_to_spree_stock_locations.rb
+- db/migrate/20240725124530_add_refunder_to_spree_refunds.rb
 - db/seeds.rb
 - lib/friendly_id/paranoia.rb
 - lib/generators/spree/custom_authentication/custom_authentication_generator.rb
@@ -1119,9 +1146,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.8.3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.9.0
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.8.3
+  source_code_uri: https://github.com/spree/spree/tree/v4.9.0
 post_install_message:
 rdoc_options: []
 require_paths: