spree_core 4.7.3 → 4.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96a1ab3dd325e2cd0053b0ad881b73ddb153624fd04dba62dd61d4e01ab2aca4
-  data.tar.gz: 1e947a1bba157dd1df4ba6773d869675da4bffa856f4f1c57f63a4c7b5a592aa
+  metadata.gz: a07adab86367df355f16ba975b123b0c203579de5882cec741c8f81e1dfff5f0
+  data.tar.gz: b7c41de3fb4ab564ca7c7ebbe0642e2ed6d0235ea59c4661ceb524435bf51c3f
 SHA512:
-  metadata.gz: 6307ed6baf1241414853b53c6528f08448fb465fcdd4603e96f29aaf507fa2188a7f481f4e000b5ec9370e7894c49680ad86ad61d39b1c2e36d7735988c36c95
-  data.tar.gz: 1d75cd60145ae2fe99f9d9a8e2c13cd7c3b9026847b561c31299ce1bbd0596c7f4e14499e01f658dfe0e8c87e5335ee718d6983213d8ac1d8338a3300836d1f3
+  metadata.gz: eb9917a0b380bc500b7bcfa63f0a36dcdefb6afc1237b52bd95cd8365d3caba3af00d97eed799834a6db6aa1689d043a27107dc53045a24ccaa7f702152470dd
+  data.tar.gz: 22c9f866d4e5a5ce0f556fa8dd38bbb59a9a6d6c7f64d7a9de300c30ccf4f63625e75ea2f119eb65e25a03bcf35925905ff522e163925919b048e304e331519f

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2015, Spree Commerce, Inc. and other contributors
+Copyright (c) 2007-2024, Spree Commerce, Inc., Spark Solutuons Sp. z o.o. and other contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/app/finders/spree/taxons/find.rb

@@ -65,9 +65,13 @@ module Spree
       def by_parent_permalink(taxons)
         return taxons unless parent_permalink?
 
-        taxons.joins(:parent).
-          join_translation_table(Taxon, 'parents_spree_taxons').
-          where(["#{Taxon.translation_table_alias}.permalink = ?", parent_permalink])
+        if Spree.use_translations?
+          taxons.joins(:parent).
+            join_translation_table(Taxon, 'parents_spree_taxons').
+            where(["#{Taxon.translation_table_alias}.permalink = ?", parent_permalink])
+        else
+          taxons.joins(:parent).where(parent: { permalink: parent_permalink })
+        end
       end
 
       def by_taxonomy(taxons)

data/app/models/concerns/spree/product_scopes.rb

@@ -33,15 +33,15 @@ module Spree
 
       def self.property_conditions(property)
         properties_table = Property.table_name
-        property_translations_table = Property.translation_table_alias
+
         case property
         when Property then { "#{properties_table}.id" => property.id }
         when Integer  then { "#{properties_table}.id" => property }
         else
           if Property.column_for_attribute('id').type == :uuid
-            ["#{property_translations_table.name} = ? OR #{properties_table.id} = ?", property, property]
+            ["#{properties_table}.name = ? OR #{properties_table}.id = ?", property, property]
           else
-            { "#{property_translations_table}.name" => property }
+            { "#{properties_table}.name" => property }
           end
         end
       end
@@ -127,25 +127,29 @@ module Spree
 
       # a scope that finds all products having property specified by name, object or id
       add_search_scope :with_property do |property|
-        joins(:properties).join_translation_table(Property).where(property_conditions(property))
+        joins(:properties).where(property_conditions(property))
       end
 
       # a simple test for product with a certain property-value pairing
       # note that it can test for properties with NULL values, but not for absent values
       add_search_scope :with_property_value do |property, value|
-        joins(:properties).
-          join_translation_table(Property).
-          join_translation_table(ProductProperty).
-          where("#{ProductProperty.translation_table_alias}.value = ?", value).
-          where(property_conditions(property))
+        if Spree.use_translations?
+          joins(:properties).
+            join_translation_table(Property).
+            join_translation_table(ProductProperty).
+            where("#{ProductProperty.translation_table_alias}.value = ?", value).
+            where(property_conditions(property))
+        else
+          joins(:properties).
+            where("#{ProductProperty.table_name}.value = ?", value).
+            where(property_conditions(property))
+        end
       end
 
       add_search_scope :with_property_values do |property_filter_param, property_values|
         joins(product_properties: :property).
-          join_translation_table(Property).
-          join_translation_table(ProductProperty).
-          where(Property.translation_table_alias => { filter_param: property_filter_param }).
-          where(ProductProperty.translation_table_alias => { filter_param: property_values.map(&:parameterize) })
+          where(Property.table_name => { filter_param: property_filter_param }).
+          where(ProductProperty.table_name => { filter_param: property_values.map(&:parameterize) })
       end
 
       add_search_scope :with_option do |option|
@@ -156,9 +160,7 @@ module Spree
         elsif OptionType.column_for_attribute('id').type == :uuid
           joins(:option_types).where(spree_option_types: { name: option }).or(Product.joins(:option_types).where(spree_option_types: { id: option }))
         else
-          joins(:option_types).
-            join_translation_table(OptionType).
-            where(OptionType.translation_table_alias => { name: option })
+          joins(:option_types).where(OptionType.table_name => { name: option })
         end
       end
 
@@ -179,9 +181,7 @@ module Spree
 
         group("#{Spree::Product.table_name}.id").
           joins(variants_including_master: :option_values).
-          join_translation_table(Spree::OptionValue).
-          where(Spree::OptionValue.translation_table_alias => { name: value },
-                Spree::OptionValue.table_name => { option_type_id: option_type_id })
+          where(Spree::OptionValue.table_name => { name: value, option_type_id: option_type_id })
       end
 
       # Finds all products which have either:

data/app/models/concerns/spree/user_address.rb

@@ -5,11 +5,13 @@ module Spree
     included do
       belongs_to :bill_address, foreign_key: :bill_address_id, class_name: 'Spree::Address',
                                 optional: true
-      alias_attribute :billing_address, :bill_address
+      alias_method :billing_address, :bill_address
+      alias_method :billing_address=, :bill_address=
 
       belongs_to :ship_address, foreign_key: :ship_address_id, class_name: 'Spree::Address',
                                 optional: true
-      alias_attribute :shipping_address, :ship_address
+      alias_method :shipping_address, :ship_address
+      alias_method :shipping_address=, :ship_address=
 
       accepts_nested_attributes_for :ship_address, :bill_address
 

data/app/models/spree/address.rb

@@ -3,7 +3,7 @@ module Spree
     require 'validates_zipcode'
 
     include Spree::Metadata
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
     if defined?(Spree::Security::Addresses)
@@ -68,25 +68,6 @@ module Spree
     self.whitelisted_ransackable_attributes = ADDRESS_FIELDS
     self.whitelisted_ransackable_associations = %w[country state user]
 
-    def self.build_default
-      Spree::Deprecation.warn(<<-DEPRECATION, caller)
-        `Address#build_default` is deprecated and will be removed in Spree 5.0.
-        Please use standard rails `Address.new(country: current_store.default_country)`
-      DEPRECATION
-      new(country: Spree::Country.default)
-    end
-
-    def self.default(user = nil, kind = 'bill')
-      Spree::Deprecation.warn(<<-DEPRECATION, caller)
-        `Address#default` is deprecated and will be removed in Spree 5.0.
-      DEPRECATION
-      if user && user_address = user.public_send(:"#{kind}_address")
-        user_address.clone
-      else
-        build_default
-      end
-    end
-
     def self.required_fields
       Spree::Address.validators.map do |v|
         v.is_a?(ActiveModel::Validations::PresenceValidator) ? v.attributes : []

data/app/models/spree/asset.rb

@@ -2,7 +2,7 @@ module Spree
   class Asset < Spree::Base
     include Support::ActiveStorage
     include Spree::Metadata
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/cms_page.rb

@@ -3,7 +3,7 @@ module Spree
     include Spree::SingleStoreResource
     include Spree::DisplayLink
 
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/country.rb

@@ -1,9 +1,5 @@
 module Spree
   class Country < Spree::Base
-    # we need to have this callback before any dependent: :destroy associations
-    # https://github.com/rails/rails/issues/3458
-    # before_destroy :ensure_not_default
-
     has_many :addresses, dependent: :restrict_with_error
     has_many :states,
              -> { order name: :asc },
@@ -18,17 +14,6 @@ module Spree
 
     validates :name, :iso_name, :iso, :iso3, presence: true, uniqueness: { case_sensitive: false, scope: spree_base_uniqueness_scope }
 
-    def self.default(store = nil)
-      Spree::Deprecation.warn(<<-DEPRECATION, caller)
-        `Country#default` is deprecated and will be removed in Spree 5.0.
-        Please use `current_store.default_country` instead
-      DEPRECATION
-      store ||= Spree::Store.default
-      country_id = store.default_country_id
-      default = find_by(id: country_id) if country_id.present?
-      default || find_by(iso: 'US') || first
-    end
-
     def self.by_iso(iso)
       where(['LOWER(iso) = ?', iso.downcase]).or(where(['LOWER(iso3) = ?', iso.downcase])).take
     end
@@ -45,16 +30,5 @@ module Spree
     def to_s
       name
     end
-
-    private
-
-    def ensure_not_default
-      Spree::Deprecation.warn('Country#ensure_not_default is deprecated and will be removed in Spree v5')
-
-      if id.eql?(Spree::Config[:default_country_id])
-        errors.add(:base, Spree.t(:default_country_cannot_be_deleted))
-        throw(:abort)
-      end
-    end
   end
 end

data/app/models/spree/credit_card.rb

@@ -2,7 +2,7 @@ module Spree
   class CreditCard < Spree::Base
     include ActiveMerchant::Billing::CreditCardMethods
     include Spree::Metadata
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
     if defined?(Spree::Security::CreditCards)
@@ -99,13 +99,15 @@ module Spree
     def cc_type=(type)
       self[:cc_type] = case type
                        when 'mastercard', 'maestro' then 'master'
-                       when 'amex' then 'american_express'
+                      when 'amex' then 'american_express'
                        when 'dinersclub' then 'diners_club'
                        when '' then try_type_from_number
                        else type
                        end
     end
 
+    alias_method :brand=, :cc_type=
+
     def verification_value=(value)
       @verification_value = value.to_s.gsub(/\s/, '')
     end

data/app/models/spree/customer_return.rb

@@ -3,7 +3,7 @@ module Spree
     include Spree::Core::NumberGenerator.new(prefix: 'CR', length: 9)
     include Spree::NumberIdentifier
     include Spree::Metadata
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/digital.rb

@@ -3,7 +3,7 @@ module Spree
     belongs_to :variant
     has_many :digital_links, dependent: :destroy
 
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/digital_link.rb

@@ -6,7 +6,7 @@ module Spree
       has_secure_token
     end
 
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
     if defined?(Spree::Security::DigitalLinks)

data/app/models/spree/inventory_unit.rb

@@ -1,6 +1,6 @@
 module Spree
   class InventoryUnit < Spree::Base
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/line_item.rb

@@ -1,7 +1,7 @@
 module Spree
   class LineItem < Spree::Base
     include Spree::Metadata
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/menu.rb

@@ -1,7 +1,7 @@
 module Spree
   class Menu < Spree::Base
     include Spree::SingleStoreResource
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/menu_item.rb

@@ -1,7 +1,7 @@
 module Spree
   class MenuItem < Spree::Base
     include Spree::DisplayLink
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/option_type.rb

@@ -3,12 +3,12 @@ module Spree
     include Spree::UniqueName
     include Spree::Metadata
     include Spree::TranslatableResource
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 
-    TRANSLATABLE_FIELDS = %i[name presentation].freeze
-    translates(*TRANSLATABLE_FIELDS)
+    TRANSLATABLE_FIELDS = %i[presentation].freeze
+    translates(*TRANSLATABLE_FIELDS, column_fallback: true)
 
     acts_as_list
     auto_strip_attributes :name, :presentation

data/app/models/spree/option_value.rb

@@ -2,12 +2,12 @@ module Spree
   class OptionValue < Spree::Base
     include Spree::Metadata
     include Spree::TranslatableResource
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 
-    TRANSLATABLE_FIELDS = %i[name presentation].freeze
-    translates(*TRANSLATABLE_FIELDS)
+    TRANSLATABLE_FIELDS = %i[presentation].freeze
+    translates(*TRANSLATABLE_FIELDS, column_fallback: true)
 
     belongs_to :option_type, class_name: 'Spree::OptionType', touch: true, inverse_of: :option_values
 

data/app/models/spree/order.rb

@@ -25,7 +25,7 @@ module Spree
     include Spree::SingleStoreResource
     include Spree::MemoizedData
     include Spree::Metadata
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
     if defined?(Spree::Security::Orders)
@@ -102,11 +102,13 @@ module Spree
 
     belongs_to :bill_address, foreign_key: :bill_address_id, class_name: 'Spree::Address',
                               optional: true, dependent: :destroy
-    alias_attribute :billing_address, :bill_address
+    alias_method :billing_address, :bill_address
+    alias_method :billing_address=, :bill_address=
 
     belongs_to :ship_address, foreign_key: :ship_address_id, class_name: 'Spree::Address',
                               optional: true, dependent: :destroy
-    alias_attribute :shipping_address, :ship_address
+    alias_method :shipping_address, :ship_address
+    alias_method :shipping_address=, :ship_address=
 
     belongs_to :store, class_name: 'Spree::Store'
 

data/app/models/spree/payment.rb

@@ -6,7 +6,7 @@ module Spree
     include Spree::NumberIdentifier
     include Spree::NumberAsParam
     include Spree::Metadata
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
     if defined?(Spree::Security::Payments)

data/app/models/spree/payment_capture_event.rb

@@ -1,6 +1,6 @@
 module Spree
   class PaymentCaptureEvent < Spree::Base
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/price.rb

@@ -1,7 +1,7 @@
 module Spree
   class Price < Spree::Base
     include Spree::VatPriceCalculation
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 
@@ -46,7 +46,9 @@ module Spree
     end
 
     alias_attribute :price, :amount
+    alias_method :price=, :amount=
     alias_attribute :compare_at_price, :compare_at_amount
+    alias_method :compare_at_price=, :compare_at_amount=
 
     def price_including_vat_for(price_options)
       options = price_options.merge(tax_category: variant.tax_category)

data/app/models/spree/product.rb

@@ -27,7 +27,7 @@ module Spree
     include Spree::TranslatableResourceSlug
     include Spree::MemoizedData
     include Spree::Metadata
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
     if defined?(Spree::VendorConcern)
@@ -39,7 +39,7 @@ module Spree
                           purchasable? in_stock? backorderable?]
 
     TRANSLATABLE_FIELDS = %i[name description slug meta_description meta_keywords meta_title].freeze
-    translates(*TRANSLATABLE_FIELDS)
+    translates(*TRANSLATABLE_FIELDS, column_fallback: true)
 
     self::Translation.class_eval do
       before_save :set_slug
@@ -332,16 +332,17 @@ module Spree
     end
 
     def property(property_name)
-      product_properties.joins(:property).
-        join_translation_table(Property).
-        find_by(Property.translation_table_alias => { name: property_name }).try(:value)
+      product_properties.joins(:property).find_by(Property.table_name => { name: property_name }).try(:value)
     end
 
     def set_property(property_name, property_value, property_presentation = property_name)
       ApplicationRecord.transaction do
         # Manual first_or_create to work around Mobility bug
         property = if Property.where(name: property_name).exists?
-                     Property.where(name: property_name).first
+                     existing_property = Property.where(name: property_name).first
+                     existing_property.presentation ||= property_presentation
+                     existing_property.save
+                     existing_property
                    else
                      Property.create(name: property_name, presentation: property_presentation)
                    end
@@ -375,16 +376,24 @@ module Spree
     end
 
     def brand
-      @brand ||= taxons.joins(:taxonomy).
-                 join_translation_table(Taxonomy).
-                 find_by(Taxonomy.translation_table_alias => { name: Spree.t(:taxonomy_brands_name) })
+      @brand ||= if Spree.use_translations?
+                    taxons.joins(:taxonomy).
+                     join_translation_table(Taxonomy).
+                     find_by(Taxonomy.translation_table_alias => { name: Spree.t(:taxonomy_brands_name) })
+                 else
+                   taxons.joins(:taxonomy).find_by(Taxonomy.table_name => { name: Spree.t(:taxonomy_brands_name) })
+                 end
     end
 
     def category
-      @category ||= taxons.joins(:taxonomy).
-                    join_translation_table(Taxonomy).
-                    order(depth: :desc).
-                    find_by(Taxonomy.translation_table_alias => { name: Spree.t(:taxonomy_categories_name) })
+      @category ||= if Spree.use_translations?
+                      taxons.joins(:taxonomy).
+                        join_translation_table(Taxonomy).
+                        order(depth: :desc).
+                        find_by(Taxonomy.translation_table_alias => { name: Spree.t(:taxonomy_categories_name) })
+                    else
+                      taxons.joins(:taxonomy).order(depth: :desc).find_by(Taxonomy.table_name => { name: Spree.t(:taxonomy_categories_name) })
+                    end
     end
 
     def taxons_for_store(store)
@@ -460,6 +469,8 @@ module Spree
       # punch slug with date prefix to allow reuse of original
       return if frozen?
 
+      update_column(:slug, "#{Time.current.to_i}_#{slug}"[0..254])
+
       translations.with_deleted.each do |t|
         t.update_column :slug, "#{Time.current.to_i}_#{t.slug}"[0..254]
       end

data/app/models/spree/product_property.rb

@@ -3,13 +3,15 @@ module Spree
     include Spree::FilterParam
     include Spree::TranslatableResource
 
-    TRANSLATABLE_FIELDS = %i[value filter_param].freeze
-    translates(*TRANSLATABLE_FIELDS)
+    TRANSLATABLE_FIELDS = %i[value].freeze
+    translates(*TRANSLATABLE_FIELDS, column_fallback: true)
 
     self::Translation.class_eval do
       auto_strip_attributes :value
     end
 
+    auto_strip_attributes :value
+
     acts_as_list scope: :product
 
     with_options inverse_of: :product_properties do

data/app/models/spree/promotion.rb

@@ -2,7 +2,7 @@ module Spree
   class Promotion < Spree::Base
     include Spree::MultiStoreResource
     include Spree::Metadata
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
     if defined?(Spree::Security::Promotions)

data/app/models/spree/property.rb

@@ -3,17 +3,19 @@ module Spree
     include Spree::FilterParam
     include Spree::Metadata
     include Spree::TranslatableResource
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 
-    TRANSLATABLE_FIELDS = %i[name presentation filter_param].freeze
-    translates(*TRANSLATABLE_FIELDS)
+    TRANSLATABLE_FIELDS = %i[presentation].freeze
+    translates(*TRANSLATABLE_FIELDS, column_fallback: true)
 
     self::Translation.class_eval do
-      auto_strip_attributes :name, :presentation
+      auto_strip_attributes :presentation
     end
 
+    auto_strip_attributes :name, :presentation
+
     has_many :property_prototypes, class_name: 'Spree::PropertyPrototype'
     has_many :prototypes, through: :property_prototypes, class_name: 'Spree::Prototype'
 

data/app/models/spree/prototype.rb

@@ -1,7 +1,7 @@
 module Spree
   class Prototype < Spree::Base
     include Spree::Metadata
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/refund.rb

@@ -1,7 +1,7 @@
 module Spree
   class Refund < Spree::Base
     include Spree::Metadata
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
     if defined?(Spree::Security::Refunds)

data/app/models/spree/reimbursement.rb

@@ -2,7 +2,7 @@ module Spree
   class Reimbursement < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'RI', length: 9)
     include Spree::NumberIdentifier
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/return_authorization.rb

@@ -2,7 +2,7 @@ module Spree
   class ReturnAuthorization < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'RA', length: 9)
     include Spree::NumberIdentifier
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/return_item.rb

@@ -2,7 +2,7 @@ module Spree
   class ReturnItem < Spree::Base
     COMPLETED_RECEPTION_STATUSES = %w(received given_to_customer)
 
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/shipment.rb

@@ -6,7 +6,7 @@ module Spree
     include Spree::NumberIdentifier
     include Spree::NumberAsParam
     include Spree::Metadata
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
     if defined?(Spree::Security::Shipments)

data/app/models/spree/shipping_category.rb

@@ -1,7 +1,7 @@
 module Spree
   class ShippingCategory < Spree::Base
     include Spree::UniqueName
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
 

data/app/models/spree/shipping_method.rb

@@ -3,7 +3,7 @@ module Spree
     acts_as_paranoid
     include Spree::CalculatedAdjustments
     include Spree::Metadata
-    if defined?(Spree::Webhooks)
+    if defined?(Spree::Webhooks::HasWebhooks)
       include Spree::Webhooks::HasWebhooks
     end
     if defined?(Spree::VendorConcern)